aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/poche/Poche.class.php
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2015-02-10 01:23:30 +0100
committerThomas Citharel <tcit@tcit.fr>2015-02-10 01:23:30 +0100
commit28c42eb1d83856d014a74fe0370d6d0a7a892580 (patch)
tree1856d6a07edb26b6f188b8a354b4ba34c7efc5e2 /inc/poche/Poche.class.php
parentcefdc12380c5acee927e3f8e1cb85213f4b1475d (diff)
parentfde4cf0616e68d7b94f0991c1fcb434de4567c17 (diff)
downloadwallabag-28c42eb1d83856d014a74fe0370d6d0a7a892580.tar.gz
wallabag-28c42eb1d83856d014a74fe0370d6d0a7a892580.tar.zst
wallabag-28c42eb1d83856d014a74fe0370d6d0a7a892580.zip
Merge pull request #1053 from erixtekila/dev
Fix fetched entries when localized
Diffstat (limited to 'inc/poche/Poche.class.php')
-rwxr-xr-xinc/poche/Poche.class.php28
1 files changed, 17 insertions, 11 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index a601f0a8..d096de91 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -740,17 +740,23 @@ class Poche
740 $purifier = $this->_getPurifier(); 740 $purifier = $this->_getPurifier();
741 foreach($items as $item) { 741 foreach($items as $item) {
742 $url = new Url(base64_encode($item['url'])); 742 $url = new Url(base64_encode($item['url']));
743 Tools::logm('Fetching article ' . $item['id']); 743 if( $url->isCorrect() )
744 $content = Tools::getPageContent($url); 744 {
745 $title = (($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled')); 745 Tools::logm('Fetching article ' . $item['id']);
746 $body = (($content['rss']['channel']['item']['description'] != '') ? $content['rss']['channel']['item']['description'] : _('Undefined')); 746 $content = Tools::getPageContent($url);
747 747 $title = (($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'));
748 // clean content to prevent xss attack 748 $body = (($content['rss']['channel']['item']['description'] != '') ? $content['rss']['channel']['item']['description'] : _('Undefined'));
749 749
750 $title = $purifier->purify($title); 750 // clean content to prevent xss attack
751 $body = $purifier->purify($body); 751
752 $this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId()); 752 $title = $purifier->purify($title);
753 Tools::logm('Article ' . $item['id'] . ' updated.'); 753 $body = $purifier->purify($body);
754 $this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId());
755 Tools::logm('Article ' . $item['id'] . ' updated.');
756 } else
757 {
758 Tools::logm('Unvalid URL (' . $item['url'] .') to fetch for article ' . $item['id']);
759 }
754 } 760 }
755 } 761 }
756 } 762 }