From b6473890d053ceec3f3fb7750d2b681b79501e37 Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Tue, 12 Nov 2019 10:19:02 +0100 Subject: Automatic mostly-right RTL with dir="auto" See . --- app/views/index/normal.phtml | 2 +- app/views/index/reader.phtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml index f556df201..23105df5c 100644 --- a/app/views/index/normal.phtml +++ b/app/views/index/normal.phtml @@ -64,7 +64,7 @@ if (!empty($this->entries)) { $this->renderHelper('index/normal/entry_header'); - ?>
+ ?>

entry->title() ?>

entries)) { continue; } ?>
-
+
categories, $item->feed()); //We most likely already have the feed object in cache -- cgit v1.2.3 From 52ca1887d784b5a002f3ff2f53df7d2d3a76e50d Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Tue, 12 Nov 2019 11:27:20 +0100 Subject: also put it on the title in the flux list --- app/views/helpers/index/normal/entry_header.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/views/helpers/index/normal/entry_header.phtml b/app/views/helpers/index/normal/entry_header.phtml index d22cf5036..3d25301fa 100644 --- a/app/views/helpers/index/normal/entry_header.phtml +++ b/app/views/helpers/index/normal/entry_header.phtml @@ -28,7 +28,7 @@ } } ?>
  • ✇ feed->name() ?>
    • -
  • entry->title() ?>entry->title() ?>
    entry->authors(); -- cgit v1.2.3 From 8bdf7b09f208346481cba5e08edc55dfab8c8d63 Mon Sep 17 00:00:00 2001 From: rezad Date: Wed, 13 Nov 2019 23:22:52 +0330 Subject: Replace some http links with https links (#2662) --- app/views/feed/add.phtml | 2 +- app/views/helpers/feed/update.phtml | 2 +- docs/en/users/07_Frequently_Asked_Questions.md | 14 ++++---------- docs/fr/users/07_Frequently_Asked_Questions.md | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) (limited to 'app') diff --git a/app/views/feed/add.phtml b/app/views/feed/add.phtml index e39f45a86..9cfe024fc 100644 --- a/app/views/feed/add.phtml +++ b/app/views/feed/add.phtml @@ -42,7 +42,7 @@
    - +
    • diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml index e5f186956..4bc9d62a8 100644 --- a/app/views/helpers/feed/update.phtml +++ b/app/views/helpers/feed/update.phtml @@ -49,7 +49,7 @@
    - +
    diff --git a/docs/en/users/07_Frequently_Asked_Questions.md b/docs/en/users/07_Frequently_Asked_Questions.md index e63c4c2c7..577931572 100644 --- a/docs/en/users/07_Frequently_Asked_Questions.md +++ b/docs/en/users/07_Frequently_Asked_Questions.md @@ -13,7 +13,7 @@ Of course, ```/i``` has a purpose! We used it for performance and usability: To increase security, FreshRSS is hosted in two sections. The first section is public (```./p``` folder) and the second section is private (everything else). Therefore the ```robots.txt``` file is located in ```./p``` sub-folder. -As explained in the [security section](/en/User_documentation/Installation/Security), it is highly recommended to make only the public section available at the domain level. With that configuration, ```./p``` is the root folder for http://demo.freshrss.org/, thus making ```robots.txt``` available at the root of the application. +As explained in the [security section](/en/User_documentation/Installation/Security), it is highly recommended to make only the public section available at the domain level. With that configuration, ```./p``` is the root folder for https://demo.freshrss.org/, thus making ```robots.txt``` available at the root of the application. The same rule applies for ```favicon.ico``` and ```.htaccess```. @@ -24,15 +24,9 @@ The feed syntax can be invalid, it can be unrecognized by the SimplePie library. The first step is to identify what causes the problem. Here are the steps to follow: -1. __Verify if the feed syntax is valid__ with the [W3C on-line tool](http://validator.w3.org/feed/ "RSS and Atom feed validator"). If it is not valid, there is nothing we can do. -1. __Verify SimplePie validation__ with the [SimplePie on-line tool](http://simplepie.org/demo/ "SimplePie official demo"). If it is not recognized, there is nothing we can do. -1. __Verify FreshRSS integration__ with the [demo](http://demo.freshrss.org "FreshRSS official demo"). If it is not working, you need to [create an issue on Github](https://github.com/FreshRSS/FreshRSS/issues/new "Create an issue for FreshRSS") so we can have a look at it. If it is working, there is probably something fishy with the hosting server. - -Here is a list of feeds which don't work: - -* http://foulab.org/fr/rss/Foulab_News: is not a W3C valid feed (November 2014) -* http://eu.battle.net/hearthstone/fr/feed/news: is not a W3C valid feed (Novembre 2014) -* http://webseriesmag.blogs.liberation.fr/we/atom.xml: is not working for the user but succeed on all the described validations (November 2014) +1. __Verify if the feed syntax is valid__ with the [W3C on-line tool](https://validator.w3.org/feed/ "RSS and Atom feed validator"). If it is not valid, there is nothing we can do. +1. __Verify SimplePie validation__ with the [SimplePie on-line tool](https://simplepie.org/demo/ "SimplePie official demo"). If it is not recognized, there is nothing we can do. +1. __Verify FreshRSS integration__ with the [demo](https://demo.freshrss.org "FreshRSS official demo"). If it is not working, you need to [create an issue on Github](https://github.com/FreshRSS/FreshRSS/issues/new "Create an issue for FreshRSS") so we can have a look at it. If it is working, there is probably something fishy with the hosting server. ## How to change a forgotten password? diff --git a/docs/fr/users/07_Frequently_Asked_Questions.md b/docs/fr/users/07_Frequently_Asked_Questions.md index 87ff8631a..25e8dbd6a 100644 --- a/docs/fr/users/07_Frequently_Asked_Questions.md +++ b/docs/fr/users/07_Frequently_Asked_Questions.md @@ -24,7 +24,7 @@ Le flux peut avoir une syntaxe invalide, il peut ne pas être reconnu par la bib Il faut dans un premier temps déterminer la cause du problème. Voici la liste des étapes à suivre pour la déterminer : -1. __Vérifier la validité du flux__ grâce à l'[outil en ligne du W3C](http://validator.w3.org/feed/ "Validateur en ligne de flux RSS et Atom"). Si ça ne fonctionne pas, nous ne pouvons rien faire. +1. __Vérifier la validité du flux__ grâce à l'[outil en ligne du W3C](https://validator.w3.org/feed/ "Validateur en ligne de flux RSS et Atom"). Si ça ne fonctionne pas, nous ne pouvons rien faire. 1. __Vérifier la reconnaissance par SimplePie__ grâce à l'[outil en ligne de SimplePie](http://simplepie.org/demo/ "Démo officielle de SimplePie"). Si ça ne fonctionne pas, nous ne pouvons rien faire. 1. __Vérifier l'intégration dans FreshRSS__ grâce à la [démo](http://demo.freshrss.org "Démo officielle de FreshRSS"). Si ça ne fonctionne pas, il faut [créer un ticket sur Github](https://github.com/FreshRSS/FreshRSS/issues/new "Créer un ticket pour FreshRSS") pour que l'on puisse regarder ce qui se passe. Si ça fonctionne, il y a probablement un problème avec l'hébergement. -- cgit v1.2.3 From 3d6f9c58988c27430df278b5f6f8937a37d16794 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Fri, 15 Nov 2019 22:11:23 +0100 Subject: Fix sharing/integration (#2669) Arg, it looks like the submit button in sharing/integration page is broken in 1.15.2 :-( Fix https://github.com/FreshRSS/FreshRSS/pull/2643 --- app/views/configure/integration.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/views/configure/integration.phtml b/app/views/configure/integration.phtml index 32ef11716..9c83a5dc7 100644 --- a/app/views/configure/integration.phtml +++ b/app/views/configure/integration.phtml @@ -3,7 +3,7 @@
    -
    " size="64" />
    ' -- cgit v1.2.3 From d3735d04fcdb557a2ecc798f9914b9f769daf781 Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Mon, 18 Nov 2019 10:04:32 +0100 Subject: Add log in fever api saving process (#2664) Before, there was no user log when the fever api credential saving process was failing. There was one though for the admin user but it did not appear in the interface. Now, there is a user log showing what the problem is. The admin log is still there but catch only unknown errors. See #2663 --- app/Controllers/userController.php | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'app') diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php index 7ce6b298a..5209edc84 100644 --- a/app/Controllers/userController.php +++ b/app/Controllers/userController.php @@ -59,14 +59,22 @@ class FreshRSS_user_Controller extends Minz_ActionController { $apiPasswordHash = self::hashPassword($apiPasswordPlain); $userConfig->apiPasswordHash = $apiPasswordHash; - @mkdir(DATA_PATH . '/fever/', 0770, true); - self::deleteFeverKey($user); - $userConfig->feverKey = strtolower(md5($user . ':' . $apiPasswordPlain)); - $ok = file_put_contents(DATA_PATH . '/fever/.key-' . sha1(FreshRSS_Context::$system_conf->salt) . '-' . $userConfig->feverKey . '.txt', $user) !== false; - - if (!$ok) { - Minz_Log::warning('Could not save API credentials for fever API', ADMIN_LOG); - return $ok; + $feverPath = DATA_PATH . '/fever/'; + + if (!file_exists($feverPath)) { + @mkdir($feverPath, 0770, true); + } + + if (!is_writable($feverPath)) { + Minz_Log::error("Could not save Fever API credentials. The directory does not have write access."); + } else { + self::deleteFeverKey($user); + $userConfig->feverKey = strtolower(md5("{$user}:{$apiPasswordPlain}")); + $ok = file_put_contents($feverPath . '.key-' . sha1(FreshRSS_Context::$system_conf->salt) . '-' . $userConfig->feverKey . '.txt', $user) !== false; + + if (!$ok) { + Minz_Log::warning('Could not save Fever API credentials. Unknown error.', ADMIN_LOG); + } } } -- cgit v1.2.3 From 1ddf98c50b2e0388c76386202bd8be3442640418 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 18 Nov 2019 19:46:38 +0100 Subject: Fix adding categories in MySQL 5.5 (#2672) Fix https://github.com/FreshRSS/FreshRSS/issues/2670 (from https://github.com/FreshRSS/FreshRSS/pull/2335 ) Tested with MySQL 5.5.40, the oldest version on Docker Hub Debian 8.0 Jessie ships MySQL 5.5.43 --- app/Models/CategoryDAO.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php index 08dc4eef0..4bba23d9c 100644 --- a/app/Models/CategoryDAO.php +++ b/app/Models/CategoryDAO.php @@ -81,7 +81,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable public function addCategory($valuesTmp) { $sql = 'INSERT INTO `_category`(name, attributes) ' - . 'SELECT * FROM (SELECT TRIM(?), ?) c2 ' //TRIM() to provide a type hint as text for PostgreSQL + . 'SELECT * FROM (SELECT TRIM(?) AS name, TRIM(?) AS attributes) c2 ' //TRIM() to provide a type hint as text . 'WHERE NOT EXISTS (SELECT 1 FROM `_tag` WHERE name = TRIM(?))'; //No tag of the same name $stm = $this->pdo->prepare($sql); -- cgit v1.2.3 From 131ad1014b05bf00e4c46acc54e3647353a2587f Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Thu, 21 Nov 2019 15:22:52 +0100 Subject: Fix updateTagAttribute (#2682) --- app/Models/TagDAO.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/Models/TagDAO.php b/app/Models/TagDAO.php index 5882eee76..09397c6a1 100644 --- a/app/Models/TagDAO.php +++ b/app/Models/TagDAO.php @@ -106,9 +106,9 @@ class FreshRSS_TagDAO extends Minz_ModelPdo implements FreshRSS_Searchable { public function updateTagAttribute($tag, $key, $value) { if ($tag instanceof FreshRSS_Tag) { $tag->_attributes($key, $value); - return $this->updateFeed( + return $this->updateTag( $tag->id(), - array('attributes' => $feed->attributes()) + [ 'attributes' => $tag->attributes() ] ); } return false; -- cgit v1.2.3 From bb5d15f7c6133b17016407c0cbf9cce824285d0d Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Thu, 21 Nov 2019 16:23:20 +0100 Subject: Do not obbey rel=self if WebSub is disabled (#2659) * Do not obbey rel=self if WebSub is disabled https://github.com/FreshRSS/FreshRSS/issues/2654 * Correct variable https://github.com/FreshRSS/FreshRSS/pull/2659#discussion_r347552063 * Update app/Controllers/feedController.php --- app/Controllers/feedController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index aabeb80ff..3eb2316b8 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -415,8 +415,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController { $entryDAO->commit(); } - if ($feed->hubUrl() && $feed->selfUrl()) { //selfUrl has priority for WebSub - if ($feed->selfUrl() !== $url) { //https://code.google.com/p/pubsubhubbub/wiki/MovingFeedsOrChangingHubs + if ($pubSubHubbubEnabled && $feed->hubUrl() && $feed->selfUrl()) { //selfUrl has priority for WebSub + if ($feed->selfUrl() !== $url) { // https://github.com/pubsubhubbub/PubSubHubbub/wiki/Moving-Feeds-or-changing-Hubs $selfUrl = checkUrl($feed->selfUrl()); if ($selfUrl) { Minz_Log::debug('WebSub unsubscribe ' . $feed->url(false)); -- cgit v1.2.3