diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/digest.php | 2 | ||||
| -rw-r--r-- | include/feedbrowser.php | 5 | ||||
| -rw-r--r-- | include/functions.php | 15 | ||||
| -rw-r--r-- | include/labels.php | 2 | ||||
| -rw-r--r-- | include/rssfuncs.php | 22 |
5 files changed, 13 insertions, 33 deletions
diff --git a/include/digest.php b/include/digest.php index 4427936e5..71ee6d203 100644 --- a/include/digest.php +++ b/include/digest.php @@ -127,8 +127,6 @@ ORDER BY ttrss_feed_categories.title, ttrss_feeds.title, score DESC, date_updated DESC LIMIT $limit"); - $cur_feed_title = ""; - $headlines_count = db_num_rows($result); $headlines = array(); diff --git a/include/feedbrowser.php b/include/feedbrowser.php index d35f1ebf8..8907aa9e4 100644 --- a/include/feedbrowser.php +++ b/include/feedbrowser.php @@ -63,7 +63,7 @@ htmlspecialchars($line["title"])."</span></a>"; $feed_url = "<a target=\"_blank\" class=\"fb_feedUrl\" - href=\"$feed_url\"><img src='images/pub_set.svg' + href=\"$feed_url\"><img src='images/pub_set.png' style='vertical-align : middle'></a>"; $rv .= "<li>$check_box $feed_url $site_url". @@ -72,7 +72,6 @@ } else if ($mode == 2) { $feed_url = htmlspecialchars($line["feed_url"]); $site_url = htmlspecialchars($line["site_url"]); - $title = htmlspecialchars($line["title"]); $check_box = "<input onclick='toggleSelectListRow2(this)' dojoType=\"dijit.form.CheckBox\" type=\"checkbox\">"; @@ -92,7 +91,7 @@ htmlspecialchars($line["title"])."</span></a>"; $feed_url = "<a target=\"_blank\" class=\"fb_feedUrl\" - href=\"$feed_url\"><img src='images/pub_set.svg' + href=\"$feed_url\"><img src='images/pub_set.png' style='vertical-align : middle'></a>"; diff --git a/include/functions.php b/include/functions.php index 1d613a737..75722515d 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1614,7 +1614,6 @@ AND ttrss_counters_cache.feed_id = id"; $result = db_query($query); - $fctrs_modified = false; while ($line = db_fetch_assoc($result)) { @@ -2923,7 +2922,6 @@ $fragment = $doc->createDocumentFragment(); $text = $child->textContent; - $stubs = array(); while (($pos = mb_stripos($text, $word)) !== false) { $fragment->appendChild(new DomText(mb_substr($text, 0, $pos))); @@ -3105,19 +3103,16 @@ } function format_warning($msg, $id = "") { - global $link; return "<div class=\"warning\" id=\"$id\"> <span><img src=\"images/alert.png\"></span><span>$msg</span></div>"; } function format_notice($msg, $id = "") { - global $link; return "<div class=\"notice\" id=\"$id\"> <span><img src=\"images/information.png\"></span><span>$msg</span></div>"; } function format_error($msg, $id = "") { - global $link; return "<div class=\"error\" id=\"$id\"> <span><img src=\"images/alert.png\"></span><span>$msg</span></div>"; } @@ -3226,8 +3221,6 @@ $line = db_fetch_assoc($result); - $tag_cache = $line["tag_cache"]; - $line["tags"] = get_article_tags($id, $owner_uid, $line["tag_cache"]); unset($line["tag_cache"]); @@ -3383,7 +3376,7 @@ $rv['content'] .= " "; $rv['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>"; - $rv['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.svg'></a>"; + $rv['content'] .= "<img title='".__('Feed URL')."' class='tinyFeedIcon' src='images/pub_set.png'></a>"; $rv['content'] .= "</div>"; } @@ -4269,9 +4262,9 @@ $fetch_last_error = curl_errno($curl) . " " . curl_error($curl); curl_close($curl); - $oline=''; - foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';} - $line =$oline." \r\n ".$url."\r\n-----------------\r\n"; +# $oline=''; +# foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';} +# $line =$oline." \r\n ".$url."\r\n-----------------\r\n"; # $handle = @fopen('./curl.error.log', 'a'); # fwrite($handle, $line); return FALSE; diff --git a/include/labels.php b/include/labels.php index 6e0bfcb98..4149864b3 100644 --- a/include/labels.php +++ b/include/labels.php @@ -109,7 +109,7 @@ if (!$label_id) return; - $result = db_query( + db_query( "DELETE FROM ttrss_user_labels2 WHERE label_id = '$label_id' AND diff --git a/include/rssfuncs.php b/include/rssfuncs.php index dc0d6b02d..f9f9772e1 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -208,7 +208,7 @@ _debug("start", $debug_enabled); $result = db_query("SELECT id,update_interval,auth_login, - feed_url,auth_pass,cache_images,last_updated, + feed_url,auth_pass,cache_images, mark_unread_on_update, owner_uid, pubsub_state, auth_pass_encrypted, (SELECT max(date_entered) FROM @@ -220,7 +220,6 @@ return false; } - $last_updated = db_fetch_result($result, 0, "last_updated"); $last_article_timestamp = @strtotime(db_fetch_result($result, 0, "last_article_timestamp")); if (defined('_DISABLE_HTTP_304')) @@ -383,7 +382,7 @@ // cache data for later if (!$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/simplepie")) { - $new_rss_hash = sha1($rss_data); + $new_rss_hash = sha1($feed_data); if ($new_rss_hash != $rss_hash && count($rss->get_items()) > 0 ) { _debug("saving $cache_filename", $debug_enabled); @@ -534,7 +533,7 @@ $rc = $s->subscribe($feed_self_url); - _debug("feed hub url found, subscribe request sent.", $debug_enabled); + _debug("feed hub url found, subscribe request sent. [rc=$rc]", $debug_enabled); db_query("UPDATE ttrss_feeds SET pubsub_state = 1 WHERE id = '$feed'"); @@ -570,9 +569,6 @@ if ($entry_timestamp == -1 || !$entry_timestamp || $entry_timestamp > time()) { $entry_timestamp = time(); - $no_orig_date = 'true'; - } else { - $no_orig_date = 'false'; } $entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp); @@ -742,7 +738,7 @@ '$entry_timestamp_fmt', '$entry_content', '$content_hash', - $no_orig_date, + false, NOW(), '$date_feed_processed', '$entry_comments', @@ -770,9 +766,7 @@ // now it should exist, if not - bad luck then $result = db_query("SELECT - id,content_hash,no_orig_date,title,plugin_data,guid, - ".SUBSTRING_FOR_DATE."(date_updated,1,19) as date_updated, - ".SUBSTRING_FOR_DATE."(updated,1,19) as updated, + id,content_hash,title,plugin_data,guid, num_comments FROM ttrss_entries @@ -789,8 +783,6 @@ $orig_content_hash = db_fetch_result($result, 0, "content_hash"); $orig_title = db_fetch_result($result, 0, "title"); $orig_num_comments = db_fetch_result($result, 0, "num_comments"); - $orig_date_updated = strtotime(db_fetch_result($result, - 0, "date_updated")); $orig_plugin_data = db_fetch_result($result, 0, "plugin_data"); $ref_id = db_fetch_result($result, 0, "id"); @@ -906,7 +898,7 @@ $p = new Publisher(PUBSUBHUBBUB_HUB); - $pubsub_result = $p->publish_update($rss_link); + /* $pubsub_result = */ $p->publish_update($rss_link); } $result = db_query( @@ -1156,8 +1148,6 @@ } function cache_images($html, $site_url, $debug) { - $cache_dir = CACHE_DIR . "/images"; - libxml_use_internal_errors(true); $charset_hack = '<head> |