diff options
Diffstat (limited to 'app/Controllers/userController.php')
| -rw-r--r-- | app/Controllers/userController.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php index 81f8b20a8..b1f34ce61 100644 --- a/app/Controllers/userController.php +++ b/app/Controllers/userController.php @@ -95,9 +95,9 @@ class FreshRSS_user_Controller extends Minz_ActionController { $this->view->disable_aside = true; } - Minz_View::prependTitle(_t('conf.profile.title') . ' · '); + FreshRSS_View::prependTitle(_t('conf.profile.title') . ' · '); - Minz_View::appendScript(Minz_Url::display('/scripts/bcrypt.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js'))); + FreshRSS_View::appendScript(Minz_Url::display('/scripts/bcrypt.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js'))); if (Minz_Request::isPost()) { $system_conf = FreshRSS_Context::$system_conf; @@ -173,7 +173,7 @@ class FreshRSS_user_Controller extends Minz_ActionController { Minz_Error::error(403); } - Minz_View::prependTitle(_t('admin.user.title') . ' · '); + FreshRSS_View::prependTitle(_t('admin.user.title') . ' · '); if (Minz_Request::isPost()) { $action = Minz_Request::param('action'); @@ -227,6 +227,7 @@ class FreshRSS_user_Controller extends Minz_ActionController { $ok = self::checkUsername($new_user_name); $homeDir = join_path(DATA_PATH, 'users', $new_user_name); + $configPath = ''; if ($ok) { $languages = Minz_Translate::availableLanguages(); @@ -418,7 +419,7 @@ class FreshRSS_user_Controller extends Minz_ActionController { Minz_Error::error(404); } - Minz_View::prependTitle(_t('user.email.validation.title') . ' · '); + FreshRSS_View::prependTitle(_t('user.email.validation.title') . ' · '); $this->view->_layout('simple'); $username = Minz_Request::param('username'); @@ -429,11 +430,11 @@ class FreshRSS_user_Controller extends Minz_ActionController { } elseif (FreshRSS_Auth::hasAccess()) { $user_config = FreshRSS_Context::$user_conf; } else { - Minz_Error::error(403); + return Minz_Error::error(403); } if (!FreshRSS_UserDAO::exists($username) || $user_config === null) { - Minz_Error::error(404); + return Minz_Error::error(404); } if ($user_config->email_validation_token === '') { |