diff options
| author | 2014-07-06 00:10:58 +0200 | |
|---|---|---|
| committer | 2014-07-06 00:10:58 +0200 | |
| commit | 72924cb5fecce336dce5b252f719a50af0981f12 (patch) | |
| tree | 0549ee2385d51b7a1b22b794b83570b29d7fb672 /app/Controllers/configureController.php | |
| parent | bc8eb560afd50290745ea6a500c0f930df2559eb (diff) | |
Minor white space parentheses
Diffstat (limited to 'app/Controllers/configureController.php')
| -rwxr-xr-x | app/Controllers/configureController.php | 220 |
1 files changed, 110 insertions, 110 deletions
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index 5fd09a263..f016e1fbf 100755 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -1,81 +1,81 @@ <?php class FreshRSS_configure_Controller extends Minz_ActionController { - public function firstAction () { + public function firstAction() { if (!$this->view->loginOk) { - Minz_Error::error ( + Minz_Error::error( 403, - array ('error' => array (Minz_Translate::t ('access_denied'))) + array('error' => array(Minz_Translate::t('access_denied'))) ); } - $catDAO = new FreshRSS_CategoryDAO (); - $catDAO->checkDefault (); + $catDAO = new FreshRSS_CategoryDAO(); + $catDAO->checkDefault(); } - public function categorizeAction () { + public function categorizeAction() { $feedDAO = FreshRSS_Factory::createFeedDao(); - $catDAO = new FreshRSS_CategoryDAO (); - $defaultCategory = $catDAO->getDefault (); - $defaultId = $defaultCategory->id (); + $catDAO = new FreshRSS_CategoryDAO(); + $defaultCategory = $catDAO->getDefault(); + $defaultId = $defaultCategory->id(); - if (Minz_Request::isPost ()) { - $cats = Minz_Request::param ('categories', array ()); - $ids = Minz_Request::param ('ids', array ()); - $newCat = trim (Minz_Request::param ('new_category', '')); + if (Minz_Request::isPost()) { + $cats = Minz_Request::param('categories', array()); + $ids = Minz_Request::param('ids', array()); + $newCat = trim(Minz_Request::param('new_category', '')); foreach ($cats as $key => $name) { - if (strlen ($name) > 0) { - $cat = new FreshRSS_Category ($name); - $values = array ( - 'name' => $cat->name (), + if (strlen($name) > 0) { + $cat = new FreshRSS_Category($name); + $values = array( + 'name' => $cat->name(), ); - $catDAO->updateCategory ($ids[$key], $values); + $catDAO->updateCategory($ids[$key], $values); } elseif ($ids[$key] != $defaultId) { - $feedDAO->changeCategory ($ids[$key], $defaultId); - $catDAO->deleteCategory ($ids[$key]); + $feedDAO->changeCategory($ids[$key], $defaultId); + $catDAO->deleteCategory($ids[$key]); } } if ($newCat != '') { - $cat = new FreshRSS_Category ($newCat); - $values = array ( - 'id' => $cat->id (), - 'name' => $cat->name (), + $cat = new FreshRSS_Category($newCat); + $values = array( + 'id' => $cat->id(), + 'name' => $cat->name(), ); - if ($catDAO->searchByName ($newCat) == null) { - $catDAO->addCategory ($values); + if ($catDAO->searchByName($newCat) == null) { + $catDAO->addCategory($values); } } invalidateHttpCache(); - $notif = array ( + $notif = array( 'type' => 'good', - 'content' => Minz_Translate::t ('categories_updated') + 'content' => Minz_Translate::t('categories_updated') ); - Minz_Session::_param ('notification', $notif); + Minz_Session::_param('notification', $notif); - Minz_Request::forward (array ('c' => 'configure', 'a' => 'categorize'), true); + Minz_Request::forward(array('c' => 'configure', 'a' => 'categorize'), true); } - $this->view->categories = $catDAO->listCategories (false); - $this->view->defaultCategory = $catDAO->getDefault (); - $this->view->feeds = $feedDAO->listFeeds (); + $this->view->categories = $catDAO->listCategories(false); + $this->view->defaultCategory = $catDAO->getDefault(); + $this->view->feeds = $feedDAO->listFeeds(); - Minz_View::prependTitle (Minz_Translate::t ('categories_management') . ' · '); + Minz_View::prependTitle(Minz_Translate::t('categories_management') . ' · '); } - public function feedAction () { - $catDAO = new FreshRSS_CategoryDAO (); - $this->view->categories = $catDAO->listCategories (false); + public function feedAction() { + $catDAO = new FreshRSS_CategoryDAO(); + $this->view->categories = $catDAO->listCategories(false); $feedDAO = FreshRSS_Factory::createFeedDao(); - $this->view->feeds = $feedDAO->listFeeds (); + $this->view->feeds = $feedDAO->listFeeds(); - $id = Minz_Request::param ('id'); - if ($id == false && !empty ($this->view->feeds)) { - $id = current ($this->view->feeds)->id (); + $id = Minz_Request::param('id'); + if ($id == false && !empty($this->view->feeds)) { + $id = current($this->view->feeds)->id(); } $this->view->flux = false; @@ -83,14 +83,14 @@ class FreshRSS_configure_Controller extends Minz_ActionController { $this->view->flux = $this->view->feeds[$id]; if (!$this->view->flux) { - Minz_Error::error ( + Minz_Error::error( 404, - array ('error' => array (Minz_Translate::t ('page_not_found'))) + array('error' => array(Minz_Translate::t('page_not_found'))) ); } else { - if (Minz_Request::isPost () && $this->view->flux) { - $user = Minz_Request::param ('http_user', ''); - $pass = Minz_Request::param ('http_pass', ''); + if (Minz_Request::isPost() && $this->view->flux) { + $user = Minz_Request::param('http_user', ''); + $pass = Minz_Request::param('http_pass', ''); $httpAuth = ''; if ($user != '' || $pass != '') { @@ -99,46 +99,46 @@ class FreshRSS_configure_Controller extends Minz_ActionController { $cat = intval(Minz_Request::param('category', 0)); - $values = array ( - 'name' => Minz_Request::param ('name', ''), + $values = array( + 'name' => Minz_Request::param('name', ''), 'description' => sanitizeHTML(Minz_Request::param('description', '', true)), 'website' => Minz_Request::param('website', ''), 'url' => Minz_Request::param('url', ''), 'category' => $cat, - 'pathEntries' => Minz_Request::param ('path_entries', ''), - 'priority' => intval(Minz_Request::param ('priority', 0)), + 'pathEntries' => Minz_Request::param('path_entries', ''), + 'priority' => intval(Minz_Request::param('priority', 0)), 'httpAuth' => $httpAuth, - 'keep_history' => intval(Minz_Request::param ('keep_history', -2)), + 'keep_history' => intval(Minz_Request::param('keep_history', -2)), 'ttl' => intval(Minz_Request::param('ttl', -2)), ); - if ($feedDAO->updateFeed ($id, $values)) { - $this->view->flux->_category ($cat); + if ($feedDAO->updateFeed($id, $values)) { + $this->view->flux->_category($cat); $this->view->flux->faviconPrepare(); - $notif = array ( + $notif = array( 'type' => 'good', - 'content' => Minz_Translate::t ('feed_updated') + 'content' => Minz_Translate::t('feed_updated') ); } else { - $notif = array ( + $notif = array( 'type' => 'bad', - 'content' => Minz_Translate::t ('error_occurred_update') + 'content' => Minz_Translate::t('error_occurred_update') ); } invalidateHttpCache(); - Minz_Session::_param ('notification', $notif); - Minz_Request::forward (array ('c' => 'configure', 'a' => 'feed', 'params' => array ('id' => $id)), true); + Minz_Session::_param('notification', $notif); + Minz_Request::forward(array('c' => 'configure', 'a' => 'feed', 'params' => array('id' => $id)), true); } - Minz_View::prependTitle (Minz_Translate::t ('rss_feed_management') . ' — ' . $this->view->flux->name () . ' · '); + Minz_View::prependTitle(Minz_Translate::t('rss_feed_management') . ' — ' . $this->view->flux->name() . ' · '); } } else { - Minz_View::prependTitle (Minz_Translate::t ('rss_feed_management') . ' · '); + Minz_View::prependTitle(Minz_Translate::t('rss_feed_management') . ' · '); } } - public function displayAction () { + public function displayAction() { if (Minz_Request::isPost()) { $this->view->conf->_language(Minz_Request::param('language', 'en')); $themeId = Minz_Request::param('theme', ''); @@ -159,36 +159,36 @@ class FreshRSS_configure_Controller extends Minz_ActionController { $this->view->conf->_bottomline_link(Minz_Request::param('bottomline_link', false)); $this->view->conf->save(); - Minz_Session::_param ('language', $this->view->conf->language); - Minz_Translate::reset (); + Minz_Session::_param('language', $this->view->conf->language); + Minz_Translate::reset(); invalidateHttpCache(); - $notif = array ( + $notif = array( 'type' => 'good', - 'content' => Minz_Translate::t ('configuration_updated') + 'content' => Minz_Translate::t('configuration_updated') ); - Minz_Session::_param ('notification', $notif); + Minz_Session::_param('notification', $notif); - Minz_Request::forward (array ('c' => 'configure', 'a' => 'display'), true); + Minz_Request::forward(array('c' => 'configure', 'a' => 'display'), true); } $this->view->themes = FreshRSS_Themes::get(); - Minz_View::prependTitle (Minz_Translate::t ('display_configuration') . ' · '); + Minz_View::prependTitle(Minz_Translate::t('display_configuration') . ' · '); } - public function readingAction () { + public function readingAction() { if (Minz_Request::isPost()) { $this->view->conf->_posts_per_page(Minz_Request::param('posts_per_page', 10)); $this->view->conf->_view_mode(Minz_Request::param('view_mode', 'normal')); - $this->view->conf->_default_view (Minz_Request::param('default_view', 'a')); + $this->view->conf->_default_view(Minz_Request::param('default_view', 'a')); $this->view->conf->_auto_load_more(Minz_Request::param('auto_load_more', false)); $this->view->conf->_display_posts(Minz_Request::param('display_posts', false)); $this->view->conf->_onread_jump_next(Minz_Request::param('onread_jump_next', false)); - $this->view->conf->_lazyload (Minz_Request::param('lazyload', false)); - $this->view->conf->_sticky_post (Minz_Request::param('sticky_post', false)); + $this->view->conf->_lazyload(Minz_Request::param('lazyload', false)); + $this->view->conf->_sticky_post(Minz_Request::param('sticky_post', false)); $this->view->conf->_sort_order(Minz_Request::param('sort_order', 'DESC')); - $this->view->conf->_mark_when (array( + $this->view->conf->_mark_when(array( 'article' => Minz_Request::param('mark_open_article', false), 'site' => Minz_Request::param('mark_open_site', false), 'scroll' => Minz_Request::param('mark_scroll', false), @@ -196,43 +196,43 @@ class FreshRSS_configure_Controller extends Minz_ActionController { )); $this->view->conf->save(); - Minz_Session::_param ('language', $this->view->conf->language); - Minz_Translate::reset (); + Minz_Session::_param('language', $this->view->conf->language); + Minz_Translate::reset(); invalidateHttpCache(); - $notif = array ( + $notif = array( 'type' => 'good', - 'content' => Minz_Translate::t ('configuration_updated') + 'content' => Minz_Translate::t('configuration_updated') ); - Minz_Session::_param ('notification', $notif); + Minz_Session::_param('notification', $notif); - Minz_Request::forward (array ('c' => 'configure', 'a' => 'reading'), true); + Minz_Request::forward(array('c' => 'configure', 'a' => 'reading'), true); } - Minz_View::prependTitle (Minz_Translate::t ('reading_configuration') . ' · '); + Minz_View::prependTitle(Minz_Translate::t('reading_configuration') . ' · '); } - public function sharingAction () { - if (Minz_Request::isPost ()) { + public function sharingAction() { + if (Minz_Request::isPost()) { $params = Minz_Request::params(); - $this->view->conf->_sharing ($params['share']); + $this->view->conf->_sharing($params['share']); $this->view->conf->save(); invalidateHttpCache(); - $notif = array ( + $notif = array( 'type' => 'good', - 'content' => Minz_Translate::t ('configuration_updated') + 'content' => Minz_Translate::t('configuration_updated') ); - Minz_Session::_param ('notification', $notif); + Minz_Session::_param('notification', $notif); - Minz_Request::forward (array ('c' => 'configure', 'a' => 'sharing'), true); + Minz_Request::forward(array('c' => 'configure', 'a' => 'sharing'), true); } - Minz_View::prependTitle (Minz_Translate::t ('sharing') . ' · '); + Minz_View::prependTitle(Minz_Translate::t('sharing') . ' · '); } - public function shortcutAction () { - $list_keys = array ('a', 'b', 'backspace', 'c', 'd', 'delete', 'down', 'e', 'end', 'enter', + public function shortcutAction() { + $list_keys = array('a', 'b', 'backspace', 'c', 'd', 'delete', 'down', 'e', 'end', 'enter', 'escape', 'f', 'g', 'h', 'home', 'i', 'insert', 'j', 'k', 'l', 'left', 'm', 'n', 'o', 'p', 'page_down', 'page_up', 'q', 'r', 'return', 'right', 's', 'space', 't', 'tab', 'u', 'up', 'v', 'w', 'x', 'y', @@ -241,9 +241,9 @@ class FreshRSS_configure_Controller extends Minz_ActionController { 'f10', 'f11', 'f12'); $this->view->list_keys = $list_keys; - if (Minz_Request::isPost ()) { - $shortcuts = Minz_Request::param ('shortcuts'); - $shortcuts_ok = array (); + if (Minz_Request::isPost()) { + $shortcuts = Minz_Request::param('shortcuts'); + $shortcuts_ok = array(); foreach ($shortcuts as $key => $value) { if (in_array($value, $list_keys)) { @@ -251,27 +251,27 @@ class FreshRSS_configure_Controller extends Minz_ActionController { } } - $this->view->conf->_shortcuts ($shortcuts_ok); + $this->view->conf->_shortcuts($shortcuts_ok); $this->view->conf->save(); invalidateHttpCache(); - $notif = array ( + $notif = array( 'type' => 'good', - 'content' => Minz_Translate::t ('shortcuts_updated') + 'content' => Minz_Translate::t('shortcuts_updated') ); - Minz_Session::_param ('notification', $notif); + Minz_Session::_param('notification', $notif); - Minz_Request::forward (array ('c' => 'configure', 'a' => 'shortcut'), true); + Minz_Request::forward(array('c' => 'configure', 'a' => 'shortcut'), true); } - Minz_View::prependTitle (Minz_Translate::t ('shortcuts') . ' · '); + Minz_View::prependTitle(Minz_Translate::t('shortcuts') . ' · '); } public function usersAction() { - Minz_View::prependTitle(Minz_Translate::t ('users') . ' · '); + Minz_View::prependTitle(Minz_Translate::t('users') . ' · '); } - public function archivingAction () { + public function archivingAction() { if (Minz_Request::isPost()) { $old = Minz_Request::param('old_entries', 3); $keepHistoryDefault = Minz_Request::param('keep_history_default', 0); @@ -303,8 +303,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController { } } - public function queriesAction () { - if (Minz_Request::isPost ()) { + public function queriesAction() { + if (Minz_Request::isPost()) { $queries = Minz_Request::param('queries', array()); foreach ($queries as $key => $query) { @@ -315,13 +315,13 @@ class FreshRSS_configure_Controller extends Minz_ActionController { $this->view->conf->_queries($queries); $this->view->conf->save(); - $notif = array ( + $notif = array( 'type' => 'good', - 'content' => Minz_Translate::t ('configuration_updated') + 'content' => Minz_Translate::t('configuration_updated') ); - Minz_Session::_param ('notification', $notif); + Minz_Session::_param('notification', $notif); - Minz_Request::forward (array ('c' => 'configure', 'a' => 'queries'), true); + Minz_Request::forward(array('c' => 'configure', 'a' => 'queries'), true); } else { $this->view->query_get = array(); foreach ($this->view->conf->queries as $key => $query) { @@ -362,10 +362,10 @@ class FreshRSS_configure_Controller extends Minz_ActionController { } } - Minz_View::prependTitle (Minz_Translate::t ('queries') . ' · '); + Minz_View::prependTitle(Minz_Translate::t('queries') . ' · '); } - public function addQueryAction () { + public function addQueryAction() { $queries = $this->view->conf->queries; $query = Minz_Request::params(); $query['name'] = Minz_Translate::t('query_number', count($queries) + 1); |
