]> git.wh0rd.org - tt-rss.git/blobdiff - functions.php
js: misc fixes, code cleanup
[tt-rss.git] / functions.php
index 126ad27c611e4a87330d6cf8333240da219adf19..7ab6fabb37800db756a4b86e5ca4fb6836aacbe9 100644 (file)
         */
        function get_favicon_url($url) {
 
+               $favicon_url = false;
+
                if ($html = @fetch_file_contents($url)) {
 
-                       if ( preg_match('/<link[^>]+rel="(?:shortcut )?icon"[^>]+?href="([^"]+?)"/si', $html, $matches)) {
-                               // Attempt to grab a favicon link from their webpage url
-                               $linkUrl = html_entity_decode($matches[1]);
+                       libxml_use_internal_errors(true);
 
-                               if (substr($linkUrl, 0, 1) == '/') {
-                                       $urlParts = parse_url($url);
-                                       $faviconURL = $urlParts['scheme'].'://'.$urlParts['host'].$linkUrl;
-                               } else if (substr($linkUrl, 0, 7) == 'http://') {
-                                       $faviconURL = $linkUrl;
-                               } else {
-                                       $pos = strrpos($url, "/");
-                                       // no "/" in url or "/" is part of "://"
-                                       if ($pos === false || $pos == (strpos($url, "://")+2)) {
-                                               $faviconURL = $url.'/'.$linkUrl;
-                                       } else {
-                                               $faviconURL = substr($url, 0, $pos+1).$linkUrl;
-                                       }
-                               }
+                       $doc = new DOMDocument();
+                       $doc->loadHTML($html);
+                       $xpath = new DOMXPath($doc);
+                       $entries = $xpath->query('/html/head/link[@rel="shortcut icon"]');
 
-                       } else {
-                               // If unsuccessful, attempt to "guess" the favicon location
-                               $urlParts = parse_url($url);
-                               $faviconURL = $urlParts['scheme'].'://'.$urlParts['host'].'/favicon.ico';
-                       }
+                       if (count($entries) > 0) {
+                               foreach ($entries as $entry) {
+                                       $favicon_url = rewrite_relative_url($url, $entry->getAttribute("href"));
+                                       break;
+                               }
+                       }               
                }
 
+               if (!$favicon_url)
+                       $favicon_url = rewrite_relative_url($url, "/favicon.ico");
+
                // Run a test to see if what we have attempted to get actually exists.
-               if(USE_CURL_FOR_ICONS || url_validate($faviconURL)) {
-                       return $faviconURL;
+               if(USE_CURL_FOR_ICONS || url_validate($favicon_url)) {
+                       return $favicon_url;
                } else {
                        return false;
                }
                        }
 
                        if ($icon_url && $orig_icon_url != $icon_url) { 
-                               db_query($link, "UPDATE ttrss_feeds SET icon_url = '$icon_url' WHERE id = '$feed'");
+                               if (USE_CURL_FOR_ICONS || url_validate($icon_url)) {
+                                       db_query($link, "UPDATE ttrss_feeds SET icon_url = '$icon_url' WHERE id = '$feed'");
+                               }
                        }
 
                        if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
                                                rewrite_relative_url($site_url, $entry->getAttribute('src')));
                        }
 
-                       if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW', $owner)) {
-                               $entry->setAttribute("target", "_blank");
+                       if (strtolower($entry->nodeName) == "a") {
+                               if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW', $owner)) {
+                                       $entry->setAttribute("target", "_blank");
+                               }
+                       }
+
+                       if (strtolower($entry->nodeName) == "img") {
+                               $br = $doc->createElement("br");
+
+                               if ($entry->parentNode->nextSibling)
+                                       $entry->parentNode->insertBefore($br, $entry->nextSibling);
+
                        }
                }
        
                        $archive_sel_link = "javascript:archiveSelection()";
                        $delete_sel_link = "javascript:deleteSelection()";
 
-                       if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
+                       $sel_all_link = "javascript:selectArticles('all')";
+                       $sel_unread_link = "javascript:selectArticles('unread')";
+                       $sel_none_link = "javascript:selectArticles('none')";
+                       $sel_inv_link = "javascript:selectArticles('invert')";
 
-                               $sel_all_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, '', true)";
-                               $sel_unread_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true)";
-                               $sel_none_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false)";
-                               $sel_inv_link = "javascript:invertHeadlineSelection()";
-
-                               $tog_unread_link = "javascript:selectionToggleUnread()";
-                               $tog_marked_link = "javascript:selectionToggleMarked()";
-                               $tog_published_link = "javascript:selectionTogglePublished()";
-
-                       } else {
-
-                               $sel_all_link = "javascript:cdmSelectArticles('all')";
-                               $sel_unread_link = "javascript:cdmSelectArticles('unread')";
-                               $sel_none_link = "javascript:cdmSelectArticles('none')";
-
-                               $sel_inv_link = "javascript:invertHeadlineSelection()";
-
-                               $tog_unread_link = "javascript:selectionToggleUnread()";
-                               $tog_marked_link = "javascript:selectionToggleMarked()";
-                               $tog_published_link = "javascript:selectionTogglePublished()";
-
-                       }
+                       $tog_unread_link = "javascript:selectionToggleUnread()";
+                       $tog_marked_link = "javascript:selectionToggleMarked()";
+                       $tog_published_link = "javascript:selectionTogglePublished()";
 
                        print "<div id=\"subtoolbar_ftitle\">";
 
                        print "</div>";
 
                        print __('Select:')."
-                               <a href=\"$sel_all_link\">".__('All')."</a>,
-                               <a href=\"$sel_unread_link\">".__('Unread')."</a>,
-                               <a href=\"$sel_inv_link\">".__('Invert')."</a>,
-                               <a href=\"$sel_none_link\">".__('None')."</a></li>";
+                               <a href=\"#\" onclick=\"$sel_all_link\">".__('All')."</a>,
+                               <a href=\"#\" onclick=\"$sel_unread_link\">".__('Unread')."</a>,
+                               <a href=\"#\" onclick=\"$sel_inv_link\">".__('Invert')."</a>,
+                               <a href=\"#\" onclick=\"$sel_none_link\">".__('None')."</a></li>";
 
                        print "&nbsp;&nbsp;";
 
                                        print "<td class='hlMarkedPic'>$published_pic</td>";
 
                                        print "<td onclick='return hlClicked(event,$id)' 
-                                               title=\"".__("Click to select, ctrl-click selects multiple")."\"
                                                class='hlContent$hlc_suffix' valign='middle' id='HLC-$id'>";
 
                                        print "<a id=\"RTITLE-$id\" 
                                        print "</div>";
 
                                        print "<div class=\"cdmContent\" $content_hidden
-                                               title=\"".__("Click to select, ctrl-click selects multiple")."\"
                                                onclick=\"return cdmClicked(event, $id);\"
                                                id=\"CICD-$id\">";
 
                                        }
                        }
 
-                       if (!$offset) print "<div class='whiteBox'>$message</div>";
+                       if (!$offset && $message) {
+                               print "<div class='whiteBox'>$message";
+
+                               print "<p class=\"small\"><span class=\"insensitive\">";
+
+                               $result = db_query($link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
+                                       WHERE owner_uid = " . $_SESSION['uid']);
+               
+                               $last_updated = db_fetch_result($result, 0, "last_updated");
+                               $last_updated = make_local_datetime($link, $last_updated, false);
+               
+                               printf(__("Feeds last updated at %s"), $last_updated);
+               
+                               $result = db_query($link, "SELECT COUNT(id) AS num_errors
+                                       FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
+               
+                               $num_errors = db_fetch_result($result, 0, "num_errors");
+               
+                               if ($num_errors > 0) {
+                                       print "<br/>";
+                                       print "<a class=\"insensitive\" href=\"#\" onclick=\"showFeedsWithErrors()\">".
+                                               __('Some feeds have update errors (click for details)')."</a>";
+                               }
+                               print "</span></p></div>";
+                       }
                }
 
                if (!$offset) {