Schlaefer / Saito

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'
+            ]
+        ];
 
-	}
+    }

app/Model/Entry.php

Indentation +935 added lines, -935 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-	use Saito\User\ForumsUserInterface;
+    use Saito\User\ForumsUserInterface;
 
-	App::uses('AppModel', 'Model');
+    App::uses('AppModel', 'Model');
 
 /**
  *
@@ -23,225 +23,225 @@ 
  * @td After mlf is gone `edited_by` should conatin a User.id, not the username string.
  *
  */
-	class Entry extends AppModel {
-
-		public $name = 'Entry';
-
-		public $primaryKey = 'id';
-
-		public $actsAs = [
-			'Markup',
-			'Containable',
-			'Search.Searchable',
-			'Tree'
-		];
-
-		public $findMethods = array(
-			'feed' => true,
-			'entry' => true
-		);
-
-		/**
-		 * Fields for search plugin
-		 *
-		 * @var array
-		 */
-		public $filterArgs = [
-				'subject' => ['type' => 'like'],
-				'text' => ['type' => 'like'],
-				'name' => ['type' => 'like'],
-				'category_id' => ['type' => 'value'],
-		];
-
-		public $belongsTo = array(
-			'Category' => array(
-				'className' => 'Category',
-				'foreignKey' => 'category_id',
-			),
-			'User' => array(
-				'className' => 'User',
-				'foreignKey' => 'user_id',
-				'counterCache' => true,
-			),
-		);
-
-		public $hasMany = array(
-			'Bookmark' => array(
-				'foreignKey' => 'entry_id',
-				'dependent' => true,
-			),
-			'Esevent' => array(
-				'foreignKey' => 'subject',
-				'conditions' => array('Esevent.subject' => 'Entry.id'),
-			),
-			'UserRead' => [
-				'foreignKey' => 'entry_id',
-				'dependent' => true
-			]
-		);
-
-		public $validate = [
-				'subject' => [
-						'notEmpty' => ['rule' => 'notBlank'],
-						'maxLength' => ['rule' => 'validateSubjectMaxLength']
-				],
-				'category_id' => [
-						'notEmpty' => ['rule' => 'notBlank'],
-						'numeric' => ['rule' => 'numeric'],
-						'isAllowed' => ['rule' => 'validateCategoryIsAllowed']
-				],
-				'user_id' => ['rule' => 'numeric'],
-				'views' => ['rule' => ['comparison', '>=', 0]],
-			// used in full text search
-				'name' => array()
-		];
-
-		/**
-		 * Fields allowed in public output
-		 *
-		 * @var array
-		 */
-		protected $_allowedPublicOutputFields = [
-			'Entry.id',
-			'Entry.pid',
-			'Entry.tid',
-			'Entry.time',
-			'Entry.last_answer',
-			'Entry.edited',
-			'Entry.edited_by',
-			'Entry.user_id',
-			'Entry.name',
-			'Entry.subject',
-			'Entry.category_id',
-			'Entry.text',
-			'Entry.locked',
-			'Entry.fixed',
-			'Entry.views',
-			'User.username'
-		];
-
-		/**
-		 * field list necessary for displaying a thread_line
-		 *
-		 * Entry.text determine if Entry is n/t
-		 *
-		 * @var string
-		 */
-		public $threadLineFieldList = [
-			'Entry.id',
-			'Entry.pid',
-			'Entry.tid',
-			'Entry.subject',
-			'Entry.text',
-			'Entry.time',
-			'Entry.fixed',
-			'Entry.last_answer',
-			'Entry.views',
-			'Entry.user_id',
-			'Entry.locked',
-			'Entry.name',
-			'Entry.solves',
-
-			'User.username',
-
-			'Category.accession',
-			'Category.category',
-			'Category.description'
-		];
-
-		/**
-		 * fields additional to $threadLineFieldList to show complete entry
-		 *
-		 * @var string
-		 */
-		public $showEntryFieldListAdditional = [
-			'Entry.edited',
-			'Entry.edited_by',
-			'Entry.ip',
-			'Entry.category_id',
-
-			'User.id',
-			'User.signature',
-			'User.user_place'
-		];
-
-		/**
-		 * Allowed external user input
-		 *
-		 * @var array
-		 */
-		public $allowedInputFields = [
-			'create' => [
-				'category_id',
-				'pid',
-				'subject',
-				'text'
-			],
-			'update' => [
-				'id',
-				'category_id',
-				'subject',
-				'text'
-			]
-		];
-
-		protected $_settings = [
-			'edit_period' => 20,
-			'subject_maxlength' => 100
-		];
+    class Entry extends AppModel {
+
+        public $name = 'Entry';
+
+        public $primaryKey = 'id';
+
+        public $actsAs = [
+            'Markup',
+            'Containable',
+            'Search.Searchable',
+            'Tree'
+        ];
+
+        public $findMethods = array(
+            'feed' => true,
+            'entry' => true
+        );
+
+        /**
+         * Fields for search plugin
+         *
+         * @var array
+         */
+        public $filterArgs = [
+                'subject' => ['type' => 'like'],
+                'text' => ['type' => 'like'],
+                'name' => ['type' => 'like'],
+                'category_id' => ['type' => 'value'],
+        ];
+
+        public $belongsTo = array(
+            'Category' => array(
+                'className' => 'Category',
+                'foreignKey' => 'category_id',
+            ),
+            'User' => array(
+                'className' => 'User',
+                'foreignKey' => 'user_id',
+                'counterCache' => true,
+            ),
+        );
+
+        public $hasMany = array(
+            'Bookmark' => array(
+                'foreignKey' => 'entry_id',
+                'dependent' => true,
+            ),
+            'Esevent' => array(
+                'foreignKey' => 'subject',
+                'conditions' => array('Esevent.subject' => 'Entry.id'),
+            ),
+            'UserRead' => [
+                'foreignKey' => 'entry_id',
+                'dependent' => true
+            ]
+        );
+
+        public $validate = [
+                'subject' => [
+                        'notEmpty' => ['rule' => 'notBlank'],
+                        'maxLength' => ['rule' => 'validateSubjectMaxLength']
+                ],
+                'category_id' => [
+                        'notEmpty' => ['rule' => 'notBlank'],
+                        'numeric' => ['rule' => 'numeric'],
+                        'isAllowed' => ['rule' => 'validateCategoryIsAllowed']
+                ],
+                'user_id' => ['rule' => 'numeric'],
+                'views' => ['rule' => ['comparison', '>=', 0]],
+            // used in full text search
+                'name' => array()
+        ];
+
+        /**
+         * Fields allowed in public output
+         *
+         * @var array
+         */
+        protected $_allowedPublicOutputFields = [
+            'Entry.id',
+            'Entry.pid',
+            'Entry.tid',
+            'Entry.time',
+            'Entry.last_answer',
+            'Entry.edited',
+            'Entry.edited_by',
+            'Entry.user_id',
+            'Entry.name',
+            'Entry.subject',
+            'Entry.category_id',
+            'Entry.text',
+            'Entry.locked',
+            'Entry.fixed',
+            'Entry.views',
+            'User.username'
+        ];
+
+        /**
+         * field list necessary for displaying a thread_line
+         *
+         * Entry.text determine if Entry is n/t
+         *
+         * @var string
+         */
+        public $threadLineFieldList = [
+            'Entry.id',
+            'Entry.pid',
+            'Entry.tid',
+            'Entry.subject',
+            'Entry.text',
+            'Entry.time',
+            'Entry.fixed',
+            'Entry.last_answer',
+            'Entry.views',
+            'Entry.user_id',
+            'Entry.locked',
+            'Entry.name',
+            'Entry.solves',
+
+            'User.username',
+
+            'Category.accession',
+            'Category.category',
+            'Category.description'
+        ];
+
+        /**
+         * fields additional to $threadLineFieldList to show complete entry
+         *
+         * @var string
+         */
+        public $showEntryFieldListAdditional = [
+            'Entry.edited',
+            'Entry.edited_by',
+            'Entry.ip',
+            'Entry.category_id',
+
+            'User.id',
+            'User.signature',
+            'User.user_place'
+        ];
+
+        /**
+         * Allowed external user input
+         *
+         * @var array
+         */
+        public $allowedInputFields = [
+            'create' => [
+                'category_id',
+                'pid',
+                'subject',
+                'text'
+            ],
+            'update' => [
+                'id',
+                'category_id',
+                'subject',
+                'text'
+            ]
+        ];
+
+        protected $_settings = [
+            'edit_period' => 20,
+            'subject_maxlength' => 100
+        ];
 
 /**
  * Caching for isRoot()
  *
  * @var array
  */
-		protected $_isRoot = [];
-
-		/**
-		 * @param ForumsUserInterface $User
-		 * @param array $options
-		 * @return array|mixed
-		 */
-		public function getRecentEntries(CurrentUserComponent $User, array $options = []) {
-			Stopwatch::start('Model->User->getRecentEntries()');
-
-			$options += [
-				'user_id' => null,
-				'limit' => 10,
-				'category_id' => $User->Categories->getAllowed()
-			];
-
-			$_cacheKey = 'Entry.recentEntries-' . md5(serialize($options));
-			$_cachedEntry = Cache::read($_cacheKey, 'entries');
-			if ($_cachedEntry) {
-				Stopwatch::stop('Model->User->getRecentEntries()');
-				return $_cachedEntry;
-			}
-
-			$conditions = array();
-			if ($options['user_id'] !== null) {
-				$conditions[]['Entry.user_id'] = $options['user_id'];
-			}
-			if ($options['category_id'] !== null):
-				$conditions[]['Entry.category_id'] = $options['category_id'];
-			endif;
-
-			$result = $this->find(
-				'all',
-				[
-					'contain' => array('User', 'Category'),
-					'fields' => $this->threadLineFieldList,
-					'conditions' => $conditions,
-					'limit' => $options['limit'],
-					'order' => 'time DESC'
-				]
-			);
-
-			Cache::write($_cacheKey, $result, 'entries');
-
-			Stopwatch::stop('Model->User->getRecentEntries()');
-			return $result;
-		}
+        protected $_isRoot = [];
+
+        /**
+         * @param ForumsUserInterface $User
+         * @param array $options
+         * @return array|mixed
+         */
+        public function getRecentEntries(CurrentUserComponent $User, array $options = []) {
+            Stopwatch::start('Model->User->getRecentEntries()');
+
+            $options += [
+                'user_id' => null,
+                'limit' => 10,
+                'category_id' => $User->Categories->getAllowed()
+            ];
+
+            $_cacheKey = 'Entry.recentEntries-' . md5(serialize($options));
+            $_cachedEntry = Cache::read($_cacheKey, 'entries');
+            if ($_cachedEntry) {
+                Stopwatch::stop('Model->User->getRecentEntries()');
+                return $_cachedEntry;
+            }
+
+            $conditions = array();
+            if ($options['user_id'] !== null) {
+                $conditions[]['Entry.user_id'] = $options['user_id'];
+            }
+            if ($options['category_id'] !== null):
+                $conditions[]['Entry.category_id'] = $options['category_id'];
+            endif;
+
+            $result = $this->find(
+                'all',
+                [
+                    'contain' => array('User', 'Category'),
+                    'fields' => $this->threadLineFieldList,
+                    'conditions' => $conditions,
+                    'limit' => $options['limit'],
+                    'order' => 'time DESC'
+                ]
+            );
+
+            Cache::write($_cacheKey, $result, 'entries');
+
+            Stopwatch::stop('Model->User->getRecentEntries()');
+            return $result;
+        }
 
 /**
  * Finds the thread-id for a posting
@@ -250,233 +250,233 @@ 
  * @return int Thread-Id
  * @throws UnexpectedValueException
  */
-		public function getThreadId($id) {
-			$entry = $this->find(
-				'first',
-				[
-					'contain' => false,
-					'conditions' => ['Entry.id' => $id],
-					'fields' => 'Entry.tid'
-
-				]
-			);
-			if ($entry == false) {
-				throw new UnexpectedValueException('Posting not found. Posting-Id: ' . $id);
-			}
-			return $entry['Entry']['tid'];
-		}
+        public function getThreadId($id) {
+            $entry = $this->find(
+                'first',
+                [
+                    'contain' => false,
+                    'conditions' => ['Entry.id' => $id],
+                    'fields' => 'Entry.tid'
+
+                ]
+            );
+            if ($entry == false) {
+                throw new UnexpectedValueException('Posting not found. Posting-Id: ' . $id);
+            }
+            return $entry['Entry']['tid'];
+        }
 
 /**
  * Shorthand for reading an entry with full data
  */
-		public function get($id) {
-			return $this->find('entry',
-					['conditions' => [$this->alias . '.id' => $id]]);
-		}
+        public function get($id) {
+            return $this->find('entry',
+                    ['conditions' => [$this->alias . '.id' => $id]]);
+        }
 
 /**
  * @param $id
  * @return mixed
  * @throws UnexpectedValueException
  */
-		public function getParentId($id) {
-			$entry = $this->find(
-				'first',
-				[
-					'contain' => false,
-					'conditions' => ['Entry.id' => $id],
-					'fields' => 'Entry.pid'
-
-				]
-			);
-			if ($entry == false) {
-				throw new UnexpectedValueException('Posting not found. Posting-Id: ' . $id);
-			}
-			return $entry['Entry']['pid'];
-		}
-
-		/**
-		 * creates a new root or child entry for a node
-		 *
-		 * fields in $data are filtered
-		 *
-		 * @param $data
-		 * @return array|bool|mixed
-		 */
-		public function createPosting($data) {
-			if (!isset($data[$this->alias]['pid'])) {
-				$data[$this->alias]['pid'] = 0;
-			}
-
-			if (isset($data[$this->alias]['subject']) === false) {
-				return false;
-			}
-
-			try {
-				$this->prepare($data, ['preFilterFields' => 'create']);
-			} catch (Exception $e) {
-				return false;
-			}
-
-			$data[$this->alias]['user_id'] = $this->CurrentUser->getId();
-			$data[$this->alias]['name'] = $this->CurrentUser['username'];
-
-			$data[$this->alias]['time'] = bDate();
-			$data[$this->alias]['last_answer'] = bDate();
-			$data[$this->alias]['ip'] = self::_getIp();
-
-			$this->create();
-			$_newPosting = $this->save($data);
-
-			if ($_newPosting === false) {
-				return false;
-			}
-
-			$_newPostingId = $this->id;
-
-			// make sure we pass the complete ['Entry'] dataset to events
-			$this->contain();
-			$_newPosting = $this->read();
-
-			if ($this->isRoot($data)) {
-				// thread-id of new thread is its own id
-				if ($this->save(['tid' => $_newPostingId], false, ['tid']) === false) {
-					// @td raise error and/or roll back new entry
-					return false;
-				} else {
-					$_newPosting[$this->alias]['tid'] = $_newPostingId;
-					$this->Category->id = $data[$this->alias]['category_id'];
-					$this->Category->updateThreadCounter();
-				}
-				$this->_dispatchEvent(
-					'Model.Thread.create',
-					[
-						'subject' => $_newPosting[$this->alias]['id'],
-						'data' => $_newPosting
-					]
-				);
-			} else {
-				// update last answer time of root entry
-				$this->clear();
-				$this->id = $_newPosting[$this->alias]['tid'];
-				$this->set('last_answer', $_newPosting[$this->alias]['last_answer']);
-				if ($this->save() === false) {
-					// @td raise error and/or roll back new entry
-					return false;
-				}
-
-				$this->_dispatchEvent(
-					'Model.Entry.replyToEntry',
-					[
-						'subject' => $_newPosting[$this->alias]['pid'],
-						'data' => $_newPosting
-					]
-				);
-				$this->_dispatchEvent(
-					'Model.Entry.replyToThread',
-					[
-						'subject' => $_newPosting[$this->alias]['tid'],
-						'data' => $_newPosting
-					]
-				);
-			}
-
-			$this->id = $_newPostingId;
-			$_newPosting[$this->alias]['subject'] = Sanitize::html($_newPosting[$this->alias]['subject']);
-			$_newPosting[$this->alias]['text'] = Sanitize::html($_newPosting[$this->alias]['text']);
-			return $_newPosting;
-		}
-
-		/**
-		 * Updates a posting
-		 *
-		 * fields in $data are filtered except for $id!
-		 *
-		 * @param $data
-		 * @param null $CurrentUser
-		 * @return array|mixed
-		 * @throws NotFoundException
-		 * @throws InvalidArgumentException
-		 */
-		public function update($data, $CurrentUser = null) {
-			if ($CurrentUser !== null) {
-				$this->CurrentUser = $CurrentUser;
-			}
-
-			if (empty($data[$this->alias]['id'])) {
-				throw new InvalidArgumentException('Missing entry id in arguments.');
-			}
-
-			$id = $data[$this->alias]['id'];
-			if (!$this->exists($id)) {
-				throw new NotFoundException(sprintf('Entry with id `%s` not found.', $id));
-			}
-
-			$this->prepare($data, ['preFilterFields' => 'update']);
-
-			// prevents normal user of changing category of complete thread when answering
-			// @todo this should be refactored together with the change category handling in beforeSave()
-			if ($this->isRoot($data) === false) {
-				unset($data[$this->alias]['category_id']);
-			}
-
-			$data[$this->alias]['edited'] = bDate();
-			$data[$this->alias]['edited_by'] = $this->CurrentUser['username'];
-
-			$this->validator()->add(
-				'edited_by',
-				'isEditingAllowed',
-				[
-					'rule' => 'validateEditingAllowed'
-				]
-			);
-
-			$result = $this->save($data);
-
-			if ($result) {
-				$this->contain();
-				$result = $this->read() + $data;
-				$this->_dispatchEvent(
-					'Model.Entry.update',
-					[
-						'subject' => $result[$this->alias]['id'],
-						'data' => $result
-					]
-				);
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Update view counter on all entries in a thread
-		 *
-		 * Note that this function unbinds the model associations for performance.
-		 * Otherwise updateAll() left joins all associated models.
-		 *
-		 * @param $tid thread-ID
-		 * @param $uid entries with this user-id are not updated
-		 */
-		public function threadIncrementViews($tid, $uid = null) {
-			Stopwatch::start('Entry::threadIncrementViews');
-			$_where = ['Entry.tid' => $tid];
-			if ($uid && is_int($uid)) {
-				$_where['Entry.user_id !='] = $uid;
-			}
-			// $_belongsTo = $this->belongsTo;
-			$this->unbindModel(['belongsTo' => array_keys($this->belongsTo)]);
-			$this->updateAll(['Entry.views' => 'Entry.views + 1'], $_where);
-			// $this->bindModel(['belongsTo' => $_belongsTo]);
-			Stopwatch::stop('Entry::threadIncrementViews');
-		}
+        public function getParentId($id) {
+            $entry = $this->find(
+                'first',
+                [
+                    'contain' => false,
+                    'conditions' => ['Entry.id' => $id],
+                    'fields' => 'Entry.pid'
+
+                ]
+            );
+            if ($entry == false) {
+                throw new UnexpectedValueException('Posting not found. Posting-Id: ' . $id);
+            }
+            return $entry['Entry']['pid'];
+        }
+
+        /**
+         * creates a new root or child entry for a node
+         *
+         * fields in $data are filtered
+         *
+         * @param $data
+         * @return array|bool|mixed
+         */
+        public function createPosting($data) {
+            if (!isset($data[$this->alias]['pid'])) {
+                $data[$this->alias]['pid'] = 0;
+            }
+
+            if (isset($data[$this->alias]['subject']) === false) {
+                return false;
+            }
+
+            try {
+                $this->prepare($data, ['preFilterFields' => 'create']);
+            } catch (Exception $e) {
+                return false;
+            }
+
+            $data[$this->alias]['user_id'] = $this->CurrentUser->getId();
+            $data[$this->alias]['name'] = $this->CurrentUser['username'];
+
+            $data[$this->alias]['time'] = bDate();
+            $data[$this->alias]['last_answer'] = bDate();
+            $data[$this->alias]['ip'] = self::_getIp();
+
+            $this->create();
+            $_newPosting = $this->save($data);
+
+            if ($_newPosting === false) {
+                return false;
+            }
+
+            $_newPostingId = $this->id;
+
+            // make sure we pass the complete ['Entry'] dataset to events
+            $this->contain();
+            $_newPosting = $this->read();
+
+            if ($this->isRoot($data)) {
+                // thread-id of new thread is its own id
+                if ($this->save(['tid' => $_newPostingId], false, ['tid']) === false) {
+                    // @td raise error and/or roll back new entry
+                    return false;
+                } else {
+                    $_newPosting[$this->alias]['tid'] = $_newPostingId;
+                    $this->Category->id = $data[$this->alias]['category_id'];
+                    $this->Category->updateThreadCounter();
+                }
+                $this->_dispatchEvent(
+                    'Model.Thread.create',
+                    [
+                        'subject' => $_newPosting[$this->alias]['id'],
+                        'data' => $_newPosting
+                    ]
+                );
+            } else {
+                // update last answer time of root entry
+                $this->clear();
+                $this->id = $_newPosting[$this->alias]['tid'];
+                $this->set('last_answer', $_newPosting[$this->alias]['last_answer']);
+                if ($this->save() === false) {
+                    // @td raise error and/or roll back new entry
+                    return false;
+                }
+
+                $this->_dispatchEvent(
+                    'Model.Entry.replyToEntry',
+                    [
+                        'subject' => $_newPosting[$this->alias]['pid'],
+                        'data' => $_newPosting
+                    ]
+                );
+                $this->_dispatchEvent(
+                    'Model.Entry.replyToThread',
+                    [
+                        'subject' => $_newPosting[$this->alias]['tid'],
+                        'data' => $_newPosting
+                    ]
+                );
+            }
+
+            $this->id = $_newPostingId;
+            $_newPosting[$this->alias]['subject'] = Sanitize::html($_newPosting[$this->alias]['subject']);
+            $_newPosting[$this->alias]['text'] = Sanitize::html($_newPosting[$this->alias]['text']);
+            return $_newPosting;
+        }
+
+        /**
+         * Updates a posting
+         *
+         * fields in $data are filtered except for $id!
+         *
+         * @param $data
+         * @param null $CurrentUser
+         * @return array|mixed
+         * @throws NotFoundException
+         * @throws InvalidArgumentException
+         */
+        public function update($data, $CurrentUser = null) {
+            if ($CurrentUser !== null) {
+                $this->CurrentUser = $CurrentUser;
+            }
+
+            if (empty($data[$this->alias]['id'])) {
+                throw new InvalidArgumentException('Missing entry id in arguments.');
+            }
+
+            $id = $data[$this->alias]['id'];
+            if (!$this->exists($id)) {
+                throw new NotFoundException(sprintf('Entry with id `%s` not found.', $id));
+            }
+
+            $this->prepare($data, ['preFilterFields' => 'update']);
+
+            // prevents normal user of changing category of complete thread when answering
+            // @todo this should be refactored together with the change category handling in beforeSave()
+            if ($this->isRoot($data) === false) {
+                unset($data[$this->alias]['category_id']);
+            }
+
+            $data[$this->alias]['edited'] = bDate();
+            $data[$this->alias]['edited_by'] = $this->CurrentUser['username'];
+
+            $this->validator()->add(
+                'edited_by',
+                'isEditingAllowed',
+                [
+                    'rule' => 'validateEditingAllowed'
+                ]
+            );
+
+            $result = $this->save($data);
+
+            if ($result) {
+                $this->contain();
+                $result = $this->read() + $data;
+                $this->_dispatchEvent(
+                    'Model.Entry.update',
+                    [
+                        'subject' => $result[$this->alias]['id'],
+                        'data' => $result
+                    ]
+                );
+            }
+
+            return $result;
+        }
+
+        /**
+         * Update view counter on all entries in a thread
+         *
+         * Note that this function unbinds the model associations for performance.
+         * Otherwise updateAll() left joins all associated models.
+         *
+         * @param $tid thread-ID
+         * @param $uid entries with this user-id are not updated
+         */
+        public function threadIncrementViews($tid, $uid = null) {
+            Stopwatch::start('Entry::threadIncrementViews');
+            $_where = ['Entry.tid' => $tid];
+            if ($uid && is_int($uid)) {
+                $_where['Entry.user_id !='] = $uid;
+            }
+            // $_belongsTo = $this->belongsTo;
+            $this->unbindModel(['belongsTo' => array_keys($this->belongsTo)]);
+            $this->updateAll(['Entry.views' => 'Entry.views + 1'], $_where);
+            // $this->bindModel(['belongsTo' => $_belongsTo]);
+            Stopwatch::stop('Entry::threadIncrementViews');
+        }
 
 /**
  *
  * @mb `views` into extra related table if performance becomes a problem
  */
-		public function incrementViews($id, $amount = 1) {
-			$this->increment($id, 'views', $amount);
-		}
+        public function incrementViews($id, $amount = 1) {
+            $this->increment($id, 'views', $amount);
+        }
 
 /**
  * tree of a single node and its subentries
@@ -489,77 +489,77 @@ 
  * @param array $options
  * @return array tree
  */
-		public function treeForNode($id, $options = array()) {
-			$options += [
-				'root' => false,
-				'complete' => false
-			];
-
-			if ($options['root']) {
-				$tid = $id;
-			} else {
-				$tid = $this->getThreadId($id);
-			}
-
-			$fields = null;
-			if ($options['complete']) {
-				$fields = array_merge($this->threadLineFieldList, $this->showEntryFieldListAdditional);
-			}
-
-			$tree = $this->treesForThreads([$tid], null, $fields);
-
-			if ((int)$tid !== (int)$id) {
-				$tree = $this->treeGetSubtree($tree, $id);
-			}
-
-			return $tree;
-		}
-
-		/**
-		 * trees for multiple tids
-		 *
-		 * @param $ids
-		 * @param null $order
-		 * @param null $fieldlist
-		 * @return array|bool false if no threads or array with Posting
-		 */
-		public function treesForThreads($ids, $order = null, $fieldlist = null) {
-			if (empty($ids)) {
-				return [];
-			}
-
-			Stopwatch::start('Model->Entries->treeForThreads() DB');
-
-			if (empty($order)) {
-				$order = 'last_answer ASC';
-			}
-
-			if ($fieldlist === null) {
-				$fieldlist = $this->threadLineFieldList;
-			}
-
-			$entries = $this->_getThreadEntries(
-				$ids,
-				['order' => $order, 'fields' => $fieldlist]
-			);
-
-			Stopwatch::stop('Model->Entries->treeForThreads() DB');
-			Stopwatch::start('Model->Entries->treeForThreads() CPU');
-
-			$threads = false;
-			if ($entries) {
-				$threads = [];
-				$entries = $this->treeBuild($entries);
-				foreach ($entries as $thread) {
-					$id = (int)$thread['Entry']['tid'];
-					$threads[$id] = $thread;
-				}
-			}
-
-			Stopwatch::stop('Model->Entries->treeForThreads() CPU');
-
-			return $threads;
-		}
+        public function treeForNode($id, $options = array()) {
+            $options += [
+                'root' => false,
+                'complete' => false
+            ];
+
+            if ($options['root']) {
+                $tid = $id;
+            } else {
+                $tid = $this->getThreadId($id);
+            }
+
+            $fields = null;
+            if ($options['complete']) {
+                $fields = array_merge($this->threadLineFieldList, $this->showEntryFieldListAdditional);
+            }
+
+            $tree = $this->treesForThreads([$tid], null, $fields);
+
+            if ((int)$tid !== (int)$id) {
+                $tree = $this->treeGetSubtree($tree, $id);
+            }
+
+            return $tree;
+        }
+
+        /**
+         * trees for multiple tids
+         *
+         * @param $ids
+         * @param null $order
+         * @param null $fieldlist
+         * @return array|bool false if no threads or array with Posting
+         */
+        public function treesForThreads($ids, $order = null, $fieldlist = null) {
+            if (empty($ids)) {
+                return [];
+            }
+
+            Stopwatch::start('Model->Entries->treeForThreads() DB');
+
+            if (empty($order)) {
+                $order = 'last_answer ASC';
+            }
+
+            if ($fieldlist === null) {
+                $fieldlist = $this->threadLineFieldList;
+            }
+
+            $entries = $this->_getThreadEntries(
+                $ids,
+                ['order' => $order, 'fields' => $fieldlist]
+            );
+
+            Stopwatch::stop('Model->Entries->treeForThreads() DB');
+            Stopwatch::start('Model->Entries->treeForThreads() CPU');
+
+            $threads = false;
+            if ($entries) {
+                $threads = [];
+                $entries = $this->treeBuild($entries);
+                foreach ($entries as $thread) {
+                    $id = (int)$thread['Entry']['tid'];
+                    $threads[$id] = $thread;
+                }
+            }
+
+            Stopwatch::stop('Model->Entries->treeForThreads() CPU');
+
+            return $threads;
+        }
 
 /**
  * @param       $tid
@@ -574,82 +574,82 @@ 
  *  )
  * </pre>
  */
-		protected function _getThreadEntries($tid, array $params = []) {
-			$params += [
-				'fields' => $this->threadLineFieldList,
-				'order' => 'last_answer ASC'
-			];
-			$threads = $this->find(
-				'all',
-				[
-					'conditions' => ['tid' => $tid],
-					'contain' => ['User', 'Category'],
-					'fields' => $params['fields'],
-					'order' => $params['order']
-				]
-			);
-
-			return $threads;
-		}
-
-		/**
-		 * Marks a sub-entry as solution to a root entry
-		 *
-		 * @param $id
-		 * @return bool
-		 * @throws InvalidArgumentException
-		 * @throws ForbiddenException
-		 */
-		public function toggleSolve($id) {
-			$entry = $this->get($id);
-			if (empty($entry) || $this->isRoot($entry)) {
-				throw new InvalidArgumentException;
-			}
-
-			$root = $this->get($entry['Entry']['tid']);
-			if ((int)$root['User']['id'] !== $this->CurrentUser->getId()) {
-				throw new ForbiddenException;
-			}
-
-			if ($entry[$this->alias]['solves']) {
-				$value = 0;
-			} else {
-				$value = $entry[$this->alias]['tid'];
-			}
-			$this->id = $id;
-			$success = $this->saveField('solves', $value);
-			if (!$success) {
-				return $success;
-			}
-			$this->_dispatchEvent('Model.Entry.update',
-					['subject' => $id, 'data' => $entry]);
-			$entry[$this->alias]['solves'] = $value;
-			return $success;
-		}
-
-		public function toggle($key) {
-			$result = parent::toggle($key);
-			if ($key === 'locked') {
-				$this->_threadLock($result);
-			}
-
-			$this->contain();
-			$entry = $this->read();
-
-			$this->_dispatchEvent(
-				'Model.Entry.update',
-				[
-					'subject' => $entry[$this->alias]['id'],
-					'data' => $entry
-				]
-			);
-
-			return $result;
-		}
-
-		public function beforeFind($queryData) {
-			parent::beforeFind($queryData);
-			/*
+        protected function _getThreadEntries($tid, array $params = []) {
+            $params += [
+                'fields' => $this->threadLineFieldList,
+                'order' => 'last_answer ASC'
+            ];
+            $threads = $this->find(
+                'all',
+                [
+                    'conditions' => ['tid' => $tid],
+                    'contain' => ['User', 'Category'],
+                    'fields' => $params['fields'],
+                    'order' => $params['order']
+                ]
+            );
+
+            return $threads;
+        }
+
+        /**
+         * Marks a sub-entry as solution to a root entry
+         *
+         * @param $id
+         * @return bool
+         * @throws InvalidArgumentException
+         * @throws ForbiddenException
+         */
+        public function toggleSolve($id) {
+            $entry = $this->get($id);
+            if (empty($entry) || $this->isRoot($entry)) {
+                throw new InvalidArgumentException;
+            }
+
+            $root = $this->get($entry['Entry']['tid']);
+            if ((int)$root['User']['id'] !== $this->CurrentUser->getId()) {
+                throw new ForbiddenException;
+            }
+
+            if ($entry[$this->alias]['solves']) {
+                $value = 0;
+            } else {
+                $value = $entry[$this->alias]['tid'];
+            }
+            $this->id = $id;
+            $success = $this->saveField('solves', $value);
+            if (!$success) {
+                return $success;
+            }
+            $this->_dispatchEvent('Model.Entry.update',
+                    ['subject' => $id, 'data' => $entry]);
+            $entry[$this->alias]['solves'] = $value;
+            return $success;
+        }
+
+        public function toggle($key) {
+            $result = parent::toggle($key);
+            if ($key === 'locked') {
+                $this->_threadLock($result);
+            }
+
+            $this->contain();
+            $entry = $this->read();
+
+            $this->_dispatchEvent(
+                'Model.Entry.update',
+                [
+                    'subject' => $entry[$this->alias]['id'],
+                    'data' => $entry
+                ]
+            );
+
+            return $result;
+        }
+
+        public function beforeFind($queryData) {
+            parent::beforeFind($queryData);
+            /*
 				* workarround for possible cakephp join error for associated tables
 				* and virtual fields
 				*
@@ -659,17 +659,17 @@ 
 				*
 				* checkout in cakephp mailing list/bug tracker
 				*/
-			$this->User->virtualFields = null;
-		}
+            $this->User->virtualFields = null;
+        }
 
-		public function beforeValidate($options = array()) {
-			parent::beforeValidate($options);
+        public function beforeValidate($options = array()) {
+            parent::beforeValidate($options);
 
-			//* in n/t posting delete unnecessary body text
-			if (isset($this->data['Entry']['text'])) {
-				$this->data['Entry']['text'] = rtrim($this->data['Entry']['text']);
-			}
-		}
+            //* in n/t posting delete unnecessary body text
+            if (isset($this->data['Entry']['text'])) {
+                $this->data['Entry']['text'] = rtrim($this->data['Entry']['text']);
+            }
+        }
 
 /**
  * Deletes entry and all it's subentries and associated data
@@ -677,43 +677,43 @@ 
  * @return bool
  * @throws Exception
  */
-		public function deleteNode($id = null) {
-			if (empty($id)) {
-				$id = $this->id;
-			}
-
-			$this->contain();
-			$entry = $this->findById($id);
-
-			if (empty($entry)) {
-				throw new Exception;
-			}
-
-			$_idsToDelete = $this->getIdsForNode($id);
-			$success = $this->deleteAll(
-				[$this->alias . '.id' => $_idsToDelete],
-				true,
-				true
-			);
-
-			if ($success):
-				if ($this->isRoot($entry)) {
-					$this->Category->id = $entry['Entry']['category_id'];
-					$this->Category->updateThreadCounter();
-					$this->Esevent->deleteSubject($id, 'thread');
-				}
-				foreach ($_idsToDelete as $_entryId) {
-					$this->Esevent->deleteSubject($_entryId, 'entry');
-				}
-
-				$this->_dispatchEvent(
-					'Model.Thread.change',
-					['subject' => $entry[$this->alias]['tid']]
-				);
-			endif;
-
-			return $success;
-		}
+        public function deleteNode($id = null) {
+            if (empty($id)) {
+                $id = $this->id;
+            }
+
+            $this->contain();
+            $entry = $this->findById($id);
+
+            if (empty($entry)) {
+                throw new Exception;
+            }
+
+            $_idsToDelete = $this->getIdsForNode($id);
+            $success = $this->deleteAll(
+                [$this->alias . '.id' => $_idsToDelete],
+                true,
+                true
+            );
+
+            if ($success):
+                if ($this->isRoot($entry)) {
+                    $this->Category->id = $entry['Entry']['category_id'];
+                    $this->Category->updateThreadCounter();
+                    $this->Esevent->deleteSubject($id, 'thread');
+                }
+                foreach ($_idsToDelete as $_entryId) {
+                    $this->Esevent->deleteSubject($_entryId, 'entry');
+                }
+
+                $this->_dispatchEvent(
+                    'Model.Thread.change',
+                    ['subject' => $entry[$this->alias]['tid']]
+                );
+            endif;
+
+            return $success;
+        }
 
 /**
  * Get the ID of all subentries of and including entry $id
@@ -721,16 +721,16 @@ 
  * @param int $id
  * @return array Ids
  */
-		public function getIdsForNode($id) {
-			$subthread = $this->treeForNode($id);
-			$func = function (&$tree, &$entry) {
-				$tree['ids'][] = (int)$entry['Entry']['id'];
-			};
-			Entry::mapTreeElements($subthread, $func);
-			sort($subthread['ids']);
+        public function getIdsForNode($id) {
+            $subthread = $this->treeForNode($id);
+            $func = function (&$tree, &$entry) {
+                $tree['ids'][] = (int)$entry['Entry']['id'];
+            };
+            Entry::mapTreeElements($subthread, $func);
+            sort($subthread['ids']);
 
-			return $subthread['ids'];
-		}
+            return $subthread['ids'];
+        }
 
 /**
  * Anonymizes the entries for a user
@@ -739,24 +739,24 @@ 
  *
  * @return bool success
  */
-		public function anonymizeEntriesFromUser($userId) {
-			// remove username from all entries and reassign to anonyme user
-			$success = $this->updateAll(
-				[
-					'Entry.name' => "NULL",
-					'Entry.edited_by' => "NULL",
-					'Entry.ip' => "NULL",
-					'Entry.user_id' => 0,
-				],
-				['Entry.user_id' => $userId]
-			);
-
-			if ($success) {
-				$this->_dispatchEvent('Cmd.Cache.clear', ['cache' => 'Thread']);
-			}
-
-			return $success;
-		}
+        public function anonymizeEntriesFromUser($userId) {
+            // remove username from all entries and reassign to anonyme user
+            $success = $this->updateAll(
+                [
+                    'Entry.name' => "NULL",
+                    'Entry.edited_by' => "NULL",
+                    'Entry.ip' => "NULL",
+                    'Entry.user_id' => 0,
+                ],
+                ['Entry.user_id' => $userId]
+            );
+
+            if ($success) {
+                $this->_dispatchEvent('Cmd.Cache.clear', ['cache' => 'Thread']);
+            }
+
+            return $success;
+        }
 
 /**
  * Maps all elements in $tree to function $func
@@ -768,23 +768,23 @@ 
  *
  * @return string
  */
-		public static function mapTreeElements(&$leafs, callable $func, $context = null, &$tree = null) {
-			if ($tree === null) {
-				$tree = & $leafs;
-			}
-			foreach ($leafs as $leaf):
-				$result = $func($tree, $leaf, $context);
-				if ($result === 'break') {
-					return 'break';
-				}
-				if (isset($leaf['_children'])) {
-					$result = self::mapTreeElements($leaf['_children'], $func, $context, $tree);
-					if ($result === 'break') {
-						return 'break';
-					}
-				}
-			endforeach;
-		}
+        public static function mapTreeElements(&$leafs, callable $func, $context = null, &$tree = null) {
+            if ($tree === null) {
+                $tree = & $leafs;
+            }
+            foreach ($leafs as $leaf):
+                $result = $func($tree, $leaf, $context);
+                if ($result === 'break') {
+                    return 'break';
+                }
+                if (isset($leaf['_children'])) {
+                    $result = self::mapTreeElements($leaf['_children'], $func, $context, $tree);
+                    if ($result === 'break') {
+                        return 'break';
+                    }
+                }
+            endforeach;
+        }
 
 /**
  * Merge thread on to entry $targetId
@@ -792,74 +792,74 @@ 
  * @param int $targetId id of the entry the thread should be appended to
  * @return bool true if merge was successfull false otherwise
  */
-		public function threadMerge($targetId) {
-			$threadIdSource = $this->id;
-
-			$this->contain();
-			$sourceEntry = $this->findById($threadIdSource);
-
-			// check that source is thread and not an entry
-			if ($sourceEntry[$this->alias]['pid'] != 0) {
-				return false;
-			}
-
-			$this->contain();
-			$targetEntry = $this->findById($targetId);
-
-			// check that target exists
-			if (!$targetEntry) {
-				return false;
-			}
-
-			// check that a thread is not merged onto itself
-			if ($targetEntry[$this->alias]['tid'] === $sourceEntry[$this->alias]['tid']) {
-				return false;
-			}
-
-			// set target entry as new parent entry
-			$this->data = [];
-			$this->set('pid', $targetEntry[$this->alias]['id']);
-			if ($this->save()) {
-				// associate all entries in source thread to target thread
-				$this->updateAll(
-					['tid' => $targetEntry[$this->alias]['tid']],
-					['tid' => $this->id]
-				);
-
-				// appended source entries get category of target thread
-				$this->_threadChangeCategory(
-					$targetEntry[$this->alias]['tid'],
-					$targetEntry[$this->alias]['category_id']
-				);
-
-				// update target thread last answer if source is newer
-				$sourceLastAnswer = $this->field('last_answer');
-				if (strtotime($sourceLastAnswer) > strtotime($targetEntry[$this->alias]['last_answer'])) {
-					$this->id = $targetEntry[$this->alias]['tid'];
-					$this->set('last_answer', $sourceLastAnswer);
-					$this->save();
-				}
-
-				// propagate pinned property from target to source
-				$isTargetPinned = (bool)$targetEntry[$this->alias]['locked'];
-				if ($sourceEntry[$this->alias]['locked'] !== $isTargetPinned) {
-					$this->id = $targetEntry[$this->alias]['tid'];
-					$this->_threadLock($isTargetPinned);
-				}
-
-				$this->Esevent->transferSubjectForEventType(
-					$threadIdSource,
-					$targetEntry[$this->alias]['tid'],
-					'thread'
-				);
-				$this->_dispatchEvent(
-					'Model.Thread.change',
-					['subject' => $targetEntry[$this->alias]['tid']]
-				);
-				return true;
-			}
-			return false;
-		}
+        public function threadMerge($targetId) {
+            $threadIdSource = $this->id;
+
+            $this->contain();
+            $sourceEntry = $this->findById($threadIdSource);
+
+            // check that source is thread and not an entry
+            if ($sourceEntry[$this->alias]['pid'] != 0) {
+                return false;
+            }
+
+            $this->contain();
+            $targetEntry = $this->findById($targetId);
+
+            // check that target exists
+            if (!$targetEntry) {
+                return false;
+            }
+
+            // check that a thread is not merged onto itself
+            if ($targetEntry[$this->alias]['tid'] === $sourceEntry[$this->alias]['tid']) {
+                return false;
+            }
+
+            // set target entry as new parent entry
+            $this->data = [];
+            $this->set('pid', $targetEntry[$this->alias]['id']);
+            if ($this->save()) {
+                // associate all entries in source thread to target thread
+                $this->updateAll(
+                    ['tid' => $targetEntry[$this->alias]['tid']],
+                    ['tid' => $this->id]
+                );
+
+                // appended source entries get category of target thread
+                $this->_threadChangeCategory(
+                    $targetEntry[$this->alias]['tid'],
+                    $targetEntry[$this->alias]['category_id']
+                );
+
+                // update target thread last answer if source is newer
+                $sourceLastAnswer = $this->field('last_answer');
+                if (strtotime($sourceLastAnswer) > strtotime($targetEntry[$this->alias]['last_answer'])) {
+                    $this->id = $targetEntry[$this->alias]['tid'];
+                    $this->set('last_answer', $sourceLastAnswer);
+                    $this->save();
+                }
+
+                // propagate pinned property from target to source
+                $isTargetPinned = (bool)$targetEntry[$this->alias]['locked'];
+                if ($sourceEntry[$this->alias]['locked'] !== $isTargetPinned) {
+                    $this->id = $targetEntry[$this->alias]['tid'];
+                    $this->_threadLock($isTargetPinned);
+                }
+
+                $this->Esevent->transferSubjectForEventType(
+                    $threadIdSource,
+                    $targetEntry[$this->alias]['tid'],
+                    'thread'
+                );
+                $this->_dispatchEvent(
+                    'Model.Thread.change',
+                    ['subject' => $targetEntry[$this->alias]['tid']]
+                );
+                return true;
+            }
+            return false;
+        }
 
 /**
  * Test if entry is thread-root
@@ -871,36 +871,36 @@ 
  * @return mixed
  * @throws InvalidArgumentException
  */
-		public function isRoot($id = null) {
-			if ($id === null) {
-				$id = $this->id;
-			}
-
-			$md5 = md5(serialize($id));
-			if (isset($this->_isRoot[$md5]) === false) {
-				// $id was $entry array
-				if (is_array($id) && isset($id[$this->alias]['pid'])) {
-					$entry = $id;
-				} else {
-					if (is_array($id) && isset($id[$this->alias]['id'])) {
-						$id = $id[$this->alias]['id'];
-					} elseif (empty($id)) {
-						throw new InvalidArgumentException();
-					}
-					$entry = $this->find(
-						'first',
-						array(
-							'contain' => false,
-							'conditions' => array(
-								'id' => $id,
-							)
-						)
-					);
-				}
-				$this->_isRoot[$md5] = empty($entry[$this->alias]['pid']);
-			}
-			return $this->_isRoot[$md5];
-		}
+        public function isRoot($id = null) {
+            if ($id === null) {
+                $id = $this->id;
+            }
+
+            $md5 = md5(serialize($id));
+            if (isset($this->_isRoot[$md5]) === false) {
+                // $id was $entry array
+                if (is_array($id) && isset($id[$this->alias]['pid'])) {
+                    $entry = $id;
+                } else {
+                    if (is_array($id) && isset($id[$this->alias]['id'])) {
+                        $id = $id[$this->alias]['id'];
+                    } elseif (empty($id)) {
+                        throw new InvalidArgumentException();
+                    }
+                    $entry = $this->find(
+                        'first',
+                        array(
+                            'contain' => false,
+                            'conditions' => array(
+                                'id' => $id,
+                            )
+                        )
+                    );
+                }
+                $this->_isRoot[$md5] = empty($entry[$this->alias]['pid']);
+            }
+            return $this->_isRoot[$md5];
+        }
 
 /**
  * Preprocesses entry data before saving it
@@ -911,85 +911,85 @@ 
  * @throws InvalidArgumentException
  * @throws ForbiddenException
  */
-		public function prepare(&$data, array $options = []) {
-			$options += [
-				'isRoot' => null
-			];
-
-			if (isset($options['preFilterFields'])) {
-				$org = $data;
-				$this->filterFields($data, $options['preFilterFields']);
-				if (isset($org['Event'])) {
-					$data['Event'] = $org['Event'];
-				}
-			}
-			unset($options['preFilterFields']);
-
-			$isRoot = $options['isRoot'];
-			unset($options['isRoot']);
-
-			if ($isRoot === null) {
-				$isRoot = $this->isRoot($data);
-			}
-			// adds info from parent entry to an answer
-			if ($isRoot === false) {
-				if (!isset($data[$this->alias]['pid'])) {
-					$pid = $this->getParentId($data[$this->alias]['id']);
-				} else {
-					$pid = $data[$this->alias]['pid'];
-				}
-				$parent = $this->get($pid, true);
-				if ($parent === false) {
-					throw new InvalidArgumentException;
-				}
-
-				// @todo highly @bogus should be a validator?
-				$parentPosting = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $parent]);
-				if ($parentPosting->isAnsweringForbidden()) {
-					throw new ForbiddenException;
-				}
-
-				// if new subject is empty use the parent's subject
-				if (empty($data[$this->alias]['subject'])) {
-					$data[$this->alias]['subject'] = $parent[$this->alias]['subject'];
-				}
-
-				$data[$this->alias]['tid'] = $parent[$this->alias]['tid'];
-				$data[$this->alias]['category_id'] = $parent[$this->alias]['category_id'];
-			}
-
-			//= markup preprocessing
-			if (empty($data[$this->alias]['text']) === false) {
-				$data[$this->alias]['text'] = $this->prepareMarkup($data[$this->alias]['text']);
-			}
-		}
-
-		protected function _findEntry($state, $query, $results = []) {
-			if ($state === 'before') {
-				$query['contain'] = ['User', 'Category'];
-				$query['fields'] = array_merge($this->threadLineFieldList, $this->showEntryFieldListAdditional);
-				return $query;
-			}
-			if ($results) {
-				return $results[0];
-			}
-			return $results;
-		}
+        public function prepare(&$data, array $options = []) {
+            $options += [
+                'isRoot' => null
+            ];
+
+            if (isset($options['preFilterFields'])) {
+                $org = $data;
+                $this->filterFields($data, $options['preFilterFields']);
+                if (isset($org['Event'])) {
+                    $data['Event'] = $org['Event'];
+                }
+            }
+            unset($options['preFilterFields']);
+
+            $isRoot = $options['isRoot'];
+            unset($options['isRoot']);
+
+            if ($isRoot === null) {
+                $isRoot = $this->isRoot($data);
+            }
+            // adds info from parent entry to an answer
+            if ($isRoot === false) {
+                if (!isset($data[$this->alias]['pid'])) {
+                    $pid = $this->getParentId($data[$this->alias]['id']);
+                } else {
+                    $pid = $data[$this->alias]['pid'];
+                }
+                $parent = $this->get($pid, true);
+                if ($parent === false) {
+                    throw new InvalidArgumentException;
+                }
+
+                // @todo highly @bogus should be a validator?
+                $parentPosting = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $parent]);
+                if ($parentPosting->isAnsweringForbidden()) {
+                    throw new ForbiddenException;
+                }
+
+                // if new subject is empty use the parent's subject
+                if (empty($data[$this->alias]['subject'])) {
+                    $data[$this->alias]['subject'] = $parent[$this->alias]['subject'];
+                }
+
+                $data[$this->alias]['tid'] = $parent[$this->alias]['tid'];
+                $data[$this->alias]['category_id'] = $parent[$this->alias]['category_id'];
+            }
+
+            //= markup preprocessing
+            if (empty($data[$this->alias]['text']) === false) {
+                $data[$this->alias]['text'] = $this->prepareMarkup($data[$this->alias]['text']);
+            }
+        }
+
+        protected function _findEntry($state, $query, $results = []) {
+            if ($state === 'before') {
+                $query['contain'] = ['User', 'Category'];
+                $query['fields'] = array_merge($this->threadLineFieldList, $this->showEntryFieldListAdditional);
+                return $query;
+            }
+            if ($results) {
+                return $results[0];
+            }
+            return $results;
+        }
 
 /**
  * Implements the custom find type 'feed'
  *
  * Add parameters for generating a rss/json-feed with find('feed', …)
  */
-		protected function _findFeed($state, $query, $results = array()) {
-			if ($state == 'before') {
-				$query['contain'] = array('User');
-				$query['fields'] = $this->_allowedPublicOutputFields;
-				$query['limit'] = 10;
-				return $query;
-			}
-			return $results;
-		}
+        protected function _findFeed($state, $query, $results = array()) {
+            if ($state == 'before') {
+                $query['contain'] = array('User');
+                $query['fields'] = $this->_allowedPublicOutputFields;
+                $query['limit'] = 10;
+                return $query;
+            }
+            return $results;
+        }
 
 /**
  * Locks or unlocks a whole thread
@@ -998,57 +998,57 @@ 
  *
  * @param bool $value
  */
-		protected function _threadLock($value) {
-			$tid = $this->field('tid');
-			$this->contain();
-			// @bogus throws error on $value = false
-			$value = $value ? 1 : 0;
-			$this->updateAll(['locked' => $value], ['tid' => $tid]);
-		}
-
-		public function paginateCount($conditions, $recursive, $extra) {
-			if (isset($extra['getInitialThreads'])) {
-				$this->Category->contain();
-				$categories = $this->Category->find(
-					'all',
-					[
-						'conditions' => array('id' => $conditions['Entry.category_id']),
-						'fields' => array('thread_count')
-					]
-				);
-				$count = array_sum(Set::extract('/Category/thread_count', $categories));
-			} else {
-				$parameters = array('conditions' => $conditions);
-				if ($recursive != $this->recursive) {
-					$parameters['recursive'] = $recursive;
-				}
-				$count = $this->find('count', array_merge($parameters, $extra));
-			}
-			return $count;
-		}
-
-		public function beforeSave($options = array()) {
-			$success = true;
-
-			//# change category of thread if category of root entry changed
-			$modified = !empty($this->id);
-			if (isset($this->data[$this->alias]['category_id']) && $modified) {
-				$oldEntry = $this->find('first',
-					['contain' => false, 'conditions' => ['Entry.id' => $this->id]]);
-
-				if ($oldEntry && (int)$oldEntry[$this->alias]['pid'] === 0) {
-					$categoryChanged = (int)$this->data[$this->alias]['category_id'] !== (int)$oldEntry[$this->alias]['category_id'];
-					if ($categoryChanged) {
-						$success = $success && $this->_threadChangeCategory(
-								$oldEntry[$this->alias]['tid'],
-								$this->data[$this->alias]['category_id']
-							);
-					}
-				}
-			}
-
-			return $success && parent::beforeSave($options);
-		}
+        protected function _threadLock($value) {
+            $tid = $this->field('tid');
+            $this->contain();
+            // @bogus throws error on $value = false
+            $value = $value ? 1 : 0;
+            $this->updateAll(['locked' => $value], ['tid' => $tid]);
+        }
+
+        public function paginateCount($conditions, $recursive, $extra) {
+            if (isset($extra['getInitialThreads'])) {
+                $this->Category->contain();
+                $categories = $this->Category->find(
+                    'all',
+                    [
+                        'conditions' => array('id' => $conditions['Entry.category_id']),
+                        'fields' => array('thread_count')
+                    ]
+                );
+                $count = array_sum(Set::extract('/Category/thread_count', $categories));
+            } else {
+                $parameters = array('conditions' => $conditions);
+                if ($recursive != $this->recursive) {
+                    $parameters['recursive'] = $recursive;
+                }
+                $count = $this->find('count', array_merge($parameters, $extra));
+            }
+            return $count;
+        }
+
+        public function beforeSave($options = array()) {
+            $success = true;
+
+            //# change category of thread if category of root entry changed
+            $modified = !empty($this->id);
+            if (isset($this->data[$this->alias]['category_id']) && $modified) {
+                $oldEntry = $this->find('first',
+                    ['contain' => false, 'conditions' => ['Entry.id' => $this->id]]);
+
+                if ($oldEntry && (int)$oldEntry[$this->alias]['pid'] === 0) {
+                    $categoryChanged = (int)$this->data[$this->alias]['category_id'] !== (int)$oldEntry[$this->alias]['category_id'];
+                    if ($categoryChanged) {
+                        $success = $success && $this->_threadChangeCategory(
+                                $oldEntry[$this->alias]['tid'],
+                                $this->data[$this->alias]['category_id']
+                            );
+                    }
+                }
+            }
+
+            return $success && parent::beforeSave($options);
+        }
 
 /**
  * check that entries are only in existing and allowed categories
@@ -1056,35 +1056,35 @@ 
  * @param $check
  * @return bool
  */
-		public function validateCategoryIsAllowed($check) {
-			$availableCategories = $this->CurrentUser->Categories->getAllowed();
-			if (!isset($availableCategories[$check['category_id']])) {
-				return false;
-			}
-			return true;
-		}
-
-		/**
-		 * @param $check
-		 * @return bool
-		 * @throws Exception
-		 */
-		public function validateEditingAllowed($check) {
-			$id = $this->data[$this->alias]['id'];
-			$entry = $this->get($id);
-			if (empty($entry)) {
-				throw new Exception(sprintf('Entry %s not found.', $entry));
-			}
-
-			$posting = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $entry]);
-			$forbidden = $posting->isEditingAsCurrentUserForbidden();
-
-			if (is_bool($forbidden)) {
-				return !$forbidden;
-			} else {
-				return $forbidden;
-			}
-		}
+        public function validateCategoryIsAllowed($check) {
+            $availableCategories = $this->CurrentUser->Categories->getAllowed();
+            if (!isset($availableCategories[$check['category_id']])) {
+                return false;
+            }
+            return true;
+        }
+
+        /**
+         * @param $check
+         * @return bool
+         * @throws Exception
+         */
+        public function validateEditingAllowed($check) {
+            $id = $this->data[$this->alias]['id'];
+            $entry = $this->get($id);
+            if (empty($entry)) {
+                throw new Exception(sprintf('Entry %s not found.', $entry));
+            }
+
+            $posting = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $entry]);
+            $forbidden = $posting->isEditingAsCurrentUserForbidden();
+
+            if (is_bool($forbidden)) {
+                return !$forbidden;
+            } else {
+                return $forbidden;
+            }
+        }
 
 /**
  *
@@ -1097,9 +1097,9 @@ 
  * @param $check
  * @return bool
  */
-		public function validateSubjectMaxLength($check) {
-			return mb_strlen($check['subject']) <= $this->_setting('subject_maxlength');
-		}
+        public function validateSubjectMaxLength($check) {
+            return mb_strlen($check['subject']) <= $this->_setting('subject_maxlength');
+        }
 
 /**
  * Changes the category of a thread.
@@ -1113,20 +1113,20 @@ 
  * @throws NotFoundException
  * @throws InvalidArgumentException
  */
-		protected function _threadChangeCategory($tid = null, $newCategoryId = null) {
-			if (empty($tid)) {
-				throw new InvalidArgumentException;
-			}
-			$this->Category->contain();
-			$categoryExists = $this->Category->findById($newCategoryId);
-			if (!$categoryExists) {
-				throw new NotFoundException;
-			}
-			$out = $this->updateAll(
-				['Entry.category_id' => $newCategoryId],
-				['Entry.tid' => $tid]
-			);
-			return $out;
-		}
-
-	}
\ No newline at end of file
+        protected function _threadChangeCategory($tid = null, $newCategoryId = null) {
+            if (empty($tid)) {
+                throw new InvalidArgumentException;
+            }
+            $this->Category->contain();
+            $categoryExists = $this->Category->findById($newCategoryId);
+            if (!$categoryExists) {
+                throw new NotFoundException;
+            }
+            $out = $this->updateAll(
+                ['Entry.category_id' => $newCategoryId],
+                ['Entry.tid' => $tid]
+            );
+            return $out;
+        }
+
+    }
\ No newline at end of file

app/Model/Esnotification.php

Indentation +29 added lines, -29 removed lines

@@ -8,43 +8,43 @@
  */
 class Esnotification extends AppModel {
 
-	//The Associations below have been created with all possible keys, those that are not needed can be removed
+    //The Associations below have been created with all possible keys, those that are not needed can be removed
 
 /**
  * belongsTo associations
  *
  * @var array
  */
-	public $belongsTo = array(
-		'User' => array(
-			'className' => 'User',
-			'foreignKey' => 'user_id',
-			'conditions' => '',
-			'fields' => '',
-			'order' => ''
-		),
-		'Esevent' => array(
-			'className' => 'Esevent',
-			'foreignKey' => 'esevent_id',
-			'conditions' => '',
-			'fields' => '',
-			'order' => ''
-		)
-	);
+    public $belongsTo = array(
+        'User' => array(
+            'className' => 'User',
+            'foreignKey' => 'user_id',
+            'conditions' => '',
+            'fields' => '',
+            'order' => ''
+        ),
+        'Esevent' => array(
+            'className' => 'Esevent',
+            'foreignKey' => 'esevent_id',
+            'conditions' => '',
+            'fields' => '',
+            'order' => ''
+        )
+    );
 
-	public function beforeSave($options = array()) {
-		if (empty($this->data[$this->alias]['deactivate'])) {
-			$this->data[$this->alias]['deactivate'] = mt_rand(0, 99999999);
-		}
+    public function beforeSave($options = array()) {
+        if (empty($this->data[$this->alias]['deactivate'])) {
+            $this->data[$this->alias]['deactivate'] = mt_rand(0, 99999999);
+        }
 
-		return parent::beforeSave();
-	}
+        return parent::beforeSave();
+    }
 
-	public function deleteNotificationWithId($id) {
-			return $this->delete($id, false);
-	}
+    public function deleteNotificationWithId($id) {
+            return $this->delete($id, false);
+    }
 
-	public function deleteAllFromUser($userId) {
-		return $this->deleteAll(array('user_id' => $userId), false);
-	}
+    public function deleteAllFromUser($userId) {
+        return $this->deleteAll(array('user_id' => $userId), false);
+    }
 }

app/Model/Behavior/TreeBehavior.php

Indentation +52 added lines, -52 removed lines

@@ -1,35 +1,35 @@ 
 <?php
 
-	class TreeBehavior extends ModelBehavior {
-
-		public function treeGetSubtree(Model $Model, $tree, $_nodeId) {
-			$func = function (&$tree, &$entry, $_nodeId) {
-				if ((int)$entry['Entry']['id'] === (int)$_nodeId) {
-					$tree = array($entry);
-					return 'break';
-				}
-			};
-			Entry::mapTreeElements($tree, $func, $_nodeId);
-			return $tree;
-		}
-
-		public function treeBuild(Model $Model, $threads) {
-			$tree = array();
-			foreach ($threads as $thread) {
-				$id = $thread[$Model->alias]['id'];
-				$pid = $thread[$Model->alias]['pid'];
-				$tree[$id] = isset($tree[$id]) ? $tree[$id] + $thread : $thread;
-				$tree[$pid]['_children'][] = &$tree[$id];
-			}
-
-			// It's possible to do uasort before tree build and  get the same results,
-			// without _sortTreesAfterTime
-			// but then *all* entries have to be sorted whereas now only subthreads with childs
-			// are sorted. So using _sortTreesAfterTime is actually faster in praxis.
-			$_sortedTrees = $this->_sortTreesAfterTime($tree[0]['_children']);
-
-			return $_sortedTrees;
-		}
+    class TreeBehavior extends ModelBehavior {
+
+        public function treeGetSubtree(Model $Model, $tree, $_nodeId) {
+            $func = function (&$tree, &$entry, $_nodeId) {
+                if ((int)$entry['Entry']['id'] === (int)$_nodeId) {
+                    $tree = array($entry);
+                    return 'break';
+                }
+            };
+            Entry::mapTreeElements($tree, $func, $_nodeId);
+            return $tree;
+        }
+
+        public function treeBuild(Model $Model, $threads) {
+            $tree = array();
+            foreach ($threads as $thread) {
+                $id = $thread[$Model->alias]['id'];
+                $pid = $thread[$Model->alias]['pid'];
+                $tree[$id] = isset($tree[$id]) ? $tree[$id] + $thread : $thread;
+                $tree[$pid]['_children'][] = &$tree[$id];
+            }
+
+            // It's possible to do uasort before tree build and  get the same results,
+            // without _sortTreesAfterTime
+            // but then *all* entries have to be sorted whereas now only subthreads with childs
+            // are sorted. So using _sortTreesAfterTime is actually faster in praxis.
+            $_sortedTrees = $this->_sortTreesAfterTime($tree[0]['_children']);
+
+            return $_sortedTrees;
+        }
 
 /**
  * Sort all entries in trees after time
@@ -38,25 +38,25 @@ 
  * @param int $level
  * @return array
  */
-		protected function _sortTreesAfterTime($in, $level = 0) {
-			if ($level > 0) {
-				uasort($in, [$this, '_sort']);
-			}
-
-			foreach ($in as $k => $v) {
-				if (isset($v['_children'])) {
-					$in[$k]['_children'] = $this->_sortTreesAfterTime($v['_children'], $level + 1);
-				}
-			}
-			return $in;
-		}
-
-		protected function _sort($a, $b) {
-			if ($a['Entry']['time'] === $b['Entry']['time']) {
-				return ($a['Entry']['id'] > $b['Entry']['id']) ? 1 : -1;
-			} else {
-				return ($a['Entry']['time'] > $b['Entry']['time']) ? 1 : -1;
-			}
-		}
-
-	}
+        protected function _sortTreesAfterTime($in, $level = 0) {
+            if ($level > 0) {
+                uasort($in, [$this, '_sort']);
+            }
+
+            foreach ($in as $k => $v) {
+                if (isset($v['_children'])) {
+                    $in[$k]['_children'] = $this->_sortTreesAfterTime($v['_children'], $level + 1);
+                }
+            }
+            return $in;
+        }
+
+        protected function _sort($a, $b) {
+            if ($a['Entry']['time'] === $b['Entry']['time']) {
+                return ($a['Entry']['id'] > $b['Entry']['id']) ? 1 : -1;
+            } else {
+                return ($a['Entry']['time'] > $b['Entry']['time']) ? 1 : -1;
+            }
+        }
+
+    }