diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/Feed.php | 19 | ||||
| -rwxr-xr-x | app/models/RSSConfiguration.php | 5 |
2 files changed, 18 insertions, 6 deletions
diff --git a/app/models/Feed.php b/app/models/Feed.php index 82ef93621..97fa7aabc 100644 --- a/app/models/Feed.php +++ b/app/models/Feed.php @@ -17,8 +17,12 @@ class Feed extends Model { private $error = false; private $keep_history = false; - public function __construct ($url) { - $this->_url ($url); + public function __construct ($url, $validate=true) { + if ($validate) { + $this->_url ($url); + } else { + $this->url = $url; + } } public function id () { @@ -110,11 +114,16 @@ class Feed extends Model { $this->id = $value; } public function _url ($value) { - if (!is_null ($value) && !preg_match ('#^https?://#', $value)) { + if (empty ($value)) { + throw new BadUrlException ($value); + } + if (!preg_match ('#^https?://#', $value)) { $value = 'http://' . $value; } - if (!is_null ($value) && filter_var ($value, FILTER_VALIDATE_URL)) { + if (filter_var ($value, FILTER_VALIDATE_URL)) { + $this->url = $value; + } elseif (version_compare(PHP_VERSION, '5.3.3', '<') && (strpos($value, '-') > 0) && ($value === filter_var($value, FILTER_SANITIZE_URL))) { //PHP bug #51192 $this->url = $value; } else { throw new BadUrlException ($value); @@ -527,7 +536,7 @@ class HelperFeed { $key = $dao['id']; } - $list[$key] = new Feed ($dao['url']); + $list[$key] = new Feed ($dao['url'], false); $list[$key]->_category ($dao['category']); $list[$key]->_name ($dao['name']); $list[$key]->_website ($dao['website']); diff --git a/app/models/RSSConfiguration.php b/app/models/RSSConfiguration.php index 289538fd5..e79fd933b 100755 --- a/app/models/RSSConfiguration.php +++ b/app/models/RSSConfiguration.php @@ -248,9 +248,12 @@ class RSSConfiguration extends Model { $this->mark_when['scroll'] = $values['scroll']; } public function _urlShaarli ($value) { - $this->url_shaarli = ''; if (filter_var ($value, FILTER_VALIDATE_URL)) { $this->url_shaarli = $value; + } elseif (version_compare(PHP_VERSION, '5.3.3', '<') && (strpos($value, '-') > 0) && ($value === filter_var($value, FILTER_SANITIZE_URL))) { //PHP bug #51192 + $this->url_shaarli = $value; + } else { + $this->url_shaarli = ''; } } public function _theme ($value) { |