diff options
| author | robocoder <anthon.pang@gmail.com> | 2011-03-04 18:41:58 +0300 |
|---|---|---|
| committer | robocoder <anthon.pang@gmail.com> | 2011-03-04 18:41:58 +0300 |
| commit | ee2751b747bd0c0bf6bbbbc6e132f38f2625658f (patch) | |
| tree | aa3e4a5b68fe73811b67fc46f3cfbd879900c77c /plugins/UsersManager | |
| parent | 956207555e83d0276b2f801f2dd025690d0a3e1f (diff) | |
fixes #2138
git-svn-id: http://dev.piwik.org/svn/trunk@4024 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/UsersManager')
| -rw-r--r-- | plugins/UsersManager/Controller.php | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php index 1e0416bf7b..370fda93ea 100644 --- a/plugins/UsersManager/Controller.php +++ b/plugins/UsersManager/Controller.php @@ -92,8 +92,22 @@ class Piwik_UsersManager_Controller extends Piwik_Controller echo $view->render(); } - const DEFAULT_DATE = 'today'; - + /** + * Returns default date for Piwik reports + * + * @param string $user + * @return string today, yesterday, week, month, year + */ + protected function getDefaultDateForUser($user) + { + $userSettingsDate = Piwik_UsersManager_API::getInstance()->getUserPreference($user, Piwik_UsersManager_API::PREFERENCE_DEFAULT_REPORT_DATE); + if($userSettingsDate === false) + { + return Zend_Registry::get('config')->General->default_day; + } + return $userSettingsDate; + } + /** * The "User Settings" admin UI screen view */ @@ -125,12 +139,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller } $view->defaultReport = $defaultReport; - $defaultDate = Piwik_UsersManager_API::getInstance()->getUserPreference($userLogin, Piwik_UsersManager_API::PREFERENCE_DEFAULT_REPORT_DATE); - if($defaultDate === false) - { - $defaultDate = self::DEFAULT_DATE; - } - $view->defaultDate = $defaultDate; + $view->defaultDate = $this->getDefaultDateForUser($userLogin); $view->availableDefaultDates = array( 'today' => Piwik_Translate('General_Today'), 'yesterday' => Piwik_Translate('General_Yesterday'), @@ -196,13 +205,8 @@ class Piwik_UsersManager_Controller extends Piwik_Controller } } $view->anonymousDefaultReport = $anonymousDefaultReport; - - $anonymousDefaultDate = Piwik_UsersManager_API::getInstance()->getUserPreference($userLogin, Piwik_UsersManager_API::PREFERENCE_DEFAULT_REPORT_DATE); - if($anonymousDefaultDate === false) - { - $anonymousDefaultDate = self::DEFAULT_DATE; - } - $view->anonymousDefaultDate = $anonymousDefaultDate; + + $view->anonymousDefaultDate = $this->getDefaultDateForUser($userLogin); } /** |