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

Fix error handling when updating URL (#5039)

Browse Source 
Fix 3 related error handling when updating the feed URL with an invalid URL. Previously leading to unclear 500 page with additional PHP errors.
This commit is contained in:
Alexandre Alapetite
2023-01-26 08:59:34 +01:00
committed by GitHub
parent 2f02754522
commit 07efaf71ea
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controllers/subscriptionController.php
View File

@@ -256,7 +256,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController {
$url_redirect = array('c' => 'subscription', 'params' => array('id' => $id));
}
if ($feedDAO->updateFeed($id, $values) !== false) {
if ($values['url'] != '' && $feedDAO->updateFeed($id, $values) !== false) {
$feed->_categoryId($values['category']);
// update url and website values for faviconPrepare
$feed->_url($values['url'], false);
@@ -265,6 +265,9 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController {
Minz_Request::good(_t('feedback.sub.feed.updated'), $url_redirect);
} else {
if ($values['url'] == '') {
Minz_Log::warning('Invalid feed URL!');
}
Minz_Request::bad(_t('feedback.sub.feed.error'), $url_redirect);
}
}

7
app/Models/Feed.php
View File

@@ -259,13 +259,14 @@ class FreshRSS_Feed extends Minz_Model {
}
public function _url(string $value, bool $validate = true) {
$this->hash = '';
$url = $value;
if ($validate) {
$value = checkUrl($value);
$url = checkUrl($url);
}
if ($value == '') {
if ($url == '') {
throw new FreshRSS_BadUrl_Exception($value);
}
$this->url = $value;
$this->url = $url;
}
public function _kind(int $value) {
$this->kind = $value;

2
lib/lib_rss.php
View File

@@ -845,7 +845,7 @@ function errorMessageInfo($errorTitle, $error = '') {
$details = '';
// Prevent empty tags by checking if error isn not empty first
if ($error) {
$error = htmlspecialchars($error, ENT_NOQUOTES, 'UTF-8');
$error = htmlspecialchars($error, ENT_NOQUOTES, 'UTF-8') . "\n";
// First line is the main message, other lines are the details
list($message, $details) = explode("\n", $error, 2);