diff options
Diffstat (limited to 'p')
| -rw-r--r-- | p/api/fever.php | 2 | ||||
| -rw-r--r-- | p/api/greader.php | 4 | ||||
| -rw-r--r-- | p/api/pshb.php | 5 | ||||
| -rw-r--r-- | p/themes/base-theme/template.css | 4 | ||||
| -rw-r--r-- | p/themes/base-theme/template.rtl.css | 4 |
5 files changed, 18 insertions, 1 deletions
diff --git a/p/api/fever.php b/p/api/fever.php index a714561da..909e29d32 100644 --- a/p/api/fever.php +++ b/p/api/fever.php @@ -163,7 +163,7 @@ class FeverAPI $username = trim($username); Minz_Session::_param('currentUser', $username); $user_conf = get_user_configuration($username); - if ($user_conf != null && $feverKey === $user_conf->feverKey) { + if ($user_conf != null && $feverKey === $user_conf->feverKey && $user_conf->enabled) { FreshRSS_Context::$user_conf = $user_conf; Minz_Translate::init(FreshRSS_Context::$user_conf->language); $this->entryDAO = FreshRSS_Factory::createEntryDao(); diff --git a/p/api/greader.php b/p/api/greader.php index a9e6398d2..b87387bd7 100644 --- a/p/api/greader.php +++ b/p/api/greader.php @@ -157,6 +157,10 @@ function authorizationToUser() { Minz_Log::warning('Invalid API user ' . $user . ': configuration cannot be found.'); unauthorized(); } + if (!FreshRSS_Context::$user_conf->enabled) { + Minz_Log::warning('Invalid API user ' . $user . ': configuration cannot be found.'); + unauthorized(); + } if ($headerAuthX[1] === sha1(FreshRSS_Context::$system_conf->salt . $user . FreshRSS_Context::$user_conf->apiPasswordHash)) { return $user; } else { diff --git a/p/api/pshb.php b/p/api/pshb.php index e8109cbb0..1e07c0f80 100644 --- a/p/api/pshb.php +++ b/p/api/pshb.php @@ -140,6 +140,11 @@ foreach ($users as $userFilename) { Minz_Translate::reset(FreshRSS_Context::$user_conf->language); } + if (!FreshRSS_Context::$user_conf->enabled) { + Minz_Log::warning('FreshRSS skip disabled user ' . $username); + continue; + } + list($updated_feeds, $feed, $nb_new_articles) = FreshRSS_feed_Controller::actualizeFeed(0, $self, false, $simplePie); if ($updated_feeds > 0 || $feed != false) { $nb++; diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index ccc615fd0..3394bf896 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -1203,6 +1203,10 @@ input:checked + .slide-container .properties { white-space: pre-line; } +.default-user { + font-style: italic; +} + /*=== READER */ /*===========*/ .reader .nav_menu .toggle_aside { diff --git a/p/themes/base-theme/template.rtl.css b/p/themes/base-theme/template.rtl.css index a1fd33d0a..7985ff764 100644 --- a/p/themes/base-theme/template.rtl.css +++ b/p/themes/base-theme/template.rtl.css @@ -1203,6 +1203,10 @@ input:checked + .slide-container .properties { white-space: pre-line; } +.default-user { + font-style: italic; +} + /*=== READER */ /*===========*/ .reader .nav_menu .toggle_aside { |