Schlaefer / Saito

app/Config/saito_config.php

Indentation +63 added lines, -63 removed lines

@@ -1,60 +1,60 @@ 
 <?php
 
-  /**
-   * Saito Enduser Configuration
-   */
+    /**
+     * Saito Enduser Configuration
+     */
 
-  /**
-   * Setting default language (mandatory)
-   *
-   * Use ISO 639-2 Code http://www.loc.gov/standards/iso639-2/php/code_list.php
-   * So german would be: deu
-   */
-  Configure::write('Config.language', 'eng');
+    /**
+     * Setting default language (mandatory)
+     *
+     * Use ISO 639-2 Code http://www.loc.gov/standards/iso639-2/php/code_list.php
+     * So german would be: deu
+     */
+    Configure::write('Config.language', 'eng');
 
-	/**
-	 * Sets the markup parser
-	 *
-	 * Parser hould be placed in app/Plugin/<name>Parser
-	 */
-	Configure::write('Saito.Settings.ParserPlugin', 'Bbcode');
+    /**
+     * Sets the markup parser
+     *
+     * Parser hould be placed in app/Plugin/<name>Parser
+     */
+    Configure::write('Saito.Settings.ParserPlugin', 'Bbcode');
 
-  /**
-   * Sets the default theme
-   */
-  Configure::write('Saito.themes.default', 'Paz');
+    /**
+     * Sets the default theme
+     */
+    Configure::write('Saito.themes.default', 'Paz');
 
-	/**
-	 * Sets additional themes available for all users
-	 *
-	 * `*` - all installed themes (in Themed folder)
-	 * `['A', 'B']` - only themes 'A' and 'B' (Themed folder names)
-	 */
-	// Configure::write('Saito.themes.available.all', '*');
+    /**
+     * Sets additional themes available for all users
+     *
+     * `*` - all installed themes (in Themed folder)
+     * `['A', 'B']` - only themes 'A' and 'B' (Themed folder names)
+     */
+    // Configure::write('Saito.themes.available.all', '*');
 
-	/**
-	 * Sets additional themes available for specific users only
-	 *
-	 * [<user-id> => '<theme name>', …]
-	 */
-	 // Configure::write('Saito.themes.available.users', [1 => ['C']]);
+    /**
+     * Sets additional themes available for specific users only
+     *
+     * [<user-id> => '<theme name>', …]
+     */
+        // Configure::write('Saito.themes.available.users', [1 => ['C']]);
 
-	/**
-	 * Sets the X-Frame-Options header send with each request
-	 */
-	Configure::write('Saito.X-Frame-Options', 'SAMEORIGIN');
+    /**
+     * Sets the X-Frame-Options header send with each request
+     */
+    Configure::write('Saito.X-Frame-Options', 'SAMEORIGIN');
 
-  /**
-   * Add additional buttons to editor
-	 *
-	 * You can theme them with
-	 *
-	 * <code>
-	 * 	.markItUp .markItUpButton<Id> a {
-	 * 		…
-	 *	}
-	 * </code>
-   *
+    /**
+     * Add additional buttons to editor
+     *
+     * You can theme them with
+     *
+     * <code>
+     * 	.markItUp .markItUpButton<Id> a {
+     * 		…
+     *	}
+     * </code>
+     *
   /*
   Configure::write(
       'Saito.markItUp.additionalButtons',
@@ -75,23 +75,23 @@ 
             // image in img/markitup/<replacement>
             'replacement' => 'resultofbutton1.png'
           ),
-  * 			// …
+     * 			// …
         )
       );
-  *
-  */
+     *
+     */
 
-  /**
-   * Users to notify via email if a new users registers successfully
-	 *
-	 * Provide an array with user IDs. To notify the admin (usually user-id 1):
-	 *
-	 *     [1]
-	 *
-	 * To notify the admin with id 1 and the user with the id 5:
-	 *
-	 *     [1, 5]
-   */
-  /*
+    /**
+     * Users to notify via email if a new users registers successfully
+     *
+     * Provide an array with user IDs. To notify the admin (usually user-id 1):
+     *
+     *     [1]
+     *
+     * To notify the admin with id 1 and the user with the id 5:
+     *
+     *     [1, 5]
+     */
+    /*
   Configure::write('Saito.Notification.userActivatedAdminNoticeToUserWithID', [1]);
    */

app/Config/core.php

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/Config/bootstrap.php

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/acl.php

Indentation +8 added lines, -8 removed lines

@@ -105,8 +105,8 @@ 
  * to the roles you defined in the roles configuration.
  */
 $config['map'] = array(
-	'User' => 'User/username',
-	'Role' => 'User/group_id',
+    'User' => 'User/username',
+    'Role' => 'User/group_id',
 );
 
 /**
@@ -114,22 +114,22 @@ 
  * the roles defined in your role configuration.
  */
 $config['alias'] = array(
-	'Role/4' => 'Role/editor',
+    'Role/4' => 'Role/editor',
 );
 
 /**
  * role configuration
  */
 $config['roles'] = array(
-	'Role/admin' => null,
+    'Role/admin' => null,
 );
 
 /**
  * rule configuration
  */
 $config['rules'] = array(
-	'allow' => array(
-		'*' => 'Role/admin',
-	),
-	'deny' => array(),
+    'allow' => array(
+        '*' => 'Role/admin',
+    ),
+    'deny' => array(),
 );

app/Config/Schema/db_acl.php

Indentation +36 added lines, -36 removed lines

@@ -29,46 +29,46 @@
  */
 class DbAclSchema extends CakeSchema {
 
-	public $name = 'DbAcl';
+    public $name = 'DbAcl';
 
-	public function before($event = array()) {
-		return true;
-	}
+    public function before($event = array()) {
+        return true;
+    }
 
-	public function after($event = array()) {
-	}
+    public function after($event = array()) {
+    }
 
-	public $acos = array(
-			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
-			'parent_id' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
-			'model' => array('type'=>'string', 'null' => true),
-			'foreign_key' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
-			'alias' => array('type'=>'string', 'null' => true),
-			'lft' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
-			'rght' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
-			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
-		);
+    public $acos = array(
+            'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
+            'parent_id' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+            'model' => array('type'=>'string', 'null' => true),
+            'foreign_key' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+            'alias' => array('type'=>'string', 'null' => true),
+            'lft' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+            'rght' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+            'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
+        );
 
-	public $aros = array(
-			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
-			'parent_id' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
-			'model' => array('type'=>'string', 'null' => true),
-			'foreign_key' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
-			'alias' => array('type'=>'string', 'null' => true),
-			'lft' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
-			'rght' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
-			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
-		);
+    public $aros = array(
+            'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
+            'parent_id' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+            'model' => array('type'=>'string', 'null' => true),
+            'foreign_key' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+            'alias' => array('type'=>'string', 'null' => true),
+            'lft' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+            'rght' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+            'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
+        );
 
-	public $aros_acos = array(
-			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
-			'aro_id' => array('type'=>'integer', 'null' => false, 'length' => 10, 'key' => 'index'),
-			'aco_id' => array('type'=>'integer', 'null' => false, 'length' => 10),
-			'_create' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
-			'_read' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
-			'_update' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
-			'_delete' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
-			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1), 'ARO_ACO_KEY' => array('column' => array('aro_id', 'aco_id'), 'unique' => 1))
-		);
+    public $aros_acos = array(
+            'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
+            'aro_id' => array('type'=>'integer', 'null' => false, 'length' => 10, 'key' => 'index'),
+            'aco_id' => array('type'=>'integer', 'null' => false, 'length' => 10),
+            '_create' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
+            '_read' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
+            '_update' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
+            '_delete' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
+            'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1), 'ARO_ACO_KEY' => array('column' => array('aro_id', 'aco_id'), 'unique' => 1))
+        );
 
 }

app/Config/Schema/sessions.php

Indentation +12 added lines, -12 removed lines

@@ -29,20 +29,20 @@
  */
 class SessionsSchema extends CakeSchema {
 
-	public $name = 'Sessions';
+    public $name = 'Sessions';
 
-	public function before($event = array()) {
-		return true;
-	}
+    public function before($event = array()) {
+        return true;
+    }
 
-	public function after($event = array()) {
-	}
+    public function after($event = array()) {
+    }
 
-	public $cake_sessions = array(
-			'id' => array('type'=>'string', 'null' => false, 'key' => 'primary'),
-			'data' => array('type'=>'text', 'null' => true, 'default' => NULL),
-			'expires' => array('type'=>'integer', 'null' => true, 'default' => NULL),
-			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
-		);
+    public $cake_sessions = array(
+            'id' => array('type'=>'string', 'null' => false, 'key' => 'primary'),
+            'data' => array('type'=>'text', 'null' => true, 'default' => NULL),
+            'expires' => array('type'=>'integer', 'null' => true, 'default' => NULL),
+            'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
+        );
 
 }

app/Config/Schema/schema.php

Indentation +250 added lines, -250 removed lines

@@ -2,269 +2,269 @@
 
 class AppSchema extends CakeSchema {
 
-	public $bookmarks = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
-		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'index'),
-		'entry_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'index'),
-		'comment' => array('type' => 'string', 'null' => false, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
-		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1),
-			'bookmarks_entryId_userId' => array('column' => array('entry_id', 'user_id'), 'unique' => 0),
-			'bookmarks_userId' => array('column' => 'user_id', 'unique' => 0)
-		),
-		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
-	);
+    public $bookmarks = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
+        'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'index'),
+        'entry_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'index'),
+        'comment' => array('type' => 'string', 'null' => false, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
+        'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1),
+            'bookmarks_entryId_userId' => array('column' => array('entry_id', 'user_id'), 'unique' => 0),
+            'bookmarks_userId' => array('column' => 'user_id', 'unique' => 0)
+        ),
+        'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
+    );
 
-	public $categories = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
-		'category_order' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false),
-		'category' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'description' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'accession' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => 4, 'unsigned' => false),
-		'thread_count' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
-	);
+    public $categories = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
+        'category_order' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false),
+        'category' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'description' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'accession' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => 4, 'unsigned' => false),
+        'thread_count' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
+    );
 
-	public $entries = array(
-		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
-		'pid' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false, 'key' => 'index'),
-		'tid' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false, 'key' => 'index'),
-		'time' => array('type' => 'timestamp', 'null' => true, 'default' => null, 'key' => 'index'),
-		'last_answer' => array('type' => 'timestamp', 'null' => true, 'default' => null, 'key' => 'index'),
-		'edited' => array('type' => 'timestamp', 'null' => true, 'default' => null),
-		'edited_by' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'user_id' => array('type' => 'integer', 'null' => true, 'default' => '0', 'unsigned' => false, 'key' => 'index'),
-		'name' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'subject' => array('type' => 'string', 'null' => true, 'default' => null, 'key' => 'index', 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'category_id' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false),
-		'text' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'email_notify' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 4, 'unsigned' => false),
-		'locked' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 4, 'unsigned' => false),
-		'fixed' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 4, 'unsigned' => false),
-		'views' => array('type' => 'integer', 'null' => true, 'default' => '0', 'unsigned' => false),
-		'ip' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 39, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'solves' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1),
-			'tid' => array('column' => 'tid', 'unique' => 0),
-			'entries_userId' => array('column' => 'user_id', 'unique' => 0),
-			'last_answer' => array('column' => 'last_answer', 'unique' => 0),
-			'pft' => array('column' => array('pid', 'fixed', 'time', 'category_id'), 'unique' => 0),
-			'pfl' => array('column' => array('pid', 'fixed', 'last_answer', 'category_id'), 'unique' => 0),
-			'pid_category' => array('column' => array('pid', 'category_id'), 'unique' => 0),
-			'entries_userId_time' => array('column' => array('time', 'user_id'), 'unique' => 0),
-			'fulltext_search' => array('column' => array('subject', 'name', 'text'), 'type' => 'fulltext')
-		),
-		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
-	);
+    public $entries = array(
+        'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
+        'pid' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false, 'key' => 'index'),
+        'tid' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false, 'key' => 'index'),
+        'time' => array('type' => 'timestamp', 'null' => true, 'default' => null, 'key' => 'index'),
+        'last_answer' => array('type' => 'timestamp', 'null' => true, 'default' => null, 'key' => 'index'),
+        'edited' => array('type' => 'timestamp', 'null' => true, 'default' => null),
+        'edited_by' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'user_id' => array('type' => 'integer', 'null' => true, 'default' => '0', 'unsigned' => false, 'key' => 'index'),
+        'name' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'subject' => array('type' => 'string', 'null' => true, 'default' => null, 'key' => 'index', 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'category_id' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false),
+        'text' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'email_notify' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 4, 'unsigned' => false),
+        'locked' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 4, 'unsigned' => false),
+        'fixed' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 4, 'unsigned' => false),
+        'views' => array('type' => 'integer', 'null' => true, 'default' => '0', 'unsigned' => false),
+        'ip' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 39, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'solves' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1),
+            'tid' => array('column' => 'tid', 'unique' => 0),
+            'entries_userId' => array('column' => 'user_id', 'unique' => 0),
+            'last_answer' => array('column' => 'last_answer', 'unique' => 0),
+            'pft' => array('column' => array('pid', 'fixed', 'time', 'category_id'), 'unique' => 0),
+            'pfl' => array('column' => array('pid', 'fixed', 'last_answer', 'category_id'), 'unique' => 0),
+            'pid_category' => array('column' => array('pid', 'category_id'), 'unique' => 0),
+            'entries_userId_time' => array('column' => array('time', 'user_id'), 'unique' => 0),
+            'fulltext_search' => array('column' => array('subject', 'name', 'text'), 'type' => 'fulltext')
+        ),
+        'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
+    );
 
-	public $esevents = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
-		'subject' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'index'),
-		'event' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1),
-			'subject_event' => array('column' => array('subject', 'event'), 'unique' => 0)
-		),
-		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
-	);
+    public $esevents = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
+        'subject' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'index'),
+        'event' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1),
+            'subject_event' => array('column' => array('subject', 'event'), 'unique' => 0)
+        ),
+        'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
+    );
 
-	public $esnotifications = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
-		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'index'),
-		'esevent_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'index'),
-		'esreceiver_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'deactivate' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 8, 'unsigned' => false),
-		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1),
-			'userid_esreceiverid' => array('column' => array('user_id', 'esreceiver_id'), 'unique' => 0),
-			'eseventid_esreceiverid_userid' => array('column' => array('esevent_id', 'esreceiver_id', 'user_id'), 'unique' => 0)
-		),
-		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
-	);
+    public $esnotifications = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
+        'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'index'),
+        'esevent_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'index'),
+        'esreceiver_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'deactivate' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 8, 'unsigned' => false),
+        'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1),
+            'userid_esreceiverid' => array('column' => array('user_id', 'esreceiver_id'), 'unique' => 0),
+            'eseventid_esreceiverid_userid' => array('column' => array('esevent_id', 'esreceiver_id', 'user_id'), 'unique' => 0)
+        ),
+        'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
+    );
 
-	public $settings = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'key' => 'primary'),
-		'name' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8', 'key' => 'primary'),
-		'value' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1),
-		),
-		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
-	);
+    public $settings = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'key' => 'primary'),
+        'name' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8', 'key' => 'primary'),
+        'value' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1),
+        ),
+        'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
+    );
 
-	public $shouts = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
-		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'text' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
-		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'time' => array('type' => 'timestamp', 'null' => true, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'MEMORY')
-	);
+    public $shouts = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
+        'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'text' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
+        'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'time' => array('type' => 'timestamp', 'null' => true, 'default' => null),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'MEMORY')
+    );
 
-	public $smiley_codes = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
-		'smiley_id' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false),
-		'code' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 32, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
-	);
+    public $smiley_codes = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
+        'smiley_id' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false),
+        'code' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 32, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
+    );
 
-	public $smilies = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
-		'sort' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => 4, 'unsigned' => false),
-		'icon' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 100, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
-		'image' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 100, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'title' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
-	);
+    public $smilies = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
+        'sort' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => 4, 'unsigned' => false),
+        'icon' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 100, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
+        'image' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 100, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'title' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
+    );
 
-	public $uploads = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
-		'name' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 200, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'type' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 200, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'size' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false),
-		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'user_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
-	);
+    public $uploads = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
+        'name' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 200, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'type' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 200, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'size' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false),
+        'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'user_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM')
+    );
 
-	public $user_blocks = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
-		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'index'),
-		'reason' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
-		'blocked_by_user_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => true),
-		'ends' => array('type' => 'datetime', 'null' => true, 'default' => null, 'key' => 'index'),
-		'ended' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'hash' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 32, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1),
-			'ends' => array('column' => 'ends', 'unique' => 0),
-			'user_id' => array('column' => 'user_id', 'unique' => 0)
-		),
-		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'InnoDB')
-	);
+    public $user_blocks = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
+        'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'index'),
+        'reason' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
+        'blocked_by_user_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => true),
+        'ends' => array('type' => 'datetime', 'null' => true, 'default' => null, 'key' => 'index'),
+        'ended' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'hash' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 32, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1),
+            'ends' => array('column' => 'ends', 'unique' => 0),
+            'user_id' => array('column' => 'user_id', 'unique' => 0)
+        ),
+        'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'InnoDB')
+    );
 
-	public $user_ignores = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
-		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'user_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false, 'key' => 'index'),
-		'blocked_user_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false, 'key' => 'index'),
-		'timestamp' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1),
-			'userignores_user_id' => array('column' => 'user_id', 'unique' => 0),
-			'blocked_user_id' => array('column' => 'blocked_user_id', 'unique' => 0)
-		),
-		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'InnoDB')
-	);
+    public $user_ignores = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
+        'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'user_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false, 'key' => 'index'),
+        'blocked_user_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false, 'key' => 'index'),
+        'timestamp' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1),
+            'userignores_user_id' => array('column' => 'user_id', 'unique' => 0),
+            'blocked_user_id' => array('column' => 'blocked_user_id', 'unique' => 0)
+        ),
+        'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'InnoDB')
+    );
 
-	public $user_reads = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
-		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'index'),
-		'entry_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'index'),
-		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1),
-			'userread_user_id' => array('column' => 'user_id', 'unique' => 0),
-			'userread_entry_id' => array('column' => 'entry_id', 'unique' => 0)
-		),
-		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'InnoDB')
-	);
+    public $user_reads = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
+        'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'index'),
+        'entry_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'index'),
+        'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1),
+            'userread_user_id' => array('column' => 'user_id', 'unique' => 0),
+            'userread_entry_id' => array('column' => 'entry_id', 'unique' => 0)
+        ),
+        'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'InnoDB')
+    );
 
-	public $useronline = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
-		'uuid' => array('type' => 'string', 'null' => false, 'length' => 32, 'key' => 'unique', 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'user_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false, 'key' => 'index'),
-		'logged_in' => array('type' => 'boolean', 'null' => false, 'default' => null, 'key' => 'index'),
-		'time' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => 14, 'unsigned' => false),
-		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1),
-			'useronline_uuid' => array('column' => 'uuid', 'unique' => 1),
-			'useronline_userId' => array('column' => 'user_id', 'unique' => 0),
-			'useronline_loggedIn' => array('column' => 'logged_in', 'unique' => 0)
-		),
-		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MEMORY')
-	);
+    public $useronline = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
+        'uuid' => array('type' => 'string', 'null' => false, 'length' => 32, 'key' => 'unique', 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'user_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false, 'key' => 'index'),
+        'logged_in' => array('type' => 'boolean', 'null' => false, 'default' => null, 'key' => 'index'),
+        'time' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => 14, 'unsigned' => false),
+        'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'modified' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1),
+            'useronline_uuid' => array('column' => 'uuid', 'unique' => 1),
+            'useronline_userId' => array('column' => 'user_id', 'unique' => 0),
+            'useronline_loggedIn' => array('column' => 'logged_in', 'unique' => 0)
+        ),
+        'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MEMORY')
+    );
 
-	public $users = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
-		'user_type' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'username' => array('type' => 'string', 'null' => true, 'default' => null, 'key' => 'unique', 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'user_real_name' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'password' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'user_email' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'user_hp' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'user_place' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'user_place_lat' => array('type' => 'float', 'null' => true, 'default' => null, 'unsigned' => false),
-		'user_place_lng' => array('type' => 'float', 'null' => true, 'default' => null, 'unsigned' => false),
-		'user_place_zoom' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 4, 'unsigned' => false),
-		'signature' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'profile' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
-		'entry_count' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false),
-		'logins' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false),
-		'last_login' => array('type' => 'timestamp', 'null' => true, 'default' => null),
-		'registered' => array('type' => 'timestamp', 'null' => true, 'default' => null),
-		'last_refresh' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'last_refresh_tmp' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'personal_messages' => array('type' => 'boolean', 'null' => false, 'default' => '1'),
-		'user_lock' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
-		'activate_code' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => 7, 'unsigned' => false),
-		'user_signatures_hide' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
-		'user_signatures_images_hide' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
-		'user_forum_refresh_time' => array('type' => 'integer', 'null' => true, 'default' => '0', 'unsigned' => false),
-		'user_automaticaly_mark_as_read' => array('type' => 'boolean', 'null' => false, 'default' => '1'),
-		'user_sort_last_answer' => array('type' => 'boolean', 'null' => false, 'default' => '1'),
-		'user_color_new_postings' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'user_color_actual_posting' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'user_color_old_postings' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'user_theme' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'slidetab_order' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 512, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'show_userlist' => array('type' => 'boolean', 'null' => false, 'default' => '0', 'comment' => 'stores if userlist is shown in front layout'),
-		'show_recentposts' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
-		'show_recententries' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
-		'show_shoutbox' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
-		'inline_view_on_click' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
-		'user_show_thread_collapsed' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
-		'user_category_override' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
-		'user_category_active' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false),
-		'user_category_custom' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 512, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
-		'ignore_count' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => 10, 'unsigned' => true),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1),
-			'username' => array('column' => 'username', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'InnoDB')
-	);
+    public $users = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false, 'key' => 'primary'),
+        'user_type' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'username' => array('type' => 'string', 'null' => true, 'default' => null, 'key' => 'unique', 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'user_real_name' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'password' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'user_email' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'user_hp' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'user_place' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'user_place_lat' => array('type' => 'float', 'null' => true, 'default' => null, 'unsigned' => false),
+        'user_place_lng' => array('type' => 'float', 'null' => true, 'default' => null, 'unsigned' => false),
+        'user_place_zoom' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 4, 'unsigned' => false),
+        'signature' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'profile' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
+        'entry_count' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false),
+        'logins' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false),
+        'last_login' => array('type' => 'timestamp', 'null' => true, 'default' => null),
+        'registered' => array('type' => 'timestamp', 'null' => true, 'default' => null),
+        'last_refresh' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'last_refresh_tmp' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'personal_messages' => array('type' => 'boolean', 'null' => false, 'default' => '1'),
+        'user_lock' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
+        'activate_code' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => 7, 'unsigned' => false),
+        'user_signatures_hide' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
+        'user_signatures_images_hide' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
+        'user_forum_refresh_time' => array('type' => 'integer', 'null' => true, 'default' => '0', 'unsigned' => false),
+        'user_automaticaly_mark_as_read' => array('type' => 'boolean', 'null' => false, 'default' => '1'),
+        'user_sort_last_answer' => array('type' => 'boolean', 'null' => false, 'default' => '1'),
+        'user_color_new_postings' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'user_color_actual_posting' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'user_color_old_postings' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'user_theme' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'slidetab_order' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 512, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'show_userlist' => array('type' => 'boolean', 'null' => false, 'default' => '0', 'comment' => 'stores if userlist is shown in front layout'),
+        'show_recentposts' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
+        'show_recententries' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
+        'show_shoutbox' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
+        'inline_view_on_click' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
+        'user_show_thread_collapsed' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
+        'user_category_override' => array('type' => 'boolean', 'null' => false, 'default' => '0'),
+        'user_category_active' => array('type' => 'integer', 'null' => false, 'default' => '0', 'unsigned' => false),
+        'user_category_custom' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 512, 'collate' => 'utf8_unicode_ci', 'charset' => 'utf8'),
+        'ignore_count' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => 10, 'unsigned' => true),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1),
+            'username' => array('column' => 'username', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'InnoDB')
+    );
 
 }

app/Config/Schema/i18n.php

Indentation +15 added lines, -15 removed lines

@@ -29,23 +29,23 @@
  */
 class i18nSchema extends CakeSchema {
 
-	public $name = 'i18n';
+    public $name = 'i18n';
 
-	public function before($event = array()) {
-		return true;
-	}
+    public function before($event = array()) {
+        return true;
+    }
 
-	public function after($event = array()) {
-	}
+    public function after($event = array()) {
+    }
 
-	public $i18n = array(
-			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
-			'locale' => array('type'=>'string', 'null' => false, 'length' => 6, 'key' => 'index'),
-			'model' => array('type'=>'string', 'null' => false, 'key' => 'index'),
-			'foreign_key' => array('type'=>'integer', 'null' => false, 'length' => 10, 'key' => 'index'),
-			'field' => array('type'=>'string', 'null' => false, 'key' => 'index'),
-			'content' => array('type'=>'text', 'null' => true, 'default' => NULL),
-			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1), 'locale' => array('column' => 'locale', 'unique' => 0), 'model' => array('column' => 'model', 'unique' => 0), 'row_id' => array('column' => 'foreign_key', 'unique' => 0), 'field' => array('column' => 'field', 'unique' => 0))
-		);
+    public $i18n = array(
+            'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
+            'locale' => array('type'=>'string', 'null' => false, 'length' => 6, 'key' => 'index'),
+            'model' => array('type'=>'string', 'null' => false, 'key' => 'index'),
+            'foreign_key' => array('type'=>'integer', 'null' => false, 'length' => 10, 'key' => 'index'),
+            'field' => array('type'=>'string', 'null' => false, 'key' => 'index'),
+            'content' => array('type'=>'text', 'null' => true, 'default' => NULL),
+            'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1), 'locale' => array('column' => 'locale', 'unique' => 0), 'model' => array('column' => 'model', 'unique' => 0), 'row_id' => array('column' => 'foreign_key', 'unique' => 0), 'field' => array('column' => 'field', 'unique' => 0))
+        );
 
 }

app/webroot/index.php

Indentation +21 added lines, -21 removed lines

@@ -20,7 +20,7 @@ 
  * Use the DS to separate the directories in other defines
  */
 if (!defined('DS')) {
-	define('DS', DIRECTORY_SEPARATOR);
+    define('DS', DIRECTORY_SEPARATOR);
 }
 
 /**
@@ -33,21 +33,21 @@ 
  * The full path to the directory which holds "app", WITHOUT a trailing DS.
  */
 if (!defined('ROOT')) {
-	define('ROOT', dirname(dirname(dirname(__FILE__))));
+    define('ROOT', dirname(dirname(dirname(__FILE__))));
 }
 
 /**
  * The actual directory name for the "app".
  */
 if (!defined('APP_DIR')) {
-	define('APP_DIR', basename(dirname(dirname(__FILE__))));
+    define('APP_DIR', basename(dirname(dirname(__FILE__))));
 }
 
 /**
  * Config Directory
  */
 if (!defined('CONFIG')) {
-	define('CONFIG', ROOT . DS . APP_DIR . DS . 'Config' . DS);
+    define('CONFIG', ROOT . DS . APP_DIR . DS . 'Config' . DS);
 }
 
 /**
@@ -73,7 +73,7 @@ 
 $vendorPath = ROOT . DS . APP_DIR . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib';
 $dispatcher = 'Cake' . DS . 'Console' . DS . 'ShellDispatcher.php';
 if (!defined('CAKE_CORE_INCLUDE_PATH') && file_exists($vendorPath . DS . $dispatcher)) {
-	define('CAKE_CORE_INCLUDE_PATH', $vendorPath);
+    define('CAKE_CORE_INCLUDE_PATH', $vendorPath);
 }
 
 /**
@@ -81,38 +81,38 @@ 
  * Change at your own risk.
  */
 if (!defined('WEBROOT_DIR')) {
-	define('WEBROOT_DIR', basename(dirname(__FILE__)));
+    define('WEBROOT_DIR', basename(dirname(__FILE__)));
 }
 if (!defined('WWW_ROOT')) {
-	define('WWW_ROOT', dirname(__FILE__) . DS);
+    define('WWW_ROOT', dirname(__FILE__) . DS);
 }
 
 // For the built-in server
 if (PHP_SAPI === 'cli-server') {
-	if ($_SERVER['PHP_SELF'] !== '/' . basename(__FILE__) && file_exists(WWW_ROOT . $_SERVER['PHP_SELF'])) {
-		return false;
-	}
-	$_SERVER['PHP_SELF'] = '/' . basename(__FILE__);
+    if ($_SERVER['PHP_SELF'] !== '/' . basename(__FILE__) && file_exists(WWW_ROOT . $_SERVER['PHP_SELF'])) {
+        return false;
+    }
+    $_SERVER['PHP_SELF'] = '/' . basename(__FILE__);
 }
 
 if (!defined('CAKE_CORE_INCLUDE_PATH')) {
-	if (function_exists('ini_set')) {
-		ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
-	}
-	if (!include 'Cake' . DS . 'bootstrap.php') {
-		$failed = true;
-	}
+    if (function_exists('ini_set')) {
+        ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
+    }
+    if (!include 'Cake' . DS . 'bootstrap.php') {
+        $failed = true;
+    }
 } elseif (!include CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php') {
-	$failed = true;
+    $failed = true;
 }
 if (!empty($failed)) {
-	trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
+    trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
 }
 
 App::uses('Dispatcher', 'Routing');
 
 $Dispatcher = new Dispatcher();
 $Dispatcher->dispatch(
-	new CakeRequest(),
-	new CakeResponse()
+    new CakeRequest(),
+    new CakeResponse()
 );

Spacing +11 added lines, -11 removed lines

@@ -47,7 +47,7 @@ 
  * Config Directory
  */
 if (!defined('CONFIG')) {
-	define('CONFIG', ROOT . DS . APP_DIR . DS . 'Config' . DS);
+	define('CONFIG', ROOT.DS.APP_DIR.DS.'Config'.DS);
 }
 
 /**
@@ -70,9 +70,9 @@ 
  * This auto-detects CakePHP as a composer installed library.
  * You may remove this if you are not planning to use composer (not recommended, though).
  */
-$vendorPath = ROOT . DS . APP_DIR . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib';
-$dispatcher = 'Cake' . DS . 'Console' . DS . 'ShellDispatcher.php';
-if (!defined('CAKE_CORE_INCLUDE_PATH') && file_exists($vendorPath . DS . $dispatcher)) {
+$vendorPath = ROOT.DS.APP_DIR.DS.'Vendor'.DS.'cakephp'.DS.'cakephp'.DS.'lib';
+$dispatcher = 'Cake'.DS.'Console'.DS.'ShellDispatcher.php';
+if (!defined('CAKE_CORE_INCLUDE_PATH') && file_exists($vendorPath.DS.$dispatcher)) {
 	define('CAKE_CORE_INCLUDE_PATH', $vendorPath);
 }
 
@@ -84,29 +84,29 @@ 
 	define('WEBROOT_DIR', basename(dirname(__FILE__)));
 }
 if (!defined('WWW_ROOT')) {
-	define('WWW_ROOT', dirname(__FILE__) . DS);
+	define('WWW_ROOT', dirname(__FILE__).DS);
 }
 
 // For the built-in server
 if (PHP_SAPI === 'cli-server') {
-	if ($_SERVER['PHP_SELF'] !== '/' . basename(__FILE__) && file_exists(WWW_ROOT . $_SERVER['PHP_SELF'])) {
+	if ($_SERVER['PHP_SELF'] !== '/'.basename(__FILE__) && file_exists(WWW_ROOT.$_SERVER['PHP_SELF'])) {
 		return false;
 	}
-	$_SERVER['PHP_SELF'] = '/' . basename(__FILE__);
+	$_SERVER['PHP_SELF'] = '/'.basename(__FILE__);
 }
 
 if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 	if (function_exists('ini_set')) {
-		ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
+		ini_set('include_path', ROOT.DS.'lib'.PATH_SEPARATOR.ini_get('include_path'));
 	}
-	if (!include 'Cake' . DS . 'bootstrap.php') {
+	if (!include 'Cake'.DS.'bootstrap.php') {
 		$failed = true;
 	}
-} elseif (!include CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php') {
+} elseif (!include CAKE_CORE_INCLUDE_PATH.DS.'Cake'.DS.'bootstrap.php') {
 	$failed = true;
 }
 if (!empty($failed)) {
-	trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
+	trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your ".DS."cake core directory and your ".DS."vendors root directory.", E_USER_ERROR);
 }
 
 App::uses('Dispatcher', 'Routing');