Schlaefer / Saito

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()
 );

app/webroot/test.php

Indentation +18 added lines, -18 removed lines

@@ -23,7 +23,7 @@ 
  * Use the DS to separate the directories in other defines
  */
 if (!defined('DS')) {
-	define('DS', DIRECTORY_SEPARATOR);
+    define('DS', DIRECTORY_SEPARATOR);
 }
 
 /**
@@ -36,21 +36,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,30 +81,30 @@ 
  * 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);
 }
 
 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;
+    }
 } else {
-	if (!include CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php') {
-		$failed = true;
-	}
+    if (!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/test.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/test.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
 }
 
 if (Configure::read('debug') < 1) {
-	throw new NotFoundException(__d('cake_dev', 'Debug setting does not allow access to this URL.'));
+    throw new NotFoundException(__d('cake_dev', 'Debug setting does not allow access to this URL.'));
 }
 
 require_once CAKE . 'TestSuite' . DS . 'CakeTestSuiteDispatcher.php';

app/Console/Command/DummyDataShell.php

Indentation +168 added lines, -168 removed lines

@@ -1,171 +1,171 @@
 <?php
 
-	use Saito\User\Auth;
-	use Saito\User\SaitoUser;
-
-	class DummyDataShell extends AppShell {
-
-		public $uses = ['Entry', 'User'];
-
-		protected $_Categories = null;
-
-		protected $_Users = null;
-
-		protected $_text = null;
-
-		protected $_Threads = [];
-
-		protected $_users = ['aaron', 'Alex', 'Amy', 'Ana-Lucia', 'Anthony', 'Ben',
-			'Bernard', 'Boone', 'Carmen', 'Carole', 'Charles', 'Charlie', 'Charlotte',
-			'Christian', 'Claire', 'Daniel', 'Danielle', 'Desmond', 'Dogen', 'Eko',
-			'Eloise', 'Ethan', 'Frank', 'Frogurt', 'George', 'Gina', 'Horace', 'Hugo',
-			'Ilana', 'Jack', 'Jacob', 'James', 'Jin', 'John', 'Juliet', 'Kate',
-			'Kelvin', 'Liam', 'Libby', 'Martin', 'Maninbla', 'Michael', 'Michelle',
-			'Miles', 'Nadia', 'Naomi', 'Nikki', 'Omar', 'Paulo', 'Penny', 'Pierre',
-			'Richard', 'Sarah', 'Sayid', 'Shannon', 'Stuart', 'Sun', 'Teresa', 'Tom',
-			'walt'];
-
-		public function main() {
-			$this->user();
-			$this->generate();
-		}
-
-		public function generate() {
-			$nPostings = (int)$this->in('Number of postings to generate?', null, 100);
-			if ($nPostings === 0) {
-				return;
-			}
-			$ratio = (int)$this->in('Average answers per thread?', null, 10);
-			$seed = $nPostings / $ratio;
-
-			new Saito\Markup\Settings([
-				'hashBaseUrl' => 'entries/view/',
-				'atBaseUrl' => 'users/name/',
-				'server' => Router::fullBaseUrl(),
-				'webroot' => Router::fullBaseUrl()
-			]);
-			$this->Entry->SharedObjects['CurrentUser'] = new SaitoUserDummy();
-
-			for ($i = 0; $i < $nPostings; $i++) {
-				$newThread = $i < $seed;
-
-				$user = $this->_randomUser();
-				$this->Entry->CurrentUser->setSettings($user);
-
-				$entry = [
-					'subject' => $i,
-					'text' => rand(0, 1) ? $this->_randomText() : '',
-					'user_id' => $user['id']
-				];
-				if ($newThread) {
-					$entry['category'] = $this->_randomCategory();
-				} else {
-					$entry['pid'] = array_rand($this->_Threads);
-				}
-				$entry = $this->Entry->createPosting(['Entry' => $entry]);
-				if (empty($entry)) {
-					throw new RuntimeException('Could not create entry: ' . $entry);
-				}
-
-				$this->_progress($i, $nPostings);
-
-				$id = $entry['Entry']['id'];
-				$this->_Threads[$id] = $id;
-			}
-
-			$this->out();
-			$this->out("Generated $i postings.");
-		}
-
-		public function user() {
-			$max = count($this->_users);
-			$n = (int)$this->in("Number of users to generate (max: $max)?", null, 0);
-			if ($n === 0) {
-				return;
-			}
-			if ($n > $max) {
-				$n = $max;
-			}
-			$users = array_rand($this->_users, $n);
-			$i = 0;
-			foreach ($users as $user) {
-				$name = $this->_users[$user];
-				$data = [
-					'User' => [
-						'username' => $name,
-						'password' => 'test',
-						'password_confirm' => 'test',
-						'user_email' => "$name@example.com"
-					]
-				];
-				$this->User->register($data, true);
-				$this->_progress($i++, $n);
-			}
-
-			$this->out();
-			$this->out("Generated $i users.");
-		}
-
-		protected function _progress($i, $off) {
-			if ($i < 1) {
-				return;
-			}
-			$this->out('.', 0);
-			if ($i > 1 && !($i % 50)) {
-				$percent = (int)floor($i / $off * 100);
-				$this->out(sprintf(' %3s%%', $percent), 1);
-			}
-		}
-
-		protected function _randomCategory() {
-			if ($this->_Categories === null) {
-				$this->_Categories = $this->Entry->Category->find('all',
-					['recursive' => 0, 'fields' => ['id']]);
-			}
-			$id = array_rand($this->_Categories);
-			return $this->_Categories[$id]['Category']['id'];
-		}
-
-		protected function _randomUser() {
-			if ($this->_Users === null) {
-				$this->_Users = $this->User->find('all',
-					['recursive' => -1, 'conditions' => ['activate_code' => 0]]);
-			}
-			$id = array_rand($this->_Users);
-			return $this->_Users[$id]['User'];
-		}
-
-		protected function _randomText() {
-			if (empty($this->_text)) {
-				$this->_text = file_get_contents('http://loripsum.net/api/short/plaintext');
-			}
-			return $this->_text;
-		}
-
-	}
-
-	class SaitoUserDummy extends SaitoUser {
-
-		public function __construct($settings = null) {
-			parent::__construct($settings);
-			$this->Categories = new Auth\CategoryAuthorization($this);
-		}
-
-		public function getMaxAccession() {
-			return 2;
-		}
-
-		public function isLoggedIn() {
-			return true;
-		}
-
-		public function isAdmin() {
-			return true;
-		}
-
-		public function hasBookmarked() {
-			return false;
-		}
-
-	}
+    use Saito\User\Auth;
+    use Saito\User\SaitoUser;
+
+    class DummyDataShell extends AppShell {
+
+        public $uses = ['Entry', 'User'];
+
+        protected $_Categories = null;
+
+        protected $_Users = null;
+
+        protected $_text = null;
+
+        protected $_Threads = [];
+
+        protected $_users = ['aaron', 'Alex', 'Amy', 'Ana-Lucia', 'Anthony', 'Ben',
+            'Bernard', 'Boone', 'Carmen', 'Carole', 'Charles', 'Charlie', 'Charlotte',
+            'Christian', 'Claire', 'Daniel', 'Danielle', 'Desmond', 'Dogen', 'Eko',
+            'Eloise', 'Ethan', 'Frank', 'Frogurt', 'George', 'Gina', 'Horace', 'Hugo',
+            'Ilana', 'Jack', 'Jacob', 'James', 'Jin', 'John', 'Juliet', 'Kate',
+            'Kelvin', 'Liam', 'Libby', 'Martin', 'Maninbla', 'Michael', 'Michelle',
+            'Miles', 'Nadia', 'Naomi', 'Nikki', 'Omar', 'Paulo', 'Penny', 'Pierre',
+            'Richard', 'Sarah', 'Sayid', 'Shannon', 'Stuart', 'Sun', 'Teresa', 'Tom',
+            'walt'];
+
+        public function main() {
+            $this->user();
+            $this->generate();
+        }
+
+        public function generate() {
+            $nPostings = (int)$this->in('Number of postings to generate?', null, 100);
+            if ($nPostings === 0) {
+                return;
+            }
+            $ratio = (int)$this->in('Average answers per thread?', null, 10);
+            $seed = $nPostings / $ratio;
+
+            new Saito\Markup\Settings([
+                'hashBaseUrl' => 'entries/view/',
+                'atBaseUrl' => 'users/name/',
+                'server' => Router::fullBaseUrl(),
+                'webroot' => Router::fullBaseUrl()
+            ]);
+            $this->Entry->SharedObjects['CurrentUser'] = new SaitoUserDummy();
+
+            for ($i = 0; $i < $nPostings; $i++) {
+                $newThread = $i < $seed;
+
+                $user = $this->_randomUser();
+                $this->Entry->CurrentUser->setSettings($user);
+
+                $entry = [
+                    'subject' => $i,
+                    'text' => rand(0, 1) ? $this->_randomText() : '',
+                    'user_id' => $user['id']
+                ];
+                if ($newThread) {
+                    $entry['category'] = $this->_randomCategory();
+                } else {
+                    $entry['pid'] = array_rand($this->_Threads);
+                }
+                $entry = $this->Entry->createPosting(['Entry' => $entry]);
+                if (empty($entry)) {
+                    throw new RuntimeException('Could not create entry: ' . $entry);
+                }
+
+                $this->_progress($i, $nPostings);
+
+                $id = $entry['Entry']['id'];
+                $this->_Threads[$id] = $id;
+            }
+
+            $this->out();
+            $this->out("Generated $i postings.");
+        }
+
+        public function user() {
+            $max = count($this->_users);
+            $n = (int)$this->in("Number of users to generate (max: $max)?", null, 0);
+            if ($n === 0) {
+                return;
+            }
+            if ($n > $max) {
+                $n = $max;
+            }
+            $users = array_rand($this->_users, $n);
+            $i = 0;
+            foreach ($users as $user) {
+                $name = $this->_users[$user];
+                $data = [
+                    'User' => [
+                        'username' => $name,
+                        'password' => 'test',
+                        'password_confirm' => 'test',
+                        'user_email' => "$name@example.com"
+                    ]
+                ];
+                $this->User->register($data, true);
+                $this->_progress($i++, $n);
+            }
+
+            $this->out();
+            $this->out("Generated $i users.");
+        }
+
+        protected function _progress($i, $off) {
+            if ($i < 1) {
+                return;
+            }
+            $this->out('.', 0);
+            if ($i > 1 && !($i % 50)) {
+                $percent = (int)floor($i / $off * 100);
+                $this->out(sprintf(' %3s%%', $percent), 1);
+            }
+        }
+
+        protected function _randomCategory() {
+            if ($this->_Categories === null) {
+                $this->_Categories = $this->Entry->Category->find('all',
+                    ['recursive' => 0, 'fields' => ['id']]);
+            }
+            $id = array_rand($this->_Categories);
+            return $this->_Categories[$id]['Category']['id'];
+        }
+
+        protected function _randomUser() {
+            if ($this->_Users === null) {
+                $this->_Users = $this->User->find('all',
+                    ['recursive' => -1, 'conditions' => ['activate_code' => 0]]);
+            }
+            $id = array_rand($this->_Users);
+            return $this->_Users[$id]['User'];
+        }
+
+        protected function _randomText() {
+            if (empty($this->_text)) {
+                $this->_text = file_get_contents('http://loripsum.net/api/short/plaintext');
+            }
+            return $this->_text;
+        }
+
+    }
+
+    class SaitoUserDummy extends SaitoUser {
+
+        public function __construct($settings = null) {
+            parent::__construct($settings);
+            $this->Categories = new Auth\CategoryAuthorization($this);
+        }
+
+        public function getMaxAccession() {
+            return 2;
+        }
+
+        public function isLoggedIn() {
+            return true;
+        }
+
+        public function isAdmin() {
+            return true;
+        }
+
+        public function hasBookmarked() {
+            return false;
+        }
+
+    }
 

app/Console/Command/SiegeShell.php

Indentation +72 added lines, -72 removed lines

@@ -1,87 +1,87 @@
 <?php
 
-	class SiegeShell extends AppShell {
+    class SiegeShell extends AppShell {
 
-		public $uses = [
-				'Entry'
-		];
+        public $uses = [
+                'Entry'
+        ];
 
-		protected $_prefix = '$(HOST)/';
+        protected $_prefix = '$(HOST)/';
 
-		public function main() {
-			$out = [];
-			$base = rtrim($this->args[0], '/');
-			$in = $this->in('Base URL is: ' . $base, ['y', 'n'], 'y');
-			if ($in !== 'y') {
-				$this->out('Aborting.');
-				return;
-			}
-			$out[] = 'HOST=' . $base;
-			$this->_generateEntriesIndex($out);
-			$this->_generateEntriesMix($out);
-			$this->_generateEntriesView($out);
-			$this->_siege($out);
-		}
+        public function main() {
+            $out = [];
+            $base = rtrim($this->args[0], '/');
+            $in = $this->in('Base URL is: ' . $base, ['y', 'n'], 'y');
+            if ($in !== 'y') {
+                $this->out('Aborting.');
+                return;
+            }
+            $out[] = 'HOST=' . $base;
+            $this->_generateEntriesIndex($out);
+            $this->_generateEntriesMix($out);
+            $this->_generateEntriesView($out);
+            $this->_siege($out);
+        }
 
-		public function getOptionParser() {
-			$parser = parent::getOptionParser();
-			$parser->addArgument('url',
-					[
-							'help' => 'Saito base URL',
-							'required' => true
-					]);
-			return $parser;
-		}
+        public function getOptionParser() {
+            $parser = parent::getOptionParser();
+            $parser->addArgument('url',
+                    [
+                            'help' => 'Saito base URL',
+                            'required' => true
+                    ]);
+            return $parser;
+        }
 
-		protected function _siege(&$out) {
-			$urlFilePath = TMP . 'url.txt';
-			$this->_cleanup($urlFilePath);
-			$this->createFile($urlFilePath, implode("\n", $out));
-			$command = 'siege -R ' . APP . '..' . DS . ".siegerc -f $urlFilePath";
-			$this->out('<info>Running: ' . $command . '</info>', 1, 'info');
-			exec($command);
-		}
+        protected function _siege(&$out) {
+            $urlFilePath = TMP . 'url.txt';
+            $this->_cleanup($urlFilePath);
+            $this->createFile($urlFilePath, implode("\n", $out));
+            $command = 'siege -R ' . APP . '..' . DS . ".siegerc -f $urlFilePath";
+            $this->out('<info>Running: ' . $command . '</info>', 1, 'info');
+            exec($command);
+        }
 
-		protected function _cleanup($urlFilePath) {
-			if (file_exists($urlFilePath)) {
-				unlink($urlFilePath);
-			}
-		}
+        protected function _cleanup($urlFilePath) {
+            if (file_exists($urlFilePath)) {
+                unlink($urlFilePath);
+            }
+        }
 
-		protected function _generateEntriesIndex(&$out) {
-			for ($i = 0; $i < 400; $i++) {
-				$out[] = $this->_prefix . 'entries/index/page:' . rand(1, 2);
-			}
-			for ($i = 0; $i < 400; $i++) {
-				$out[] = $this->_prefix . 'entries/index/page:' . rand(5, 10);
-			}
-		}
+        protected function _generateEntriesIndex(&$out) {
+            for ($i = 0; $i < 400; $i++) {
+                $out[] = $this->_prefix . 'entries/index/page:' . rand(1, 2);
+            }
+            for ($i = 0; $i < 400; $i++) {
+                $out[] = $this->_prefix . 'entries/index/page:' . rand(5, 10);
+            }
+        }
 
-		protected function _generateEntriesMix(&$out) {
-			$entries = $this->Entry->find('all',
-					[
-							'fields' => ['Entry.id'],
-							'conditions' => ['Entry.pid' => 0, 'Category.accession' => 1],
-							'limit' => '500'
-					]);
+        protected function _generateEntriesMix(&$out) {
+            $entries = $this->Entry->find('all',
+                    [
+                            'fields' => ['Entry.id'],
+                            'conditions' => ['Entry.pid' => 0, 'Category.accession' => 1],
+                            'limit' => '500'
+                    ]);
 
-			foreach ($entries as $entry) {
-				$out[] = $this->_prefix . 'entries/mix/' . $entry['Entry']['id'];
-			}
-		}
+            foreach ($entries as $entry) {
+                $out[] = $this->_prefix . 'entries/mix/' . $entry['Entry']['id'];
+            }
+        }
 
-		protected function _generateEntriesView(&$out) {
-			$entries = $this->Entry->find('all',
-					[
-							'fields' => ['Entry.id'],
-							'conditions' => ['Category.accession' => 1],
-							'limit' => '1000'
-					]);
+        protected function _generateEntriesView(&$out) {
+            $entries = $this->Entry->find('all',
+                    [
+                            'fields' => ['Entry.id'],
+                            'conditions' => ['Category.accession' => 1],
+                            'limit' => '1000'
+                    ]);
 
-			foreach ($entries as $entry) {
-				$out[] = $this->_prefix . 'entries/view/' . $entry['Entry']['id'];
-			}
-		}
+            foreach ($entries as $entry) {
+                $out[] = $this->_prefix . 'entries/view/' . $entry['Entry']['id'];
+            }
+        }
 
-	}
+    }
 

app/Console/cake.php

Indentation +13 added lines, -13 removed lines

@@ -18,29 +18,29 @@
  */
 
 if (!defined('DS')) {
-	define('DS', DIRECTORY_SEPARATOR);
+    define('DS', DIRECTORY_SEPARATOR);
 }
 
 $dispatcher = 'Cake' . DS . 'Console' . DS . 'ShellDispatcher.php';
 
 if (function_exists('ini_set')) {
-	$root = dirname(dirname(dirname(__FILE__)));
-	$appDir = basename(dirname(dirname(__FILE__)));
-	$install = $root . DS . 'lib';
-	$composerInstall = $root . DS . $appDir . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib';
+    $root = dirname(dirname(dirname(__FILE__)));
+    $appDir = basename(dirname(dirname(__FILE__)));
+    $install = $root . DS . 'lib';
+    $composerInstall = $root . DS . $appDir . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib';
 
-	// the following lines differ from its sibling
-	// /lib/Cake/Console/Templates/skel/Console/cake.php
-	if (file_exists($composerInstall . DS . $dispatcher)) {
-		$install = $composerInstall;
-	}
+    // the following lines differ from its sibling
+    // /lib/Cake/Console/Templates/skel/Console/cake.php
+    if (file_exists($composerInstall . DS . $dispatcher)) {
+        $install = $composerInstall;
+    }
 
-	ini_set('include_path', $install . PATH_SEPARATOR . ini_get('include_path'));
-	unset($root, $appDir, $install, $composerInstall);
+    ini_set('include_path', $install . PATH_SEPARATOR . ini_get('include_path'));
+    unset($root, $appDir, $install, $composerInstall);
 }
 
 if (!include $dispatcher) {
-	trigger_error('Could not locate CakePHP core files.', E_USER_ERROR);
+    trigger_error('Could not locate CakePHP core files.', E_USER_ERROR);
 }
 unset($dispatcher);
 

app/Model/Setting.php

Indentation +110 added lines, -110 removed lines

@@ -1,112 +1,112 @@
 <?php
 
-	App::uses('AppSettingModel', 'Lib/Model');
-
-	class Setting extends AppSettingModel {
-
-		public $name = 'Setting';
-
-		public $primaryKey = 'name';
-
-		public $validate = [
-			'name' => [
-				'rule' => ['between', 1, 255],
-				'allowEmpty' => false
-			],
-			'value' => [
-				'rule' => ['between', 0, 255],
-				'allowEmpty' => true
-			]
-		];
-
-		protected $_optionalEmailFields = [
-			'email_contact', 'email_register', 'email_system'
-		];
-
-		/* @td getSettings vs Load why to functions? */
-
-		/**
-		 * Reads settings from DB and returns them in a compact array
-		 *
-		 * Note that this is the stored config in the DB. It may differ from the
-		 * current config used by the app in Config::read('Saito.Settings'), e.g.
-		 * when modified with a load-preset.
-		 *
-		 * @throws UnexpectedValueException
-		 * @return array Settings
-		 */
-		public function getSettings() {
-			$settings = $this->find('all');
-			if (empty($settings)) {
-				throw new UnexpectedValueException('No settings found in settings table.');
-			}
-			$settings = $this->_compactKeyValue($settings);
-
-			// edit_delay is normed to seconds
-			$this->_normToSeconds($settings, 'edit_delay');
-			$this->_fillOptionalEmailAddresses($settings);
-
-			return $settings;
-		}
-
-		/**
-		 * Loads settings from storage into Configuration `Saito.Settings`
-		 *
-		 * @param array $preset allows to overwrite loaded values
-		 * @return array Settings
-		 */
-		public function load($preset = []) {
-			Stopwatch::start('Settings->getSettings()');
-
-			$settings = Cache::read('Saito.appSettings');
-			if (empty($settings)) {
-				$settings = $this->getSettings();
-				Cache::write('Saito.appSettings', $settings);
-			}
-			if ($preset) {
-				$settings = $preset + $settings;
-			}
-			Configure::write('Saito.Settings', $settings);
-
-			Stopwatch::end('Settings->getSettings()');
-		}
-
-		public function clearCache() {
-			parent::clearCache();
-			Cache::delete('Saito.appSettings');
-		}
-
-		/**
-		 * Returns a key-value array
-		 *
-		 * Fast version of Set::combine($results, '{n}.Setting.name', '{n}.Setting.value');
-		 *
-		 * @param array $results
-		 * @return array
-		 */
-		protected function _compactKeyValue($results) {
-			$settings = array();
-			foreach ($results as $result) {
-				$settings[$result[$this->alias]['name']] = $result[$this->alias]['value'];
-			}
-			return $settings;
-		}
-
-		protected function _normToSeconds(&$settings, $field) {
-			$settings[$field] = (int)$settings[$field] * 60;
-		}
-
-		/**
-		 * Defaults optional email addresses to main address
-		 *
-		 * @param $settings
-		 */
-		protected function _fillOptionalEmailAddresses(&$settings) {
-			foreach ($this->_optionalEmailFields as $field) {
-				if (empty($settings[$field])) {
-					$settings[$field] = $settings['forum_email'];
-				}
-			}
-		}
-
-	}
\ No newline at end of file
+    App::uses('AppSettingModel', 'Lib/Model');
+
+    class Setting extends AppSettingModel {
+
+        public $name = 'Setting';
+
+        public $primaryKey = 'name';
+
+        public $validate = [
+            'name' => [
+                'rule' => ['between', 1, 255],
+                'allowEmpty' => false
+            ],
+            'value' => [
+                'rule' => ['between', 0, 255],
+                'allowEmpty' => true
+            ]
+        ];
+
+        protected $_optionalEmailFields = [
+            'email_contact', 'email_register', 'email_system'
+        ];
+
+        /* @td getSettings vs Load why to functions? */
+
+        /**
+         * Reads settings from DB and returns them in a compact array
+         *
+         * Note that this is the stored config in the DB. It may differ from the
+         * current config used by the app in Config::read('Saito.Settings'), e.g.
+         * when modified with a load-preset.
+         *
+         * @throws UnexpectedValueException
+         * @return array Settings
+         */
+        public function getSettings() {
+            $settings = $this->find('all');
+            if (empty($settings)) {
+                throw new UnexpectedValueException('No settings found in settings table.');
+            }
+            $settings = $this->_compactKeyValue($settings);
+
+            // edit_delay is normed to seconds
+            $this->_normToSeconds($settings, 'edit_delay');
+            $this->_fillOptionalEmailAddresses($settings);
+
+            return $settings;
+        }
+
+        /**
+         * Loads settings from storage into Configuration `Saito.Settings`
+         *
+         * @param array $preset allows to overwrite loaded values
+         * @return array Settings
+         */
+        public function load($preset = []) {
+            Stopwatch::start('Settings->getSettings()');
+
+            $settings = Cache::read('Saito.appSettings');
+            if (empty($settings)) {
+                $settings = $this->getSettings();
+                Cache::write('Saito.appSettings', $settings);
+            }
+            if ($preset) {
+                $settings = $preset + $settings;
+            }
+            Configure::write('Saito.Settings', $settings);
+
+            Stopwatch::end('Settings->getSettings()');
+        }
+
+        public function clearCache() {
+            parent::clearCache();
+            Cache::delete('Saito.appSettings');
+        }
+
+        /**
+         * Returns a key-value array
+         *
+         * Fast version of Set::combine($results, '{n}.Setting.name', '{n}.Setting.value');
+         *
+         * @param array $results
+         * @return array
+         */
+        protected function _compactKeyValue($results) {
+            $settings = array();
+            foreach ($results as $result) {
+                $settings[$result[$this->alias]['name']] = $result[$this->alias]['value'];
+            }
+            return $settings;
+        }
+
+        protected function _normToSeconds(&$settings, $field) {
+            $settings[$field] = (int)$settings[$field] * 60;
+        }
+
+        /**
+         * Defaults optional email addresses to main address
+         *
+         * @param $settings
+         */
+        protected function _fillOptionalEmailAddresses(&$settings) {
+            foreach ($this->_optionalEmailFields as $field) {
+                if (empty($settings[$field])) {
+                    $settings[$field] = $settings['forum_email'];
+                }
+            }
+        }
+
+    }
\ No newline at end of file

app/Model/UserRead.php

Indentation +143 added lines, -143 removed lines

@@ -1,145 +1,145 @@
 <?php
 
-	App::uses('AppModel', 'Model');
-
-	/**
-	 * UserRead Model
-	 *
-	 * @property User $User
-	 */
-	class UserRead extends AppModel {
-
-		/**
-		 * Caches user entries over multiple validations
-		 *
-		 * Esp. when many rows are set via Mix-view request
-		 *
-		 * @var array
-		 */
-		protected $_userCache = null;
-
-		public $actsAs = ['Containable'];
-
-		/**
-		 * belongsTo associations
-		 *
-		 * @var array
-		 */
-		public $belongsTo = [
-				'User' => [
-						'className' => 'User',
-						'foreignKey' => 'user_id',
-						'conditions' => '',
-						'fields' => '',
-						'order' => ''
-				]
-		];
-
-		/**
-		 * sets $entriesIds as read for user $userId
-		 *
-		 * @param array $entriesId [3, 4, 34]
-		 * @param int $userId
-		 */
-		public function setEntriesForUser($entriesId, $userId) {
-			// filter out duplicates
-			$userEntries = $this->getUser($userId);
-			$entriesToSave = array_diff($entriesId, $userEntries);
-
-			if (empty($entriesToSave)) {
-				return;
-			}
-
-			$data = [];
-			foreach ($entriesToSave as $entryId) {
-				$this->_userCache[$userId][$entryId] = $entryId;
-				$data[] = [
-						'entry_id' => $entryId,
-						'user_id' => $userId
-				];
-			}
-			$this->create();
-			$this->saveMany($data);
-		}
-
-		/**
-		 * gets all read postings of user with id $userId
-		 *
-		 * @param int $userId
-		 * @return array [1 => 1, 3 => 3]
-		 */
-		public function getUser($userId) {
-			if (isset($this->_userCache[$userId])) {
-				return $this->_userCache[$userId];
-			}
-
-			Stopwatch::start('UserRead::getUser()');
-			$readPostings = $this->find('all',
-					[
-							'conditions' => ['user_id' => $userId],
-							'order' => $this->alias . '.entry_id',
-							'contain' => false
-					]);
-
-			$read = [];
-			foreach ($readPostings as $posting) {
-				$id = (int)$posting[$this->alias]['entry_id'];
-				$read[$id] = $id;
-			}
-			$this->_userCache[$userId] = $read;
-			Stopwatch::stop('UserRead::getUser()');
-
-			return $this->_userCache[$userId];
-		}
-
-		/**
-		 * deletes entries with lower entry-ID than $entryId
-		 *
-		 * @param $entryId
-		 * @throws InvalidArgumentException
-		 */
-		public function deleteEntriesBefore($entryId) {
-			if (empty($entryId)) {
-				throw new InvalidArgumentException;
-			}
-			$this->_userCache = null;
-			$this->deleteAll([$this->alias . '.entry_id <' => $entryId],
-					false,
-					false);
-		}
-
-		/**
-		 * deletes entries with lower entry-ID than $entryId from user $userId
-		 *
-		 * @param $userId
-		 * @param $entryId
-		 * @throws InvalidArgumentException
-		 */
-		public function deleteUserEntriesBefore($userId, $entryId) {
-			if (empty($userId) || empty($entryId)) {
-				throw new InvalidArgumentException;
-			}
-			$this->_userCache = null;
-			$this->deleteAll([
-							$this->alias . '.entry_id <' => $entryId,
-							$this->alias . '.user_id' => $userId
-					],
-					false,
-					false);
-		}
-
-		/**
-		 * deletes entries from user $userId
-		 *
-		 * @param $userId
-		 * @throws InvalidArgumentException
-		 */
-		public function deleteAllFromUser($userId) {
-			if (empty($userId)) {
-				throw new InvalidArgumentException;
-			}
-			$this->_userCache = null;
-			$this->deleteAll(['user_id' => $userId], false, false);
-		}
-
-	}
+    App::uses('AppModel', 'Model');
+
+    /**
+     * UserRead Model
+     *
+     * @property User $User
+     */
+    class UserRead extends AppModel {
+
+        /**
+         * Caches user entries over multiple validations
+         *
+         * Esp. when many rows are set via Mix-view request
+         *
+         * @var array
+         */
+        protected $_userCache = null;
+
+        public $actsAs = ['Containable'];
+
+        /**
+         * belongsTo associations
+         *
+         * @var array
+         */
+        public $belongsTo = [
+                'User' => [
+                        'className' => 'User',
+                        'foreignKey' => 'user_id',
+                        'conditions' => '',
+                        'fields' => '',
+                        'order' => ''
+                ]
+        ];
+
+        /**
+         * sets $entriesIds as read for user $userId
+         *
+         * @param array $entriesId [3, 4, 34]
+         * @param int $userId
+         */
+        public function setEntriesForUser($entriesId, $userId) {
+            // filter out duplicates
+            $userEntries = $this->getUser($userId);
+            $entriesToSave = array_diff($entriesId, $userEntries);
+
+            if (empty($entriesToSave)) {
+                return;
+            }
+
+            $data = [];
+            foreach ($entriesToSave as $entryId) {
+                $this->_userCache[$userId][$entryId] = $entryId;
+                $data[] = [
+                        'entry_id' => $entryId,
+                        'user_id' => $userId
+                ];
+            }
+            $this->create();
+            $this->saveMany($data);
+        }
+
+        /**
+         * gets all read postings of user with id $userId
+         *
+         * @param int $userId
+         * @return array [1 => 1, 3 => 3]
+         */
+        public function getUser($userId) {
+            if (isset($this->_userCache[$userId])) {
+                return $this->_userCache[$userId];
+            }
+
+            Stopwatch::start('UserRead::getUser()');
+            $readPostings = $this->find('all',
+                    [
+                            'conditions' => ['user_id' => $userId],
+                            'order' => $this->alias . '.entry_id',
+                            'contain' => false
+                    ]);
+
+            $read = [];
+            foreach ($readPostings as $posting) {
+                $id = (int)$posting[$this->alias]['entry_id'];
+                $read[$id] = $id;
+            }
+            $this->_userCache[$userId] = $read;
+            Stopwatch::stop('UserRead::getUser()');
+
+            return $this->_userCache[$userId];
+        }
+
+        /**
+         * deletes entries with lower entry-ID than $entryId
+         *
+         * @param $entryId
+         * @throws InvalidArgumentException
+         */
+        public function deleteEntriesBefore($entryId) {
+            if (empty($entryId)) {
+                throw new InvalidArgumentException;
+            }
+            $this->_userCache = null;
+            $this->deleteAll([$this->alias . '.entry_id <' => $entryId],
+                    false,
+                    false);
+        }
+
+        /**
+         * deletes entries with lower entry-ID than $entryId from user $userId
+         *
+         * @param $userId
+         * @param $entryId
+         * @throws InvalidArgumentException
+         */
+        public function deleteUserEntriesBefore($userId, $entryId) {
+            if (empty($userId) || empty($entryId)) {
+                throw new InvalidArgumentException;
+            }
+            $this->_userCache = null;
+            $this->deleteAll([
+                            $this->alias . '.entry_id <' => $entryId,
+                            $this->alias . '.user_id' => $userId
+                    ],
+                    false,
+                    false);
+        }
+
+        /**
+         * deletes entries from user $userId
+         *
+         * @param $userId
+         * @throws InvalidArgumentException
+         */
+        public function deleteAllFromUser($userId) {
+            if (empty($userId)) {
+                throw new InvalidArgumentException;
+            }
+            $this->_userCache = null;
+            $this->deleteAll(['user_id' => $userId], false, false);
+        }
+
+    }

app/Model/SmileyCode.php

Indentation +11 added lines, -11 removed lines

@@ -1,18 +1,18 @@
 <?php
 
-	App::uses('AppSettingModel', 'Lib/Model');
+    App::uses('AppSettingModel', 'Lib/Model');
 
-	class SmileyCode extends AppSettingModel {
+    class SmileyCode extends AppSettingModel {
 
-		public $name = 'SmileyCode';
+        public $name = 'SmileyCode';
 
-		public $displayField = 'code';
+        public $displayField = 'code';
 
-		public $belongsTo = [
-			'Smiley' => [
-				'className' => 'Smiley',
-				'foreignKey' => 'smiley_id'
-			]
-		];
+        public $belongsTo = [
+            'Smiley' => [
+                'className' => 'Smiley',
+                'foreignKey' => 'smiley_id'
+            ]
+        ];
 
-	}
+    }