Schlaefer / Saito

app/Test/Case/Lib/Saito/User/ReadPostings/ReadPostingsCookieTest.php

Doc Comments +3 added lines

@@ -181,6 +181,9 @@
 			);
 		}
 
+		/**
+		 * @param string[] $methods
+		 */
 		public function mock($methods = null) {
 			$Collection = new ComponentCollection();
 			$this->CurrentUser = new CurrentUserComponent($Collection);

Indentation +197 added lines, -197 removed lines

@@ -1,204 +1,204 @@
 <?php
 
-	use Saito\User\ReadPostings;
-
-	App::uses('CurrentUserComponent', 'Controller/Component');
-
-	class ReadPostingsCookieMock extends ReadPostings\ReadPostingsCookie {
-
-		/**
-		 * @param mixed $maxPostings
-		 */
-		public function setMaxPostings($maxPostings) {
-			$this->_maxPostings = $maxPostings;
-		}
-
-		public function setCookie($Cookie) {
-			$this->_Cookie = $Cookie;
-		}
-
-		public function setLastRefresh($LR) {
-			$this->_LastRefresh = $LR;
-		}
-
-		public function __get($name) {
-			$property = '_' . $name;
-			if (property_exists($this, $property)) {
-				return $this->{$property};
-			}
-		}
-
-		public function __call($name, $arguments) {
-			$method = '_' . $name;
-			if (is_callable([$this, $method])) {
-				return call_user_func_array([$this, $method], $arguments);
-			}
-		}
-
-	}
-
-	class ReadPostingsCookieTest extends CakeTestCase {
-
-		/**
-		 * @var CurrentUserComponent;
-		 */
-		public $CurrentUser;
-
-		public function testAbstractIsReadNoTimestamp() {
-			$this->mock();
-			$this->ReadPostings->Cookie->expects($this->once())
-				->method('read')
-				->will($this->returnValue('1.6'));
-
-			$this->ReadPostings->LastRefresh->expects($this->never())
-				->method('isNewerThan');
-
-			$this->assertTrue($this->ReadPostings->isRead(1));
-			$this->assertTrue($this->ReadPostings->isRead(6));
-			$this->assertFalse($this->ReadPostings->isRead(2));
-		}
-
-		public function testAbstractIsReadWithTimestamp() {
-			$this->mock();
-			$this->ReadPostings->Cookie->expects($this->once())
-				->method('read')
-				->will($this->returnValue('1'));
-
-			$time = time();
-
-			$this->ReadPostings->LastRefresh->expects($this->at(0))
-				->method('isNewerThan')
-				->with($time)
-				->will($this->returnValue(null));
-			$this->ReadPostings->LastRefresh->expects($this->at(1))
-				->method('isNewerThan')
-				->with($time + 1)
-				->will($this->returnValue(null));
-			$this->ReadPostings->LastRefresh->expects($this->at(2))
-				->method('isNewerThan')
-				->with($time + 2)
-				->will($this->returnValue(true));
-			$this->ReadPostings->LastRefresh->expects($this->at(3))
-				->method('isNewerThan')
-				->with($time + 3)
-				->will($this->returnValue(false));
-
-			$this->assertTrue($this->ReadPostings->isRead(1, $time));
-			$this->assertFalse($this->ReadPostings->isRead(2, $time + 1));
-			$this->assertTrue($this->ReadPostings->isRead(3, $time + 2));
-			$this->assertFalse($this->ReadPostings->isRead(4, $time + 3));
-		}
-
-		public function testGet() {
-			$this->mock();
-			$this->ReadPostings->Cookie->expects($this->once())
-				->method('read')
-				->will($this->returnValue('1.6'));
-
-			$this->ReadPostings->isRead(1);
-
-			//# test class cache is set
-			$expected = [1 => 1, 6 => 1];
-			$actual = $this->ReadPostings->readPostings;
-			$this->assertEquals($expected, $actual);
-
-			// test caching: should not read cookie a second time
-			$this->ReadPostings->isRead(6);
-		}
-
-		public function testSet() {
-			$this->mock(['_gc', '_get']);
-			$this->ReadPostings->expects($this->once())
-				->method('_gc');
-			$this->ReadPostings->expects($this->once())
-				->method('_get')
-				->will($this->returnValue([1 => 1, 2 => 1]));
-
-			$time = time();
-			$this->ReadPostings->LastRefresh->expects($this->at(0))
-				->method('isNewerThan')
-				->with($time)
-				->will($this->returnValue(false));
-			$this->ReadPostings->LastRefresh->expects($this->at(1))
-				->method('isNewerThan')
-				->with($time + 1)
-				->will($this->returnValue(true));
-			$this->ReadPostings->LastRefresh->expects($this->at(2))
-				->method('isNewerThan')
-				->with($time + 2)
-				->will($this->returnValue(false));
-
-			/*
+    use Saito\User\ReadPostings;
+
+    App::uses('CurrentUserComponent', 'Controller/Component');
+
+    class ReadPostingsCookieMock extends ReadPostings\ReadPostingsCookie {
+
+        /**
+         * @param mixed $maxPostings
+         */
+        public function setMaxPostings($maxPostings) {
+            $this->_maxPostings = $maxPostings;
+        }
+
+        public function setCookie($Cookie) {
+            $this->_Cookie = $Cookie;
+        }
+
+        public function setLastRefresh($LR) {
+            $this->_LastRefresh = $LR;
+        }
+
+        public function __get($name) {
+            $property = '_' . $name;
+            if (property_exists($this, $property)) {
+                return $this->{$property};
+            }
+        }
+
+        public function __call($name, $arguments) {
+            $method = '_' . $name;
+            if (is_callable([$this, $method])) {
+                return call_user_func_array([$this, $method], $arguments);
+            }
+        }
+
+    }
+
+    class ReadPostingsCookieTest extends CakeTestCase {
+
+        /**
+         * @var CurrentUserComponent;
+         */
+        public $CurrentUser;
+
+        public function testAbstractIsReadNoTimestamp() {
+            $this->mock();
+            $this->ReadPostings->Cookie->expects($this->once())
+                ->method('read')
+                ->will($this->returnValue('1.6'));
+
+            $this->ReadPostings->LastRefresh->expects($this->never())
+                ->method('isNewerThan');
+
+            $this->assertTrue($this->ReadPostings->isRead(1));
+            $this->assertTrue($this->ReadPostings->isRead(6));
+            $this->assertFalse($this->ReadPostings->isRead(2));
+        }
+
+        public function testAbstractIsReadWithTimestamp() {
+            $this->mock();
+            $this->ReadPostings->Cookie->expects($this->once())
+                ->method('read')
+                ->will($this->returnValue('1'));
+
+            $time = time();
+
+            $this->ReadPostings->LastRefresh->expects($this->at(0))
+                ->method('isNewerThan')
+                ->with($time)
+                ->will($this->returnValue(null));
+            $this->ReadPostings->LastRefresh->expects($this->at(1))
+                ->method('isNewerThan')
+                ->with($time + 1)
+                ->will($this->returnValue(null));
+            $this->ReadPostings->LastRefresh->expects($this->at(2))
+                ->method('isNewerThan')
+                ->with($time + 2)
+                ->will($this->returnValue(true));
+            $this->ReadPostings->LastRefresh->expects($this->at(3))
+                ->method('isNewerThan')
+                ->with($time + 3)
+                ->will($this->returnValue(false));
+
+            $this->assertTrue($this->ReadPostings->isRead(1, $time));
+            $this->assertFalse($this->ReadPostings->isRead(2, $time + 1));
+            $this->assertTrue($this->ReadPostings->isRead(3, $time + 2));
+            $this->assertFalse($this->ReadPostings->isRead(4, $time + 3));
+        }
+
+        public function testGet() {
+            $this->mock();
+            $this->ReadPostings->Cookie->expects($this->once())
+                ->method('read')
+                ->will($this->returnValue('1.6'));
+
+            $this->ReadPostings->isRead(1);
+
+            //# test class cache is set
+            $expected = [1 => 1, 6 => 1];
+            $actual = $this->ReadPostings->readPostings;
+            $this->assertEquals($expected, $actual);
+
+            // test caching: should not read cookie a second time
+            $this->ReadPostings->isRead(6);
+        }
+
+        public function testSet() {
+            $this->mock(['_gc', '_get']);
+            $this->ReadPostings->expects($this->once())
+                ->method('_gc');
+            $this->ReadPostings->expects($this->once())
+                ->method('_get')
+                ->will($this->returnValue([1 => 1, 2 => 1]));
+
+            $time = time();
+            $this->ReadPostings->LastRefresh->expects($this->at(0))
+                ->method('isNewerThan')
+                ->with($time)
+                ->will($this->returnValue(false));
+            $this->ReadPostings->LastRefresh->expects($this->at(1))
+                ->method('isNewerThan')
+                ->with($time + 1)
+                ->will($this->returnValue(true));
+            $this->ReadPostings->LastRefresh->expects($this->at(2))
+                ->method('isNewerThan')
+                ->with($time + 2)
+                ->will($this->returnValue(false));
+
+            /*
 			 * 1: already stored, will be stored again but not twice
 			 * 2: already stored, will be stored again
 			 * 3: not stored, older than last refresh
 			 * 4: newly stored
 			 */
-			$this->ReadPostings->Cookie->expects($this->once())
-				->method('write')
-				->with('1.2.4');
-			$this->ReadPostings->set([
-					['Entry' => ['id' => 1, 'time' => $time]],
-					['Entry' => ['id' => 3, 'time' => $time + 1]],
-					['Entry' => ['id' => 4, 'time' => $time + 2]]
-				]
-			);
-
-			// test that cookie is unencrypted
-			$this->assertFalse($this->ReadPostings->Cookie->encrypt);
-
-			// test that class cache is updated
-			$expected = [1 => 1, 2 => 1, 4 => 1];
-			$actual = $this->ReadPostings->readPostings;
-			$this->assertEquals($expected, $actual);
-		}
-
-		public function testSetSingle() {
-			$this->mock();
-
-			$this->ReadPostings->LastRefresh->expects($this->at(0))
-				->method('isNewerThan')
-				->will($this->returnValue(false));
-			$this->ReadPostings->Cookie->expects($this->once())
-				->method('write')
-				->with('4');
-
-			$this->ReadPostings->set(['Entry' => ['id' => 4, 'time' => 0]]);
-		}
-
-		public function testGc() {
-			$this->mock();
-			$this->ReadPostings->Cookie->expects($this->once())
-				->method('write')
-				->with('5.6');
-
-			$this->ReadPostings->setMaxPostings(2);
-			$this->ReadPostings->set([
-					['Entry' => ['id' => 1, 'time' => 0]],
-					['Entry' => ['id' => 5, 'time' => 1]],
-					['Entry' => ['id' => 6, 'time' => 2]]
-				]
-			);
-		}
-
-		public function mock($methods = null) {
-			$Collection = new ComponentCollection();
-			$this->CurrentUser = new CurrentUserComponent($Collection);
-			$this->ReadPostings = $this->getMock(
-				'ReadPostingsCookieMock',
-				$methods,
-				[$this->CurrentUser]
-			);
-
-			$this->ReadPostings->setCookie($this->getMock('Object', ['read', 'write', 'delete']));
-			$this->ReadPostings->setLastRefresh($this->getMock('Object', ['isNewerThan']));
-		}
-
-		public function tearDown() {
-			$this->ReadPostings->Cookie->delete();
-			unset($this->ReadPostings);
-			unset($this->CurrentUser);
-			parent::tearDown();
-		}
-
-	}
+            $this->ReadPostings->Cookie->expects($this->once())
+                ->method('write')
+                ->with('1.2.4');
+            $this->ReadPostings->set([
+                    ['Entry' => ['id' => 1, 'time' => $time]],
+                    ['Entry' => ['id' => 3, 'time' => $time + 1]],
+                    ['Entry' => ['id' => 4, 'time' => $time + 2]]
+                ]
+            );
+
+            // test that cookie is unencrypted
+            $this->assertFalse($this->ReadPostings->Cookie->encrypt);
+
+            // test that class cache is updated
+            $expected = [1 => 1, 2 => 1, 4 => 1];
+            $actual = $this->ReadPostings->readPostings;
+            $this->assertEquals($expected, $actual);
+        }
+
+        public function testSetSingle() {
+            $this->mock();
+
+            $this->ReadPostings->LastRefresh->expects($this->at(0))
+                ->method('isNewerThan')
+                ->will($this->returnValue(false));
+            $this->ReadPostings->Cookie->expects($this->once())
+                ->method('write')
+                ->with('4');
+
+            $this->ReadPostings->set(['Entry' => ['id' => 4, 'time' => 0]]);
+        }
+
+        public function testGc() {
+            $this->mock();
+            $this->ReadPostings->Cookie->expects($this->once())
+                ->method('write')
+                ->with('5.6');
+
+            $this->ReadPostings->setMaxPostings(2);
+            $this->ReadPostings->set([
+                    ['Entry' => ['id' => 1, 'time' => 0]],
+                    ['Entry' => ['id' => 5, 'time' => 1]],
+                    ['Entry' => ['id' => 6, 'time' => 2]]
+                ]
+            );
+        }
+
+        public function mock($methods = null) {
+            $Collection = new ComponentCollection();
+            $this->CurrentUser = new CurrentUserComponent($Collection);
+            $this->ReadPostings = $this->getMock(
+                'ReadPostingsCookieMock',
+                $methods,
+                [$this->CurrentUser]
+            );
+
+            $this->ReadPostings->setCookie($this->getMock('Object', ['read', 'write', 'delete']));
+            $this->ReadPostings->setLastRefresh($this->getMock('Object', ['isNewerThan']));
+        }
+
+        public function tearDown() {
+            $this->ReadPostings->Cookie->delete();
+            unset($this->ReadPostings);
+            unset($this->CurrentUser);
+            parent::tearDown();
+        }
+
+    }

Spacing +2 added lines, -2 removed lines

@@ -22,14 +22,14 @@
 		}
 
 		public function __get($name) {
-			$property = '_' . $name;
+			$property = '_'.$name;
 			if (property_exists($this, $property)) {
 				return $this->{$property};
 			}
 		}
 
 		public function __call($name, $arguments) {
-			$method = '_' . $name;
+			$method = '_'.$name;
 			if (is_callable([$this, $method])) {
 				return call_user_func_array([$this, $method], $arguments);
 			}

app/Test/Selenium/InlineAnswerTest.php

Doc Comments +6 added lines

@@ -26,6 +26,9 @@ 
 			$this->_testSingleLine($this->nextId - 1);
 		}
 
+		/**
+		 * @param integer $id
+		 */
 		protected function _testSingleLine($id) {
 			$this->_testInlineCloseButtons($id);
 			$this->_testInlineAnswerCloseButton($id);
@@ -57,6 +60,9 @@ 
 			$this->assertFalse($this->_isPostingVisible($id));
 		}
 
+		/**
+		 * @param integer $parentId
+		 */
 		protected function _createNewInlineAnswer($parentId) {
 
 			$this->_openThreadline($parentId);

Indentation +151 added lines, -151 removed lines

@@ -1,153 +1,153 @@
 <?php
 
-	require_once 'Lib/SaitoSeleniumTestCase.php';
-
-	class InlineAnswerTest extends SaitoSeleniumTestCase {
-
-		public $nextId = 11;
-
-		public function testInlineAnswer() {
-			$this->login();
-
-			$id = 6;
-			$this->_testSingleLine($id);
-
-			// test inline answering
-			$this->_createNewInlineAnswer($id);
-			$this->_testSingleLine($this->nextId - 1);
-
-			// test that an inline answer of an inline answer is working
-			$lastInlineAnswerId = $this->nextId - 1;
-			$this->_createNewInlineAnswer($lastInlineAnswerId);
-			$this->_testSingleLine($this->nextId - 1);
-
-			// test a new sibling answer
-			$this->_createNewInlineAnswer($id);
-			$this->_testSingleLine($this->nextId - 1);
-		}
-
-		protected function _testSingleLine($id) {
-			$this->_testInlineCloseButtons($id);
-			$this->_testInlineAnswerCloseButton($id);
-		}
-
-		protected function _testInlineAnswerCloseButton($id) {
-			$this->_openThreadline($id);
-			$this->_openAnswerForm($id);
-			// click answering close button
-			$this->click("css=.threadLeaf[data-id={$id}] .btn-answeringClose");
-			// wait for answering form to be closed
-			for ($second = 0; ; $second++) {
-				if ($second >= 60) $this->fail("timeout");
-				try {
-					if (!$this->isElementPresent("css=.threadLeaf[data-id={$id}]  .entry.reply")) break;
-				} catch (Exception $e) {}
-				sleep(1);
-			}
-			// answering form is closed but posting is still visible
-			$this->assertTrue($this->_isPostingVisible($id));
-			$this->_closeThreadline($id);
-		}
-
-		protected function _testInlineCloseButtons($id) {
-			$this->_openThreadline($id);
-			// click posting close button
-			$this->_closeThreadline($id);
-			$this->_waitForThreadlineVisible($id);
-			$this->assertFalse($this->_isPostingVisible($id));
-		}
-
-		protected function _createNewInlineAnswer($parentId) {
-
-			$this->_openThreadline($parentId);
-
-			// footer in posting is visible
-			$this->assertTrue(
-				$this->isVisible("css=.threadLeaf[data-id={$parentId}] .panel-footer")
-			);
-
-			// opening answer form
-			$this->_openAnswerForm($parentId);
-
-			// wait for answering form to be shown
-			for ($second = 0; ; $second++) {
-				if ($second >= 60) {
-					$this->fail("timeout");
-				}
-				try {
-					if ($this->isVisible("css=.threadLeaf[data-id={$parentId}] .entry.reply")
-					) {
-						break;
-					}
-				} catch (Exception $e) {
-				}
-				sleep(1);
-			}
-
-			// footer in posting is now hidden
-			$this->assertFalse(
-				$this->isVisible("css=.threadLeaf[data-id={$parentId}] .panel-footer")
-			);
-
-			// type subject in answering field
-			$this->type("css=.threadLeaf[data-id={$parentId}]  #EntrySubject", "Id: {$this->nextId}");
-			// send the inline answering form
-			$this->click("css=.threadLeaf[data-id={$parentId}] #btn-submit");
-
-			$this->_waitForThreadlineVisible($parentId);
-
-			// test that new thread line is visible
-			$this->_waitForThreadlineVisible($this->nextId);
-			$this->assertTrue($this->_isThreadlineVisible($this->nextId));
-
-			$this->nextId++;
-		}
-
-		protected function _openAnswerForm($id) {
-			// opening answer form
-			$this->click("css=.threadLeaf[data-id={$id}] .js-btn-setAnsweringForm");
-			$this->_waitForAnsweringVisible($id);
-		}
-
-		protected function _openThreadline($id) {
-			// test that thread line is visible
-			$this->assertTrue(
-				$this->isVisible(
-					"css=.threadLeaf[data-id={$id}] .threadLeaf-content"
-				)
-			);
-			// click to open threadline
-			$this->click("css=.threadLeaf[data-id={$id}] .btn_show_thread");
-			$this->_waitForPostingVisible($id);
-			// threadline should now be invisible
-			$this->assertFalse($this->_isThreadlineVisible($id));
-		}
-
-		protected function _closeThreadline($id) {
-			$this->click("css=.threadLeaf[data-id={$id}] .js-btn-strip");
-		}
-
-		protected function _waitForPostingVisible($id) {
-			$this->waitForVisibleJq(".threadLeaf[data-id={$id}] .js-entry-view-core");
-		}
-
-		protected function _waitForThreadlineVisible($id) {
-			$this->waitForVisibleJq(".threadLeaf[data-id={$id}] .threadLeaf-content");
-		}
-
-		protected function _waitForAnsweringVisible($id) {
-			$this->waitForVisibleJq(".threadLeaf[data-id={$id}]  .entry.reply");
-		}
-
-		protected function _isThreadlineVisible($id) {
-			return $this->isVisible(
-				"css=.threadLeaf[data-id={$id}] .threadLeaf-content"
-			);
-		}
-
-		protected function _isPostingVisible($id) {
-			return $this->isVisible(
-				"css=.threadLeaf[data-id={$id}] .js-entry-view-core"
-			);
-		}
-	}
+    require_once 'Lib/SaitoSeleniumTestCase.php';
+
+    class InlineAnswerTest extends SaitoSeleniumTestCase {
+
+        public $nextId = 11;
+
+        public function testInlineAnswer() {
+            $this->login();
+
+            $id = 6;
+            $this->_testSingleLine($id);
+
+            // test inline answering
+            $this->_createNewInlineAnswer($id);
+            $this->_testSingleLine($this->nextId - 1);
+
+            // test that an inline answer of an inline answer is working
+            $lastInlineAnswerId = $this->nextId - 1;
+            $this->_createNewInlineAnswer($lastInlineAnswerId);
+            $this->_testSingleLine($this->nextId - 1);
+
+            // test a new sibling answer
+            $this->_createNewInlineAnswer($id);
+            $this->_testSingleLine($this->nextId - 1);
+        }
+
+        protected function _testSingleLine($id) {
+            $this->_testInlineCloseButtons($id);
+            $this->_testInlineAnswerCloseButton($id);
+        }
+
+        protected function _testInlineAnswerCloseButton($id) {
+            $this->_openThreadline($id);
+            $this->_openAnswerForm($id);
+            // click answering close button
+            $this->click("css=.threadLeaf[data-id={$id}] .btn-answeringClose");
+            // wait for answering form to be closed
+            for ($second = 0; ; $second++) {
+                if ($second >= 60) $this->fail("timeout");
+                try {
+                    if (!$this->isElementPresent("css=.threadLeaf[data-id={$id}]  .entry.reply")) break;
+                } catch (Exception $e) {}
+                sleep(1);
+            }
+            // answering form is closed but posting is still visible
+            $this->assertTrue($this->_isPostingVisible($id));
+            $this->_closeThreadline($id);
+        }
+
+        protected function _testInlineCloseButtons($id) {
+            $this->_openThreadline($id);
+            // click posting close button
+            $this->_closeThreadline($id);
+            $this->_waitForThreadlineVisible($id);
+            $this->assertFalse($this->_isPostingVisible($id));
+        }
+
+        protected function _createNewInlineAnswer($parentId) {
+
+            $this->_openThreadline($parentId);
+
+            // footer in posting is visible
+            $this->assertTrue(
+                $this->isVisible("css=.threadLeaf[data-id={$parentId}] .panel-footer")
+            );
+
+            // opening answer form
+            $this->_openAnswerForm($parentId);
+
+            // wait for answering form to be shown
+            for ($second = 0; ; $second++) {
+                if ($second >= 60) {
+                    $this->fail("timeout");
+                }
+                try {
+                    if ($this->isVisible("css=.threadLeaf[data-id={$parentId}] .entry.reply")
+                    ) {
+                        break;
+                    }
+                } catch (Exception $e) {
+                }
+                sleep(1);
+            }
+
+            // footer in posting is now hidden
+            $this->assertFalse(
+                $this->isVisible("css=.threadLeaf[data-id={$parentId}] .panel-footer")
+            );
+
+            // type subject in answering field
+            $this->type("css=.threadLeaf[data-id={$parentId}]  #EntrySubject", "Id: {$this->nextId}");
+            // send the inline answering form
+            $this->click("css=.threadLeaf[data-id={$parentId}] #btn-submit");
+
+            $this->_waitForThreadlineVisible($parentId);
+
+            // test that new thread line is visible
+            $this->_waitForThreadlineVisible($this->nextId);
+            $this->assertTrue($this->_isThreadlineVisible($this->nextId));
+
+            $this->nextId++;
+        }
+
+        protected function _openAnswerForm($id) {
+            // opening answer form
+            $this->click("css=.threadLeaf[data-id={$id}] .js-btn-setAnsweringForm");
+            $this->_waitForAnsweringVisible($id);
+        }
+
+        protected function _openThreadline($id) {
+            // test that thread line is visible
+            $this->assertTrue(
+                $this->isVisible(
+                    "css=.threadLeaf[data-id={$id}] .threadLeaf-content"
+                )
+            );
+            // click to open threadline
+            $this->click("css=.threadLeaf[data-id={$id}] .btn_show_thread");
+            $this->_waitForPostingVisible($id);
+            // threadline should now be invisible
+            $this->assertFalse($this->_isThreadlineVisible($id));
+        }
+
+        protected function _closeThreadline($id) {
+            $this->click("css=.threadLeaf[data-id={$id}] .js-btn-strip");
+        }
+
+        protected function _waitForPostingVisible($id) {
+            $this->waitForVisibleJq(".threadLeaf[data-id={$id}] .js-entry-view-core");
+        }
+
+        protected function _waitForThreadlineVisible($id) {
+            $this->waitForVisibleJq(".threadLeaf[data-id={$id}] .threadLeaf-content");
+        }
+
+        protected function _waitForAnsweringVisible($id) {
+            $this->waitForVisibleJq(".threadLeaf[data-id={$id}]  .entry.reply");
+        }
+
+        protected function _isThreadlineVisible($id) {
+            return $this->isVisible(
+                "css=.threadLeaf[data-id={$id}] .threadLeaf-content"
+            );
+        }
+
+        protected function _isPostingVisible($id) {
+            return $this->isVisible(
+                "css=.threadLeaf[data-id={$id}] .js-entry-view-core"
+            );
+        }
+    }

Braces +6 added lines, -2 removed lines

@@ -38,9 +38,13 @@
 			$this->click("css=.threadLeaf[data-id={$id}] .btn-answeringClose");
 			// wait for answering form to be closed
 			for ($second = 0; ; $second++) {
-				if ($second >= 60) $this->fail("timeout");
+				if ($second >= 60) {
+				    $this->fail("timeout");
+				}
 				try {
-					if (!$this->isElementPresent("css=.threadLeaf[data-id={$id}]  .entry.reply")) break;
+					if (!$this->isElementPresent("css=.threadLeaf[data-id={$id}]  .entry.reply")) {
+					    break;
+					}
 				} catch (Exception $e) {}
 				sleep(1);
 			}

app/Config/version.php

Indentation +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <?php
-	Configure::write('Saito.v', '4.10.0');
+    Configure::write('Saito.v', '4.10.0');
 
-	Configure::write('Saito.saitoHomepage', 'http://saito.siezi.com');
+    Configure::write('Saito.saitoHomepage', 'http://saito.siezi.com');

app/Config/saito_config.php

Indentation +63 added lines, -63 removed lines

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

app/Config/acl.php

Indentation +8 added lines, -8 removed lines

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

app/Config/Schema/db_acl.php

Indentation +36 added lines, -36 removed lines

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

app/Config/Schema/sessions.php

Indentation +12 added lines, -12 removed lines

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

app/Config/Schema/schema.php

Indentation +250 added lines, -250 removed lines

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

app/Config/Schema/i18n.php

Indentation +15 added lines, -15 removed lines

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