Merge branch 'save-effective-url' of JustAMacUser/tt-rss into master

[tt-rss.git] / classes / feeds.php

diff --git a/classes/feeds.php b/classes/feeds.php
index 98507d361a7e076db3e47f06dd8ab2b4f4ce2862..015418328729ccb3cc7849be80c99f399533e338 100755 (executable)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -173,53 +173,10 @@ class Feeds extends Handler_Protected {
                $method_split = explode(":", $method);
 
                if ($method == "ForceUpdate" && $feed > 0 && is_numeric($feed)) {
-                       // Update the feed if required with some basic flood control
-
-                       $any_needs_curl = false;
-
-                       if (ini_get("open_basedir")) {
-                               $pluginhost = PluginHost::getInstance();
-                               foreach ($pluginhost->get_plugins() as $plugin) {
-                                       $flags = $plugin->flags();
-
-                                       if (isset($flags["needs_curl"]) && $flags["needs_curl"]) {
-                                               $any_needs_curl = true;
-                                               break;
-                                       }
-                               }
-                       }
-
-                       //if ($_REQUEST["debug"]) print "<!-- any_needs_curl: $any_needs_curl -->";
-
-                       if (!$any_needs_curl) {
-
-                               $sth = $this->pdo->prepare("SELECT cache_images," . SUBSTRING_FOR_DATE . "(last_updated,1,19) AS last_updated
-                                               FROM ttrss_feeds WHERE id = ?");
-                               $sth->execute([$feed]);
-
-                               if ($row = $sth->fetch()) {
-                                       $last_updated = strtotime($row["last_updated"]);
-                                       $cache_images = $row["cache_images"];
-
-                                       if (!$cache_images && time() - $last_updated > 120) {
-                                           try {
-                                                       RSSUtils::update_rss_feed($feed, true);
-                                               } catch (PDOException $e) {
-                                               user_error("PDO Exception while doing on-demand feed update for $feed: " . $e->getMessage(), E_USER_NOTICE);
-                        }
-                                       } else {
-                                               $sth = $this->pdo->prepare("UPDATE ttrss_feeds 
-                                SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
-                                                               WHERE id = ?");
-                                               $sth->execute([$feed]);
-                                       }
-                               }
-                       } else {
-                               $sth = $this->pdo->prepare("UPDATE ttrss_feeds 
-                                SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
-                                                               WHERE id = ?");
-                               $sth->execute([$feed]);
-                       }
+            $sth = $this->pdo->prepare("UPDATE ttrss_feeds 
+                            SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
+                            WHERE id = ?");
+            $sth->execute([$feed]);
                }
 
                if ($method_split[0] == "MarkAllReadGR")  {
@@ -1547,7 +1504,7 @@ class Feeds extends Handler_Protected {
                                        (owner_uid,feed_url,title,cat_id, auth_login,auth_pass,update_method,auth_pass_encrypted)
                                VALUES (?, ?, ?, ?, ?, ?, 0, false)");
 
-                       $sth->execute([$_SESSION['uid'], $url, "[Unknown]", $cat_id, $auth_login, $auth_pass]);
+                       $sth->execute([$_SESSION['uid'], $url, "[Unknown]", $cat_id, (string)$auth_login, (string)$auth_pass]);
 
                        $sth = $pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
                                        AND owner_uid = ?");