From ef17914960191c6008fc70891544ae2182d70582 Mon Sep 17 00:00:00 2001 From: tcit Date: Thu, 24 Apr 2014 09:39:50 +0200 Subject: Fix for #664 - Missing source url attribute in RSS feeds --- inc/3rdparty/libraries/feedwriter/FeedItem.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/3rdparty/libraries/feedwriter/FeedItem.php b/inc/3rdparty/libraries/feedwriter/FeedItem.php index 3487423f..54a56f22 100644 --- a/inc/3rdparty/libraries/feedwriter/FeedItem.php +++ b/inc/3rdparty/libraries/feedwriter/FeedItem.php @@ -174,7 +174,8 @@ */ public function setSource($link) { - $this->setElement('source', $link); + $attributes = array('url'=>$link); + $this->setElement('source', "wallabag",$attributes); } /** -- cgit v1.2.3 From 827f5b42a667a9ac2ab68701c23885ae6e617907 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Thu, 24 Apr 2014 11:48:00 +0300 Subject: fix of rss headers problem --- inc/3rdparty/libraries/feedwriter/FeedWriter.php | 23 ++++++++++++++++++----- inc/3rdparty/makefulltextfeed.php | 6 +++--- 2 files changed, 21 insertions(+), 8 deletions(-) (limited to 'inc') diff --git a/inc/3rdparty/libraries/feedwriter/FeedWriter.php b/inc/3rdparty/libraries/feedwriter/FeedWriter.php index 79639c0c..d708e99b 100755 --- a/inc/3rdparty/libraries/feedwriter/FeedWriter.php +++ b/inc/3rdparty/libraries/feedwriter/FeedWriter.php @@ -87,12 +87,25 @@ define('JSONP', 3, true); * @access public * @return void */ - public function genarateFeed() + public function genarateFeed($withHeaders = true) { - header('Content-type: text/xml; charset=UTF-8'); - // this line prevents Chrome 20 from prompting download - // used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss - header('X-content-type-options: nosniff'); + if ($withHeaders) { + if ($this->version == RSS2) { + header('Content-type: text/xml; charset=UTF-8'); + // this line prevents Chrome 20 from prompting download + // used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss + header('X-content-type-options: nosniff'); + } elseif ($this->version == JSON) { + header('Content-type: application/json; charset=UTF-8'); + } elseif ($this->version == JSONP) { + header('Content-type: application/javascript; charset=UTF-8'); + } + } + + if ($this->version == JSON || $this->version == JSONP) { + $this->json = new stdClass(); + } + $this->printHead(); $this->printChannels(); diff --git a/inc/3rdparty/makefulltextfeed.php b/inc/3rdparty/makefulltextfeed.php index 135964f1..4faad6d9 100755 --- a/inc/3rdparty/makefulltextfeed.php +++ b/inc/3rdparty/makefulltextfeed.php @@ -749,7 +749,7 @@ foreach ($items as $key => $item) { // add effective URL (URL after redirects) if (isset($effective_url)) { //TODO: ensure $effective_url is valid witout - sometimes it causes problems, e.g. - //http://www.siasat.pk/forum/showthread.php?108883-Pakistan-Chowk-by-Rana-Mubashir-–-25th-March-2012-Special-Program-from-Liari-(Karachi) + //http://www.siasat.pk/forum/showthread.php?108883-Pakistan-Chowk-by-Rana-Mubashir-�-25th-March-2012-Special-Program-from-Liari-(Karachi) //temporary measure: use utf8_encode() $newitem->addElement('dc:identifier', remove_url_cruft(utf8_encode($effective_url))); } else { @@ -831,7 +831,7 @@ if (!$debug_mode) { } if ($add_to_cache) { ob_start(); - $output->genarateFeed(); + $output->genarateFeed(false); $output = ob_get_contents(); ob_end_clean(); if ($html_only && $item_count == 0) { @@ -842,7 +842,7 @@ if (!$debug_mode) { } echo $output; } else { - $output->genarateFeed(); + $output->genarateFeed(false); } if ($callback) echo ');'; } -- cgit v1.2.3 From b6413975c36a5f912ed95ee749a5a1bd2d868f40 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 25 Apr 2014 13:25:03 +0300 Subject: fix of putenv warning under safe mode, issue #646 --- inc/poche/Poche.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'inc') diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 7e3e6afe..5aa6ea07 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -72,7 +72,7 @@ class Poche # l10n $language = $this->user->getConfigValue('language'); - putenv('LC_ALL=' . $language); + @putenv('LC_ALL=' . $language); setlocale(LC_ALL, $language); bindtextdomain($language, LOCALE); textdomain($language); @@ -241,12 +241,12 @@ class Poche $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime'); $this->tpl->addFilter($filter); } - + public function createNewUser() { if (isset($_GET['newuser'])){ if ($_POST['newusername'] != "" && $_POST['password4newuser'] != ""){ $newusername = filter_var($_POST['newusername'], FILTER_SANITIZE_STRING); - if (!$this->store->userExists($newusername)){ + if (!$this->store->userExists($newusername)){ if ($this->store->install($newusername, Tools::encodeString($_POST['password4newuser'] . $newusername))) { Tools::logm('The new user '.$newusername.' has been installed'); $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to logout ?'),$newusername)); @@ -265,7 +265,7 @@ class Poche } } } - + public function deleteUser(){ if (isset($_GET['deluser'])){ if ($this->store->listUsers() > 1) { -- cgit v1.2.3 From 5b5e47c3aee521497f93ef1e36a71d3824f5a585 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 25 Apr 2014 13:41:42 +0300 Subject: fix of already defined constant notice, issue #653 --- inc/poche/config.inc.default.php | 78 ++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'inc') diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 3b08c212..edc42fc9 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -8,56 +8,56 @@ * @license http://www.wtfpl.net/ see COPYING file */ -define ('SALT', ''); # put a strong string here -define ('LANG', 'en_EN.utf8'); +@define ('SALT', ''); # put a strong string here +@define ('LANG', 'en_EN.utf8'); -define ('STORAGE', 'sqlite'); # postgres, mysql or sqlite +@define ('STORAGE', 'sqlite'); # postgres, mysql or sqlite -define ('STORAGE_SQLITE', ROOT . '/db/poche.sqlite'); # if you are using sqlite, where the database file is located +@define ('STORAGE_SQLITE', ROOT . '/db/poche.sqlite'); # if you are using sqlite, where the database file is located # only for postgres & mysql -define ('STORAGE_SERVER', 'localhost'); -define ('STORAGE_DB', 'poche'); -define ('STORAGE_USER', 'poche'); -define ('STORAGE_PASSWORD', 'poche'); +@define ('STORAGE_SERVER', 'localhost'); +@define ('STORAGE_DB', 'poche'); +@define ('STORAGE_USER', 'poche'); +@define ('STORAGE_PASSWORD', 'poche'); ################################################################################# # Do not trespass unless you know what you are doing ################################################################################# // Change this if not using the standart port for SSL - i.e you server is behind sslh -define ('SSL_PORT', 443); - -define ('MODE_DEMO', FALSE); -define ('DEBUG_POCHE', FALSE); -define ('DOWNLOAD_PICTURES', FALSE); -define ('CONVERT_LINKS_FOOTNOTES', FALSE); -define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE); -define ('SHARE_TWITTER', TRUE); -define ('SHARE_MAIL', TRUE); -define ('SHARE_SHAARLI', FALSE); -define ('SHAARLI_URL', 'http://myshaarliurl.com'); -define ('FLATTR', TRUE); -define ('FLATTR_API', 'https://api.flattr.com/rest/v2/things/lookup/?url='); -define ('NOT_FLATTRABLE', '0'); -define ('FLATTRABLE', '1'); -define ('FLATTRED', '2'); -// display or not print link in article view -define ('SHOW_PRINTLINK', '1'); -// display or not percent of read in article view. Affects only default theme. -define ('SHOW_READPERCENT', '1'); -define ('ABS_PATH', 'assets/'); - -define ('DEFAULT_THEME', 'baggy'); - -define ('THEME', ROOT . '/themes'); -define ('LOCALE', ROOT . '/locale'); -define ('CACHE', ROOT . '/cache'); - -define ('PAGINATION', '10'); +@define ('SSL_PORT', 443); + +@define ('MODE_DEMO', FALSE); +@define ('DEBUG_POCHE', FALSE); +@define ('DOWNLOAD_PICTURES', FALSE); +@define ('CONVERT_LINKS_FOOTNOTES', FALSE); +@define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE); +@define ('SHARE_TWITTER', TRUE); +@define ('SHARE_MAIL', TRUE); +@define ('SHARE_SHAARLI', FALSE); +@define ('SHAARLI_URL', 'http://myshaarliurl.com'); +@define ('FLATTR', TRUE); +@define ('FLATTR_API', 'https://api.flattr.com/rest/v2/things/lookup/?url='); +@define ('NOT_FLATTRABLE', '0'); +@define ('FLATTRABLE', '1'); +@define ('FLATTRED', '2'); +// display or not print link in article view +@define ('SHOW_PRINTLINK', '1'); +// display or not percent of read in article view. Affects only default theme. +@define ('SHOW_READPERCENT', '1'); +@define ('ABS_PATH', 'assets/'); + +@define ('DEFAULT_THEME', 'baggy'); + +@define ('THEME', ROOT . '/themes'); +@define ('LOCALE', ROOT . '/locale'); +@define ('CACHE', ROOT . '/cache'); + +@define ('PAGINATION', '10'); //limit for download of articles during import -define ('IMPORT_LIMIT', 5); +@define ('IMPORT_LIMIT', 5); //delay between downloads (in sec) -define ('IMPORT_DELAY', 5); +@define ('IMPORT_DELAY', 5); -- cgit v1.2.3