"feed_catchup" => __("Mark as read"),
"feed_reverse" => __("Reverse headlines"),
"feed_debug_update" => __("Debug feed update"),
+ "feed_debug_viewfeed" => __("Debug viewfeed()"),
"catchup_all" => __("Mark all feeds as read"),
"cat_toggle_collapse" => __("Un/collapse current category"),
"toggle_combined_mode" => __("Toggle combined mode"),
"f q" => "feed_catchup",
"f x" => "feed_reverse",
"f *d" => "feed_debug_update",
+ "f *g" => "feed_debug_viewfeed",
"f *c" => "toggle_combined_mode",
"f c" => "toggle_cdm_expanded",
"*q" => "catchup_all",
return $data;
}
- function search_to_sql($search) {
+ function search_to_sql($search, $search_language) {
- $search_query_part = "";
-
- $keywords = str_getcsv($search, " ");
+ $keywords = str_getcsv(trim($search), " ");
$query_keywords = array();
$search_words = array();
+ $search_query_leftover = array();
+
+ if ($search_language)
+ $search_language = db_escape_string(mb_strtolower($search_language));
+ else
+ $search_language = "english";
foreach ($keywords as $k) {
if (strpos($k, "-") === 0) {
array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH('$k')) $not = '$k')");
} else {
- array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+
+ if (DB_TYPE == "pgsql") {
+ $k = mb_strtolower($k);
+ array_push($search_query_leftover, $not ? "!$k" : $k);
+ } 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);
}
}
}
+ if (count($search_query_leftover) > 0) {
+ $search_query_leftover = db_escape_string(implode(" & ", $search_query_leftover));
+
+ if (DB_TYPE == "pgsql") {
+ array_push($query_keywords,
+ "(tsvector_combined @@ to_tsquery('$search_language', '$search_query_leftover'))");
+ }
+
+ }
+
$search_query_part = implode("AND", $query_keywords);
return array($search_query_part, $search_words);
$view_mode = $params["view_mode"];
$cat_view = isset($params["cat_view"]) ? $params["cat_view"] : false;
$search = isset($params["search"]) ? $params["search"] : false;
+ $search_language = isset($params["search_language"]) ? $params["search_language"] : "";
$override_order = isset($params["override_order"]) ? $params["override_order"] : false;
$offset = isset($params["offset"]) ? $params["offset"] : 0;
$owner_uid = isset($params["owner_uid"]) ? $params["owner_uid"] : $_SESSION["uid"];
$override_vfeed = isset($params["override_vfeed"]) ? $params["override_vfeed"] : false;
$start_ts = isset($params["start_ts"]) ? $params["start_ts"] : false;
$check_first_id = isset($params["check_first_id"]) ? $params["check_first_id"] : false;
+ $api_request = isset($params["api_request"]) ? $params["api_request"] : false;
$ext_tables_part = "";
$query_strategy_part = "";
// fall back in case of no plugins
if (!$search_query_part) {
- list($search_query_part, $search_words) = search_to_sql($search);
+ list($search_query_part, $search_words) = search_to_sql($search, $search_language);
}
$search_query_part .= " AND ";
} else {
}
$view_query_part = "";
+ $disable_offsets = false;
if ($view_mode == "adaptive") {
if ($search) {
if ($cat_view && $feed > 0 && $include_children)
$unread += getCategoryChildrenUnread($feed);
- if ($unread > 0)
- $view_query_part = " unread = true AND ";
-
+ if ($unread > 0) {
+ $view_query_part = " unread = true AND ";
+ $disable_offsets = !$api_request && get_pref("CDM_AUTO_CATCHUP") && get_pref("CDM_EXPANDED");
+ }
}
}
if ($view_mode == "unread" && $feed != -6) {
$view_query_part = " unread = true AND ";
+ $disable_offsets = !$api_request && get_pref("CDM_AUTO_CATCHUP") && get_pref("CDM_EXPANDED");
}
if ($limit > 0) {
} else {
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
- $ext_tables_part = ",ttrss_labels2,ttrss_user_labels2";
+ $ext_tables_part = "ttrss_labels2,ttrss_user_labels2,";
$query_strategy_part = "ttrss_labels2.id = ttrss_user_labels2.label_id AND
ttrss_user_labels2.article_id = ref_id";
}
} else if ($feed == -6) { // recently read
$query_strategy_part = "unread = false AND last_read IS NOT NULL";
+
+ if (DB_TYPE == "pgsql") {
+ $query_strategy_part .= " AND date_entered > NOW() - INTERVAL '1 DAY' ";
+ } else {
+ $query_strategy_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL 1 DAY) ";
+ }
+
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
$allow_archived = true;
$ignore_vfeed_group = true;
ttrss_user_labels2.article_id = ref_id";
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
- $ext_tables_part = ",ttrss_labels2,ttrss_user_labels2";
+ $ext_tables_part = "ttrss_labels2,ttrss_user_labels2,";
$allow_archived = true;
} else {
}
if (!$allow_archived) {
- $from_qpart = "ttrss_entries,ttrss_user_entries,ttrss_feeds$ext_tables_part";
+ $from_qpart = "${ext_tables_part}ttrss_entries LEFT JOIN ttrss_user_entries ON (ref_id = ttrss_entries.id),ttrss_feeds";
$feed_check_qpart = "ttrss_user_entries.feed_id = ttrss_feeds.id AND";
} else {
- $from_qpart = "ttrss_entries$ext_tables_part,ttrss_user_entries
+ $from_qpart = "${ext_tables_part}ttrss_entries LEFT JOIN ttrss_user_entries ON (ref_id = ttrss_entries.id)
LEFT JOIN ttrss_feeds ON (feed_id = ttrss_feeds.id)";
}
if ($feed == -3)
$first_id_query_strategy_part = "true";
- // if previous topmost article id changed that means our current pagination is no longer valid
- $query = "SELECT DISTINCT
- ttrss_feeds.title,
- date_entered,
- guid,
- ttrss_entries.id,
- ttrss_entries.title,
- updated,
- score,
- marked,
- published,
- last_marked,
- last_published
- FROM
- $from_qpart
- WHERE
- $feed_check_qpart
- ttrss_user_entries.ref_id = ttrss_entries.id AND
- ttrss_user_entries.owner_uid = '$owner_uid' AND
- $search_query_part
- $start_ts_query_part
- $since_id_part
- $first_id_query_strategy_part ORDER BY $order_by LIMIT 1";
+ if (DB_TYPE == "pgsql") {
+ $sanity_interval_qpart = "date_entered >= NOW() - INTERVAL '1 hour' AND";
+ } else {
+ $sanity_interval_qpart = "date_entered >= DATE_SUB(NOW(), INTERVAL 1 hour) AND";
+ }
+
+ if (!$search && !$disable_offsets) {
+ // if previous topmost article id changed that means our current pagination is no longer valid
+ $query = "SELECT DISTINCT
+ ttrss_feeds.title,
+ date_entered,
+ guid,
+ ttrss_entries.id,
+ ttrss_entries.title,
+ updated,
+ score,
+ marked,
+ published,
+ last_marked,
+ last_published,
+ last_read
+ FROM
+ $from_qpart
+ WHERE
+ $feed_check_qpart
+ ttrss_user_entries.owner_uid = '$owner_uid' AND
+ $search_query_part
+ $start_ts_query_part
+ $since_id_part
+ $sanity_interval_qpart
+ $first_id_query_strategy_part ORDER BY $order_by LIMIT 1";
if ($_REQUEST["debug"]) {
print $query;
$result = db_query($query);
if ($result && db_num_rows($result) > 0) {
- $first_id = (int) db_fetch_result($result, 0, "id");
+ $first_id = (int)db_fetch_result($result, 0, "id");
if ($offset > 0 && $first_id && $check_first_id && $first_id != $check_first_id) {
return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id);
}
}
+ }
+
+ if ($disable_offsets) {
+ $offset_query_part = "";
+ }
$query = "SELECT DISTINCT
date_entered,
$from_qpart
WHERE
$feed_check_qpart
- ttrss_user_entries.ref_id = ttrss_entries.id AND
ttrss_user_entries.owner_uid = '$owner_uid' AND
$search_query_part
$start_ts_query_part
}
function format_warning($msg, $id = "") {
- return "<div class=\"warning\" id=\"$id\">
- <span><img src=\"images/alert.png\"></span><span>$msg</span></div>";
+ return "<div class=\"alert\" id=\"$id\">$msg</div>";
}
function format_notice($msg, $id = "") {
- return "<div class=\"notice\" id=\"$id\">
- <span><img src=\"images/information.png\"></span><span>$msg</span></div>";
+ return "<div class=\"alert alert-info\" id=\"$id\">$msg</div>";
}
function format_error($msg, $id = "") {
- return "<div class=\"error\" id=\"$id\">
- <span><img src=\"images/alert.png\"></span><span>$msg</span></div>";
+ return "<div class=\"alert alert-danger\" id=\"$id\">$msg</div>";
}
function print_notice($msg) {
<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 {
- var url = elem[elem.selectedIndex].value;
-
- if (url) {
- window.open(url);
- elem.selectedIndex = 0;
- }
-
- } catch (e) {
- exception_error(\"openSelectedAttachment\", e);
- }
- }
- </script>
</head><body id=\"ttrssZoom\">";
}
$rv['content'] .= "<div class=\"postContent\" lang=\"".$line['lang']."\">";
$rv['content'] .= $line["content"];
- $rv['content'] .= format_article_enclosures($id,
- sql_bool_to_bool($line["always_display_enclosures"]),
- $line["content"],
- sql_bool_to_bool($line["hide_images"]));
+
+ if (!$zoom_mode) {
+ $rv['content'] .= format_article_enclosures($id,
+ sql_bool_to_bool($line["always_display_enclosures"]),
+ $line["content"],
+ sql_bool_to_bool($line["hide_images"]));
+ }
$rv['content'] .= "</div>";
$tags_str = "";
for ($i = 0; $i < $maxtags; $i++) {
- $tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"viewfeed('".$tags[$i]."')\">" . $tags[$i] . "</a>, ";
+ $tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"viewfeed({feed:'".$tags[$i]."'})\">" . $tags[$i] . "</a>, ";
}
$tags_str = mb_substr($tags_str, 0, mb_strlen($tags_str)-2);
if (db_num_rows($result) == 1) {
return db_fetch_result($result, 0, "access_key");
} else {
- $key = db_escape_string(uniqid(base_convert(rand(), 10, 36)));
+ $key = db_escape_string(uniqid_short());
$result = db_query("INSERT INTO ttrss_access_keys
(access_key, feed_id, is_cat, owner_uid)
$rv = $retval;
}
}
+ unset($retval); // Unset to prevent breaking render if there are no HOOK_RENDER_ENCLOSURE hooks below.
if ($rv === '' && !empty($result)) {
$entries_html = array();
if (!$hide_images) {
$encsize = '';
if ($entry['height'] > 0)
- $encsize .= ' height="' . intval($entry['width']) . '"';
+ $encsize .= ' height="' . intval($entry['height']) . '"';
if ($entry['width'] > 0)
- $encsize .= ' width="' . intval($entry['height']) . '"';
+ $encsize .= ' width="' . intval($entry['width']) . '"';
$rv .= "<p><img
alt=\"".htmlspecialchars($entry["filename"])."\"
src=\"" .htmlspecialchars($entry["url"]) . "\"
$rv .= "<hr clear='both'/>";
}
- $rv .= "<select class=\"attachments\" onchange=\"openSelectedAttachment(this)\">".
- "<option value=''>" . __('Attachments')."</option>";
+ $rv .= "<div class=\"attachments\" dojoType=\"dijit.form.DropDownButton\">".
+ "<span>" . __('Attachments')."</span>";
+
+ $rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
foreach ($entries as $entry) {
if ($entry["title"])
else
$title = "";
- $rv .= "<option value=\"".htmlspecialchars($entry["url"])."\">" . htmlspecialchars($entry["filename"]) . "$title</option>";
+ $rv .= "<div onclick='window.open(\"".htmlspecialchars($entry["url"])."\")'
+ dojoType=\"dijit.MenuItem\">".htmlspecialchars($entry["filename"])."$title</div>";
};
- $rv .= "</select>";
+ $rv .= "</div>";
+ $rv .= "</div>";
}
return $rv;
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
//curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); //CURLOPT_FOLLOWLOCATION Disabled...
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);
git.wh0rd.org / tt-rss.git / blobdiff