mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-24 16:25:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Début de mode multi-utilisateur avec http_auth

Browse Source 
+ Légère optimisation de Minz_View.
+ Encore plus de tests de bibliothèques dans install.php
Contribue à https://github.com/marienfressinaud/FreshRSS/issues/126 et
https://github.com/marienfressinaud/FreshRSS/issues/303
This commit is contained in:
Alexandre Alapetite
2013-12-30 01:03:32 +01:00
parent 220341b406
commit 92efd68a3a
21 changed files with 272 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/Controllers/feedController.php
View File

@@ -2,18 +2,17 @@
class FreshRSS_feed_Controller extends Minz_ActionController {
public function firstAction () {
$token = $this->view->conf->token;
$token_param = Minz_Request::param ('token', '');
$token_is_ok = ($token != '' && $token == $token_param);
$action = Minz_Request::actionName ();
if (login_is_conf ($this->view->conf) &&
!is_logged () &&
!($token_is_ok && $action == 'actualize')) {
Minz_Error::error (
403,
array ('error' => array (Minz_Translate::t ('access_denied')))
);
if (!$this->view->loginOk) {
$token = $this->view->conf->token; //TODO: check the token logic again, and if it is still needed
$token_param = Minz_Request::param ('token', '');
$token_is_ok = ($token != '' && $token == $token_param);
$action = Minz_Request::actionName ();
if (!($token_is_ok && $action === 'actualize')) {
Minz_Error::error (
403,
array ('error' => array (Minz_Translate::t ('access_denied')))
);
}
}
$this->catDAO = new FreshRSS_CategoryDAO ();
@@ -411,10 +410,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
}
private function addCategories ($categories) {
$catDAO = new FreshRSS_CategoryDAO ();
foreach ($categories as $cat) {
if (!$catDAO->searchByName ($cat->name ())) {
if (!$this->catDAO->searchByName ($cat->name ())) {
$values = array (
'id' => $cat->id (),
'name' => $cat->name (),