diff options
| -rw-r--r-- | css/news.css | 12 | ||||
| -rw-r--r-- | js/news.js | 2 | ||||
| -rw-r--r-- | lib/utils.php | 8 |
3 files changed, 12 insertions, 10 deletions
diff --git a/css/news.css b/css/news.css index b0e66cbae..4a215946b 100644 --- a/css/news.css +++ b/css/news.css @@ -71,7 +71,7 @@ div.add_parentfolder { /* feed/folder list */ #leftcontent { - width: 21.5em; + width: 20em; margin: 0; z-index: 0; position: relative; @@ -171,7 +171,7 @@ div.add_parentfolder { overflow: hidden; text-overflow: ellipsis; text-align: left; - width: 75%; + width: 85%; font-weight: bold; } @@ -180,7 +180,7 @@ div.add_parentfolder { } #feeds li#selected_feed { - background-color: #FF9933 !important; + background-color: #ffffff !important; } #feeds li.feed.updating { @@ -343,7 +343,7 @@ div.add_parentfolder { bottom: 0px; overflow:visible; height:2.8em; - width: 21.5em; + width: 20em; margin:0; background:#eee; border-top:1px @@ -448,7 +448,7 @@ div.add_parentfolder { top: 3.5em !important; box-sizing: border-box; -moz-box-sizing: border-box; - left: 34.1em; + left: 32.6em; overflow: hidden; } @@ -744,7 +744,7 @@ ul.menu { } .popup.bottomleft { - left: 34.8em; + left: 33.3em; /*left: 3.8em;*/ } diff --git a/js/news.js b/js/news.js index 696f1b9a2..2b18ffb59 100644 --- a/js/news.js +++ b/js/news.js @@ -174,7 +174,7 @@ News={ rightcontent.find('ul.accordion').before(jsondata.data.part_items); transformCollapsableTrigger(); // if the deleted feed is the current feed, reload the page - window.location.reload(); + // window.location.reload(); } } else{ diff --git a/lib/utils.php b/lib/utils.php index 1632849b6..ca5501f1f 100644 --- a/lib/utils.php +++ b/lib/utils.php @@ -82,7 +82,7 @@ class Utils { $feed = new Feed($url, $title, $items); $favicon = $spfeed->get_image_url(); - + if ($favicon !== null && self::checkFavicon($favicon)) { // use favicon from feed $feed->setFavicon($favicon); } @@ -130,7 +130,9 @@ class Utils { } public static function checkFavicon($favicon) { - var_dump($favicon); + if ($favicon === null || $favicon == false) + return false; + $file = new \SimplePie_File($favicon); // size in bytes $filesize = strlen($file->body); @@ -156,7 +158,7 @@ class Utils { //try to extract favicon from web page $absoluteUrl = \SimplePie_Misc::absolutize_url('/', $url); - + $handle = curl_init ( ); curl_setopt ( $handle, CURLOPT_URL, $absoluteUrl ); curl_setopt ( $handle, CURLOPT_RETURNTRANSFER, 1 ); |