Schlaefer / Saito

app/Config/bootstrap.php

Spacing +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
-include App::path('Lib')[0] . 'BaseFunctions.php';
+include App::path('Lib')[0].'BaseFunctions.php';
 
 // Load Composer autoload.
-require ROOT . DS . APP_DIR . DS . 'Vendor' . DS . 'autoload.php';
+require ROOT.DS.APP_DIR.DS.'Vendor'.DS.'autoload.php';
 Cake2ComposerAutoloadFix();
 
 /**
@@ -210,7 +210,7 @@ 
 	/**
  * Check if the forum is installed
  */
-if ( file_exists(APP . 'Config' . DS . 'installed.txt') ) :
+if (file_exists(APP.'Config'.DS.'installed.txt')) :
 	Configure::write('Saito.installed', TRUE);
 else :
 	Configure::write('Saito.installed', FALSE);

Indentation +59 added lines, -59 removed lines

@@ -33,43 +33,43 @@ 
 
 
 if (!isset($engine)) {
-	$engine = 'File';
-	$prefix = 'saito_';
+    $engine = 'File';
+    $prefix = 'saito_';
 }
 
 // Setup a 'default' cache configuration for use in the application.
 Cache::config(
-	'default',
-	[
-		'engine' => $engine,
-		'prefix'	 => $prefix
-	]
+    'default',
+    [
+        'engine' => $engine,
+        'prefix'	 => $prefix
+    ]
 );
 
 /**
  * Long term cache for performance cheating
  */
 Cache::config(
-	'entries',
-	[
-		'engine'   => $engine,
-		'prefix'	 => $prefix,
-		'groups'	 => ['entries'],
-		'duration' => 3600
-	]
+    'entries',
+    [
+        'engine'   => $engine,
+        'prefix'	 => $prefix,
+        'groups'	 => ['entries'],
+        'duration' => 3600
+    ]
 );
 
 /**
  * Short term cache for performance cheating
  */
 Cache::config(
-	'short',
-	[
-		'engine'   => $engine,
-		'prefix'	 => $prefix,
-		'groups'	 => ['short'],
-		'duration' => 180
-	]
+    'short',
+    [
+        'engine'   => $engine,
+        'prefix'	 => $prefix,
+        'groups'	 => ['short'],
+        'duration' => 180
+    ]
 );
 
 /**
@@ -107,13 +107,13 @@ 
  *
  */
 
-	/**
-	 * Cake doesn't handle Smiley <-> Smilies
-	 */
+    /**
+     * Cake doesn't handle Smiley <-> Smilies
+     */
 Inflector::rules('plural', array(
-								'/^(smil)ey$/i' => '\1ies'));
+                                '/^(smil)ey$/i' => '\1ies'));
 Inflector::rules('singular', array(
-								'/^(smil)ies$/i' => '\1ey'));
+                                '/^(smil)ies$/i' => '\1ey'));
 
 /**
  * Plugins need to be loaded manually, you can either load them one by one or all of them in a single call
@@ -126,11 +126,11 @@ 
  */
 
 CakePlugin::loadAll(
-	[
-		'Api' => ['bootstrap' => true, 'routes' => true],
-		'M' => ['bootstrap' => true, 'routes' => true],
-		'SaitoHelp' => ['routes' => true],
-	]
+    [
+        'Api' => ['bootstrap' => true, 'routes' => true],
+        'M' => ['bootstrap' => true, 'routes' => true],
+        'SaitoHelp' => ['routes' => true],
+    ]
 );
 
 /**
@@ -150,8 +150,8 @@ 
  * ));
  */
 Configure::write('Dispatcher.filters', array(
-	'AssetDispatcher',
-	'Stopwatch.StopwatchFilter',
+    'AssetDispatcher',
+    'Stopwatch.StopwatchFilter',
 ));
 
 /**
@@ -159,35 +159,35 @@ 
  */
 App::uses('CakeLog', 'Log');
 CakeLog::config('debug', array(
-	'engine' => 'FileLog',
-	'types' => array('notice', 'info', 'debug'),
-	'file' => 'debug',
+    'engine' => 'FileLog',
+    'types' => array('notice', 'info', 'debug'),
+    'file' => 'debug',
 ));
 CakeLog::config('error', array(
-	'engine' => 'FileLog',
-	'types' => array('warning', 'error', 'critical', 'alert', 'emergency'),
-	'file' => 'error',
+    'engine' => 'FileLog',
+    'types' => array('warning', 'error', 'critical', 'alert', 'emergency'),
+    'file' => 'error',
 ));
 CakeLog::config('saito-error', array(
-	'engine' => 'FileLog',
-	'size' => '1MB',
-	'rotate' => '4',
-	'types' => ['saito.error'],
-	'file' => 'saito-error'
+    'engine' => 'FileLog',
+    'size' => '1MB',
+    'rotate' => '4',
+    'types' => ['saito.error'],
+    'file' => 'saito-error'
 ));
 CakeLog::config('saito', array(
-		'engine' => 'FileLog',
-		'size' => '1MB',
-		'rotate' => '4',
-		'types' => ['saito.info'],
-		'file' => 'saito-info'
+        'engine' => 'FileLog',
+        'size' => '1MB',
+        'rotate' => '4',
+        'types' => ['saito.info'],
+        'file' => 'saito-info'
 ));
 CakeLog::config('auth', array(
-		'engine' => 'FileLog',
-		'size' => '1MB',
-		'rotate' => '4',
-		'types' => ['saito.forbidden'],
-		'file' => 'saito-auth'
+        'engine' => 'FileLog',
+        'size' => '1MB',
+        'rotate' => '4',
+        'types' => ['saito.forbidden'],
+        'file' => 'saito-auth'
 ));
 
 include 'version.php';
@@ -207,13 +207,13 @@ 
  */
 Configure::write('Saito.Globals.postingsPerThread', 10);
 
-	/**
- * Check if the forum is installed
- */
+    /**
+     * Check if the forum is installed
+     */
 if ( file_exists(APP . 'Config' . DS . 'installed.txt') ) :
-	Configure::write('Saito.installed', TRUE);
+    Configure::write('Saito.installed', TRUE);
 else :
-	Configure::write('Saito.installed', FALSE);
+    Configure::write('Saito.installed', FALSE);
 endif;
 
 /**

Braces +3 added lines, -1 removed lines

@@ -212,8 +212,10 @@
  */
 if ( file_exists(APP . 'Config' . DS . 'installed.txt') ) :
 	Configure::write('Saito.installed', TRUE);
-else :
+else {
+    :
 	Configure::write('Saito.installed', FALSE);
+}
 endif;
 
 /**

app/Config/core.php

Spacing +4 added lines, -4 removed lines

@@ -337,8 +337,8 @@ 
  */
 Cache::config('_cake_core_', array(
 	'engine' => $engine,
-	'prefix' => $prefix . 'cake_core_',
-	'path' => CACHE . 'persistent' . DS,
+	'prefix' => $prefix.'cake_core_',
+	'path' => CACHE.'persistent'.DS,
 	'serialize' => ($engine === 'File'),
 	'duration' => $duration
 ));
@@ -349,8 +349,8 @@ 
  */
 Cache::config('_cake_model_', array(
 	'engine' => $engine,
-	'prefix' => $prefix . 'cake_model_',
-	'path' => CACHE . 'models' . DS,
+	'prefix' => $prefix.'cake_model_',
+	'path' => CACHE.'models'.DS,
 	'serialize' => ($engine === 'File'),
 	'duration' => $duration
 ));

Indentation +44 added lines, -44 removed lines

@@ -33,7 +33,7 @@ 
  * In production mode, flash messages redirect after a time interval.
  * In development mode, you need to click the flash message to continue.
  */
-	Configure::write('debug', 0);
+    Configure::write('debug', 0);
 
 /**
  * Configure the Error handler used to handle errors for your application. By default
@@ -50,11 +50,11 @@ 
  *
  * @see ErrorHandler for more information on error handling and configuration.
  */
-	Configure::write('Error', array(
-		'handler' => 'ErrorHandler::handleError',
-		'level' => E_ALL & ~E_DEPRECATED,
-		'trace' => true
-	));
+    Configure::write('Error', array(
+        'handler' => 'ErrorHandler::handleError',
+        'level' => E_ALL & ~E_DEPRECATED,
+        'trace' => true
+    ));
 
 /**
  * Configure the Exception handler used for uncaught exceptions. By default,
@@ -76,16 +76,16 @@ 
  *
  * @see ErrorHandler for more information on exception handling and configuration.
  */
-	Configure::write('Exception', array(
-		'handler' => 'ErrorHandler::handleException',
-		'renderer' => 'ExceptionRenderer',
-		'log' => true
-	));
+    Configure::write('Exception', array(
+        'handler' => 'ErrorHandler::handleException',
+        'renderer' => 'ExceptionRenderer',
+        'log' => true
+    ));
 
 /**
  * Application wide charset encoding
  */
-	Configure::write('App.encoding', 'UTF-8');
+    Configure::write('App.encoding', 'UTF-8');
 
 /**
  * To configure CakePHP *not* to use mod_rewrite and to
@@ -106,7 +106,7 @@ 
  * included primarily as a development convenience - and
  * thus not recommended for production applications.
  */
-	//Configure::write('App.baseUrl', env('SCRIPT_NAME'));
+    //Configure::write('App.baseUrl', env('SCRIPT_NAME'));
 
 /**
  * To configure CakePHP to use a particular domain URL
@@ -115,7 +115,7 @@ 
  * will override the automatic detection of full base URL and can be
  * useful when generating links from the CLI (e.g. sending emails)
  */
-	//Configure::write('App.fullBaseURL', 'http://example.com');
+    //Configure::write('App.fullBaseURL', 'http://example.com');
 
 /**
  * Uncomment the define below to use CakePHP prefix routes.
@@ -133,12 +133,12 @@ 
  *	`manager_index()` and `/manager/controller/index`
  *
  */
-	Configure::write('Routing.prefixes', array('admin'));
+    Configure::write('Routing.prefixes', array('admin'));
 /**
- * Turn off all caching application-wide.
- *
- */
-	//Configure::write('Cache.disable', true);
+     * Turn off all caching application-wide.
+     *
+     */
+    //Configure::write('Cache.disable', true);
 
 /**
  * Enable cache checking.
@@ -149,13 +149,13 @@ 
  * or in each action using $this->cacheAction = true.
  *
  */
-	//Configure::write('Cache.check', true);
+    //Configure::write('Cache.check', true);
 
 /**
  * Defines the default error type when using the log() function. Used for
  * differentiating error logging and debugging. Currently PHP supports LOG_DEBUG.
  */
-	define('LOG_ERROR', LOG_ERR);
+    define('LOG_ERROR', LOG_ERR);
 
 /**
  * Session configuration.
@@ -194,20 +194,20 @@ 
  * the cake shell command: cake schema create Sessions
  *
  */
-	Configure::write('Session', array(
-		'defaults' => 'php',
-		'cookie' => 'Saito',
-	));
+    Configure::write('Session', array(
+        'defaults' => 'php',
+        'cookie' => 'Saito',
+    ));
 
 /**
  * A random string used in security hashing methods.
  */
-	Configure::write('Security.salt', 'shouldBeAtLeast22CharsLongNoUnderscores');
+    Configure::write('Security.salt', 'shouldBeAtLeast22CharsLongNoUnderscores');
 
 /**
  * A random numeric string (digits only) used to encrypt/decrypt strings.
  */
-	Configure::write('Security.cipherSeed', '0123456789');
+    Configure::write('Security.cipherSeed', '0123456789');
 
 /**
  * Apply timestamps with the last modified time to static assets (js, css, images).
@@ -217,7 +217,7 @@ 
  * Set to `true` to apply timestamps when debug > 0. Set to 'force' to always enable
  * timestamping regardless of debug value.
  */
-	Configure::write('Asset.timestamp', 'force');
+    Configure::write('Asset.timestamp', 'force');
 
 /**
  * Compress CSS output by removing comments, whitespace, repeating tags, etc.
@@ -226,7 +226,7 @@ 
  *
  * To use, prefix the CSS link URL with '/ccss/' instead of '/css/' or use HtmlHelper::css().
  */
-	//Configure::write('Asset.filter.css', 'css.php');
+    //Configure::write('Asset.filter.css', 'css.php');
 
 /**
  * Plug in your own custom JavaScript compressor by dropping a script in your webroot to handle the
@@ -234,20 +234,20 @@ 
  *
  * To use, prefix your JavaScript link URLs with '/cjs/' instead of '/js/' or use JavaScriptHelper::link().
  */
-	//Configure::write('Asset.filter.js', 'custom_javascript_output_filter.php');
+    //Configure::write('Asset.filter.js', 'custom_javascript_output_filter.php');
 
 /**
  * The class name and database used in CakePHP's
  * access control lists.
  */
-	Configure::write('Acl.classname', 'DbAcl');
-	Configure::write('Acl.database', 'default');
+    Configure::write('Acl.classname', 'DbAcl');
+    Configure::write('Acl.database', 'default');
 
 /**
  * Uncomment this line and correct your server timezone to fix
  * any date & time related errors.
  */
-	date_default_timezone_set('UTC');
+    date_default_timezone_set('UTC');
 
 /**
  *
@@ -325,7 +325,7 @@ 
 // In development mode, caches should expire quickly.
 $duration = '+999 days';
 if (Configure::read('debug') > 0) {
-	$duration = '+10 seconds';
+    $duration = '+10 seconds';
 }
 
 // Prefix each application on the same server with a different string, to avoid Memcache and APC conflicts.
@@ -336,11 +336,11 @@ 
  * object listings, and translation cache files are stored with this configuration.
  */
 Cache::config('_cake_core_', array(
-	'engine' => $engine,
-	'prefix' => $prefix . 'cake_core_',
-	'path' => CACHE . 'persistent' . DS,
-	'serialize' => ($engine === 'File'),
-	'duration' => $duration
+    'engine' => $engine,
+    'prefix' => $prefix . 'cake_core_',
+    'path' => CACHE . 'persistent' . DS,
+    'serialize' => ($engine === 'File'),
+    'duration' => $duration
 ));
 
 /**
@@ -348,9 +348,9 @@ 
  * is used to store schema descriptions, and table listings in connections.
  */
 Cache::config('_cake_model_', array(
-	'engine' => $engine,
-	'prefix' => $prefix . 'cake_model_',
-	'path' => CACHE . 'models' . DS,
-	'serialize' => ($engine === 'File'),
-	'duration' => $duration
+    'engine' => $engine,
+    'prefix' => $prefix . 'cake_model_',
+    'path' => CACHE . 'models' . DS,
+    'serialize' => ($engine === 'File'),
+    'duration' => $duration
 ));

app/View/Helper/EntryHHelper.php

Spacing +5 added lines, -5 removed lines

@@ -26,18 +26,18 @@ 
 
 			if ($lastAction !== 'add'):
 				if ($this->Session->read('paginator.lastPage')):
-					$indexPage .= '/page:' . $this->Session->read('paginator.lastPage');
+					$indexPage .= '/page:'.$this->Session->read('paginator.lastPage');
 				endif;
 			endif;
-			$indexPage .= '/jump:' . $tid;
+			$indexPage .= '/jump:'.$tid;
 
 			return $indexPage;
 		}
 
 		public function getFastLink($entry, $params = array('class' => '')) {
 			// @todo @performance
-			$out = "<a href='{$this->request->webroot}entries/view/{$entry['Entry']['id']}' class='{$params['class']}'>" .
-					$this->getSubject($this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $entry])) . '</a>';
+			$out = "<a href='{$this->request->webroot}entries/view/{$entry['Entry']['id']}' class='{$params['class']}'>".
+					$this->getSubject($this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $entry])).'</a>';
 			return $out;
 		}
 
@@ -73,7 +73,7 @@ 
 		public function renderThread(&$tree, array $options = []) {
 			$options += [
 				'lineCache' => $this->_View->get('LineCache'),
-				'maxThreadDepthIndent' => (int)Configure::read('Saito.Settings.thread_depth_indent'),
+				'maxThreadDepthIndent' => (int) Configure::read('Saito.Settings.thread_depth_indent'),
 				'renderer' => 'thread',
 				'rootWrap' => false
 			];

Indentation +117 added lines, -117 removed lines

@@ -1,119 +1,119 @@
 <?php
 
-	use Saito\Thread\Renderer;
-
-	App::uses('AppHelper', 'View/Helper');
-
-
-	# @td refactor helper name to 'EntryHelper'
-	/**
-	 * @package saito_entry
-	 */
-
-	class EntryHHelper extends AppHelper {
-
-		use \Saito\Posting\Renderer\HelperTrait;
-
-		public $helpers = ['Form', 'Html', 'Session', 'TimeH'];
-
-		/**
-		 * @var array perf-cheat for renderers
-		 */
-		protected $_renderers = [];
-
-		public function getPaginatedIndexPageId($tid, $lastAction) {
-			$indexPage = '/entries/index';
-
-			if ($lastAction !== 'add'):
-				if ($this->Session->read('paginator.lastPage')):
-					$indexPage .= '/page:' . $this->Session->read('paginator.lastPage');
-				endif;
-			endif;
-			$indexPage .= '/jump:' . $tid;
-
-			return $indexPage;
-		}
-
-		public function getFastLink($entry, $params = array('class' => '')) {
-			// @todo @performance
-			$out = "<a href='{$this->request->webroot}entries/view/{$entry['Entry']['id']}' class='{$params['class']}'>" .
-					$this->getSubject($this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $entry])) . '</a>';
-			return $out;
-		}
-
-		public function categorySelect($entry, $categories) {
-			if ($entry['Entry']['pid'] == 0) {
-				$out = $this->Form->input(
-						'category_id',
-						[
-								'options' => [$categories],
-								'empty' => true,
-								'label' => __('Category'),
-								'tabindex' => 1,
-								'error' => ['notEmpty' => __('error_category_empty')]
-						]
-				);
-			} else {
-				// Send category for easy access in entries/preview when answering
-				// (not used when saved).
-				$out = $this->Form->hidden('category_id');
-			}
-			return $out;
-		}
-
-		/**
-		 * renders a posting tree as thread
-		 *
-		 * @param mixed $tree passed as reference to share CU-decorator "up"
-		 * @param $CurrentUser
-		 * @param $options
-		 * 	- 'renderer' [thread]|mix
-		 * @return string
-		 */
-		public function renderThread(&$tree, array $options = []) {
-			$options += [
-				'lineCache' => $this->_View->get('LineCache'),
-				'maxThreadDepthIndent' => (int)Configure::read('Saito.Settings.thread_depth_indent'),
-				'renderer' => 'thread',
-				'rootWrap' => false
-			];
-			$renderer = $options['renderer'];
-			unset($options['renderer']);
-
-			if (is_array($tree)) {
-				$tree = $this->createTreeObject($tree, $options);
-			}
-
-			if (isset($this->_renderers[$renderer])) {
-				$renderer = $this->_renderers[$renderer];
-			} else {
-				$name = $renderer;
-				switch ($name) {
-					case 'mix':
-						$renderer = new Renderer\MixHtmlRenderer($this);
-						break;
-					default:
-						$renderer = new Renderer\ThreadHtmlRenderer($this);
-				}
-				$this->_renderers[$name] = $renderer;
-			}
-			$renderer->setOptions($options);
-			return $renderer->render($tree);
-		}
-
-		/**
-		 * helper function for creating object thread tree
-		 *
-		 * @param array $entrySub
-		 * @param array $options
-		 * @return Posting
-		 */
-		public function createTreeObject(array $entrySub, array $options = []) {
-			$tree = $this->dic->newInstance(
-				'\Saito\Posting\Posting',
-				['rawData' => $entrySub, 'options' => $options]
-			);
-			return $tree;
-		}
-
-	}
+    use Saito\Thread\Renderer;
+
+    App::uses('AppHelper', 'View/Helper');
+
+
+    # @td refactor helper name to 'EntryHelper'
+    /**
+     * @package saito_entry
+     */
+
+    class EntryHHelper extends AppHelper {
+
+        use \Saito\Posting\Renderer\HelperTrait;
+
+        public $helpers = ['Form', 'Html', 'Session', 'TimeH'];
+
+        /**
+         * @var array perf-cheat for renderers
+         */
+        protected $_renderers = [];
+
+        public function getPaginatedIndexPageId($tid, $lastAction) {
+            $indexPage = '/entries/index';
+
+            if ($lastAction !== 'add'):
+                if ($this->Session->read('paginator.lastPage')):
+                    $indexPage .= '/page:' . $this->Session->read('paginator.lastPage');
+                endif;
+            endif;
+            $indexPage .= '/jump:' . $tid;
+
+            return $indexPage;
+        }
+
+        public function getFastLink($entry, $params = array('class' => '')) {
+            // @todo @performance
+            $out = "<a href='{$this->request->webroot}entries/view/{$entry['Entry']['id']}' class='{$params['class']}'>" .
+                    $this->getSubject($this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $entry])) . '</a>';
+            return $out;
+        }
+
+        public function categorySelect($entry, $categories) {
+            if ($entry['Entry']['pid'] == 0) {
+                $out = $this->Form->input(
+                        'category_id',
+                        [
+                                'options' => [$categories],
+                                'empty' => true,
+                                'label' => __('Category'),
+                                'tabindex' => 1,
+                                'error' => ['notEmpty' => __('error_category_empty')]
+                        ]
+                );
+            } else {
+                // Send category for easy access in entries/preview when answering
+                // (not used when saved).
+                $out = $this->Form->hidden('category_id');
+            }
+            return $out;
+        }
+
+        /**
+         * renders a posting tree as thread
+         *
+         * @param mixed $tree passed as reference to share CU-decorator "up"
+         * @param $CurrentUser
+         * @param $options
+         * 	- 'renderer' [thread]|mix
+         * @return string
+         */
+        public function renderThread(&$tree, array $options = []) {
+            $options += [
+                'lineCache' => $this->_View->get('LineCache'),
+                'maxThreadDepthIndent' => (int)Configure::read('Saito.Settings.thread_depth_indent'),
+                'renderer' => 'thread',
+                'rootWrap' => false
+            ];
+            $renderer = $options['renderer'];
+            unset($options['renderer']);
+
+            if (is_array($tree)) {
+                $tree = $this->createTreeObject($tree, $options);
+            }
+
+            if (isset($this->_renderers[$renderer])) {
+                $renderer = $this->_renderers[$renderer];
+            } else {
+                $name = $renderer;
+                switch ($name) {
+                    case 'mix':
+                        $renderer = new Renderer\MixHtmlRenderer($this);
+                        break;
+                    default:
+                        $renderer = new Renderer\ThreadHtmlRenderer($this);
+                }
+                $this->_renderers[$name] = $renderer;
+            }
+            $renderer->setOptions($options);
+            return $renderer->render($tree);
+        }
+
+        /**
+         * helper function for creating object thread tree
+         *
+         * @param array $entrySub
+         * @param array $options
+         * @return Posting
+         */
+        public function createTreeObject(array $entrySub, array $options = []) {
+            $tree = $this->dic->newInstance(
+                '\Saito\Posting\Posting',
+                ['rawData' => $entrySub, 'options' => $options]
+            );
+            return $tree;
+        }
+
+    }

app/View/Helper/AdminHelper.php

Spacing +5 added lines, -5 removed lines

@@ -78,7 +78,7 @@ 
 			$_nErrorsToShow = 20;
 			$errors = preg_split('/(?=^\d{4}-\d{2}-\d{2})/m', $log, -1, PREG_SPLIT_NO_EMPTY);
 			if (empty($errors)) {
-				return '<p>' . __('No log file found.') . '</p>';
+				return '<p>'.__('No log file found.').'</p>';
 			}
 
 			$out = '';
@@ -89,9 +89,9 @@ 
 				$_i = self::tagId();
 				$_details = $e->details();
 				if (!empty($_details)) {
-					$out .= '<button class="btn btn-mini" style="float:right;" onclick="$(\'#' . $_i . '\').toggle(); return false;">' . __('Details') . '</button>' . "\n";
+					$out .= '<button class="btn btn-mini" style="float:right;" onclick="$(\'#'.$_i.'\').toggle(); return false;">'.__('Details').'</button>'."\n";
 				}
-				$out .= '<pre style="font-size: 10px;">' . "\n";
+				$out .= '<pre style="font-size: 10px;">'."\n";
 				$out .= '<div class="row"><div class="span2" style="text-align: right">';
 				$out .= $this->TimeH->formatTime($e->time(), 'eng');
 
@@ -99,12 +99,12 @@ 
 				$out .= '<div class="span7">';
 				$out .= $e->message();
 				if (!empty($_details)) {
-					$out .= '<span id="' . $_i . '" style="display: none;">' . "\n";
+					$out .= '<span id="'.$_i.'" style="display: none;">'."\n";
 					$out .= $_details;
 					$out .= '</span>';
 				}
 				$out .= '</div></div>';
-				$out .= '</pre>' . "\n";
+				$out .= '</pre>'."\n";
 				if ($k++ > $_nErrorsToShow) {
 					break;
 				}

Indentation +123 added lines, -123 removed lines

@@ -1,125 +1,125 @@ 
 <?php
 
-	App::uses('AppHelper', 'View/Helper');
-
-	class CakeLogEntry {
-
-		public function __construct($text) {
-			$lines = explode("\n", trim($text));
-			$_firstLine = array_shift($lines);
-			preg_match('/^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}) (.*?): (.*)/',
-				$_firstLine,
-				$matches);
-			$this->_time = $matches[1];
-			$this->_type = $matches[2];
-			$this->_message = trim($matches[3]);
-			if (empty($this->_message)) {
-				$this->_message = array_shift($lines);
-			}
-			$this->_detail = implode($lines, '<br>');
-		}
-
-		public function time() {
-			return $this->_time;
-		}
-
-		public function type() {
-			return $this->_type;
-		}
-
-		public function message() {
-			return $this->_message;
-		}
-
-		public function details() {
-			return $this->_detail;
-		}
-
-	}
-
-	class AdminHelper extends AppHelper {
-
-		public $helpers = [
-			'SaitoHelp',
-			'Html',
-			'TimeH'
-		];
-
-		public function help($id) {
-			return $this->SaitoHelp->icon($id, ['style' => 'float: right;']);
-		}
-
-		protected function _cBadge($engine) {
-			switch ($engine) {
-				case 'File':
-					$badge = 'warning';
-					break;
-				case 'Apc':
-					$badge = 'success';
-					break;
-				default:
-					$badge = 'info';
-			}
-			return $badge;
-		}
-
-		public function badge($text, $type = null) {
-			if (is_callable([$this, $type])) {
-				$badge = $this->$type($text);
-			} elseif (is_string(($type))) {
-				$badge = $type;
-			} else {
-				$badge = 'info';
-			}
-			return $this->Html->tag('span', $text, ['class' => "label label-$badge"]);
-		}
-
-		public function formatCakeLog($log) {
-			$_nErrorsToShow = 20;
-			$errors = preg_split('/(?=^\d{4}-\d{2}-\d{2})/m', $log, -1, PREG_SPLIT_NO_EMPTY);
-			if (empty($errors)) {
-				return '<p>' . __('No log file found.') . '</p>';
-			}
-
-			$out = '';
-			$k = 0;
-			$errors = array_reverse($errors);
-			foreach ($errors as $error) {
-				$e = new CakeLogEntry($error);
-				$_i = self::tagId();
-				$_details = $e->details();
-				if (!empty($_details)) {
-					$out .= '<button class="btn btn-mini" style="float:right;" onclick="$(\'#' . $_i . '\').toggle(); return false;">' . __('Details') . '</button>' . "\n";
-				}
-				$out .= '<pre style="font-size: 10px;">' . "\n";
-				$out .= '<div class="row"><div class="span2" style="text-align: right">';
-				$out .= $this->TimeH->formatTime($e->time(), 'eng');
-
-				$out .= '</div>';
-				$out .= '<div class="span7">';
-				$out .= $e->message();
-				if (!empty($_details)) {
-					$out .= '<span id="' . $_i . '" style="display: none;">' . "\n";
-					$out .= $_details;
-					$out .= '</span>';
-				}
-				$out .= '</div></div>';
-				$out .= '</pre>' . "\n";
-				if ($k++ > $_nErrorsToShow) {
-					break;
-				}
-
-			}
-			return $out;
-		}
-
-		public function jqueryTable($selector, $sort) {
-			$this->Html->script(
-				'lib/datatables/media/js/jquery.dataTables.js',
-				['inline' => false]
-			);
-
-			$script = <<<EOF
+    App::uses('AppHelper', 'View/Helper');
+
+    class CakeLogEntry {
+
+        public function __construct($text) {
+            $lines = explode("\n", trim($text));
+            $_firstLine = array_shift($lines);
+            preg_match('/^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}) (.*?): (.*)/',
+                $_firstLine,
+                $matches);
+            $this->_time = $matches[1];
+            $this->_type = $matches[2];
+            $this->_message = trim($matches[3]);
+            if (empty($this->_message)) {
+                $this->_message = array_shift($lines);
+            }
+            $this->_detail = implode($lines, '<br>');
+        }
+
+        public function time() {
+            return $this->_time;
+        }
+
+        public function type() {
+            return $this->_type;
+        }
+
+        public function message() {
+            return $this->_message;
+        }
+
+        public function details() {
+            return $this->_detail;
+        }
+
+    }
+
+    class AdminHelper extends AppHelper {
+
+        public $helpers = [
+            'SaitoHelp',
+            'Html',
+            'TimeH'
+        ];
+
+        public function help($id) {
+            return $this->SaitoHelp->icon($id, ['style' => 'float: right;']);
+        }
+
+        protected function _cBadge($engine) {
+            switch ($engine) {
+                case 'File':
+                    $badge = 'warning';
+                    break;
+                case 'Apc':
+                    $badge = 'success';
+                    break;
+                default:
+                    $badge = 'info';
+            }
+            return $badge;
+        }
+
+        public function badge($text, $type = null) {
+            if (is_callable([$this, $type])) {
+                $badge = $this->$type($text);
+            } elseif (is_string(($type))) {
+                $badge = $type;
+            } else {
+                $badge = 'info';
+            }
+            return $this->Html->tag('span', $text, ['class' => "label label-$badge"]);
+        }
+
+        public function formatCakeLog($log) {
+            $_nErrorsToShow = 20;
+            $errors = preg_split('/(?=^\d{4}-\d{2}-\d{2})/m', $log, -1, PREG_SPLIT_NO_EMPTY);
+            if (empty($errors)) {
+                return '<p>' . __('No log file found.') . '</p>';
+            }
+
+            $out = '';
+            $k = 0;
+            $errors = array_reverse($errors);
+            foreach ($errors as $error) {
+                $e = new CakeLogEntry($error);
+                $_i = self::tagId();
+                $_details = $e->details();
+                if (!empty($_details)) {
+                    $out .= '<button class="btn btn-mini" style="float:right;" onclick="$(\'#' . $_i . '\').toggle(); return false;">' . __('Details') . '</button>' . "\n";
+                }
+                $out .= '<pre style="font-size: 10px;">' . "\n";
+                $out .= '<div class="row"><div class="span2" style="text-align: right">';
+                $out .= $this->TimeH->formatTime($e->time(), 'eng');
+
+                $out .= '</div>';
+                $out .= '<div class="span7">';
+                $out .= $e->message();
+                if (!empty($_details)) {
+                    $out .= '<span id="' . $_i . '" style="display: none;">' . "\n";
+                    $out .= $_details;
+                    $out .= '</span>';
+                }
+                $out .= '</div></div>';
+                $out .= '</pre>' . "\n";
+                if ($k++ > $_nErrorsToShow) {
+                    break;
+                }
+
+            }
+            return $out;
+        }
+
+        public function jqueryTable($selector, $sort) {
+            $this->Html->script(
+                'lib/datatables/media/js/jquery.dataTables.js',
+                ['inline' => false]
+            );
+
+            $script = <<<EOF
 $(function() {
 	$.extend( $.fn.dataTableExt.oStdClasses, {
 			"sWrapper": "dataTables_wrapper form-inline"
@@ -132,7 +132,7 @@ 
 });
 EOF;
 
-			$this->Html->scriptBlock($script, ['inline' => false]);
-		}
+            $this->Html->scriptBlock($script, ['inline' => false]);
+        }
 
-	}
+    }

app/View/Helper/MapHelper.php

Spacing +7 added lines, -7 removed lines

@@ -17,7 +17,7 @@ 
 		protected $_assetsIncluded = false;
 
 		public function beforeRender($viewFile) {
-			$this->_apiEnabled = (bool)Configure::read('Saito.Settings.map_enabled');
+			$this->_apiEnabled = (bool) Configure::read('Saito.Settings.map_enabled');
 			if (!$this->_apiEnabled) {
 				return;
 			}
@@ -36,8 +36,8 @@ 
 			$this->Html->script([
 							'../dist/leaflet/leaflet.js',
 							'../dist/leaflet/leaflet.markercluster.js',
-							'//open.mapquestapi.com/sdk/leaflet/v1.0/mq-map.js?key=' . $this->_apiKey,
-							'//open.mapquestapi.com/sdk/leaflet/v1.0/mq-geocoding.js?key=' . $this->_apiKey
+							'//open.mapquestapi.com/sdk/leaflet/v1.0/mq-map.js?key='.$this->_apiKey,
+							'//open.mapquestapi.com/sdk/leaflet/v1.0/mq-geocoding.js?key='.$this->_apiKey
 					],
 					['inline' => false, 'block' => 'script-head']);
 			$this->_assetsIncluded = true;
@@ -76,13 +76,13 @@ 
 				// @performance
 				// filter out every field except the place fields
 				$users[$key] = [
-						'id' => (int)$user['User']['id'],
+						'id' => (int) $user['User']['id'],
 						'name' => $user['User']['username'],
-						'lat' => (float)$user['User']['user_place_lat'],
-						'lng' => (float)$user['User']['user_place_lng']
+						'lat' => (float) $user['User']['user_place_lat'],
+						'lng' => (float) $user['User']['user_place_lng']
 				];
 				if ($edit) {
-					$users[$key]['zoom'] = (int)$user['User']['user_place_zoom'];
+					$users[$key]['zoom'] = (int) $user['User']['user_place_zoom'];
 				} else {
 					// add simple jitter
 					$rand = 0; //  rand(-9,9) / pow(10, $this->_precision + 1);

Indentation +91 added lines, -91 removed lines

@@ -1,106 +1,106 @@
 <?php
 
-	App::uses('AppHelper', 'View/Helper');
+    App::uses('AppHelper', 'View/Helper');
 
-	class MapHelper extends AppHelper {
+    class MapHelper extends AppHelper {
 
-		public $helpers = [
-				'Html'
-		];
+        public $helpers = [
+                'Html'
+        ];
 
-		protected $_precision = 2;
+        protected $_precision = 2;
 
-		protected $_apiEnabled;
+        protected $_apiEnabled;
 
-		protected $_apiKey;
+        protected $_apiKey;
 
-		protected $_assetsIncluded = false;
+        protected $_assetsIncluded = false;
 
-		public function beforeRender($viewFile) {
-			$this->_apiEnabled = (bool)Configure::read('Saito.Settings.map_enabled');
-			if (!$this->_apiEnabled) {
-				return;
-			}
-			$this->_apiKey = Configure::read('Saito.Settings.map_api_key');
-		}
+        public function beforeRender($viewFile) {
+            $this->_apiEnabled = (bool)Configure::read('Saito.Settings.map_enabled');
+            if (!$this->_apiEnabled) {
+                return;
+            }
+            $this->_apiKey = Configure::read('Saito.Settings.map_api_key');
+        }
 
-		protected function _includeAssets() {
-			if (!$this->_apiEnabled || $this->_assetsIncluded === true) {
-				return;
-			}
-			$this->Html->css([
-							'../dist/leaflet/leaflet.css',
-							'../dist/leaflet/MarkerCluster.Default.css'
-					],
-					['inline' => false]);
-			$this->Html->script([
-							'../dist/leaflet/leaflet.js',
-							'../dist/leaflet/leaflet.markercluster.js',
-							'//open.mapquestapi.com/sdk/leaflet/v1.0/mq-map.js?key=' . $this->_apiKey,
-							'//open.mapquestapi.com/sdk/leaflet/v1.0/mq-geocoding.js?key=' . $this->_apiKey
-					],
-					['inline' => false, 'block' => 'script-head']);
-			$this->_assetsIncluded = true;
-		}
+        protected function _includeAssets() {
+            if (!$this->_apiEnabled || $this->_assetsIncluded === true) {
+                return;
+            }
+            $this->Html->css([
+                            '../dist/leaflet/leaflet.css',
+                            '../dist/leaflet/MarkerCluster.Default.css'
+                    ],
+                    ['inline' => false]);
+            $this->Html->script([
+                            '../dist/leaflet/leaflet.js',
+                            '../dist/leaflet/leaflet.markercluster.js',
+                            '//open.mapquestapi.com/sdk/leaflet/v1.0/mq-map.js?key=' . $this->_apiKey,
+                            '//open.mapquestapi.com/sdk/leaflet/v1.0/mq-geocoding.js?key=' . $this->_apiKey
+                    ],
+                    ['inline' => false, 'block' => 'script-head']);
+            $this->_assetsIncluded = true;
+        }
 
-		public function map(array $users = [], array $options = []) {
-			$this->_includeAssets();
-			// generate options
-			$defaults = [
-					'fields' => [],
-					'type' => 'world',
-					'div' => [
-							'class' => 'saito-usermap'
-					]
-			];
-			foreach ($defaults as $key => $default) {
-				if (isset($options[$key])) {
-					if (is_array($options[$key])) {
-						$options[$key] = am($default, $options[$key]);
-					}
-				} else {
-					$options[$key] = $default;
-				}
-			}
+        public function map(array $users = [], array $options = []) {
+            $this->_includeAssets();
+            // generate options
+            $defaults = [
+                    'fields' => [],
+                    'type' => 'world',
+                    'div' => [
+                            'class' => 'saito-usermap'
+                    ]
+            ];
+            foreach ($defaults as $key => $default) {
+                if (isset($options[$key])) {
+                    if (is_array($options[$key])) {
+                        $options[$key] = am($default, $options[$key]);
+                    }
+                } else {
+                    $options[$key] = $default;
+                }
+            }
 
-			// show single user
-			if (isset($users['User'])) {
-				if ($options['type'] === 'world') {
-					$options['type'] = 'single';
-				}
-				$users = [$users];
-			}
-			$edit = $options['type'] === 'edit';
+            // show single user
+            if (isset($users['User'])) {
+                if ($options['type'] === 'world') {
+                    $options['type'] = 'single';
+                }
+                $users = [$users];
+            }
+            $edit = $options['type'] === 'edit';
 
-			foreach ($users as $key => $user) {
-				// @performance
-				// filter out every field except the place fields
-				$users[$key] = [
-						'id' => (int)$user['User']['id'],
-						'name' => $user['User']['username'],
-						'lat' => (float)$user['User']['user_place_lat'],
-						'lng' => (float)$user['User']['user_place_lng']
-				];
-				if ($edit) {
-					$users[$key]['zoom'] = (int)$user['User']['user_place_zoom'];
-				} else {
-					// add simple jitter
-					$rand = 0; //  rand(-9,9) / pow(10, $this->_precision + 1);
-					$users[$key]['lat'] = round($users[$key]['lat'],
-									$this->_precision) + $rand;
-					$users[$key]['lng'] = round($users[$key]['lng'],
-									$this->_precision) + $rand;
-				}
-			}
+            foreach ($users as $key => $user) {
+                // @performance
+                // filter out every field except the place fields
+                $users[$key] = [
+                        'id' => (int)$user['User']['id'],
+                        'name' => $user['User']['username'],
+                        'lat' => (float)$user['User']['user_place_lat'],
+                        'lng' => (float)$user['User']['user_place_lng']
+                ];
+                if ($edit) {
+                    $users[$key]['zoom'] = (int)$user['User']['user_place_zoom'];
+                } else {
+                    // add simple jitter
+                    $rand = 0; //  rand(-9,9) / pow(10, $this->_precision + 1);
+                    $users[$key]['lat'] = round($users[$key]['lat'],
+                                    $this->_precision) + $rand;
+                    $users[$key]['lng'] = round($users[$key]['lng'],
+                                    $this->_precision) + $rand;
+                }
+            }
 
-			$options['div'] += [
-					'data-users' => json_encode($users),
-					'data-params' => json_encode([
-							'type' => $options['type'],
-							'fields' => $options['fields']
-					])
-			];
-			return $this->Html->div(null, '', $options['div']);
-		}
+            $options['div'] += [
+                    'data-users' => json_encode($users),
+                    'data-params' => json_encode([
+                            'type' => $options['type'],
+                            'fields' => $options['fields']
+                    ])
+            ];
+            return $this->Html->div(null, '', $options['div']);
+        }
 
-	}
+    }

app/View/Helper/JsDataHelper.php

Spacing +7 added lines, -7 removed lines

@@ -20,17 +20,17 @@ 
 					'version' => Configure::read('Saito.v'),
 					'settings' => [
 						'autoPageReload' => (isset($View->viewVars['autoPageReload']) ? $View->viewVars['autoPageReload'] : 0),
-						'embedly_enabled' => (bool)Configure::read('Saito.Settings.embedly_enabled'),
-						'editPeriod' => (int)Configure::read('Saito.Settings.edit_period'),
+						'embedly_enabled' => (bool) Configure::read('Saito.Settings.embedly_enabled'),
+						'editPeriod' => (int) Configure::read('Saito.Settings.edit_period'),
 						'notificationIcon' => $this->assetUrl(
 									'html5-notification-icon.png',
 									[
 										'pathPrefix' => Configure::read('App.imageBaseUrl'),
 										'fullBase' => true
 									]),
-						'subject_maxlength' => (int)Configure::read('Saito.Settings.subject_maxlength'),
-						'upload_max_img_size' => (int)Configure::read('Saito.Settings.upload_max_img_size') * 1024,
-						'upload_max_number_of_uploads' => (int)Configure::read('Saito.Settings.upload_max_number_of_uploads'),
+						'subject_maxlength' => (int) Configure::read('Saito.Settings.subject_maxlength'),
+						'upload_max_img_size' => (int) Configure::read('Saito.Settings.upload_max_img_size') * 1024,
+						'upload_max_number_of_uploads' => (int) Configure::read('Saito.Settings.upload_max_number_of_uploads'),
 						'webroot' => $View->request->webroot
 					]
 				],
@@ -41,7 +41,7 @@ 
 					'isPreview' => $View->request->isPreview()
 				],
 				'currentUser' => [
-					'id' => (int)$View->viewVars['CurrentUser']['id'],
+					'id' => (int) $View->viewVars['CurrentUser']['id'],
 					'username' => $View->viewVars['CurrentUser']['username'],
 					'user_show_inline' => $View->viewVars['CurrentUser']['inline_view_on_click'] || false,
 					'user_show_thread_collapsed' => $View->viewVars['CurrentUser']['user_show_thread_collapsed'] || false
@@ -52,7 +52,7 @@ 
 					'afterViewInit' => []
 				]
 			];
-			$out = 'var SaitoApp = ' . json_encode($js);
+			$out = 'var SaitoApp = '.json_encode($js);
 			$out .= '; SaitoApp.timeAppStart = new Date().getTime();';
 			return $out;
 		}

Indentation +60 added lines, -60 removed lines

@@ -1,69 +1,69 @@
 <?php
 
-	use Saito\JsData;
+    use Saito\JsData;
 
-	App::uses('AppHelper', 'View/Helper');
+    App::uses('AppHelper', 'View/Helper');
 
-	class JsDataHelper extends AppHelper {
+    class JsDataHelper extends AppHelper {
 
-		protected $_JsData;
+        protected $_JsData;
 
-		public function __construct(View $view, $settings = array()) {
-			$this->_JsData = JsData::getInstance();
-			parent::__construct($view, $settings);
-		}
+        public function __construct(View $view, $settings = array()) {
+            $this->_JsData = JsData::getInstance();
+            parent::__construct($view, $settings);
+        }
 
-		public function getAppJs(View $View) {
-			$js = $this->_JsData->getJs();
-			$js += [
-				'app' => [
-					'version' => Configure::read('Saito.v'),
-					'settings' => [
-						'autoPageReload' => (isset($View->viewVars['autoPageReload']) ? $View->viewVars['autoPageReload'] : 0),
-						'embedly_enabled' => (bool)Configure::read('Saito.Settings.embedly_enabled'),
-						'editPeriod' => (int)Configure::read('Saito.Settings.edit_period'),
-						'notificationIcon' => $this->assetUrl(
-									'html5-notification-icon.png',
-									[
-										'pathPrefix' => Configure::read('App.imageBaseUrl'),
-										'fullBase' => true
-									]),
-						'subject_maxlength' => (int)Configure::read('Saito.Settings.subject_maxlength'),
-						'upload_max_img_size' => (int)Configure::read('Saito.Settings.upload_max_img_size') * 1024,
-						'upload_max_number_of_uploads' => (int)Configure::read('Saito.Settings.upload_max_number_of_uploads'),
-						'webroot' => $View->request->webroot
-					]
-				],
-				'request' => [
-					'action' => $View->request->action,
-					'controller' => $View->request->controller,
-					'isMobile' => $View->request->isMobile(),
-					'isPreview' => $View->request->isPreview()
-				],
-				'currentUser' => [
-					'id' => (int)$View->viewVars['CurrentUser']['id'],
-					'username' => $View->viewVars['CurrentUser']['username'],
-					'user_show_inline' => $View->viewVars['CurrentUser']['inline_view_on_click'] || false,
-					'user_show_thread_collapsed' => $View->viewVars['CurrentUser']['user_show_thread_collapsed'] || false
-				],
-				'callbacks' => [
-					'beforeAppInit' => [],
-					'afterAppInit' => [],
-					'afterViewInit' => []
-				]
-			];
-			$out = 'var SaitoApp = ' . json_encode($js);
-			$out .= '; SaitoApp.timeAppStart = new Date().getTime();';
-			return $out;
-		}
+        public function getAppJs(View $View) {
+            $js = $this->_JsData->getJs();
+            $js += [
+                'app' => [
+                    'version' => Configure::read('Saito.v'),
+                    'settings' => [
+                        'autoPageReload' => (isset($View->viewVars['autoPageReload']) ? $View->viewVars['autoPageReload'] : 0),
+                        'embedly_enabled' => (bool)Configure::read('Saito.Settings.embedly_enabled'),
+                        'editPeriod' => (int)Configure::read('Saito.Settings.edit_period'),
+                        'notificationIcon' => $this->assetUrl(
+                                    'html5-notification-icon.png',
+                                    [
+                                        'pathPrefix' => Configure::read('App.imageBaseUrl'),
+                                        'fullBase' => true
+                                    ]),
+                        'subject_maxlength' => (int)Configure::read('Saito.Settings.subject_maxlength'),
+                        'upload_max_img_size' => (int)Configure::read('Saito.Settings.upload_max_img_size') * 1024,
+                        'upload_max_number_of_uploads' => (int)Configure::read('Saito.Settings.upload_max_number_of_uploads'),
+                        'webroot' => $View->request->webroot
+                    ]
+                ],
+                'request' => [
+                    'action' => $View->request->action,
+                    'controller' => $View->request->controller,
+                    'isMobile' => $View->request->isMobile(),
+                    'isPreview' => $View->request->isPreview()
+                ],
+                'currentUser' => [
+                    'id' => (int)$View->viewVars['CurrentUser']['id'],
+                    'username' => $View->viewVars['CurrentUser']['username'],
+                    'user_show_inline' => $View->viewVars['CurrentUser']['inline_view_on_click'] || false,
+                    'user_show_thread_collapsed' => $View->viewVars['CurrentUser']['user_show_thread_collapsed'] || false
+                ],
+                'callbacks' => [
+                    'beforeAppInit' => [],
+                    'afterAppInit' => [],
+                    'afterViewInit' => []
+                ]
+            ];
+            $out = 'var SaitoApp = ' . json_encode($js);
+            $out .= '; SaitoApp.timeAppStart = new Date().getTime();';
+            return $out;
+        }
 
-		public function __call($method, $params) {
-			$proxy = array($this->_JsData, $method);
-			if (is_callable($proxy)) {
-				return call_user_func_array($proxy, $params);
-			} else {
-				return parent::__call($method, $params);
-			}
-		}
+        public function __call($method, $params) {
+            $proxy = array($this->_JsData, $method);
+            if (is_callable($proxy)) {
+                return call_user_func_array($proxy, $params);
+            } else {
+                return parent::__call($method, $params);
+            }
+        }
 
-	}
+    }

app/View/Helper/SettingHelper.php

Spacing +8 added lines, -8 removed lines

@@ -21,11 +21,11 @@ 
 			$anchors = '';
 			foreach ($settingNames as $name) {
 				$out .= $this->tableRow($name, $Settings);
-				$anchors .= '<a name="' . $name . '"></a>';
+				$anchors .= '<a name="'.$name.'"></a>';
 			}
 			$key = $this->addHeader($options['nav-title']);
-			$out = '<table class="table table-striped table-bordered table-condensed">' .
-					$out . '</table>';
+			$out = '<table class="table table-striped table-bordered table-condensed">'.
+					$out.'</table>';
 
 			$sh = '';
 			if (!empty($options['sh'])) {
@@ -33,10 +33,10 @@ 
 					['style' => 'float: right; margin: 1em']);
 			}
 
-			$out = '<div id="navHeaderAnchor' . $key . '"></div>' .
-					$sh .
-					$anchors .
-					'<h2 >' . $tableName . '</h2>' .
+			$out = '<div id="navHeaderAnchor'.$key.'"></div>'.
+					$sh.
+					$anchors.
+					'<h2 >'.$tableName.'</h2>'.
 					$out;
 			return $out;
 		}
@@ -56,7 +56,7 @@ 
 				[
 					__d('nondynamic', $name),
 					$Settings[$name],
-					"<p>" . __d('nondynamic', $name . '_exp') . "</p>",
+					"<p>".__d('nondynamic', $name.'_exp')."</p>",
 					$this->Html->link(
 						__('edit'),
 						['controller' => 'settings', 'action' => 'edit', $name],

Indentation +66 added lines, -66 removed lines

@@ -1,80 +1,80 @@
 <?php
 
-	App::uses('AppHelper', 'View/Helper');
+    App::uses('AppHelper', 'View/Helper');
 
-	class SettingHelper extends AppHelper {
+    class SettingHelper extends AppHelper {
 
-		protected $_headers = [];
+        protected $_headers = [];
 
-		public $helpers = [
-			'Html',
-			'SaitoHelp'
-		];
+        public $helpers = [
+            'Html',
+            'SaitoHelp'
+        ];
 
-		public function table($tableName, array $settingNames, $Settings, array $options = []) {
-			$defaults = [
-				'nav-title' => $tableName
-			];
-			$options += $defaults;
+        public function table($tableName, array $settingNames, $Settings, array $options = []) {
+            $defaults = [
+                'nav-title' => $tableName
+            ];
+            $options += $defaults;
 
-			$out = $this->tableHeaders();
-			$anchors = '';
-			foreach ($settingNames as $name) {
-				$out .= $this->tableRow($name, $Settings);
-				$anchors .= '<a name="' . $name . '"></a>';
-			}
-			$key = $this->addHeader($options['nav-title']);
-			$out = '<table class="table table-striped table-bordered table-condensed">' .
-					$out . '</table>';
+            $out = $this->tableHeaders();
+            $anchors = '';
+            foreach ($settingNames as $name) {
+                $out .= $this->tableRow($name, $Settings);
+                $anchors .= '<a name="' . $name . '"></a>';
+            }
+            $key = $this->addHeader($options['nav-title']);
+            $out = '<table class="table table-striped table-bordered table-condensed">' .
+                    $out . '</table>';
 
-			$sh = '';
-			if (!empty($options['sh'])) {
-				$sh = $this->SaitoHelp->icon($options['sh'],
-					['style' => 'float: right; margin: 1em']);
-			}
+            $sh = '';
+            if (!empty($options['sh'])) {
+                $sh = $this->SaitoHelp->icon($options['sh'],
+                    ['style' => 'float: right; margin: 1em']);
+            }
 
-			$out = '<div id="navHeaderAnchor' . $key . '"></div>' .
-					$sh .
-					$anchors .
-					'<h2 >' . $tableName . '</h2>' .
-					$out;
-			return $out;
-		}
+            $out = '<div id="navHeaderAnchor' . $key . '"></div>' .
+                    $sh .
+                    $anchors .
+                    '<h2 >' . $tableName . '</h2>' .
+                    $out;
+            return $out;
+        }
 
-		public function addHeader($header) {
-			$id = count($this->_headers) + 1;
-			$this->_headers[$id] = $header;
-			return $id;
-		}
+        public function addHeader($header) {
+            $id = count($this->_headers) + 1;
+            $this->_headers[$id] = $header;
+            return $id;
+        }
 
-		public function getHeaders() {
-			return $this->_headers;
-		}
+        public function getHeaders() {
+            return $this->_headers;
+        }
 
-		public function tableRow($name, $Settings) {
-			return $this->Html->tableCells(
-				[
-					__d('nondynamic', $name),
-					$Settings[$name],
-					"<p>" . __d('nondynamic', $name . '_exp') . "</p>",
-					$this->Html->link(
-						__('edit'),
-						['controller' => 'settings', 'action' => 'edit', $name],
-						['class' => 'btn']
-					)
-				]
-			);
-		}
+        public function tableRow($name, $Settings) {
+            return $this->Html->tableCells(
+                [
+                    __d('nondynamic', $name),
+                    $Settings[$name],
+                    "<p>" . __d('nondynamic', $name . '_exp') . "</p>",
+                    $this->Html->link(
+                        __('edit'),
+                        ['controller' => 'settings', 'action' => 'edit', $name],
+                        ['class' => 'btn']
+                    )
+                ]
+            );
+        }
 
-		public function tableHeaders() {
-			return $this->Html->tableHeaders(
-				[
-					__('Key'),
-					__('Value'),
-					__('Explanation'),
-					__('Actions')
-				]
-			);
-		}
+        public function tableHeaders() {
+            return $this->Html->tableHeaders(
+                [
+                    __('Key'),
+                    __('Value'),
+                    __('Explanation'),
+                    __('Actions')
+                ]
+            );
+        }
 
-	}
+    }

app/View/Helper/FarbtasticHelper.php

Spacing +6 added lines, -6 removed lines

@@ -17,11 +17,11 @@ 
  *    @version    2010-07-18
  * 		@td make plugin, fork from http://bakery.cakephp.org/articles/view/helper-for-farbtastic-jquery-color-picker to githup
  */
-class FarbtasticHelper extends Helper  {
+class FarbtasticHelper extends Helper {
 
     public $helpers = ['Form', 'Html'];
 
-		protected $output_files =	true;
+		protected $output_files = true;
 
 
     /**
@@ -32,7 +32,7 @@ 
     *    Adapted from April Hodge Silver's "Simple Colorpicker" input function
     *    http://bakery.cakephp.org/articles/view/simple-colorpicker
     */
-    function input($name, $label='') {
+    function input($name, $label = '') {
 
         $icon_file = '../../js/farbtastic/color.png'; // update to wherever your icon is.
 
@@ -41,7 +41,7 @@ 
             $label = Inflector::Humanize($fieldname);
         }
 
-        if(isset($this->request->data[$model][$fieldname])) {
+        if (isset($this->request->data[$model][$fieldname])) {
             $color_value = str_replace("#", "", $this->request->data[$model][$fieldname]); // expects an RGB string, strips any incoming '#' character
         }
         else {
@@ -51,7 +51,7 @@ 
         $str = '';
         $str .= '<div class="input text colorpicker">';
 				$str .= $this->Form->input($fieldname, [
-					'id' => $model . Inflector::Camelize($fieldname),
+					'id' => $model.Inflector::Camelize($fieldname),
 					'class' => 'farbtastic-input',
 					'maxlength' => 7,
 					'label' => $label,
@@ -80,7 +80,7 @@ 
     *    Farbtastic-ize the input, make the button show/hide the color picker div
     */
     function readyJS($name) {
-        list($model,$fieldname) = explode('.',$name);
+        list($model, $fieldname) = explode('.', $name);
         $str = '$(document).ready(function() { ';
         $str .= ' $("#farbtastic-picker-'.Inflector::Camelize($fieldname).'").farbtastic("#'.$model.Inflector::Camelize($fieldname).'"); ';
         $str .= ' $("#farbtastic-picker-icon-'.Inflector::Camelize($fieldname).'").click( function() { $("#farbtastic-picker-'.Inflector::Camelize($fieldname).'").toggle("slow"); }); ';

Braces +1 added lines, -2 removed lines

@@ -43,8 +43,7 @@
 
         if(isset($this->request->data[$model][$fieldname])) {
             $color_value = str_replace("#", "", $this->request->data[$model][$fieldname]); // expects an RGB string, strips any incoming '#' character
-        }
-        else {
+        } else {
             $color_value = "000000"; // black
         }
 

Indentation +43 added lines, -43 removed lines

@@ -1,37 +1,37 @@ 
 <?php
-	// @codingStandardsIgnoreFile
-	App::uses('AppHelper', 'View/Helper');
+    // @codingStandardsIgnoreFile
+    App::uses('AppHelper', 'View/Helper');
 /**
- *    Farbtastic helper
- *    @author      	Curtis Gibby
- *    @author     	Sebastian Siedentopf
- *    @desc        This helper does everything you need related to Farbtastic within CakePHP
- *
- *                Like Farbtastic, requires jQuery to function properly.
- *                jQuery: http://jquery.com
- *
- *                Also requires a Color Wheel icon (color.png in this example)
- *                like the one from Mark James' Silk set
- *                http://www.iconfinder.net/icondetails/5185/16/
- *
- *    @version    2010-07-18
- * 		@td make plugin, fork from http://bakery.cakephp.org/articles/view/helper-for-farbtastic-jquery-color-picker to githup
- */
+     *    Farbtastic helper
+     *    @author      	Curtis Gibby
+     *    @author     	Sebastian Siedentopf
+     *    @desc        This helper does everything you need related to Farbtastic within CakePHP
+     *
+     *                Like Farbtastic, requires jQuery to function properly.
+     *                jQuery: http://jquery.com
+     *
+     *                Also requires a Color Wheel icon (color.png in this example)
+     *                like the one from Mark James' Silk set
+     *                http://www.iconfinder.net/icondetails/5185/16/
+     *
+     *    @version    2010-07-18
+     * 		@td make plugin, fork from http://bakery.cakephp.org/articles/view/helper-for-farbtastic-jquery-color-picker to githup
+     */
 class FarbtasticHelper extends Helper  {
 
     public $helpers = ['Form', 'Html'];
 
-		protected $output_files =	true;
+        protected $output_files =	true;
 
 
     /**
-    *    Generate a form input and related div and icon
-    *
-    *    may need to customize $icon_file (relative to webroot)
-    *
-    *    Adapted from April Hodge Silver's "Simple Colorpicker" input function
-    *    http://bakery.cakephp.org/articles/view/simple-colorpicker
-    */
+     *    Generate a form input and related div and icon
+     *
+     *    may need to customize $icon_file (relative to webroot)
+     *
+     *    Adapted from April Hodge Silver's "Simple Colorpicker" input function
+     *    http://bakery.cakephp.org/articles/view/simple-colorpicker
+     */
     function input($name, $label='') {
 
         $icon_file = '../../js/farbtastic/color.png'; // update to wherever your icon is.
@@ -50,25 +50,25 @@ 
 
         $str = '';
         $str .= '<div class="input text colorpicker">';
-				$str .= $this->Form->input($fieldname, [
-					'id' => $model . Inflector::Camelize($fieldname),
-					'class' => 'farbtastic-input',
-					'maxlength' => 7,
-					'label' => $label,
-					'value' => "#$color_value"
-				]);
+                $str .= $this->Form->input($fieldname, [
+                    'id' => $model . Inflector::Camelize($fieldname),
+                    'class' => 'farbtastic-input',
+                    'maxlength' => 7,
+                    'label' => $label,
+                    'value' => "#$color_value"
+                ]);
         $str .= '<img id="farbtastic-picker-icon-'.Inflector::Camelize($fieldname).'" src="'.$icon_file.'" alt="Color Picker" title="Color Picker" class="farbtastic-picker-icon">';
         $str .= '<div style="display:none;" class="farbtastic-picker" id="farbtastic-picker-'.Inflector::Camelize($fieldname).'"></div>';
         $str .= '</div>';
 
-				$this->readyJS($name);
+                $this->readyJS($name);
 
-				### include css and js files
-				if ($this->output_files) {
-					$this->Html->script('farbtastic/farbtastic', array('inline' => false));
-					$this->Html->css('../js/farbtastic/farbtastic', null, array('inline' => false));
-				}
-				$this->output_files = false;
+                ### include css and js files
+                if ($this->output_files) {
+                    $this->Html->script('farbtastic/farbtastic', array('inline' => false));
+                    $this->Html->css('../js/farbtastic/farbtastic', null, array('inline' => false));
+                }
+                $this->output_files = false;
 
         return $str;
     }
@@ -76,15 +76,15 @@ 
 
 
     /**
-    *    Add the jQuery magic to the $(document).ready function
-    *    Farbtastic-ize the input, make the button show/hide the color picker div
-    */
+     *    Add the jQuery magic to the $(document).ready function
+     *    Farbtastic-ize the input, make the button show/hide the color picker div
+     */
     function readyJS($name) {
         list($model,$fieldname) = explode('.',$name);
         $str = '$(document).ready(function() { ';
         $str .= ' $("#farbtastic-picker-'.Inflector::Camelize($fieldname).'").farbtastic("#'.$model.Inflector::Camelize($fieldname).'"); ';
         $str .= ' $("#farbtastic-picker-icon-'.Inflector::Camelize($fieldname).'").click( function() { $("#farbtastic-picker-'.Inflector::Camelize($fieldname).'").toggle("slow"); }); ';
         $str .= '})';
-				$this->Html->scriptBlock($str, array('inline'=>false));
+                $this->Html->scriptBlock($str, array('inline'=>false));
     }
 }?>
\ No newline at end of file

app/View/Helper/ParserHelper.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
 			$defaults = ['return' => 'html', 'multimedia' => true, 'wrap' => true];
 			$options += $defaults;
 
-			$cacheId = md5(serialize($options) . $string);
+			$cacheId = md5(serialize($options).$string);
 			if (isset($this->_parserCache[$cacheId])) {
 				$html = $this->_parserCache[$cacheId];
 			} else {
@@ -68,7 +68,7 @@ 
 				$this->_parserCache[$cacheId] = $html;
 			}
 			if ($options['wrap']) {
-				$html = '<div class="richtext">' . $html . '</div>';
+				$html = '<div class="richtext">'.$html.'</div>';
 			}
 			Stopwatch::stop('ParseHelper::parse()');
 			return $html;

Indentation +94 added lines, -94 removed lines

@@ -1,96 +1,96 @@
 <?php
 
-	App::uses('AppHelper', 'View/Helper');
-
-	class ParserHelper extends AppHelper {
-
-		/**
-		 * @var array these Helpers are also used in the Parser
-		 */
-		public $helpers = [
-			'FileUpload.FileUpload',
-			'MailObfuscator.MailObfuscator',
-			'Geshi.Geshi',
-			'Embedly.Embedly',
-			'Html',
-			'Text',
-			//= usefull in Parsers
-			'Layout',
-			'SaitoHelp'
-		];
-
-		protected $_MarkupEditor;
-
-		/**
-		 * @var array parserCache for parsed markup
-		 *
-		 * Esp. useful for repeating signatures in long mix view threads
-		 */
-		protected $_parserCache = [];
-
-		protected $_Parser;
-
-		public $SmileyRenderer;
-
-		public function beforeRender($viewFile) {
-			if (isset($this->request) && $this->request->action === 'preview') {
-				$this->Geshi->showPlainTextButton = false;
-			}
-		}
-
-		public function citeText($string) {
-			return $this->_getParser()->citeText($string);
-		}
-
-		public function editorHelp() {
-			return $this->_getMarkupEditor()->getEditorHelp();
-		}
-
-		public function getButtonSet() {
-			return $this->_getMarkupEditor()->getMarkupSet();
-		}
-
-		public function parse($string, array $options = []) {
-			Stopwatch::start('ParseHelper::parse()');
-			if (empty($string) || $string === 'n/t') {
-				Stopwatch::stop('ParseHelper::parse()');
-				return $string;
-			}
-
-			$defaults = ['return' => 'html', 'multimedia' => true, 'wrap' => true];
-			$options += $defaults;
-
-			$cacheId = md5(serialize($options) . $string);
-			if (isset($this->_parserCache[$cacheId])) {
-				$html = $this->_parserCache[$cacheId];
-			} else {
-				$html = $this->_getParser()->parse($string, $options);
-				$this->_parserCache[$cacheId] = $html;
-			}
-			if ($options['wrap']) {
-				$html = '<div class="richtext">' . $html . '</div>';
-			}
-			Stopwatch::stop('ParseHelper::parse()');
-			return $html;
-		}
-
-		protected function _getMarkupEditor() {
-			if ($this->_MarkupEditor === null) {
-				$this->_MarkupEditor = \Saito\Plugin::getParserClassInstance('Editor', $this);
-			}
-			return $this->_MarkupEditor;
-		}
-
-		protected function _getParser() {
-			if ($this->_Parser === null) {
-				$settings = Configure::read('Saito.Settings') + $this->settings;
-
-				$this->SmileyRenderer = new \Saito\Smiley\Renderer($settings['smiliesData']);
-				$this->SmileyRenderer->setHelper($this);
-
-				$this->_Parser = \Saito\Plugin::getParserClassInstance('Parser', $this, $settings);
-			}
-			return $this->_Parser;
-		}
-
-	}
\ No newline at end of file
+    App::uses('AppHelper', 'View/Helper');
+
+    class ParserHelper extends AppHelper {
+
+        /**
+         * @var array these Helpers are also used in the Parser
+         */
+        public $helpers = [
+            'FileUpload.FileUpload',
+            'MailObfuscator.MailObfuscator',
+            'Geshi.Geshi',
+            'Embedly.Embedly',
+            'Html',
+            'Text',
+            //= usefull in Parsers
+            'Layout',
+            'SaitoHelp'
+        ];
+
+        protected $_MarkupEditor;
+
+        /**
+         * @var array parserCache for parsed markup
+         *
+         * Esp. useful for repeating signatures in long mix view threads
+         */
+        protected $_parserCache = [];
+
+        protected $_Parser;
+
+        public $SmileyRenderer;
+
+        public function beforeRender($viewFile) {
+            if (isset($this->request) && $this->request->action === 'preview') {
+                $this->Geshi->showPlainTextButton = false;
+            }
+        }
+
+        public function citeText($string) {
+            return $this->_getParser()->citeText($string);
+        }
+
+        public function editorHelp() {
+            return $this->_getMarkupEditor()->getEditorHelp();
+        }
+
+        public function getButtonSet() {
+            return $this->_getMarkupEditor()->getMarkupSet();
+        }
+
+        public function parse($string, array $options = []) {
+            Stopwatch::start('ParseHelper::parse()');
+            if (empty($string) || $string === 'n/t') {
+                Stopwatch::stop('ParseHelper::parse()');
+                return $string;
+            }
+
+            $defaults = ['return' => 'html', 'multimedia' => true, 'wrap' => true];
+            $options += $defaults;
+
+            $cacheId = md5(serialize($options) . $string);
+            if (isset($this->_parserCache[$cacheId])) {
+                $html = $this->_parserCache[$cacheId];
+            } else {
+                $html = $this->_getParser()->parse($string, $options);
+                $this->_parserCache[$cacheId] = $html;
+            }
+            if ($options['wrap']) {
+                $html = '<div class="richtext">' . $html . '</div>';
+            }
+            Stopwatch::stop('ParseHelper::parse()');
+            return $html;
+        }
+
+        protected function _getMarkupEditor() {
+            if ($this->_MarkupEditor === null) {
+                $this->_MarkupEditor = \Saito\Plugin::getParserClassInstance('Editor', $this);
+            }
+            return $this->_MarkupEditor;
+        }
+
+        protected function _getParser() {
+            if ($this->_Parser === null) {
+                $settings = Configure::read('Saito.Settings') + $this->settings;
+
+                $this->SmileyRenderer = new \Saito\Smiley\Renderer($settings['smiliesData']);
+                $this->SmileyRenderer->setHelper($this);
+
+                $this->_Parser = \Saito\Plugin::getParserClassInstance('Parser', $this, $settings);
+            }
+            return $this->_Parser;
+        }
+
+    }
\ No newline at end of file