X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Fpref%2Ffeeds.php;h=8249f756a75726cb46d2b71a4389e1b9cd4adf23;hb=81fc862e370a1dfbd3941206fd00076e3cbf0551;hp=30bfbc19e1e7e4b40529b8b73931b95bea33fdce;hpb=6fb5ce5e354312eaed97a8edde014a1677cabdfb;p=tt-rss.git
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
old mode 100644
new mode 100755
index 30bfbc19..8249f756
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -69,9 +69,9 @@ class Pref_Feeds extends Handler_Protected {
}
$fsth = $this->pdo->prepare("SELECT id, title, last_error,
- ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+ ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
FROM ttrss_feeds
- WHERE cat_id = :cat AND
+ WHERE cat_id = :cat AND
owner_uid = :uid AND
(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
ORDER BY order_id, title");
@@ -90,6 +90,7 @@ class Pref_Feeds extends Handler_Protected {
$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
$feed['param'] = make_local_datetime(
$feed_line['last_updated'], true);
+ $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
array_push($items, $feed);
}
@@ -237,9 +238,9 @@ class Pref_Feeds extends Handler_Protected {
$cat['child_unread'] = 0;
$fsth = $this->pdo->prepare("SELECT id, title,last_error,
- ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+ ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
FROM ttrss_feeds
- WHERE cat_id IS NULL AND
+ WHERE cat_id IS NULL AND
owner_uid = :uid AND
(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
ORDER BY order_id, title");
@@ -258,6 +259,7 @@ class Pref_Feeds extends Handler_Protected {
$feed_line['last_updated'], true);
$feed['unread'] = 0;
$feed['type'] = 'feed';
+ $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
array_push($cat['items'], $feed);
}
@@ -272,7 +274,7 @@ class Pref_Feeds extends Handler_Protected {
} else {
$fsth = $this->pdo->prepare("SELECT id, title, last_error,
- ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+ ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
FROM ttrss_feeds
WHERE owner_uid = :uid AND
(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
@@ -292,6 +294,7 @@ class Pref_Feeds extends Handler_Protected {
$feed_line['last_updated'], true);
$feed['unread'] = 0;
$feed['type'] = 'feed';
+ $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
array_push($root['items'], $feed);
}
@@ -325,13 +328,12 @@ class Pref_Feeds extends Handler_Protected {
}
private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) {
- $debug = isset($_REQUEST["debug"]);
$prefix = "";
for ($i = 0; $i < $nest_level; $i++)
$prefix .= " ";
- if ($debug) _debug("$prefix C: $item_id P: $parent_id");
+ Debug::log("$prefix C: $item_id P: $parent_id");
$bare_item_id = substr($item_id, strpos($item_id, ':')+1);
@@ -358,7 +360,7 @@ class Pref_Feeds extends Handler_Protected {
$id = $item['_reference'];
$bare_id = substr($id, strpos($id, ':')+1);
- if ($debug) _debug("$prefix [$order_id] $id/$bare_id");
+ Debug::log("$prefix [$order_id] $id/$bare_id");
if ($item['_reference']) {
@@ -389,7 +391,7 @@ class Pref_Feeds extends Handler_Protected {
}
function savefeedorder() {
- $data = json_decode(clean($_POST['payload']), true);
+ $data = json_decode($_POST['payload'], true);
#file_put_contents("/tmp/saveorder.json", clean($_POST['payload']));
#$data = json_decode(file_get_contents("/tmp/saveorder.json"), true);
@@ -510,8 +512,6 @@ class Pref_Feeds extends Handler_Protected {
print '
';
- $auth_pass_encrypted = $row["auth_pass_encrypted"];
-
$title = htmlspecialchars($row["title"]);
print_hidden("id", "$feed_id");
@@ -562,6 +562,18 @@ class Pref_Feeds extends Handler_Protected {
'dojoType="dijit.form.Select"');
}
+ /* Site URL */
+
+ $site_url = htmlspecialchars($row["site_url"]);
+
+ print "
";
+
+ print __('Site URL:') . " ";
+ print "";
+
/* FTS Stemming Language */
if (DB_TYPE == "pgsql") {
@@ -600,14 +612,8 @@ class Pref_Feeds extends Handler_Protected {
print "";
$auth_login = htmlspecialchars($row["auth_login"]);
- $auth_pass = $row["auth_pass"];
-
- if ($auth_pass_encrypted && function_exists("mcrypt_decrypt")) {
- require_once "crypt.php";
- $auth_pass = decrypt_string($auth_pass);
- }
+ $auth_pass = htmlspecialchars($row["auth_pass"]);
- $auth_pass = htmlspecialchars($auth_pass);
$auth_enabled = $auth_login !== '' || $auth_pass !== '';
$auth_style = $auth_enabled ? '' : 'display: none';
@@ -620,7 +626,6 @@ class Pref_Feeds extends Handler_Protected {
autocomplete=\"new-password\"
name=\"auth_login\" value=\"$auth_login\">
";
-
print "
";
+ if (DIGEST_SUBJECT !== false) {
$include_in_digest = $row["include_in_digest"];
if ($include_in_digest) {
@@ -666,6 +672,7 @@ class Pref_Feeds extends Handler_Protected {
print "
";
+ }
$always_display_enclosures = $row["always_display_enclosures"];
@@ -691,7 +698,7 @@ class Pref_Feeds extends Handler_Protected {
print "
";
+ __('Do not embed media')."";
$cache_images = $row["cache_images"];
@@ -739,7 +746,7 @@ class Pref_Feeds extends Handler_Protected {
-
+
";
+ $auto_expand = $feed_search != "" ? "true" : "false";
+
print "
@@ -1231,7 +1242,7 @@ class Pref_Feeds extends Handler_Protected {