mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-04 14:43:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fallback for feeds with empty title (#3787)

Browse Source 
* Fallback for feeds with empty title
Address a part of https://github.com/FreshRSS/FreshRSS/issues/3776 for existing feeds

* Also strip www prefix

* Reuse fallback logic
This commit is contained in:
Alexandre Alapetite
2021-08-22 13:33:58 +02:00
committed by GitHub
parent 93f759fd4f
commit ee2d2db780
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controllers/feedController.php
View File

@@ -470,10 +470,11 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
}
if ($simplePie != null) {
if (trim($feed->name()) == '') {
if ($feed->name(true) == '') {
//HTML to HTML-PRE //ENT_COMPAT except '&'
$name = strtr(html_only_entity_decode($simplePie->get_title()), array('<' => '&lt;', '>' => '&gt;', '"' => '&quot;'));
$feedProperties['name'] = $name == '' ? $feed->url() : $name;
$feed->_name($name);
$feedProperties['name'] = $feed->name(false);
}
if (trim($feed->website()) == '') {
$website = html_only_entity_decode($simplePie->get_link());

6
app/Models/Feed.php
View File

@@ -75,8 +75,8 @@ class FreshRSS_Feed extends Minz_Model {
$simplePie = $this->load(false, true);
return $simplePie == null ? [] : iterator_to_array($this->loadEntries($simplePie));
}
public function name() {
return $this->name;
public function name($raw = false) {
return $raw || $this->name != '' ? $this->name : preg_replace('%^https?://(www[.])?%i', '', $this->url);
}
public function website() {
return $this->website;
@@ -198,7 +198,7 @@ class FreshRSS_Feed extends Minz_Model {
$this->category = $value >= 0 ? $value : 0;
}
public function _name($value) {
$this->name = $value === null ? '' : $value;
$this->name = $value === null ? '' : trim($value);
}
public function _website($value, $validate = true) {
if ($validate) {

2
app/views/helpers/feed/update.phtml
View File

@@ -23,7 +23,7 @@
<div class="form-group">
<label class="group-name" for="name"><?= _t('sub.feed.title') ?></label>
<div class="group-controls">
<input type="text" name="name" id="name" class="extend" value="<?= $this->feed->name() ?>" />
<input type="text" name="name" id="name" class="extend" value="<?= $this->feed->name(true) ?>" />
</div>
</div>
<div class="form-group">