X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=include%2Ffunctions.php;h=3ac413667d61a299837a7b8d0cd89715a3dd0739;hb=924a89ebf33b5ce82a76aa4f9b4726cb60282528;hp=238c017c5a6eff33095f7781edc1a0f2673af854;hpb=893960b039284fcd240fb3113fdfa86cc1331223;p=tt-rss.git

diff --git a/include/functions.php b/include/functions.php
index 238c017c..3ac41366 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
 	define('EXPECTED_CONFIG_VERSION', 26);
-	define('SCHEMA_VERSION', 121);
+	define('SCHEMA_VERSION', 123);
 
 	define('LABEL_BASE_INDEX', -1024);
 	define('PLUGIN_FEED_BASE_INDEX', -128);
@@ -11,6 +11,7 @@
 	$fetch_last_error_code = false;
 	$fetch_last_content_type = false;
 	$fetch_curl_used = false;
+	$suppress_debugging = false;
 
 	mb_internal_encoding("UTF-8");
 	date_default_timezone_set('UTC');
@@ -87,6 +88,7 @@
 	require_once "lib/accept-to-gettext.php";
 	require_once "lib/gettext/gettext.inc";
 
+	require_once "lib/languagedetect/LanguageDetect.php";
 
 	function startup_gettext() {
 
@@ -131,6 +133,12 @@
 
 	$schema_version = false;
 
+	function _debug_suppress($suppress) {
+		global $suppress_debugging;
+
+		$suppress_debugging = $suppress;
+	}
+
 	/**
 	 * Print a timestamped debug message.
 	 *
@@ -138,6 +146,11 @@
 	 * @return void
 	 */
 	function _debug($msg, $show = true) {
+		global $suppress_debugging;
+
+		//echo "[$suppress_debugging] $msg $show\n";
+
+		if ($suppress_debugging) return false;
 
 		$ts = strftime("%H:%M:%S", time());
 		if (function_exists('posix_getpid')) {
@@ -152,7 +165,29 @@
 			$fp = fopen(LOGFILE, 'a+');
 
 			if ($fp) {
+				$locked = false;
+
+				if (function_exists("flock")) {
+					$tries = 0;
+
+					// try to lock logfile for writing
+					while ($tries < 5 && !$locked = flock($fp, LOCK_EX | LOCK_NB)) {
+						sleep(1);
+						++$tries;
+					}
+
+					if (!$locked) {
+						fclose($fp);
+						return;
+					}
+				}
+
 				fputs($fp, "[$ts] $msg\n");
+
+				if (function_exists("flock")) {
+					flock($fp, LOCK_UN);
+				}
+
 				fclose($fp);
 			}
 		}
@@ -344,6 +379,10 @@
 			curl_setopt($ch, CURLOPT_ENCODING, "");
 			curl_setopt($ch, CURLOPT_REFERER, $url);
 
+			if (defined('_CURL_HTTP_PROXY')) {
+				curl_setopt($ch, CURLOPT_PROXY, _CURL_HTTP_PROXY);
+			}
+
 			if ($post_query) {
 				curl_setopt($ch, CURLOPT_POST, true);
 				curl_setopt($ch, CURLOPT_POSTFIELDS, $post_query);
@@ -1062,7 +1101,7 @@
 					$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 WEEK) ";
 				}
 				break;
-			case "2weeks":
+			case "2week":
 				if (DB_TYPE == "pgsql") {
 					$date_qpart = "date_entered < NOW() - INTERVAL '2 week' ";
 				} else {
@@ -1382,9 +1421,9 @@
 			$intl = get_pref("FRESH_ARTICLE_MAX_AGE", $owner_uid);
 
 			if (DB_TYPE == "pgsql") {
-				$match_part .= " AND updated > NOW() - INTERVAL '$intl hour' ";
+				$match_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' ";
 			} else {
-				$match_part .= " AND updated > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
+				$match_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
 			}
 
 			$need_entries = true;
@@ -1522,13 +1561,10 @@
 
 		$owner_uid = $_SESSION["uid"];
 
-		$result = db_query("SELECT id,caption,COUNT(u1.unread) AS unread,COUNT(u2.unread) AS total
+		$result = db_query("SELECT id,caption,SUM(CASE WHEN u1.unread = true THEN 1 ELSE 0 END) AS unread, COUNT(u1.unread) AS total
 			FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON
 				(ttrss_labels2.id = label_id)
-				LEFT JOIN ttrss_user_entries AS u1 ON (u1.ref_id = article_id AND u1.unread = true
-					AND u1.owner_uid = $owner_uid)
-				LEFT JOIN ttrss_user_entries AS u2 ON (u2.ref_id = article_id AND u2.unread = false
-					AND u2.owner_uid = $owner_uid)
+				LEFT JOIN ttrss_user_entries AS u1 ON u1.ref_id = article_id
 				WHERE ttrss_labels2.owner_uid = $owner_uid GROUP BY ttrss_labels2.id,
 					ttrss_labels2.caption");
 
@@ -2203,6 +2239,7 @@
 
 		$keywords = explode(" ", $search);
 		$query_keywords = array();
+		$search_words = array();
 
 		foreach ($keywords as $k) {
 			if (strpos($k, "-") === 0) {
@@ -2222,6 +2259,7 @@
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 							OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
+					array_push($search_words, $k);
 				}
 				break;
 			case "author":
@@ -2231,6 +2269,7 @@
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 							OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
+					array_push($search_words, $k);
 				}
 				break;
 			case "note":
@@ -2245,6 +2284,7 @@
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 							OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
+					if (!$not) array_push($search_words, $k);
 				}
 				break;
 			case "star":
@@ -2257,6 +2297,7 @@
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 							OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
+					if (!$not) array_push($search_words, $k);
 				}
 				break;
 			case "pub":
@@ -2269,6 +2310,7 @@
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 							OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
+					if (!$not) array_push($search_words, $k);
 				}
 				break;
 			default:
@@ -2284,13 +2326,15 @@
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 							OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
+
+					if (!$not) array_push($search_words, $k);
 				}
 			}
 		}
 
 		$search_query_part = implode("AND", $query_keywords);
 
-		return $search_query_part;
+		return array($search_query_part, $search_words);
 	}
 
 	function getParentCategories($cat, $owner_uid) {
@@ -2326,6 +2370,7 @@
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
 		$ext_tables_part = "";
+		$search_words = array();
 
 			if ($search) {
 
@@ -2338,7 +2383,7 @@
 						$search_query_part = "ref_id = -1 AND ";
 
 				} else {
-					$search_query_part = search_to_sql($search);
+					list($search_query_part, $search_words) = search_to_sql($search);
 					$search_query_part .= " AND ";
 				}
 
@@ -2650,6 +2695,7 @@
 						comments,
 						int_id,
 						uuid,
+						lang,
 						hide_images,
 						unread,feed_id,marked,published,link,last_read,orig_feed_id,
 						last_marked, last_published,
@@ -2692,6 +2738,7 @@
 								"tag_cache," .
 								"label_cache," .
 								"link," .
+								"lang," .
 								"uuid," .
 								"last_read," .
 								"(SELECT hide_images FROM ttrss_feeds WHERE id = feed_id) AS hide_images," .
@@ -2744,18 +2791,15 @@
 				$result = db_query($select_qpart . $from_qpart . $where_qpart);
 			}
 
-			return array($result, $feed_title, $feed_site_url, $last_error, $last_updated);
+			return array($result, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words);
 
 	}
 
-	function sanitize($str, $force_remove_images = false, $owner = false, $site_url = false) {
+	function sanitize($str, $force_remove_images = false, $owner = false, $site_url = false, $highlight_words = false, $article_id = false) {
 		if (!$owner) $owner = $_SESSION["uid"];
 
 		$res = trim($str); if (!$res) return '';
 
-		if (strpos($res, "href=") === false)
-			$res = rewrite_urls($res);
-
 		$charset_hack = '<head>
 			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 		</head>';
@@ -2837,7 +2881,7 @@
 		$disallowed_attributes = array('id', 'style', 'class');
 
 		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SANITIZE) as $plugin) {
-			$retval = $plugin->hook_sanitize($doc, $site_url, $allowed_elements, $disallowed_attributes);
+			$retval = $plugin->hook_sanitize($doc, $site_url, $allowed_elements, $disallowed_attributes, $article_id);
 			if (is_array($retval)) {
 				$doc = $retval[0];
 				$allowed_elements = $retval[1];
@@ -2847,9 +2891,53 @@
 			}
 		}
 
-		$doc->removeChild($doc->firstChild); //remove doctype
+		$doc->removeChild($doc->doctype); //remove doctype
 		$doc = strip_harmful_tags($doc, $allowed_elements, $disallowed_attributes);
-		$res = $doc->saveHTML();
+
+		if ($highlight_words) {
+			foreach ($highlight_words as $word) {
+
+				// http://stackoverflow.com/questions/4081372/highlight-keywords-in-a-paragraph
+
+				$elements = $xpath->query("//*/text()");
+
+				foreach ($elements as $child) {
+
+					$fragment = $doc->createDocumentFragment();
+					$text = $child->textContent;
+					$stubs = array();
+
+					while (($pos = mb_stripos($text, $word)) !== false) {
+						$fragment->appendChild(new DomText(mb_substr($text, 0, $pos)));
+						$word = mb_substr($text, $pos, mb_strlen($word));
+						$highlight = $doc->createElement('span');
+						$highlight->appendChild(new DomText($word));
+						$highlight->setAttribute('class', 'highlight');
+						$fragment->appendChild($highlight);
+						$text = mb_substr($text, $pos + mb_strlen($word));
+					}
+
+					if (!empty($text)) $fragment->appendChild(new DomText($text));
+
+					$child->parentNode->replaceChild($fragment, $child);
+				}
+			}
+		}
+
+		$body = $doc->getElementsByTagName("body")->item(0);
+
+		if ($body) {
+			$div = $doc->createElement("div");
+
+			foreach ($body->childNodes as $child) {
+				$div->appendChild($child);
+			}
+
+			$res = $doc->saveXML($div);
+		} else {
+			$res = $doc->saveHTML();
+		}
+
 		return $res;
 	}
 
@@ -2998,10 +3086,6 @@
 		if (preg_match("/^[0-9]*$/", $tag)) return false;
 		if (mb_strlen($tag) > 250) return false;
 
-		if (function_exists('iconv')) {
-			$tag = iconv("utf-8", "utf-8", $tag);
-		}
-
 		if (!$tag) return false;
 
 		return true;
@@ -3118,9 +3202,10 @@
 			ccache_update($feed_id, $owner_uid);
 		}
 
-		$result = db_query("SELECT id,title,link,content,feed_id,comments,int_id,
+		$result = db_query("SELECT id,title,link,content,feed_id,comments,int_id,lang,
 			".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
 			(SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url,
+			(SELECT title FROM ttrss_feeds WHERE id = feed_id) as feed_title,
 			(SELECT hide_images FROM ttrss_feeds WHERE id = feed_id) as hide_images,
 			(SELECT always_display_enclosures FROM ttrss_feeds WHERE id = feed_id) as always_display_enclosures,
 			num_comments,
@@ -3142,7 +3227,7 @@
 
 			$line["content"] = sanitize($line["content"],
 				sql_bool_to_bool($line['hide_images']),
-				$owner_uid, $line["site_url"]);
+				$owner_uid, $line["site_url"], false, $line["id"]);
 
 			foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE) as $p) {
 				$line = $p->hook_render_article($line);
@@ -3157,10 +3242,13 @@
 				} else {
 					$comments_url = htmlspecialchars($line["link"]);
 				}
-				$entry_comments = "<a target='_blank' href=\"$comments_url\">$num_comments comments</a>";
+				$entry_comments = "<a class=\"postComments\"
+					target='_blank' href=\"$comments_url\">$num_comments ".
+					_ngettext("comment", "comments", $num_comments)."</a>";
+
 			} else {
 				if ($line["comments"] && $line["link"] != $line["comments"]) {
-					$entry_comments = "<a target='_blank' href=\"".htmlspecialchars($line["comments"])."\">comments</a>";
+					$entry_comments = "<a class=\"postComments\" target='_blank' href=\"".htmlspecialchars($line["comments"])."\">".__("comments")."</a>";
 				}
 			}
 
@@ -3170,6 +3258,9 @@
 						<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
 						<title>Tiny Tiny RSS - ".$line["title"]."</title>
 						<link rel=\"stylesheet\" type=\"text/css\" href=\"css/tt-rss.css\">
+						<link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
+						<link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">
+
 						<script type=\"text/javascript\">
 						function openSelectedAttachment(elem) {
 							try {
@@ -3201,7 +3292,8 @@
 			$parsed_updated = make_local_datetime($line["updated"], true,
 				$owner_uid, true);
 
-			$rv['content'] .= "<div class=\"postDate\">$parsed_updated</div>";
+			if (!$zoom_mode)
+				$rv['content'] .= "<div class=\"postDate\">$parsed_updated</div>";
 
 			if ($line["link"]) {
 				$rv['content'] .= "<div class='postTitle'><a target='_blank'
@@ -3214,6 +3306,16 @@
 				$rv['content'] .= "<div class='postTitle'>" . $line["title"] . "$entry_author</div>";
 			}
 
+			if ($zoom_mode) {
+				$feed_title = "<a href=\"".htmlspecialchars($line["site_url"]).
+					"\" target=\"_blank\">".
+					htmlspecialchars($line["feed_title"])."</a>";
+
+				$rv['content'] .= "<div class=\"postFeedTitle\">$feed_title</div>";
+
+				$rv['content'] .= "<div class=\"postDate\">$parsed_updated</div>";
+			}
+
 			$tags_str = format_tags_string($line["tags"], $id);
 			$tags_str_full = join(", ", $line["tags"]);
 
@@ -3286,7 +3388,9 @@
 				}
 			$rv['content'] .= "</div>";
 
-			$rv['content'] .= "<div class=\"postContent\">";
+			if (!$line['lang']) $line['lang'] = 'en';
+
+			$rv['content'] .= "<div class=\"postContent\" lang=\"".$line['lang']."\">";
 
 			$rv['content'] .= $line["content"];
 			$rv['content'] .= format_article_enclosures($id,
@@ -3368,6 +3472,11 @@
 
 		$cat_id = (int)getFeedCategory($feed_id);
 
+		if ($cat_id == 0)
+			$null_cat_qpart = "cat_id IS NULL OR";
+		else
+			$null_cat_qpart = "";
+
 		$result = db_query("SELECT * FROM ttrss_filters2 WHERE
 			owner_uid = $owner_uid AND enabled = true ORDER BY order_id, title");
 
@@ -3383,7 +3492,7 @@
 				FROM ttrss_filters2_rules AS r,
 				ttrss_filter_types AS t
 				WHERE
-					(cat_id IS NULL OR cat_id IN ($check_cats)) AND
+					($null_cat_qpart (cat_id IS NULL AND cat_filter = false) OR cat_id IN ($check_cats)) AND
 					(feed_id IS NULL OR feed_id = '$feed_id') AND
 					filter_type = t.id AND filter_id = '$filter_id'");
 
@@ -3729,6 +3838,7 @@
 
 				$url = $line["content_url"];
 				$ctype = $line["content_type"];
+				$title = $line["title"];
 
 				if (!$ctype) $ctype = __("unknown type");
 
@@ -3751,6 +3861,7 @@
 				$entry["type"] = $ctype;
 				$entry["filename"] = $filename;
 				$entry["url"] = $url;
+				$entry["title"] = $title;
 
 				array_push($entries, $entry);
 			}
@@ -3772,7 +3883,10 @@
 									$rv .= "<p><a target=\"_blank\"
 									href=\"".htmlspecialchars($entry["url"])."\"
 									>" .htmlspecialchars($entry["url"]) . "</a></p>";
+								}
 
+								if ($entry['title']) {
+									$rv.= "<div class=\"enclosure_title\">${entry['title']}</div>";
 								}
 						}
 					}
@@ -3789,7 +3903,12 @@
 				"<option value=''>" . __('Attachments')."</option>";
 
 			foreach ($entries as $entry) {
-				$rv .= "<option value=\"".htmlspecialchars($entry["url"])."\">" . htmlspecialchars($entry["filename"]) . "</option>";
+				if ($entry["title"])
+					$title = "&mdash; " . truncate_string($entry["title"], 30);
+				else
+					$title = "";
+
+				$rv .= "<option value=\"".htmlspecialchars($entry["url"])."\">" . htmlspecialchars($entry["filename"]) . "$title</option>";
 
 			};
 
@@ -3938,52 +4057,6 @@
 
 	}
 
-	function rewrite_urls($html) {
-		libxml_use_internal_errors(true);
-
-		$charset_hack = '<head>
-			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-		</head>';
-
-		$doc = new DOMDocument();
-		$doc->loadHTML($charset_hack . $html);
-		$xpath = new DOMXPath($doc);
-
-		$entries = $xpath->query('//*/text()');
-
-		foreach ($entries as $entry) {
-			if (strstr($entry->wholeText, "://") !== false) {
-				$text = preg_replace("/((?<!=.)((http|https|ftp)+):\/\/[^ ,!]+)/i",
-					"<a target=\"_blank\" href=\"\\1\">\\1</a>", $entry->wholeText);
-
-				if ($text != $entry->wholeText) {
-					$cdoc = new DOMDocument();
-					$cdoc->loadHTML($charset_hack . $text);
-
-
-					foreach ($cdoc->childNodes as $cnode) {
-						$cnode = $doc->importNode($cnode, true);
-
-						if ($cnode) {
-							$entry->parentNode->insertBefore($cnode);
-						}
-					}
-
-					$entry->parentNode->removeChild($entry);
-
-				}
-			}
-		}
-
-		$node = $doc->getElementsByTagName('body')->item(0);
-
-		// http://tt-rss.org/forum/viewtopic.php?f=1&t=970
-		if ($node)
-			return $doc->saveXML($node);
-		else
-			return $html;
-	}
-
 	function filter_to_sql($filter, $owner_uid) {
 		$query = array();
 
@@ -4051,6 +4124,8 @@
 					$qpart .= " AND $cat_qpart";
 				}
 
+				$qpart .= " AND feed_id IS NOT NULL";
+
 				array_push($query, "($qpart)");
 
 			}
@@ -4157,6 +4232,10 @@
 		curl_setopt($curl, CURLOPT_TIMEOUT, 60);
 		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
 
+		if (defined('_CURL_HTTP_PROXY')) {
+			curl_setopt($curl, CURLOPT_PROXY, _CURL_HTTP_PROXY);
+		}
+
 		if ((OPENSSL_VERSION_NUMBER >= 0x0090808f) && (OPENSSL_VERSION_NUMBER < 0x10000000)) {
 			curl_setopt($curl, CURLOPT_SSLVERSION, 3);
 		}