diff --git a/.gitignore b/.gitignore index 3f0f36f22..b3abe2e04 100755 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,11 @@ .DS_Store tags +### CakePHP 3 ### +/logs +/tmp +/vendor + # Saito /app/Config/email.php /app/Config/database.php diff --git a/app/Config/Schema/schema.php b/app/Config/Schema/schema.php index 1375d4814..363d549fb 100644 --- a/app/Config/Schema/schema.php +++ b/app/Config/Schema/schema.php @@ -1,21 +1,7 @@ cakeMysqlMediumBlobFix(); - } - } - 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'), @@ -44,17 +30,6 @@ public function after($event = array()) { 'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_unicode_ci', 'engine' => 'MyISAM') ); - public $ecaches = array( - 'created' => array('type' => 'datetime', 'null' => false, 'default' => null), - 'modified' => array('type' => 'datetime', 'null' => false, 'default' => null), - 'key' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 128, 'key' => 'primary', 'collate' => 'utf8_general_ci', 'charset' => 'utf8'), - 'value' => array('type' => 'binary', 'null' => false, 'default' => null), - 'indexes' => array( - 'PRIMARY' => array('column' => 'key', 'unique' => 1) - ), - 'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'MyISAM') - ); - public $entries = array( 'created' => array('type' => 'datetime', 'null' => true, 'default' => null), 'modified' => array('type' => 'datetime', 'null' => true, 'default' => null), diff --git a/app/Config/bootstrap.php b/app/Config/bootstrap.php index 4ceb4e8b7..e195abc8b 100755 --- a/app/Config/bootstrap.php +++ b/app/Config/bootstrap.php @@ -190,7 +190,6 @@ 'file' => 'saito-auth' )); -include APP . 'Lib' . DS . 'SaitoExceptions.php'; include 'version.php'; /** diff --git a/app/Config/routes.php b/app/Config/routes.php index c6292aec9..53a6d1f29 100755 --- a/app/Config/routes.php +++ b/app/Config/routes.php @@ -56,6 +56,10 @@ */ Router::connect('/admin', ['controller' => 'admins', 'action' => 'index', 'admin' => true]); + Router::connect( + '/admin/plugins', + ['controller' => 'admins', 'action' => 'plugins', 'admin' => true] + ); /** * Default search action diff --git a/app/Config/version.php b/app/Config/version.php index 714e31477..44b4d7a2f 100644 --- a/app/Config/version.php +++ b/app/Config/version.php @@ -1,4 +1,4 @@ Categories = new CategoryAuth($this); + $this->Categories = new Auth\CategoryAuthorization($this); } public function getMaxAccession() { diff --git a/app/Controller/AdminsController.php b/app/Controller/AdminsController.php index c76143972..ff011c1ff 100755 --- a/app/Controller/AdminsController.php +++ b/app/Controller/AdminsController.php @@ -15,20 +15,26 @@ public function admin_logs() { // order here is output order in frontend $_logsToRead = ['error', 'debug']; + $_logsToRead = glob(LOGS . '*.log'); + if (!$_logsToRead) { + return; + } + // will contain ['error' => '', 'debug' => ''] $_logs = []; - foreach ($_logsToRead as $_log) { - $_path = LOGS . $_log . '.log'; + foreach ($_logsToRead as $_path) { $_content = ''; - if (file_exists($_path)) { - $_size = filesize($_path); - $_content = file_get_contents($_path, false, null, $_size - 65536); - } - $_logs[$_log] = $_content; + $_size = filesize($_path); + $_content = file_get_contents($_path, false, null, $_size - 65536); + $name = basename($_path); + $_logs[$name] = $_content; } $this->set('logs', $_logs); } + public function admin_plugins() { + } + public function admin_stats() { $postingsPA = $this->_getYearStats('Entry', 'time'); $registrationsPA = $this->_getYearStats('User', 'registered'); diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php index c6db51a20..4a4dfe4d7 100644 --- a/app/Controller/AppController.php +++ b/app/Controller/AppController.php @@ -1,13 +1,11 @@ 0) { App::uses('FireCake', 'DebugKit.Lib'); } @@ -105,9 +103,20 @@ public function __construct($request = null, $response = null) { Stopwatch::start( '---------------------- Controller ----------------------' ); + + ClassRegistry::addObject('dic', \Saito\DicSetup::getNewDic()); parent::__construct($request, $response); } + public function __get($name) { + switch ($name) { + case 'dic': + return ClassRegistry::getObject('dic'); + default: + return parent::__get($name); + } + } + public function beforeFilter() { Stopwatch::start('App->beforeFilter()'); @@ -151,7 +160,7 @@ public function beforeFilter() { $this->_setConfigurationFromGetParams(); // must be set after all language chooser - Properize::setLanguage(Configure::read('Config.language')); + \Saito\String\Properize::setLanguage(Configure::read('Config.language')); // allow sql explain for DebugKit toolbar if ($this->request->plugin === 'debug_kit') { @@ -298,10 +307,10 @@ protected function _setXFrameOptionsHeader() { * * * @param $type - * @throws Saito\BlackHoledException + * @throws Saito\Exception\SaitoBlackholeException */ public function blackhole($type) { - throw new Saito\BlackHoledException($type, + throw new SaitoBlackholeException($type, ['CurrentUser' => $this->CurrentUser]); } diff --git a/app/Controller/BookmarksController.php b/app/Controller/BookmarksController.php index cc8385dd6..84ad53702 100644 --- a/app/Controller/BookmarksController.php +++ b/app/Controller/BookmarksController.php @@ -55,12 +55,18 @@ public function add() { * @param null $id * @throws NotFoundException * @throws MethodNotAllowedException - * @throws Saito\ForbiddenException */ public function edit($id = null) { $bookmark = $this->_getBookmark($id); if (!$this->request->is('post') && !$this->request->is('put')) { + $posting = array( + 'Entry' => $bookmark['Entry'], + 'Category' => $bookmark['Entry']['Category'], + 'User' => $bookmark['Entry']['User'], + ); + $this->set('entry', $this->dic->newInstance('\Saito\Posting\Posting', + ['rawData' => $posting])); $this->request->data = $bookmark; return; } @@ -103,10 +109,10 @@ public function beforeFilter() { /** * @param $id - * @return mixed * @throws NotFoundException * @throws MethodNotAllowedException - * @throws Saito\ForbiddenException + * @throws Saito\Exception\SaitoForbiddenException + * @return mixed */ protected function _getBookmark($id) { if (!$this->CurrentUser->isLoggedIn()) { @@ -121,7 +127,7 @@ protected function _getBookmark($id) { $bookmark = $this->Bookmark->findById($id); if ($bookmark['Bookmark']['user_id'] != $this->CurrentUser->getId()) { - throw new Saito\ForbiddenException("Attempt to edit bookmark $id."); + throw new Saito\Exception\SaitoForbiddenException("Attempt to edit bookmark $id."); } return $bookmark; } diff --git a/app/Controller/Component/CacheSupportComponent.php b/app/Controller/Component/CacheSupportComponent.php index 1f8611206..86d5e1821 100644 --- a/app/Controller/Component/CacheSupportComponent.php +++ b/app/Controller/Component/CacheSupportComponent.php @@ -1,20 +1,17 @@ {$Controller->modelClass}->SharedObjects['CacheSupport'] = $this->_CacheSupport; } $this->_addConfigureCachelets(); - $this->_initCacheTree($Controller); $this->_initLineCache($Controller); } @@ -32,29 +28,11 @@ protected function _initLineCache() { 'Saito.LineCache', new SaitoCacheEngineAppCache, // duration: update relative time values in HTML at least every hour - ['duration' => 3600, 'maxItems' => 500] + ['duration' => 3600, 'maxItems' => 600] ); $this->_CacheSupport->add(new LineCacheSupportCachelet($this->LineCache)); } - protected function _initCacheTree($Controller) { - $cacheConfig = Cache::settings(); - if ($cacheConfig['engine'] === 'Apc') { - $CacheEngine = new SaitoCacheEngineAppCache; - } else { - $CacheEngine = new SaitoCacheEngineDbCache; - } - - $this->CacheTree = new CacheTree( - 'EntrySub', - $CacheEngine, - ['maxItems' => 240] - ); - - $this->CacheTree->initialize($Controller->CurrentUser); - $this->_CacheSupport->add(new CacheTreeCacheSupportCachelet($this->CacheTree)); - } - /** * Adds additional cachelets from Configure `Saito.Cachelets` * diff --git a/app/Controller/Component/CurrentUserComponent.php b/app/Controller/Component/CurrentUserComponent.php index 923648611..a340967a0 100755 --- a/app/Controller/Component/CurrentUserComponent.php +++ b/app/Controller/Component/CurrentUserComponent.php @@ -1,26 +1,22 @@ name === 'CakeError') { return; } + $this->_Controller = $Controller; if ($this->_Controller->modelClass) { $this->_Controller->{$this->_Controller->modelClass}->SharedObjects['CurrentUser'] = $this; } - $this->Categories = new CategoryAuth($this); + $this->Categories = new CategoryAuthorization($this); + + $this->_Controller->dic->set('CU', $this); /* * We create a new User Model instance. Otherwise we would overwrite $this->request->data @@ -98,7 +93,7 @@ public function initialize(Controller $Controller) { ['class' => 'User', 'alias' => 'currentUser'] ); - $this->PersistentCookie = new SaitoCurrentUserCookie($this->Cookie, 'AU'); + $this->PersistentCookie = new \Saito\User\Cookie\CurrentUserCookie($this->Cookie, 'AU'); $this->_configureAuth(); @@ -117,14 +112,14 @@ public function initialize(Controller $Controller) { } if ($this->isLoggedIn()) { - $this->ReadEntries = new ReadPostingsDatabase($this); + $this->ReadEntries = new ReadPostings\ReadPostingsDatabase($this); } elseif ($this->isBot()) { - $this->ReadEntries = new ReadPostingsDummy($this); + $this->ReadEntries = new ReadPostings\ReadPostingsDummy($this); } else { - $this->ReadEntries = new ReadPostingsCookie($this); + $this->ReadEntries = new ReadPostings\ReadPostingsCookie($this); } - $this->_Bookmarks = new UserBookmarks($this); + $this->_Bookmarks = new Bookmarks($this); $this->_markOnline(); } @@ -231,11 +226,11 @@ public function refresh() { if ($this->isLoggedIn()) { $this->_User->id = $this->getId(); $this->setSettings($this->_User->getProfile($this->getId())); - $this->LastRefresh = new LastRefreshDatabase($this); + $this->LastRefresh = new LastRefresh\LastRefreshDatabase($this); } elseif ($this->isBot()) { - $this->LastRefresh = new LastRefreshDummy($this); + $this->LastRefresh = new LastRefresh\LastRefreshDummy($this); } else { - $this->LastRefresh = new LastRefreshCookie($this); + $this->LastRefresh = new LastRefresh\LastRefreshCookie($this); } } diff --git a/app/Controller/Component/JsDataComponent.php b/app/Controller/Component/JsDataComponent.php index d9ca3a0ee..24bdc9a1d 100644 --- a/app/Controller/Component/JsDataComponent.php +++ b/app/Controller/Component/JsDataComponent.php @@ -1,7 +1,8 @@ set($controller->User); $smilies = new \Saito\Smiley\Cache($controller); $controller->set('smiliesData', $smilies); diff --git a/app/Controller/DynamicAssetsController.php b/app/Controller/DynamicAssetsController.php index 29a090815..733500875 100644 --- a/app/Controller/DynamicAssetsController.php +++ b/app/Controller/DynamicAssetsController.php @@ -20,7 +20,7 @@ class DynamicAssetsController extends Controller { * Output current language strings as json */ public function langJs() { - // dummy translation to load po files + //= dummy translation to load po files __d('nondynamic', 'foo'); __d('default', 'foo'); $domains = I18n::domains(); diff --git a/app/Controller/EntriesController.php b/app/Controller/EntriesController.php index 1d50426ab..6930c1103 100644 --- a/app/Controller/EntriesController.php +++ b/app/Controller/EntriesController.php @@ -1,5 +1,7 @@ _prepareSlidetabData(); - //# determine user sort order + //= determine user sort order $sortKey = 'Entry.'; if ($this->CurrentUser['user_sort_last_answer'] == false) { $sortKey .= 'time'; @@ -30,39 +32,13 @@ public function index() { $sortKey .= 'last_answer'; } $order = ['Entry.fixed' => 'DESC', $sortKey => 'DESC']; - $initials = $this->_getInitialThreads($this->CurrentUser, $order); - - //# match initial threads against cache - $threads = []; - $uncached = []; - foreach ($initials as $thread) { - // ensure string so that integer index won't reorder - $id = (string)$thread['id']; - if ($this->CacheSupport->CacheTree->isCacheValid($thread)) { - $threads[$id] = $this->CacheSupport->CacheTree->get($id); - } else { - $threads[$id] = $id; - $uncached[$id] = $thread; - } - } - - //# get threads not available in cache from DB - $dbThreads = $this->Entry->treesForThreads($uncached, $order); - - $page = 0; - if (isset($this->request->named['page'])) { - $page = $this->request->named['page']; - } - - foreach ($dbThreads as $thread) { - $id = (string)$thread['Entry']['tid']; - $threads[$id] = $thread; - if ($page < 3 && $this->CacheSupport->CacheTree->isCacheUpdatable($thread['Entry'])) { - $this->CacheSupport->CacheTree->set($id, $thread); - } + //= get threads + $initials = $this->_getInitialThreads($this->CurrentUser, $order); + $threads = $this->Entry->treesForThreads($initials, $order); + foreach ($threads as $tid => $thread) { + $threads[$tid] = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $thread]); } - $this->set('entries', $threads); $currentPage = 1; @@ -76,6 +52,7 @@ public function index() { // @bogus $this->Session->write('paginator.lastPage', $currentPage); $this->showDisclaimer = true; + $this->set('allowThreadCollapse', true); Stopwatch::stop('Entries->index()'); } @@ -128,16 +105,19 @@ public function mix($tid) { } // check if anonymous tries to access internal categories - $accession = $entries[0]['Category']['accession']; + $root = reset($entries); + $accession = $root['Category']['accession']; if (!$this->CurrentUser->Categories->isAccessionAuthorized($accession)) { $this->_requireAuth(); return; } - $root = $entries[0]; $this->_setRootEntry($root); $this->_setTitleFromEntry($root, __('view.type.mix')); + + $entries = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $root]); $this->set('entries', $entries); + $this->_showAnsweringPanel(); $this->_incrementViews($root, 'thread'); @@ -309,8 +289,10 @@ public function add($id = null) { } $this->request->data = $this->Entry->get($id); + $posting = $this->dic->newInstance('\Saito\Posting\Posting', + ['rawData' => $this->request->data]); - if ($this->Entry->isAnsweringForbidden($this->request->data)) { + if ($posting->isAnsweringForbidden()) { throw new ForbiddenException; } @@ -380,7 +362,10 @@ public function edit($id = null) { throw new NotFoundException(); } - switch ($oldEntry['rights']['isEditingForbidden']) { + /** * @var \Saito\Posting\Posting */ + $posting = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $oldEntry]); + + switch ($posting->isEditingAsCurrentUserForbidden()) { case 'time': $this->Session->setFlash( 'Stand by your word bro\', it\'s too late. @lo', @@ -415,7 +400,7 @@ public function edit($id = null) { } // show editing form - if ($oldEntry['rights']['isEditingAsUserForbidden']) { + if ($posting->isEditingWithRoleUserForbidden()) { $this->Session->setFlash(__('notice_you_are_editing_as_mod'), 'flash/warning'); } @@ -560,6 +545,7 @@ public function preview() { 'subject' => $data['subject'], 'text' => $data['text'], 'category' => $data['category'], + 'edited_by' => null, 'fixed' => false, 'solves' => 0, 'views' => 0, @@ -588,7 +574,8 @@ public function preview() { ) ) ); - $this->set('entry', $newEntry); + $entry = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $newEntry]); + $this->set('entry', $entry); else : // validation errors foreach ($errors as $field => $error) { @@ -852,14 +839,14 @@ protected function _getInitialThreads(CurrentUserComponent $User, $order) { $initialThreadsNew = []; foreach ($initialThreads as $k => $v) { - $initialThreadsNew[$k] = $v['Entry']; + $initialThreadsNew[$k] = $v['Entry']['id']; } Stopwatch::stop('Entries->_getInitialThreads() Paginate'); return $initialThreadsNew; } - protected function _setupCategoryChooser(ForumsUserInterface $User) { + protected function _setupCategoryChooser(\Saito\User\ForumsUserInterface $User) { $categories = $User->Categories->getAllowed(); $isUsed = $User->isLoggedIn() && @@ -874,8 +861,7 @@ protected function _setupCategoryChooser(ForumsUserInterface $User) { if ($isUsed) { // @todo find right place for this; also: User::getCategories(); - App::uses('UserCategories', 'Lib'); - $UserCategories = new UserCategories($User->getSettings(), $categories); + $UserCategories = new Categories($User->getSettings(), $categories); list($categories, $type, $custom) = $UserCategories->get(); $this->set('categoryChooserChecked', $custom); diff --git a/app/Controller/SearchesController.php b/app/Controller/SearchesController.php index 1313609f3..d6db49cf7 100644 --- a/app/Controller/SearchesController.php +++ b/app/Controller/SearchesController.php @@ -1,7 +1,8 @@ request->data['User']['password']); - $Logger = new \Saito\Logger\ForbiddenLogger(); + $Logger = new ForbiddenLogger; $Logger->write("Unsuccessful login for user: $username", ['msgs' => [$message]]); @@ -129,7 +134,7 @@ public function register() { // only used in test cases $this->set('email', $email); } catch (Exception $e) { - $Logger = new Saito\Logger\ExceptionLogger(); + $Logger = new ExceptionLogger(); $Logger->write('Registering email confirmation failed', ['e' => $e]); $this->set('status', 'fail: email'); return; @@ -337,17 +342,17 @@ public function view($id = null) { ); } - /** - * @param null $id - * @throws Saito\ForbiddenException - * @throws BadRequestException - */ + /** + * @param null $id + * @throws Saito\Exception\SaitoForbiddenException + * @throws BadRequestException + */ public function edit($id = null) { if (!$id) { throw new BadRequestException; } if (!$this->_isEditingAllowed($this->CurrentUser, $id)) { - throw new \Saito\ForbiddenException("Attempt to edit user $id.", [ + throw new \Saito\Exception\SaitoForbiddenException("Attempt to edit user $id.", [ 'CurrentUser' => $this->CurrentUser ]); } @@ -399,7 +404,7 @@ public function edit($id = null) { $this->set( 'title_for_layout', __('Edit %s Profil', - Properize::prop($this->request->data['User']['username'])) + Saito\String\Properize::prop($this->request->data['User']['username'])) ); } @@ -440,12 +445,15 @@ public function lock() { ); } else { try { - App::uses('UserBlockerManual', 'Lib/SaitoUser/Blocking'); $duration = (int)$this->request->data('User.lockPeriod'); - $status = $this->User->UserBlock->block(new UserBlockerManual, $id, [ - 'adminId' => $this->CurrentUser->getId(), - 'duration' => $duration - ]); + $status = $this->User->UserBlock->block( + new \Saito\User\Blocker\ManualBlocker, + $id, + [ + 'adminId' => $this->CurrentUser->getId(), + 'duration' => $duration + ] + ); $username = $readUser['User']['username']; if ($status === true) { $message = __('User %s is locked.', $username); @@ -501,7 +509,7 @@ public function admin_delete($id = null) { * changes user password * * @param null $id - * @throws Saito\ForbiddenException + * @throws \Saito\Exception\SaitoForbiddenException * @throws BadRequestException */ public function changepassword($id = null) { @@ -512,7 +520,7 @@ public function changepassword($id = null) { $user = $this->User->getProfile($id); $allowed = $this->_isEditingAllowed($this->CurrentUser, $id); if (empty($user) || !$allowed) { - throw new \Saito\ForbiddenException("Attempt to change password for user $id.", + throw new SaitoForbiddenException("Attempt to change password for user $id.", ['CurrentUser' => $this->CurrentUser]); } $this->set('userId', $id); @@ -655,7 +663,7 @@ public function beforeFilter() { * @param int $userId * @return type */ - protected function _isEditingAllowed(ForumsUserInterface $CurrentUser, $userId) { + protected function _isEditingAllowed(\Saito\User\ForumsUserInterface $CurrentUser, $userId) { if ($CurrentUser->isAdmin()) { return true; } diff --git a/app/Lib/Cache/CacheTree.php b/app/Lib/Cache/CacheTree.php deleted file mode 100644 index a0832a090..000000000 --- a/app/Lib/Cache/CacheTree.php +++ /dev/null @@ -1,115 +0,0 @@ -_CurrentUser = $CurrentUser; - - if (Configure::read('debug') > 1) { - Configure::write('Saito.Cache.Thread', false); - } - - if (!Configure::read('Saito.Cache.Thread')) { - return; - } - - $this->_allowUpdate = true; - $this->_allowRead = true; - } - - public function isCacheUpdatable(array $entry) { - if (!$this->_allowUpdate) { - return false; - } - return $this->_isRead($entry); - } - - public function isCacheValid(array $entry) { - if (!$this->_allowRead) { - return false; - } - - $id = (int)$entry['id']; - if (isset($this->_validEntries[$id])) { - return $this->_validEntries[$id]; - } - - if (!$this->_inCache($entry)) { - $valid = false; - } elseif ($this->_isRead($entry)) { - $valid = true; - } else { - $valid = false; - } - - $this->_validEntries[$id] = $valid; - return $valid; - } - - /** - * @param array $entry - * @return bool - */ - protected function _isRead(array $entry) { - return $this->_CurrentUser->LastRefresh->isNewerThan($entry['last_answer']) === true; - } - - protected function _inCache($entry) { - $id = $entry['id']; - - if (!$this->get($id)) { - return false; - } - - $lastAnswer = strtotime($entry['last_answer']); - $hasNewerAnswers = $this->compareUpdated($id, $lastAnswer, - function ($updated, $lastAnswer) { - return $lastAnswer > $updated; - }); - if ($hasNewerAnswers) { - $this->delete($id); - return false; - } - - return true; - } - - public function get($id = null) { - if (!$this->_allowRead) { - return false; - } - return parent::get($id); - } - - public function set($id, $content, $timestamp = null) { - if (!$this->_allowUpdate) { - return false; - } - parent::set($id, $content, $timestamp); - } - - } \ No newline at end of file diff --git a/app/Lib/Cache/CacheTreeCacheSupportCachelet.php b/app/Lib/Cache/CacheTreeCacheSupportCachelet.php deleted file mode 100644 index 6583a0f26..000000000 --- a/app/Lib/Cache/CacheTreeCacheSupportCachelet.php +++ /dev/null @@ -1,53 +0,0 @@ -_CacheTree = $CacheTree; - CakeEventManager::instance()->attach($this); - } - - public function implementedEvents() { - return [ - 'Model.Thread.change' => 'onThreadChanged', - 'Model.Entry.replyToEntry' => 'onEntryChanged', - 'Model.Entry.update' => 'onEntryChanged' - ]; - } - - public function onThreadChanged($event) { - $this->clear($event->data['subject']); - } - - /** - * @param $event - * @throws InvalidArgumentException - */ - public function onEntryChanged($event) { - $_modelAlias = $event->subject()->alias; - if (!isset($event->data['data'][$_modelAlias]['tid'])) { - throw new InvalidArgumentException('No thread-id in event data.'); - } - $_threadId = $event->data['data'][$_modelAlias]['tid']; - $this->clear($_threadId); - } - - public function clear($id = null) { - Cache::clearGroup('entries', 'entries'); - if ($id === null) { - $this->_CacheTree->reset(); - } else { - $this->_CacheTree->delete($id); - } - } - - } - diff --git a/app/Lib/Cache/SaitoCacheEngineDbCache.php b/app/Lib/Cache/SaitoCacheEngineDbCache.php deleted file mode 100644 index 7bb841df5..000000000 --- a/app/Lib/Cache/SaitoCacheEngineDbCache.php +++ /dev/null @@ -1,52 +0,0 @@ -_Database === null) { - $this->_Database = ClassRegistry::init('Ecach'); - $this->_Database->primaryKey = 'key'; - } - return $this->_Database; - } - - public function read($name) { - $result = $this->_db()->findByKey($name); - if (!$result) { - return []; - } - - $result = @unserialize($result['Ecach']['value']); - // catches storage overflow - if ($result === false) { - $this->_reset($name); - return []; - } - - return $result; - } - - protected function _reset($name) { - $this->write($name, []); - } - - public function write($name, $content) { - // @todo @bogus - // Calling this write in ItemCache::__deconstruct fails in PHPUnit - // because the table is already cleaned up and does no longer exist - // to write the content. - // Shouldn't never be an issue on a real server. - try { - return $this->_db()->save([ - 'Ecach' => ['key' => $name, 'value' => serialize($content)] - ]); - } catch (Exception $e) { - return false; - } - } - - } \ No newline at end of file diff --git a/app/Lib/Cache/CacheSupport.php b/app/Lib/Saito/Cache/CacheSupport.php similarity index 64% rename from app/Lib/Cache/CacheSupport.php rename to app/Lib/Saito/Cache/CacheSupport.php index 879326d4d..9a0d3a1ff 100644 --- a/app/Lib/Cache/CacheSupport.php +++ b/app/Lib/Saito/Cache/CacheSupport.php @@ -1,9 +1,11 @@ _buildInCaches as $_name) { - $this->add(new $_name); + $name = 'Saito\Cache\\' . $_name; + $this->add(new $name); } - CakeEventManager::instance()->attach($this); + \CakeEventManager::instance()->attach($this); } public function implementedEvents() { @@ -82,22 +86,11 @@ public function getId(); } - abstract class CacheSupportCachelet implements CacheSupportCacheletInterface { - - public function getId() { - if (!empty($this->_title)) { - return $this->_title; - } - return str_replace('CacheSupportCachelet', '', get_class($this)); - } - - } - class SaitoCacheSupportCachelet extends CacheSupportCachelet { public function clear($id = null) { - Cache::clear(false, 'default'); - Cache::clear(false, 'short'); + \Cache::clear(false, 'default'); + \Cache::clear(false, 'short'); } } @@ -129,9 +122,45 @@ class CakeCacheSupportCachelet extends CacheSupportCachelet { protected $_title = 'Cake'; public function clear($id = null) { - Cache::clearGroup('persistent'); - Cache::clearGroup('models'); - Cache::clearGroup('views'); + \Cache::clearGroup('persistent'); + \Cache::clearGroup('models'); + \Cache::clearGroup('views'); + } + + } + + class EntriesCacheSupportCachelet extends CacheSupportCachelet implements \CakeEventListener { + + protected $_title = 'EntriesCache'; + + protected $_CacheTree; + + public function __construct() { + \CakeEventManager::instance()->attach($this); + } + + public function implementedEvents() { + return [ + 'Model.Thread.change' => 'onThreadChanged', + 'Model.Entry.replyToEntry' => 'onEntryChanged', + 'Model.Entry.update' => 'onEntryChanged' + ]; + } + + public function onThreadChanged($event) { + $this->clear(); + } + + /** + * @param $event + * @throws InvalidArgumentException + */ + public function onEntryChanged($event) { + $this->clear(); + } + + public function clear($id = null) { + \Cache::clearGroup('entries', 'entries'); } } diff --git a/app/Lib/Saito/Cache/CacheSupportCachelet.php b/app/Lib/Saito/Cache/CacheSupportCachelet.php new file mode 100644 index 000000000..ae14dca6b --- /dev/null +++ b/app/Lib/Saito/Cache/CacheSupportCachelet.php @@ -0,0 +1,15 @@ +_title)) { + return $this->_title; + } + return str_replace('CacheSupportCachelet', '', get_class($this)); + } + + } + diff --git a/app/Lib/Cache/ItemCache.php b/app/Lib/Saito/Cache/ItemCache.php similarity index 62% rename from app/Lib/Cache/ItemCache.php rename to app/Lib/Saito/Cache/ItemCache.php index ede65cbcb..b018a136e 100644 --- a/app/Lib/Cache/ItemCache.php +++ b/app/Lib/Saito/Cache/ItemCache.php @@ -1,7 +1,15 @@ null, 'maxItems' => null, // +/- percentage maxItems can deviate before gc is triggered - 'maxItemsFuzzy' => 0.05 + 'maxItemsFuzzy' => 0.06 ]; + protected $_gcFuzzy; + + protected $_gcMax; + + protected $_gcMin; + protected $_name; protected $_now; + protected $_oldestPersistent = 0; + protected $_updated = false; public function __construct($name, SaitoCacheEngineInterface $CacheEngine = null, $options = []) { @@ -29,6 +45,12 @@ public function __construct($name, SaitoCacheEngineInterface $CacheEngine = null $this->_now = time(); $this->_name = $name; $this->_CacheEngine = $CacheEngine; + + if ($this->_settings['maxItems']) { + $this->_gcFuzzy = $this->_settings['maxItemsFuzzy']; + $this->_gcMax = (int)($this->_settings['maxItems'] * (1 + $this->_gcFuzzy)); + $this->_gcMin = (int)($this->_gcMax * (1 - $this->_gcFuzzy)); + } } public function __destruct() { @@ -70,7 +92,7 @@ public function get($key = null) { */ public function compareUpdated($key, $timestamp, callable $comp) { if (!isset($this->_cache[$key])) { - throw new InvalidArgumentException; + throw new \InvalidArgumentException; } return $comp($this->_cache[$key]['metadata']['content_last_updated'], $timestamp); @@ -81,11 +103,26 @@ public function set($key, $content, $timestamp = null) { $this->_read(); } - $this->_updated = true; - if (!$timestamp) { $timestamp = $this->_now; } + + /* + * Don't fill the cache with entries which are removed by the maxItemsGC. + * Old entries may trigger a store to disk on each request without + * adding new cache data. + */ + // there's no upper limit + if (!$this->_gcMax) { + $this->_updated = true; + // the new entry is not older than the oldest existing + } elseif ($timestamp > $this->_oldestPersistent) { + $this->_updated = true; + // there's still room in lower maxItemsGc limit + } elseif (count($this->_cache) < $this->_gcMin) { + $this->_updated = true; + } + $metadata = [ 'created' => $this->_now, 'content_last_updated' => $timestamp, @@ -95,12 +132,19 @@ public function set($key, $content, $timestamp = null) { $this->_cache[$key] = $data; } + protected function _isCacheFull() { + if (!$this->_gcMax) { + return false; + } + return count($this->_cache) >= $this->_settings['maxItems']; + } + protected function _read() { if ($this->_CacheEngine === null) { $this->_cache = []; return; } - Stopwatch::start("ItemCache read: {$this->_name}"); + \Stopwatch::start("ItemCache read: {$this->_name}"); $this->_cache = $this->_CacheEngine->read($this->_name); if (empty($this->_cache)) { $this->_cache = []; @@ -108,8 +152,11 @@ protected function _read() { if ($this->_settings['duration']) { $this->_gcOutdated(); } - Stopwatch::stop("ItemCache read: {$this->_name}"); - return; + if (count($this->_cache) > 0) { + $oldest = reset($this->_cache); + $this->_oldestPersistent = $oldest['metadata']['content_last_updated']; + } + \Stopwatch::stop("ItemCache read: {$this->_name}"); } public function reset() { @@ -118,7 +165,7 @@ public function reset() { } protected function _gcOutdated() { - Stopwatch::start("ItemCache _gcOutdated: {$this->_name}"); + \Stopwatch::start("ItemCache _gcOutdated: {$this->_name}"); $expired = time() - $this->_settings['duration']; foreach ($this->_cache as $key => $item) { if ($item['metadata']['created'] < $expired) { @@ -126,7 +173,7 @@ protected function _gcOutdated() { $this->_updated = true; } } - Stopwatch::stop("ItemCache _gcOutdated: {$this->_name}"); + \Stopwatch::stop("ItemCache _gcOutdated: {$this->_name}"); } /** @@ -135,16 +182,16 @@ protected function _gcOutdated() { * costly function for larger arrays, relieved by maxItemsFuzzy */ protected function _gcMaxItems() { - // Stopwatch::start("ItemCache _gxMaxItems: {$this->_name}"); - - $fuzzy = $this->_settings['maxItemsFuzzy']; - $max = (int)($this->_settings['maxItems'] * (1 + $fuzzy)); - - if (count($this->_cache) <= $max) { - Stopwatch::stop("ItemCache _gxMaxItems: {$this->_name}"); + if (count($this->_cache) <= $this->_gcMax) { return; } + $this->_cache = array_slice($this->_cache, 0, $this->_gcMin, true); + } + /** + * sorts for 'content_last_updated', oldest on top + */ + protected function _sort() { // keep items which were last used/updated uasort($this->_cache, function ($a, $b) { if ($a['metadata']['content_last_updated'] === $b['metadata']['content_last_updated']) { @@ -152,17 +199,14 @@ protected function _gcMaxItems() { } return ($a['metadata']['content_last_updated'] < $b['metadata']['content_last_updated']) ? 1 : -1; }); - - $min = (int)($this->_settings['maxItems'] * (1 - $fuzzy)); - $this->_cache = array_slice($this->_cache, 0, $min, true); - // Stopwatch::stop("ItemCache _gxMaxItems: {$this->_name}"); } protected function _write() { if ($this->_CacheEngine === null || !$this->_updated) { return; } - if ($this->_settings['maxItems']) { + $this->_sort(); + if ($this->_gcMax) { $this->_gcMaxItems(); } $this->_CacheEngine->write($this->_name, $this->_cache); diff --git a/app/Lib/Cache/LineCacheSupportCachelet.php b/app/Lib/Saito/Cache/LineCacheSupportCachelet.php similarity index 75% rename from app/Lib/Cache/LineCacheSupportCachelet.php rename to app/Lib/Saito/Cache/LineCacheSupportCachelet.php index ffe5c527c..bc194b60e 100644 --- a/app/Lib/Cache/LineCacheSupportCachelet.php +++ b/app/Lib/Saito/Cache/LineCacheSupportCachelet.php @@ -1,18 +1,19 @@ attach($this); + \CakeEventManager::instance()->attach($this); $this->_LineCache = $LineCache; } @@ -29,7 +30,7 @@ public function implementedEvents() { public function onEntryChanged($event) { $_modelAlias = $event->subject()->alias; if (!isset($event->data['data'][$_modelAlias]['tid'])) { - throw new InvalidArgumentException('No thread-id in event data.'); + throw new \InvalidArgumentException('No thread-id in event data.'); } $id = $event->data['data'][$_modelAlias]['id']; $this->clear($id); diff --git a/app/Lib/Cache/SaitoCacheEngineAppCache.php b/app/Lib/Saito/Cache/SaitoCacheEngineAppCache.php similarity index 57% rename from app/Lib/Cache/SaitoCacheEngineAppCache.php rename to app/Lib/Saito/Cache/SaitoCacheEngineAppCache.php index d402e8d56..08fd074ca 100644 --- a/app/Lib/Cache/SaitoCacheEngineAppCache.php +++ b/app/Lib/Saito/Cache/SaitoCacheEngineAppCache.php @@ -1,15 +1,15 @@ params['\Saito\Posting\Posting']['CurrentUser'] = $dic->lazyGet('CU'); + return $dic; + } + + } \ No newline at end of file diff --git a/app/Lib/DomainParser.php b/app/Lib/Saito/DomainParser.php similarity index 97% rename from app/Lib/DomainParser.php rename to app/Lib/Saito/DomainParser.php index 93a52cad2..9c67833f8 100644 --- a/app/Lib/DomainParser.php +++ b/app/Lib/Saito/DomainParser.php @@ -1,5 +1,7 @@ __Logger = new ExceptionLogger; + $this->__Logger->write($message, $data); + parent::__construct($message, 400); + } + + } + diff --git a/app/Lib/Saito/Exception/SaitoForbiddenException.php b/app/Lib/Saito/Exception/SaitoForbiddenException.php new file mode 100644 index 000000000..a628028c6 --- /dev/null +++ b/app/Lib/Saito/Exception/SaitoForbiddenException.php @@ -0,0 +1,21 @@ +__Logger = new ForbiddenLogger; + $this->__Logger->write($message, $data); + parent::__construct($message, 403); + } + + } + diff --git a/app/Lib/JsData.php b/app/Lib/Saito/JsData.php similarity index 93% rename from app/Lib/JsData.php rename to app/Lib/Saito/JsData.php index 083e17a25..4a8123451 100644 --- a/app/Lib/JsData.php +++ b/app/Lib/Saito/JsData.php @@ -1,5 +1,7 @@ _appJs[$key] = $value; } - public function addAppJsMessage($message, $options = null) { + public function addAppJsMessage($message, $options = []) { $defaults = array( 'type' => 'notice', 'channel' => 'notification' diff --git a/app/Lib/Saito/SaitoPlugin.php b/app/Lib/Saito/Plugin.php similarity index 73% rename from app/Lib/Saito/SaitoPlugin.php rename to app/Lib/Saito/Plugin.php index 6f4682257..7b2379ed0 100644 --- a/app/Lib/Saito/SaitoPlugin.php +++ b/app/Lib/Saito/Plugin.php @@ -1,6 +1,8 @@ newInstanceArgs($args); } diff --git a/app/Lib/Saito/Posting/Decorator/DecoratorInterface.php b/app/Lib/Saito/Posting/Decorator/DecoratorInterface.php new file mode 100644 index 000000000..4c2faf14e --- /dev/null +++ b/app/Lib/Saito/Posting/Decorator/DecoratorInterface.php @@ -0,0 +1,56 @@ +_Posting = $Posting; + return $this; + } + + public function get($var) { + return $this->_Posting->get($var); + } + + public function getChildren() { + return $this->_Posting->getChildren(); + } + + public function getLevel() { + return $this->_Posting->getLevel(); + } + + public function getRaw() { + return $this->_Posting->getRaw(); + } + + public function getThread() { + return $this->_Posting->getThread(); + } + + public function hasAnswers() { + return $this->_Posting->hasAnswers(); + } + + public function isNt() { + return $this->_Posting->isNt(); + } + + public function isPinned() { + return $this->_Posting->isPinned(); + } + + public function isRoot() { + return $this->_Posting->isRoot(); + } + + public function addDecorator($fct) { + return $this->_Posting->addDecorator($fct); + } + + } \ No newline at end of file diff --git a/app/Lib/Saito/Posting/Decorator/UserPostingTrait.php b/app/Lib/Saito/Posting/Decorator/UserPostingTrait.php new file mode 100644 index 000000000..3404f8d25 --- /dev/null +++ b/app/Lib/Saito/Posting/Decorator/UserPostingTrait.php @@ -0,0 +1,134 @@ +_CU; + } + + public function setCurrentUser($CU) { + $this->_CU = $CU; + } + + /** + * Checks if answering an entry is allowed + * + * @param array $entry + * @return boolean + */ + public function isAnsweringForbidden() { + if ($this->isLocked()) { + $isAnsweringForbidden = 'locked'; + } else { + $isAnsweringForbidden = false; + } + return $isAnsweringForbidden; + } + + /** + * checks if entry is bookmarked by current user + */ + public function isBookmarked() { + return $this->_CU->hasBookmarked($this->get('id')); + } + + public function isEditingAsCurrentUserForbidden() { + return $this->_isEditingForbidden($this, $this->_CU); + } + + public function isEditingWithRoleUserForbidden() { + return $this->_isEditingForbidden($this, $this->_CU->mockUserType('user')); + } + + protected function _isEditingForbidden(\Saito\Posting\Posting $posting, $User) { + // Anon + if ($User->isLoggedIn() !== true) { + return true; + } + + // Admins + if ($User->isAdmin()) { + return false; + } + + $verboten = true; + + $timeLimit = (\Configure::read('Saito.Settings.edit_period') * 60) + strtotime($posting->get('time')); + $isOverTimeLimit = time() > $timeLimit; + + $isUsersPosting = (int)$User->getId() === (int)$posting->get('user_id'); + + if ($User->isMod()) { + // Mods + // @todo mods don't edit admin posts + if ($isUsersPosting && $isOverTimeLimit && + /* Mods should be able to edit their own posts if they are pinned + * + * @todo this opens a 'mod can pin and then edit root entries'-loophole, + * as long as no one checks pinning for Configure::read('Saito.Settings.edit_period') * 60 + * for mods pinning root-posts. + */ + (!$posting->isPinned()) + ) { + // mods don't mod themselves + $verboten = 'time'; + } else { + $verboten = false; + }; + + } else { + // Users + if ($isUsersPosting === false) { + $verboten = 'user'; + } elseif ($isOverTimeLimit) { + $verboten = 'time'; + } elseif ($this->isLocked()) { + $verboten = 'locked'; + } else { + $verboten = false; + } + } + + return $verboten; + } + + public function isIgnored() { + return $this->_CU->ignores($this->get('user_id')); + } + + public function isNew() { + if (isset($this->_cache['isNew'])) { + $this->_cache['isNew'] = $this->_cache['isNew']; + } else { + $id = $this->get('id'); + $time = $this->get('time'); + $this->_cache['isNew'] = !$this->_CU->ReadEntries->isRead($id, $time); + } + return $this->_cache['isNew']; + } + + /** + * Checks if posting has newer answers + * + * currently only supported for root postings + * + * @return bool + * @throws \RuntimeException + */ + public function hasNewAnswers() { + if (!$this->isRoot()) { + throw new \RuntimeException('Posting with id ' . $this->get('id') . ' is no root posting.'); + } + if (!isset($this->_CU['last_refresh'])) { + return false; + } + return $this->_CU['last_refresh_unix'] < strtotime($this->get('last_answer')); + } + + } diff --git a/app/Lib/Saito/Posting/Posting.php b/app/Lib/Saito/Posting/Posting.php new file mode 100644 index 000000000..a74a6da4e --- /dev/null +++ b/app/Lib/Saito/Posting/Posting.php @@ -0,0 +1,126 @@ +_rawData = $rawData; + $this->_rawData[self::ALIAS]['id'] = (int)$this->_rawData[self::ALIAS]['id']; + if (isset($this->_rawData[self::ALIAS]['pid'])) { + $this->_rawData[self::ALIAS]['pid'] = (int)$this->_rawData[self::ALIAS]['pid']; + } + if (isset($this->_rawData[self::ALIAS]['tid'])) { + $this->_rawData[self::ALIAS]['tid'] = (int)$this->_rawData[self::ALIAS]['tid']; + } + + $this->setCurrentUser($CurrentUser); + + $options += ['level' => 0]; + $this->_level = $options['level']; + + if (!$tree) { + $tree = new \Saito\Thread\Thread; + } + $this->_Thread = $tree; + $this->_Thread->add($this); + + $this->_attachChildren(); + return $this; + } + + /** + * @param $var + * @return mixed + * @throws \InvalidArgumentException + */ + public function get($var) { + switch ($var) { + case (isset($this->_rawData[self::ALIAS][$var])): + return $this->_rawData[self::ALIAS][$var]; + case (isset($this->_rawData[$var])): + return $this->_rawData[$var]; + // if key is set but null + case (array_key_exists($var, $this->_rawData[self::ALIAS])): + return $this->_rawData[self::ALIAS][$var]; + default: + throw new \InvalidArgumentException("Attribute '$var' not found in class Posting."); + } + } + + public function getLevel() { + return $this->_level; + } + + public function getChildren() { + return $this->_children; + } + + public function getRaw() { + return $this->_rawData; + } + + public function getThread() { + return $this->_Thread; + } + + public function hasAnswers() { + return count($this->_children) > 0; + } + + public function isLocked() { + return $this->get('locked') != false; + } + + /** + * checks if entry is n/t + * + * @return bool + */ + public function isNt() { + return empty($this->_rawData[self::ALIAS]['text']); + } + + public function isPinned() { + return $this->_rawData[self::ALIAS]['fixed'] == true; + } + + public function isRoot() { + return $this->_rawData[self::ALIAS]['pid'] === 0; + } + + public function addDecorator($fct) { + foreach ($this->_children as $key => $child) { + $newChild = $fct($child); + $newChild->addDecorator($fct); + $this->_children[$key] = $newChild; + } + $new = $fct($this); + // replace decorated object in Thread collection + $this->_Thread->add($new); + return $new; + } + + protected function _attachChildren() { + if (isset($this->_rawData['_children'])) { + foreach ($this->_rawData['_children'] as $child) { + $this->_children[] = new Posting($this->getCurrentUser(), $child, ['level' => $this->_level + 1], $this->_Thread); + } + } + unset($this->_rawData['_children']); + } + + } + diff --git a/app/Lib/Thread/PostingInterface.php b/app/Lib/Saito/Posting/PostingInterface.php similarity index 53% rename from app/Lib/Thread/PostingInterface.php rename to app/Lib/Saito/Posting/PostingInterface.php index 91ddf0dfe..92acaac03 100644 --- a/app/Lib/Thread/PostingInterface.php +++ b/app/Lib/Saito/Posting/PostingInterface.php @@ -1,13 +1,23 @@ isPinned()) { $out .= ' '; } // anchor for inserting solve-icon via FE-JS - $out .= ''; - if ($entry['Entry']['solves']) { + $out .= ''; + if ($entry->get('solves')) { $out .= $this->solvedBadge(); } $out .= ''; if (!isset($this->_SEM)) { - $this->_SEM = SaitoEventManager::getInstance(); + $this->_SEM = \SaitoEventManager::getInstance(); } $additionalBadges = $this->_SEM->dispatch( 'Request.Saito.View.Posting.badges', - ['posting' => $entry] + ['posting' => $entry->getRaw()] ); if ($additionalBadges) { $out .= implode('', $additionalBadges); @@ -46,11 +45,11 @@ public function solvedBadge() { * This function may be called serveral hundred times on the front page. * Don't make ist slow, benchmark! * - * @param $entry + * @param $posting * @return string */ - public function getSubject($entry) { - return h($entry['Entry']['subject']) . (empty($entry['Entry']['text']) ? ' n/t' : ''); + public function getSubject(\Saito\Posting\Posting $posting) { + return \h($posting->get('subject')) . ($posting->isNt() ? ' n/t' : ''); } } \ No newline at end of file diff --git a/app/Lib/SimpleSearchString.php b/app/Lib/Saito/SimpleSearchString.php similarity index 98% rename from app/Lib/SimpleSearchString.php rename to app/Lib/Saito/SimpleSearchString.php index 0425a73c4..96f02c38e 100644 --- a/app/Lib/SimpleSearchString.php +++ b/app/Lib/Saito/SimpleSearchString.php @@ -1,5 +1,7 @@ loadHTML('' . $html); - $xpath = new DOMXPath($document); + $xpath = new \DOMXPath($document); libxml_clear_errors(); return $xpath; } diff --git a/app/Lib/Test/SaitoControllerTestCase.php b/app/Lib/Saito/Test/ControllerTestCase.php similarity index 66% rename from app/Lib/Test/SaitoControllerTestCase.php rename to app/Lib/Saito/Test/ControllerTestCase.php index c2b04fb83..01cf4692c 100644 --- a/app/Lib/Test/SaitoControllerTestCase.php +++ b/app/Lib/Saito/Test/ControllerTestCase.php @@ -1,5 +1,7 @@ _logoutUser(); - $userFixture = new UserFixture(); + $userFixture = new \UserFixture(); $users = $userFixture->records; $this->controller->Session->write('Auth.User', $users[$id - 1]); } protected function _debugEmail() { - Configure::write('Saito.Debug.email', true); + \Configure::write('Saito.Debug.email', true); } protected function _resetEmail() { - Configure::write('Saito.Debug.email', false); + \Configure::write('Saito.Debug.email', false); } public function assertRedirectedTo($url = '') { $this->assertEquals( $this->headers['Location'], - Router::fullBaseUrl() . $this->controller->request->webroot . $url + \Router::fullBaseUrl() . $this->controller->request->webroot . $url ); } @@ -121,12 +121,12 @@ public function setUp() { $this->_unsetAjax(); $this->_unsetJson(); $this->_debugEmail(); - Configure::write('Cache.disable', true); - Configure::write('Config.language', 'eng'); + \Configure::write('Cache.disable', true); + \Configure::write('Config.language', 'eng'); } public function tearDown() { - Configure::write('Cache.disable', false); + \Configure::write('Cache.disable', false); $this->_unsetUserAgent(); $this->_resetEmail(); $this->_logoutUser(); @@ -135,34 +135,4 @@ public function tearDown() { } - trait SaitoSecurityMockTrait { - - public function generate($controller, $mocks = []) { - $byPassSecurity = false; - if (!isset($mocks['components']['Security'])) { - $byPassSecurity = true; - $mocks['components']['Security'] = ['_validateCsrf', '_validatePost']; - } - $Mock = parent::generate($controller, $mocks); - if ($byPassSecurity) { - $this->assertSecurityByPass($Mock); - } - return $Mock; - } - - /** - * Assume that SecurityComponent was called - * - * @param $Controller - */ - public function assertSecurityBypass($Controller) { - $Controller->Security->expects($this->any()) - ->method('_validatePost') - ->will($this->returnValue(true)); - $Controller->Security->expects($this->any()) - ->method('_validateCsrf') - ->will($this->returnValue(true)); - } - - } diff --git a/app/Lib/Saito/Test/DicSetup.php b/app/Lib/Saito/Test/DicSetup.php new file mode 100644 index 000000000..5a2044a3d --- /dev/null +++ b/app/Lib/Saito/Test/DicSetup.php @@ -0,0 +1,19 @@ +set('CU', $User); + return $dic; + } + + } \ No newline at end of file diff --git a/app/Lib/Saito/Test/SecurityMockTrait.php b/app/Lib/Saito/Test/SecurityMockTrait.php new file mode 100644 index 000000000..404297e7b --- /dev/null +++ b/app/Lib/Saito/Test/SecurityMockTrait.php @@ -0,0 +1,34 @@ +assertSecurityByPass($Mock); + } + return $Mock; + } + + /** + * Assume that SecurityComponent was called + * + * @param $Controller + */ + public function assertSecurityBypass($Controller) { + $Controller->Security->expects($this->any()) + ->method('_validatePost') + ->will($this->returnValue(true)); + $Controller->Security->expects($this->any()) + ->method('_validateCsrf') + ->will($this->returnValue(true)); + } + + } diff --git a/app/Lib/Thread/Renderer/HtmlRendererAbstract.php b/app/Lib/Saito/Thread/Renderer/HtmlRendererAbstract.php similarity index 70% rename from app/Lib/Thread/Renderer/HtmlRendererAbstract.php rename to app/Lib/Saito/Thread/Renderer/HtmlRendererAbstract.php index b19d13af9..8360a60db 100644 --- a/app/Lib/Thread/Renderer/HtmlRendererAbstract.php +++ b/app/Lib/Saito/Thread/Renderer/HtmlRendererAbstract.php @@ -1,6 +1,6 @@ _EntryHelper = $EntryHelper; + $this->_SEM = \SaitoEventManager::getInstance(); $this->setOptions($options); } - public function render(PostingInterface $node) { - $this->_lastAnswer = $node->Thread->getLastAnswer(); + public function render(\Saito\Posting\PostingInterface $node) { + $this->_lastAnswer = $node->getThread()->getLastAnswer(); $html = $this->_renderNode($node); - if ($node->getLevel() === 0) { - $html = $this->_wrapUl($html, 0, $node->id); + if ($node->isRoot()) { + $html = $this->_wrapUl($html, 0, $node->get('id')); } return $html; } @@ -37,7 +41,7 @@ public function setOptions($options) { $this->_settings = $options + $this->_defaults; } - protected function _renderNode(PostingInterface $node) { + protected function _renderNode(\Saito\Posting\PostingInterface $node) { $html = $this->_renderCore($node); $children = $node->getChildren(); @@ -54,7 +58,7 @@ protected function _renderNode(PostingInterface $node) { return $html; } - protected abstract function _renderCore(PostingInterface $node); + protected abstract function _renderCore(\Saito\Posting\PostingInterface $node); /** * Wraps li tags with ul tag @@ -85,9 +89,9 @@ protected function _wrapUl($string, $level = null, $id = null) { * @return string */ protected function _css($node) { - $entryType = ($node->getLevel() === 0) ? 'et-root' : 'et-reply'; + $entryType = ($node->isRoot()) ? 'et-root' : 'et-reply'; $entryType .= ($node->isNew()) ? ' et-new' : ' et-old'; - if ($node->id === (int)$this->_settings['currentEntry']) { + if ($node->get('id') === (int)$this->_settings['currentEntry']) { $entryType .= ' et-current'; } $css = $entryType; diff --git a/app/Lib/Thread/Renderer/MixHtmlRenderer.php b/app/Lib/Saito/Thread/Renderer/MixHtmlRenderer.php similarity index 60% rename from app/Lib/Thread/Renderer/MixHtmlRenderer.php rename to app/Lib/Saito/Thread/Renderer/MixHtmlRenderer.php index 655eacabe..f715beb92 100644 --- a/app/Lib/Thread/Renderer/MixHtmlRenderer.php +++ b/app/Lib/Saito/Thread/Renderer/MixHtmlRenderer.php @@ -1,19 +1,19 @@ _css($node); $html = $this->_EntryHelper->_View->element('/entry/view_posting', - ['entry' => $node->getRaw(), 'level' => $node->getLevel()]); + ['entry' => $node, 'level' => $node->getLevel()]); $html = << +
  • {$html}
    • EOF; diff --git a/app/Lib/Thread/Renderer/ThreadHtmlRenderer.php b/app/Lib/Saito/Thread/Renderer/ThreadHtmlRenderer.php similarity index 84% rename from app/Lib/Thread/Renderer/ThreadHtmlRenderer.php rename to app/Lib/Saito/Thread/Renderer/ThreadHtmlRenderer.php index 3da11197b..23a4a328b 100644 --- a/app/Lib/Thread/Renderer/ThreadHtmlRenderer.php +++ b/app/Lib/Saito/Thread/Renderer/ThreadHtmlRenderer.php @@ -1,6 +1,6 @@ getRaw(); $level = $node->getLevel(); - $id = (int)$posting['Entry']['id']; + $id = $posting['Entry']['id']; - $threadLine = $this->_renderThreadLine($posting, $level); + $threadLine = $this->_renderThreadLine($node, $posting, $level); $css = $this->_css($node); - $badges = $this->getBadges($posting); + $badges = $this->getBadges($node); $requestedParams = $this->_SEM->dispatch( 'Request.Saito.View.ThreadLine.beforeRender', @@ -52,7 +52,7 @@ protected function _renderCore(PostingInterface $node) { } //= manual json_encode() for performance - $tid = (int)$posting['Entry']['tid']; + $tid = $posting['Entry']['tid']; $isNew = $node->isNew() ? 'true' : 'false'; $jsData = << comes from _renderThreadLine and allows appending to threadLine-post $out = << -
    +
    @@ -76,15 +76,15 @@ class="link_show_thread et threadLine-content"> return $out; } - protected function _renderThreadLine(array $posting, $level) { - $id = (int)$posting['Entry']['id']; + protected function _renderThreadLine($node, array $posting, $level) { + $id = $posting['Entry']['id']; $useLineCache = $level > 0 && $this->_LineCache; if ($useLineCache && $threadLine = $this->_LineCache->get($id)) { return $threadLine; } - $subject = $this->getSubject($posting); + $subject = $this->getSubject($node); $username = h($posting['User']['username']); $time = $this->_EntryHelper->TimeH->formatTime($posting['Entry']['time']); diff --git a/app/Lib/Thread/Thread.php b/app/Lib/Saito/Thread/Thread.php similarity index 71% rename from app/Lib/Thread/Thread.php rename to app/Lib/Saito/Thread/Thread.php index 1dd52cf33..3c3e59514 100644 --- a/app/Lib/Thread/Thread.php +++ b/app/Lib/Saito/Thread/Thread.php @@ -1,5 +1,7 @@ id; + public function add(\Saito\Posting\PostingInterface $posting) { + $id = $posting->get('id'); $this->_Postings[$id] = $posting; if ($this->_rootId === null) { @@ -28,7 +30,7 @@ public function get($id) { } public function getLastAnswer() { - return strtotime($this->get('root')->last_answer); + return strtotime($this->get('root')->get('last_answer')); } } diff --git a/app/Lib/SaitoUser/CategoryAuth.php b/app/Lib/Saito/User/Auth/CategoryAuthorization.php similarity index 81% rename from app/Lib/SaitoUser/CategoryAuth.php rename to app/Lib/Saito/User/Auth/CategoryAuthorization.php index 2d951ebec..0fa9fb306 100644 --- a/app/Lib/SaitoUser/CategoryAuth.php +++ b/app/Lib/Saito/User/Auth/CategoryAuthorization.php @@ -1,12 +1,16 @@ _User = $User; } @@ -23,7 +27,7 @@ public function getAllowed($format = 'short') { return $this->_cache[$format]; } - $Category = ClassRegistry::init('Category'); + $Category = \ClassRegistry::init('Category'); $acs = $this->_User->getMaxAccession(); $categories = $Category->getCategoriesForAccession($acs); diff --git a/app/Lib/SaitoUser/Blocking/UserBlockerAbstract.php b/app/Lib/Saito/User/Blocker/BlockerAbstract.php similarity index 83% rename from app/Lib/SaitoUser/Blocking/UserBlockerAbstract.php rename to app/Lib/Saito/User/Blocker/BlockerAbstract.php index 9a2b9da18..9280c0ba2 100644 --- a/app/Lib/SaitoUser/Blocking/UserBlockerAbstract.php +++ b/app/Lib/Saito/User/Blocker/BlockerAbstract.php @@ -1,6 +1,8 @@ _defaults; $user = $this->_Model->User->getProfile($userId); if (empty($user)) { - throw new InvalidArgumentException; + throw new \InvalidArgumentException; } $conditions = [ 'ended' => null, @@ -51,7 +51,7 @@ public function block($userId, array $options = []) { } $success = $this->_Model->save($conditions); if (empty($success)) { - throw new Exception; + throw new \Exception; } } else { $this->_Model->unblock($existing[$this->_Model->alias]['id']); diff --git a/app/Lib/UserBookmarks.php b/app/Lib/Saito/User/Bookmarks.php similarity index 85% rename from app/Lib/UserBookmarks.php rename to app/Lib/Saito/User/Bookmarks.php index dc93553b3..6b8248240 100644 --- a/app/Lib/UserBookmarks.php +++ b/app/Lib/Saito/User/Bookmarks.php @@ -1,9 +1,11 @@ id, …] @@ -12,7 +14,7 @@ class UserBookmarks { protected $_CurrentUser; - public function __construct(CurrentUserComponent $CurrentUser) { + public function __construct(\CurrentUserComponent $CurrentUser) { $this->_CurrentUser = $CurrentUser; } diff --git a/app/Lib/UserCategories.php b/app/Lib/Saito/User/Categories.php similarity index 97% rename from app/Lib/UserCategories.php rename to app/Lib/Saito/User/Categories.php index 15fdb7264..5f4db1b8b 100644 --- a/app/Lib/UserCategories.php +++ b/app/Lib/Saito/User/Categories.php @@ -1,6 +1,8 @@ _Cookie = $Cookie; $this->_key = $key; $this->_setup(); diff --git a/app/Lib/SaitoUser/ForumsUserInterface.php b/app/Lib/Saito/User/ForumsUserInterface.php similarity index 95% rename from app/Lib/SaitoUser/ForumsUserInterface.php rename to app/Lib/Saito/User/ForumsUserInterface.php index f1a4f8158..e12da7e3f 100644 --- a/app/Lib/SaitoUser/ForumsUserInterface.php +++ b/app/Lib/Saito/User/ForumsUserInterface.php @@ -1,5 +1,7 @@ _CurrentUser = $CurrentUser; } diff --git a/app/Lib/SaitoUser/LastRefresh/LastRefreshCookie.php b/app/Lib/Saito/User/LastRefresh/LastRefreshCookie.php similarity index 73% rename from app/Lib/SaitoUser/LastRefresh/LastRefreshCookie.php rename to app/Lib/Saito/User/LastRefresh/LastRefreshCookie.php index 32bf5bb17..5aa701e0a 100644 --- a/app/Lib/SaitoUser/LastRefresh/LastRefreshCookie.php +++ b/app/Lib/Saito/User/LastRefresh/LastRefreshCookie.php @@ -1,7 +1,8 @@ _CurrentUser = $CurrentUser; - $this->_Cookie = new SaitoUserCookieStorage( + $this->_Cookie = new Cookie\Storage( $this->_CurrentUser->Cookie, 'lastRefresh' ); diff --git a/app/Lib/SaitoUser/LastRefresh/LastRefreshDatabase.php b/app/Lib/Saito/User/LastRefresh/LastRefreshDatabase.php similarity index 90% rename from app/Lib/SaitoUser/LastRefresh/LastRefreshDatabase.php rename to app/Lib/Saito/User/LastRefresh/LastRefreshDatabase.php index 37044f195..ba343bfb1 100644 --- a/app/Lib/SaitoUser/LastRefresh/LastRefreshDatabase.php +++ b/app/Lib/Saito/User/LastRefresh/LastRefreshDatabase.php @@ -1,6 +1,6 @@ _timestamp === null) { @@ -19,7 +19,7 @@ protected function _get() { // on ArrayIterator … Yeah for PHP!1!! $settings = $this->_CurrentUser->getSettings(); if (!array_key_exists('last_refresh', $settings)) { - throw new Exception('last_refresh not set'); + throw new \Exception('last_refresh not set'); } elseif ($settings['last_refresh'] === null) { // mar is not initialized $this->_timestamp = false; diff --git a/app/Lib/SaitoUser/LastRefresh/LastRefreshDummy.php b/app/Lib/Saito/User/LastRefresh/LastRefreshDummy.php similarity index 84% rename from app/Lib/SaitoUser/LastRefresh/LastRefreshDummy.php rename to app/Lib/Saito/User/LastRefresh/LastRefreshDummy.php index 2f0c2737d..29377ec76 100644 --- a/app/Lib/SaitoUser/LastRefresh/LastRefreshDummy.php +++ b/app/Lib/Saito/User/LastRefresh/LastRefreshDummy.php @@ -1,6 +1,6 @@ _CurrentUser = $CurrentUser; $this->_LastRefresh = $this->_CurrentUser->LastRefresh; } @@ -65,7 +67,7 @@ abstract public function delete(); * * @param $postings * @return array - * @throws InvalidArgumentException + * @throws \InvalidArgumentException */ protected function _preparePostings($postings) { // wrap single posting @@ -74,7 +76,7 @@ protected function _preparePostings($postings) { } if (empty($postings)) { - throw new InvalidArgumentException; + throw new \InvalidArgumentException; } // performance: don't store entries covered by timestamp @@ -85,7 +87,7 @@ protected function _preparePostings($postings) { } if (!empty($postings)) { - $postings = Hash::extract($postings, '{n}.' . $this->_modelAlias . '.id'); + $postings = \Hash::extract($postings, '{n}.' . $this->_modelAlias . '.id'); } return $postings; diff --git a/app/Lib/SaitoUser/ReadPostings/ReadPostingsCookie.php b/app/Lib/Saito/User/ReadPostings/ReadPostingsCookie.php similarity index 88% rename from app/Lib/SaitoUser/ReadPostings/ReadPostingsCookie.php rename to app/Lib/Saito/User/ReadPostings/ReadPostingsCookie.php index 0f5ebb152..821ca8396 100644 --- a/app/Lib/SaitoUser/ReadPostings/ReadPostingsCookie.php +++ b/app/Lib/Saito/User/ReadPostings/ReadPostingsCookie.php @@ -1,7 +1,6 @@ _Cookie = new SaitoUserCookieStorage( + $this->_Cookie = new \Saito\User\Cookie\Storage( $this->_CurrentUser->Cookie, 'Read' ); diff --git a/app/Lib/SaitoUser/ReadPostings/ReadPostingsDatabase.php b/app/Lib/Saito/User/ReadPostings/ReadPostingsDatabase.php similarity index 85% rename from app/Lib/SaitoUser/ReadPostings/ReadPostingsDatabase.php rename to app/Lib/Saito/User/ReadPostings/ReadPostingsDatabase.php index e47312612..59b84cffd 100644 --- a/app/Lib/SaitoUser/ReadPostings/ReadPostingsDatabase.php +++ b/app/Lib/Saito/User/ReadPostings/ReadPostingsDatabase.php @@ -1,6 +1,6 @@ _UserRead = $this->_CurrentUser->getModel()->UserRead; $this->_registerGc($this->_CurrentUser->Cron); @@ -21,7 +21,7 @@ public function __construct(CurrentUserComponent $CurrentUser) { * @throws InvalidArgumentException */ public function set($entries) { - Stopwatch::start('ReadPostingsDatabase::set()'); + \Stopwatch::start('ReadPostingsDatabase::set()'); if (!$this->_CurrentUser->isLoggedIn()) { return; } @@ -32,7 +32,7 @@ public function set($entries) { } $this->_UserRead->setEntriesForUser($entries, $this->_id()); - Stopwatch::stop('ReadPostingsDatabase::set()'); + \Stopwatch::stop('ReadPostingsDatabase::set()'); } public function delete() { @@ -43,23 +43,23 @@ public function delete() { * calculates user quota of allowed entries in DB * * @return int - * @throws UnexpectedValueException + * @throws \UnexpectedValueException */ protected function _minNPostingsToKeep() { if ($this->_minPostingsToKeep) { return $this->_minPostingsToKeep; } - $threadsOnPage = Configure::read('Saito.Settings.topics_per_page'); - $postingsPerThread = Configure::read('Saito.Globals.postingsPerThread'); + $threadsOnPage = \Configure::read('Saito.Settings.topics_per_page'); + $postingsPerThread = \Configure::read('Saito.Globals.postingsPerThread'); $pagesToCache = 1.5; $this->_minPostingsToKeep = intval($postingsPerThread * $threadsOnPage * $pagesToCache); if (empty($this->_minPostingsToKeep)) { - throw new UnexpectedValueException(); + throw new \UnexpectedValueException(); } return $this->_minPostingsToKeep; } - protected function _registerGc(CronComponent $Cron) { + protected function _registerGc(\CronComponent $Cron) { $Cron->addCronJob('ReadUser.' . $this->_id(), 'hourly', [$this, 'gcUser']); $Cron->addCronJob('ReadUser.global', 'hourly', [$this, 'gcGlobal']); } @@ -79,7 +79,8 @@ public function gcGlobal() { if (!$lastEntry) { return; } - $Category = ClassRegistry::init('Category'); + // @bogus why not getModel()->Entry->Category + $Category = \ClassRegistry::init('Category'); $nCategories = $Category->find('count'); $entriesToKeep = $nCategories * $this->_minNPostingsToKeep(); $lastEntryId = $lastEntry['Entry']['id'] - $entriesToKeep; diff --git a/app/Lib/SaitoUser/ReadPostings/ReadPostingsDummy.php b/app/Lib/Saito/User/ReadPostings/ReadPostingsDummy.php similarity index 86% rename from app/Lib/SaitoUser/ReadPostings/ReadPostingsDummy.php rename to app/Lib/Saito/User/ReadPostings/ReadPostingsDummy.php index f8ff62df5..11523f372 100644 --- a/app/Lib/SaitoUser/ReadPostings/ReadPostingsDummy.php +++ b/app/Lib/Saito/User/ReadPostings/ReadPostingsDummy.php @@ -1,6 +1,6 @@ setSettings($settings); + } + } + + } diff --git a/app/Lib/SaitoUser/SaitoUserTrait.php b/app/Lib/Saito/User/SaitoUserTrait.php similarity index 99% rename from app/Lib/SaitoUser/SaitoUserTrait.php rename to app/Lib/Saito/User/SaitoUserTrait.php index e109b21e9..f1c1194eb 100644 --- a/app/Lib/SaitoUser/SaitoUserTrait.php +++ b/app/Lib/Saito/User/SaitoUserTrait.php @@ -1,5 +1,7 @@ _User = $User; } diff --git a/app/Lib/SaitoExceptions.php b/app/Lib/SaitoExceptions.php deleted file mode 100644 index 1322d8a51..000000000 --- a/app/Lib/SaitoExceptions.php +++ /dev/null @@ -1,32 +0,0 @@ -__Logger = new \Saito\Logger\ForbiddenLogger(); - $this->__Logger->write($message, $data); - parent::__construct($message, 403); - } - - } - - class BlackHoledException extends \BadRequestException { - - public function __construct($type = null, $data = []) { - $message = 'Request was blackholed. Type: ' . $type; - $this->__Logger = new \Saito\Logger\ExceptionLogger(); - $this->__Logger->write($message, $data); - parent::__construct($message, 400); - } - - } - diff --git a/app/Lib/SaitoUser/SaitoUser.php b/app/Lib/SaitoUser/SaitoUser.php deleted file mode 100755 index 587fa5235..000000000 --- a/app/Lib/SaitoUser/SaitoUser.php +++ /dev/null @@ -1,16 +0,0 @@ -setSettings($settings); - } - } - - } diff --git a/app/Lib/SchemaCakeMysqlFixTrait.php b/app/Lib/SchemaCakeMysqlFixTrait.php deleted file mode 100644 index fa62c1ce8..000000000 --- a/app/Lib/SchemaCakeMysqlFixTrait.php +++ /dev/null @@ -1,22 +0,0 @@ -getDataSource(); - if ($DS instanceof Mysql) { - $table = $Ecach->tablePrefix . $Ecach->table; - $DS->fetchAll('ALTER TABLE `' . $table . '` CHANGE `value` `value` MEDIUMBLOB NOT NULL;'); - } - } - - } \ No newline at end of file diff --git a/app/Lib/Thread/Posting.php b/app/Lib/Thread/Posting.php deleted file mode 100644 index 0a97bb3a6..000000000 --- a/app/Lib/Thread/Posting.php +++ /dev/null @@ -1,88 +0,0 @@ - 0]; - $this->_rawData = $rawData; - $this->_level = $options['level']; - - if (!$tree) { - $tree = new Thread; - } - $this->Thread = $tree; - $this->Thread->add($this); - - $this->_attachChildren(); - return $this; - } - - /** - * magic get accessor - * - * @param $var - * @return int - * @throws InvalidArgumentException - */ - public function __get($var) { - switch ($var) { - case 'id': - return (int)$this->_rawData['Entry']['id']; - case 'pid': - return (int)$this->_rawData['Entry']['pid']; - case (isset($this->_rawData['Entry'][$var])): - return $this->_rawData['Entry'][$var]; - default: - throw new InvalidArgumentException("Attribute '$var' not found in class Posting."); - } - } - - public function getChildren() { - return $this->_children; - } - - public function getLevel() { - return $this->_level; - } - - public function getRaw() { - return $this->_rawData; - } - - public function isRoot() { - return $this->pid === 0; - } - - public function addDecorator($fct) { - foreach ($this->_children as $key => $child) { - $newChild = $fct($child); - $newChild->addDecorator($fct); - $this->_children[$key] = $newChild; - } - $new = $fct($this); - $this->Thread->add($new); - return $new; - } - - protected function _attachChildren() { - if (isset($this->_rawData['_children'])) { - foreach ($this->_rawData['_children'] as $child) { - $this->_children[] = new Posting($child, ['level' => $this->_level + 1], $this->Thread); - } - } - unset($this->_rawData['_children']); - } - - } - diff --git a/app/Lib/Thread/PostingCurrentUserDecorator.php b/app/Lib/Thread/PostingCurrentUserDecorator.php deleted file mode 100644 index 04c7ea877..000000000 --- a/app/Lib/Thread/PostingCurrentUserDecorator.php +++ /dev/null @@ -1,22 +0,0 @@ -_CU = $CU; - } - - public function isIgnored() { - return $this->_CU->ignores($this->getRaw()['Entry']['user_id']); - } - - public function isNew() { - $data = $this->getRaw(); - return !$this->_CU->ReadEntries->isRead($data['Entry']['id'], $data['Entry']['time']); - } - - } diff --git a/app/Lib/Thread/PostingDecorator.php b/app/Lib/Thread/PostingDecorator.php deleted file mode 100644 index 610cc77d7..000000000 --- a/app/Lib/Thread/PostingDecorator.php +++ /dev/null @@ -1,36 +0,0 @@ -_Posting = $Posting; - return $this; - } - - public function __get($var) { - return $this->_Posting->{$var}; - } - - public function getChildren() { - return $this->_Posting->getChildren(); - } - - public function getLevel() { - return $this->_Posting->getLevel(); - } - - public function getRaw() { - return $this->_Posting->getRaw(); - } - - public function isRoot() { - return $this->_Posting->isRoot(); - } - - public function addDecorator($fct) { - return $this->_Posting->addDecorator($fct); - } - - } \ No newline at end of file diff --git a/app/Locale/deu/LC_MESSAGES/default.po b/app/Locale/deu/LC_MESSAGES/default.po index 611fd4891..2a56409c9 100644 --- a/app/Locale/deu/LC_MESSAGES/default.po +++ b/app/Locale/deu/LC_MESSAGES/default.po @@ -1724,6 +1724,9 @@ msgstr "Nichts erkannt." msgid "ncy.bkm" msgstr "Noch keine Lesezeichen angelegt." +msgid "ncy.aub" +msgstr "Noch keine Benutzer gesperrt." + #: webroot/js/templates/upload.html:6 msgid "upload_btn_insert_into_posting" msgstr "Einfügen" diff --git a/app/Locale/eng/LC_MESSAGES/default.po b/app/Locale/eng/LC_MESSAGES/default.po index 6214227d1..66f8884ac 100644 --- a/app/Locale/eng/LC_MESSAGES/default.po +++ b/app/Locale/eng/LC_MESSAGES/default.po @@ -1680,6 +1680,9 @@ msgstr "" msgid "ncy.bkm" msgstr "No bookmarks created yet." +msgid "ncy.aub" +msgstr "No users blocked yet." + #: webroot/js/templates/upload.html:6 msgid "upload_btn_insert_into_posting" msgstr "Insert" diff --git a/app/Model/AppModel.php b/app/Model/AppModel.php index 43791c313..4d0d16431 100644 --- a/app/Model/AppModel.php +++ b/app/Model/AppModel.php @@ -2,7 +2,6 @@ App::uses('Model', 'Model'); App::uses('Sanitize', 'Utility'); - App::uses('SaitoUser', 'Lib/SaitoUser'); App::uses('CakeEvent', 'Event'); App::uses('SaitoEventManager', 'Lib/Saito/Event'); @@ -35,8 +34,13 @@ public function __construct($id = false, $table = null, $ds = null) { } public function __get($name) { - if (isset($this->SharedObjects[$name])) { - return $this->SharedObjects[$name]; + switch ($name) { + case 'dic': + return ClassRegistry::getObject('dic'); + default: + if (isset($this->SharedObjects[$name])) { + return $this->SharedObjects[$name]; + } } return parent::__get($name); } @@ -69,21 +73,23 @@ public function filterFields(&$data, $fields) { } public function requireFields(&$data, array $required) { - return $this->_mapFields($data, $required, function(&$data, $model, $field) { - if (!isset($data[$model][$field])) { - return false; - } - return true; - }); + return $this->_mapFields($data, $required, + function (&$data, $model, $field) { + if (!isset($data[$model][$field])) { + return false; + } + return true; + }); } public function unsetFields(&$data, array $unset = ['id']) { - return $this->_mapFields($data, $unset, function(&$data, $model, $field) { - if (isset($data[$model][$field])) { - unset($data[$model][$field]); - } - return true; - }); + return $this->_mapFields($data, $unset, + function (&$data, $model, $field) { + if (isset($data[$model][$field])) { + unset($data[$model][$field]); + } + return true; + }); } protected function _mapFields(&$data, $fields, callable $func) { @@ -134,7 +140,7 @@ public function increment($id, $field, $amount = 1) { } $field = $this->alias . '.' . $field; $this->updateAll([$field => "$field $operator $amount"], - [$this->alias . '.id' => $id]); + [$this->alias . '.id' => $id]); } public function pipeMerger(array $data) { @@ -145,12 +151,12 @@ public function pipeMerger(array $data) { return implode(' | ', $out); } -/** - * Splits String 'a=b|c=d|e=f' into an array('a'=>'b', 'c'=>'d', 'e'=>'f') - * - * @param string $pipeString - * @return array - */ + /** + * Splits String 'a=b|c=d|e=f' into an array('a'=>'b', 'c'=>'d', 'e'=>'f') + * + * @param string $pipeString + * @return array + */ protected function _pipeSplitter($pipeString) { $unpipedArray = array(); $ranks = explode('|', $pipeString); @@ -166,25 +172,25 @@ protected function _pipeSplitter($pipeString) { protected static function _getIp() { $ip = null; - if ( Configure::read('Saito.Settings.store_ip') ): + if (Configure::read('Saito.Settings.store_ip')): $ip = env('REMOTE_ADDR'); - if ( Configure::read('Saito.Settings.store_ip_anonymized' ) ): + if (Configure::read('Saito.Settings.store_ip_anonymized')): $ip = self::_anonymizeIp($ip); endif; endif; return $ip; } -/** - * Dispatches an event - * - * - Always passes the issuing model class as subject - * - Wrapper for CakeEvent boilerplate code - * - Easier to test - * - * @param string $event event identifier `Model..` - * @param array $data additional event data - */ + /** + * Dispatches an event + * + * - Always passes the issuing model class as subject + * - Wrapper for CakeEvent boilerplate code + * - Easier to test + * + * @param string $event event identifier `Model..` + * @param array $data additional event data + */ protected function _dispatchEvent($event, $data = []) { $this->getEventManager()->dispatch(new CakeEvent($event, $this, $data)); // propagate event on Saito's event bus @@ -198,12 +204,12 @@ public function dispatchSaitoEvent($event, $data) { $this->_SEM->dispatch($event, $data + ['Model' => $this]); } -/** - * Rough and tough ip anonymizer - * - * @param string $ip - * @return string - */ + /** + * Rough and tough ip anonymizer + * + * @param string $ip + * @return string + */ protected static function _anonymizeIp($ip) { $strlen = strlen($ip); if ($strlen > 6) : @@ -274,7 +280,8 @@ public function inRange($check, $lower = null, $upper = null) { */ public function logSql() { if (Configure::read('debug') < 2) { - trigger_error('You must set debug level to at least 2 to enable SQL-logging', E_USER_NOTICE); + trigger_error('You must set debug level to at least 2 to enable SQL-logging', + E_USER_NOTICE); } $dbo = $this->getDatasource(); $logs = $dbo->getLog(); diff --git a/app/Model/Behavior/MarkupBehavior.php b/app/Model/Behavior/MarkupBehavior.php index f5877748c..cfee8632c 100644 --- a/app/Model/Behavior/MarkupBehavior.php +++ b/app/Model/Behavior/MarkupBehavior.php @@ -1,7 +1,6 @@ _Preprocessor === null) { $settings = Configure::read('Saito.Settings.Parser'); - $this->_Preprocessor = SaitoPlugin::getParserClassInstance( + $this->_Preprocessor = \Saito\Plugin::getParserClassInstance( 'Preprocessor', $settings ); diff --git a/app/Model/Ecach.php b/app/Model/Ecach.php deleted file mode 100644 index 3ad9febe4..000000000 --- a/app/Model/Ecach.php +++ /dev/null @@ -1,18 +0,0 @@ - true // performance improvements if it's a known thread-root - * 'complete' => true // include all fields necessary to render the complete entries * ); * * @param int $id @@ -505,24 +506,25 @@ public function treeForNode($id, $options = array()) { $fields = array_merge($this->threadLineFieldList, $this->showEntryFieldListAdditional); } - $tree = $this->treesForThreads([['id' => $tid]], null, $fields); + $tree = $this->treesForThreads([$tid], null, $fields); if ((int)$tid !== (int)$id) { $tree = $this->treeGetSubtree($tree, $id); } - if ($options['complete'] && $tree) { - $this->_addAdditionalFields($tree); - } - return $tree; } -/** - * trees for multiple tids - */ - public function treesForThreads($searchArray, $order = null, $fieldlist = null) { - if (empty($searchArray)) { + /** + * 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 []; } @@ -532,32 +534,31 @@ public function treesForThreads($searchArray, $order = null, $fieldlist = null) $order = 'last_answer ASC'; } - $where = []; - foreach ($searchArray as $_searchItem) { - $where[] = $_searchItem['id']; - } - if ($fieldlist === null) { $fieldlist = $this->threadLineFieldList; } - $threads = $this->_getThreadEntries( - $where, - [ - 'order' => $order, - 'fields' => $fieldlist - ] + $entries = $this->_getThreadEntries( + $ids, + ['order' => $order, 'fields' => $fieldlist] ); - Stopwatch::stop('Model->Entries->treeForThreads() DB'); - $out = false; - if ($threads) { - Stopwatch::start('Model->Entries->treeForThreads() CPU'); - $out = $this->treeBuild($threads); - Stopwatch::stop('Model->Entries->treeForThreads() CPU'); + 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; + } } - return $out; + Stopwatch::stop('Model->Entries->treeForThreads() CPU'); + + return $threads; } /** @@ -816,6 +817,7 @@ public function threadMerge($targetId) { } // 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 @@ -838,6 +840,13 @@ public function threadMerge($targetId) { $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'], @@ -852,110 +861,6 @@ public function threadMerge($targetId) { return false; } - protected function _addAdditionalFields(&$entries) { - /* - * Function for checking if entry is bookmarked by current user - * - * @param $entries - */ - $ldGetBookmarkForEntryAndUser = function (&$tree, &$element, $_this) { - $element['isBookmarked'] = $this->CurrentUser - ->hasBookmarked($element['Entry']['id']); - }; - Entry::mapTreeElements($entries, $ldGetBookmarkForEntryAndUser, $this); - - /* - * Function for checking user rights on an entry - * - * @param $tree - * @param $element - * @param $_this - */ - $ldGetRightsForEntryAndUser = function (&$tree, &$element, $_this) { - $rights = [ - 'isEditingForbidden' => $_this->isEditingForbidden($element, $_this->CurrentUser), - 'isEditingAsUserForbidden' => $_this->isEditingForbidden($element, $_this->CurrentUser->mockUserType('user')), - 'isAnsweringForbidden' => $_this->isAnsweringForbidden($element) - ]; - $element['rights'] = $rights; - }; - Entry::mapTreeElements($entries, $ldGetRightsForEntryAndUser, $this); - } - - /** - * Checks if someone is allowed to edit an entry - * - * @param $entry - * @param ForumsUserInterface $User - * - * @return bool|string - * @throws Exception - */ - public function isEditingForbidden($entry, ForumsUserInterface $User = null) { - if ($User === null) { - $User = $this->CurrentUser; - } - - // Anon - if ($User->isLoggedIn() !== true) { - return true; - } - - // Admins - if ($User->isAdmin()) { - return false; - } - - $verboten = true; - - if (!isset($entry['Entry'])) { - $entry = $this->get($entry); - } - - if (empty($entry)) { - throw new Exception(sprintf('Entry %s not found.', $entry)); - } - - $expired = ($this->_setting('edit_period') * 60) + - strtotime($entry['Entry']['time']); - $isOverEditLimit = time() > $expired; - - $isUsersPosting = (int)$User->getId() === (int)$entry['Entry']['user_id']; - - if ($User->isMod()) { - // Mods - // @todo mods don't edit admin posts - if ($isUsersPosting && $isOverEditLimit && - /* Mods should be able to edit their own posts if they are pinned - * - * @todo this opens a 'mod can pin and then edit root entries'-loophole, - * as long as no one checks pinning for Configure::read('Saito.Settings.edit_period') * 60 - * for mods pinning root-posts. - */ - ($entry['Entry']['fixed'] == false) - ) { - // mods don't mod themselves - $verboten = 'time'; - } else { - $verboten = false; - }; - - } else { - // Users - if ($isUsersPosting === false) { - $verboten = 'user'; - } elseif ($isOverEditLimit) { - $verboten = 'time'; - } elseif ($this->_isLocked($entry)) { - $verboten = 'locked'; - } else { - $verboten = false; - } - } - - return $verboten; - } - /** * Test if entry is thread-root * @@ -997,13 +902,6 @@ public function isRoot($id = null) { return $this->_isRoot[$md5]; } - protected function _isLocked($entry) { - if (!isset($entry[$this->alias]['locked'])) { - throw new InvalidArgumentException; - } - return $entry[$this->alias]['locked'] != false; - } - /** * Preprocesses entry data before saving it * @@ -1045,7 +943,9 @@ public function prepare(&$data, array $options = []) { throw new InvalidArgumentException; } - if ($this->isAnsweringForbidden($parent)) { + // @todo highly @bogus should be a validator? + $parentPosting = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $parent]); + if ($parentPosting->isAnsweringForbidden()) { throw new ForbiddenException; } @@ -1071,7 +971,6 @@ protected function _findEntry($state, $query, $results = []) { return $query; } if ($results) { - $this->_addAdditionalFields($results); return $results[0]; } return $results; @@ -1102,26 +1001,11 @@ protected function _findFeed($state, $query, $results = array()) { 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]); } -/** - * Checks if answering an entry is allowed - * - * @param array $entry - * @return boolean - */ - public function isAnsweringForbidden($entry) { - $isAnsweringForbidden = true; - if ($this->_isLocked($entry)) { - $isAnsweringForbidden = 'locked'; - } else { - $isAnsweringForbidden = false; - } - - return $isAnsweringForbidden; - } - public function paginateCount($conditions, $recursive, $extra) { if (isset($extra['getInitialThreads'])) { $this->Category->contain(); @@ -1180,8 +1064,21 @@ public function validateCategoryIsAllowed($check) { return true; } + /** + * @param $check + * @return bool + * @throws Exception + */ public function validateEditingAllowed($check) { - $forbidden = $this->isEditingForbidden($this->data['Entry']['id']); + $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 { diff --git a/app/Model/User.php b/app/Model/User.php index af2908156..b88848208 100644 --- a/app/Model/User.php +++ b/app/Model/User.php @@ -75,7 +75,10 @@ class User extends AppModel { 'isUnique' => ['rule' => 'isUniqueCiString'], 'notEmpty' => ['rule' => 'notEmpty'], 'hasAllowedChars' => ['rule' => ['validateHasAllowedChars']], - 'isUsernameEqual' => ['rule' => 'validateUsernameEqual'] + 'isUsernameEqual' => [ + 'on' => 'create', + 'rule' => 'validateUsernameEqual' + ] ], 'user_type' => [ 'allowedChoice' => ['rule' => ['inList', ['user', 'admin', 'mod']]] diff --git a/app/Model/UserBlock.php b/app/Model/UserBlock.php index b86afdeab..ec6711d46 100644 --- a/app/Model/UserBlock.php +++ b/app/Model/UserBlock.php @@ -99,9 +99,7 @@ public function gc() { public function getAll() { $blocklist = $this->find('all', [ 'contain' => ['By', 'User'], - 'order' => [ - 'UserBlock.id' => 'DESC' - ] + 'order' => ['UserBlock.id' => 'DESC'] ]); $o = []; foreach ($blocklist as $k => $b) { @@ -112,6 +110,15 @@ public function getAll() { return $o; } + public function getAllActive() { + $blocklist = $this->find('all', [ + 'contain' => false, + 'conditions' => ['ended' => null], + 'order' => ['UserBlock.id' => 'DESC'] + ]); + return $blocklist; + } + protected function _updateIsBlocked($userId) { $blocks = $this->find('first', [ 'contain' => false, diff --git a/app/Plugin/Api/Controller/ApiEntriesController.php b/app/Plugin/Api/Controller/ApiEntriesController.php index c6957a87b..d0382e925 100644 --- a/app/Plugin/Api/Controller/ApiEntriesController.php +++ b/app/Plugin/Api/Controller/ApiEntriesController.php @@ -134,7 +134,9 @@ public function entriesItemPut($id = null) { throw new NotFoundException(sprintf('Entry with id `%s` not found.', $id)); } - $isEditingForbidden = $oldEntry['rights']['isEditingForbidden']; + $posting = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $oldEntry]); + + $isEditingForbidden = $posting->isEditingAsCurrentUserForbidden(); if ($isEditingForbidden === 'time') { throw new ForbiddenException('The editing time ran out.'); } elseif ($isEditingForbidden === 'user') { diff --git a/app/Plugin/Api/Lib/ApiControllerTestCase.php b/app/Plugin/Api/Lib/ApiControllerTestCase.php index 9c025425e..a652b9b13 100644 --- a/app/Plugin/Api/Lib/ApiControllerTestCase.php +++ b/app/Plugin/Api/Lib/ApiControllerTestCase.php @@ -1,8 +1,6 @@ generate( 'Api.ApiEntries', - [ - 'models' => ['Entry' => ['get']] - ] + ['models' => ['Entry' => ['get']]] ); + $entry = [ + 'Entry' => [ + 'id' => 1, + 'locked' => true, + 'time' => bDate(time() + 9999), + 'user_id' => 3 + ] + ]; + $ApiEntries->Entry->expects($this->once()) ->method('get') - ->will($this->returnValue(['rights' => ['isEditingForbidden' => true]])); + ->will($this->returnValue($entry)); $this->_loginUser(3); $this->setExpectedException('ForbiddenException', 'Editing is forbidden for unknown reason.'); $this->testAction( diff --git a/app/Plugin/Api/Test/Case/Controller/ApiShoutsControllerTest.php b/app/Plugin/Api/Test/Case/Controller/ApiShoutsControllerTest.php index 68f7d7ba9..90c889de8 100644 --- a/app/Plugin/Api/Test/Case/Controller/ApiShoutsControllerTest.php +++ b/app/Plugin/Api/Test/Case/Controller/ApiShoutsControllerTest.php @@ -49,11 +49,12 @@ class ApiShoutsControllerTest extends ApiControllerTestCase { 'plugin.api.entry', 'plugin.api.category', 'plugin.api.user', + 'plugin.api.user_block', + 'plugin.api.user_ignore', 'plugin.api.user_online', 'plugin.api.bookmark', 'plugin.api.esnotification', 'plugin.api.esevent', - 'plugin.api.ecach', 'plugin.api.setting', 'plugin.api.smiley', 'plugin.api.smiley_code', diff --git a/app/Plugin/Api/Test/Case/Controller/ApiUsersControllerTest.php b/app/Plugin/Api/Test/Case/Controller/ApiUsersControllerTest.php index e545af548..ce852933d 100644 --- a/app/Plugin/Api/Test/Case/Controller/ApiUsersControllerTest.php +++ b/app/Plugin/Api/Test/Case/Controller/ApiUsersControllerTest.php @@ -19,14 +19,15 @@ class ApiUsersControllerTest extends ApiControllerTestCase { 'plugin.api.entry', 'plugin.api.category', 'plugin.api.user', + 'plugin.api.user_block', + 'plugin.api.user_ignore', 'plugin.api.user_online', 'plugin.api.user_read', 'plugin.api.bookmark', 'plugin.api.esnotification', 'plugin.api.esevent', 'plugin.api.upload', - 'plugin.api.setting', - 'plugin.api.ecach' + 'plugin.api.setting' ); public function testLoginNoUsername() { diff --git a/app/Plugin/BbcodeParser/Lib/Helper/UrlParserTrait.php b/app/Plugin/BbcodeParser/Lib/Helper/UrlParserTrait.php index 3f9c20c6d..52d042bc9 100644 --- a/app/Plugin/BbcodeParser/Lib/Helper/UrlParserTrait.php +++ b/app/Plugin/BbcodeParser/Lib/Helper/UrlParserTrait.php @@ -2,7 +2,7 @@ namespace Plugin\BbcodeParser\Lib\Helper; - \App::uses('DomainParser', 'Lib'); + use Saito\DomainParser; trait UrlParserTrait { @@ -34,7 +34,7 @@ protected function _url($url, $text, $label = false, $truncate = false) { // add domain info: `[url=domain.info]my link[/url]` -> `my link [domain.info]` if ($label !== false && $label !== 'none' && $label !== 'false') { if (!empty($url) && preg_match('/\[' . $host . ']'; } diff --git a/app/Plugin/BbcodeParser/Lib/Parser.php b/app/Plugin/BbcodeParser/Lib/Parser.php index a03960333..6046a014e 100644 --- a/app/Plugin/BbcodeParser/Lib/Parser.php +++ b/app/Plugin/BbcodeParser/Lib/Parser.php @@ -187,10 +187,10 @@ public function parse($string, array $options = []) { $this->_Parser->parse($string); + $this->_Parser->accept(new Visitors\JbbCodeNl2BrVisitor($this->_Helper, $options)); if ($this->_cSettings['autolink']) { $this->_Parser->accept(new Visitors\JbbCodeAutolinkVisitor($this->_Helper, $options)); } - $this->_Parser->accept(new Visitors\JbbCodeNl2BrVisitor($this->_Helper, $options)); if ($this->_cSettings['smilies']) { $this->_Parser->accept(new Visitors\JbbCodeSmileyVisitor($this->_Helper, $options)); } diff --git a/app/Plugin/BbcodeParser/Lib/jBBCode/Definitions/JbbCodeDefinitions.php b/app/Plugin/BbcodeParser/Lib/jBBCode/Definitions/JbbCodeDefinitions.php index 2d1865271..1b8ecbf5f 100644 --- a/app/Plugin/BbcodeParser/Lib/jBBCode/Definitions/JbbCodeDefinitions.php +++ b/app/Plugin/BbcodeParser/Lib/jBBCode/Definitions/JbbCodeDefinitions.php @@ -4,6 +4,7 @@ use Plugin\BbcodeParser\Lib\Helper\Message; use Plugin\BbcodeParser\Lib\Helper\UrlParserTrait; + use Saito\DomainParser; include 'CodeDefinition.php'; include 'JbbHtml5MediaCodeDefinition.php'; @@ -66,8 +67,6 @@ protected function _parse($content, $attributes) { } - \App::uses('DomainParser', 'Lib'); - class Iframe extends CodeDefinition { protected $_sTagName = 'iframe'; @@ -142,7 +141,7 @@ protected function _checkHostAllowed($url) { return true; } - $host = \DomainParser::domain($url); + $host = DomainParser::domain($url); if ($host && isset($allowedDomains[$host])) { return true; } @@ -188,7 +187,7 @@ protected function _parse($content, $attributes) { } if (env('HTTPS')) { - $host = \DomainParser::domain($url); + $host = DomainParser::domain($url); if (isset(self::$_flashVideoDomainsWithHttps[$host])) { $url = str_ireplace('http://', 'https://', $url); } diff --git a/app/Plugin/BbcodeParser/Lib/jBBCode/Visitors/JbbCodeAutolinkVisitor.php b/app/Plugin/BbcodeParser/Lib/jBBCode/Visitors/JbbCodeAutolinkVisitor.php index 5424c32ec..2ef6f63cd 100644 --- a/app/Plugin/BbcodeParser/Lib/jBBCode/Visitors/JbbCodeAutolinkVisitor.php +++ b/app/Plugin/BbcodeParser/Lib/jBBCode/Visitors/JbbCodeAutolinkVisitor.php @@ -24,7 +24,12 @@ protected function _processTextNode($string, $node) { protected function _atUserLink($string) { $tags = array(); - if (!preg_match_all('/(\s|^)@([^\s\pP]+)/m', $string, $tags)) { + /* + * - '\pP' all unicode punctuation marks + * - '<' if nl2br has taken place whatchout for
    linebreaks + */ + $hasTags = preg_match_all('/(\s|^)@([^\s\pP<]+)/m', $string, $tags); + if (!$hasTags) { return $string; } diff --git a/app/Plugin/BbcodeParser/Test/Case/Lib/BbcodeParserTest.php b/app/Plugin/BbcodeParser/Test/Case/Lib/BbcodeParserTest.php index ba0b7e8b7..d57e02372 100755 --- a/app/Plugin/BbcodeParser/Test/Case/Lib/BbcodeParserTest.php +++ b/app/Plugin/BbcodeParser/Test/Case/Lib/BbcodeParserTest.php @@ -1,6 +1,7 @@ set(['Alice', 'Bobby Junior', 'Dr. No']); //= ParserHelper diff --git a/app/Plugin/BbcodeParser/docs/help/eng/1-bbcodes.md b/app/Plugin/BbcodeParser/docs/help/eng/1-bbcodes.md index a0769be4f..bee2d159e 100755 --- a/app/Plugin/BbcodeParser/docs/help/eng/1-bbcodes.md +++ b/app/Plugin/BbcodeParser/docs/help/eng/1-bbcodes.md @@ -58,11 +58,11 @@ Usually the top-level domain is appended to a `[url]` link. This can be controll ### Email Link ### - [email]mailto:mail@tosomeone.com[/email] + [email]mail@tosomeone.com[/email] or - [email=mailto:mail@tosomeone.com]Mail[/email] + [email=mail@tosomeone.com]Mail[/email] ### Internal Shortlinks ### diff --git a/app/Plugin/Install/Controller/InstallController.php b/app/Plugin/Install/Controller/InstallController.php index b55489d8a..488507ea6 100755 --- a/app/Plugin/Install/Controller/InstallController.php +++ b/app/Plugin/Install/Controller/InstallController.php @@ -202,8 +202,6 @@ public function data() { $this->redirect(array('action' => 'database')); } } - // @hack - $schema->after(['create' => 'ecaches']); $path = CakePlugin::path('Install') .DS. 'Config' .DS. 'Data' .DS; $dataObjects = App::objects('class', $path); diff --git a/app/Plugin/M/Lib/MCacheSupportCachelet.php b/app/Plugin/M/Lib/MCacheSupportCachelet.php index b1004524b..4116a1da7 100644 --- a/app/Plugin/M/Lib/MCacheSupportCachelet.php +++ b/app/Plugin/M/Lib/MCacheSupportCachelet.php @@ -1,6 +1,6 @@ ' . $title . ''; + $mailto = '' . $title . ''; $mailto .= ''; $mailto .= $this->Html->scriptBlock( "$(function(){ diff --git a/app/Plugin/Sitemap/Test/Case/Controller/SitemapsControllerTest.php b/app/Plugin/Sitemap/Test/Case/Controller/SitemapsControllerTest.php index 08063b43a..07a472152 100644 --- a/app/Plugin/Sitemap/Test/Case/Controller/SitemapsControllerTest.php +++ b/app/Plugin/Sitemap/Test/Case/Controller/SitemapsControllerTest.php @@ -16,7 +16,6 @@ class SitemapsControllerTest extends ControllerTestCase { 'setting', 'user', 'user_online', - 'ecach', 'bookmark', 'entry', 'category', diff --git a/app/Test/Case/Controller/AppControllerTest.php b/app/Test/Case/Controller/AppControllerTest.php index e9d8b6d1d..2001ead0a 100755 --- a/app/Test/Case/Controller/AppControllerTest.php +++ b/app/Test/Case/Controller/AppControllerTest.php @@ -2,14 +2,12 @@ App::uses('Controller', 'Controller'); App::uses('AppController', 'Controller'); - App::uses('SaitoControllerTestCase', 'Lib/Test'); - class AppControllerTest extends SaitoControllerTestCase { + class AppControllerTest extends \Saito\Test\ControllerTestCase { public $fixtures = [ 'app.bookmark', 'app.category', - 'app.ecach', 'app.entry', 'app.esevent', 'app.esnotification', diff --git a/app/Test/Case/Controller/BookmarksControllerTest.php b/app/Test/Case/Controller/BookmarksControllerTest.php index b1c1b4990..670229aac 100644 --- a/app/Test/Case/Controller/BookmarksControllerTest.php +++ b/app/Test/Case/Controller/BookmarksControllerTest.php @@ -1,11 +1,10 @@ generate('Bookmarks'); $this->_loginUser(1); - $this->setExpectedException('Saito\ForbiddenException'); + $this->setExpectedException('Saito\Exception\SaitoForbiddenException'); $this->testAction('/bookmarks/edit/1'); } @@ -121,7 +119,7 @@ public function testDeleteNotUsersBookmark() { $this->generate('Bookmarks'); $this->_loginUser(1); - $this->setExpectedException('Saito\ForbiddenException'); + $this->setExpectedException('Saito\Exception\SaitoForbiddenException'); $this->testAction('/bookmarks/delete/1', ['method' => 'POST']); } diff --git a/app/Test/Case/Controller/ContactsControllerTest.php b/app/Test/Case/Controller/ContactsControllerTest.php index 7a3ad0ff5..57cf14e63 100644 --- a/app/Test/Case/Controller/ContactsControllerTest.php +++ b/app/Test/Case/Controller/ContactsControllerTest.php @@ -4,9 +4,9 @@ App::uses('UsersController', 'Controller'); App::uses('SaitoControllerTestCase', 'Lib/Test'); - class ContactsControllerTestCase extends SaitoControllerTestCase { + class ContactsControllerTestCase extends \Saito\Test\ControllerTestCase { - use SaitoSecurityMockTrait; + use \Saito\Test\SecurityMockTrait; public $fixtures = [ 'app.category', diff --git a/app/Test/Case/Controller/EntriesControllerTest.php b/app/Test/Case/Controller/EntriesControllerTest.php index 52fe34698..bc4d4ffe6 100755 --- a/app/Test/Case/Controller/EntriesControllerTest.php +++ b/app/Test/Case/Controller/EntriesControllerTest.php @@ -16,14 +16,13 @@ public function getInitialThreads($User, $order = ['Entry.last_answer' => 'DESC' } - class EntriesControllerTestCase extends SaitoControllerTestCase { + class EntriesControllerTestCase extends \Saito\Test\ControllerTestCase { - use SaitoSecurityMockTrait; + use \Saito\Test\SecurityMockTrait; public $fixtures = [ 'app.bookmark', 'app.category', - 'app.ecach', 'app.entry', 'app.esevent', 'app.esnotification', @@ -191,7 +190,7 @@ public function testCategoryChooserNotLoggedIn() { App::uses('ComponentCollection', 'Controller'); $User = new CurrentUserComponent(new ComponentCollection()); - $User->Categories = $this->getMock('CategoryAuth', ['getAllowed'], + $User->Categories = $this->getMock('Saito\User\Auth\CategoryAuthorization', ['getAllowed'], [$User]); $User->Categories->expects($this->any()) ->method('getAllowed') @@ -224,8 +223,11 @@ public function testCategoryChooserDeactivated() { App::uses('ComponentCollection', 'Controller'); $User = new CurrentUserComponent(new ComponentCollection()); - $User->Categories = $this->getMock('CategoryAuth', ['getAllowed'], - [$User]); + $User->Categories = $this->getMock( + 'Saito\User\Auth\CategoryAuthorization', + ['getAllowed'], + [$User] + ); $User->Categories->expects($this->any()) ->method('getAllowed') ->will($this->returnValue([ @@ -261,8 +263,11 @@ public function testCategoryChooserEmptyCustomSet() { App::uses('ComponentCollection', 'Controller'); $User = new CurrentUserComponent(new ComponentCollection()); - $User->Categories = $this->getMock('CategoryAuth', ['getAllowed'], - [$User]); + $User->Categories = $this->getMock( + 'Saito\User\Auth\CategoryAuthorization', + ['getAllowed'], + [$User] + ); $User->Categories->expects($this->any()) ->method('getAllowed') ->will($this->returnValue([ @@ -303,8 +308,11 @@ public function testCategoryChooserCustomSet() { App::uses('ComponentCollection', 'Controller'); $User = new CurrentUserComponent(new ComponentCollection()); - $User->Categories = $this->getMock('CategoryAuth', ['getAllowed'], - [$User]); + $User->Categories = $this->getMock( + 'Saito\User\Auth\CategoryAuthorization', + ['getAllowed'], + [$User] + ); $User->Categories->expects($this->any()) ->method('getAllowed') ->will($this->returnValue([ @@ -351,8 +359,11 @@ public function testCategoryChooserSingleCategory() { App::uses('ComponentCollection', 'Controller'); $User = new CurrentUserComponent(new ComponentCollection()); - $User->Categories = $this->getMock('CategoryAuth', ['getAllowed'], - [$User]); + $User->Categories = $this->getMock( + 'Saito\User\Auth\CategoryAuthorization', + ['getAllowed'], + [$User] + ); $User->Categories->expects($this->any()) ->method('getAllowed') ->will($this->returnValue([ @@ -569,7 +580,7 @@ public function testEditShowForm() { ) )); - $this->_loginUser(2); + $this->_loginUser(1); $Entries->Entry->expects($this->any()) ->method('isEditingForbidden') @@ -585,8 +596,8 @@ public function testEditShowForm() { // test that text is quoted $this->assertContains('Second_Text', $result); // notification are un/checked - $this->assertNoPattern('/data\[Event\]\[1\]\[event_type_id\]"\s+?checked="checked"/', $result); - $this->assertPattern('/data\[Event\]\[2\]\[event_type_id\]"\s+?checked="checked"/', $result); + $this->assertNotRegExp('/data\[Event\]\[1\]\[event_type_id\]"\s+?checked="checked"/', $result); + $this->assertRegExp('/data\[Event\]\[2\]\[event_type_id\]"\s+?checked="checked"/', $result); } /** @@ -608,7 +619,8 @@ public function testEditNoInternalErrorOnValidationError() { 'tid' => 1, 'pid' => 1, 'time' => time() - 1, - 'user_id' => 2 + 'user_id' => 2, + 'fixed' => false ], 'User' => [ 'username' => 'Mitch' @@ -622,7 +634,7 @@ public function testEditNoInternalErrorOnValidationError() { ->method('update') ->will($this->returnValue(false)); - $this->_loginUser(2); + $this->_loginUser(1); $this->testAction('entries/edit/2', [ 'data' => [ 'Entry' => [ @@ -820,7 +832,7 @@ public function testAppStats() { $headerCounter = $result['HeaderCounter']; $this->assertEquals($headerCounter['user_online'], 1); - $this->assertEquals($headerCounter['user'], 9); + $this->assertEquals($headerCounter['user'], 10); $this->assertEquals($headerCounter['entries'], 11); $this->assertEquals($headerCounter['threads'], 5); $this->assertEquals($headerCounter['user_registered'], 0); diff --git a/app/Test/Case/Controller/EsnotificationsControllerTest.php b/app/Test/Case/Controller/EsnotificationsControllerTest.php index 7ca0dfe0f..62d97e75e 100644 --- a/app/Test/Case/Controller/EsnotificationsControllerTest.php +++ b/app/Test/Case/Controller/EsnotificationsControllerTest.php @@ -1,13 +1,12 @@ setExpectedException('Saito\ForbiddenException'); + $this->setExpectedException('\Saito\Exception\SaitoForbiddenException'); $this->testAction('/users/edit/3'); } public function testEditNotUsersEntryGet() { $this->generate('Users'); $this->_loginUser(2); // mod - $this->setExpectedException('Saito\ForbiddenException'); + $this->setExpectedException('Saito\Exception\SaitoForbiddenException'); $this->testAction('/users/edit/3', ['method' => 'GET']); } public function testEditNotUsersEntryPost() { $this->generate('Users'); $this->_loginUser(2); // mod - $this->setExpectedException('Saito\ForbiddenException'); + $this->setExpectedException('Saito\Exception\SaitoForbiddenException'); $this->testAction('/users/edit/3', ['method' => 'POST']); } @@ -814,7 +812,7 @@ public function testDelete() { } public function testChangePasswordNotLoggedIn() { - $this->setExpectedException('Saito\ForbiddenException'); + $this->setExpectedException('Saito\Exception\SaitoForbiddenException'); $this->testAction('/users/changepassword/5'); $this->assertRedirectedTo(); } @@ -823,7 +821,7 @@ public function testChangePasswordWrongUser() { $this->generate('Users'); $this->_loginUser(4); - $this->setExpectedException('Saito\ForbiddenException'); + $this->setExpectedException('Saito\Exception\SaitoForbiddenException'); $data = [ 'User' => [ @@ -838,7 +836,7 @@ public function testChangePasswordWrongUser() { public function testChangePasswordViewFormWrongUser() { $this->generate('Users'); - $this->setExpectedException('Saito\ForbiddenException'); + $this->setExpectedException('Saito\Exception\SaitoForbiddenException'); $this->_loginUser(4); $this->testAction('/users/changepassword/5'); } diff --git a/app/Test/Case/Lib/Cache/CacheTreeTest.php b/app/Test/Case/Lib/Cache/CacheTreeTest.php deleted file mode 100644 index 0b4bf73ff..000000000 --- a/app/Test/Case/Lib/Cache/CacheTreeTest.php +++ /dev/null @@ -1,227 +0,0 @@ -_CurrentUser = new SaitoUser(); - $this->_Cache = new ItemCache('EntrySub', null, ['maxItems' => 240]); - } - - public function setCache($data) { - $this->_cachedEntries = $data; - } - - public function setItemCache($IC) { - $this->_Cache = $IC; - } - - public function setAllowRead($state) { - $this->_allowRead = $state; - } - - public function setAllowUpdate($state) { - $this->_allowUpdate = $state; - } - - public function __get($name) { - if ($name === 'CurrentUser') { - return $this->_CurrentUser; - } - } - - } - - /** - * CacheTreeComponent Test Case - * - */ - class CacheTreeTest extends CakeTestCase { - - protected $_fixture; - - protected $_time; - - /** - * setUp method - * - * @return void - */ - public function setUp() { - parent::setUp(); - $this->CacheTree = new CacheTreeMock(); - - $this->_time = time(); - $fixtureTime = $this->_time - 3600; - $fixtureContent = 'foo'; - $fixtureKey = 1; - - $this->CacheTree->setAllowUpdate(true); - $this->CacheTree->set($fixtureKey, $fixtureContent, $fixtureTime); - $this->CacheTree->setAllowUpdate(false); - } - - /** - * tearDown method - * - * @return void - */ - public function tearDown() { - unset($this->CacheTree); - - parent::tearDown(); - } - - /** - * testIsCacheUpdatable method - * - * @return void - */ - public function testIsCacheUpdatableDisabled() { - $this->CacheTree->setAllowUpdate(false); - - $this->CacheTree->CurrentUser->LastRefresh = $this->getMock('Object', [ - 'isNewerThan' - ]); - $this->CacheTree->CurrentUser->LastRefresh - ->expects($this->never()) - ->method('isNewerThan'); - - $in = array( - 'id' => 1, - 'last_answer' => date('Y-m-d H:i:s', time() - 7200), - ); - $result = $this->CacheTree->isCacheUpdatable($in); - $this->assertFalse($result); - } - - public function testIsCacheUpdatable() { - $this->CacheTree->setAllowUpdate(true); - - $this->CacheTree->CurrentUser->LastRefresh = $this->getMock('Object', [ - 'isNewerThan' - ]); - $this->CacheTree->CurrentUser->LastRefresh - ->expects($this->once()) - ->method('isNewerThan') - ->will($this->returnValue(true)); - - $in = array( - 'id' => 1, - 'last_answer' => date('Y-m-d H:i:s', time() - 7200), - ); - $result = $this->CacheTree->isCacheUpdatable($in); - $this->assertTrue($result); - } - - public function testIsCacheUpdatableNewToUser() { - $this->CacheTree->CurrentUser->LastRefresh = $this->getMock('Object', [ - 'isNewerThan' - ]); - $this->CacheTree->CurrentUser->LastRefresh - ->expects($this->once()) - ->method('isNewerThan') - ->will($this->returnValue(false)); - - $this->CacheTree->setAllowUpdate(true); - - $in = array( - 'id' => 1, - 'last_answer' => date('Y-m-d H:i:s', time() - 1800), - ); - $result = $this->CacheTree->isCacheUpdatable($in); - $this->assertFalse($result); - } - - public function testIsCacheValidReadDisabled() { - $this->CacheTree->CurrentUser->LastRefresh = $this->getMock('Object', [ - 'isNewerThan' - ]); - $this->CacheTree->CurrentUser->LastRefresh - ->expects($this->never()) - ->method('isNewerThan'); - - $this->CacheTree->setAllowRead(false); - - $in = array( - 'id' => 1, - 'last_answer' => date('Y-m-d H:i:s', time() - 7200), - ); - $result = $this->CacheTree->isCacheValid($in); - $this->assertFalse($result); - } - - public function testIsCacheValid() { - $this->CacheTree->CurrentUser->LastRefresh = $this->getMock('Object', [ - 'isNewerThan' - ]); - $this->CacheTree->CurrentUser->LastRefresh - ->expects($this->once()) - ->method('isNewerThan') - ->will($this->returnValue(true)); - - $this->CacheTree->setAllowRead(true); - $in = array( - 'id' => 1, - 'last_answer' => date('Y-m-d H:i:s', time() - 7200), - ); - $result = $this->CacheTree->isCacheValid($in); - $this->assertTrue($result); - } - - public function testIsCacheValidNewAnswerForUser() { - $this->CacheTree->CurrentUser->LastRefresh = $this->getMock('Object', [ - 'isNewerThan' - ]); - $this->CacheTree->CurrentUser->LastRefresh - ->expects($this->once()) - ->method('isNewerThan') - ->will($this->returnValue(false)); - - $this->CacheTree->setAllowRead(true); - $in = array( - 'id' => 1, - 'last_answer' => date('Y-m-d H:i:s', time() - 7200), - ); - $result = $this->CacheTree->isCacheValid($in); - $this->assertFalse($result); - } - - /** - * last refresh for user is undetermined - */ - public function testIsCacheValidNewUser() { - $this->CacheTree->CurrentUser->LastRefresh = $this->getMock('Object', [ - 'isNewerThan' - ]); - $this->CacheTree->CurrentUser->LastRefresh - ->expects($this->once()) - ->method('isNewerThan') - ->will($this->returnValue(null)); - - $this->CacheTree->setAllowRead(true); - $in = array( - 'id' => 1, - 'last_answer' => date('Y-m-d H:i:s', time() - 7200), - ); - $result = $this->CacheTree->isCacheValid($in); - $this->assertFalse($result); - } - - /** - * tests that cache is invalid if thread has new answers - */ - public function testIsCacheValidNewAnswerInThread() { - $this->CacheTree->setAllowRead(true); - - $in = array( - 'id' => 1, - 'last_answer' => date('Y-m-d H:i:s', time() - 1800), - ); - $result = $this->CacheTree->isCacheValid($in); - $this->assertFalse($result); - } - - } diff --git a/app/Test/Case/Lib/Cache/ItemCacheTest.php b/app/Test/Case/Lib/Saito/Cache/ItemCacheTest.php similarity index 98% rename from app/Test/Case/Lib/Cache/ItemCacheTest.php rename to app/Test/Case/Lib/Saito/Cache/ItemCacheTest.php index e55911250..40f69d015 100644 --- a/app/Test/Case/Lib/Cache/ItemCacheTest.php +++ b/app/Test/Case/Lib/Saito/Cache/ItemCacheTest.php @@ -1,6 +1,6 @@ {$key} = $val; + } elseif ($key === lcfirst($key)) { + $this->_rawData['Entry'][$key] = $val; + } else { + $this->_rawData[$key] = $val; + } + } + + } + + class UserPostingTraitTest extends CakeTestCase { + + public $editPeriod = 20; + + public function testIsAnsweringForbidden() { + $this->Mock->set('locked', 0); + $result = $this->Mock->isAnsweringForbidden(); + $expected = false; + $this->assertSame($result, $expected); + + $this->Mock->set('locked', '0'); + $result = $this->Mock->isAnsweringForbidden(); + $expected = false; + $this->assertSame($result, $expected); + + $this->Mock->set('locked', false); + $result = $this->Mock->isAnsweringForbidden(); + $expected = false; + $this->assertSame($result, $expected); + } + + public function testIsEditingForbiddenSuccess() { + $entry = [ + 'user_id' => 1, + 'time' => strftime("%c", time() - ($this->editPeriod * 60) + 1), + 'locked' => 0 + ]; + $this->Mock->set('Entry', $entry); + + $user = ['id' => 1, 'user_type' => 'user']; + $this->Mock->set('_CU', new SaitoUser($user)); + + $result = $this->Mock->isEditingAsCurrentUserForbidden(); + $this->assertFalse($result); + } + + public function testIsEditingForbiddenEmptyUser() { + $entry = [ + 'user_id' => 1, + 'time' => strftime("%c", + time() - ($this->editPeriod * 60) + 1), + 'locked' => 0, + ]; + $this->Mock->set('Entry', $entry); + $this->Mock->set('_CU', new SaitoUser); + $result = $this->Mock->isEditingAsCurrentUserForbidden(); + $this->assertTrue($result); + } + + public function testIsEditingForbiddenAnon() { + $entry = [ + 'user_id' => 1, + 'time' => strftime("%c", time()), + ]; + $this->Mock->set('Entry', $entry); + $user = [ + 'id' => null, + 'user_type' => 'anon', + ]; + $this->Mock->set('_CU', new SaitoUser($user)); + $result = $this->Mock->isEditingAsCurrentUserForbidden(); + $this->assertTrue($result); + } + + public function testIsEditingForbiddenWrongUser() { + $entry = [ + 'user_id' => 1, + 'time' => strftime("%c", time()), + ]; + $this->Mock->set('Entry', $entry); + $user = [ + 'id' => 2, + 'user_type' => 'user', + ]; + $this->Mock->set('_CU', new SaitoUser($user)); + $result = $this->Mock->isEditingAsCurrentUserForbidden(); + $this->assertEquals($result, 'user'); + } + + public function testIsEditingForbiddenToLate() { + $editPeriod = 20; + Configure::write('Saito.Settings.edit_period', $editPeriod); + $entry = [ + 'user_id' => 1, + 'locked' => false, + 'time' => strftime( "%c", time() - ($this->editPeriod * 60) - 1) + ]; + $this->Mock->set('Entry', $entry); + $user = [ + 'id' => 1, + 'user_type' => 'user', + ]; + $this->Mock->set('_CU', new SaitoUser($user)); + $result = $this->Mock->isEditingAsCurrentUserForbidden(); + $this->assertEquals($result, 'time'); + } + + public function testIsEditingForbiddenLocked() { + $entry = [ + 'user_id' => 1, + 'time' => strftime("%c", time()), + 'locked' => 1, + ]; + $this->Mock->set('Entry', $entry); + $user = [ + 'id' => 1, + 'user_type' => 'user', + ]; + $this->Mock->set('Entry', $entry); + $this->Mock->set('_CU', new SaitoUser($user)); + $result = $this->Mock->isEditingAsCurrentUserForbidden(); + $this->assertEquals($result, 'locked'); + } + + public function testIsEditingForbiddenModToLateNotFixed() { + $entry = [ + 'user_id' => 1, + 'time' => strftime("%c", + time() - ($this->editPeriod * 60) - 1), + 'fixed' => false, + ]; + $user = [ + 'id' => 1, + 'user_type' => 'mod', + ]; + $this->Mock->set('Entry', $entry); + $this->Mock->set('_CU', new SaitoUser($user)); + $result = $this->Mock->isEditingAsCurrentUserForbidden(); + $this->assertEquals($result, 'time'); + } + + public function testIsEditingForbiddenModToLateFixed() { + $entry = [ + 'user_id' => 1, + 'time' => strftime("%c", + time() - (Configure::read('Saito.Settings.edit_period') * 60) - 1), + 'fixed' => true, + ]; + $user = [ + 'id' => 1, + 'user_type' => 'mod', + ]; + $this->Mock->set('Entry', $entry); + $this->Mock->set('_CU', new SaitoUser($user)); + $result = $this->Mock->isEditingAsCurrentUserForbidden(); + $this->assertFalse($result); + } + + public function testIsEditingForbiddenAdminToLateNotFixed() { + $entry = [ + 'user_id' => 1, + 'time' => strftime("%c", + time() - ($this->editPeriod * 60) - 1), + 'fixed' => false, + ]; + $user = [ + 'id' => 1, + 'user_type' => 'admin', + ]; + $this->Mock->set('Entry', $entry); + $this->Mock->set('_CU', new SaitoUser($user)); + $result = $this->Mock->isEditingAsCurrentUserForbidden(); + $this->assertFalse($result); + } + + public function setUp() { + $this->editPeriodGlob = Configure::read('Saito.Settings.edit_period'); + Configure::write('Saito.Settings.edit_period', $this->editPeriod); + $this->Mock = new UserPostingTraitClassMock(); + } + + public function tearDown() { + unset($this->Mock); + Configure::write('Saito.Settings.edit_period', $this->editPeriodGlob); + } + + } diff --git a/app/Test/Case/Lib/ProperizeTest.php b/app/Test/Case/Lib/Saito/ProperizeTest.php similarity index 97% rename from app/Test/Case/Lib/ProperizeTest.php rename to app/Test/Case/Lib/Saito/ProperizeTest.php index 043d46bce..73eda27fe 100644 --- a/app/Test/Case/Lib/ProperizeTest.php +++ b/app/Test/Case/Lib/Saito/ProperizeTest.php @@ -1,6 +1,6 @@ [ 'id' => 1, 'tid' => 0, 'subject' => 'a', 'text' => 'b', 'time' => 0, 'last_answer' => 0, 'fixed' => false, 'solves' => '', 'user_id' => 1 ], + 'Entry' => [ 'id' => 1, 'tid' => 0, 'pid' => '0', 'subject' => 'a', 'text' => 'b', 'time' => 0, 'last_answer' => 0, 'fixed' => false, 'solves' => '', 'user_id' => 1 ], 'Category' => ['id' => 1, 'accession' => 0, 'description' => 'd', 'category' => 'c' ], 'User' => ['id' => 1, 'username' => 'u'] ]; - $entries = $this->EntryHelper->createTreeObject($entry); - $entries = $entries->addDecorator(function ($node) { - $node = $this->getMock('PostingCurrentUserDecorator', ['isIgnored'], [$node]); - $node->expects($this->once())->method('isIgnored')->will($this->returnValue(true)); - $node->setCurrentUser($this->SaitoUser); - return $node; - }); + $entries = $this->getMock('\Saito\Posting\Posting', ['isIgnored'], [$this->SaitoUser, $entry]); + $entries->expects($this->once())->method('isIgnored')->will($this->returnValue(true)); $xPathQuery = '//ul[@data-id=1]/li[contains(@class,"ignored")]'; //= posting should be ignored $options = ['maxThreadDepthIndent' => 25]; - $renderer = new ThreadHtmlRenderer($this->EntryHelper, $options); + $renderer = new \Saito\Thread\Renderer\ThreadHtmlRenderer($this->EntryHelper, $options); $result = $renderer->render($entries); $this->assertXPath($result, $xPathQuery); @@ -47,7 +37,7 @@ public function testIgnore() { public function testNesting() { $entry = $entry1 = $entry2 = $entry3 = [ - 'Entry' => [ 'id' => 1, 'tid' => 0, 'subject' => 'a', 'text' => 'b', 'time' => 0, 'last_answer' => 0, 'fixed' => false, 'solves' => '', 'user_id' => 1 ], + 'Entry' => [ 'id' => 1, 'tid' => 0, 'pid' => 0, 'subject' => 'a', 'text' => 'b', 'time' => 0, 'last_answer' => 0, 'fixed' => false, 'solves' => '', 'user_id' => 1 ], 'Category' => ['id' => 1, 'accession' => 0, 'description' => 'd', 'category' => 'c' ], 'User' => ['username' => 'u'] ]; @@ -61,12 +51,7 @@ public function testNesting() { $entries['_children'] = [$entry1 + ['_children' => [$entry2]], $entry3]; $entries = $this->EntryHelper->createTreeObject($entries); - $entries = $entries->addDecorator(function ($node) { - $node = new PostingCurrentUserDecorator($node); - $node->setCurrentUser($this->SaitoUser); - return $node; - }); - $renderer = new ThreadHtmlRenderer($this->EntryHelper, ['maxThreadDepthIndent' => 9999]); + $renderer = new \Saito\Thread\Renderer\ThreadHtmlRenderer($this->EntryHelper, ['maxThreadDepthIndent' => 9999]); $result = $renderer->render($entries); @@ -80,11 +65,12 @@ public function testThreadMaxDepth() { 'SaitoUser', ['getMaxAccession', 'getId', 'hasBookmarks'] ); - $SaitoUser->ReadEntries = $this->getMock('ReadPostingsDummy'); + $SaitoUser->ReadEntries = $this->getMock('ReadPostings\ReadPostingsDummy'); $entry = [ 'Entry' => [ 'id' => 1, + 'pid' => 0, 'tid' => 0, 'subject' => 'a', 'text' => 'b', @@ -114,14 +100,10 @@ public function testThreadMaxDepth() { ]; $entries = $this->EntryHelper->createTreeObject($entries); - $entries = $entries->addDecorator(function ($node) use ($SaitoUser) { - $node = new PostingCurrentUserDecorator($node); - $node->setCurrentUser($SaitoUser); - return $node; - }); + $this->EntryHelper->dic->set('CU', $SaitoUser); // max depth should not apply - $renderer = new ThreadHtmlRenderer($this->EntryHelper, [ + $renderer = new \Saito\Thread\Renderer\ThreadHtmlRenderer($this->EntryHelper, [ 'maxThreadDepthIndent' => 9999 ]); $result = $renderer->render($entries); @@ -137,7 +119,9 @@ public function setUp() { $this->EntryHelper = $this->_setupEntryHelper(); $this->SaitoUser = new SaitoUser; - $this->SaitoUser->ReadEntries = new ReadPostingsDummy; + $this->SaitoUser->ReadEntries = new ReadPostings\ReadPostingsDummy; + + $this->EntryHelper->dic = \Saito\Test\DicSetup::getNewDic($this->SaitoUser); } protected function _setupEntryHelper() { diff --git a/app/Test/Case/Lib/SaitoUser/CategoryAuthTest.php b/app/Test/Case/Lib/Saito/User/Auth/CategoryAuthTest.php similarity index 80% rename from app/Test/Case/Lib/SaitoUser/CategoryAuthTest.php rename to app/Test/Case/Lib/Saito/User/Auth/CategoryAuthTest.php index db017330d..c9c29bc1d 100644 --- a/app/Test/Case/Lib/SaitoUser/CategoryAuthTest.php +++ b/app/Test/Case/Lib/Saito/User/Auth/CategoryAuthTest.php @@ -1,7 +1,7 @@ 1, 'user_type' => 'anon']); - $this->Lib = new CategoryAuth($User); + $this->Lib = new CategoryAuthorization($User); $result = $this->Lib->getAllowed('select'); $expected = array( diff --git a/app/Test/Case/Lib/SaitoUser/LastRefresh/LastRefreshDatabaseTest.php b/app/Test/Case/Lib/Saito/User/LastRefresh/LastRefreshDatabaseTest.php similarity index 92% rename from app/Test/Case/Lib/SaitoUser/LastRefresh/LastRefreshDatabaseTest.php rename to app/Test/Case/Lib/Saito/User/LastRefresh/LastRefreshDatabaseTest.php index 56780dabd..2f6c911fa 100644 --- a/app/Test/Case/Lib/SaitoUser/LastRefresh/LastRefreshDatabaseTest.php +++ b/app/Test/Case/Lib/Saito/User/LastRefresh/LastRefreshDatabaseTest.php @@ -1,6 +1,5 @@ CurrentUser = new CurrentUserComponent($Collection); - $this->LastRefresh = new LastRefreshDatabase($this->CurrentUser); + $this->LastRefresh = new \Saito\User\LastRefresh\LastRefreshDatabase($this->CurrentUser); } /** diff --git a/app/Test/Case/Lib/SaitoUser/ReadPostings/ReadPostingsCookieTest.php b/app/Test/Case/Lib/Saito/User/ReadPostings/ReadPostingsCookieTest.php similarity index 97% rename from app/Test/Case/Lib/SaitoUser/ReadPostings/ReadPostingsCookieTest.php rename to app/Test/Case/Lib/Saito/User/ReadPostings/ReadPostingsCookieTest.php index c20934627..5c0f608c9 100644 --- a/app/Test/Case/Lib/SaitoUser/ReadPostings/ReadPostingsCookieTest.php +++ b/app/Test/Case/Lib/Saito/User/ReadPostings/ReadPostingsCookieTest.php @@ -1,9 +1,10 @@ Ecach->getDataSource(); - if (stripos($DS->config['datasource'], 'MySQL') === false) { - return; - } - - $length = 10e6; - - $saveData = function($length) { - $data = str_pad('', $length, 0); - $this->Ecach->save(['key' => 'foo', 'value' => $data]); - }; - - $expectSavedLength = function($expected) { - $result = $this->Ecach->findByKey('foo'); - $this->assertEquals($expected, strlen($result['Ecach']['value'])); - }; - - $saveData($length); - // fixture has the same problem as schema.php: CakePHP only creates a BLOB - // for `binary` field type on MySQL - $expectSavedLength(65535); - - // this fix is run in schema.php's after() - $this->cakeMysqlMediumBlobFix(); - $saveData($length); - $expectSavedLength($length); - } - - /** - * setUp method - * - * @return void - */ - public function setUp() { - parent::setUp(); - $this->Ecach = ClassRegistry::init('Ecach'); - } - - /** - * tearDown method - * - * @return void - */ - public function tearDown() { - unset($this->Ecach); - - parent::tearDown(); - } - - } diff --git a/app/Test/Case/Model/EntryTest.php b/app/Test/Case/Model/EntryTest.php index d617b10db..0d6fda1c2 100755 --- a/app/Test/Case/Model/EntryTest.php +++ b/app/Test/Case/Model/EntryTest.php @@ -1,7 +1,6 @@ with('Model.Thread.create', $this->anything()); //# Setup CurrentUser - $SaitoUser = $this->getMock('SaitoUser', ['getId', 'hasBookmarks']); + $SaitoUser = $this->getMock('Saito\User\SaitoUser', ['getId', 'hasBookmarks']); $SaitoUser->expects($this->any()) ->method('getId') ->will($this->returnValue(1)); @@ -114,7 +112,7 @@ public function testCreateCategoryThreadCounterUpdate() { $category = 1; //# Setup CurrentUser - $SaitoUser = $this->getMock('SaitoUser', ['getId']); + $SaitoUser = $this->getMock('\Saito\User\SaitoUser', ['getId']); $SaitoUser->expects($this->any()) ->method('getId') ->will($this->returnValue(1)); @@ -225,6 +223,44 @@ public function testThreadMerge() { $this->assertEquals($appendedEntry, 1); } + /** + * test that a unpinned source thread is pinned after merge if target is pinned + */ + public function testThreadMergePin() { + //= unlock source the fixture thread + $this->Entry->id = 4; + $this->Entry->toggle('locked'); + $entry = $this->Entry->get(4); + $this->assertTrue($entry['Entry']['locked'] == false); + + //= lock the target fixture thread + $this->Entry->id = 2; + $this->Entry->toggle('locked'); + $entry = $this->Entry->get(4); + $this->assertTrue($entry['Entry']['locked'] == false); + + //= merge + $this->Entry->id = 4; + $this->Entry->threadMerge(2); + + $entry = $this->Entry->get(4); + $this->assertTrue($entry['Entry']['locked'] == true); + } + + /** + * test that a pinned source thread is unpinned before merge + */ + public function testThreadMergeUnpin() { + $entry = $this->Entry->get(4); + $this->assertTrue($entry['Entry']['locked'] == true); + + $this->Entry->id = 4; + $this->Entry->threadMerge(2); + + $entry = $this->Entry->get(4); + $this->assertTrue($entry['Entry']['locked'] == false); + } + public function testIdsForNode() { $expected = array(2, 3, 7, 9); $result = $this->Entry->getIdsForNode(2); @@ -268,7 +304,7 @@ public function testThreadIncrementViewOmitUser() { } public function testChangeThreadCategory() { - $SaitoUser = $this->getMock('SaitoUser'); + $SaitoUser = $this->getMock('\Saito\User\SaitoUser'); $SaitoUser->Categories = $this->getMock('Object', ['getAllowed']); $SaitoUser->Categories->expects($this->once()) ->method('getAllowed') @@ -311,7 +347,7 @@ public function testChangeThreadCategory() { } public function testChangeThreadCategoryNotAnExistingCategory() { - $SaitoUser = $this->getMock('SaitoUser'); + $SaitoUser = $this->getMock('\Saito\User\SaitoUser'); $SaitoUser->Categories = $this->getMock('Object', ['getAllowed']); $SaitoUser->Categories->expects($this->once()) ->method('getAllowed') @@ -429,189 +465,6 @@ public function testAnonymizeEntriesFromUser() { $this->assertEquals($result, $expected); } - public function testIsAnsweringForbidden() { - $entry = array('Entry' => array('locked' => 0)); - $result = $this->Entry->isAnsweringForbidden($entry); - $expected = false; - $this->assertSame($result, $expected); - $entry = array('Entry' => array('locked' => '0')); - $result = $this->Entry->isAnsweringForbidden($entry); - $expected = false; - $this->assertSame($result, $expected); - $entry = array('Entry' => array('locked' => false)); - $result = $this->Entry->isAnsweringForbidden($entry); - $expected = false; - $this->assertSame($result, $expected); - } - - public function testIsEditingForbiddenSuccess() { - $this->Entry->_editPeriod = 1200; - $entry = array( - 'Entry' => array( - 'user_id' => 1, - 'time' => strftime("%c", - time() - $this->Entry->_editPeriod + 1), - 'locked' => 0, - ) - ); - $user = array( - 'id' => 1, - 'user_type' => 'user', - ); - $SaitoUser = new SaitoUser($user); - $user = $SaitoUser; - $result = $this->Entry->isEditingForbidden($entry, $user); - $this->assertFalse($result); - } - - public function testIsEditingForbiddenEmptyUser() { - $entry = array( - 'Entry' => array( - 'user_id' => 1, - 'time' => strftime("%c", - time() - (Configure::read('Saito.Settings.edit_period') * 60) + 1), - 'locked' => 0, - ) - ); - $user = null; - $SaitoUser = new SaitoUser($user); - $user = $SaitoUser; - $result = $this->Entry->isEditingForbidden($entry, $user); - $this->assertTrue($result); - } - - public function testIsEditingForbiddenAnon() { - $entry = array( - 'Entry' => array( - 'user_id' => 1, - 'time' => strftime("%c", time()), - ) - ); - $user = array( - 'id' => null, - 'user_type' => 'anon', - ); - $SaitoUser = new SaitoUser($user); - $user = $SaitoUser; - $result = $this->Entry->isEditingForbidden($entry, $user); - $this->assertTrue($result); - } - - public function testIsEditingForbiddenWrongUser() { - $entry = array( - 'Entry' => array( - 'user_id' => 1, - 'time' => strftime("%c", time()), - ) - ); - $user = array( - 'id' => 2, - 'user_type' => 'user', - ); - $SaitoUser = new SaitoUser($user); - $user = $SaitoUser; - $result = $this->Entry->isEditingForbidden($entry, $user); - $this->assertEquals($result, 'user'); - } - - public function testIsEditingForbiddenToLate() { - $this->Entry->_editPeriod = 1200; - $entry = [ - 'Entry' => [ - 'user_id' => 1, - 'locked' => false, - 'time' => strftime( - "%c", - time() - $this->Entry->_editPeriod - 1 - ) - ] - ]; - $user = array( - 'id' => 1, - 'user_type' => 'user', - ); - $SaitoUser = new SaitoUser($user); - $user = $SaitoUser; - $result = $this->Entry->isEditingForbidden($entry, $user); - $this->assertEquals($result, 'time'); - } - - public function testIsEditingForbiddenLocked() { - $entry = array( - 'Entry' => array( - 'user_id' => 1, - 'time' => strftime("%c", time()), - 'locked' => 1, - ) - ); - $user = array( - 'id' => 1, - 'user_type' => 'user', - ); - $SaitoUser = new SaitoUser($user); - $user = $SaitoUser; - $result = $this->Entry->isEditingForbidden($entry, $user); - $this->assertEquals($result, 'locked'); - } - - public function testIsEditingForbiddenModToLateNotFixed() { - Configure::write('Saito.Settings.edit_period', 20); - $entry = array( - 'Entry' => array( - 'user_id' => 1, - 'time' => strftime("%c", - time() - (Configure::read('Saito.Settings.edit_period') * 60) - 1), - 'fixed' => false, - ) - ); - $user = array( - 'id' => 1, - 'user_type' => 'mod', - ); - $SaitoUser = new SaitoUser($user); - $user = $SaitoUser; - $result = $this->Entry->isEditingForbidden($entry, $user); - $this->assertEquals($result, 'time'); - } - - public function testIsEditingForbiddenModToLateFixed() { - $entry = array( - 'Entry' => array( - 'user_id' => 1, - 'time' => strftime("%c", - time() - (Configure::read('Saito.Settings.edit_period') * 60) - 1), - 'fixed' => true, - ) - ); - $user = array( - 'id' => 1, - 'user_type' => 'mod', - ); - $SaitoUser = new SaitoUser($user); - $user = $SaitoUser; - $result = $this->Entry->isEditingForbidden($entry, $user); - $this->assertFalse($result); - } - - public function testIsEditingForbiddenAdminToLateNotFixed() { - $entry = array( - 'Entry' => array( - 'user_id' => 1, - 'time' => strftime("%c", - time() - (Configure::read('Saito.Settings.edit_period') * 60) - 1), - 'fixed' => false, - ) - ); - $user = array( - 'id' => 1, - 'user_type' => 'admin', - ); - $SaitoUser = new SaitoUser($user); - $user = $SaitoUser; - $result = $this->Entry->isEditingForbidden($entry, $user); - $this->assertFalse($result); - } - public function testIsRoot() { $this->Entry->id = 8; $result = $this->Entry->isRoot(); @@ -638,8 +491,10 @@ public function testIsRoot() { } public function testTreeForNode() { - $this->Entry = $this->getMock('Entry', array('getThreadId', 'treesForThreads'), - array(false, 'entries', 'test') + $this->Entry = $this->getMock( + 'Entry', + ['getThreadId', 'treesForThreads'], + [false, 'entries', 'test'] ); $this->Entry->expects($this->once()) @@ -647,28 +502,22 @@ public function testTreeForNode() { ->with(2) ->will($this->returnValue(1)); - $ar = array( - 0 => array( - 'Entry' => array( - 'id' => 1, - ), - '_children' => array( + $ar = [ + 0 => [ + 'Entry' => ['id' => 1], + '_children' => [ 0 => - array( - 'Entry' => array( - 'id' => 2, - ), - 'User' - ), - 'Entry' => array( - 'id' => 3, - ), - ) - ) - ); + [ + 'Entry' => ['id' => 2], + 'User' + ], + 'Entry' => ['id' => 3], + ] + ] + ]; $this->Entry->expects($this->once()) ->method('treesForThreads') - ->with(array(array('id' => 1))) + ->with([1]) ->will($this->returnValue($ar)); $result = $this->Entry->treeForNode(2); diff --git a/app/Test/Case/Model/SmileyCodeTest.php b/app/Test/Case/Model/SmileyCodeTest.php index c2a5305be..46b223f91 100644 --- a/app/Test/Case/Model/SmileyCodeTest.php +++ b/app/Test/Case/Model/SmileyCodeTest.php @@ -1,7 +1,8 @@ User->find('latest'); - $this->assertEquals($result['User']['id'], 8); + $this->assertEquals($result['User']['id'], 9); } public function testSetCategoryAll() { @@ -364,14 +364,14 @@ public function testActivateUserAlreadyActivated() { } public function testActivateUserWrongCode() { - $result = $this->User->activate(9, '123'); + $result = $this->User->activate(10, '123'); $this->assertFalse($result); } public function testActivateUserSuccess() { - $result = $this->User->activate(9, '1548'); + $result = $this->User->activate(10, '1548'); $this->assertEquals('activated', $result['status']); - $user = $this->User->findById(9); + $user = $this->User->findById(10); $this->assertEquals(0, $user['User']['activate_code']); $this->assertEquals($user['User'], $result['User']); } @@ -644,7 +644,7 @@ public function testRegisterValidationUsernameDisallowedChars() { $this->assertEquals($this->User->validationErrors, $expected); } - public function testRegisterValidationUsernameIsEqual() { + public function testRegisterValidationUsernameIsEqualDisallowed() { $data = [ 'User' => [ 'username' => 'Mitsch', @@ -673,6 +673,23 @@ public function testRegisterValidationUsernameIsEqual() { $this->assertEmpty($this->User->validationErrors); } + /** + * the validation should not trigger if two coliding but existing users + * with same name get values updated, but not the username + */ + public function testRegisterValidationUsernameIsEqualAllowed() { + $data = [ + 'User' => [ + 'id' => 9, + 'username' => 'Liane', + 'user_email' => 'new@example.com' + ] + ]; + $result = $this->User->save($data); + $this->assertEquals($data, $result); + $this->assertEmpty($this->User->validationErrors); + } + public function setUp() { Security::setHash('md5'); diff --git a/app/Test/Case/View/Helper/EntryHelperTest.php b/app/Test/Case/View/Helper/EntryHelperTest.php index 1f5adea08..47777e14c 100755 --- a/app/Test/Case/View/Helper/EntryHelperTest.php +++ b/app/Test/Case/View/Helper/EntryHelperTest.php @@ -1,9 +1,10 @@ set('LineCache', new ItemCache('test')); $this->EntryH = new EntryHHelper($View); + + $this->EntryH->dic = \Saito\Test\DicSetup::getNewDic(); } public function tearDown() { @@ -25,39 +28,31 @@ public function tearDown() { public function testGetFastLink() { $this->EntryH->webroot = 'localhost/'; - //* - $entry = array( 'Entry' => array( - 'id' => 3, - 'subject' => 'Subject', - 'text' => 'Text' - ) - ); + //= simple test + $entry = [ + 'Entry' => [ + 'id' => 3, + 'tid' => 1, + 'pid' => 1, + 'subject' => 'Subject', + 'text' => 'Text' + ] + ]; $expected = "Subject"; $result = $this->EntryH->getFastLink($entry); $this->assertEquals($expected, $result); - //* test n/t posting - $entry = array( 'Entry' => array( - 'id' => 1, - 'subject' => 'Subject', - 'text' => '' - ) - ); - $expected = "Subject n/t"; - $result = $this->EntryH->getFastLink($entry); - $this->assertEquals($expected, $result); - - //* test 'class' input - $entry = array( 'Entry' => array( - 'id' => 3, - 'subject' => 'Subject', - 'text' => 'Text' - ) - ); + //= test 'class' input $class = 'my_test_class foo'; $expected = "Subject"; $result = $this->EntryH->getFastLink($entry, array( 'class' => $class )); $this->assertEquals($expected, $result); + + //* test n/t posting + $entry['Entry']['text'] = ''; + $expected = "Subject n/t"; + $result = $this->EntryH->getFastLink($entry); + $this->assertEquals($expected, $result); } } diff --git a/app/Test/Fixture/EcachFixture.php b/app/Test/Fixture/EcachFixture.php deleted file mode 100644 index 486e6d48c..000000000 --- a/app/Test/Fixture/EcachFixture.php +++ /dev/null @@ -1,36 +0,0 @@ - array('type' => 'string', 'null' => false, 'default' => null, 'length' => 128, 'key' => 'primary', 'collate' => 'utf8_general_ci', 'charset' => 'utf8'), - 'value' => array('type' => 'binary', 'null' => false, 'default' => null), - 'indexes' => array( - 'PRIMARY' => array('column' => 'key', 'unique' => 1) - ), - 'tableParameters' => array('charset' => 'utf8', - 'collate' => 'utf8_general_ci', 'engine' => 'InnoDB') - ); - - /** - * Records - * - * @var array - */ - public $records = array( - array( - 'key' => 'Lorem ipsum dolor sit amet', - 'value' => 'Lorem ipsum dolor sit amet' - ), - ); - - } diff --git a/app/Test/Fixture/UserFixture.php b/app/Test/Fixture/UserFixture.php index 199750280..5446ccb83 100755 --- a/app/Test/Fixture/UserFixture.php +++ b/app/Test/Fixture/UserFixture.php @@ -128,6 +128,11 @@ class UserFixture extends CakeTestFixture { ], [ 'id' => 9, + 'username' => 'Liane', + 'user_email' => 'liane@example.com' + ], + [ + 'id' => 10, 'username' => 'Diane', 'user_email' => 'diane@example.com', 'activate_code' => 1548 diff --git a/app/Test/Selenium/Lib/SaitoSeleniumTestCase.php b/app/Test/Selenium/Lib/SaitoSeleniumTestCase.php index c68c427a7..b8efa7ae7 100644 --- a/app/Test/Selenium/Lib/SaitoSeleniumTestCase.php +++ b/app/Test/Selenium/Lib/SaitoSeleniumTestCase.php @@ -60,7 +60,6 @@ class SaitoSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase { */ public $fixtures = array( 'app.bookmark', - 'app.ecach', 'app.user', 'app.user_online', 'app.entry', diff --git a/app/View/Admins/admin_logs.ctp b/app/View/Admins/admin_logs.ctp index 11b669dbf..a9ea5afad 100644 --- a/app/View/Admins/admin_logs.ctp +++ b/app/View/Admins/admin_logs.ctp @@ -2,7 +2,11 @@

    - $content) : ?> -

    - Admin->formatCakeLog($content) ?> - + $content) { + echo $this->Html->tag('h3', $title); + echo $this->Admin->formatCakeLog($content) ; + } diff --git a/app/View/Admins/admin_plugins.ctp b/app/View/Admins/admin_plugins.ctp new file mode 100644 index 000000000..8186bbad7 --- /dev/null +++ b/app/View/Admins/admin_plugins.ctp @@ -0,0 +1,15 @@ +Html->addCrumb(__('Plugins'), '/admin/plugins'); + + echo $this->Html->tag('h1', __('Plugins')); + $items = SaitoEventManager::getInstance() + ->dispatch('Request.Saito.View.Admin.plugins'); + if ($items) { + foreach ($items as $item) { + $plugins[] = $this->Html->link( + $item['title'], + $item['url'] + ); + } + echo $this->Html->nestedList($plugins); + } diff --git a/app/View/Bookmarks/edit.ctp b/app/View/Bookmarks/edit.ctp index e5e802300..6728a3949 100644 --- a/app/View/Bookmarks/edit.ctp +++ b/app/View/Bookmarks/edit.ctp @@ -8,14 +8,7 @@ Layout->panelHeading(__('Edit Bookmark'), ['pageHeading' => true]) ?>
    - $this->request->data['Entry'], - 'Category' => $this->request->data['Entry']['Category'], - 'User' => $this->request->data['Entry']['User'], - ); - echo $this->element('/entry/view_content', array( - 'entry' => $entry)); ?> + element('/entry/view_content', ['entry' => $entry]); ?>
    - EntryH->renderThread($entry_sub, $CurrentUser) ?> + EntryH->renderThread($entry_sub) ?>
    EntryH->createTreeObject($entry_sub); - $rendered = $this->EntryH->renderThread($tree, $CurrentUser, - ['currentEntry' => $currentEntry]); - $css = ($tree->Thread->get('root')->isIgnored()) ? 'ignored' : ''; + $rendered = $this->EntryH->renderThread($entry_sub, + ['currentEntry' => $currentEntry]); + $css = ($entry_sub->getThread()->get('root')->isIgnored()) ? 'ignored' : ''; ?> -
    +
    - - + + isLoggedIn()): ?>     EntryH->hasNewEntries($entry_sub, $CurrentUser)) { + if ($entry_sub->hasNewAnswers()) { $tag = 'button'; } else { $tag = 'span'; @@ -65,25 +65,20 @@ < class=" btn-threadBox-tools js-btn-showAllNewThreadlines "> > - - - + + +
    EntryH->hasAnswers($entry_sub) && - $this->request->params['controller'] === 'entries' && - $this->request->params['action'] === 'index' - ) { - $_style = ''; + $style = ''; + if (!$allowThreadCollapse || !$entry_sub->hasAnswers()) { + $style = 'visibility: hidden;'; } ?>
    diff --git a/app/View/Elements/entry/view_content.ctp b/app/View/Elements/entry/view_content.ctp index 64c76613f..cf23b4168 100644 --- a/app/View/Elements/entry/view_content.ctp +++ b/app/View/Elements/entry/view_content.ctp @@ -8,7 +8,7 @@

    EntryH->getSubject($entry); - $url = $this->Html->url('/entries/view/' . $entry['Entry']['id'], true); + $url = $this->Html->url('/entries/view/' . $entry->get('id'), true); $schemaMeta['url'] = $url; // only make subject a link if it is not in entries/view if ($this->request->action !== 'preview' && @@ -23,51 +23,52 @@

    - Parser->parse($entry['Entry']['text']) ?> + Parser->parse($entry->get('text')) ?>
    @@ -88,7 +89,7 @@
    isLoggedIn()) ? !$CurrentUser['user_signatures_images_hide'] : true; - echo $this->Parser->parse($entry['User']['signature'], + echo $this->Parser->parse($entry->get('User')['signature'], array('multimedia' => $multimedia)); ?> diff --git a/app/View/Elements/entry/view_posting.ctp b/app/View/Elements/entry/view_posting.ctp index 034f3b5b4..98e241b5f 100644 --- a/app/View/Elements/entry/view_posting.ctp +++ b/app/View/Elements/entry/view_posting.ctp @@ -5,21 +5,26 @@ $editLinkIsShown = false; $_showSignature = false; + // @todo remove + if (is_array($entry)) { + $entry = $this->EntryH->createTreeObject($entry); + } + //data passed as json model $_jsEntry = json_encode([ - 'pid' => (int)$entry['Entry']['pid'], - 'isBookmarked' => $entry['isBookmarked'], - 'isSolves' => (bool)$entry['Entry']['solves'], + 'pid' => $entry->get('pid'), + 'isBookmarked' => $entry->isBookmarked(), + 'isSolves' => (bool)$entry->get('solves'), 'rootEntryUserId' => (int)$rootEntry['Entry']['user_id'], - 'time' => $this->TimeH->mysqlTimestampToIso($entry['Entry']['time']) + 'time' => $this->TimeH->mysqlTimestampToIso($entry->get('time')) ]); ?> -
    +
    EntryH->isNt($entry) + !empty($entry->get('User')['signature']) && + !$entry->isNt() ) { $_showSignature = true; } @@ -40,7 +45,7 @@ $items = SaitoEventManager::getInstance()->dispatch( 'Request.Saito.View.Posting.footerActions', [ - 'posting' => $entry, + 'posting' => $entry->getRaw(), 'View' => $this ] ); @@ -51,8 +56,7 @@
    isAnsweringForbidden(); if ($answering_forbidden === 'locked') { echo $this->Html->tag( @@ -74,14 +78,12 @@ ); }; ?> - + isEditingWithRoleUserForbidden()) : ?> Html->link( __('edit_linkname'), - '/entries/edit/' . $entry['Entry']['id'], + '/entries/edit/' . $entry->get('id'), ['class' => 'btn btn-edit js-btn-edit panel-footer-form-btn', 'accesskey' => 'e'] ); ?> @@ -92,19 +94,17 @@ // mod menu if ($CurrentUser->isMod()) { // edit entry - if (isset($entry['rights']['isEditingForbidden']) && - ($entry['rights']['isEditingForbidden'] == false) - ) { + if (!$entry->isEditingAsCurrentUserForbidden()) { $editLinkIsShown = true; $_menuItems[] = $this->Html->link( ' ' . __('edit_linkname'), - '/entries/edit/' . $entry['Entry']['id'], + '/entries/edit/' . $entry->get('id'), ['escape' => false] ); } // pin and lock thread - if ($entry['Entry']['pid'] == 0) { + if ($entry->isRoot()) { if ($editLinkIsShown) { $_menuItems[] = 'divider'; } @@ -115,15 +115,15 @@ foreach ($_ajaxToggleOptions as $key => $icon) { $_menuItems[] = $this->Js->link( ' ' - . '' - . (($entry['Entry'][$key] == 0) ? __d('nondynamic', + . '' + . (($entry->get($key) == 0) ? __d('nondynamic', $key . '_set_entry_link') : __d('nondynamic', $key . '_unset_entry_link')) . '', - '/entries/ajax_toggle/' . $entry['Entry']['id'] . '/' . $key, + '/entries/ajax_toggle/' . $entry->get('id') . '/' . $key, array( - 'id' => 'btn-entry_' . $key . '-' . $entry['Entry']['id'], - 'success' => "$('#title-entry_{$key}-{$entry['Entry']['id']}').html(data);", + 'id' => 'btn-entry_' . $key . '-' . $entry->get('id'), + 'success' => "$('#title-entry_{$key}-{$entry->get('id')}').html(data);", 'buffer' => false, 'escape' => false, ) @@ -136,7 +136,7 @@ // merge thread $_menuItems[] = $this->Html->link( ' ' . __('merge_tree_link'), - '/entries/merge/' . $entry['Entry']['id'], + '/entries/merge/' . $entry->get('id'), array('escape' => false)); } @@ -145,7 +145,7 @@ $_menuItems[] = 'divider'; $_menuItems[] = $this->Html->link( ' ' . __('delete_tree_link'), - '/entries/delete/' . $entry['Entry']['id'], + '/entries/delete/' . $entry->get('id'), array('escape' => false), __('delete_tree_link_confirm_message') ); diff --git a/app/View/Elements/flash/render.ctp b/app/View/Elements/flash/render.ctp index 332ce4b1c..774500066 100644 --- a/app/View/Elements/flash/render.ctp +++ b/app/View/Elements/flash/render.ctp @@ -1,11 +1,7 @@ JsData->getAppJsMessages(); - foreach($messages['msg'] as $message) : - ?> -
    -
    - -
    -
    - Html->tag('div', $message['message'], ['class' => 'alert']); + $class = 'flash flash-' . $message['type']; + echo $this->Html->tag('div', $inner, ['class' => $class]); + } diff --git a/app/View/Elements/generic/no-content-yet.ctp b/app/View/Elements/generic/no-content-yet.ctp index 94299bbe6..e99cf922e 100644 --- a/app/View/Elements/generic/no-content-yet.ctp +++ b/app/View/Elements/generic/no-content-yet.ctp @@ -1,3 +1,3 @@
    - +
    \ No newline at end of file diff --git a/app/View/Elements/layout/slidetab_recentposts.ctp b/app/View/Elements/layout/slidetab_recentposts.ctp index 3f6e1ca48..3e39cfa58 100755 --- a/app/View/Elements/layout/slidetab_recentposts.ctp +++ b/app/View/Elements/layout/slidetab_recentposts.ctp @@ -9,7 +9,7 @@ diff --git a/app/View/Elements/searches/search_results.ctp b/app/View/Elements/searches/search_results.ctp index cec0c9c5e..241f9db4b 100644 --- a/app/View/Elements/searches/search_results.ctp +++ b/app/View/Elements/searches/search_results.ctp @@ -9,7 +9,7 @@ } else { $out = []; foreach ($results as $result) { - $out[] = $this->EntryH->renderThread($result, $CurrentUser); + $out[] = $this->EntryH->renderThread($result); } echo $this->Html->nestedList($out); } diff --git a/app/View/Elements/users/block-report.ctp b/app/View/Elements/users/block-report.ctp index 8d3e234f5..f895bb2c5 100644 --- a/app/View/Elements/users/block-report.ctp +++ b/app/View/Elements/users/block-report.ctp @@ -1,7 +1,11 @@ element( + 'generic/no-content-yet', + ['message' => __('ncy.aub')] + ); + return; + } SDV($mode, 'profile'); $format = ($mode === 'full') ? 'eng' : 'normal' ; ?> diff --git a/app/View/Entries/json/thread_line.ctp b/app/View/Entries/json/thread_line.ctp index 66861fa95..83dcd0d17 100644 --- a/app/View/Entries/json/thread_line.ctp +++ b/app/View/Entries/json/thread_line.ctp @@ -1,7 +1,6 @@ $entry_sub['Entry']['id'], - 'html' => $this->EntryH->renderThread($entry_sub, $CurrentUser, - ['level' => $level]) + 'html' => $this->EntryH->renderThread($entry_sub, ['level' => $level]) ]; echo json_encode($out); diff --git a/app/View/Entries/mix.ctp b/app/View/Entries/mix.ctp index 760b8692b..92b84b6de 100644 --- a/app/View/Entries/mix.ctp +++ b/app/View/Entries/mix.ctp @@ -4,7 +4,7 @@ echo $this->Layout->navbarItem( ' ' . __('Back'), - $this->EntryH->getPaginatedIndexPageId($entries[0]['Entry']['tid'], + $this->EntryH->getPaginatedIndexPageId($entries->get('tid'), $lastAction), ['escape' => false, 'rel' => 'nofollow'] ); @@ -15,7 +15,7 @@ echo $this->Html->link( '
     
    ', $this->EntryH->getPaginatedIndexPageId( - $entries[0]['Entry']['tid'], + $entries->get('tid'), $lastAction), [ 'escape' => false, @@ -24,8 +24,7 @@ ); ?>
    - EntryH->renderThread($entries[0], $CurrentUser, - ['renderer' => 'mix']) ?> + EntryH->renderThread($entries, ['renderer' => 'mix']) ?>
    \ No newline at end of file diff --git a/app/View/Errors/error400.ctp b/app/View/Errors/error400.ctp index 400f0fe63..94a254c1c 100755 --- a/app/View/Errors/error400.ctp +++ b/app/View/Errors/error400.ctp @@ -27,7 +27,7 @@ ?>

    8]; + $shpErrorPages = ['Saito\Exception\SaitoBlackholeException' => 8]; $errorClass = get_class($error); if (isset($shpErrorPages[$errorClass])) { $help = $this->SaitoHelp->icon($shpErrorPages[$errorClass], diff --git a/app/View/Helper/AdminHelper.php b/app/View/Helper/AdminHelper.php index 0849f5c2f..bc15f1b61 100644 --- a/app/View/Helper/AdminHelper.php +++ b/app/View/Helper/AdminHelper.php @@ -12,7 +12,10 @@ public function __construct($text) { $matches); $this->_time = $matches[1]; $this->_type = $matches[2]; - $this->_message = $matches[3]; + $this->_message = trim($matches[3]); + if (empty($this->_message)) { + $this->_message = array_shift($lines); + } $this->_detail = implode($lines, '
    '); } diff --git a/app/View/Helper/AppHelper.php b/app/View/Helper/AppHelper.php index e4633f89c..203bd7b6b 100755 --- a/app/View/Helper/AppHelper.php +++ b/app/View/Helper/AppHelper.php @@ -34,6 +34,15 @@ class AppHelper extends Helper { protected static $_tagId = 0; + public function __get($name) { + switch ($name) { + case 'dic': + return ClassRegistry::getObject('dic'); + default: + return parent::__get($name); + } + } + public static function tagId() { return 'id' . static::$_tagId++; } diff --git a/app/View/Helper/EntryHHelper.php b/app/View/Helper/EntryHHelper.php index 40b2a5f88..974b80d13 100755 --- a/app/View/Helper/EntryHHelper.php +++ b/app/View/Helper/EntryHHelper.php @@ -1,6 +1,9 @@ strtotime($entry['Entry']['time']); - } - - public function isPinned($entry) { - return (bool)$entry['Entry']['fixed']; - } - -/** - * @param $entry - * @param $user - * @return bool - * @throws InvalidArgumentException - */ - public function hasNewEntries($entry, $user) { - if ($entry['Entry']['pid'] != 0) { - throw new InvalidArgumentException('Entry is no thread-root, pid != 0'); - } - if (!isset($user['last_refresh'])) { - return false; - } - return $user['last_refresh_unix'] < strtotime($entry['Entry']['last_answer']); - } - public function getPaginatedIndexPageId($tid, $lastAction) { $indexPage = '/entries/index'; @@ -64,19 +34,10 @@ public function getPaginatedIndexPageId($tid, $lastAction) { return $indexPage; } - /** - * evaluates if entry is n/t - * - * @param $entry - * @return bool - */ - public function isNt($entry) { - return empty($entry['Entry']['text']); - } - public function getFastLink($entry, $params = array('class' => '')) { + // @todo @performance $out = "" . - $this->getSubject($entry) . ''; + $this->getSubject($this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $entry])) . ''; return $out; } @@ -103,13 +64,13 @@ public function categorySelect($entry, $categories) { /** * renders a posting tree as thread * - * @param mixed $tree + * @param mixed $tree passed as reference to share CU-decorator "up" * @param $CurrentUser * @param $options * - 'renderer' [thread]|mix * @return string */ - public function renderThread($tree, ForumsUserInterface $CurrentUser, array $options = []) { + public function renderThread(&$tree, array $options = []) { $options += [ 'lineCache' => $this->_View->get('LineCache'), 'maxThreadDepthIndent' => (int)Configure::read('Saito.Settings.thread_depth_indent'), @@ -122,25 +83,16 @@ public function renderThread($tree, ForumsUserInterface $CurrentUser, array $opt $tree = $this->createTreeObject($tree, $options); } - App::uses('PostingCurrentUserDecorator', 'Lib/Thread'); - $tree = $tree->addDecorator(function ($node) use ($CurrentUser) { - $node = new PostingCurrentUserDecorator($node); - $node->setCurrentUser($CurrentUser); - return $node; - }); - if (isset($this->_renderers[$renderer])) { $renderer = $this->_renderers[$renderer]; } else { $name = $renderer; switch ($name) { case 'mix': - App::uses('MixHtmlRenderer', 'Lib/Thread/Renderer'); - $renderer = new MixHtmlRenderer($this); + $renderer = new Renderer\MixHtmlRenderer($this); break; default: - App::uses('ThreadHtmlRenderer', 'Lib/Thread/Renderer'); - $renderer = new ThreadHtmlRenderer($this); + $renderer = new Renderer\ThreadHtmlRenderer($this); } $this->_renderers[$name] = $renderer; } @@ -156,8 +108,11 @@ public function renderThread($tree, ForumsUserInterface $CurrentUser, array $opt * @return Posting */ public function createTreeObject(array $entrySub, array $options = []) { - App::uses('Posting', 'Lib/Thread'); - return new Posting($entrySub, $options); + $tree = $this->dic->newInstance( + '\Saito\Posting\Posting', + ['rawData' => $entrySub, 'options' => $options] + ); + return $tree; } } diff --git a/app/View/Helper/JsDataHelper.php b/app/View/Helper/JsDataHelper.php index 23826a519..e142afde8 100644 --- a/app/View/Helper/JsDataHelper.php +++ b/app/View/Helper/JsDataHelper.php @@ -1,7 +1,8 @@ _MarkupEditor === null) { - $this->_MarkupEditor = SaitoPlugin::getParserClassInstance('Editor', $this); + $this->_MarkupEditor = \Saito\Plugin::getParserClassInstance('Editor', $this); } return $this->_MarkupEditor; } @@ -89,7 +88,7 @@ protected function _getParser() { $this->SmileyRenderer = new \Saito\Smiley\Renderer($settings['smiliesData']); $this->SmileyRenderer->setHelper($this); - $this->_Parser = SaitoPlugin::getParserClassInstance('Parser', $this, $settings); + $this->_Parser = \Saito\Plugin::getParserClassInstance('Parser', $this, $settings); } return $this->_Parser; } diff --git a/app/View/Helper/UserHHelper.php b/app/View/Helper/UserHHelper.php index 3cfdfd06d..1f4d63c19 100755 --- a/app/View/Helper/UserHHelper.php +++ b/app/View/Helper/UserHHelper.php @@ -1,6 +1,7 @@
    • - Html->link(__('Overview'), - array( 'controller' => 'admins', 'action' => 'index', 'admin' => true )); - ?> + Html->link(__('Overview'), '/admin/') ?>
    • Html->link(__('Settings'), '/admin/settings/index'); ?> @@ -85,6 +82,34 @@
    • Html->link(__('Logs'), '/admin/admins/logs'); ?>
      • + + dispatch( + 'Request.Saito.View.Admin.plugins' + ); + if ($items) { ?> +
    • + Html->link( + __('Plugins') . ' ▾', + '/admin/plugins', + ['class' => 'drowdown-toggle', 'data-toggle' => 'dropdown'] + ); + foreach ($items as $item) { + $plugins[] = $this->Html->link( + $item['title'], + $item['url'], + $jqueryVsBootstrapFix + ); + } + echo $this->Html->nestedList( + $plugins, + ['class' => 'dropdown-menu'] + ); + } + ?> +
    • @@ -100,8 +125,11 @@
       
      - Html->getCrumbs(' > '); ?> - fetch('content'); ?> + element('flash/render'); + echo $this->Html->getCrumbs(' > '); + echo $this->fetch('content'); + ?>
       
      diff --git a/app/View/Users/edit.ctp b/app/View/Users/edit.ctp index 889c1e981..49aa90f6e 100644 --- a/app/View/Users/edit.ctp +++ b/app/View/Users/edit.ctp @@ -193,19 +193,18 @@ - Form->input( + Form->input( 'user_forum_refresh_time', - array( + [ 'maxLength' => 3, 'label' => false, - 'style' => 'width: 3em;', 'min' => 0, 'max' => 999, - ) - ); ?> -

      - -

      + ] + ); + echo $this->Html->para('exp', __('user_forum_refresh_time_exp')) + ?> diff --git a/app/View/Users/view.ctp b/app/View/Users/view.ctp index 02304cef8..ba0b2aa2e 100644 --- a/app/View/Users/view.ctp +++ b/app/View/Users/view.ctp @@ -248,8 +248,7 @@
      • - EntryH->renderThread($entry, $CurrentUser, - ['ignore' => false]) ?> + EntryH->renderThread($entry, ['ignore' => false]) ?>
      diff --git a/app/composer.json b/app/composer.json index bcbf8fae2..3c64e2a33 100644 --- a/app/composer.json +++ b/app/composer.json @@ -30,9 +30,10 @@ "php": ">=5.4.0", "ext-mcrypt": "*", "markstory/geshi": "0.3.*", - "pear-pear.cakephp.org/CakePHP": "2.5.5", + "pear-pear.cakephp.org/CakePHP": "2.6.0-RC1", "kzykhys/ciconia": "~1.0.3", - "jbbcode/jbbcode": "~1.3" + "jbbcode/jbbcode": "~1.3", + "aura/di": "~2.1" }, "require-dev": { "phpmd/phpmd": "@stable", diff --git a/app/composer.lock b/app/composer.lock index b5c14bcd0..7f8f60261 100644 --- a/app/composer.lock +++ b/app/composer.lock @@ -4,8 +4,60 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "7cbaf19756558c8153e0145d7e089668", + "hash": "0b63fdd3405fb43c4c4f6e7ca52beeed", "packages": [ + { + "name": "aura/di", + "version": "2.1.0", + "source": { + "type": "git", + "url": "https://github.com/auraphp/Aura.Di.git", + "reference": "68ffa4f76a2525ce3b7d211c09c71709a882556c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/auraphp/Aura.Di/zipball/68ffa4f76a2525ce3b7d211c09c71709a882556c", + "reference": "68ffa4f76a2525ce3b7d211c09c71709a882556c", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "aura": { + "type": "library" + }, + "branch-alias": { + "dev-develop-2": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Aura\\Di\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Aura.Di Contributors", + "homepage": "https://github.com/auraphp/Aura.Di/contributors" + } + ], + "description": "Provides a dependency injection container system with native support for constructor- and setter-based injection, lazy-loading of services, and inheritable configuration of setters and constructor params.", + "homepage": "https://github.com/auraphp/Aura.Di", + "keywords": [ + "container", + "dependency injection", + "dependency injection container", + "di", + "di container" + ], + "time": "2014-11-06 18:13:34" + }, { "name": "composer/installers", "version": "v1.0.18", @@ -239,10 +291,10 @@ }, { "name": "pear-pear.cakephp.org/CakePHP", - "version": "2.5.5", + "version": "2.6.0RC1", "dist": { "type": "file", - "url": "http://pear.cakephp.org/get/CakePHP-2.5.5.tgz", + "url": "http://pear.cakephp.org/get/CakePHP-2.6.0RC1.tgz", "reference": null, "shasum": null }, @@ -250,7 +302,7 @@ "php": ">=5.2.8.0" }, "replace": { - "pear-cakephp/cakephp": "== 2.5.5.0" + "pear-cakephp/cakephp": "== 2.6.0.0-RC1" }, "type": "pear-library", "autoload": { @@ -1015,6 +1067,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { + "pear-pear.cakephp.org/cakephp": 5, "phpmd/phpmd": 0 }, "prefer-stable": false, diff --git a/app/webroot/dist/leaflet/leaflet.css b/app/webroot/dist/leaflet/leaflet.css index ac0cd174d..123255025 100644 --- a/app/webroot/dist/leaflet/leaflet.css +++ b/app/webroot/dist/leaflet/leaflet.css @@ -1,478 +1,478 @@ -/* required styles */ - -.leaflet-map-pane, -.leaflet-tile, -.leaflet-marker-icon, -.leaflet-marker-shadow, -.leaflet-tile-pane, -.leaflet-tile-container, -.leaflet-overlay-pane, -.leaflet-shadow-pane, -.leaflet-marker-pane, -.leaflet-popup-pane, -.leaflet-overlay-pane svg, -.leaflet-zoom-box, -.leaflet-image-layer, -.leaflet-layer { - position: absolute; - left: 0; - top: 0; - } -.leaflet-container { - overflow: hidden; - -ms-touch-action: none; - } -.leaflet-tile, -.leaflet-marker-icon, -.leaflet-marker-shadow { - -webkit-user-select: none; - -moz-user-select: none; - user-select: none; - -webkit-user-drag: none; - } -.leaflet-marker-icon, -.leaflet-marker-shadow { - display: block; - } -/* map is broken in FF if you have max-width: 100% on tiles */ -.leaflet-container img { - max-width: none !important; - } -/* stupid Android 2 doesn't understand "max-width: none" properly */ -.leaflet-container img.leaflet-image-layer { - max-width: 15000px !important; - } -.leaflet-tile { - filter: inherit; - visibility: hidden; - } -.leaflet-tile-loaded { - visibility: inherit; - } -.leaflet-zoom-box { - width: 0; - height: 0; - } -/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */ -.leaflet-overlay-pane svg { - -moz-user-select: none; - } - -.leaflet-tile-pane { z-index: 2; } -.leaflet-objects-pane { z-index: 3; } -.leaflet-overlay-pane { z-index: 4; } -.leaflet-shadow-pane { z-index: 5; } -.leaflet-marker-pane { z-index: 6; } -.leaflet-popup-pane { z-index: 7; } - -.leaflet-vml-shape { - width: 1px; - height: 1px; - } -.lvml { - behavior: url(#default#VML); - display: inline-block; - position: absolute; - } - - -/* control positioning */ - -.leaflet-control { - position: relative; - z-index: 7; - pointer-events: auto; - } -.leaflet-top, -.leaflet-bottom { - position: absolute; - z-index: 1000; - pointer-events: none; - } -.leaflet-top { - top: 0; - } -.leaflet-right { - right: 0; - } -.leaflet-bottom { - bottom: 0; - } -.leaflet-left { - left: 0; - } -.leaflet-control { - float: left; - clear: both; - } -.leaflet-right .leaflet-control { - float: right; - } -.leaflet-top .leaflet-control { - margin-top: 10px; - } -.leaflet-bottom .leaflet-control { - margin-bottom: 10px; - } -.leaflet-left .leaflet-control { - margin-left: 10px; - } -.leaflet-right .leaflet-control { - margin-right: 10px; - } - - -/* zoom and fade animations */ - -.leaflet-fade-anim .leaflet-tile, -.leaflet-fade-anim .leaflet-popup { - opacity: 0; - -webkit-transition: opacity 0.2s linear; - -moz-transition: opacity 0.2s linear; - -o-transition: opacity 0.2s linear; - transition: opacity 0.2s linear; - } -.leaflet-fade-anim .leaflet-tile-loaded, -.leaflet-fade-anim .leaflet-map-pane .leaflet-popup { - opacity: 1; - } - -.leaflet-zoom-anim .leaflet-zoom-animated { - -webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1); - -moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1); - -o-transition: -o-transform 0.25s cubic-bezier(0,0,0.25,1); - transition: transform 0.25s cubic-bezier(0,0,0.25,1); - } -.leaflet-zoom-anim .leaflet-tile, -.leaflet-pan-anim .leaflet-tile, -.leaflet-touching .leaflet-zoom-animated { - -webkit-transition: none; - -moz-transition: none; - -o-transition: none; - transition: none; - } - -.leaflet-zoom-anim .leaflet-zoom-hide { - visibility: hidden; - } - - -/* cursors */ - -.leaflet-clickable { - cursor: pointer; - } -.leaflet-container { - cursor: -webkit-grab; - cursor: -moz-grab; - } -.leaflet-popup-pane, -.leaflet-control { - cursor: auto; - } -.leaflet-dragging .leaflet-container, -.leaflet-dragging .leaflet-clickable { - cursor: move; - cursor: -webkit-grabbing; - cursor: -moz-grabbing; - } - - -/* visual tweaks */ - -.leaflet-container { - background: #ddd; - outline: 0; - } -.leaflet-container a { - color: #0078A8; - } -.leaflet-container a.leaflet-active { - outline: 2px solid orange; - } -.leaflet-zoom-box { - border: 2px dotted #38f; - background: rgba(255,255,255,0.5); - } - - -/* general typography */ -.leaflet-container { - font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif; - } - - -/* general toolbar styles */ - -.leaflet-bar { - box-shadow: 0 1px 5px rgba(0,0,0,0.65); - border-radius: 4px; - } -.leaflet-bar a, -.leaflet-bar a:hover { - background-color: #fff; - border-bottom: 1px solid #ccc; - width: 26px; - height: 26px; - line-height: 26px; - display: block; - text-align: center; - text-decoration: none; - color: black; - } -.leaflet-bar a, -.leaflet-control-layers-toggle { - background-position: 50% 50%; - background-repeat: no-repeat; - display: block; - } -.leaflet-bar a:hover { - background-color: #f4f4f4; - } -.leaflet-bar a:first-child { - border-top-left-radius: 4px; - border-top-right-radius: 4px; - } -.leaflet-bar a:last-child { - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; - border-bottom: none; - } -.leaflet-bar a.leaflet-disabled { - cursor: default; - background-color: #f4f4f4; - color: #bbb; - } - -.leaflet-touch .leaflet-bar a { - width: 30px; - height: 30px; - line-height: 30px; - } - - -/* zoom control */ - -.leaflet-control-zoom-in, -.leaflet-control-zoom-out { - font: bold 18px 'Lucida Console', Monaco, monospace; - text-indent: 1px; - } -.leaflet-control-zoom-out { - font-size: 20px; - } - -.leaflet-touch .leaflet-control-zoom-in { - font-size: 22px; - } -.leaflet-touch .leaflet-control-zoom-out { - font-size: 24px; - } - - -/* layers control */ - -.leaflet-control-layers { - box-shadow: 0 1px 5px rgba(0,0,0,0.4); - background: #fff; - border-radius: 5px; - } -.leaflet-control-layers-toggle { - background-image: url(images/layers.png); - width: 36px; - height: 36px; - } -.leaflet-retina .leaflet-control-layers-toggle { - background-image: url(images/layers-2x.png); - background-size: 26px 26px; - } -.leaflet-touch .leaflet-control-layers-toggle { - width: 44px; - height: 44px; - } -.leaflet-control-layers .leaflet-control-layers-list, -.leaflet-control-layers-expanded .leaflet-control-layers-toggle { - display: none; - } -.leaflet-control-layers-expanded .leaflet-control-layers-list { - display: block; - position: relative; - } -.leaflet-control-layers-expanded { - padding: 6px 10px 6px 6px; - color: #333; - background: #fff; - } -.leaflet-control-layers-selector { - margin-top: 2px; - position: relative; - top: 1px; - } -.leaflet-control-layers label { - display: block; - } -.leaflet-control-layers-separator { - height: 0; - border-top: 1px solid #ddd; - margin: 5px -10px 5px -6px; - } - - -/* attribution and scale controls */ - -.leaflet-container .leaflet-control-attribution { - background: #fff; - background: rgba(255, 255, 255, 0.7); - margin: 0; - } -.leaflet-control-attribution, -.leaflet-control-scale-line { - padding: 0 5px; - color: #333; - } -.leaflet-control-attribution a { - text-decoration: none; - } -.leaflet-control-attribution a:hover { - text-decoration: underline; - } -.leaflet-container .leaflet-control-attribution, -.leaflet-container .leaflet-control-scale { - font-size: 11px; - } -.leaflet-left .leaflet-control-scale { - margin-left: 5px; - } -.leaflet-bottom .leaflet-control-scale { - margin-bottom: 5px; - } -.leaflet-control-scale-line { - border: 2px solid #777; - border-top: none; - line-height: 1.1; - padding: 2px 5px 1px; - font-size: 11px; - white-space: nowrap; - overflow: hidden; - -moz-box-sizing: content-box; - box-sizing: content-box; - - background: #fff; - background: rgba(255, 255, 255, 0.5); - } -.leaflet-control-scale-line:not(:first-child) { - border-top: 2px solid #777; - border-bottom: none; - margin-top: -2px; - } -.leaflet-control-scale-line:not(:first-child):not(:last-child) { - border-bottom: 2px solid #777; - } - -.leaflet-touch .leaflet-control-attribution, -.leaflet-touch .leaflet-control-layers, -.leaflet-touch .leaflet-bar { - box-shadow: none; - } -.leaflet-touch .leaflet-control-layers, -.leaflet-touch .leaflet-bar { - border: 2px solid rgba(0,0,0,0.2); - background-clip: padding-box; - } - - -/* popup */ - -.leaflet-popup { - position: absolute; - text-align: center; - } -.leaflet-popup-content-wrapper { - padding: 1px; - text-align: left; - border-radius: 12px; - } -.leaflet-popup-content { - margin: 13px 19px; - line-height: 1.4; - } -.leaflet-popup-content p { - margin: 18px 0; - } -.leaflet-popup-tip-container { - margin: 0 auto; - width: 40px; - height: 20px; - position: relative; - overflow: hidden; - } -.leaflet-popup-tip { - width: 17px; - height: 17px; - padding: 1px; - - margin: -10px auto 0; - - -webkit-transform: rotate(45deg); - -moz-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); - } -.leaflet-popup-content-wrapper, -.leaflet-popup-tip { - background: white; - - box-shadow: 0 3px 14px rgba(0,0,0,0.4); - } -.leaflet-container a.leaflet-popup-close-button { - position: absolute; - top: 0; - right: 0; - padding: 4px 4px 0 0; - text-align: center; - width: 18px; - height: 14px; - font: 16px/14px Tahoma, Verdana, sans-serif; - color: #c3c3c3; - text-decoration: none; - font-weight: bold; - background: transparent; - } -.leaflet-container a.leaflet-popup-close-button:hover { - color: #999; - } -.leaflet-popup-scrolled { - overflow: auto; - border-bottom: 1px solid #ddd; - border-top: 1px solid #ddd; - } - -.leaflet-oldie .leaflet-popup-content-wrapper { - zoom: 1; - } -.leaflet-oldie .leaflet-popup-tip { - width: 24px; - margin: 0 auto; - - -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)"; - filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678); - } -.leaflet-oldie .leaflet-popup-tip-container { - margin-top: -1px; - } - -.leaflet-oldie .leaflet-control-zoom, -.leaflet-oldie .leaflet-control-layers, -.leaflet-oldie .leaflet-popup-content-wrapper, -.leaflet-oldie .leaflet-popup-tip { - border: 1px solid #999; - } - - -/* div icon */ - -.leaflet-div-icon { - background: #fff; - border: 1px solid #666; - } +/* required styles */ + +.leaflet-map-pane, +.leaflet-tile, +.leaflet-marker-icon, +.leaflet-marker-shadow, +.leaflet-tile-pane, +.leaflet-tile-container, +.leaflet-overlay-pane, +.leaflet-shadow-pane, +.leaflet-marker-pane, +.leaflet-popup-pane, +.leaflet-overlay-pane svg, +.leaflet-zoom-box, +.leaflet-image-layer, +.leaflet-layer { + position: absolute; + left: 0; + top: 0; + } +.leaflet-container { + overflow: hidden; + -ms-touch-action: none; + } +.leaflet-tile, +.leaflet-marker-icon, +.leaflet-marker-shadow { + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; + -webkit-user-drag: none; + } +.leaflet-marker-icon, +.leaflet-marker-shadow { + display: block; + } +/* map is broken in FF if you have max-width: 100% on tiles */ +.leaflet-container img { + max-width: none !important; + } +/* stupid Android 2 doesn't understand "max-width: none" properly */ +.leaflet-container img.leaflet-image-layer { + max-width: 15000px !important; + } +.leaflet-tile { + filter: inherit; + visibility: hidden; + } +.leaflet-tile-loaded { + visibility: inherit; + } +.leaflet-zoom-box { + width: 0; + height: 0; + } +/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */ +.leaflet-overlay-pane svg { + -moz-user-select: none; + } + +.leaflet-tile-pane { z-index: 2; } +.leaflet-objects-pane { z-index: 3; } +.leaflet-overlay-pane { z-index: 4; } +.leaflet-shadow-pane { z-index: 5; } +.leaflet-marker-pane { z-index: 6; } +.leaflet-popup-pane { z-index: 7; } + +.leaflet-vml-shape { + width: 1px; + height: 1px; + } +.lvml { + behavior: url(#default#VML); + display: inline-block; + position: absolute; + } + + +/* control positioning */ + +.leaflet-control { + position: relative; + z-index: 7; + pointer-events: auto; + } +.leaflet-top, +.leaflet-bottom { + position: absolute; + z-index: 1000; + pointer-events: none; + } +.leaflet-top { + top: 0; + } +.leaflet-right { + right: 0; + } +.leaflet-bottom { + bottom: 0; + } +.leaflet-left { + left: 0; + } +.leaflet-control { + float: left; + clear: both; + } +.leaflet-right .leaflet-control { + float: right; + } +.leaflet-top .leaflet-control { + margin-top: 10px; + } +.leaflet-bottom .leaflet-control { + margin-bottom: 10px; + } +.leaflet-left .leaflet-control { + margin-left: 10px; + } +.leaflet-right .leaflet-control { + margin-right: 10px; + } + + +/* zoom and fade animations */ + +.leaflet-fade-anim .leaflet-tile, +.leaflet-fade-anim .leaflet-popup { + opacity: 0; + -webkit-transition: opacity 0.2s linear; + -moz-transition: opacity 0.2s linear; + -o-transition: opacity 0.2s linear; + transition: opacity 0.2s linear; + } +.leaflet-fade-anim .leaflet-tile-loaded, +.leaflet-fade-anim .leaflet-map-pane .leaflet-popup { + opacity: 1; + } + +.leaflet-zoom-anim .leaflet-zoom-animated { + -webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1); + -moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1); + -o-transition: -o-transform 0.25s cubic-bezier(0,0,0.25,1); + transition: transform 0.25s cubic-bezier(0,0,0.25,1); + } +.leaflet-zoom-anim .leaflet-tile, +.leaflet-pan-anim .leaflet-tile, +.leaflet-touching .leaflet-zoom-animated { + -webkit-transition: none; + -moz-transition: none; + -o-transition: none; + transition: none; + } + +.leaflet-zoom-anim .leaflet-zoom-hide { + visibility: hidden; + } + + +/* cursors */ + +.leaflet-clickable { + cursor: pointer; + } +.leaflet-container { + cursor: -webkit-grab; + cursor: -moz-grab; + } +.leaflet-popup-pane, +.leaflet-control { + cursor: auto; + } +.leaflet-dragging .leaflet-container, +.leaflet-dragging .leaflet-clickable { + cursor: move; + cursor: -webkit-grabbing; + cursor: -moz-grabbing; + } + + +/* visual tweaks */ + +.leaflet-container { + background: #ddd; + outline: 0; + } +.leaflet-container a { + color: #0078A8; + } +.leaflet-container a.leaflet-active { + outline: 2px solid orange; + } +.leaflet-zoom-box { + border: 2px dotted #38f; + background: rgba(255,255,255,0.5); + } + + +/* general typography */ +.leaflet-container { + font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif; + } + + +/* general toolbar styles */ + +.leaflet-bar { + box-shadow: 0 1px 5px rgba(0,0,0,0.65); + border-radius: 4px; + } +.leaflet-bar a, +.leaflet-bar a:hover { + background-color: #fff; + border-bottom: 1px solid #ccc; + width: 26px; + height: 26px; + line-height: 26px; + display: block; + text-align: center; + text-decoration: none; + color: black; + } +.leaflet-bar a, +.leaflet-control-layers-toggle { + background-position: 50% 50%; + background-repeat: no-repeat; + display: block; + } +.leaflet-bar a:hover { + background-color: #f4f4f4; + } +.leaflet-bar a:first-child { + border-top-left-radius: 4px; + border-top-right-radius: 4px; + } +.leaflet-bar a:last-child { + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; + border-bottom: none; + } +.leaflet-bar a.leaflet-disabled { + cursor: default; + background-color: #f4f4f4; + color: #bbb; + } + +.leaflet-touch .leaflet-bar a { + width: 30px; + height: 30px; + line-height: 30px; + } + + +/* zoom control */ + +.leaflet-control-zoom-in, +.leaflet-control-zoom-out { + font: bold 18px 'Lucida Console', Monaco, monospace; + text-indent: 1px; + } +.leaflet-control-zoom-out { + font-size: 20px; + } + +.leaflet-touch .leaflet-control-zoom-in { + font-size: 22px; + } +.leaflet-touch .leaflet-control-zoom-out { + font-size: 24px; + } + + +/* layers control */ + +.leaflet-control-layers { + box-shadow: 0 1px 5px rgba(0,0,0,0.4); + background: #fff; + border-radius: 5px; + } +.leaflet-control-layers-toggle { + background-image: url(images/layers.png); + width: 36px; + height: 36px; + } +.leaflet-retina .leaflet-control-layers-toggle { + background-image: url(images/layers-2x.png); + background-size: 26px 26px; + } +.leaflet-touch .leaflet-control-layers-toggle { + width: 44px; + height: 44px; + } +.leaflet-control-layers .leaflet-control-layers-list, +.leaflet-control-layers-expanded .leaflet-control-layers-toggle { + display: none; + } +.leaflet-control-layers-expanded .leaflet-control-layers-list { + display: block; + position: relative; + } +.leaflet-control-layers-expanded { + padding: 6px 10px 6px 6px; + color: #333; + background: #fff; + } +.leaflet-control-layers-selector { + margin-top: 2px; + position: relative; + top: 1px; + } +.leaflet-control-layers label { + display: block; + } +.leaflet-control-layers-separator { + height: 0; + border-top: 1px solid #ddd; + margin: 5px -10px 5px -6px; + } + + +/* attribution and scale controls */ + +.leaflet-container .leaflet-control-attribution { + background: #fff; + background: rgba(255, 255, 255, 0.7); + margin: 0; + } +.leaflet-control-attribution, +.leaflet-control-scale-line { + padding: 0 5px; + color: #333; + } +.leaflet-control-attribution a { + text-decoration: none; + } +.leaflet-control-attribution a:hover { + text-decoration: underline; + } +.leaflet-container .leaflet-control-attribution, +.leaflet-container .leaflet-control-scale { + font-size: 11px; + } +.leaflet-left .leaflet-control-scale { + margin-left: 5px; + } +.leaflet-bottom .leaflet-control-scale { + margin-bottom: 5px; + } +.leaflet-control-scale-line { + border: 2px solid #777; + border-top: none; + line-height: 1.1; + padding: 2px 5px 1px; + font-size: 11px; + white-space: nowrap; + overflow: hidden; + -moz-box-sizing: content-box; + box-sizing: content-box; + + background: #fff; + background: rgba(255, 255, 255, 0.5); + } +.leaflet-control-scale-line:not(:first-child) { + border-top: 2px solid #777; + border-bottom: none; + margin-top: -2px; + } +.leaflet-control-scale-line:not(:first-child):not(:last-child) { + border-bottom: 2px solid #777; + } + +.leaflet-touch .leaflet-control-attribution, +.leaflet-touch .leaflet-control-layers, +.leaflet-touch .leaflet-bar { + box-shadow: none; + } +.leaflet-touch .leaflet-control-layers, +.leaflet-touch .leaflet-bar { + border: 2px solid rgba(0,0,0,0.2); + background-clip: padding-box; + } + + +/* popup */ + +.leaflet-popup { + position: absolute; + text-align: center; + } +.leaflet-popup-content-wrapper { + padding: 1px; + text-align: left; + border-radius: 12px; + } +.leaflet-popup-content { + margin: 13px 19px; + line-height: 1.4; + } +.leaflet-popup-content p { + margin: 18px 0; + } +.leaflet-popup-tip-container { + margin: 0 auto; + width: 40px; + height: 20px; + position: relative; + overflow: hidden; + } +.leaflet-popup-tip { + width: 17px; + height: 17px; + padding: 1px; + + margin: -10px auto 0; + + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); + } +.leaflet-popup-content-wrapper, +.leaflet-popup-tip { + background: white; + + box-shadow: 0 3px 14px rgba(0,0,0,0.4); + } +.leaflet-container a.leaflet-popup-close-button { + position: absolute; + top: 0; + right: 0; + padding: 4px 4px 0 0; + text-align: center; + width: 18px; + height: 14px; + font: 16px/14px Tahoma, Verdana, sans-serif; + color: #c3c3c3; + text-decoration: none; + font-weight: bold; + background: transparent; + } +.leaflet-container a.leaflet-popup-close-button:hover { + color: #999; + } +.leaflet-popup-scrolled { + overflow: auto; + border-bottom: 1px solid #ddd; + border-top: 1px solid #ddd; + } + +.leaflet-oldie .leaflet-popup-content-wrapper { + zoom: 1; + } +.leaflet-oldie .leaflet-popup-tip { + width: 24px; + margin: 0 auto; + + -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)"; + filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678); + } +.leaflet-oldie .leaflet-popup-tip-container { + margin-top: -1px; + } + +.leaflet-oldie .leaflet-control-zoom, +.leaflet-oldie .leaflet-control-layers, +.leaflet-oldie .leaflet-popup-content-wrapper, +.leaflet-oldie .leaflet-popup-tip { + border: 1px solid #999; + } + + +/* div icon */ + +.leaflet-div-icon { + background: #fff; + border: 1px solid #666; + } diff --git a/app/webroot/dist/main.min.js b/app/webroot/dist/main.min.js index 7a2c5180a..bbf19e0d5 100644 --- a/app/webroot/dist/main.min.js +++ b/app/webroot/dist/main.min.js @@ -1,3 +1,3 @@ -"undefined"==typeof console&&(console={},console.log=function(){},console.error=console.debug=console.info=console.log),window.redirect=function(e){document.location.replace(e)},$.ajaxSetup({cache:!1}),define("jquery",[],function(){return jQuery}),define("lib/bootstrapHelper",function(){}),define("app/core",["marionette"],function(e){return new e.Application}),define("app/vent",["marionette"],function(){var e=function(){this.vent=new Backbone.Wreqr.EventAggregator,this.commands=new Backbone.Wreqr.Commands,this.reqres=new Backbone.Wreqr.RequestResponse,this.request=function(){var e=Array.prototype.slice.apply(arguments);return this.reqres.request.apply(this.reqres,e)}};return new e}),define("models/appSetting",["underscore","backbone"],function(e,t){var i=t.Model.extend({});return i}),define("models/appStatus",["underscore","backbone","cakeRest","app/vent"],function(e,t,i,n){var o=t.Model.extend({stream:null,initialize:function(t,i){this.settings=i.settings,this.methodToCakePhpUrl=e.clone(this.methodToCakePhpUrl),this.methodToCakePhpUrl.read="status/",this.listenTo(this,"change:lastShoutId",this._onNewShout)},start:function(){this._setWebroot(this.settings.get("webroot")),this._poll()},_onNewShout:function(e){var t=e.get("lastShoutId");n.commands.execute("shoutbox:update",t)},_setWebroot:function(e){this.webroot=e+"status/"},_eventStream:function(){this.stream=new EventSource(this.webroot+this.methodToCakePhpUrl.read),this.stream.addEventListener("message",e.bind(function(e){var t=JSON.parse(e.data);this.set(t)},this),!1)},_poll:function(){var t,i,n,o,s,a,r=1e4,l=9e4;s=function(){void 0!==o&&clearTimeout(o)},t=function(){s(),a=r},n=function(){o=setTimeout(i,a)},i=e.bind(function(){n(),this.fetch({success:function(){a=Math.floor(a*(1+a/4e4)),a>l&&(a=l)},error:s})},this),this.listenTo(this,"change",function(){t(),n()}),i(),t(),n()}});return e.extend(o.prototype,i),o}),define("models/currentUser",["underscore","backbone"],function(e,t){var i=t.Model.extend({isLoggedIn:function(){return this.get("id")>0}});return i}),define("models/app",["underscore","backbone","app/vent","models/appSetting","models/appStatus","models/currentUser"],function(e,t,i,n,o,s){var a=t.Model.extend({eventBus:null,settings:null,status:null,currentUser:null,request:null,initialize:function(){this.eventBus=i.vent,this.commands=i.commands,this.reqres=i.reqres,this.settings=new n,this.status=new o({},{settings:this.settings}),this.currentUser=new s}});return new a}),define("modules/html5-notification/views/notification",["underscore","backbone","models/app"],function(e,t,i){var n=t.View.extend({_hideAfter:10,_iconUrl:!1,initialize:function(e){this._iconUrl=e.iconUrl,this.listenTo(i.eventBus,"html5-notification",this.notification),i.commands.setHandler("app:html5-notification:activate",this._activate,this),i.reqres.setHandler("app:html5-notification:available",this._isEnabled,this)},notification:function(t){var n=!i.reqres.request("isAppVisible");if(t=e.defaults(t,{icon:this._iconUrl,always:!1}),t.always||n){var o=new window.Notification(t.title,{icon:t.icon,body:t.message}),s=navigator.userAgent.toLowerCase().indexOf("chrome")>-1;s&&setTimeout(function(){o.close()},1e3*this._hideAfter)}},_activate:function(){return"permission"in window.Notification&&"granted"!==window.Notification.permission?void window.Notification.requestPermission():void window.Notification.requestPermission()},_isEnabled:function(){return"Notification"in window?!0:!1}});return n}),define("modules/html5-notification/html5-notification",["app/core","marionette","modules/html5-notification/views/notification"],function(e,t,i){var n=e.module("html5-notification");return n.addInitializer(function(e){new i({iconUrl:e.SaitoApp.app.settings.notificationIcon})}),n}),define("modules/shoutbox/models/shout",["underscore","backbone"],function(e,t){var i=t.Model.extend({initialize:function(e,t){this.urlRoot=t.urlRoot}});return i}),define("modules/shoutbox/collections/shouts",["underscore","backbone","modules/shoutbox/models/shout"],function(e,t,i){var n=t.Collection.extend({model:i,initialize:function(e,t){this.apiroot=t.apiroot+"shouts/"},fetch:function(){$.ajax({url:this.apiroot,dataType:"json",context:this}).done(function(e){e.length>0&&this.reset(e)})}});return n}),define("templateHelpers",["jquery","underscore","app/vent","moment"],function(e,t,i,n){var o=function(){this.webroot=i.reqres.request("webroot")};return{Time:t.extend(new o,{moment:n,_timeFormats:{"long":"DD.MM.YYYY",longWithTime:"DD.MM.YYYY HH:mm",RFC3339:"YYYY-MM-DDTHH:mm:ssZ",theRightWay:"YYYY-MM-DD HH:mm:ss",time:"HH:mm"},lastMidnight:function(){return n(this.now().format("YYYY-MM-DD"))},now:function(){return n()},_normal:function(t){var i=this.now(),n=this.lastMidnight(),o=i.diff(t)/1e3;return t.isAfter(n)||21600>o?t.format(this._timeFormats.time):64800>o?e.i18n.__("yesterday")+" "+t.format(this._timeFormats.time):t.format(this._timeFormats.long)},format:function(e,i,o){var s,a;if(i=i||"normal",o=o||{},t.defaults(o,{wrap:!0}),n.isMoment(e))a=e;else if(t.isNumber(e))(""+e).length<13&&(e=Math.round(1e3*e)),a=new n(e);else{if(!t.isDate(e))throw"No valid timestamp: "+e.toJSON();a=new n(e)}if(s="normal"===i?this._normal(a):a.format(this._timeFormats[i]?this._timeFormats[i]:i),o.wrap){var r=" ",l={title:a.format(this._timeFormats.theRightWay),datetime:a.format(this._timeFormats.RFC3339)};t.each(l,function(e,t){r+=t+'="'+e+'" '}),s=""+s+""}return s}}),User:t.extend(new o,{templates:{linkToUserProfile:t.template('<%- name %>')},linkToUserProfile:function(e,t){var i=this.urlToUserProfile(e);return this.templates.linkToUserProfile({url:i,name:t})},urlToUserProfile:function(e){return this.webroot+"users/view/"+e}})}}),define("lib/saito/localStorageHelper",["underscore","app/vent"],function(e,t){var i=function(){};e.extend(i.prototype,{_available:null,_prefix:"saito-",available:function(){return null===this._available&&(this._available=this._isAvailable()),this._available},_clear:function(){if(this.available()){var t=Object.keys(localStorage);e.each(t,function(e){0===e.indexOf(this._prefix)&&localStorage.removeItem(e)},this)}},_key:function(e){return this._prefix+e},_isAvailable:function(){if(!("localStorage"in window))return!1;try{var e="localStorageAvailableTestKey",t=window.localStorage;return t.setItem(e,"1"),t.removeItem(e),!0}catch(i){return!1}return!1}});var n=new i;t.reqres.setHandler("app:localStorage:available",n.available,n),t.reqres.setHandler("app:localStorage:key",n._key,n),t.commands.setHandler("app:localStorage:clear",n._clear,n)}),define("modules/shoutbox/models/control",["underscore","backbone","models/app","lib/saito/localStorageHelper"],function(e,t,i){var n=t.Model.extend({defaults:{id:1,lastId:0,mar:0,notify:!1},localStorage:function(){var e=i.reqres.request("app:localStorage:key","shoutbox-control");return new t.LocalStorage(e)}(),initialize:function(){this._restore(["notify","mar"]),this.listenTo(this,"change:notify",this._onChangeNotify),i.commands.setHandler("shoutbox:mar",this._mar,this)},_mar:function(t){t=t||{},e.defaults(t,{silent:!1}),this.set({mar:this.get("lastId")},{silent:t.silent}),this._save("mar")},setLastId:function(e){e<=this.get("lastId")||this.set("lastId",e)},_onChangeNotify:function(){this._save("notify")},_onChangeMar:function(){this._save("mar")},_restore:function(t){e.isArray(t)&&e.each(t,function(e){this._restore(e)},this),i.reqres.request("app:localStorage:available")&&this.fetch()},_save:function(){i.reqres.request("app:localStorage:available")&&this.save()}});return new n}),define("text!modules/shoutbox/templates/shout.html",[],function(){return'\n <%= User.linkToUserProfile(user_id, user_name) %>:\n\n<%= html %>\n'}),define("modules/shoutbox/views/shout",["jquery","underscore","backbone","marionette","models/app","modules/shoutbox/models/control","templateHelpers","text!modules/shoutbox/templates/shout.html"],function(e,t,i,n,o,s,a,r){var l=n.ItemView.extend({className:"shout",templateHelpers:a,initialize:function(e){this.webroot=e.webroot,this.listenTo(s,"change:mar",this.render)},serializeData:function(){var e=this.model.toJSON(),t=this.model.get("id")>s.get("mar"),i=this.model.get("user_id")===o.currentUser.get("id");return i&&this.$el.addClass("shoutbox-shout-cu"),this.$el.addClass(t&&!i?"shoutbox-shout-new":"shoutbox-shout-old"),e},onRender:function(){s.setLastId(this.model.get("id"))},template:function(e){return t.template(r,e)}});return l}),define("modules/shoutbox/views/shouts",["jquery","underscore","backbone","marionette","models/app","templateHelpers","modules/shoutbox/views/shout","modules/shoutbox/models/control"],function(e,t,i,n,o,s,a,r){var l=n.CollectionView.extend({itemView:a,itemViewOptions:{},_Notifications:{_last:0,_models:[],_isEnabled:!1,init:function(e){this._currentUserId=e.currentUserId,this._isEnabled=e.isEnabled,this._last=e.last},add:function(e){this._isEnabled===!0&&this._currentUserId!==e.get("user_id")&&(e.get("id")<=this._last||this._models.push(e))},send:function(){0!==this._models.length&&(t.each(this._models,function(e){o.eventBus.trigger("html5-notification",{title:e.get("user_name"),message:e.get("text")})}),this._last=t.first(this._models).get("id"),this._models=[])}},_Delimiter:{_conversationCoolOff:300,_previousItemTime:null,tpl:t.template('
      <%= time %>
      '),append:function(e){var t=s.Time.moment(e.model.get("time"));return null===this._previousItemTime?void(this._previousItemTime=t):(this._itemTime=t,this.$el=e.$el,this._prepend(this._previousItemTime.unix()-t.unix()>this._conversationCoolOff?this._previousItemTime:"
      "),void(this._previousItemTime=t))},finish:function(){this._previousItemTime=null,this._itemTime&&this.$el.after(this._formatTime(this._itemTime))},_prepend:function(e){this.$el.before(this._formatTime(e))},_formatTime:function(e){var i=e;if(t.isObject(e)){var n=s.Time.moment().utc().diff(e)/1e3,o="normal";n>64800&&(o="longWithTime"),i=this.tpl({time:s.Time.format(e,o)})}return i}},initialize:function(e){this.itemViewOptions.webroot=e.webroot,this.setupNotifications(),this.listenTo(r,"change:notify",this.setupNotifications)},setupNotifications:function(){var e=0;this.collection.size()>0&&(e=this.collection.first().get("id")),this._Notifications.init({currentUserId:o.currentUser.get("id"),isEnabled:r.get("notify"),last:e})},onBeforeRender:function(){this.$el.html("")},onAfterItemAdded:function(e){this._Delimiter.append(e),this._Notifications.add(e.model)},onRender:function(){this._Delimiter.finish(),this._Notifications.send()}});return l}),define("text!modules/shoutbox/templates/add.html",[],function(){return'
      \n \n
      \n'}),define("modules/shoutbox/views/add",["jquery","underscore","backbone","marionette","models/app","modules/shoutbox/models/shout","text!modules/shoutbox/templates/add.html","jqueryAutosize"],function(e,t,i,n,o,s,a){var r=n.ItemView.extend({template:t.template(a),_placeholder:{a:e.i18n.__("Shout :shortcut",{shortcut:"⌃s"}),b:e.i18n.__("Hit enter to mark as read")},events:{"keyup form":"formUp","keydown form":"formDown","blur #shoutbox-input":"_setPlaceholder","focus #shoutbox-input":"_setPlaceholder"},submit:function(){this.model.save({text:this.textarea.val()},{success:t.bind(function(e,t){o.commands.execute("shoutbox:mar",{silent:!0}),this.collection.reset(t)},this)})},_setPlaceholder:function(){t.defer(t.bind(function(){var e;e=this.textarea.is(":focus")?this._placeholder.b:this._placeholder.a,this.textarea.attr("placeholder",e)},this))},_firefoxRowFix:function(){if(-1!==navigator.userAgent.toLowerCase().indexOf("firefox")){var e=parseFloat(this.textarea.css("line-height")),t=1*this.textarea.attr("rows");this.textarea.css("height",t*e)}},serializeData:function(){return{placeholder:this._placeholder.a}},clearForm:function(){this.textarea.val("").trigger("autosize.resize")},formDown:function(e){13===e.keyCode&&e.shiftKey===!1&&(e.preventDefault(),this.textarea.val().length>0?(this.submit(),this.clearForm()):o.commands.execute("shoutbox:mar"))},formUp:function(){this.textarea.val().length>0?o.eventBus.trigger("breakAutoreload"):0===this.textarea.val().length&&o.eventBus.trigger("initAutoreload")},onShow:function(){this.textarea=this.$("#shoutbox-input"),this._firefoxRowFix(),this.textarea.autosize(),this._setPlaceholder(),e(window).keydown(t.bind(function(e){e.ctrlKey===!0&&83===e.which&&this.textarea.focus()},this))}});return r}),define("text!modules/shoutbox/templates/control.html",[],function(){return"\n"}),define("modules/shoutbox/views/control",["jquery","underscore","backbone","marionette","models/app","modules/shoutbox/models/control","text!modules/shoutbox/templates/control.html"],function(e,t,i,n,o,s,a){var r=n.ItemView.extend({template:t.template(a),events:{"click #shoutbox-notify":"onChangeNotify"},initialize:function(){this.model=s},onRender:function(){this._putNotifyCheckbox()},serializeData:function(){return{n:e.i18n.__("Notification")}},_putNotifyCheckbox:function(){var e=o.reqres.request("app:html5-notification:available");e===!0&&(this.notify=this.$("#shoutbox-notify"),this.model.get("notify")?this.notify.attr("checked","checked"):this.notify.removeAttr("checked"),this.$("#shoutbox-notify-label").show())},onChangeNotify:function(){var e=this.notify.is(":checked");this.model.set("notify",e),e&&o.commands.execute("app:html5-notification:activate")}});return r}),define("text!modules/shoutbox/templates/layout.html",[],function(){return"
      \n
      \n
      \n
      \n
      \n"}),define("modules/shoutbox/shoutbox",["jquery","app/app","models/app","marionette","modules/shoutbox/collections/shouts","modules/shoutbox/models/shout","modules/shoutbox/views/shouts","modules/shoutbox/views/add","modules/shoutbox/views/control","text!modules/shoutbox/templates/layout.html"],function(e,t,i,n,o,s,a,r,l,d){var c=t.module("Shoutbox");return c.addInitializer(function(t){var c=t.SaitoApp.shouts,u=i.reqres.request("webroot"),h=i.reqres.request("apiroot");if(e("#shoutbox").length){var p={layout:null,shoutsCollection:null,initialize:function(){this.initLayout(),this.initShoutsCollection(),this.initAdd(),this.initShouts(),this.initControl()},initShoutsCollection:function(){this.shoutsCollection=new o(c,{apiroot:h});var e=_.bind(function(){var e=!i.reqres.request("slidetab:open","shoutbox");e||this.shoutsCollection.fetch()},this);i.eventBus.on("slidetab:open",_.bind(function(t){"shoutbox"===t.slidetab&&e()},this)),i.commands.setHandler("shoutbox:update",_.bind(function(t){var i=0;this.shoutsCollection.size()>0&&(i=this.shoutsCollection.at(0).get("id")),t!==i&&e()},this))},initLayout:function(){var e=n.Layout.extend({el:"#shoutbox",template:d,regions:{add:"#shoutbox-add",shouts:"#shoutbox-shouts",control:"#shoutbox-control"}});this.layout=new e,this.layout.render(),this.layout.$("#shoutbox-add").addClass("slidetab-header"),this.layout.$("#shoutbox-shouts").addClass("slidetab-content"),this.layout.$("#shoutbox-control").addClass("slidetab-footer")},initShouts:function(){var e=new a({collection:this.shoutsCollection,webroot:u});this.layout.shouts.show(e)},initControl:function(){var e=new l;this.layout.control.show(e)},initAdd:function(){var e=new s({},{urlRoot:h+"shouts/"});this.layout.add.show(new r({model:e,collection:this.shoutsCollection}))}};p.initialize()}}),c}),define("models/threadline",["underscore","backbone","models/app","cakeRest"],function(e,t,i,n){var o=t.Model.extend({defaults:{isInlineOpened:!1,shouldScrollOnInlineOpen:!0,isAlwaysShownInline:!1,isNewToUser:!1,posting:"",html:""},initialize:function(){this.webroot=i.settings.get("webroot")+"entries/",this.methodToCakePhpUrl=e.clone(this.methodToCakePhpUrl),this.methodToCakePhpUrl.read="threadLine/",this.set("isAlwaysShownInline",i.currentUser.get("user_show_inline")||!1)}});return e.extend(o.prototype,n),o}),define("collections/threadlines",["underscore","backbone","models/threadline"],function(e,t,i){var n=t.Collection.extend({model:i});return n}),define("text!templates/threadline-spinner.html",[],function(){return''}),define("views/postingActionBookmark",["jquery","underscore","marionette","models/app"],function(e,t,i,n){return i.ItemView.extend({tagName:"a",className:"btn-bookmark-add btn-icon panel-footer-form-btn",template:t.template(''),events:{click:"_onClick"},modelEvents:{"change:isBookmarked":"_toggle"},initialize:function(){this._shouldRender()&&(this.$el.attr("href","#"),this.render())},_shouldRender:function(){return n.currentUser.isLoggedIn()?!0:!1},_onClick:function(e){e.preventDefault(),this.model.get("isBookmarked")?window.location=n.settings.get("webroot")+"bookmarks/index/#"+this.model.get("id"):this.model.set("isBookmarked",!0)},_toggle:function(){var t=this.$("i");this.model.get("isBookmarked")?(t.removeClass("fa-bookmark-o"),t.addClass("fa-bookmark"),this.$el.attr("title",e.i18n.__("Entry is bookmarked"))):(t.removeClass("fa-bookmark"),t.addClass("fa-bookmark-o"),this.$el.attr("title",e.i18n.__("Bookmark the entry")))},onRender:function(){this._toggle()}})}),define("views/postingActionSolves",["jquery","marionette","models/app"],function(e,t,i){return t.ItemView.extend({tagName:"a",className:"btn-solves btn-icon panel-footer-form-btn",template:_.template(''),events:{click:"_onClick"},modelEvents:{"change:isSolves":"_toggle"},initialize:function(){this._shouldRender()&&(this.$el.attr({href:"#",title:e.i18n.__("Mark entry as helpful")}),this.render())},_shouldRender:function(){return i.currentUser.isLoggedIn()?this.model.isRoot()?!1:this.model.get("rootEntryUserId")!==i.currentUser.get("id")?!1:!0:!1},_onClick:function(e){e.preventDefault(),this.model.toggle("isSolves")},_toggle:function(){var t=this.$("i"),i=this.model.get("isSolves"),n="";i?(t.addClass("solves-isSolved"),t.removeClass("fa-badge-solves-o"),t.addClass("fa-badge-solves"),n=this.$el.html(),n=e(n).removeClass("fa-lg")):(t.removeClass("fa-badge-solves"),t.addClass("fa-badge-solves-o"),t.removeClass("solves-isSolved")),this._toggleGlobal(n)},_toggleGlobal:function(t){var i=e(".solves."+this.model.get("id"));i.html(t)},onRender:function(){this._toggle()}})}),define("views/editCountdown",["jquery","underscore","marionette","moment","jqueryTinyTimer"],function(e,t,i,n){return i.ItemView.extend({_editEnd:null,_buttonText:null,_$countdownDummy:null,_doneAction:"remove",initialize:function(t){this._editEnd=n(this.model.get("time")).unix()+60*t.editPeriod,n().unix()>this._editEnd||(t.done&&(this._doneAction=t.done),this._buttonText=this.$el.html(),this._$countdownDummy=e(''),this.$el.append(this._$countdownDummy),this._start())},_setButtonText:function(e){this.$el.text(this._buttonText+" "+e)},_onTick:function(e){e.m>1||1===e.m&&e.s>30?(e.m=e.m+1,this._setButtonText("("+e.m+" min)")):this._setButtonText(1===e.m?"("+e.m+" min "+e.s+" s)":"("+e.s+" s)")},_onEnd:function(){switch(this._doneAction){case"disable":this._disable();break;default:this._remove()}},_remove:function(){this.remove()},_disable:function(){this.$el.attr("disabled","disabled")},_start:function(){this._$countdownDummy.tinyTimer({to:n.unix(this._editEnd).toDate(),format:"",onTick:t.bind(this._onTick,this),onEnd:t.bind(this._onEnd,this)})}})}),define("views/postingAction",["jquery","underscore","marionette","models/app","views/postingActionBookmark","views/postingActionSolves","views/editCountdown"],function(e,t,i,n,o,s,a){var r=i.ItemView.extend({events:{"click .js-btn-setAnsweringForm":"onBtnAnswer"},_jsButtons:[o,s],initialize:function(){this._initFormElements(),this.listenTo(this.model,"change:isAnsweringFormShown",this._toggleAnsweringForm)},_initFormElements:function(){t.each(this._jsButtons,function(e){this.$el.append(new e({model:this.model}).$el)},this);var e=this.$(".js-btn-edit");if(e.length>0){new a({el:e,model:this.model,editPeriod:n.settings.get("editPeriod")})}},onBtnAnswer:function(e){e.preventDefault(),this.model.set("isAnsweringFormShown",!0)},_toggleAnsweringForm:function(){this.model.get("isAnsweringFormShown")?this.$el.slideUp("fast"):this.$el.slideDown("fast")}});return r}),define("models/geshi",["underscore","backbone"],function(e,t){var i=t.Model.extend({defaults:{isPlaintext:!1}});return i}),define("collections/geshis",["underscore","backbone","models/geshi"],function(e,t,i){var n=t.Collection.extend({model:i});return n}),define("views/geshi",["jquery","underscore","backbone","models/geshi"],function(e,t,i,n){var o=i.View.extend({plainText:!1,htmlText:!1,events:{"click .geshi-plain-text":"_togglePlaintext"},initialize:function(){this.model=new n,this.collection.push(this.model),this.block=this.$(".geshi-plain-text").next(),this._setPlaintextButton(),this.listenTo(this.model,"change",this.render)},_setPlaintextButton:function(e){var t;e&&e.preventDefault(),t=this.model.get("isPlaintext")?"fa-list-ol":"fa-align-justify",this.$(".geshi-plain-text").html("")},_togglePlaintext:function(e){e.preventDefault(),this.model.set("isPlaintext",!this.model.get("isPlaintext"))},_extractPlaintext:function(){this.plainText===!1&&(this.htmlText=this.block.html(),"Microsoft Internet Explorer"===navigator.appName?(this.htmlText=this.htmlText.replace(/\n\r/g,"+"),this.plainText=e(this.htmlText).text().replace(/\+\+/g,"\r")):this.plainText=this.block.text().replace(/code /g,"code \n"))},_renderText:function(){this.model.get("isPlaintext")?this.block.text(this.plainText).wrapInner('
      '):this.block.html(this.htmlText)},render:function(){return this._setPlaintextButton(),this._extractPlaintext(),this._renderText(),this}});return o}),define("views/postingContent",["jquery","underscore","marionette","collections/geshis","views/geshi"],function(e,t,i,n,o){return i.ItemView.extend({initialize:function(){this.listenTo(this.model,"change:isAnsweringFormShown",this._toggleAnsweringForm),this.listenTo(this.model,"change:html",this.render),this._initGeshi(".geshi-wrapper")},_toggleAnsweringForm:function(){this.model.get("isAnsweringFormShown")?this._hideSignature():this._showSignature()},_showSignature:function(){this.$(".postingBody-signature").slideDown("fast")},_hideSignature:function(){this.$(".postingBody-signature").slideUp("fast")},_initGeshi:function(e){var t=this.$(e);if(t.length>0){var i=new n;t.each(function(e,t){new o({el:t,collection:i})})}},render:function(){return this.$el.html(this.model.get("html")),this._initGeshi(".geshi-wrapper"),this}})}),define("models/upload",["underscore","backbone","models/app","cakeRest"],function(e,t,i,n){var o=t.Model.extend({initialize:function(){this.webroot=i.settings.get("webroot")+"uploads/"}});return e.extend(o.prototype,n),o}),define("collections/uploads",["underscore","backbone","models/upload"],function(e,t,i){var n=t.Collection.extend({model:i,initialize:function(e){this.url=e.url+"uploads/index/"}});return n}),define("text!templates/upload.html",[],function(){return'
      \n    <%= linkImage %>\n
      \n
      \n    \n    
      \n        <%= linkDelete %>\n    
      \n
      \n'}),function(e,t){"function"==typeof define&&define.amd?define("lib/saito/jquery.insertAtCaret",["jquery"],function(e){return t(e)}):t(jQuery)}(this,function(e){e.fn.insertAtCaret=function(e){var t,i=this[0],n=0,o=i.selectionStart||"0"===i.selectionStart?"standard":document.selection?"ie":!1;"ie"===o?(i.focus(),t=document.selection.createRange(),t.moveStart("character",-i.value.length),n=t.text.length):"standard"===o&&(n=i.selectionStart);var s=i.value.substring(0,n),a=i.value.substring(n,i.value.length);return i.value=s+e+a,n+=e.length,"ie"===o?(i.focus(),t=document.selection.createRange(),t.moveStart("character",-i.value.length),t.moveStart("character",n),t.moveEnd("character",0),t.select()):"standard"===o&&(i.selectionStart=n,i.selectionEnd=n,i.focus()),this}}),define("views/upload",["jquery","underscore","backbone","models/app","text!templates/upload.html","lib/saito/jquery.insertAtCaret"],function(e,t,i,n,o){var s=i.View.extend({className:"panel-content upload_box current",events:{"click .upload_box_delete":"_removeUpload","click .btn-submit":"_insert"},initialize:function(e){this.textarea=e.textarea,this.listenTo(this.model,"destroy",this._uploadRemoved)},_removeUpload:function(e){e.preventDefault(),this.model.destroy({success:t.bind(function(e,t){n.eventBus.trigger("notification",t)},this)})},_uploadRemoved:function(){this.remove()},_insert:function(t){t.preventDefault(),e(this.textarea).insertAtCaret("[upload]"+this.model.get("name")+"[/upload]")},render:function(){return this.$el.html(t.template(o,this.model.toJSON())),this}});return s}),function(e){function t(){}jQuery.event.props.push("dataTransfer");var i,n,o={fallback_id:"",url:"",refresh:1e3,paramname:"userfile",allowedfiletypes:[],maxfiles:25,maxfilesize:1,queuefiles:0,queuewait:200,data:{},headers:{},drop:t,dragStart:t,dragEnter:t,dragOver:t,dragLeave:t,docEnter:t,docOver:t,docLeave:t,beforeEach:t,afterAll:t,rename:t,error:function(e){alert(e)},uploadStarted:t,uploadFinished:t,progressUpdated:t,globalProgressUpdated:t,speedUpdated:t},s=["BrowserNotSupported","TooManyFiles","FileTooLarge","FileTypeNotAllowed","NotFound","NotReadable","AbortError","ReadError"],a=!1,r=0;e.fn.filedrop=function(t){function l(e){return T.drop.call(this,e)===!1?!1:(n=e.dataTransfer.files,null===n||void 0===n||0===n.length?(T.error(s[0]),!1):(r=n.length,h(),e.preventDefault(),!1))}function d(t,i,n,o){var s="--",a="\r\n",r="";if(T.data){var l=e.param(T.data).replace(/\+/g,"%20").split(/&/);e.each(l,function(){var e=this.split("=",2),t=decodeURIComponent(e[0]),i=decodeURIComponent(e[1]);r+=s,r+=o,r+=a,r+='Content-Disposition: form-data; name="'+t+'"',r+=a,r+=a,r+=i,r+=a})}return r+=s,r+=o,r+=a,r+='Content-Disposition: form-data; name="'+T.paramname+'"',r+='; filename="'+t+'"',r+=a,r+="Content-Type: "+n,r+=a,r+=a,r+=i,r+=a,r+=s,r+=o,r+=s,r+=a}function c(e){if(e.lengthComputable){var t=Math.round(100*e.loaded/e.total);if(this.currentProgress!==t){this.currentProgress=t,T.progressUpdated(this.index,this.file,this.currentProgress),S[this.global_progress_index]=this.currentProgress,u();var i=(new Date).getTime(),n=i-this.currentStart;if(n>=T.refresh){var o=e.loaded-this.startData,s=o/n;T.speedUpdated(this.index,this.file,s),this.startData=e.loaded,this.currentStart=i}}}}function u(){if(0!==S.length){var e,t=0;for(e in S)S.hasOwnProperty(e)&&(t+=S[e]);T.globalProgressUpdated(Math.round(t/S.length))}}function h(){if(a=!1,!n)return T.error(s[0]),!1;if(T.allowedfiletypes.push&&T.allowedfiletypes.length)for(var t=n.length;t--;)if(!n[t].type||e.inArray(n[t].type,T.allowedfiletypes)<0)return T.error(s[3],n[t]),!1;var i=0,o=0;if(r>T.maxfiles&&0===T.queuefiles)return T.error(s[1]),!1;for(var l=[],h=[],v=[],b=0;r>b;b++)l.push(b);var _=function(e){setTimeout(w,e)},w=function(){var e;if(a)return!1;if(T.queuefiles>0&&h.length>=T.queuefiles)return _(T.queuewait);e=l[0],l.splice(0,1),h.push(e);try{if(m(n[e])!==!1){if(e===r)return;var t=new FileReader,i=1048576*T.maxfilesize;if(t.index=e,n[e].size>i)return T.error(s[2],n[e],e),h.forEach(function(t,i){t===e&&h.splice(i,1)}),o++,!0;t.onerror=function(e){switch(e.target.error.code){case e.target.error.NOT_FOUND_ERR:return T.error(s[4]),!1;case e.target.error.NOT_READABLE_ERR:return T.error(s[5]),!1;case e.target.error.ABORT_ERR:return T.error(s[6]),!1;default:return T.error(s[7]),!1}},t.onloadend=T.beforeSend?function(t){T.beforeSend(n[e],e,function(){y(t)})}:y,t.readAsBinaryString(n[e])}else o++}catch(d){return h.forEach(function(t,i){t===e&&h.splice(i,1)}),T.error(s[0]),!1}l.length>0&&w()},y=function(t){var s=("undefined"==typeof t.srcElement?t.target:t.srcElement).index;void 0===t.target.index&&(t.target.index=p(t.total));var l,m=new XMLHttpRequest,b=m.upload,_=n[t.target.index],w=t.target.index,y=(new Date).getTime(),x="------multipartformboundary"+(new Date).getTime(),k=S.length,$=f(_.name),I=_.type;T.withCredentials&&(m.withCredentials=T.withCredentials),l="string"==typeof $?d($,t.target.result,I,x):d(_.name,t.target.result,I,x),b.index=w,b.file=_,b.downloadStartTime=y,b.currentStart=y,b.currentProgress=0,b.global_progress_index=k,b.startData=0,b.addEventListener("progress",c,!1),jQuery.isFunction(T.url)?m.open("POST",T.url(),!0):m.open("POST",T.url,!0),m.setRequestHeader("content-type","multipart/form-data; boundary="+x),e.each(T.headers,function(e,t){m.setRequestHeader(e,t)}),m.sendAsBinary(l),S[k]=0,u(),T.uploadStarted(w,_,r),m.onload=function(){var e=null;if(m.responseText)try{e=jQuery.parseJSON(m.responseText)}catch(t){e=m.responseText}var n=(new Date).getTime(),l=n-y,d=T.uploadFinished(w,_,e,l,m);i++,h.forEach(function(e,t){e===s&&h.splice(t,1)}),v.push(s),S[k]=100,u(),i===r-o&&g(),d===!1&&(a=!0),(m.status<200||m.status>299)&&T.error(m.statusText,_,s,m.status)}};w()}function p(e){for(var t=0;r>t;t++)if(n[t].size===e)return t;return void 0}function f(e){return T.rename(e)}function m(e){return T.beforeEach(e)}function g(){return T.afterAll()}function v(e){clearTimeout(i),e.preventDefault(),T.dragEnter.call(this,e)}function b(e){clearTimeout(i),e.preventDefault(),T.docOver.call(this,e),T.dragOver.call(this,e)}function _(e){clearTimeout(i),T.dragLeave.call(this,e),e.stopPropagation()}function w(e){return e.preventDefault(),T.docLeave.call(this,e),!1}function y(e){return clearTimeout(i),e.preventDefault(),T.docEnter.call(this,e),!1}function x(e){return clearTimeout(i),e.preventDefault(),T.docOver.call(this,e),!1}function k(e){i=setTimeout(function(t){return function(){T.docLeave.call(t,e)}}(this),200)}var T=e.extend({},o,t),S=[];return this.on("drop",l).on("dragstart",T.dragStart).on("dragenter",v).on("dragover",b).on("dragleave",_),e(document).on("drop",w).on("dragenter",y).on("dragover",x).on("dragleave",k),e("#"+T.fallback_id).change(function(e){T.drop(e),n=e.target.files,r=n.length,h()}),this};try{if(XMLHttpRequest.prototype.sendAsBinary)return;XMLHttpRequest.prototype.sendAsBinary=function(e){function t(e){return 255&e.charCodeAt(0)}var i=Array.prototype.map.call(e,t),n=new Uint8Array(i);this.send(n.buffer)}}catch(l){}}(jQuery),define("views/../../dev/vendors/jquery-filedrop/jquery.filedrop",function(){}),define("text!templates/uploadNew.html",[],function(){return'
      \n    
      \n        
      \n        
      \n        
      \n            \n        
      \n        
       <%- $.i18n.__(\'upload_new_title\') %>
      \n        
      \n            <%- $.i18n.__(\'upload_info\', {size: upload_size}) %>\n        
      \n    
      \n    
      \n        
      \n            <%\n            // To present a nice upload button we generate a dead button.\n            // Beneath the nice dummy button is the actual input file upload,\n            // but it\'s hidden behind the opacity:0 curtain div.\n            // z-index: 2000 to have the button above the jQuery UI modal.\n            %>\n            \n            
      \n                \n            
      \n        
      \n    
      \n
      \n\n'
+"undefined"==typeof console&&(console={},console.log=function(){},console.error=console.debug=console.info=console.log),window.redirect=function(e){document.location.replace(e)},$.ajaxSetup({cache:!1}),define("jquery",[],function(){return jQuery}),define("lib/bootstrapHelper",function(){}),define("app/core",["marionette"],function(e){return new e.Application}),define("app/vent",["marionette"],function(){var e=function(){this.vent=new Backbone.Wreqr.EventAggregator,this.commands=new Backbone.Wreqr.Commands,this.reqres=new Backbone.Wreqr.RequestResponse,this.request=function(){var e=Array.prototype.slice.apply(arguments);return this.reqres.request.apply(this.reqres,e)}};return new e}),define("models/appSetting",["underscore","backbone"],function(e,t){var i=t.Model.extend({});return i}),define("models/appStatus",["underscore","backbone","cakeRest","app/vent"],function(e,t,i,n){var o=t.Model.extend({stream:null,initialize:function(t,i){this.settings=i.settings,this.methodToCakePhpUrl=e.clone(this.methodToCakePhpUrl),this.methodToCakePhpUrl.read="status/",this.listenTo(this,"change:lastShoutId",this._onNewShout)},start:function(){this._setWebroot(this.settings.get("webroot")),this._poll()},_onNewShout:function(e){var t=e.get("lastShoutId");n.commands.execute("shoutbox:update",t)},_setWebroot:function(e){this.webroot=e+"status/"},_eventStream:function(){this.stream=new EventSource(this.webroot+this.methodToCakePhpUrl.read),this.stream.addEventListener("message",e.bind(function(e){var t=JSON.parse(e.data);this.set(t)},this),!1)},_poll:function(){var t,i,n,o,s,a,r=1e4,l=9e4;s=function(){void 0!==o&&clearTimeout(o)},t=function(){s(),a=r},n=function(){o=setTimeout(i,a)},i=e.bind(function(){n(),this.fetch({success:function(){a=Math.floor(a*(1+a/4e4)),a>l&&(a=l)},error:s})},this),this.listenTo(this,"change",function(){t(),n()}),i(),t(),n()}});return e.extend(o.prototype,i),o}),define("models/currentUser",["underscore","backbone"],function(e,t){var i=t.Model.extend({isLoggedIn:function(){return this.get("id")>0}});return i}),define("models/app",["underscore","backbone","app/vent","models/appSetting","models/appStatus","models/currentUser"],function(e,t,i,n,o,s){var a=t.Model.extend({eventBus:null,settings:null,status:null,currentUser:null,request:null,initialize:function(){this.eventBus=i.vent,this.commands=i.commands,this.reqres=i.reqres,this.settings=new n,this.status=new o({},{settings:this.settings}),this.currentUser=new s}});return new a}),define("modules/html5-notification/views/notification",["underscore","backbone","models/app"],function(e,t,i){var n=t.View.extend({_hideAfter:10,_iconUrl:!1,initialize:function(e){this._iconUrl=e.iconUrl,this.listenTo(i.eventBus,"html5-notification",this.notification),i.commands.setHandler("app:html5-notification:activate",this._activate,this),i.reqres.setHandler("app:html5-notification:available",this._isEnabled,this)},notification:function(t){var n=!i.reqres.request("isAppVisible");if(t=e.defaults(t,{icon:this._iconUrl,always:!1}),t.always||n){var o=new window.Notification(t.title,{icon:t.icon,body:t.message}),s=navigator.userAgent.toLowerCase().indexOf("chrome")>-1;s&&setTimeout(function(){o.close()},1e3*this._hideAfter)}},_activate:function(){return"permission"in window.Notification&&"granted"!==window.Notification.permission?void window.Notification.requestPermission():void window.Notification.requestPermission()},_isEnabled:function(){return"Notification"in window?!0:!1}});return n}),define("modules/html5-notification/html5-notification",["app/core","marionette","modules/html5-notification/views/notification"],function(e,t,i){var n=e.module("html5-notification");return n.addInitializer(function(e){new i({iconUrl:e.SaitoApp.app.settings.notificationIcon})}),n}),define("modules/shoutbox/models/shout",["underscore","backbone"],function(e,t){var i=t.Model.extend({initialize:function(e,t){this.urlRoot=t.urlRoot}});return i}),define("modules/shoutbox/collections/shouts",["underscore","backbone","modules/shoutbox/models/shout"],function(e,t,i){var n=t.Collection.extend({model:i,initialize:function(e,t){this.apiroot=t.apiroot+"shouts/"},fetch:function(){$.ajax({url:this.apiroot,dataType:"json",context:this}).done(function(e){e.length>0&&this.reset(e)})}});return n}),define("templateHelpers",["jquery","underscore","app/vent","moment"],function(e,t,i,n){var o=function(){this.webroot=i.reqres.request("webroot")};return{Time:t.extend(new o,{moment:n,_timeFormats:{"long":"DD.MM.YYYY",longWithTime:"DD.MM.YYYY HH:mm",RFC3339:"YYYY-MM-DDTHH:mm:ssZ",theRightWay:"YYYY-MM-DD HH:mm:ss",time:"HH:mm"},lastMidnight:function(){return n(this.now().format("YYYY-MM-DD"))},now:function(){return n()},_normal:function(t){var i=this.now(),n=this.lastMidnight(),o=i.diff(t)/1e3;return t.isAfter(n)||21600>o?t.format(this._timeFormats.time):64800>o?e.i18n.__("yesterday")+" "+t.format(this._timeFormats.time):t.format(this._timeFormats.long)},format:function(e,i,o){var s,a;if(i=i||"normal",o=o||{},t.defaults(o,{wrap:!0}),n.isMoment(e))a=e;else if(t.isNumber(e))(""+e).length<13&&(e=Math.round(1e3*e)),a=new n(e);else{if(!t.isDate(e))throw"No valid timestamp: "+e.toJSON();a=new n(e)}if(s="normal"===i?this._normal(a):a.format(this._timeFormats[i]?this._timeFormats[i]:i),o.wrap){var r=" ",l={title:a.format(this._timeFormats.theRightWay),datetime:a.format(this._timeFormats.RFC3339)};t.each(l,function(e,t){r+=t+'="'+e+'" '}),s=""+s+""}return s}}),User:t.extend(new o,{templates:{linkToUserProfile:t.template('<%- name %>')},linkToUserProfile:function(e,t){var i=this.urlToUserProfile(e);return this.templates.linkToUserProfile({url:i,name:t})},urlToUserProfile:function(e){return this.webroot+"users/view/"+e}})}}),define("lib/saito/localStorageHelper",["underscore","app/vent"],function(e,t){var i=function(){};e.extend(i.prototype,{_available:null,_prefix:"saito-",available:function(){return null===this._available&&(this._available=this._isAvailable()),this._available},_clear:function(){if(this.available()){var t=Object.keys(localStorage);e.each(t,function(e){0===e.indexOf(this._prefix)&&localStorage.removeItem(e)},this)}},_key:function(e){return this._prefix+e},_isAvailable:function(){if(!("localStorage"in window))return!1;try{var e="localStorageAvailableTestKey",t=window.localStorage;return t.setItem(e,"1"),t.removeItem(e),!0}catch(i){return!1}return!1}});var n=new i;t.reqres.setHandler("app:localStorage:available",n.available,n),t.reqres.setHandler("app:localStorage:key",n._key,n),t.commands.setHandler("app:localStorage:clear",n._clear,n)}),define("modules/shoutbox/models/control",["underscore","backbone","models/app","lib/saito/localStorageHelper"],function(e,t,i){var n=t.Model.extend({defaults:{id:1,lastId:0,mar:0,notify:!1},localStorage:function(){var e=i.reqres.request("app:localStorage:key","shoutbox-control");return new t.LocalStorage(e)}(),initialize:function(){this._restore(["notify","mar"]),this.listenTo(this,"change:notify",this._onChangeNotify),i.commands.setHandler("shoutbox:mar",this._mar,this)},_mar:function(t){t=t||{},e.defaults(t,{silent:!1}),this.set({mar:this.get("lastId")},{silent:t.silent}),this._save("mar")},setLastId:function(e){e<=this.get("lastId")||this.set("lastId",e)},_onChangeNotify:function(){this._save("notify")},_onChangeMar:function(){this._save("mar")},_restore:function(t){e.isArray(t)&&e.each(t,function(e){this._restore(e)},this),i.reqres.request("app:localStorage:available")&&this.fetch()},_save:function(){i.reqres.request("app:localStorage:available")&&this.save()}});return new n}),define("text!modules/shoutbox/templates/shout.html",[],function(){return'\n    <%= User.linkToUserProfile(user_id, user_name) %>:\n\n<%= html %>\n'}),define("modules/shoutbox/views/shout",["jquery","underscore","backbone","marionette","models/app","modules/shoutbox/models/control","templateHelpers","text!modules/shoutbox/templates/shout.html"],function(e,t,i,n,o,s,a,r){var l=n.ItemView.extend({className:"shout",templateHelpers:a,initialize:function(e){this.webroot=e.webroot,this.listenTo(s,"change:mar",this.render)},serializeData:function(){var e=this.model.toJSON(),t=this.model.get("id")>s.get("mar"),i=this.model.get("user_id")===o.currentUser.get("id");return i&&this.$el.addClass("shoutbox-shout-cu"),this.$el.addClass(t&&!i?"shoutbox-shout-new":"shoutbox-shout-old"),e},onRender:function(){s.setLastId(this.model.get("id"))},template:function(e){return t.template(r,e)}});return l}),define("modules/shoutbox/views/shouts",["jquery","underscore","backbone","marionette","models/app","templateHelpers","modules/shoutbox/views/shout","modules/shoutbox/models/control"],function(e,t,i,n,o,s,a,r){var l=n.CollectionView.extend({itemView:a,itemViewOptions:{},_Notifications:{_last:0,_models:[],_isEnabled:!1,init:function(e){this._currentUserId=e.currentUserId,this._isEnabled=e.isEnabled,this._last=e.last},add:function(e){this._isEnabled===!0&&this._currentUserId!==e.get("user_id")&&(e.get("id")<=this._last||this._models.push(e))},send:function(){0!==this._models.length&&(t.each(this._models,function(e){o.eventBus.trigger("html5-notification",{title:e.get("user_name"),message:e.get("text")})}),this._last=t.first(this._models).get("id"),this._models=[])}},_Delimiter:{_conversationCoolOff:300,_previousItemTime:null,tpl:t.template('
      <%= time %>
      '),append:function(e){var t=s.Time.moment(e.model.get("time"));return null===this._previousItemTime?void(this._previousItemTime=t):(this._itemTime=t,this.$el=e.$el,this._prepend(this._previousItemTime.unix()-t.unix()>this._conversationCoolOff?this._previousItemTime:"
      "),void(this._previousItemTime=t))},finish:function(){this._previousItemTime=null,this._itemTime&&this.$el.after(this._formatTime(this._itemTime))},_prepend:function(e){this.$el.before(this._formatTime(e))},_formatTime:function(e){var i=e;if(t.isObject(e)){var n=s.Time.moment().utc().diff(e)/1e3,o="normal";n>64800&&(o="longWithTime"),i=this.tpl({time:s.Time.format(e,o)})}return i}},initialize:function(e){this.itemViewOptions.webroot=e.webroot,this.setupNotifications(),this.listenTo(r,"change:notify",this.setupNotifications)},setupNotifications:function(){var e=0;this.collection.size()>0&&(e=this.collection.first().get("id")),this._Notifications.init({currentUserId:o.currentUser.get("id"),isEnabled:r.get("notify"),last:e})},onBeforeRender:function(){this.$el.html("")},onAfterItemAdded:function(e){this._Delimiter.append(e),this._Notifications.add(e.model)},onRender:function(){this._Delimiter.finish(),this._Notifications.send()}});return l}),define("text!modules/shoutbox/templates/add.html",[],function(){return'
      \n    \n
      \n'}),define("modules/shoutbox/views/add",["jquery","underscore","backbone","marionette","models/app","modules/shoutbox/models/shout","text!modules/shoutbox/templates/add.html","jqueryAutosize"],function(e,t,i,n,o,s,a){var r=n.ItemView.extend({template:t.template(a),_placeholder:{a:e.i18n.__("Shout :shortcut",{shortcut:"⌃s"}),b:e.i18n.__("Hit enter to mark as read")},events:{"keyup form":"formUp","keydown form":"formDown","blur #shoutbox-input":"_setPlaceholder","focus #shoutbox-input":"_setPlaceholder"},submit:function(){this.model.save({text:this.textarea.val()},{success:t.bind(function(e,t){o.commands.execute("shoutbox:mar",{silent:!0}),this.collection.reset(t)},this)})},_setPlaceholder:function(){t.defer(t.bind(function(){var e;e=this.textarea.is(":focus")?this._placeholder.b:this._placeholder.a,this.textarea.attr("placeholder",e)},this))},_firefoxRowFix:function(){if(-1!==navigator.userAgent.toLowerCase().indexOf("firefox")){var e=parseFloat(this.textarea.css("line-height")),t=1*this.textarea.attr("rows");this.textarea.css("height",t*e)}},serializeData:function(){return{placeholder:this._placeholder.a}},clearForm:function(){this.textarea.val("").trigger("autosize.resize")},formDown:function(e){13===e.keyCode&&e.shiftKey===!1&&(e.preventDefault(),this.textarea.val().length>0?(this.submit(),this.clearForm()):o.commands.execute("shoutbox:mar"))},formUp:function(){this.textarea.val().length>0?o.eventBus.trigger("breakAutoreload"):0===this.textarea.val().length&&o.eventBus.trigger("initAutoreload")},onShow:function(){this.textarea=this.$("#shoutbox-input"),this._firefoxRowFix(),this.textarea.autosize(),this._setPlaceholder(),e(window).keydown(t.bind(function(e){e.ctrlKey===!0&&83===e.which&&this.textarea.focus()},this))}});return r}),define("text!modules/shoutbox/templates/control.html",[],function(){return"\n"}),define("modules/shoutbox/views/control",["jquery","underscore","backbone","marionette","models/app","modules/shoutbox/models/control","text!modules/shoutbox/templates/control.html"],function(e,t,i,n,o,s,a){var r=n.ItemView.extend({template:t.template(a),events:{"click #shoutbox-notify":"onChangeNotify"},initialize:function(){this.model=s},onRender:function(){this._putNotifyCheckbox()},serializeData:function(){return{n:e.i18n.__("Notification")}},_putNotifyCheckbox:function(){var e=o.reqres.request("app:html5-notification:available");e===!0&&(this.notify=this.$("#shoutbox-notify"),this.model.get("notify")?this.notify.attr("checked","checked"):this.notify.removeAttr("checked"),this.$("#shoutbox-notify-label").show())},onChangeNotify:function(){var e=this.notify.is(":checked");this.model.set("notify",e),e&&o.commands.execute("app:html5-notification:activate")}});return r}),define("text!modules/shoutbox/templates/layout.html",[],function(){return"
      \n    
      \n    
      \n    
      \n
      \n"}),define("modules/shoutbox/shoutbox",["jquery","app/app","models/app","marionette","modules/shoutbox/collections/shouts","modules/shoutbox/models/shout","modules/shoutbox/views/shouts","modules/shoutbox/views/add","modules/shoutbox/views/control","text!modules/shoutbox/templates/layout.html"],function(e,t,i,n,o,s,a,r,l,d){var c=t.module("Shoutbox");return c.addInitializer(function(t){var c=t.SaitoApp.shouts,u=i.reqres.request("webroot"),h=i.reqres.request("apiroot");if(e("#shoutbox").length){var p={layout:null,shoutsCollection:null,initialize:function(){this.initLayout(),this.initShoutsCollection(),this.initAdd(),this.initShouts(),this.initControl()},initShoutsCollection:function(){this.shoutsCollection=new o(c,{apiroot:h});var e=_.bind(function(){var e=!i.reqres.request("slidetab:open","shoutbox");e||this.shoutsCollection.fetch()},this);i.eventBus.on("slidetab:open",_.bind(function(t){"shoutbox"===t.slidetab&&e()},this)),i.commands.setHandler("shoutbox:update",_.bind(function(t){var i=0;this.shoutsCollection.size()>0&&(i=this.shoutsCollection.at(0).get("id")),t!==i&&e()},this))},initLayout:function(){var e=n.Layout.extend({el:"#shoutbox",template:d,regions:{add:"#shoutbox-add",shouts:"#shoutbox-shouts",control:"#shoutbox-control"}});this.layout=new e,this.layout.render(),this.layout.$("#shoutbox-add").addClass("slidetab-header"),this.layout.$("#shoutbox-shouts").addClass("slidetab-content"),this.layout.$("#shoutbox-control").addClass("slidetab-footer")},initShouts:function(){var e=new a({collection:this.shoutsCollection,webroot:u});this.layout.shouts.show(e)},initControl:function(){var e=new l;this.layout.control.show(e)},initAdd:function(){var e=new s({},{urlRoot:h+"shouts/"});this.layout.add.show(new r({model:e,collection:this.shoutsCollection}))}};p.initialize()}}),c}),define("models/threadline",["underscore","backbone","models/app","cakeRest"],function(e,t,i,n){var o=t.Model.extend({defaults:{isInlineOpened:!1,shouldScrollOnInlineOpen:!0,isAlwaysShownInline:!1,isNewToUser:!1,posting:"",html:""},initialize:function(){this.webroot=i.settings.get("webroot")+"entries/",this.methodToCakePhpUrl=e.clone(this.methodToCakePhpUrl),this.methodToCakePhpUrl.read="threadLine/",this.set("isAlwaysShownInline",i.currentUser.get("user_show_inline")||!1)}});return e.extend(o.prototype,n),o}),define("collections/threadlines",["underscore","backbone","models/threadline"],function(e,t,i){var n=t.Collection.extend({model:i});return n}),define("text!templates/threadline-spinner.html",[],function(){return''}),define("views/postingActionBookmark",["jquery","underscore","marionette","models/app"],function(e,t,i,n){return i.ItemView.extend({tagName:"a",className:"btn-bookmark-add btn-icon panel-footer-form-btn",template:t.template(''),events:{click:"_onClick"},modelEvents:{"change:isBookmarked":"_toggle"},initialize:function(){this._shouldRender()&&(this.$el.attr("href","#"),this.render())},_shouldRender:function(){return n.currentUser.isLoggedIn()?!0:!1},_onClick:function(e){e.preventDefault(),this.model.get("isBookmarked")?window.location=n.settings.get("webroot")+"bookmarks/index/#"+this.model.get("id"):this.model.set("isBookmarked",!0)},_toggle:function(){var t=this.$("i");this.model.get("isBookmarked")?(t.removeClass("fa-bookmark-o"),t.addClass("fa-bookmark"),this.$el.attr("title",e.i18n.__("Entry is bookmarked"))):(t.removeClass("fa-bookmark"),t.addClass("fa-bookmark-o"),this.$el.attr("title",e.i18n.__("Bookmark the entry")))},onRender:function(){this._toggle()}})}),define("views/postingActionSolves",["jquery","marionette","models/app"],function(e,t,i){return t.ItemView.extend({tagName:"a",className:"btn-solves btn-icon panel-footer-form-btn",template:_.template(''),events:{click:"_onClick"},modelEvents:{"change:isSolves":"_toggle"},initialize:function(){this._shouldRender()&&(this.$el.attr({href:"#",title:e.i18n.__("Mark entry as helpful")}),this.render())},_shouldRender:function(){return i.currentUser.isLoggedIn()?this.model.isRoot()?!1:this.model.get("rootEntryUserId")!==i.currentUser.get("id")?!1:!0:!1},_onClick:function(e){e.preventDefault(),this.model.toggle("isSolves")},_toggle:function(){var t=this.$("i"),i=this.model.get("isSolves"),n="";i?(t.addClass("solves-isSolved"),t.removeClass("fa-badge-solves-o"),t.addClass("fa-badge-solves"),n=this.$el.html(),n=e(n).removeClass("fa-lg")):(t.removeClass("fa-badge-solves"),t.addClass("fa-badge-solves-o"),t.removeClass("solves-isSolved")),this._toggleGlobal(n)},_toggleGlobal:function(t){var i=e(".solves."+this.model.get("id"));i.html(t)},onRender:function(){this._toggle()}})}),define("views/editCountdown",["jquery","underscore","marionette","moment","jqueryTinyTimer"],function(e,t,i,n){return i.ItemView.extend({_editEnd:null,_buttonText:null,_$countdownDummy:null,_doneAction:"remove",initialize:function(t){this._editEnd=n(this.model.get("time")).unix()+60*t.editPeriod,n().unix()>this._editEnd||(t.done&&(this._doneAction=t.done),this._buttonText=this.$el.html(),this._$countdownDummy=e(''),this.$el.append(this._$countdownDummy),this._start())},_setButtonText:function(e){this.$el.text(this._buttonText+" "+e)},_onTick:function(e){e.m>1||1===e.m&&e.s>30?(e.m=e.m+1,this._setButtonText("("+e.m+" min)")):this._setButtonText(1===e.m?"("+e.m+" min "+e.s+" s)":"("+e.s+" s)")},_onEnd:function(){switch(this._doneAction){case"disable":this._disable();break;default:this._remove()}},_remove:function(){this.remove()},_disable:function(){this.$el.attr("disabled","disabled")},_start:function(){this._$countdownDummy.tinyTimer({to:n.unix(this._editEnd).toDate(),format:"",onTick:t.bind(this._onTick,this),onEnd:t.bind(this._onEnd,this)})}})}),define("views/postingAction",["jquery","underscore","marionette","models/app","views/postingActionBookmark","views/postingActionSolves","views/editCountdown"],function(e,t,i,n,o,s,a){var r=i.ItemView.extend({events:{"click .js-btn-setAnsweringForm":"onBtnAnswer"},_jsButtons:[o,s],initialize:function(){this._initFormElements(),this.listenTo(this.model,"change:isAnsweringFormShown",this._toggleAnsweringForm)},_initFormElements:function(){t.each(this._jsButtons,function(e){this.$el.append(new e({model:this.model}).$el)},this);var e=this.$(".js-btn-edit");if(e.length>0){new a({el:e,model:this.model,editPeriod:n.settings.get("editPeriod")})}},onBtnAnswer:function(e){e.preventDefault(),this.model.set("isAnsweringFormShown",!0)},_toggleAnsweringForm:function(){this.model.get("isAnsweringFormShown")?this.$el.slideUp("fast"):this.$el.slideDown("fast")}});return r}),define("models/geshi",["underscore","backbone"],function(e,t){var i=t.Model.extend({defaults:{isPlaintext:!1}});return i}),define("collections/geshis",["underscore","backbone","models/geshi"],function(e,t,i){var n=t.Collection.extend({model:i});return n}),define("views/geshi",["jquery","underscore","backbone","models/geshi"],function(e,t,i,n){var o=i.View.extend({plainText:!1,htmlText:!1,events:{"click .geshi-plain-text":"_togglePlaintext"},initialize:function(){this.model=new n,this.collection.push(this.model),this.block=this.$(".geshi-plain-text").next(),this._setPlaintextButton(),this.listenTo(this.model,"change",this.render)},_setPlaintextButton:function(e){var t;e&&e.preventDefault(),t=this.model.get("isPlaintext")?"fa-list-ol":"fa-align-justify",this.$(".geshi-plain-text").html("")},_togglePlaintext:function(e){e.preventDefault(),this.model.set("isPlaintext",!this.model.get("isPlaintext"))},_extractPlaintext:function(){this.plainText===!1&&(this.htmlText=this.block.html(),"Microsoft Internet Explorer"===navigator.appName?(this.htmlText=this.htmlText.replace(/\n\r/g,"+"),this.plainText=e(this.htmlText).text().replace(/\+\+/g,"\r")):this.plainText=this.block.text().replace(/code /g,"code \n"))},_renderText:function(){this.model.get("isPlaintext")?this.block.text(this.plainText).wrapInner('
      '):this.block.html(this.htmlText)},render:function(){return this._setPlaintextButton(),this._extractPlaintext(),this._renderText(),this}});return o}),define("views/postingContent",["jquery","underscore","marionette","collections/geshis","views/geshi"],function(e,t,i,n,o){return i.ItemView.extend({initialize:function(){this.listenTo(this.model,"change:isAnsweringFormShown",this._toggleAnsweringForm),this.listenTo(this.model,"change:html",this.render),this._initGeshi(".geshi-wrapper")},_toggleAnsweringForm:function(){this.model.get("isAnsweringFormShown")?this._hideSignature():this._showSignature()},_showSignature:function(){this.$(".postingBody-signature").slideDown("fast")},_hideSignature:function(){this.$(".postingBody-signature").slideUp("fast")},_initGeshi:function(e){var t=this.$(e);if(t.length>0){var i=new n;t.each(function(e,t){new o({el:t,collection:i})})}},render:function(){return this.$el.html(this.model.get("html")),this._initGeshi(".geshi-wrapper"),this}})}),define("models/upload",["underscore","backbone","models/app","cakeRest"],function(e,t,i,n){var o=t.Model.extend({initialize:function(){this.webroot=i.settings.get("webroot")+"uploads/"}});return e.extend(o.prototype,n),o}),define("collections/uploads",["underscore","backbone","models/upload"],function(e,t,i){var n=t.Collection.extend({model:i,initialize:function(e){this.url=e.url+"uploads/index/"}});return n}),define("text!templates/upload.html",[],function(){return'
      \n    <%= linkImage %>\n
      \n
      \n    \n    
      \n        <%= linkDelete %>\n    
      \n
      \n'}),function(e,t){"function"==typeof define&&define.amd?define("lib/saito/jquery.insertAtCaret",["jquery"],function(e){return t(e)}):t(jQuery)}(this,function(e){e.fn.insertAtCaret=function(e){var t,i=this[0],n=0,o=i.selectionStart||"0"===i.selectionStart?"standard":document.selection?"ie":!1;"ie"===o?(i.focus(),t=document.selection.createRange(),t.moveStart("character",-i.value.length),n=t.text.length):"standard"===o&&(n=i.selectionStart);var s=i.value.substring(0,n),a=i.value.substring(n,i.value.length);return i.value=s+e+a,n+=e.length,"ie"===o?(i.focus(),t=document.selection.createRange(),t.moveStart("character",-i.value.length),t.moveStart("character",n),t.moveEnd("character",0),t.select()):"standard"===o&&(i.selectionStart=n,i.selectionEnd=n,i.focus()),this}}),define("views/upload",["jquery","underscore","backbone","models/app","text!templates/upload.html","lib/saito/jquery.insertAtCaret"],function(e,t,i,n,o){var s=i.View.extend({className:"panel-content upload_box current",events:{"click .upload_box_delete":"_removeUpload","click .btn-submit":"_insert"},initialize:function(e){this.textarea=e.textarea,this.listenTo(this.model,"destroy",this._uploadRemoved)},_removeUpload:function(e){e.preventDefault(),this.model.destroy({success:t.bind(function(e,t){n.eventBus.trigger("notification",t)},this)})},_uploadRemoved:function(){this.remove()},_insert:function(t){t.preventDefault(),e(this.textarea).insertAtCaret("[upload]"+this.model.get("name")+"[/upload]")},render:function(){return console.log(e.i18n.__("upload_btn")),this.$el.html(t.template(o,this.model.toJSON())),this}});return s}),function(e){function t(){}jQuery.event.props.push("dataTransfer");var i,n,o={fallback_id:"",url:"",refresh:1e3,paramname:"userfile",allowedfiletypes:[],maxfiles:25,maxfilesize:1,queuefiles:0,queuewait:200,data:{},headers:{},drop:t,dragStart:t,dragEnter:t,dragOver:t,dragLeave:t,docEnter:t,docOver:t,docLeave:t,beforeEach:t,afterAll:t,rename:t,error:function(e){alert(e)},uploadStarted:t,uploadFinished:t,progressUpdated:t,globalProgressUpdated:t,speedUpdated:t},s=["BrowserNotSupported","TooManyFiles","FileTooLarge","FileTypeNotAllowed","NotFound","NotReadable","AbortError","ReadError"],a=!1,r=0;e.fn.filedrop=function(t){function l(e){return T.drop.call(this,e)===!1?!1:(n=e.dataTransfer.files,null===n||void 0===n||0===n.length?(T.error(s[0]),!1):(r=n.length,h(),e.preventDefault(),!1))}function d(t,i,n,o){var s="--",a="\r\n",r="";if(T.data){var l=e.param(T.data).replace(/\+/g,"%20").split(/&/);e.each(l,function(){var e=this.split("=",2),t=decodeURIComponent(e[0]),i=decodeURIComponent(e[1]);r+=s,r+=o,r+=a,r+='Content-Disposition: form-data; name="'+t+'"',r+=a,r+=a,r+=i,r+=a})}return r+=s,r+=o,r+=a,r+='Content-Disposition: form-data; name="'+T.paramname+'"',r+='; filename="'+t+'"',r+=a,r+="Content-Type: "+n,r+=a,r+=a,r+=i,r+=a,r+=s,r+=o,r+=s,r+=a}function c(e){if(e.lengthComputable){var t=Math.round(100*e.loaded/e.total);if(this.currentProgress!==t){this.currentProgress=t,T.progressUpdated(this.index,this.file,this.currentProgress),S[this.global_progress_index]=this.currentProgress,u();var i=(new Date).getTime(),n=i-this.currentStart;if(n>=T.refresh){var o=e.loaded-this.startData,s=o/n;T.speedUpdated(this.index,this.file,s),this.startData=e.loaded,this.currentStart=i}}}}function u(){if(0!==S.length){var e,t=0;for(e in S)S.hasOwnProperty(e)&&(t+=S[e]);T.globalProgressUpdated(Math.round(t/S.length))}}function h(){if(a=!1,!n)return T.error(s[0]),!1;if(T.allowedfiletypes.push&&T.allowedfiletypes.length)for(var t=n.length;t--;)if(!n[t].type||e.inArray(n[t].type,T.allowedfiletypes)<0)return T.error(s[3],n[t]),!1;var i=0,o=0;if(r>T.maxfiles&&0===T.queuefiles)return T.error(s[1]),!1;for(var l=[],h=[],v=[],b=0;r>b;b++)l.push(b);var _=function(e){setTimeout(w,e)},w=function(){var e;if(a)return!1;if(T.queuefiles>0&&h.length>=T.queuefiles)return _(T.queuewait);e=l[0],l.splice(0,1),h.push(e);try{if(m(n[e])!==!1){if(e===r)return;var t=new FileReader,i=1048576*T.maxfilesize;if(t.index=e,n[e].size>i)return T.error(s[2],n[e],e),h.forEach(function(t,i){t===e&&h.splice(i,1)}),o++,!0;t.onerror=function(e){switch(e.target.error.code){case e.target.error.NOT_FOUND_ERR:return T.error(s[4]),!1;case e.target.error.NOT_READABLE_ERR:return T.error(s[5]),!1;case e.target.error.ABORT_ERR:return T.error(s[6]),!1;default:return T.error(s[7]),!1}},t.onloadend=T.beforeSend?function(t){T.beforeSend(n[e],e,function(){y(t)})}:y,t.readAsBinaryString(n[e])}else o++}catch(d){return h.forEach(function(t,i){t===e&&h.splice(i,1)}),T.error(s[0]),!1}l.length>0&&w()},y=function(t){var s=("undefined"==typeof t.srcElement?t.target:t.srcElement).index;void 0===t.target.index&&(t.target.index=p(t.total));var l,m=new XMLHttpRequest,b=m.upload,_=n[t.target.index],w=t.target.index,y=(new Date).getTime(),x="------multipartformboundary"+(new Date).getTime(),k=S.length,$=f(_.name),I=_.type;T.withCredentials&&(m.withCredentials=T.withCredentials),l="string"==typeof $?d($,t.target.result,I,x):d(_.name,t.target.result,I,x),b.index=w,b.file=_,b.downloadStartTime=y,b.currentStart=y,b.currentProgress=0,b.global_progress_index=k,b.startData=0,b.addEventListener("progress",c,!1),jQuery.isFunction(T.url)?m.open("POST",T.url(),!0):m.open("POST",T.url,!0),m.setRequestHeader("content-type","multipart/form-data; boundary="+x),e.each(T.headers,function(e,t){m.setRequestHeader(e,t)}),m.sendAsBinary(l),S[k]=0,u(),T.uploadStarted(w,_,r),m.onload=function(){var e=null;if(m.responseText)try{e=jQuery.parseJSON(m.responseText)}catch(t){e=m.responseText}var n=(new Date).getTime(),l=n-y,d=T.uploadFinished(w,_,e,l,m);i++,h.forEach(function(e,t){e===s&&h.splice(t,1)}),v.push(s),S[k]=100,u(),i===r-o&&g(),d===!1&&(a=!0),(m.status<200||m.status>299)&&T.error(m.statusText,_,s,m.status)}};w()}function p(e){for(var t=0;r>t;t++)if(n[t].size===e)return t;return void 0}function f(e){return T.rename(e)}function m(e){return T.beforeEach(e)}function g(){return T.afterAll()}function v(e){clearTimeout(i),e.preventDefault(),T.dragEnter.call(this,e)}function b(e){clearTimeout(i),e.preventDefault(),T.docOver.call(this,e),T.dragOver.call(this,e)}function _(e){clearTimeout(i),T.dragLeave.call(this,e),e.stopPropagation()}function w(e){return e.preventDefault(),T.docLeave.call(this,e),!1}function y(e){return clearTimeout(i),e.preventDefault(),T.docEnter.call(this,e),!1}function x(e){return clearTimeout(i),e.preventDefault(),T.docOver.call(this,e),!1}function k(e){i=setTimeout(function(t){return function(){T.docLeave.call(t,e)}}(this),200)}var T=e.extend({},o,t),S=[];return this.on("drop",l).on("dragstart",T.dragStart).on("dragenter",v).on("dragover",b).on("dragleave",_),e(document).on("drop",w).on("dragenter",y).on("dragover",x).on("dragleave",k),e("#"+T.fallback_id).change(function(e){T.drop(e),n=e.target.files,r=n.length,h()}),this};try{if(XMLHttpRequest.prototype.sendAsBinary)return;XMLHttpRequest.prototype.sendAsBinary=function(e){function t(e){return 255&e.charCodeAt(0)}var i=Array.prototype.map.call(e,t),n=new Uint8Array(i);this.send(n.buffer)}}catch(l){}}(jQuery),define("views/../../dev/vendors/jquery-filedrop/jquery.filedrop",function(){}),define("text!templates/uploadNew.html",[],function(){return'
      \n    
      \n        
      \n        
      \n        
      \n            \n        
      \n        
       <%- $.i18n.__(\'upload_new_title\') %>
      \n        
      \n            <%- $.i18n.__(\'upload_info\', {size: upload_size}) %>\n        
      \n    
      \n    
      \n        
      \n            <%\n            // To present a nice upload button we generate a dead button.\n            // Beneath the nice dummy button is the actual input file upload,\n            // but it\'s hidden behind the opacity:0 curtain div.\n            // z-index: 2000 to have the button above the jQuery UI modal.\n            %>\n            \n            
      \n                \n            
      \n        
      \n    
      \n
      \n\n'
 }),define("text!templates/spinner.html",[],function(){return''}),define("views/uploadNew",["jquery","underscore","backbone","../../dev/vendors/jquery-filedrop/jquery.filedrop","models/app","text!templates/uploadNew.html","text!templates/spinner.html","humanize"],function(e,t,i,n,o,s,a,r){var l=i.View.extend({className:"panel upload_box upload-new",wasChild:"unset",events:{"change #Upload0File":"_uploadManual"},initialize:function(e){this.uploadUrl=o.settings.get("webroot")+"uploads/add",this.collection=e.collection},_initDropUploader:function(){this._browserSupportsDragAndDrop()&&window.FileReader?this.$(".upload-layer").filedrop({maxfiles:1,maxfilesize:o.settings.get("upload_max_img_size")/1024,url:this.uploadUrl,paramname:"data[Upload][0][file]",allowedfiletypes:["image/jpeg","image/jpg","image/png","image/gif"],dragOver:t.bind(function(){this._showDragIndicator()},this),dragLeave:t.bind(function(){this._hideDragIndicator()},this),uploadFinished:t.bind(function(e,t,i){this._postUpload(i)},this),beforeSend:t.bind(function(e,t,i){this._hideDragIndicator(),this._setUploadSpinner(),i()},this),error:t.bind(function(t,i){var n;switch(this._hideDragIndicator(),t){case"FileTypeNotAllowed":n=e.i18n.__("upload_fileTypeNotAllowed");break;case"FileTooLarge":n=e.i18n.__("upload_fileToLarge",{name:i.name});break;case"BrowserNotSupported":n=e.i18n.__("upload_browserNotSupported");break;case"TooManyFiles":n=e.i18n.__("upload_toManyFiles");break;default:n=t}o.eventBus.trigger("notification",{title:"Error",message:n,type:"error"})},this)}):this.$("h2").html(e.i18n.__("Upload"))},_browserSupportsDragAndDrop:function(){var e=this.$(".upload-layer")[0];return"draggable"in e||"ondragstart"in e&&"ondrop"in e},_showDragIndicator:function(){this.$(".upload-drag-indicator").fadeIn()},_hideDragIndicator:function(){this.$(".upload-drag-indicator").fadeOut()},_setUploadSpinner:function(){this.$(".upload_box_header").html(a)},_uploadManual:function(e){var t,i,n=!0;e.preventDefault();try{t=new FormData,i=this.$("#Upload0File")[0],t.append(i.name,i.files[0])}catch(o){n=!1}this._setUploadSpinner(),n?this._uploadAjax(t):this._uploadIFrame()},_uploadIFrame:function(){var e=this.$("form"),i=this.$("#uploadIFrame");i.load(t.bind(function(){this._postUpload(i.contents().find("body").html()),i.off("load")},this)),e.submit()},_uploadAjax:function(e){var i=new XMLHttpRequest;i.open("POST",this.uploadUrl),i.onloadend=t.bind(function(e){this._postUpload(e.target.response)},this),i.onerror=this._onUploadError,i.send(e)},_onUploadError:function(){o.eventBus.trigger("notification",{type:"error",message:e.i18n.__("upload_genericError")})},_postUpload:function(e){if(t.isString(e))try{e=JSON.parse(e)}catch(i){this._onUploadError()}o.eventBus.trigger("notification",e),this.collection.fetch({reset:!0}),this.render()},render:function(){return this.$el.html(t.template(s)({url:this.uploadUrl,upload_size:r.filesize(o.settings.get("upload_max_img_size"))})),this._initDropUploader(),this}});return l}),define("text!templates/uploads.html",[],function(){return'
      \n    
      \n    
      \n
      \n'}),define("views/uploads",["jquery","underscore","backbone","models/app","collections/uploads","views/upload","views/uploadNew","text!templates/uploads.html"],function(e,t,i,n,o,s,a,r){var l=i.View.extend({events:{"click .current .btn-submit":"_closeDialog"},initialize:function(e){this.textarea=e.textarea,this.collection=new o({url:n.settings.get("webroot")}),this.listenTo(this.collection,"reset",this._addAll),this.$(".body").html(t.template(r)),this.uploadNewView=new a({collection:this.collection}),this.$(".content").append(this.uploadNewView.el),this.render(),this.collection.fetch({reset:!0})},_addOne:function(e){var t=new s({model:e,textarea:this.textarea});this.$(".upload-new").after(t.render().el)},_addAll:function(){this._removeAll(),this.collection.each(this._addOne,this)},_removeAll:function(){this.$(".upload_box.current").remove()},_setDialogSize:function(){this.$el.dialog("option","width",window.innerWidth-80),this.$el.dialog("option","height",window.innerHeight-80)},_closeDialog:function(){this.$el.dialog("close")},render:function(){return this.uploadNewView.render(),this.$el.dialog({title:e.i18n.__("Upload"),modal:!0,draggable:!1,resizable:!1,position:[40,40],hide:"fade"}),this._setDialogSize(),e(window).resize(t.bind(function(){this._setDialogSize()},this)),window.onorientationchange=t.bind(function(){this._setDialogSize()},this),this}});return l}),define("lib/saito/markItUp.media",["jquery","underscore"],function(e,t){var i={cleanUp:function(e){return e=e.replace(/https:\/\/www\.dropbox\.com\//,"https://dl.dropbox.com/")}},n={rawUrlCleaner:[i],multimedia:function(i,o){var s=e.trim(i),a="([\\/?]|$)",r=new RegExp("\\.(png|gif|jpg|jpeg|webp)"+a,"i"),l=new RegExp("\\.(mp4|webm|m4v)"+a,"i"),d=new RegExp("\\.(m4a|ogg|mp3|wav|opus)"+a,"i"),c=/.*?<\/iframe>/i.exec(e)[1];return t=t.replace(/["']/g,""),"[iframe"+t+"][/iframe]"},_videoFallback:function(e){var t,i="";if(/http/.test(e)===!1&&(e="http://"+e),/(http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/i.test(e)){var o=e.match(/(https?:\/\/)?(www\.)?(.[^\/:]+)/i).pop();if("youtu.be"===o&&/youtu.be\/(.*?)(&.*)?$/.test(e))return t=e.match(/youtu.be\/(.*?)(&.*)?$/)[1],i=n._createIframe({url:"//www.youtube.com/embed/"+t}),i=n._videoIframe(i);if("youtube.com"===o)return/v=(.*?)(&.*)?$/.test(e)&&(t=e.match(/v=(.*?)(&.*)?$/)[1],i=n._createIframe({url:"//www.youtube.com/embed/"+t}),i=n._videoIframe(i)),i}return i},_embedly:function(e){return"[embed]"+e+"[/embed]"},_createIframe:function(e){return''}};return n}),define("text!templates/mediaInsert.html",[],function(){return'
      \n    
      \n        
      \n            \n            \n            \n\n            \n        
      \n    
      \n
      \n'}),define("views/mediaInsert",["jquery","underscore","backbone","models/app","lib/saito/markItUp.media","text!templates/mediaInsert.html"],function(e,t,i,n,o,s){return i.View.extend({template:t.template(s),events:{"click #markitup_media_btn":"_insert"},initialize:function(){void 0!==this.model&&null!==this.model&&this.listenTo(this.model,"change:isAnsweringFormShown",this.remove)},_insert:function(t){var i,s;t.preventDefault(),s=o,i=s.multimedia(this.$("#markitup_media_txta").val(),{embedlyEnabled:n.settings.get("embedly_enabled")===!0}),""===i?this._invalidInput():(e.markItUp({replaceWith:i}),this._closeDialog())},_hideErrorMessages:function(){this.$("#markitup_media_message").hide()},_invalidInput:function(){this.$("#markitup_media_message").show(),this.$el.dialog().parent().effect("shake",{times:2},250)},_closeDialog:function(){this.$el.dialog("close"),this._hideErrorMessages(),this.$("#markitup_media_txta").val("")},_showDialog:function(){this.$el.dialog({show:{effect:"scale",duration:200},hide:{effect:"fade",duration:200},title:e.i18n.__("Multimedia"),minWidth:346,position:{at:"left+50% top+40%"},resizable:!1,open:function(){setTimeout(function(){e("#markitup_media_txta").focus()},210)},close:t.bind(function(){this._hideErrorMessages()},this)})},render:function(){return this.$el.html(this.template),this._showDialog(),this}})}),define("models/preview",["underscore","backbone","models/app"],function(e,t,i){var n=t.Model.extend({defaults:{isFetchingData:!1,rendered:null,data:null},initialize:function(){this.webroot=i.settings.get("webroot"),this.listenTo(this,"change:data",this._fetchRendered)},_fetchRendered:function(){this.set("fetchingData",!0),$.post(this.webroot+"entries/preview/",this.get("data"),e.bind(function(e){this.set("fetchingData",!1),this.set("rendered",e.html),i.eventBus.trigger("notificationUnset","all"),i.eventBus.trigger("notification",e)},this),"json")}});return n}),define("views/preview",["jquery","underscore","marionette","text!templates/spinner.html"],function(e,t,i,n){var o=i.ItemView.extend({templates:{content:t.template("<%= rendered %>"),spinner:t.template(n)},modelEvents:{"change:fetchingData":"_fetchingData","change:rendered":"render"},_fetchingData:function(){this.model.get("fetchingData")&&this.render()},getTemplate:function(){return this.model.get("fetchingData")?this.templates.spinner:this.templates.content}});return o}),function(e){var t={_scrollToTop:function(t){e("body").animate({scrollTop:t.offset().top-10,easing:"swing"},300)},_scrollToBottom:function(i){e("body").animate({scrollTop:t._elementBottom(i)-e(window).height()+20,easing:"swing"},300,function(){t._isHeigherThanView(i)&&t._scrollToTop(i)})},_elementBottom:function(e){return e.offset().top+e.height()},_isScrolledIntoView:function(i){if(0===e(i).length)return!0;var n=e(window).scrollTop(),o=n+e(window).height(),s=e(i).offset().top,a=t._elementBottom(i);return o>=a&&s>=n},_isHeigherThanView:function(t){return e(window).height()<=t.height()}},i={top:function(){var i;return i=e(this),t._isScrolledIntoView(i)||t._scrollToTop(i),this},bottom:function(){var i;return i=e(this),t._isScrolledIntoView(i)||t._scrollToBottom(i),this},isInView:function(){var i;return i=e(this),t._isScrolledIntoView(i)}};e.fn.scrollIntoView=function(t){return i[t]?i[t].apply(this,Array.prototype.slice.call(arguments,1)):"object"!=typeof t&&t?void e.error("Method "+t+" does not exist on jQuery.scrollIntoView"):i.init.apply(this,arguments)}}(jQuery),define("lib/saito/jquery.scrollIntoView",function(){}),define("views/answering",["jquery","underscore","backbone","models/app","views/uploads","views/mediaInsert","views/editCountdown","models/preview","views/preview","lib/saito/jquery.scrollIntoView","jqueryAutosize"],function(e,t,i,n,o,s,a,r,l){var d=i.View.extend({_requestUrl:null,rendered:!1,answeringForm:!1,preview:!1,mediaView:!1,sendInProgress:!1,_action:null,model:null,events:{"click .btn-previewClose":"_closePreview","click .btn-preview":"_showPreview","click .btn-markItUp-Upload":"_upload","click .btn-markItUp-Media":"_media","click .btn-submit":"_send","click .btn-cite":"_cite","keypress .js-subject":"_onKeyPressSubject"},initialize:function(e){this.parentThreadline=e.parentThreadline||null,this._setupTextArea(),this.parentThreadline||this._onFormReady(),this._requestUrl=n.settings.get("webroot")+"entries/add/"+this.model.get("id"),this.listenTo(n.eventBus,"isAppVisible",this._focusSubject)},_disable:function(){this.$(".btn.btn-submit").attr("disabled","disabled")},_enable:function(){this.$(".btn.btn-submit").removeAttr("disabled")},_cite:function(e){e.preventDefault();var t=this.$(".cite-container"),i=this.$(".btn-cite").data("text"),n=this.$textarea.val();this.$textarea.val(i+"\n\n"+n),t.slideToggle(),this.$textarea.trigger("autosize.resize"),this.$textarea.focus()},_onKeyPressSubject:function(e){13===e.keyCode&&this._send(e)},_upload:function(e){var t;e&&e.preventDefault(),t=new o({el:"#markitup_upload",textarea:this.$textarea[0]})},_media:function(e){e.preventDefault(),this.mediaView===!1&&(this.mediaView=new s({el:"#markitup_media",model:this.model})),this.mediaView.render()},_showPreview:function(e){var t;e.preventDefault(),this.$(".preview").slideDown("fast"),this.preview===!1&&(t=new r,this.preview=new l({el:this.$(".preview .panel-content"),model:t})),this.preview.model.set("data",this.$("form").serialize())},_closePreview:function(e){e.preventDefault(),this.$(".preview").slideUp("fast")},_setupTextArea:function(){this.$textarea=this.$("textarea#EntryText"),this.$textarea.autosize()},_requestAnsweringForm:function(){e.ajax({cache:!0,url:this._requestUrl,success:t.bind(function(e){this.answeringForm=e,this.render()},this)})},_postRendering:function(){this.$el.scrollIntoView("bottom"),this._focusSubject(),this._onFormReady()},_onFormReady:function(){this._setupTextArea();var e=this.$(".js-data");if(e.length>0&&"edit"===e.data("meta").action){var t=this.$(".js-data").data("entry");this.model.set(t,{silent:!0}),this._addCountdown()}n.eventBus.trigger("change:DOM")},_addCountdown:function(){{var e=this.$(".js-btn-submit");new a({el:e,model:this.model,editPeriod:n.settings.get("editPeriod"),done:"disable"})}},_focusSubject:function(){var e=window.navigator.userAgent.match("iPad|iPhone");e||this.$(".postingform input[type=text]:first").focus()},_send:function(e){return this.sendInProgress?void e.preventDefault():(this.sendInProgress=!0,void(this.parentThreadline?this._sendInline(e):this._sendRedirect(e)))},_sendRedirect:function(i){var n=this.$(".btn-submit")[0];if(i.preventDefault(),"object"==typeof n.validity&&n.form.checkValidity()===!1){var o=t.bind(function(){this.checkValidityDummy||(this.checkValidityDummy=e("",{type:"submit",style:"display: none;"}),e(n).after(this.checkValidityDummy)),this.checkValidityDummy.click()},this);o(),this.sendInProgress=!1}else n.disabled=!0,n.form.submit()},_sendInline:function(i){i.preventDefault();var o=this.$("#EntryAddForm").serialize(),s=t.bind(function(e){this.model.set({isAnsweringFormShown:!1}),null!==this.parentThreadline&&this.parentThreadline.set("isInlineOpened",!1),n.eventBus.trigger("newEntry",{tid:e.tid,pid:this.model.get("id"),id:e.id,isNewToUser:!0})},this),a=t.bind(function(e,t){this.sendInProgress=!1,this._enable(),n.eventBus.trigger("notification",{title:t,type:"error",message:e.responseText})},this),r=t.bind(this._disable,this);e.ajax({url:this._requestUrl,type:"POST",dataType:"json",data:o,beforeSend:r}).done(s).fail(a)},render:function(){return this.answeringForm===!1?this._requestAnsweringForm():this.rendered===!1?(this.rendered=!0,this.$el.html(this.answeringForm),t.defer(function(e){e._postRendering()},this)):n.eventBus.trigger("change:DOM"),this}});return d}),define("views/postingSlider",["jquery","marionette","models/app","views/answering","text!templates/spinner.html"],function(e,t,i,n,o){return t.ItemView.extend({answeringForm:!1,events:{"click .btn-answeringClose":"onBtnClose"},initialize:function(e){this.parentThreadline=e.parentThreadline||null,this.listenTo(this.model,"change:isAnsweringFormShown",this.toggleAnsweringForm)},onBtnClose:function(e){e.preventDefault(),this.model.set("isAnsweringFormShown",!1)},toggleAnsweringForm:function(){this.model.get("isAnsweringFormShown")?(this._hideAllAnsweringForms(),this._showAnsweringForm()):this._hideAnsweringForm()},_showAnsweringForm:function(){i.eventBus.trigger("breakAutoreload"),this.answeringForm===!1&&this.$el.html(o),this.$el.slideDown("fast"),this.answeringForm===!1&&(this.answeringForm=new n({el:this.$el,model:this.model,parentThreadline:this.parentThreadline})),this.answeringForm.render()},_hideAnsweringForm:function(){this.$el.slideUp("fast",function(){i.eventBus.trigger("change:DOM")})},_hideAllAnsweringForms:function(){this.collection.forEach(function(e){e.get("id")!==this.model.get("id")&&e.set("isAnsweringFormShown",!1)},this)}})}),define("views/postingLayout",["underscore","marionette","app/core","views/postingAction","views/postingContent","views/postingSlider","text!templates/spinner.html"],function(e,t,i,n,o,s,a){var r=t.Layout.extend({initialize:function(t){e.defaults(t,{inline:!1,parentThreadline:!1}),t.inline?this._loadData(t):this._dataReady(t)},_loadData:function(t){this.$el.html(a),this.model.fetchHtml({success:e.bind(function(){this.$el.html(this.model.get("html")),this._dataReady(t)},this)})},_dataReady:function(e){var t=this.$(".js-data").data("entry");this.model.set(t,{silent:!0});new o({el:this.$(".postingBody"),model:this.model}),new n({el:this.$(".postingLayout-actions"),model:this.model}),new s({el:this.$(".postingLayout-slider"),model:this.model,collection:this.collection,parentThreadline:e.parentThreadline});i.vent.trigger("Vent.Posting.View.afterRender",{$el:this.$el})}});return r}),function(e,t){"function"==typeof define&&define.amd?define("lib/saito/backbone.modelHelper",["underscore","backbone"],function(i,n){return t(i||e._,n||e.Backbone)}):t(_,Backbone)}(this,function(e,t){t.Model.prototype.toggle=function(e){this.set(e,!this.get(e))}}),define("models/posting",["underscore","backbone","models/app","lib/saito/backbone.modelHelper"],function(e,t,i){var n=t.Model.extend({defaults:{isBookmarked:!1,isSolves:!1,isAnsweringFormShown:!1,html:""},initialize:function(){this.listenTo(this,"change:isSolves",this.syncSolved),this.listenTo(this,"change:isBookmarked",this.syncBookmarked)},isRoot:function(){var t=this.get("pid");if(!e.isNumber(t))throw"pid is not a number.";return 0===t},syncBookmarked:function(){this.get("isBookmarked")&&$.ajax({url:i.settings.get("webroot")+"bookmarks/add",type:"POST",dataType:"json",data:"id="+this.get("id")})},syncSolved:function(){$.ajax({url:i.settings.get("webroot")+"entries/solve/"+this.get("id"),type:"POST",dateType:"json"})},fetchHtml:function(t){$.ajax({success:e.bind(function(e){this.set("html",e),t&&t.success&&t.success()},this),type:"POST",dateType:"html",url:i.settings.get("webroot")+"entries/view/"+this.get("id")})}});return n}),define("views/threadlines",["jquery","underscore","marionette","models/app","models/threadline","text!templates/threadline-spinner.html","views/postingLayout","models/posting","lib/saito/jquery.scrollIntoView"],function(e,t,i,n,o,s,a,r){var l=i.ItemView.extend({className:"threadLeaf",tagName:"li",spinnerTpl:s,postings:null,ui:{btnShowThread:".btn_show_thread",linkShowThread:".link_show_thread"},events:{"click @ui.btnShowThread":"toggleInlineOpen","click @ui.linkShowThread":"toggleInlineOpenFromLink"},initialize:function(e){this.postings=e.postings,this.model=new o({id:e.leafData.id,isNewToUser:e.leafData.isNewToUser}),void 0===e.el?this.model.fetch():this.model.set({html:this.el}),this.collection.add(this.model,{silent:!0}),this.attributes={"data-id":e.id},this.listenTo(this.model,"change:isInlineOpened",this._toggleInlineOpened),this.listenTo(this.model,"change:html",this.render)},toggleInlineOpenFromLink:function(e){this.model.get("isAlwaysShownInline")&&this.toggleInlineOpen(e)},toggleInlineOpen:function(e){e.preventDefault(),this.model.toggle("isInlineOpened")},_toggleInlineOpened:function(e,i){return i?(this.model.get("isContentLoaded")||(this.$(".threadLine").after(this.spinnerTpl),this.$(".js-btn-strip").on("click",t.bind(this.toggleInlineOpen,this)),this._insertContent(),this.model.set("isContentLoaded",!0)),void this._showInlineView()):void this._closeInlineView()},_insertContent:function(){var e,t;e=this.model.get("id"),this.postingModel=new r({id:e}),this.postings.add(this.postingModel),t=new a({el:this.$(".threadInline-slider"),inline:!0,model:this.postingModel,collection:this.postings,parentThreadline:this.model})},_showInlineView:function(){var e=t.bind(function(){var e=this.model.get("shouldScrollOnInlineOpen");e?this.$el.scrollIntoView("isInView")===!1&&this.$el.scrollIntoView("bottom"):this.model.set("shouldScrollOnInlineOpen",!0)},this);this.$(".threadLine").fadeOut(100,t.bind(function(){this.$(".js-thread_inline").show(0,e)},this))},_closeInlineView:function(){n.eventBus.trigger("change:DOM"),this.$(".js-thread_inline").hide(0,t.bind(function(){this.$el.find(".threadLine").slideDown(),this._scrollLineIntoView()},this))},_scrollLineIntoView:function(){var e=this.$(".threadLine");e.scrollIntoView("isInView")||e.scrollIntoView("top").effect("highlight",{times:1},3e3)},render:function(){var t,i,n;return i=this.model.get("html"),i.length>0&&(t=this.$el,n=e(this.model.get("html")),this.setElement(n),t.replaceWith(n)),this}});return l}),define("models/thread",["underscore","backbone","collections/threadlines"],function(e,t,i){var n=t.Model.extend({defaults:{isThreadCollapsed:!1},initialize:function(){this.threadlines=new i}});return n}),define("collections/threads",["underscore","backbone","models/thread","models/app","backboneLocalStorage","lib/saito/localStorageHelper"],function(e,t,i,n){var o=t.Collection.extend({model:i,localStorage:function(){var e=n.reqres.request("app:localStorage:key","Threads");return new t.LocalStorage(e)}(),fetch:function(e){return n.reqres.request("app:localStorage:available")?t.Model.prototype.fetch.call(this,e):void 0}});return o}),define("views/thread",["jquery","underscore","backbone","models/app","collections/threadlines","views/threadlines"],function(e,t,i,n,o,s){var a=i.View.extend({className:"threadBox",events:{"click .btn-threadCollapse":"collapseThread","click .js-btn-openAllThreadlines":"openAllThreadlines","click .js-btn-closeAllThreadlines":"closeAllThreadlines","click .js-btn-showAllNewThreadlines":"showAllNewThreadlines"},initialize:function(t){this.postings=t.postings,this.$rootUl=this.$("ul.root"),this.$subThreadRootIl=e(this.$rootUl.find("li:not(:first-child)")[0]),this.model.get("isThreadCollapsed")?this.hide():this.show(),n.reqres.request("app:localStorage:available")||this._hideCollapseButton(),this.listenTo(n.eventBus,"newEntry",this._showNewThreadLine),this.listenTo(this.model,"change:isThreadCollapsed",this.toggleCollapseThread)},_showNewThreadLine:function(e){var t;e.tid===this.model.get("id")&&(t=new s({leafData:e,collection:this.model.threadlines,postings:this.postings}),this._appendThreadlineToThread(e.pid,t.render().$el))},_appendThreadlineToThread:function(e,t){var i,n;i=this.$('.threadLeaf[data-id="'+e+'"]'),n=i.next().not(".js_threadline").find("ul:first"),0===n.length?t.wrap('
        ').parent().wrap("
      • ").parent().insertAfter(i):n.append(t)},openAllThreadlines:function(e){e.preventDefault(),t.each(this.model.threadlines.where({isInlineOpened:!1}),function(e){e.set({isInlineOpened:!0,shouldScrollOnInlineOpen:!1})},this)},closeAllThreadlines:function(e){e&&e.preventDefault(),t.each(this.model.threadlines.where({isInlineOpened:!0}),function(e){e.set({isInlineOpened:!1})},this)},showAllNewThreadlines:function(e){e.preventDefault(),t.each(this.model.threadlines.where({isInlineOpened:!1,isNewToUser:!0}),function(e){e.set({isInlineOpened:!0,shouldScrollOnInlineOpen:!1})},this)},_hideCollapseButton:function(){this.$(".btn-threadCollapse").css("visibility","hidden")},collapseThread:function(e){e.preventDefault(),this.closeAllThreadlines(),this.model.toggle("isThreadCollapsed"),this.model.save()},toggleCollapseThread:function(e,t){t?this.slideUp():this.slideDown()},slideUp:function(){this.$subThreadRootIl.slideUp(300),this.markHidden()},slideDown:function(){this.$subThreadRootIl.slideDown(300),this.markShown()},hide:function(){this.$subThreadRootIl.hide(),this.markHidden()},show:function(){this.$subThreadRootIl.show(),this.markShown()},markShown:function(){e(this.el).find(".fa-thread-closed").removeClass("fa-thread-closed").addClass("fa-thread-open")},markHidden:function(){e(this.el).find(".fa-thread-open").removeClass("fa-thread-open").addClass("fa-thread-closed")}});return a}),define("collections/postings",["underscore","backbone","models/posting"],function(e,t,i){var n=t.Collection.extend({model:i});return n}),define("models/bookmark",["underscore","backbone","models/app","cakeRest"],function(e,t,i,n){var o=t.Model.extend({initialize:function(){this.webroot=i.settings.get("webroot")+"bookmarks/"}});return e.extend(o.prototype,n),o}),define("collections/bookmarks",["underscore","backbone","models/bookmark"],function(e,t,i){var n=t.Collection.extend({model:i});return n}),define("views/bookmark",["jquery","underscore","backbone"],function(e,t,i){var n=i.View.extend({events:{"click .btn-bookmark-delete":"deleteBookmark"},initialize:function(){t.bindAll(this,"render"),this.model.on("destroy",this.removeBookmark,this)},deleteBookmark:function(e){e.preventDefault(),this.model.destroy()},removeBookmark:function(){var t=this.collection;this.$el.hide("slide",null,500,function(){e(this).remove(),t.trigger("bookmark.removed")})}});return n}),define("text!templates/no-content-yet.html",[],function(){return"
        \n	<%- $.i18n.__('ncy.bkm') %>\n
        \n"}),define("views/bookmarks",["jquery","underscore","backbone","views/bookmark","text!templates/no-content-yet.html"],function(e,t,i,n,o){var s=i.View.extend({initialize:function(){this.initCollectionFromDom(".js-bookmark",this.collection,n),this._fillNoContentYet(),this.listenTo(this.collection,"bookmark.removed",this._fillNoContentYet)},_fillNoContentYet:function(){this.collection.isEmpty()&&this.$el.html(t.template(o))}});return s}),define("views/helps",["jquery","underscore","backbone","models/app","drop"],function(e,t,i,n,o){var s=i.View.extend({isHelpShown:!1,_popups:[],_elements:null,tpl:t.template(''),events:function(){var e={};return e["click "+this.indicatorName]="toggle",e},initialize:function(e){this.indicatorName=e.indicatorName,this.elementName=e.elementName,this.webroot=e.webroot,this.activateHelpButton(),this.listenTo(n.eventBus,"change:DOM",this._onDomChange)},activateHelpButton:function(){var t=e(this.indicatorName);t&&(this._isHelpOnPage()?t.addClass("is-active"):t.removeClass("is-active"))},_onDomChange:function(){this.activateHelpButton(),this._reset()},_isHelpOnPage:function(){return this._getElements().length>0},toggle:function(e){e.preventDefault(),this.isHelpShown?this._hide():this._show()},_reset:function(){this._hide(),this._elements=null,this._popups=[]},_getElements:function(){return null===this._elements&&(this._elements=this.$(this.elementName).filter(":visible")),this._elements},_show:function(){if(this.isHelpShown=!0,this._isHelpOnPage()){if(0===this._popups.length){var t=this;this._getElements().each(function(){var i=e(this),n=i.data("shpid"),s=t.tpl({id:n,webroot:t.webroot});t._popups.push(new o({target:this,content:s,classes:"drop-theme-arrows",position:"top center"}))})}this._popups.forEach(function(e){e.open()})}},_hide:function(){this.isHelpShown=!1,this._popups.forEach(function(e){e.close()})}});return s}),define("views/categoryChooser",["jquery","underscore","backbone"],function(e,t,i){return i.View.extend({initialize:function(){this._initDialog()},_initDialog:function(){this.$el.dialog({autoOpen:!1,show:{effect:"scale",duration:200},hide:{effect:"fade",duration:200},width:400,title:e.i18n.__("Categories"),resizable:!1})},_updateDialogPosition:function(){var t=e("#btn-category-chooser"),i=e(window),n=t.offset().left+t.width()-i.scrollLeft()-410,o=t.offset().top-i.scrollTop()+t.height();this.$el.dialog({position:[n,o]})},toggle:function(){this.$el.dialog("isOpen")?this.$el.dialog("close"):(this._updateDialogPosition(),this.$el.dialog("open"))}})}),define("models/slidetab",["jquery","underscore","backbone","app/vent","models/app"],function(e,t,i,n,o){var s=i.Model.extend({defaults:{isOpen:!1},initialize:function(){this.webroot=o.settings.get("webroot"),this.listenTo(this,"change:isOpen",this.onChangeIsOpen)},onChangeIsOpen:function(){n.vent.trigger("slidetab:open",{slidetab:this.get("id"),open:this.get("isOpen")})},sync:function(){var t="show_"+this.get("id");e.post(this.webroot+"users/slidetab_toggle",{slidetabKey:t})}});return s}),define("collections/slidetabs",["underscore","backbone","models/app","models/slidetab"],function(e,t,i,n){var o=t.Collection.extend({model:n,initialize:function(){i.reqres.setHandler("slidetab:open",e.bind(this.isOpen,this))},isOpen:function(e){return this.get(e).get("isOpen")}});return o}),define("views/slidetab",["jquery","underscore","backbone"],function(e,t,i){var n=i.View.extend({events:{"click .slidetab-tab":"clickSlidetab"},initialize:function(){this.model.set({isOpen:this.isOpen()},{silent:!0}),this.listenTo(this.model,"change",this.toggleSlidetab)},isOpen:function(){return this.$el.find(".slidetab-outer").is(":visible")},clickSlidetab:function(){this.model.save("isOpen",!this.model.get("isOpen"))},toggleSlidetab:function(){this.model.get("isOpen")?this.show():this.hide(),this.toggleSlidetabTabInfo()},show:function(){this.$el.animate({width:280}),this.$el.addClass("is-open")},hide:function(){this.$el.animate({width:28},t.bind(function(){this.$el.removeClass("is-open")},this))},toggleSlidetabTabInfo:function(){this.$el.find(".slidetab-tab-info").toggle()}});return n}),define("views/slidetabs",["jquery","underscore","backbone","models/app","views/slidetab"],function(e,t,i,n,o){var s=i.View.extend({initialize:function(){this.webroot=n.settings.get("webroot"),this.initCollectionFromDom(".slidetab",this.collection,o),this.makeSortable()},makeSortable:function(){var i=this.webroot;this.$el.sortable({handle:".slidetab-tab",start:t.bind(function(){this.$el.css("overflow","visible")},this),stop:t.bind(function(){this.$el.css("overflow","hidden")},this),update:function(){var t=e(this).sortable("toArray",{attribute:"data-id"});t=t.map(function(e){return"slidetab_"+e}),e.post(i+"users/slidetab_order",{slidetabOrder:t})}})}});return s}),define("views/app",["jquery","underscore","backbone","models/app","collections/threadlines","views/threadlines","collections/threads","views/thread","collections/postings","models/posting","views/postingLayout","collections/bookmarks","views/bookmarks","views/helps","views/categoryChooser","collections/slidetabs","views/slidetabs","views/answering","jqueryUi"],function(e,t,i,n,o,s,a,r,l,d,c,u,h,p,f,m,g,v){var b=i.View.extend({el:e("body"),autoPageReloadTimer:!1,_domInitializers:{".entry.add-not-inline":"_initAnsweringNotInlined","#bookmarks":"_initBookmarks","#category-chooser":"_initCategoryChooser",".js-entry-view-core":"_initPostings","#slidetabs":"_initSlidetabs",".threadBox":"_initThreadBoxes",".threadLeaf":"_initThreadLeafs",".users.logout":"_initLogout"},events:{"click #showLoginForm":"showLoginForm","focus #header-searchField":"widenSearchField","click #btn-scrollToTop":"scrollToTop","click #btn-manuallyMarkAsRead":"manuallyMarkAsRead","click #btn-category-chooser":"toggleCategoryChooser","click #btn_header_logo":"_onEntriesIndexReload"},initialize:function(){this.threads=new a,"entries"===n.request.controller&&"index"===n.request.action&&this.threads.fetch(),this.postings=new l,this.threadLines=new o,this.listenTo(n.eventBus,"initAutoreload",this.initAutoreload),this.listenTo(n.eventBus,"breakAutoreload",this.breakAutoreload),this.$el.on("dialogopen",this.fixJqueryUiDialog)},initFromDom:function(i){if(t.each(this._domInitializers,function(t,i){var n=e(i);n.length>0&&this[t](n)},this),this.initAutoreload(),this.initHelp(".shp"),n.status.start(),this._showPage(i.SaitoApp.timeAppStart,i.contentTimer),n.eventBus.trigger("notification",i.SaitoApp),window.location.href.indexOf("/jump:")>-1){var o=/jump:(\d+)/.exec(window.location.href);
-this.scrollToThread(o[1]),window.history.replaceState("object or string","Title",window.location.pathname.replace(/jump:\d+(\/)?/,""))}},_initAnsweringNotInlined:function(e){this.answeringForm=new v({el:e,model:new d({id:"foo"})})},_initBookmarks:function(e){var t,i=new u;t=new h({el:e,collection:i})},_initCategoryChooser:function(e){this.categoryChooser=new f({el:e})},_initLogout:function(){n.commands.execute("app:localStorage:clear")},_initPostings:function(i){t.each(i,function(t){var i,n,o;i=parseInt(t.getAttribute("data-id"),10),o=new d({id:i}),this.postings.add(o,{silent:!0}),n=new c({el:e(t),model:this.postings.get(i),collection:this.postings})},this)},_initSlidetabs:function(e){var t,i;t=new m,i=new g({el:e,collection:t})},_initThreadBoxes:function(i){t.each(i,function(t){var i,o;o=parseInt(e(t).attr("data-id"),10),this.threads.get(o)||this.threads.add([{id:o,isThreadCollapsed:"entries"===n.request.controller&&"index"===n.request.action&&n.currentUser.get("user_show_thread_collapsed")}],{silent:!0}),i=new r({el:e(t),postings:this.postings,model:this.threads.get(o)})},this)},_initThreadLeafs:function(i){t.each(i,function(t){var i=JSON.parse(t.getAttribute("data-leaf"));i.isNewToUser=i["new"],delete i["new"];var n,o=this.threads.get(i.tid);n=o?o.threadlines:this.threadLines;new s({el:e(t),leafData:i,postings:this.postings,collection:n})},this)},_showPage:function(t,i){var o=function(){n.eventBus.trigger("isAppVisible",!0)};n.request.isMobile||(new Date).getTime()-t>1500?(e("#content").css("visibility","visible"),o()):e("#content").css({visibility:"visible",opacity:0}).animate({opacity:1},{duration:150,easing:"easeInOutQuart",complete:o}),i.cancel()},fixJqueryUiDialog:function(){e(".ui-icon-closethick").attr("class","jqueryUi-closethick-fix").html("")},toggleCategoryChooser:function(e){e.preventDefault(),this.categoryChooser.toggle()},initHelp:function(e){new p({el:"body",elementName:e,indicatorName:"#shp-show",webroot:n.settings.get("webroot")})},scrollToThread:function(t){e(".threadBox[data-id="+t+"]")[0].scrollIntoView("top")},initAutoreload:function(){this.breakAutoreload(),n.settings.get("autoPageReload")&&(this.autoPageReloadTimer=setTimeout(t.bind(function(){window.location=n.settings.get("webroot")+"entries/"},this),1e3*n.settings.get("autoPageReload")))},breakAutoreload:function(){this.autoPageReloadTimer!==!1&&(clearTimeout(this.autoPageReloadTimer),this.autoPageReloadTimer=!1)},widenSearchField:function(t){var i=350;t.preventDefault(),e(t.currentTarget).width()",{"class":"ui-pnotify "+l.addclass,css:{display:"none"},mouseenter:function(e){l.nonblock&&e.stopPropagation(),l.mouse_reset&&"out"==r&&(f.stop(!0),r="in",f.css("height","auto").animate({width:l.width,opacity:l.nonblock?l.nonblock_opacity:l.opacity},"fast")),l.nonblock&&f.animate({opacity:l.nonblock_opacity},"fast"),l.hide&&l.mouse_reset&&f.pnotify_cancel_remove(),l.sticker&&!l.nonblock&&f.sticker.trigger("pnotify_icon").css("visibility","visible"),l.closer&&!l.nonblock&&f.closer.css("visibility","visible")},mouseleave:function(t){l.nonblock&&t.stopPropagation(),c=null,f.css("cursor","auto"),l.nonblock&&"out"!=r&&f.animate({opacity:l.opacity},"fast"),l.hide&&l.mouse_reset&&f.pnotify_queue_remove(),l.sticker_hover&&f.sticker.css("visibility","hidden"),l.closer_hover&&f.closer.css("visibility","hidden"),e.pnotify_position_all()},mouseover:function(e){l.nonblock&&e.stopPropagation()},mouseout:function(e){l.nonblock&&e.stopPropagation()},mousemove:function(e){l.nonblock&&(e.stopPropagation(),h(e,"onmousemove"))},mousedown:function(e){l.nonblock&&(e.stopPropagation(),e.preventDefault(),h(e,"onmousedown"))},mouseup:function(e){l.nonblock&&(e.stopPropagation(),e.preventDefault(),h(e,"onmouseup"))},click:function(e){l.nonblock&&(e.stopPropagation(),h(e,"onclick"))},dblclick:function(e){l.nonblock&&(e.stopPropagation(),h(e,"ondblclick"))}});f.opts=l,f.container=e("
        ",{"class":p.container+" ui-pnotify-container "+("error"==l.type?p.error:"info"==l.type?p.info:"success"==l.type?p.success:p.notice)}).appendTo(f),""!=l.cornerclass&&f.container.removeClass("ui-corner-all").addClass(l.cornerclass),l.shadow&&f.container.addClass("ui-pnotify-shadow"),f.pnotify_version="1.2.0",f.pnotify=function(t){var i=l;"string"==typeof t?l.text=t:l=e.extend({},l,t);for(var n in l)"string"==typeof n&&n.match(/^pnotify_/)&&(l[n.replace(/^pnotify_/,"")]=l[n]);return f.opts=l,l.cornerclass!=i.cornerclass&&f.container.removeClass("ui-corner-all").addClass(l.cornerclass),l.shadow!=i.shadow&&(l.shadow?f.container.addClass("ui-pnotify-shadow"):f.container.removeClass("ui-pnotify-shadow")),l.addclass===!1?f.removeClass(i.addclass):l.addclass!==i.addclass&&f.removeClass(i.addclass).addClass(l.addclass),l.title===!1?f.title_container.slideUp("fast"):l.title!==i.title&&(l.title_escape?f.title_container.text(l.title).slideDown(200):f.title_container.html(l.title).slideDown(200)),l.text===!1?f.text_container.slideUp("fast"):l.text!==i.text&&(l.text_escape?f.text_container.text(l.text).slideDown(200):f.text_container.html(l.insert_brs?String(l.text).replace(/\n/g,"
        "):l.text).slideDown(200)),f.pnotify_history=l.history,f.pnotify_hide=l.hide,l.type!=i.type&&f.container.removeClass(p.error+" "+p.notice+" "+p.success+" "+p.info).addClass("error"==l.type?p.error:"info"==l.type?p.info:"success"==l.type?p.success:p.notice),(l.icon!==i.icon||l.icon===!0&&l.type!=i.type)&&(f.container.find("div.ui-pnotify-icon").remove(),l.icon!==!1&&e("
        ",{"class":"ui-pnotify-icon"}).append(e("",{"class":l.icon===!0?"error"==l.type?p.error_icon:"info"==l.type?p.info_icon:"success"==l.type?p.success_icon:p.notice_icon:l.icon})).prependTo(f.container)),l.width!==i.width&&f.animate({width:l.width}),l.min_height!==i.min_height&&f.container.animate({minHeight:l.min_height}),l.opacity!==i.opacity&&f.fadeTo(l.animate_speed,l.opacity),!l.closer||l.nonblock?f.closer.css("display","none"):f.closer.css("display","block"),!l.sticker||l.nonblock?f.sticker.css("display","none"):f.sticker.css("display","block"),f.sticker.trigger("pnotify_icon"),l.sticker_hover?f.sticker.css("visibility","hidden"):l.nonblock||f.sticker.css("visibility","visible"),l.closer_hover?f.closer.css("visibility","hidden"):l.nonblock||f.closer.css("visibility","visible"),l.hide?i.hide||f.pnotify_queue_remove():f.pnotify_cancel_remove(),f.pnotify_queue_position(),f},f.pnotify_position=function(e){var t=f.opts.stack;if(t){t.nextpos1||(t.nextpos1=t.firstpos1),t.nextpos2||(t.nextpos2=t.firstpos2),t.addpos2||(t.addpos2=0);var i="none"==f.css("display");if(!i||e){var n,s,a,r={};switch(t.dir1){case"down":a="top";break;case"up":a="bottom";break;case"left":a="right";break;case"right":a="left"}n=parseInt(f.css(a)),isNaN(n)&&(n=0),"undefined"!=typeof t.firstpos1||i||(t.firstpos1=n,t.nextpos1=t.firstpos1);var l;switch(t.dir2){case"down":l="top";break;case"up":l="bottom";break;case"left":l="right";break;case"right":l="left"}if(s=parseInt(f.css(l)),isNaN(s)&&(s=0),"undefined"!=typeof t.firstpos2||i||(t.firstpos2=s,t.nextpos2=t.firstpos2),("down"==t.dir1&&t.nextpos1+f.height()>o.height()||"up"==t.dir1&&t.nextpos1+f.height()>o.height()||"left"==t.dir1&&t.nextpos1+f.width()>o.width()||"right"==t.dir1&&t.nextpos1+f.width()>o.width())&&(t.nextpos1=t.firstpos1,t.nextpos2+=t.addpos2+("undefined"==typeof t.spacing2?25:t.spacing2),t.addpos2=0),t.animation&&t.nextpos2t.addpos2&&(t.addpos2=f.height());break;case"left":case"right":f.outerWidth(!0)>t.addpos2&&(t.addpos2=f.width())}if(t.nextpos1)if(t.animation&&(n>t.nextpos1||r.top||r.bottom||r.right||r.left))switch(t.dir1){case"down":r.top=t.nextpos1+"px";break;case"up":r.bottom=t.nextpos1+"px";break;case"left":r.right=t.nextpos1+"px";break;case"right":r.left=t.nextpos1+"px"}else f.css(a,t.nextpos1+"px");switch((r.top||r.bottom||r.right||r.left)&&f.animate(r,{duration:500,queue:!1}),t.dir1){case"down":case"up":t.nextpos1+=f.height()+("undefined"==typeof t.spacing1?25:t.spacing1);break;case"left":case"right":t.nextpos1+=f.width()+("undefined"==typeof t.spacing1?25:t.spacing1)}}}},f.pnotify_queue_position=function(t){i&&clearTimeout(i),t||(t=10),i=setTimeout(e.pnotify_position_all,t)},f.pnotify_display=function(){f.parent().length||f.appendTo(n),l.before_open&&l.before_open(f)===!1||("top"!=l.stack.push&&f.pnotify_position(!0),"fade"==l.animation||"fade"==l.animation.effect_in?f.show().fadeTo(0,0).hide():1!=l.opacity&&f.show().fadeTo(0,l.opacity).hide(),f.animate_in(function(){l.after_open&&l.after_open(f),f.pnotify_queue_position(),l.hide&&f.pnotify_queue_remove()}))},f.pnotify_remove=function(){f.timer&&(window.clearTimeout(f.timer),f.timer=null),l.before_close&&l.before_close(f)===!1||f.animate_out(function(){l.after_close&&l.after_close(f)===!1||(f.pnotify_queue_position(),l.remove&&f.detach())})},f.animate_in=function(e){r="in";var t;t="undefined"!=typeof l.animation.effect_in?l.animation.effect_in:l.animation,"none"==t?(f.show(),e()):"show"==t?f.show(l.animate_speed,e):"fade"==t?f.show().fadeTo(l.animate_speed,l.opacity,e):"slide"==t?f.slideDown(l.animate_speed,e):"function"==typeof t?t("in",e,f):f.show(t,"object"==typeof l.animation.options_in?l.animation.options_in:{},l.animate_speed,e)},f.animate_out=function(e){r="out";var t;t="undefined"!=typeof l.animation.effect_out?l.animation.effect_out:l.animation,"none"==t?(f.hide(),e()):"show"==t?f.hide(l.animate_speed,e):"fade"==t?f.fadeOut(l.animate_speed,e):"slide"==t?f.slideUp(l.animate_speed,e):"function"==typeof t?t("out",e,f):f.hide(t,"object"==typeof l.animation.options_out?l.animation.options_out:{},l.animate_speed,e)},f.pnotify_cancel_remove=function(){f.timer&&window.clearTimeout(f.timer)},f.pnotify_queue_remove=function(){f.pnotify_cancel_remove(),f.timer=window.setTimeout(function(){f.pnotify_remove()},isNaN(l.delay)?0:l.delay)},f.closer=e("
        ",{"class":"ui-pnotify-closer",css:{cursor:"pointer",visibility:l.closer_hover?"hidden":"visible"},click:function(){f.pnotify_remove(),f.sticker.css("visibility","hidden"),f.closer.css("visibility","hidden")}}).append(e("",{"class":p.closer})).appendTo(f.container),(!l.closer||l.nonblock)&&f.closer.css("display","none"),f.sticker=e("
        ",{"class":"ui-pnotify-sticker",css:{cursor:"pointer",visibility:l.sticker_hover?"hidden":"visible"},click:function(){l.hide=!l.hide,l.hide?f.pnotify_queue_remove():f.pnotify_cancel_remove(),e(this).trigger("pnotify_icon")}}).bind("pnotify_icon",function(){e(this).children().removeClass(p.pin_up+" "+p.pin_down).addClass(l.hide?p.pin_up:p.pin_down)}).append(e("",{"class":p.pin_up})).appendTo(f.container),(!l.sticker||l.nonblock)&&f.sticker.css("display","none"),l.icon!==!1&&e("
        ",{"class":"ui-pnotify-icon"}).append(e("",{"class":l.icon===!0?"error"==l.type?p.error_icon:"info"==l.type?p.info_icon:"success"==l.type?p.success_icon:p.notice_icon:l.icon})).prependTo(f.container),f.title_container=e("
        ",{"class":"ui-pnotify-title"}).appendTo(f.container),l.title===!1?f.title_container.hide():l.title_escape?f.title_container.text(l.title):f.title_container.html(l.title),f.text_container=e("
        ",{"class":"ui-pnotify-text"}).appendTo(f.container),l.text===!1?f.text_container.hide():l.text_escape?f.text_container.text(l.text):f.text_container.html(l.insert_brs?String(l.text).replace(/\n/g,"
        "):l.text),"string"==typeof l.width&&f.css("width",l.width),"string"==typeof l.min_height&&f.container.css("min-height",l.min_height),f.pnotify_history=l.history,f.pnotify_hide=l.hide;var m=o.data("pnotify");if((null==m||"object"!=typeof m)&&(m=[]),m="top"==l.stack.push?e.merge([f],m):e.merge(m,[f]),o.data("pnotify",m),"top"==l.stack.push&&f.pnotify_queue_position(1),l.after_init&&l.after_init(f),l.history){var g=o.data("pnotify_history");if("undefined"==typeof g){g=e("
        ",{"class":"ui-pnotify-history-container "+p.hi_menu,mouseleave:function(){g.animate({top:"-"+t+"px"},{duration:100,queue:!1})}}).append(e("
        ",{"class":"ui-pnotify-history-header",text:"Redisplay"})).append(e("\n    <% if (geolocation) { %>\n        \n    <% } %>\n    \n    \n
        '}),define("modules/usermap/views/controls",["jquery","marionette","lib/leaflet/mq","text!modules/usermap/templates/controls.html"],function(e,t,i,n){return t.ItemView.extend({template:_.template(n),ui:{search:".js-btn-search",locate:".js-btn-locate",clear:".js-btn-clear",spinner:".saito-usermap-spinner"},events:{"click @ui.search":"_search","click @ui.locate":"_locate","click @ui.clear":"_clear"},initialize:function(t){this.mapLayer=t.mapLayer,this.mapModel=t.mapModel,this.params=t.params,this.mapLayer.on("click",this._repin,this),this.mapLayer.on("locationfound",this._repin,this),e(this.params.fields.edit).on("keypress",_.bind(this._onSearchFieldChange,this)),e(this.params.fields.edit).on("keyup",_.bind(this._updateSearchButtonTitle,this))},_clear:function(e){e.preventDefault(),this.model.set({lat:"",lng:"",zoom:""}),this._updateFields()},_search:function(t){t.preventDefault(),this._activityStart();var n=e(this.params.fields.edit).val();i.geocode().search(n).on("success",_.bind(function(e){var t=e.result.best;this._repin(t)},this))},_onSearchFieldChange:function(e){13===e.which&&this._search(e)},_activityStart:function(){this.ui.spinner.show()},_activityStop:function(){this.ui.spinner.hide()},_updateSearchButtonTitle:function(){var t=e(this.params.fields.edit).val();return t?(this.ui.search.removeAttr("disabled"),void this.ui.search.html(e.i18n.__("user.map.b.search",{string:t}))):void this.ui.search.attr("disabled","disabled")},_locate:function(e){e.preventDefault(),this._activityStart(),this.mapLayer.locate()},_repin:function(e){var t=this._round({lat:e.latlng.lat,lng:e.latlng.lng,zoom:this.mapLayer.getZoom()});this._activityStop(),this.model.set(t),this.mapModel.set(t),this._updateFields()},_round:function(e){return _.each(["lat","lng"],function(t){e[t]=e[t].toFixed(4)}),e},onRender:function(){this._updateSearchButtonTitle()},_updateFields:function(){var t=this.params.fields.update,i=this.model;_.each(["lat","lng","zoom"],_.bind(function(n){var o=n;t&&t[n]&&_.each(t[n],function(t){var n=e(t),s=i.get(o);"input"===n.prop("tagName").toLowerCase()?n.val(s):n.html(s)})},this)),this.render()},_geolocation:function(){return"geolocation"in navigator},serializeData:function(){var e=this.model.toJSON();return e.geolocation=this._geolocation(),e}})}),define("lib/leaflet/leaflet",[],function(){return"undefined"!=typeof L?L:void 0}),define("modules/usermap/views/map",["marionette","templateHelpers","lib/leaflet/leaflet","lib/leaflet/mq"],function(e,t,i,n){return e.ItemView.extend({collectionEvents:{add:"_createMarker",change:"_repinMarker"},modelEvents:{"change:lat":"_setView"},template:{},templateHelpers:t,mapLayer:null,markersLayer:null,markers:{},initialize:function(){"world"===this.model.get("type")&&this._zoomView(),this.markersLayer=new i.MarkerClusterGroup,this._map()},_zoomView:function(){var e=40,t=$("#content"),i={width:t.width(),top:t.offset().top},n={height:i.width*(120/198)},o={height:$(window).height()};o.available=o.height-i.top,n.height>o.available&&(n.height=o.available-e),this.$el.height(n.height)},_createMarker:function(e){var t,n=e.latlng(),o=i.marker(n);if(n[0]){if(e){var s=this.templateHelpers.User.linkToUserProfile(e.get("id"),e.get("name"));o.bindPopup(s)}if(this.markersLayer.addLayer(o),this.markers[e.get("id")]=o,t=this.model.get("type"),"single"===t||"edit"===t){var a={lat:e.get("lat"),lng:e.get("lng")};a.zoom="edit"===t?e.get("zoom"):this.model.get("maxZoom"),this.model.set(a)}}},_repinMarker:function(e){if(!e.get("lat"))return void this._clearMarkers();var t=this.markers[e.get("id")];if(!t)return void this._createMarker(e);var i=t.getLatLng();i.lat=e.get("lat"),i.lng=e.get("lng"),t.update()},_clearMarkers:function(){this.markers={},this.markersLayer.clearLayers()},_setView:function(){var e=this.model.get("lat"),t=this.model.get("lng"),i=this.model.get("zoom");this.mapLayer.setView([e,t],i)},_map:function(){var e=n.mapLayer();this.mapLayer=i.map(this.el,{closePopupOnClick:!1,maxZoom:this.model.get("maxZoom"),minZoom:this.model.get("minZoom"),maxBounds:this.model.get("maxBounds")}),this._setView(),this.mapLayer.addLayer(e),this.mapLayer.addLayer(this.markersLayer)}})}),define("modules/usermap/models/map",["backbone"],function(e){var t=e.Model.extend({maxZoom:{edit:14,single:11,world:11},defaults:{lat:30,lng:0,zoom:2,maxZoom:11,minZoom:1,maxBounds:[[-90,-180],[90,180]]},initialize:function(){this.maxZoom[this.get("type")]&&this.set("maxZoom",this.maxZoom[this.get("type")])}});return t}),define("modules/usermap/models/user",["backbone"],function(e){var t=e.Model.extend({latlng:function(){return[this.get("lat"),this.get("lng")]}});return t}),define("modules/usermap/collections/users",["backbone","modules/usermap/models/user"],function(e,t){var i=e.Collection.extend({model:t});return i}),define("text!modules/usermap/templates/layout.html",[],function(){return"
        \n    
        \n    
        \n
        "}),define("modules/usermap/usermap",["app/core","marionette","modules/usermap/views/controls","modules/usermap/views/map","modules/usermap/models/map","modules/usermap/collections/users","text!modules/usermap/templates/layout.html"],function(e,t,i,n,o,s,a){var r=e.module("usermap",{startWithParent:!1});return r.addInitializer(function(){var e=$(".saito-usermap");if(e.length){var l,d,c=e.data("users"),u=new s,h=e.data("params"),p=t.Layout.extend({el:e,template:a,regions:{mapr:".saito-usermap-map",controls:".saito-usermap-controls"}}),f=(new p).render(),m=new o(h);d=new n({el:f.$(".saito-usermap-map"),model:m,collection:u}),u.add(c),"edit"===h.type&&(d.$el.addClass("input"),l=r.ControlView=new i({model:u.at(0),mapLayer:d.mapLayer,mapModel:m,params:h}),f.controls.show(l))}}),r}),define("app/time",["moment","moment-de"],function(e){var t=e().lang()._longDateFormat;t.LT="H:mm",e.lang("de",{longDateFormat:t})}),define("lib/Saito/isAppVisible",["jquery","underscore","models/app"],function(e,t,i){var n=function(){this.initialize.apply(this,arguments)};return t.extend(n.prototype,{_isVisibleOldSchool:!0,initialize:function(){i.reqres.setHandler("isAppVisible",this.isVisible,this),this._isVisibleOldSchool=this._isAppVisibleHtml5(),this._initAppVisibleOldSchool()},isVisible:function(){return this._isVisibleOldSchool},_initAppVisibleOldSchool:function(){e(window).blur(t.bind(function(){this._isVisibleOldSchool=!1},this)),e(window).focus(t.bind(function(){this._isVisibleOldSchool=!0},this))},_isAppVisibleHtml5:function(){var e,t=!1;return"undefined"!=typeof document.hidden?e="hidden":"undefined"!=typeof document.webkitHidden&&(e="webkitHidden"),document[e]&&(t=document[e]),!t}}),new n}),function(e){e.i18n={dict:null,setDictionary:function(e){this.dict=e},_:function(e,t){var i=e;return this.dict&&this.dict[e]&&(i=this.dict[e]),this.printf(i,t)},printf:function(e,t){if(!t)return e;for(var i="",n=/%(\d+)\$s/g,o=n.exec(e);o;){var s=parseInt(o[1],10)-1;e=e.replace("%"+o[1]+"$s",t[s]),o=n.exec(e)}var a=e.split("%s");if(a.length>1)for(var r=0;r0&&a[r].lastIndexOf("%")==a[r].length-1&&(a[r]+="s"+a.splice(r+1,1)[0]),i+=a[r]+t[r];return i+a[a.length-1]}},e.fn._t=function(t,i){return e(this).text(e.i18n._(t,i))}}(jQuery),define("lib/jquery.i18n/jquery.i18n",function(){}),define("lib/jquery.i18n/jquery.i18n.extend",["jquery","lib/jquery.i18n/jquery.i18n"],function(e){e.extend(e.i18n,{currentString:"",setDict:function(e){this.dict=e},setUrl:function(e){this.dictUrl=e,this._loadDict()},_loadDict:function(){return e.ajax({url:this.dictUrl,dataType:"json",async:!1,cache:!0,success:e.proxy(function(e){this.dict=e},this)})},__:function(e,t){var i=e;return"string"==typeof this.dict[e]&&""!==this.dict[e]&&(i=this.dict[e]),"object"==typeof t&&(i=this._insert(i,t)),i},_insert:function(e,t){return e.replace(/:([-\w]+)/g,function(e,i){return"undefined"!=typeof t[i]?t[i]:e})}})}),function(e,t){"function"==typeof define&&define.amd?define("lib/saito/backbone.initHelper",["underscore","backbone"],function(i,n){return t(i||e._,n||e.Backbone)}):t(_,Backbone)}(this,function(e,t){t.View.prototype.initCollectionFromDom=function(e,t,i){var n=function(e,t,n){e.add({id:t}),new i({el:n,model:e.get(t),collection:e})};$(e).each(function(){n(t,$(this).data("id"),this)})}}),define("app/app",["marionette","app/core","app/vent","modules/html5-notification/html5-notification"],function(e,t,i){var n=SaitoApp,o=function(e){require(["jquery","domReady"],function(t,i){t.isReady?e():i(function(){e()})})},s={fireOnPageCallbacks:function(e){var t=e.afterAppInit;_.each(t,function(e){e()}),i.vent.on("isAppVisible",_.once(function(){var t=e.afterViewInit;_.each(t,function(e){e()})}))},bootstrapShoutbox:function(){o(function(){require(["modules/shoutbox/shoutbox"],function(e){e.start()})})},bootstrapApp:function(e){require(["domReady","views/app","backbone","jquery","models/app","views/notification","views/prerequisitesTester","modules/html5-notification/html5-notification","modules/usermap/usermap","app/time","lib/Saito/isAppVisible","lib/jquery.i18n/jquery.i18n.extend","jqueryDropdown","lib/saito/backbone.initHelper","lib/saito/backbone.modelHelper","fastclick"],function(t,i,a,r,l,d,c,u,h){var p,f,m;l.settings.set(e.SaitoApp.app.settings),r.i18n.setUrl(l.settings.get("webroot")+"da/langJs"),l.currentUser.set(e.SaitoApp.currentUser),l.request=e.SaitoApp.request,u.start(),h.start(),new d;var g=e.SaitoApp.callbacks.beforeAppInit;_.each(g,function(e){e()}),window.addEventListener("load",function(){new FastClick(document.body)},!1),m=new c({el:r(".app-prerequisites-warnings")}),p=new i,f=function(){"shouts"in n&&s.bootstrapShoutbox(),s.fireOnPageCallbacks(e.SaitoApp.callbacks),p.initFromDom({SaitoApp:e.SaitoApp,contentTimer:e.contentTimer})},o(f)})}},a=t;return a.addInitializer(s.bootstrapApp),a.start({contentTimer:contentTimer,SaitoApp:n}),i.reqres.setHandler("webroot",function(){return n.app.settings.webroot}),i.reqres.setHandler("apiroot",function(){return n.app.settings.webroot+"api/v1/"}),a}),require.config({paths:{common:"../dist/common.min",templateHelpers:"lib/saito/templateHelpers"}}),function(e){e.contentTimer={show:function(){$("#content").css("visibility","visible"),console.warn("DOM ready timed out: show content fallback used."),delete this.timeoutID},setup:function(){this.cancel();var t=this;this.timeoutID=e.setTimeout(function(){t.show()},5e3)},cancel:function(){"number"==typeof this.timeoutID&&(e.clearTimeout(this.timeoutID),delete this.timeoutID)}},e.contentTimer.setup()}(window),require(["lib/bootstrapHelper","common"],function(){require(["app/app"])}),define("main",function(){});
\ No newline at end of file
+this.scrollToThread(o[1]),window.history.replaceState("object or string","Title",window.location.pathname.replace(/jump:\d+(\/)?/,""))}},_initAnsweringNotInlined:function(e){this.answeringForm=new v({el:e,model:new d({id:"foo"})})},_initBookmarks:function(e){var t,i=new u;t=new h({el:e,collection:i})},_initCategoryChooser:function(e){this.categoryChooser=new f({el:e})},_initLogout:function(){n.commands.execute("app:localStorage:clear")},_initPostings:function(i){t.each(i,function(t){var i,n,o;i=parseInt(t.getAttribute("data-id"),10),o=new d({id:i}),this.postings.add(o,{silent:!0}),n=new c({el:e(t),model:this.postings.get(i),collection:this.postings})},this)},_initSlidetabs:function(e){var t,i;t=new m,i=new g({el:e,collection:t})},_initThreadBoxes:function(i){t.each(i,function(t){var i,o;o=parseInt(e(t).attr("data-id"),10),this.threads.get(o)||this.threads.add([{id:o,isThreadCollapsed:"entries"===n.request.controller&&"index"===n.request.action&&n.currentUser.get("user_show_thread_collapsed")}],{silent:!0}),i=new r({el:e(t),postings:this.postings,model:this.threads.get(o)})},this)},_initThreadLeafs:function(i){t.each(i,function(t){var i=JSON.parse(t.getAttribute("data-leaf"));i.isNewToUser=i["new"],delete i["new"];var n,o=this.threads.get(i.tid);n=o?o.threadlines:this.threadLines;new s({el:e(t),leafData:i,postings:this.postings,collection:n})},this)},_showPage:function(t,i){var o=function(){n.eventBus.trigger("isAppVisible",!0)};n.request.isMobile||(new Date).getTime()-t>1500?(e("#content").css("visibility","visible"),o()):e("#content").css({visibility:"visible",opacity:0}).animate({opacity:1},{duration:150,easing:"easeInOutQuart",complete:o}),i.cancel()},fixJqueryUiDialog:function(){e(".ui-icon-closethick").attr("class","jqueryUi-closethick-fix").html("")},toggleCategoryChooser:function(e){e.preventDefault(),this.categoryChooser.toggle()},initHelp:function(e){new p({el:"body",elementName:e,indicatorName:"#shp-show",webroot:n.settings.get("webroot")})},scrollToThread:function(t){e(".threadBox[data-id="+t+"]")[0].scrollIntoView("top")},initAutoreload:function(){this.breakAutoreload(),n.settings.get("autoPageReload")&&(this.autoPageReloadTimer=setTimeout(t.bind(function(){window.location=n.settings.get("webroot")+"entries/"},this),1e3*n.settings.get("autoPageReload")))},breakAutoreload:function(){this.autoPageReloadTimer!==!1&&(clearTimeout(this.autoPageReloadTimer),this.autoPageReloadTimer=!1)},widenSearchField:function(t){var i=350;t.preventDefault(),e(t.currentTarget).width()",{"class":"ui-pnotify "+l.addclass,css:{display:"none"},mouseenter:function(e){l.nonblock&&e.stopPropagation(),l.mouse_reset&&"out"==r&&(f.stop(!0),r="in",f.css("height","auto").animate({width:l.width,opacity:l.nonblock?l.nonblock_opacity:l.opacity},"fast")),l.nonblock&&f.animate({opacity:l.nonblock_opacity},"fast"),l.hide&&l.mouse_reset&&f.pnotify_cancel_remove(),l.sticker&&!l.nonblock&&f.sticker.trigger("pnotify_icon").css("visibility","visible"),l.closer&&!l.nonblock&&f.closer.css("visibility","visible")},mouseleave:function(t){l.nonblock&&t.stopPropagation(),c=null,f.css("cursor","auto"),l.nonblock&&"out"!=r&&f.animate({opacity:l.opacity},"fast"),l.hide&&l.mouse_reset&&f.pnotify_queue_remove(),l.sticker_hover&&f.sticker.css("visibility","hidden"),l.closer_hover&&f.closer.css("visibility","hidden"),e.pnotify_position_all()},mouseover:function(e){l.nonblock&&e.stopPropagation()},mouseout:function(e){l.nonblock&&e.stopPropagation()},mousemove:function(e){l.nonblock&&(e.stopPropagation(),h(e,"onmousemove"))},mousedown:function(e){l.nonblock&&(e.stopPropagation(),e.preventDefault(),h(e,"onmousedown"))},mouseup:function(e){l.nonblock&&(e.stopPropagation(),e.preventDefault(),h(e,"onmouseup"))},click:function(e){l.nonblock&&(e.stopPropagation(),h(e,"onclick"))},dblclick:function(e){l.nonblock&&(e.stopPropagation(),h(e,"ondblclick"))}});f.opts=l,f.container=e("
        ",{"class":p.container+" ui-pnotify-container "+("error"==l.type?p.error:"info"==l.type?p.info:"success"==l.type?p.success:p.notice)}).appendTo(f),""!=l.cornerclass&&f.container.removeClass("ui-corner-all").addClass(l.cornerclass),l.shadow&&f.container.addClass("ui-pnotify-shadow"),f.pnotify_version="1.2.0",f.pnotify=function(t){var i=l;"string"==typeof t?l.text=t:l=e.extend({},l,t);for(var n in l)"string"==typeof n&&n.match(/^pnotify_/)&&(l[n.replace(/^pnotify_/,"")]=l[n]);return f.opts=l,l.cornerclass!=i.cornerclass&&f.container.removeClass("ui-corner-all").addClass(l.cornerclass),l.shadow!=i.shadow&&(l.shadow?f.container.addClass("ui-pnotify-shadow"):f.container.removeClass("ui-pnotify-shadow")),l.addclass===!1?f.removeClass(i.addclass):l.addclass!==i.addclass&&f.removeClass(i.addclass).addClass(l.addclass),l.title===!1?f.title_container.slideUp("fast"):l.title!==i.title&&(l.title_escape?f.title_container.text(l.title).slideDown(200):f.title_container.html(l.title).slideDown(200)),l.text===!1?f.text_container.slideUp("fast"):l.text!==i.text&&(l.text_escape?f.text_container.text(l.text).slideDown(200):f.text_container.html(l.insert_brs?String(l.text).replace(/\n/g,"
        "):l.text).slideDown(200)),f.pnotify_history=l.history,f.pnotify_hide=l.hide,l.type!=i.type&&f.container.removeClass(p.error+" "+p.notice+" "+p.success+" "+p.info).addClass("error"==l.type?p.error:"info"==l.type?p.info:"success"==l.type?p.success:p.notice),(l.icon!==i.icon||l.icon===!0&&l.type!=i.type)&&(f.container.find("div.ui-pnotify-icon").remove(),l.icon!==!1&&e("
        ",{"class":"ui-pnotify-icon"}).append(e("",{"class":l.icon===!0?"error"==l.type?p.error_icon:"info"==l.type?p.info_icon:"success"==l.type?p.success_icon:p.notice_icon:l.icon})).prependTo(f.container)),l.width!==i.width&&f.animate({width:l.width}),l.min_height!==i.min_height&&f.container.animate({minHeight:l.min_height}),l.opacity!==i.opacity&&f.fadeTo(l.animate_speed,l.opacity),!l.closer||l.nonblock?f.closer.css("display","none"):f.closer.css("display","block"),!l.sticker||l.nonblock?f.sticker.css("display","none"):f.sticker.css("display","block"),f.sticker.trigger("pnotify_icon"),l.sticker_hover?f.sticker.css("visibility","hidden"):l.nonblock||f.sticker.css("visibility","visible"),l.closer_hover?f.closer.css("visibility","hidden"):l.nonblock||f.closer.css("visibility","visible"),l.hide?i.hide||f.pnotify_queue_remove():f.pnotify_cancel_remove(),f.pnotify_queue_position(),f},f.pnotify_position=function(e){var t=f.opts.stack;if(t){t.nextpos1||(t.nextpos1=t.firstpos1),t.nextpos2||(t.nextpos2=t.firstpos2),t.addpos2||(t.addpos2=0);var i="none"==f.css("display");if(!i||e){var n,s,a,r={};switch(t.dir1){case"down":a="top";break;case"up":a="bottom";break;case"left":a="right";break;case"right":a="left"}n=parseInt(f.css(a)),isNaN(n)&&(n=0),"undefined"!=typeof t.firstpos1||i||(t.firstpos1=n,t.nextpos1=t.firstpos1);var l;switch(t.dir2){case"down":l="top";break;case"up":l="bottom";break;case"left":l="right";break;case"right":l="left"}if(s=parseInt(f.css(l)),isNaN(s)&&(s=0),"undefined"!=typeof t.firstpos2||i||(t.firstpos2=s,t.nextpos2=t.firstpos2),("down"==t.dir1&&t.nextpos1+f.height()>o.height()||"up"==t.dir1&&t.nextpos1+f.height()>o.height()||"left"==t.dir1&&t.nextpos1+f.width()>o.width()||"right"==t.dir1&&t.nextpos1+f.width()>o.width())&&(t.nextpos1=t.firstpos1,t.nextpos2+=t.addpos2+("undefined"==typeof t.spacing2?25:t.spacing2),t.addpos2=0),t.animation&&t.nextpos2t.addpos2&&(t.addpos2=f.height());break;case"left":case"right":f.outerWidth(!0)>t.addpos2&&(t.addpos2=f.width())}if(t.nextpos1)if(t.animation&&(n>t.nextpos1||r.top||r.bottom||r.right||r.left))switch(t.dir1){case"down":r.top=t.nextpos1+"px";break;case"up":r.bottom=t.nextpos1+"px";break;case"left":r.right=t.nextpos1+"px";break;case"right":r.left=t.nextpos1+"px"}else f.css(a,t.nextpos1+"px");switch((r.top||r.bottom||r.right||r.left)&&f.animate(r,{duration:500,queue:!1}),t.dir1){case"down":case"up":t.nextpos1+=f.height()+("undefined"==typeof t.spacing1?25:t.spacing1);break;case"left":case"right":t.nextpos1+=f.width()+("undefined"==typeof t.spacing1?25:t.spacing1)}}}},f.pnotify_queue_position=function(t){i&&clearTimeout(i),t||(t=10),i=setTimeout(e.pnotify_position_all,t)},f.pnotify_display=function(){f.parent().length||f.appendTo(n),l.before_open&&l.before_open(f)===!1||("top"!=l.stack.push&&f.pnotify_position(!0),"fade"==l.animation||"fade"==l.animation.effect_in?f.show().fadeTo(0,0).hide():1!=l.opacity&&f.show().fadeTo(0,l.opacity).hide(),f.animate_in(function(){l.after_open&&l.after_open(f),f.pnotify_queue_position(),l.hide&&f.pnotify_queue_remove()}))},f.pnotify_remove=function(){f.timer&&(window.clearTimeout(f.timer),f.timer=null),l.before_close&&l.before_close(f)===!1||f.animate_out(function(){l.after_close&&l.after_close(f)===!1||(f.pnotify_queue_position(),l.remove&&f.detach())})},f.animate_in=function(e){r="in";var t;t="undefined"!=typeof l.animation.effect_in?l.animation.effect_in:l.animation,"none"==t?(f.show(),e()):"show"==t?f.show(l.animate_speed,e):"fade"==t?f.show().fadeTo(l.animate_speed,l.opacity,e):"slide"==t?f.slideDown(l.animate_speed,e):"function"==typeof t?t("in",e,f):f.show(t,"object"==typeof l.animation.options_in?l.animation.options_in:{},l.animate_speed,e)},f.animate_out=function(e){r="out";var t;t="undefined"!=typeof l.animation.effect_out?l.animation.effect_out:l.animation,"none"==t?(f.hide(),e()):"show"==t?f.hide(l.animate_speed,e):"fade"==t?f.fadeOut(l.animate_speed,e):"slide"==t?f.slideUp(l.animate_speed,e):"function"==typeof t?t("out",e,f):f.hide(t,"object"==typeof l.animation.options_out?l.animation.options_out:{},l.animate_speed,e)},f.pnotify_cancel_remove=function(){f.timer&&window.clearTimeout(f.timer)},f.pnotify_queue_remove=function(){f.pnotify_cancel_remove(),f.timer=window.setTimeout(function(){f.pnotify_remove()},isNaN(l.delay)?0:l.delay)},f.closer=e("
        ",{"class":"ui-pnotify-closer",css:{cursor:"pointer",visibility:l.closer_hover?"hidden":"visible"},click:function(){f.pnotify_remove(),f.sticker.css("visibility","hidden"),f.closer.css("visibility","hidden")}}).append(e("",{"class":p.closer})).appendTo(f.container),(!l.closer||l.nonblock)&&f.closer.css("display","none"),f.sticker=e("
        ",{"class":"ui-pnotify-sticker",css:{cursor:"pointer",visibility:l.sticker_hover?"hidden":"visible"},click:function(){l.hide=!l.hide,l.hide?f.pnotify_queue_remove():f.pnotify_cancel_remove(),e(this).trigger("pnotify_icon")}}).bind("pnotify_icon",function(){e(this).children().removeClass(p.pin_up+" "+p.pin_down).addClass(l.hide?p.pin_up:p.pin_down)}).append(e("",{"class":p.pin_up})).appendTo(f.container),(!l.sticker||l.nonblock)&&f.sticker.css("display","none"),l.icon!==!1&&e("
        ",{"class":"ui-pnotify-icon"}).append(e("",{"class":l.icon===!0?"error"==l.type?p.error_icon:"info"==l.type?p.info_icon:"success"==l.type?p.success_icon:p.notice_icon:l.icon})).prependTo(f.container),f.title_container=e("
        ",{"class":"ui-pnotify-title"}).appendTo(f.container),l.title===!1?f.title_container.hide():l.title_escape?f.title_container.text(l.title):f.title_container.html(l.title),f.text_container=e("
        ",{"class":"ui-pnotify-text"}).appendTo(f.container),l.text===!1?f.text_container.hide():l.text_escape?f.text_container.text(l.text):f.text_container.html(l.insert_brs?String(l.text).replace(/\n/g,"
        "):l.text),"string"==typeof l.width&&f.css("width",l.width),"string"==typeof l.min_height&&f.container.css("min-height",l.min_height),f.pnotify_history=l.history,f.pnotify_hide=l.hide;var m=o.data("pnotify");if((null==m||"object"!=typeof m)&&(m=[]),m="top"==l.stack.push?e.merge([f],m):e.merge(m,[f]),o.data("pnotify",m),"top"==l.stack.push&&f.pnotify_queue_position(1),l.after_init&&l.after_init(f),l.history){var g=o.data("pnotify_history");if("undefined"==typeof g){g=e("
        ",{"class":"ui-pnotify-history-container "+p.hi_menu,mouseleave:function(){g.animate({top:"-"+t+"px"},{duration:100,queue:!1})}}).append(e("
        ",{"class":"ui-pnotify-history-header",text:"Redisplay"})).append(e("\n    <% if (geolocation) { %>\n        \n    <% } %>\n    \n    \n
        '}),define("modules/usermap/views/controls",["jquery","marionette","lib/leaflet/mq","text!modules/usermap/templates/controls.html"],function(e,t,i,n){return t.ItemView.extend({template:_.template(n),ui:{search:".js-btn-search",locate:".js-btn-locate",clear:".js-btn-clear",spinner:".saito-usermap-spinner"},events:{"click @ui.search":"_search","click @ui.locate":"_locate","click @ui.clear":"_clear"},initialize:function(t){this.mapLayer=t.mapLayer,this.mapModel=t.mapModel,this.params=t.params,this.mapLayer.on("click",this._repin,this),this.mapLayer.on("locationfound",this._repin,this),e(this.params.fields.edit).on("keypress",_.bind(this._onSearchFieldChange,this)),e(this.params.fields.edit).on("keyup",_.bind(this._updateSearchButtonTitle,this))},_clear:function(e){e.preventDefault(),this.model.set({lat:"",lng:"",zoom:""}),this._updateFields()},_search:function(t){t.preventDefault(),this._activityStart();var n=e(this.params.fields.edit).val();i.geocode().search(n).on("success",_.bind(function(e){var t=e.result.best;this._repin(t)},this))},_onSearchFieldChange:function(e){13===e.which&&this._search(e)},_activityStart:function(){this.ui.spinner.show()},_activityStop:function(){this.ui.spinner.hide()},_updateSearchButtonTitle:function(){var t=e(this.params.fields.edit).val();return t?(this.ui.search.removeAttr("disabled"),void this.ui.search.html(e.i18n.__("user.map.b.search",{string:t}))):void this.ui.search.attr("disabled","disabled")},_locate:function(e){e.preventDefault(),this._activityStart(),this.mapLayer.locate()},_repin:function(e){var t=this._round({lat:e.latlng.lat,lng:e.latlng.lng,zoom:this.mapLayer.getZoom()});this._activityStop(),this.model.set(t),this.mapModel.set(t),this._updateFields()},_round:function(e){return _.each(["lat","lng"],function(t){e[t]=e[t].toFixed(4)}),e},onRender:function(){this._updateSearchButtonTitle()},_updateFields:function(){var t=this.params.fields.update,i=this.model;_.each(["lat","lng","zoom"],_.bind(function(n){var o=n;t&&t[n]&&_.each(t[n],function(t){var n=e(t),s=i.get(o);"input"===n.prop("tagName").toLowerCase()?n.val(s):n.html(s)})},this)),this.render()},_geolocation:function(){return"geolocation"in navigator},serializeData:function(){var e=this.model.toJSON();return e.geolocation=this._geolocation(),e}})}),define("lib/leaflet/leaflet",[],function(){return"undefined"!=typeof L?L:void 0}),define("modules/usermap/views/map",["marionette","templateHelpers","lib/leaflet/leaflet","lib/leaflet/mq"],function(e,t,i,n){return e.ItemView.extend({collectionEvents:{add:"_createMarker",change:"_repinMarker"},modelEvents:{"change:lat":"_setView"},template:{},templateHelpers:t,mapLayer:null,markersLayer:null,markers:{},initialize:function(){"world"===this.model.get("type")&&this._zoomView(),this.markersLayer=new i.MarkerClusterGroup,this._map()},_zoomView:function(){var e=40,t=$("#content"),i={width:t.width(),top:t.offset().top},n={height:i.width*(120/198)},o={height:$(window).height()};o.available=o.height-i.top,n.height>o.available&&(n.height=o.available-e),this.$el.height(n.height)},_createMarker:function(e){var t,n=e.latlng(),o=i.marker(n);if(n[0]){if(e){var s=this.templateHelpers.User.linkToUserProfile(e.get("id"),e.get("name"));o.bindPopup(s)}if(this.markersLayer.addLayer(o),this.markers[e.get("id")]=o,t=this.model.get("type"),"single"===t||"edit"===t){var a={lat:e.get("lat"),lng:e.get("lng")};a.zoom="edit"===t?e.get("zoom"):this.model.get("maxZoom"),this.model.set(a)}}},_repinMarker:function(e){if(!e.get("lat"))return void this._clearMarkers();var t=this.markers[e.get("id")];if(!t)return void this._createMarker(e);var i=t.getLatLng();i.lat=e.get("lat"),i.lng=e.get("lng"),t.update()},_clearMarkers:function(){this.markers={},this.markersLayer.clearLayers()},_setView:function(){var e=this.model.get("lat"),t=this.model.get("lng"),i=this.model.get("zoom");this.mapLayer.setView([e,t],i)},_map:function(){var e=n.mapLayer();this.mapLayer=i.map(this.el,{closePopupOnClick:!1,maxZoom:this.model.get("maxZoom"),minZoom:this.model.get("minZoom"),maxBounds:this.model.get("maxBounds")}),this._setView(),this.mapLayer.addLayer(e),this.mapLayer.addLayer(this.markersLayer)}})}),define("modules/usermap/models/map",["backbone"],function(e){var t=e.Model.extend({maxZoom:{edit:14,single:11,world:11},defaults:{lat:30,lng:0,zoom:2,maxZoom:11,minZoom:1,maxBounds:[[-90,-180],[90,180]]},initialize:function(){this.maxZoom[this.get("type")]&&this.set("maxZoom",this.maxZoom[this.get("type")])}});return t}),define("modules/usermap/models/user",["backbone"],function(e){var t=e.Model.extend({latlng:function(){return[this.get("lat"),this.get("lng")]}});return t}),define("modules/usermap/collections/users",["backbone","modules/usermap/models/user"],function(e,t){var i=e.Collection.extend({model:t});return i}),define("text!modules/usermap/templates/layout.html",[],function(){return"
        \n    
        \n    
        \n
        "}),define("modules/usermap/usermap",["app/core","marionette","modules/usermap/views/controls","modules/usermap/views/map","modules/usermap/models/map","modules/usermap/collections/users","text!modules/usermap/templates/layout.html"],function(e,t,i,n,o,s,a){var r=e.module("usermap",{startWithParent:!1});return r.addInitializer(function(){var e=$(".saito-usermap");if(e.length){var l,d,c=e.data("users"),u=new s,h=e.data("params"),p=t.Layout.extend({el:e,template:a,regions:{mapr:".saito-usermap-map",controls:".saito-usermap-controls"}}),f=(new p).render(),m=new o(h);d=new n({el:f.$(".saito-usermap-map"),model:m,collection:u}),u.add(c),"edit"===h.type&&(d.$el.addClass("input"),l=r.ControlView=new i({model:u.at(0),mapLayer:d.mapLayer,mapModel:m,params:h}),f.controls.show(l))}}),r}),define("app/time",["moment","moment-de"],function(e){var t=e().lang()._longDateFormat;t.LT="H:mm",e.lang("de",{longDateFormat:t})}),define("lib/Saito/isAppVisible",["jquery","underscore","models/app"],function(e,t,i){var n=function(){this.initialize.apply(this,arguments)};return t.extend(n.prototype,{_isVisibleOldSchool:!0,initialize:function(){i.reqres.setHandler("isAppVisible",this.isVisible,this),this._isVisibleOldSchool=this._isAppVisibleHtml5(),this._initAppVisibleOldSchool()},isVisible:function(){return this._isVisibleOldSchool},_initAppVisibleOldSchool:function(){e(window).blur(t.bind(function(){this._isVisibleOldSchool=!1},this)),e(window).focus(t.bind(function(){this._isVisibleOldSchool=!0},this))},_isAppVisibleHtml5:function(){var e,t=!1;return"undefined"!=typeof document.hidden?e="hidden":"undefined"!=typeof document.webkitHidden&&(e="webkitHidden"),document[e]&&(t=document[e]),!t}}),new n}),function(e){e.i18n={dict:null,setDictionary:function(e){this.dict=e},_:function(e,t){var i=e;return this.dict&&this.dict[e]&&(i=this.dict[e]),this.printf(i,t)},printf:function(e,t){if(!t)return e;for(var i="",n=/%(\d+)\$s/g,o=n.exec(e);o;){var s=parseInt(o[1],10)-1;e=e.replace("%"+o[1]+"$s",t[s]),o=n.exec(e)}var a=e.split("%s");if(a.length>1)for(var r=0;r0&&a[r].lastIndexOf("%")==a[r].length-1&&(a[r]+="s"+a.splice(r+1,1)[0]),i+=a[r]+t[r];return i+a[a.length-1]}},e.fn._t=function(t,i){return e(this).text(e.i18n._(t,i))}}(jQuery),define("lib/jquery.i18n/jquery.i18n",function(){}),define("lib/jquery.i18n/jquery.i18n.extend",["jquery","lib/jquery.i18n/jquery.i18n"],function(e){e.extend(e.i18n,{currentString:"",setDict:function(e){this.dict=e},setUrl:function(e){this.dictUrl=e,this._loadDict()},_loadDict:function(){return e.ajax({url:this.dictUrl,dataType:"json",async:!1,cache:!0,success:e.proxy(function(e){this.dict=e},this)})},__:function(e,t){var i=e;return"object"==typeof this.dict[e]&&""!==this.dict[e][""]&&(i=this.dict[e][""]),"object"==typeof t&&(i=this._insert(i,t)),i},_insert:function(e,t){return e.replace(/:([-\w]+)/g,function(e,i){return"undefined"!=typeof t[i]?t[i]:e})}})}),function(e,t){"function"==typeof define&&define.amd?define("lib/saito/backbone.initHelper",["underscore","backbone"],function(i,n){return t(i||e._,n||e.Backbone)}):t(_,Backbone)}(this,function(e,t){t.View.prototype.initCollectionFromDom=function(e,t,i){var n=function(e,t,n){e.add({id:t}),new i({el:n,model:e.get(t),collection:e})};$(e).each(function(){n(t,$(this).data("id"),this)})}}),define("app/app",["marionette","app/core","app/vent","modules/html5-notification/html5-notification"],function(e,t,i){var n=SaitoApp,o=function(e){require(["jquery","domReady"],function(t,i){t.isReady?e():i(function(){e()})})},s={fireOnPageCallbacks:function(e){var t=e.afterAppInit;_.each(t,function(e){e()}),i.vent.on("isAppVisible",_.once(function(){var t=e.afterViewInit;_.each(t,function(e){e()})}))},bootstrapShoutbox:function(){o(function(){require(["modules/shoutbox/shoutbox"],function(e){e.start()})})},bootstrapApp:function(e){require(["domReady","views/app","backbone","jquery","models/app","views/notification","views/prerequisitesTester","modules/html5-notification/html5-notification","modules/usermap/usermap","app/time","lib/Saito/isAppVisible","lib/jquery.i18n/jquery.i18n.extend","jqueryDropdown","lib/saito/backbone.initHelper","lib/saito/backbone.modelHelper","fastclick"],function(t,i,a,r,l,d,c,u,h){var p,f,m;l.settings.set(e.SaitoApp.app.settings),r.i18n.setUrl(l.settings.get("webroot")+"da/langJs"),l.currentUser.set(e.SaitoApp.currentUser),l.request=e.SaitoApp.request,u.start(),h.start(),new d;var g=e.SaitoApp.callbacks.beforeAppInit;_.each(g,function(e){e()}),window.addEventListener("load",function(){new FastClick(document.body)},!1),m=new c({el:r(".app-prerequisites-warnings")}),p=new i,f=function(){"shouts"in n&&s.bootstrapShoutbox(),s.fireOnPageCallbacks(e.SaitoApp.callbacks),p.initFromDom({SaitoApp:e.SaitoApp,contentTimer:e.contentTimer})},o(f)})}},a=t;return a.addInitializer(s.bootstrapApp),a.start({contentTimer:contentTimer,SaitoApp:n}),i.reqres.setHandler("webroot",function(){return n.app.settings.webroot}),i.reqres.setHandler("apiroot",function(){return n.app.settings.webroot+"api/v1/"}),a}),require.config({paths:{common:"../dist/common.min",templateHelpers:"lib/saito/templateHelpers"}}),function(e){e.contentTimer={show:function(){$("#content").css("visibility","visible"),console.warn("DOM ready timed out: show content fallback used."),delete this.timeoutID},setup:function(){this.cancel();var t=this;this.timeoutID=e.setTimeout(function(){t.show()},5e3)},cancel:function(){"number"==typeof this.timeoutID&&(e.clearTimeout(this.timeoutID),delete this.timeoutID)}},e.contentTimer.setup()}(window),require(["lib/bootstrapHelper","common"],function(){require(["app/app"])}),define("main",function(){});
\ No newline at end of file
diff --git a/app/webroot/js/lib/jquery.i18n/jquery.i18n.extend.js b/app/webroot/js/lib/jquery.i18n/jquery.i18n.extend.js
index e9a474270..4ec544637 100644
--- a/app/webroot/js/lib/jquery.i18n/jquery.i18n.extend.js
+++ b/app/webroot/js/lib/jquery.i18n/jquery.i18n.extend.js
@@ -40,8 +40,8 @@ define([
      */
     __: function(string, tokens) {
       var out = string;
-      if (typeof this.dict[string] === 'string' && this.dict[string] !== '') {
-        out = this.dict[string];
+      if (typeof this.dict[string] === 'object' && this.dict[string][''] !== '') {
+        out = this.dict[string][''];
       }
       if (typeof tokens === 'object') {
         out = this._insert(out, tokens);
@@ -50,8 +50,8 @@ define([
     },
 
     _insert: function(string, tokens) {
-      return string.replace(/:([-\w]+)/g, function(token, match, number, text) {
-        if (typeof tokens[match] !== "undefined") {
+      return string.replace(/:([-\w]+)/g, function(token, match) {
+        if (typeof tokens[match] !== 'undefined') {
           return tokens[match];
         }
         return token;
diff --git a/app/webroot/js/tests/lib/jquery.i18n.extendSpec.js b/app/webroot/js/tests/lib/jquery.i18n.extendSpec.js
index 621a6a4d1..c687f18bd 100644
--- a/app/webroot/js/tests/lib/jquery.i18n.extendSpec.js
+++ b/app/webroot/js/tests/lib/jquery.i18n.extendSpec.js
@@ -1,12 +1,16 @@
-describe("jquery.i18n.extend", function() {
+describe('jquery.i18n.extend', function() {
+  'use strict';
 
   describe('replaces :token tags', function() {
 
+    var $;
+
     beforeEach(function(done) {
       require([
         'jquery',
         'lib/jquery.i18n/jquery.i18n.extend'
-      ], function($) {
+      ], function(jQuery) {
+        $ = jQuery;
         $.i18n.setDict({});
         done();
       });
@@ -15,13 +19,13 @@ describe("jquery.i18n.extend", function() {
 
     it('in a s string not in the dictionary', function() {
       var result,
-          expected = "This; is better than fu :tokenNo nothing";
+          expected = 'This; is better than fu :tokenNo nothing';
       result = $.i18n.__(
           ':tokenA; is :token_b than fu :tokenNo :token-c',
           {
             tokenA: 'This',
             token_b: 'better',
-            'token-c': "nothing"
+            'token-c': 'nothing'
           }
       );
       expect(result).toEqual(expected);
@@ -31,19 +35,17 @@ describe("jquery.i18n.extend", function() {
       var expected,
           result;
 
-      $.i18n.setDict(
-          {
-            "token test": ":tokenA; is :token_b than fu :tokenNo :token-c"
-          }
-      );
+      $.i18n.setDict({
+        'token test': {'': ':tokenA; is :token_b than fu :tokenNo :token-c'}
+      });
 
-      expected = "This; is better than fu :tokenNo nothing";
+      expected = 'This; is better than fu :tokenNo nothing';
       result = $.i18n.__(
           'token test',
           {
             tokenA: 'This',
             token_b: 'better',
-            'token-c': "nothing"
+            'token-c': 'nothing'
           }
       );
       expect(result).toEqual(expected);
diff --git a/docs/dev-hooks.md b/docs/dev-hooks.md
index de78c93be..ec3ebc0b4 100644
--- a/docs/dev-hooks.md
+++ b/docs/dev-hooks.md
@@ -34,6 +34,13 @@ Data:
 
 - subject: View object
 
+## Request.Saito.View.Admin.plugins ##
+
+Trigger: plugins for admin area
+
+Returns: array
+- 'title' title
+- 'url' URL to plugin page, should be under '/admin/plugin'
 
 ## Request.Saito.View.Posting.badges ##
 
diff --git a/puphpet/config.yaml b/puphpet/config.yaml
index 868c5dcba..07d4ad33b 100644
--- a/puphpet/config.yaml
+++ b/puphpet/config.yaml
@@ -117,7 +117,7 @@ php:
     ini:
         display_errors: On
         error_reporting: '-1'
-        memory_limit: 256M
+        memory_limit: 320M
         max_execution_time: '180'
         session.save_path: /var/lib/php/session
     timezone: Europe/Berlin