From 19407e1ab6df2c239017fb20e47d6201bdaab223 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sat, 27 Apr 2013 13:40:48 +0200 Subject: Structure pour l'internationalisation terminée (voir bug #38) : il reste à faire la traduction en anglais notamment, rajouter une option pour changer la langue, détecter la langue préférée de l'utilisateur et voir si on peut migrer facilement l'installateur aussi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/feedController.php | 44 ++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 26 deletions(-) (limited to 'app/controllers/feedController.php') diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php index c67609d57..1232ddff4 100755 --- a/app/controllers/feedController.php +++ b/app/controllers/feedController.php @@ -10,7 +10,7 @@ class feedController extends ActionController { if (login_is_conf ($this->view->conf) && !is_logged ()) { Error::error ( 403, - array ('error' => array ('Vous n\'avez pas le droit d\'accéder à cette page')) + array ('error' => array (Translate::t ('access_denied'))) ); } else { if (Request::isPost ()) { @@ -37,7 +37,7 @@ class feedController extends ActionController { if ($feedDAO->searchByUrl ($values['url'])) { $notif = array ( 'type' => 'bad', - 'content' => 'Vous êtes déjà abonné à ' . $feed->name () . '' + 'content' => Translate::t ('already_subscribed', $feed->name ()) ); Session::_param ('notification', $notif); } elseif ($feedDAO->addFeed ($values)) { @@ -52,7 +52,7 @@ class feedController extends ActionController { // notif $notif = array ( 'type' => 'good', - 'content' => 'Le flux ' . $feed->name () . ' a bien été ajouté' + 'content' => Translate::t ('feed_added', $feed->name ()) ); Session::_param ('notification', $notif); $params['id'] = $feed->id (); @@ -60,7 +60,7 @@ class feedController extends ActionController { // notif $notif = array ( 'type' => 'bad', - 'content' => '' . $feed->name () . ' n\' a pas pu être ajouté' + 'content' => Translate::t ('feed_not_added', $feed->name ()) ); Session::_param ('notification', $notif); } @@ -68,22 +68,14 @@ class feedController extends ActionController { Log::record ($e->getMessage (), Log::ERROR); $notif = array ( 'type' => 'bad', - 'content' => 'Un problème interne a été rencontré, le flux n\'a pas pu être ajouté' - ); - Session::_param ('notification', $notif); - } catch (FileNotExistException $e) { - Log::record ($e->getMessage (), Log::ERROR); - // notif - $notif = array ( - 'type' => 'bad', - 'content' => 'Un problème de configuration a empêché l\'ajout du flux. Voir les logs pour plus d\'informations' + 'content' => Translate::t ('internal_problem_feed') ); Session::_param ('notification', $notif); } catch (Exception $e) { // notif $notif = array ( 'type' => 'bad', - 'content' => 'L\'url ' . $url . ' est invalide' + 'content' => Translate::t ('invalid_url', $url) ); Session::_param ('notification', $notif); } @@ -144,18 +136,18 @@ class feedController extends ActionController { $feed = reset ($feeds); $notif = array ( 'type' => 'good', - 'content' => '' . $feed->name () . ' a été mis à jour' + 'content' => Translate::t ('feed_actualized', $feed->name ()) ); $url['params'] = array ('get' => 'f_' . $feed->id ()); } elseif ($i > 0) { $notif = array ( 'type' => 'good', - 'content' => $i . ' flux ont été mis à jour' + 'content' => Translate::t ('n_feeds_actualized', $i) ); } else { $notif = array ( 'type' => 'bad', - 'content' => 'Aucun flux n\'a pu être mis à jour' + 'content' => Translate::t ('no_feed_actualized') ); } @@ -165,7 +157,7 @@ class feedController extends ActionController { } else { $notif = array ( 'type' => 'good', - 'content' => 'Les flux ont été mis à jour' + 'content' => Translate::t ('feeds_actualized') ); Session::_param ('notification', $notif); $this->view->_useLayout (false); @@ -176,7 +168,7 @@ class feedController extends ActionController { if (login_is_conf ($this->view->conf) && !is_logged ()) { Error::error ( 403, - array ('error' => array ('Vous n\'avez pas le droit d\'accéder à cette page')) + array ('error' => array (Translate::t ('access_denied'))) ); } else { $entryDAO = new EntryDAO (); @@ -219,9 +211,9 @@ class feedController extends ActionController { } if ($error) { - $res = 'Les flux ont été importés mais des erreurs sont survenus'; + $res = Translate::t ('feeds_imported_with_errors'); } else { - $res = 'Les flux ont été importés'; + $res = Translate::t ('feeds_imported'); } $notif = array ( 'type' => 'good', @@ -240,7 +232,7 @@ class feedController extends ActionController { if (login_is_conf ($this->view->conf) && !is_logged ()) { Error::error ( 403, - array ('error' => array ('Vous n\'avez pas le droit d\'accéder à cette page')) + array ('error' => array (Translate::t ('access_denied'))) ); } else { $type = Request::param ('type', 'feed'); @@ -251,24 +243,24 @@ class feedController extends ActionController { if ($feedDAO->deleteFeedByCategory ($id)) { $notif = array ( 'type' => 'good', - 'content' => 'La catégorie a été vidée' + 'content' => Translate::t ('category_emptied') ); } else { $notif = array ( 'type' => 'bad', - 'content' => 'Un problème est survenu' + 'content' => Translate::t ('error_occured') ); } } else { if ($feedDAO->deleteFeed ($id)) { $notif = array ( 'type' => 'good', - 'content' => 'Le flux a été supprimé' + 'content' => Translate::t ('feed_deleted') ); } else { $notif = array ( 'type' => 'bad', - 'content' => 'Un problème est survenu' + 'content' => Translate::t ('error_occured') ); } } -- cgit v1.2.3 From 0e95494e29353a9ae31fb1196c6c9aaf556ae981 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sat, 27 Apr 2013 21:08:29 +0200 Subject: Fix issue #26 : possibilité de s'abonner à des flux derrière authentification HTTP + correction quelques traductions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/configureController.php | 10 +++++++++- app/controllers/feedController.php | 12 +++++++++++- app/i18n/en.php | 7 ++++--- app/i18n/fr.php | 3 ++- app/layout/aside_feed.phtml | 8 ++++++++ app/models/Feed.php | 27 ++++++++++++++++++++++----- app/views/configure/feed.phtml | 11 ++++++----- 7 files changed, 62 insertions(+), 16 deletions(-) (limited to 'app/controllers/feedController.php') diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php index 81a8e97d7..f4d1a38e7 100755 --- a/app/controllers/configureController.php +++ b/app/controllers/configureController.php @@ -90,11 +90,19 @@ class configureController extends ActionController { $cat = Request::param ('category', 0); $path = Request::param ('path_entries', ''); $priority = Request::param ('priority', 0); + $user = Request::param ('http_user', ''); + $pass = Request::param ('http_pass', ''); + + $httpAuth = ''; + if ($user != '' || $pass != '') { + $httpAuth = $user . ':' . $pass; + } $values = array ( 'category' => $cat, 'pathEntries' => $path, - 'priority' => $priority + 'priority' => $priority, + 'httpAuth' => $httpAuth ); if ($feedDAO->updateFeed ($id, $values)) { diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php index 1232ddff4..c235e8b0f 100755 --- a/app/controllers/feedController.php +++ b/app/controllers/feedController.php @@ -16,11 +16,20 @@ class feedController extends ActionController { if (Request::isPost ()) { $url = Request::param ('url_rss'); $cat = Request::param ('category'); + $user = Request::param ('username'); + $pass = Request::param ('password'); $params = array (); try { $feed = new Feed ($url); $feed->_category ($cat); + + $httpAuth = ''; + if ($user != '' || $pass != '') { + $httpAuth = $user . ':' . $pass; + } + $feed->_httpAuth ($httpAuth); + $feed->load (); $feedDAO = new FeedDAO (); @@ -31,7 +40,8 @@ class feedController extends ActionController { 'name' => $feed->name (), 'website' => $feed->website (), 'description' => $feed->description (), - 'lastUpdate' => time () + 'lastUpdate' => time (), + 'httpAuth' => $feed->httpAuth (), ); if ($feedDAO->searchByUrl ($values['url'])) { diff --git a/app/i18n/en.php b/app/i18n/en.php index 921f86ddc..1bb7c2213 100644 --- a/app/i18n/en.php +++ b/app/i18n/en.php @@ -9,7 +9,7 @@ return array ( 'configuration' => 'Configuration', 'general_and_reading' => 'General and reading', 'categories' => 'Categories', - 'category' => 'Catégory', + 'category' => 'Category', 'shortcuts' => 'Shortcuts', 'about' => 'About', @@ -88,7 +88,7 @@ return array ( 'cancel' => 'Cancel', 'back_to_rss_feeds' => '← Go back to your RSS feeds', - 'feeds_moved_category_deleted' => 'When you delete a category, their feeds are automatically classified under %s.', + 'feeds_moved_category_deleted' => 'When you delete a category, their feeds are automatically classified under %s.', 'category_number' => 'Category n°%d', 'ask_empty' => 'Clear ?', 'number_feeds' => '%d feeds', @@ -123,6 +123,7 @@ return array ( 'no' => 'No', 'css_path_on_website' => 'Articles CSS path on original website', 'retrieve_truncated_feeds' => 'Retrieves truncated RSS feeds (attention, requires more time!)', + 'http_authentication' => 'HTTP Authentication', 'http_username' => 'HTTP username', 'http_password' => 'HTTP password', 'blank_to_disable' => 'Leave blank to disable', @@ -198,7 +199,7 @@ return array ( 'september' => 'september', 'october' => 'october', 'november' => 'november', - 'december' => 'décember', + 'december' => 'december', // special format for date() function 'Jan' => '\J\a\n\u\a\r\y', 'Feb' => '\F\e\b\r\u\a\r\y', diff --git a/app/i18n/fr.php b/app/i18n/fr.php index 3178f3687..c5bba9d07 100644 --- a/app/i18n/fr.php +++ b/app/i18n/fr.php @@ -123,7 +123,8 @@ return array ( 'no' => 'Non', 'css_path_on_website' => 'Chemin CSS des articles sur le site d\'origine', 'retrieve_truncated_feeds' => 'Permet de récupérer les flux tronqués (attention, demande plus de temps !)', - 'http_username' => 'Username HTTP', + 'http_authentication' => 'Authentification HTTP', + 'http_username' => 'Identifiant HTTP', 'http_password' => 'Mot de passe HTTP', 'blank_to_disable' => 'Laissez vide pour désactiver', 'not_yet_implemented' => 'Pas encore implémenté', diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index ff03b5552..4be37868d 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -21,6 +21,14 @@ + +
    • +
  • + +
    • +
  • + +
    • diff --git a/app/models/Feed.php b/app/models/Feed.php index 222e22256..08cf7425f 100644 --- a/app/models/Feed.php +++ b/app/models/Feed.php @@ -59,9 +59,13 @@ class Feed extends Model { if ($raw) { return $this->httpAuth; } else { + $pos_colon = strpos ($this->httpAuth, ':'); + $user = substr ($this->httpAuth, 0, $pos_colon); + $pass = substr ($this->httpAuth, $pos_colon + 1); + return array ( - 'username' => '', - 'password' => '' + 'username' => $user, + 'password' => $pass ); } } @@ -134,7 +138,12 @@ class Feed extends Model { ); } else { $feed = new SimplePie (); - $feed->set_feed_url (preg_replace ('/&/', '&', $this->url)); + $url = preg_replace ('/&/', '&', $this->url); + if ($this->httpAuth != '') { + $url = preg_replace ('#((.+)://)(.+)#', '${1}' . $this->httpAuth . '@${3}', $url); + } + + $feed->set_feed_url ($url); $feed->set_cache_location (CACHE_PATH); $feed->init (); @@ -144,6 +153,9 @@ class Feed extends Model { $subscribe_url = $feed->subscribe_url (); if (!is_null ($subscribe_url) && $subscribe_url != $this->url) { + if ($this->httpAuth != '') { + $subscribe_url = preg_replace ('#((.+)://)((.+)@)(.+)#', '${1}${5}', $subscribe_url); + } $this->_url ($subscribe_url); } $title = $feed->get_title (); @@ -205,7 +217,7 @@ class Feed extends Model { class FeedDAO extends Model_pdo { public function addFeed ($valuesTmp) { - $sql = 'INSERT INTO feed (id, url, category, name, website, description, lastUpdate, priority, error) VALUES(?, ?, ?, ?, ?, ?, ?, 10, 0)'; + $sql = 'INSERT INTO feed (id, url, category, name, website, description, lastUpdate, priority, httpAuth, error) VALUES(?, ?, ?, ?, ?, ?, ?, 10, ?, 0)'; $stm = $this->bd->prepare ($sql); $values = array ( @@ -216,6 +228,7 @@ class FeedDAO extends Model_pdo { $valuesTmp['website'], $valuesTmp['description'], $valuesTmp['lastUpdate'], + base64_encode ($valuesTmp['httpAuth']), ); if ($stm && $stm->execute ($values)) { @@ -231,6 +244,10 @@ class FeedDAO extends Model_pdo { $set = ''; foreach ($valuesTmp as $key => $v) { $set .= $key . '=?, '; + + if ($key == 'httpAuth') { + $valuesTmp[$key] = base64_encode ($v); + } } $set = substr ($set, 0, -2); @@ -408,7 +425,7 @@ class HelperFeed { $list[$key]->_lastUpdate ($dao['lastUpdate']); $list[$key]->_priority ($dao['priority']); $list[$key]->_pathEntries ($dao['pathEntries']); - $list[$key]->_httpAuth ($dao['httpAuth']); + $list[$key]->_httpAuth (base64_decode ($dao['httpAuth'])); if (isset ($dao['id'])) { $list[$key]->_id ($dao['id']); diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml index 73b70ec4c..0d9c5cae6 100644 --- a/app/views/configure/feed.phtml +++ b/app/views/configure/feed.phtml @@ -58,20 +58,21 @@ - +
    @@ -82,5 +83,5 @@
    -
    +
    -- cgit v1.2.3 From 864318bf68b28ff6340701bce24e25768164e138 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 28 Apr 2013 16:01:14 +0200 Subject: Meilleure gestion des erreurs lors de l'ajout d'un flux RSS + les vidéos apparaissent maintenant dans les articles + si connexion paramétrée l'actualisation des flux n'est plus permis MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/feedController.php | 332 ++++++++++++++++----------------- app/layout/nav_menu.phtml | 2 +- app/models/Exception/FeedException.php | 6 + app/models/Feed.php | 14 +- 4 files changed, 184 insertions(+), 170 deletions(-) (limited to 'app/controllers/feedController.php') diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php index c235e8b0f..b535e7bc4 100755 --- a/app/controllers/feedController.php +++ b/app/controllers/feedController.php @@ -2,96 +2,108 @@ class feedController extends ActionController { public function firstAction () { - $catDAO = new CategoryDAO (); - $catDAO->checkDefault (); - } - - public function addAction () { if (login_is_conf ($this->view->conf) && !is_logged ()) { Error::error ( 403, array ('error' => array (Translate::t ('access_denied'))) ); - } else { - if (Request::isPost ()) { - $url = Request::param ('url_rss'); - $cat = Request::param ('category'); - $user = Request::param ('username'); - $pass = Request::param ('password'); - $params = array (); - - try { - $feed = new Feed ($url); - $feed->_category ($cat); - - $httpAuth = ''; - if ($user != '' || $pass != '') { - $httpAuth = $user . ':' . $pass; - } - $feed->_httpAuth ($httpAuth); - - $feed->load (); - - $feedDAO = new FeedDAO (); - $values = array ( - 'id' => $feed->id (), - 'url' => $feed->url (), - 'category' => $feed->category (), - 'name' => $feed->name (), - 'website' => $feed->website (), - 'description' => $feed->description (), - 'lastUpdate' => time (), - 'httpAuth' => $feed->httpAuth (), - ); + } - if ($feedDAO->searchByUrl ($values['url'])) { - $notif = array ( - 'type' => 'bad', - 'content' => Translate::t ('already_subscribed', $feed->name ()) - ); - Session::_param ('notification', $notif); - } elseif ($feedDAO->addFeed ($values)) { - $entryDAO = new EntryDAO (); - $entries = $feed->entries (); - - foreach ($entries as $entry) { - $values = $entry->toArray (); - $entryDAO->addEntry ($values); - } - - // notif - $notif = array ( - 'type' => 'good', - 'content' => Translate::t ('feed_added', $feed->name ()) - ); - Session::_param ('notification', $notif); - $params['id'] = $feed->id (); - } else { - // notif - $notif = array ( - 'type' => 'bad', - 'content' => Translate::t ('feed_not_added', $feed->name ()) - ); - Session::_param ('notification', $notif); - } - } catch (FeedException $e) { - Log::record ($e->getMessage (), Log::ERROR); + $catDAO = new CategoryDAO (); + $catDAO->checkDefault (); + } + + public function addAction () { + if (Request::isPost ()) { + $url = Request::param ('url_rss'); + $cat = Request::param ('category'); + $user = Request::param ('username'); + $pass = Request::param ('password'); + $params = array (); + + try { + $feed = new Feed ($url); + $feed->_category ($cat); + + $httpAuth = ''; + if ($user != '' || $pass != '') { + $httpAuth = $user . ':' . $pass; + } + $feed->_httpAuth ($httpAuth); + + $feed->load (); + + $feedDAO = new FeedDAO (); + $values = array ( + 'id' => $feed->id (), + 'url' => $feed->url (), + 'category' => $feed->category (), + 'name' => $feed->name (), + 'website' => $feed->website (), + 'description' => $feed->description (), + 'lastUpdate' => time (), + 'httpAuth' => $feed->httpAuth (), + ); + + if ($feedDAO->searchByUrl ($values['url'])) { + // on est déjà abonné à ce flux $notif = array ( 'type' => 'bad', - 'content' => Translate::t ('internal_problem_feed') + 'content' => Translate::t ('already_subscribed', $feed->name ()) ); Session::_param ('notification', $notif); - } catch (Exception $e) { - // notif + } elseif (!$feedDAO->addFeed ($values)) { + // problème au niveau de la base de données $notif = array ( 'type' => 'bad', - 'content' => Translate::t ('invalid_url', $url) + 'content' => Translate::t ('feed_not_added', $feed->name ()) ); Session::_param ('notification', $notif); - } + } else { + $entryDAO = new EntryDAO (); + $entries = $feed->entries (); - Request::forward (array ('c' => 'configure', 'a' => 'feed', 'params' => $params), true); + // on ajoute les articles en masse sans vérification + foreach ($entries as $entry) { + $values = $entry->toArray (); + $entryDAO->addEntry ($values); + } + + // ok, ajout terminé + $notif = array ( + 'type' => 'good', + 'content' => Translate::t ('feed_added', $feed->name ()) + ); + Session::_param ('notification', $notif); + + // permet de rediriger vers la page de conf du flux + $params['id'] = $feed->id (); + } + } catch (BadUrlException $e) { + Log::record ($e->getMessage (), Log::ERROR); + $notif = array ( + 'type' => 'bad', + 'content' => Translate::t ('invalid_url', $url) + ); + Session::_param ('notification', $notif); + } catch (FeedException $e) { + Log::record ($e->getMessage (), Log::ERROR); + $notif = array ( + 'type' => 'bad', + 'content' => Translate::t ('internal_problem_feed') + ); + Session::_param ('notification', $notif); + } catch (FileNotExistException $e) { + // Répertoire de cache n'existe pas + Log::record ($e->getMessage (), Log::ERROR); + $notif = array ( + 'type' => 'bad', + 'content' => Translate::t ('internal_problem_feed') + ); + Session::_param ('notification', $notif); } + + Request::forward (array ('c' => 'configure', 'a' => 'feed', 'params' => $params), true); } } @@ -175,114 +187,100 @@ class feedController extends ActionController { } public function massiveImportAction () { - if (login_is_conf ($this->view->conf) && !is_logged ()) { - Error::error ( - 403, - array ('error' => array (Translate::t ('access_denied'))) - ); - } else { - $entryDAO = new EntryDAO (); - $feedDAO = new FeedDAO (); - - $categories = Request::param ('categories', array ()); - $feeds = Request::param ('feeds', array ()); - - $this->addCategories ($categories); - - $nb_month_old = $this->view->conf->oldEntries (); - $date_min = time () - (60 * 60 * 24 * 30 * $nb_month_old); - - $error = false; - $i = 0; - foreach ($feeds as $feed) { - try { - $feed->load (); - - // Enregistrement du flux - $values = array ( - 'id' => $feed->id (), - 'url' => $feed->url (), - 'category' => $feed->category (), - 'name' => $feed->name (), - 'website' => $feed->website (), - 'description' => $feed->description (), - 'lastUpdate' => 0 - ); + $entryDAO = new EntryDAO (); + $feedDAO = new FeedDAO (); + + $categories = Request::param ('categories', array ()); + $feeds = Request::param ('feeds', array ()); + + $this->addCategories ($categories); + + $nb_month_old = $this->view->conf->oldEntries (); + $date_min = time () - (60 * 60 * 24 * 30 * $nb_month_old); + + $error = false; + $i = 0; + foreach ($feeds as $feed) { + try { + $feed->load (); - if (!$feedDAO->searchByUrl ($values['url'])) { - if (!$feedDAO->addFeed ($values)) { - $error = true; - } + // Enregistrement du flux + $values = array ( + 'id' => $feed->id (), + 'url' => $feed->url (), + 'category' => $feed->category (), + 'name' => $feed->name (), + 'website' => $feed->website (), + 'description' => $feed->description (), + 'lastUpdate' => 0 + ); + + if (!$feedDAO->searchByUrl ($values['url'])) { + if (!$feedDAO->addFeed ($values)) { + $error = true; } - } catch (FeedException $e) { - $error = true; - Log::record ($e->getMessage (), Log::ERROR); } + } catch (FeedException $e) { + $error = true; + Log::record ($e->getMessage (), Log::ERROR); } + } - if ($error) { - $res = Translate::t ('feeds_imported_with_errors'); - } else { - $res = Translate::t ('feeds_imported'); - } - $notif = array ( - 'type' => 'good', - 'content' => $res - ); - Session::_param ('notification', $notif); - - Request::forward (array ( - 'c' => 'configure', - 'a' => 'importExport' - ), true); + if ($error) { + $res = Translate::t ('feeds_imported_with_errors'); + } else { + $res = Translate::t ('feeds_imported'); } + $notif = array ( + 'type' => 'good', + 'content' => $res + ); + Session::_param ('notification', $notif); + + Request::forward (array ( + 'c' => 'configure', + 'a' => 'importExport' + ), true); } public function deleteAction () { - if (login_is_conf ($this->view->conf) && !is_logged ()) { - Error::error ( - 403, - array ('error' => array (Translate::t ('access_denied'))) - ); - } else { - $type = Request::param ('type', 'feed'); - $id = Request::param ('id'); + $type = Request::param ('type', 'feed'); + $id = Request::param ('id'); - $feedDAO = new FeedDAO (); - if ($type == 'category') { - if ($feedDAO->deleteFeedByCategory ($id)) { - $notif = array ( - 'type' => 'good', - 'content' => Translate::t ('category_emptied') - ); - } else { - $notif = array ( - 'type' => 'bad', - 'content' => Translate::t ('error_occured') - ); - } + $feedDAO = new FeedDAO (); + if ($type == 'category') { + if ($feedDAO->deleteFeedByCategory ($id)) { + $notif = array ( + 'type' => 'good', + 'content' => Translate::t ('category_emptied') + ); } else { - if ($feedDAO->deleteFeed ($id)) { - $notif = array ( - 'type' => 'good', - 'content' => Translate::t ('feed_deleted') - ); - } else { - $notif = array ( - 'type' => 'bad', - 'content' => Translate::t ('error_occured') - ); - } + $notif = array ( + 'type' => 'bad', + 'content' => Translate::t ('error_occured') + ); } - - Session::_param ('notification', $notif); - - if ($type == 'category') { - Request::forward (array ('c' => 'configure', 'a' => 'categorize'), true); + } else { + if ($feedDAO->deleteFeed ($id)) { + $notif = array ( + 'type' => 'good', + 'content' => Translate::t ('feed_deleted') + ); } else { - Request::forward (array ('c' => 'configure', 'a' => 'feed'), true); + $notif = array ( + 'type' => 'bad', + 'content' => Translate::t ('error_occured') + ); } } + + Session::_param ('notification', $notif); + + if ($type == 'category') { + Request::forward (array ('c' => 'configure', 'a' => 'categorize'), true); + } else { + Request::forward (array ('c' => 'configure', 'a' => 'feed'), true); + } } private function addCategories ($categories) { diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index 1ee935db9..ce124da11 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -1,6 +1,7 @@
    + conf) || is_logged ()) { ?> - conf) || is_logged ()) { ?>
    diff --git a/app/models/Exception/FeedException.php b/app/models/Exception/FeedException.php index 3fe0f4ea0..bc61e1736 100644 --- a/app/models/Exception/FeedException.php +++ b/app/models/Exception/FeedException.php @@ -5,3 +5,9 @@ class FeedException extends Exception { parent::__construct ($message); } } + +class BadUrlException extends FeedException { + public function __construct ($url) { + parent::__construct ('`' . $url . '` is not a valid URL'); + } +} diff --git a/app/models/Feed.php b/app/models/Feed.php index e519a91cb..51c409b69 100644 --- a/app/models/Feed.php +++ b/app/models/Feed.php @@ -99,7 +99,7 @@ class Feed extends Model { if (!is_null ($value) && filter_var ($value, FILTER_VALIDATE_URL)) { $this->url = $value; } else { - throw new Exception (); + throw new BadUrlException ($value); } } public function _category ($value) { @@ -155,15 +155,23 @@ class Feed extends Model { $feed->set_feed_url ($url); $feed->set_cache_location (CACHE_PATH); + $feed->strip_htmltags (array ( + 'base', 'blink', 'body', 'doctype', + 'font', 'form', 'frame', 'frameset', 'html', + 'input', 'marquee', 'meta', 'noscript', + 'param', 'script', 'style' + )); $feed->init (); - if ($feed->error()) { + if ($feed->error ()) { throw new FeedException ($feed->error); } + // si on a utilisé l'auto-discover, notre url va avoir changé $subscribe_url = $feed->subscribe_url (); if (!is_null ($subscribe_url) && $subscribe_url != $this->url) { if ($this->httpAuth != '') { + // on enlève les id si authentification HTTP $subscribe_url = preg_replace ('#((.+)://)((.+)@)(.+)#', '${1}${5}', $subscribe_url); } $this->_url ($subscribe_url); @@ -172,6 +180,8 @@ class Feed extends Model { $this->_name (!is_null ($title) ? $title : $this->url); $this->_website ($feed->get_link ()); $this->_description ($feed->get_description ()); + + // et on charge les articles du flux $this->loadEntries ($feed); } } -- cgit v1.2.3 From bdaddd4e7602cc6ba11284a166c91ca0335c5b78 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 28 Apr 2013 16:15:16 +0200 Subject: Actualisation des flux ok + ajout de commentaires et de TODO (issue #28) --- app/controllers/feedController.php | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'app/controllers/feedController.php') diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php index b535e7bc4..ea68952a0 100755 --- a/app/controllers/feedController.php +++ b/app/controllers/feedController.php @@ -64,6 +64,7 @@ class feedController extends ActionController { $entries = $feed->entries (); // on ajoute les articles en masse sans vérification + // TODO vérification de la date pour ne pas ajouter de vieux articles foreach ($entries as $entry) { $values = $entry->toArray (); $entryDAO->addEntry ($values); @@ -112,6 +113,10 @@ class feedController extends ActionController { $entryDAO = new EntryDAO (); $id = Request::param ('id'); + + // on créé la liste des flux à mettre à actualiser + // si on veut mettre un flux à jour spécifiquement, on le met + // dans la liste, mais seul (permet d'automatiser le traitement) $feeds = array (); if ($id) { $feed = $feedDAO->searchById ($id); @@ -122,7 +127,7 @@ class feedController extends ActionController { $feeds = $feedDAO->listFeedsOrderUpdate (); } - // pour ne pas ajouter des entrées trop anciennes + // on calcule la date des articles les plus anciens qu'on accepte $nb_month_old = $this->view->conf->oldEntries (); $date_min = time () - (60 * 60 * 24 * 30 * $nb_month_old); @@ -132,6 +137,11 @@ class feedController extends ActionController { $feed->load (); $entries = $feed->entries (); + // ajout des articles en masse sans se soucier des erreurs + // On ne vérifie pas que l'article n'est pas déjà en BDD + // car demanderait plus de ressources + // La BDD refusera l'ajout de son côté car l'id doit être + // unique foreach ($entries as $entry) { if ($entry->date (true) >= $date_min) { $values = $entry->toArray (); @@ -139,34 +149,42 @@ class feedController extends ActionController { } } + // on indique que le flux vient d'être mis à jour en BDD $feedDAO->updateLastUpdate ($feed->id ()); } catch (FeedException $e) { Log::record ($e->getMessage (), Log::ERROR); + // TODO si on a une erreur ici, il faut mettre + // le flux à jour en BDD (error = 1) (issue #70) } + // On arrête à 10 flux pour ne pas surcharger le serveur $i++; if ($i >= 10) { break; } } + // TODO on peut peut-être trouver une meilleure place pour cette fonction ? $entryDAO->cleanOldEntries ($nb_month_old); - // notif $url = array (); if ($i == 1) { + // on a mis un seul flux à jour + // reset permet de récupérer ce flux $feed = reset ($feeds); $notif = array ( 'type' => 'good', 'content' => Translate::t ('feed_actualized', $feed->name ()) ); $url['params'] = array ('get' => 'f_' . $feed->id ()); - } elseif ($i > 0) { + } elseif ($i > 1) { + // plusieurs flux on été mis à jour $notif = array ( 'type' => 'good', 'content' => Translate::t ('n_feeds_actualized', $i) ); } else { + // aucun flux n'a été mis à jour, oups $notif = array ( 'type' => 'bad', 'content' => Translate::t ('no_feed_actualized') @@ -177,11 +195,17 @@ class feedController extends ActionController { Session::_param ('notification', $notif); Request::forward ($url, true); } else { + // Une requête Ajax met un seul flux à jour. + // Comme en principe plusieurs requêtes ont lieu, + // on indique que "plusieurs flux ont été mis à jour". + // Cela permet d'avoir une notification plus proche du + // ressenti utilisateur $notif = array ( 'type' => 'good', 'content' => Translate::t ('feeds_actualized') ); Session::_param ('notification', $notif); + // et on désactive le layout car ne sert à rien $this->view->_useLayout (false); } } -- cgit v1.2.3 From 00bac232e0976a2ca09e7c4e73956cd802176480 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 28 Apr 2013 16:34:25 +0200 Subject: Importation des flux ok + ajout de commentaires (issue #28) --- app/controllers/configureController.php | 7 ++++++- app/controllers/feedController.php | 10 +++++++++- lib/lib_rss.php | 6 ++++++ 3 files changed, 21 insertions(+), 2 deletions(-) (limited to 'app/controllers/feedController.php') diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php index d6d210099..2f56da177 100755 --- a/app/controllers/configureController.php +++ b/app/controllers/configureController.php @@ -199,7 +199,7 @@ class configureController extends ActionController { $this->view->req = Request::param ('q'); if ($this->view->req == 'export') { - View::_title ('feeds.opml'); + View::_title ('freshrss_feeds.opml'); $this->view->_useLayout (false); header('Content-Type: text/xml; charset=utf-8'); @@ -217,8 +217,11 @@ class configureController extends ActionController { $this->view->categories = $list; } elseif ($this->view->req == 'import' && Request::isPost ()) { if ($_FILES['file']['error'] == 0) { + // on parse le fichier OPML pour récupérer les catégories et les flux associés list ($categories, $feeds) = opml_import (file_get_contents ($_FILES['file']['tmp_name'])); + // On redirige vers le controller feed qui va se charger d'insérer les flux en BDD + // les flux sont mis au préalable dans des variables de Request Request::_param ('q', 'null'); Request::_param ('categories', $categories); Request::_param ('feeds', $feeds); @@ -228,6 +231,8 @@ class configureController extends ActionController { $feedDAO = new FeedDAO (); $this->view->feeds = $feedDAO->listFeeds (); + + // au niveau de la vue, permet de ne pas voir un flux sélectionné dans la liste $this->view->flux = false; View::prependTitle (Translate::t ('import_export_opml') . ' - '); diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php index ea68952a0..ebbf3259f 100755 --- a/app/controllers/feedController.php +++ b/app/controllers/feedController.php @@ -217,18 +217,23 @@ class feedController extends ActionController { $categories = Request::param ('categories', array ()); $feeds = Request::param ('feeds', array ()); + // on ajoute les catégories en masse dans une fonction à part $this->addCategories ($categories); + // on calcule la date des articles les plus anciens qu'on accepte $nb_month_old = $this->view->conf->oldEntries (); $date_min = time () - (60 * 60 * 24 * 30 * $nb_month_old); + // la variable $error permet de savoir si une erreur est survenue + // Le but est de ne pas arrêter l'import même en cas d'erreur + // L'utilisateur sera mis au courant s'il y a eu des erreurs, mais + // ne connaîtra pas les détails. Ceux-ci seront toutefois logguées $error = false; $i = 0; foreach ($feeds as $feed) { try { $feed->load (); - // Enregistrement du flux $values = array ( 'id' => $feed->id (), 'url' => $feed->url (), @@ -239,6 +244,7 @@ class feedController extends ActionController { 'lastUpdate' => 0 ); + // ajout du flux que s'il n'est pas déjà en BDD if (!$feedDAO->searchByUrl ($values['url'])) { if (!$feedDAO->addFeed ($values)) { $error = true; @@ -255,12 +261,14 @@ class feedController extends ActionController { } else { $res = Translate::t ('feeds_imported'); } + $notif = array ( 'type' => 'good', 'content' => $res ); Session::_param ('notification', $notif); + // et on redirige vers la page import/export Request::forward (array ( 'c' => 'configure', 'a' => 'importExport' diff --git a/lib/lib_rss.php b/lib/lib_rss.php index e004b7498..c574cd3fd 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -83,6 +83,12 @@ function opml_import ($xml) { } if ($title) { + // Permet d'éviter les soucis au niveau des id : + // ceux-ci sont générés en fonction de la date, + // un flux pourrait être dans une catégorie X avec l'id Y + // alors qu'il existe déjà la catégorie X mais avec l'id Z + // Y ne sera pas ajouté et le flux non plus vu que l'id + // de sa catégorie n'exisera pas $catDAO = new CategoryDAO (); $cat = $catDAO->searchByName ($title); if ($cat === false) { -- cgit v1.2.3 From 1c202b9364c766d1bd28a22a04b3f70077f23e84 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 2 May 2013 09:44:34 +0200 Subject: Correction code + ajout commentaires + à l'ajout d'un flux, on n'ajoute plus les trop vieux articles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/feedController.php | 12 ++++++++---- app/controllers/indexController.php | 19 +++++++++---------- app/models/RSSPaginator.php | 2 ++ app/views/index/index.phtml | 24 ++++++++++++------------ 4 files changed, 31 insertions(+), 26 deletions(-) (limited to 'app/controllers/feedController.php') diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php index ebbf3259f..5173c3a2d 100755 --- a/app/controllers/feedController.php +++ b/app/controllers/feedController.php @@ -63,11 +63,16 @@ class feedController extends ActionController { $entryDAO = new EntryDAO (); $entries = $feed->entries (); + // on calcule la date des articles les plus anciens qu'on accepte + $nb_month_old = $this->view->conf->oldEntries (); + $date_min = time () - (60 * 60 * 24 * 30 * $nb_month_old); + // on ajoute les articles en masse sans vérification - // TODO vérification de la date pour ne pas ajouter de vieux articles foreach ($entries as $entry) { - $values = $entry->toArray (); - $entryDAO->addEntry ($values); + if ($entry->date (true) >= $date_min) { + $values = $entry->toArray (); + $entryDAO->addEntry ($values); + } } // ok, ajout terminé @@ -164,7 +169,6 @@ class feedController extends ActionController { } } - // TODO on peut peut-être trouver une meilleure place pour cette fonction ? $entryDAO->cleanOldEntries ($nb_month_old); $url = array (); diff --git a/app/controllers/indexController.php b/app/controllers/indexController.php index 15cbd7edc..f4f0b98b3 100755 --- a/app/controllers/indexController.php +++ b/app/controllers/indexController.php @@ -6,14 +6,14 @@ class indexController extends ActionController { private $mode = 'all'; public function indexAction () { - if (Request::param ('output', '') == 'rss') { + if (Request::param ('output') == 'rss') { $this->view->_useLayout (false); + } else { + View::appendScript (Url::display ('/scripts/shortcut.js')); + View::appendScript (Url::display (array ('c' => 'javascript', 'a' => 'main'))); + View::appendScript (Url::display (array ('c' => 'javascript', 'a' => 'actualize'))); } - View::appendScript (Url::display ('/scripts/shortcut.js')); - View::appendScript (Url::display (array ('c' => 'javascript', 'a' => 'main'))); - View::appendScript (Url::display (array ('c' => 'javascript', 'a' => 'actualize'))); - $entryDAO = new EntryDAO (); $feedDAO = new FeedDAO (); $catDAO = new CategoryDAO (); @@ -28,6 +28,7 @@ class indexController extends ActionController { $type = $this->getType (); $error = $this->checkAndProcessType ($type); if (!$error) { + // On récupère les différents éléments de filtrage $this->view->state = $state = Request::param ('state', $this->view->conf->defaultView ()); $filter = Request::param ('search', ''); $this->view->order = $order = Request::param ('order', $this->view->conf->sortOrder ()); @@ -35,10 +36,13 @@ class indexController extends ActionController { $first = Request::param ('next', ''); try { + // EntriesGetter permet de déporter la complexité du filtrage $getter = new EntriesGetter ($type, $state, $filter, $order, $nb, $first); $getter->execute (); $entries = $getter->getPaginator (); + // Si on a récupéré aucun article "non lus" + // on essaye de récupérer tous les articles if ($state == 'not_read' && $entries->isEmpty ()) { $this->view->state = 'all'; $getter->_state ('all'); @@ -53,11 +57,6 @@ class indexController extends ActionController { 404, array ('error' => array (Translate::t ('page_not_found'))) ); - } catch(CurrentPagePaginationException $e) { - Error::error ( - 404, - array ('error' => array (Translate::t ('page_not_found'))) - ); } } else { Error::error ( diff --git a/app/models/RSSPaginator.php b/app/models/RSSPaginator.php index 619b70380..7010291bc 100644 --- a/app/models/RSSPaginator.php +++ b/app/models/RSSPaginator.php @@ -1,5 +1,7 @@ renderHelper ('rss'); - return; -} -?> +$output = Request::param ('output', 'normal'); -partial ('aside_flux'); ?> - -partial ('nav_menu'); ?> +if ($output == 'rss') { + $this->renderHelper ('rss'); +} else { + $this->partial ('aside_flux'); + $this->partial ('nav_menu'); -entryPaginator) && !$this->entryPaginator->isEmpty ()) { - $items = $this->entryPaginator->items (); + if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) { + $items = $this->entryPaginator->items (); ?> +
    entryPaginator) && !$this->entryPaginator->isEmpty ()) { entryPaginator->render ('pagination.phtml', 'next'); ?>
    - + +
    + -- cgit v1.2.3 From 5963221249cfa9ebce3e788cb1a78a15e50ac4c6 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 2 May 2013 10:18:48 +0200 Subject: Fix issue #65 : création d'un vrai script de mise à jour permettant de mettre tous les flux à jour via CRON MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README | 9 +++++--- actualize_script.php | 45 ++++++++++++++++++++++++++++++++++++++ app/controllers/feedController.php | 4 +++- 3 files changed, 54 insertions(+), 4 deletions(-) create mode 100755 actualize_script.php (limited to 'app/controllers/feedController.php') diff --git a/README b/README index 0136016a1..30cd56226 100644 --- a/README +++ b/README @@ -49,9 +49,12 @@ SÉCURITÉ ET CONSEILS 3. Le fichier `/public/index.php` défini les chemins d'accès aux répertoires clés de l'application. Si vous les bougez, tout se passe ici. - 4. Vous pouvez ajouter une tâche CRON sur l'url de mise à jour des flux - (clic droit sur le bouton d'actualisation puis "Copier l'adresse du - lien") pour que celle-ci se fasse de manière transparente + 4. Vous pouvez ajouter une tâche CRON sur le script d'actualisation des + flux. Il s'agit d'un script PHP à exécuter avec la commande `php`. + Par exemple, pour exécuter le script toutes les heures : + 0 * * * * php /chemin/vers/freshrss/actualize_script.php >/dev/null 2>&1 + Veuillez cependant vérifier que le fichier PUBLIC_PATH/data/Configuration.array.php + soit accessible en lecture / écriture par l'exécuteur du script CHANGELOG ========= diff --git a/actualize_script.php b/actualize_script.php new file mode 100755 index 000000000..cb4cbf351 --- /dev/null +++ b/actualize_script.php @@ -0,0 +1,45 @@ +. +# +# ***** END LICENSE BLOCK ***** + +// Constantes de chemins +define ('PUBLIC_PATH', realpath (dirname (__FILE__) . '/public')); +define ('LIB_PATH', realpath (PUBLIC_PATH . '/../lib')); +define ('APP_PATH', realpath (PUBLIC_PATH . '/../app')); +define ('LOG_PATH', realpath (PUBLIC_PATH . '/../log')); +define ('CACHE_PATH', realpath (PUBLIC_PATH . '/../cache')); + +$_GET['c'] = 'feed'; +$_GET['a'] = 'actualize'; +$_GET['force'] = true; +$_SERVER['HTTP_HOST'] = ''; + +set_include_path (get_include_path () + . PATH_SEPARATOR + . LIB_PATH + . PATH_SEPARATOR + . LIB_PATH . '/minz' + . PATH_SEPARATOR + . APP_PATH); + +require (APP_PATH . '/App_FrontController.php'); + +$front_controller = new App_FrontController (); +$front_controller->init (); +$front_controller->run (); diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php index 5173c3a2d..77f1787d0 100755 --- a/app/controllers/feedController.php +++ b/app/controllers/feedController.php @@ -118,6 +118,7 @@ class feedController extends ActionController { $entryDAO = new EntryDAO (); $id = Request::param ('id'); + $force = Request::param ('force', false); // on créé la liste des flux à mettre à actualiser // si on veut mettre un flux à jour spécifiquement, on le met @@ -163,8 +164,9 @@ class feedController extends ActionController { } // On arrête à 10 flux pour ne pas surcharger le serveur + // sauf si le paramètre $force est à vrai $i++; - if ($i >= 10) { + if ($i >= 10 && !$force) { break; } } -- cgit v1.2.3