Fixing bugs found by static analysis

diff --git a/api/index.php b/api/index.php
index 9f0d93f695d19880e1c1b77bd08dbeb662cd3790..facdf82c54db587e9cd07f6cb826b6daec494555 100644 (file)
--- a/api/index.php
+++ b/api/index.php
@@ -57,7 +57,7 @@
 
        $method = strtolower($_REQUEST["op"]);
 
-       $handler = new API(Db::get(), $_REQUEST);
+       $handler = new API($_REQUEST);
 
        if ($handler->before($method)) {
                if ($method && method_exists($handler, $method)) {

diff --git a/classes/api.php b/classes/api.php
index badd0b5647a610ced9f260a8984cefff32bd1f1e..f5e4a0c5cb76853bd62e44b8b79d41c9dded21cd 100644 (file)
--- a/classes/api.php
+++ b/classes/api.php
@@ -14,12 +14,12 @@ class API extends Handler {
                        header("Content-Type: text/json");
 
                        if (!$_SESSION["uid"] && $method != "login" && $method != "isloggedin") {
-                               print $this->wrap(self::STATUS_ERR, array("error" => 'NOT_LOGGED_IN'));
+                               $this->wrap(self::STATUS_ERR, array("error" => 'NOT_LOGGED_IN'));
                                return false;
                        }
 
                        if ($_SESSION["uid"] && $method != "logout" && !get_pref('ENABLE_API_ACCESS')) {
-                               print $this->wrap(self::STATUS_ERR, array("error" => 'API_DISABLED'));
+                               $this->wrap(self::STATUS_ERR, array("error" => 'API_DISABLED'));
                                return false;
                        }
 
@@ -38,12 +38,12 @@ class API extends Handler {
 
        function getVersion() {
                $rv = array("version" => VERSION);
-               print $this->wrap(self::STATUS_OK, $rv);
+               $this->wrap(self::STATUS_OK, $rv);
        }
 
        function getApiLevel() {
                $rv = array("level" => self::API_LEVEL);
-               print $this->wrap(self::STATUS_OK, $rv);
+               $this->wrap(self::STATUS_OK, $rv);
        }
 
        function login() {
@@ -65,33 +65,33 @@ class API extends Handler {
                }
 
                if (!$uid) {
-                       print $this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
+                       $this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
                        return;
                }
 
                if (get_pref("ENABLE_API_ACCESS", $uid)) {
                        if (authenticate_user($login, $password)) {               // try login with normal password
-                               print $this->wrap(self::STATUS_OK, array("session_id" => session_id(),
+                               $this->wrap(self::STATUS_OK, array("session_id" => session_id(),
                                        "api_level" => self::API_LEVEL));
                        } else if (authenticate_user($login, $password_base64)) { // else try with base64_decoded password
-                               print $this->wrap(self::STATUS_OK,      array("session_id" => session_id(),
+                               $this->wrap(self::STATUS_OK,    array("session_id" => session_id(),
                                        "api_level" => self::API_LEVEL));
                        } else {                                                         // else we are not logged in
-                               print $this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
+                               $this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
                        }
                } else {
-                       print $this->wrap(self::STATUS_ERR, array("error" => "API_DISABLED"));
+                       $this->wrap(self::STATUS_ERR, array("error" => "API_DISABLED"));
                }
 
        }
 
        function logout() {
                logout_user();
-               print $this->wrap(self::STATUS_OK, array("status" => "OK"));
+               $this->wrap(self::STATUS_OK, array("status" => "OK"));
        }
 
        function isLoggedIn() {
-               print $this->wrap(self::STATUS_OK, array("status" => $_SESSION["uid"] != ''));
+               $this->wrap(self::STATUS_OK, array("status" => $_SESSION["uid"] != ''));
        }
 
        function getUnread() {
@@ -99,15 +99,15 @@ class API extends Handler {
                $is_cat = $this->dbh->escape_string($_REQUEST["is_cat"]);
 
                if ($feed_id) {
-                       print $this->wrap(self::STATUS_OK, array("unread" => getFeedUnread($feed_id, $is_cat)));
+                       $this->wrap(self::STATUS_OK, array("unread" => getFeedUnread($feed_id, $is_cat)));
                } else {
-                       print $this->wrap(self::STATUS_OK, array("unread" => getGlobalUnread()));
+                       $this->wrap(self::STATUS_OK, array("unread" => getGlobalUnread()));
                }
        }
 
        /* Method added for ttrss-reader for Android */
        function getCounters() {
-               print $this->wrap(self::STATUS_OK, getAllCounters());
+               $this->wrap(self::STATUS_OK, getAllCounters());
        }
 
        function getFeeds() {
@@ -119,7 +119,7 @@ class API extends Handler {
 
                $feeds = $this->api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_nested);
 
-               print $this->wrap(self::STATUS_OK, $feeds);
+               $this->wrap(self::STATUS_OK, $feeds);
        }
 
        function getCategories() {
@@ -176,7 +176,7 @@ class API extends Handler {
                        }
                }
 
-               print $this->wrap(self::STATUS_OK, $cats);
+               $this->wrap(self::STATUS_OK, $cats);
        }
 
        function getHeadlines() {
@@ -219,9 +219,9 @@ class API extends Handler {
                                $include_attachments, $since_id, $search, $search_mode,
                                $include_nested, $sanitize_content);
 
-                       print $this->wrap(self::STATUS_OK, $headlines);
+                       $this->wrap(self::STATUS_OK, $headlines);
                } else {
-                       print $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+                       $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
                }
        }
 
@@ -293,11 +293,11 @@ class API extends Handler {
                                }
                        }
 
-                       print $this->wrap(self::STATUS_OK, array("status" => "OK",
+                       $this->wrap(self::STATUS_OK, array("status" => "OK",
                                "updated" => $num_updated));
 
                } else {
-                       print $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+                       $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
                }
 
        }
@@ -352,7 +352,7 @@ class API extends Handler {
                        }
                }
 
-               print $this->wrap(self::STATUS_OK, $articles);
+               $this->wrap(self::STATUS_OK, $articles);
 
        }
 
@@ -370,7 +370,7 @@ class API extends Handler {
 
                $config["num_feeds"] = (int)$num_feeds;
 
-               print $this->wrap(self::STATUS_OK, $config);
+               $this->wrap(self::STATUS_OK, $config);
        }
 
        function updateFeed() {
@@ -380,7 +380,7 @@ class API extends Handler {
 
                update_rss_feed($feed_id, true);
 
-               print $this->wrap(self::STATUS_OK, array("status" => "OK"));
+               $this->wrap(self::STATUS_OK, array("status" => "OK"));
        }
 
        function catchupFeed() {
@@ -389,13 +389,13 @@ class API extends Handler {
 
                catchup_feed($feed_id, $is_cat);
 
-               print $this->wrap(self::STATUS_OK, array("status" => "OK"));
+               $this->wrap(self::STATUS_OK, array("status" => "OK"));
        }
 
        function getPref() {
                $pref_name = $this->dbh->escape_string($_REQUEST["pref_name"]);
 
-               print $this->wrap(self::STATUS_OK, array("value" => get_pref($pref_name)));
+               $this->wrap(self::STATUS_OK, array("value" => get_pref($pref_name)));
        }
 
        function getLabels() {
@@ -432,7 +432,7 @@ class API extends Handler {
                                "checked" => $checked));
                }
 
-               print $this->wrap(self::STATUS_OK, $rv);
+               $this->wrap(self::STATUS_OK, $rv);
        }
 
        function setArticleLabel() {
@@ -460,7 +460,7 @@ class API extends Handler {
                        }
                }
 
-               print $this->wrap(self::STATUS_OK, array("status" => "OK",
+               $this->wrap(self::STATUS_OK, array("status" => "OK",
                        "updated" => $num_updated));
 
        }
@@ -471,10 +471,10 @@ class API extends Handler {
                if ($plugin && method_exists($plugin, $method)) {
                        $reply = $plugin->$method();
 
-                       print $this->wrap($reply[0], $reply[1]);
+                       $this->wrap($reply[0], $reply[1]);
 
                } else {
-                       print $this->wrap(self::STATUS_ERR, array("error" => 'UNKNOWN_METHOD', "method" => $method));
+                       $this->wrap(self::STATUS_ERR, array("error" => 'UNKNOWN_METHOD', "method" => $method));
                }
        }
 
@@ -484,9 +484,9 @@ class API extends Handler {
                $content = $this->dbh->escape_string(strip_tags($_REQUEST["content"]));
 
                if (Article::create_published_article($title, $url, $content, "", $_SESSION["uid"])) {
-                       print $this->wrap(self::STATUS_OK, array("status" => 'OK'));
+                       $this->wrap(self::STATUS_OK, array("status" => 'OK'));
                } else {
-                       print $this->wrap(self::STATUS_ERR, array("error" => 'Publishing failed'));
+                       $this->wrap(self::STATUS_ERR, array("error" => 'Publishing failed'));
                }
        }
 
@@ -714,9 +714,9 @@ class API extends Handler {
 
                if ($this->dbh->num_rows($result) != 0) {
                        Pref_Feeds::remove_feed($feed_id, $_SESSION["uid"]);
-                       print $this->wrap(self::STATUS_OK, array("status" => "OK"));
+                       $this->wrap(self::STATUS_OK, array("status" => "OK"));
                } else {
-                       print $this->wrap(self::STATUS_ERR, array("error" => "FEED_NOT_FOUND"));
+                       $this->wrap(self::STATUS_ERR, array("error" => "FEED_NOT_FOUND"));
                }
        }
 
@@ -727,12 +727,11 @@ class API extends Handler {
                $password = $this->dbh->escape_string($_REQUEST["password"]);
 
                if ($feed_url) {
-                       $rc = subscribe_to_feed($feed_url, $category_id,
-                               $login, $password, false);
+                       $rc = subscribe_to_feed($feed_url, $category_id, $login, $password);
 
-                       print $this->wrap(self::STATUS_OK, array("status" => $rc));
+                       $this->wrap(self::STATUS_OK, array("status" => $rc));
                } else {
-                       print $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+                       $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
                }
        }
 
@@ -746,9 +745,9 @@ class API extends Handler {
 
                if ($pf){
                        $data = $pf->makefeedtree();
-                       print $this->wrap(self::STATUS_OK, array("categories" => $data));
+                       $this->wrap(self::STATUS_OK, array("categories" => $data));
                } else {
-                       print $this->wrap(self::STATUS_ERR, array("error" =>
+                       $this->wrap(self::STATUS_ERR, array("error" =>
                                'UNABLE_TO_INSTANTIATE_OBJECT'));
                }
 

diff --git a/classes/article.php b/classes/article.php
index 1198eefa95cc3ebd7624c981df33b8ab4fe791e5..e9f86f2984d6a709fe5cf8aeb0c4caebd0018eec 100644 (file)
--- a/classes/article.php
+++ b/classes/article.php
@@ -215,7 +215,7 @@ class Article extends Handler_Protected {
                $this->dbh->query("UPDATE ttrss_user_entries SET
                        score = '$score' WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
 
-               print json_encode(array("id" => $id,
+               print json_encode(array("id" => $ids,
                        "score_pic" => get_score_pic($score)));
        }
 

diff --git a/classes/auth/base.php b/classes/auth/base.php
index 83f99d109f8ff66a2dba0759ea7d4c2d1a20249f..c77df51577cb0314582170ffbef7a67169673611 100644 (file)
--- a/classes/auth/base.php
+++ b/classes/auth/base.php
@@ -16,7 +16,7 @@ class Auth_Base {
 
        // Auto-creates specified user if allowed by system configuration
        // Can be used instead of find_user_by_login() by external auth modules
-       function auto_create_user($login) {
+       function auto_create_user($login, $password) {
                if ($login && defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) {
                        $user_id = $this->find_user_by_login($login);
 

diff --git a/classes/db/pdo.php b/classes/db/pdo.php
index 59499139dcc7329660a6db30dffab48ae4d06abf..126f5150a75365ff64b2ed82a0cac202114832a8 100644 (file)
--- a/classes/db/pdo.php
+++ b/classes/db/pdo.php
@@ -79,7 +79,7 @@ class Db_PDO implements IDb {
        }
 
        function last_error() {
-               return join(" ", $pdo->errorInfo());
+               return join(" ", $this->pdo->errorInfo());
        }
 
        function init() {

diff --git a/classes/handler/public.php b/classes/handler/public.php
index d5933a18c01ee0b24ad010e48f1ea9a25e373a9d..7fa74410763a6b3d7438e5eb903cd5ff1683e926 100644 (file)
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -382,9 +382,9 @@ class Handler_Public extends Handler {
                header('Content-Type: text/html; charset=utf-8');
                print "<html><head><title>Tiny Tiny RSS</title>";
 
-               print stylesheet_tag("utility.css");
-               print javascript_tag("lib/prototype.js");
-               print javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls");
+               stylesheet_tag("utility.css");
+               javascript_tag("lib/prototype.js");
+               javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls");
                print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
                        </head><body id='sharepopup'>";
 
@@ -643,6 +643,7 @@ class Handler_Public extends Handler {
                $feed_url = $this->dbh->escape_string(trim($_REQUEST["feed_url"]));
                $cat_id = $this->dbh->escape_string($_REQUEST["cat_id"]);
                $from = $this->dbh->escape_string($_REQUEST["from"]);
+               $feed_urls = array();
 
                /* only read authentication information from POST */
 
@@ -666,8 +667,10 @@ class Handler_Public extends Handler {
                        break;
                case 4:
                        print_notice(__("Multiple feed URLs found."));
-
-                       $feed_urls = get_feeds_from_html($feed_url);
+                       $contents = @fetch_file_contents($url, false, $auth_login, $auth_pass);
+                       if (is_html($contents)) {
+                               $feed_urls = get_feeds_from_html($url, $contents);
+                       }
                        break;
                case 5:
                        print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
@@ -732,8 +735,8 @@ class Handler_Public extends Handler {
                header('Content-Type: text/html; charset=utf-8');
                print "<html><head><title>Tiny Tiny RSS</title>";
 
-               print stylesheet_tag("utility.css");
-               print javascript_tag("lib/prototype.js");
+               stylesheet_tag("utility.css");
+               javascript_tag("lib/prototype.js");
 
                print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
                        </head><body id='forgotpass'>";

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 8e2aefcf167ae3584e08ff52e64e3dfa218551e8..bc5dc96beb5c0ca4cc47e40aa9bbe46d0b1317fe 100644 (file)
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -186,7 +186,7 @@ class PluginHost {
                }
        }
 
-       function del_handler($handler, $method) {
+       function del_handler($handler, $method, $sender) {
                $handler = str_replace("-", "_", strtolower($handler));
                $method = strtolower($method);
 
@@ -252,8 +252,6 @@ class PluginHost {
 
        function load_data($force = false) {
                if ($this->owner_uid)  {
-                       $plugin = $this->dbh->escape_string($plugin);
-
                        $result = $this->dbh->query("SELECT name, content FROM ttrss_plugin_storage
                                WHERE owner_uid = '".$this->owner_uid."'");
 

diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 4dbee5906fa9a2a049dead55071de5588cd560e6..bcc7b5aec424abbbf53a9447dc6fae386dbc3483 100644 (file)
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -83,8 +83,6 @@ class Pref_Filters extends Handler_Protected {
                        }
                }
 
-               $feed_title = getFeedTitle($feed);
-
                $qfh_ret = queryFeedHeadlines(-4, 30, "", false, false, false,
                        "date_entered DESC", 0, $_SESSION["uid"], $filter);
 

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index ba83a99008d0109d719e6d6058fb3cb01d18f1e0..fb67959576ddb297982a9726a7ec84e68529d28a 100644 (file)
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -747,7 +747,7 @@ class Pref_Prefs extends Handler_Protected {
                $system_enabled = array_map("trim", explode(",", PLUGINS));
                $user_enabled = array_map("trim", explode(",", get_pref("_ENABLED_PLUGINS")));
 
-               $tmppluginhost = new PluginHost(Db::get());
+               $tmppluginhost = new PluginHost();
                $tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"]);
                $tmppluginhost->load_data(true);
 

diff --git a/classes/rpc.php b/classes/rpc.php
index 2b07bbf9117255942899f384515cfb85b3c1772e..46583feb58469d333e6b97489eeebe6920575d58 100644 (file)
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -291,7 +291,7 @@ class RPC extends Handler_Protected {
 
                $reply = array();
 
-               if ($seq) $reply['seq'] = $seq;
+               if (!empty($_REQUEST['seq'])) $reply['seq'] = (int) $_REQUEST['seq'];
 
                if ($last_article_id != getLastArticleId()) {
                        $reply['counters'] = getAllCounters();
@@ -464,7 +464,7 @@ class RPC extends Handler_Protected {
                        $id = 0;
                }
 
-               print_feed_cat_select("cat_id", $id);
+               print_feed_cat_select("cat_id", $id, '');
        }
 
        // Silent

diff --git a/classes/ttrssmailer.php b/classes/ttrssmailer.php
index fd7f969aa701cc73caeccb65c42711aef7096da2..1e8d077231f2f2e192fc95d637e1c6619d9e1269 100644 (file)
--- a/classes/ttrssmailer.php
+++ b/classes/ttrssmailer.php
@@ -28,7 +28,7 @@ class ttrssMailer extends PHPMailer {
                        $this->Host = $pair[0];\r
                        $this->Port = $pair[1];\r
 \r
-                       if (!$Port) $Port = 25;\r
+                       if (!$this->Port) $this->Port = 25;\r
                } else {\r
                        $this->Host = '';\r
                        $this->Port = '';\r

diff --git a/include/colors.php b/include/colors.php
index 7cf1a6af0a71241e6e66cca2de2d82da09a5621d..41bf7b819f023ab9f1471165cada6c31def37cd0 100644 (file)
--- a/include/colors.php
+++ b/include/colors.php
@@ -237,16 +237,16 @@ function rgb2hsl($arr) {
    } else {
       $s = $del_Max / $var_Max;
 
-      $del_R = ((($max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-      $del_G = ((($max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-      $del_B = ((($max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+      $del_R = ((($var_Max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+      $del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+      $del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
 
       if      ($var_R == $var_Max) $h = $del_B - $del_G;
       else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B;
       else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R;
 
-      if ($H < 0) $h++;
-      if ($H > 1) $h--;
+      if ($h < 0) $h++;
+      if ($h > 1) $h--;
    }
 
    return array($h, $s, $v);

diff --git a/include/functions.php b/include/functions.php
index 15a8757460e9d8d68eb6c4a2ea9739fb79848845..414196e9c7d9a6530adc2677c4c4b419f6be556a 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1162,7 +1162,7 @@
 
                $data = array_merge($data, getVirtCounters());
                $data = array_merge($data, getLabelCounters());
-               $data = array_merge($data, getFeedCounters($active_feed));
+               $data = array_merge($data, getFeedCounters());
                $data = array_merge($data, getCategoryCounters());
 
                return $data;
@@ -1286,7 +1286,7 @@
 
                        return $unread;
                } else if ($cat == -1) {
-                       return getFeedUnread(-1) + getFeedUnread($link, -2) + getFeedUnread($link, -3) + getFeedUnread($link, 0);
+                       return getFeedUnread(-1) + getFeedUnread(-2) + getFeedUnread(-3) + getFeedUnread(0);
                } else if ($cat == -2) {
 
                        $result = db_query("
@@ -1726,7 +1726,8 @@
                        }
 
                        if (!$root_id) {
-                               $is_selected = ($default_id == "CAT:0") ? "selected=\"1\"" : "";
+                               $default_is_cat = ($default_id == "CAT:0");
+                               $is_selected = $default_is_cat ? "selected=\"1\"" : "";
 
                                printf("<option $is_selected value='CAT:0'>%s</option>",
                                        __("Uncategorized"));
@@ -4099,7 +4100,7 @@
                                preg_match("/(Location:|URI:)[^(\n)]*/", $header, $matches);
                                $url = trim(str_replace($matches[1],"",$matches[0]));
                                $url_parsed = parse_url($url);
-                               return (isset($url_parsed))? geturl($url, $referer):'';
+                               return (isset($url_parsed))? geturl($url):'';
                        }
                        $oline='';
                        foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';}

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 61f6ee6a0ca0c42cecea7ea643cea14e8fac4cfc..612c914c034b2f6cc75498c3f334b7cb9fccb059 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -334,7 +334,7 @@
                }
 
                $pluginhost = new PluginHost();
-               $pluginhost->set_debug($debug_enabled, $debug_enabled);
+               $pluginhost->set_debug($debug_enabled);
                $user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
                $pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
@@ -411,7 +411,7 @@
 
                                _debug("checking favicon...", $debug_enabled);
 
-                               check_feed_favicon($site_url, $feed, $link);
+                               check_feed_favicon($site_url, $feed);
                                $favicon_modified_new = @filemtime($favicon_file);
 
                                if ($favicon_modified_new > $favicon_modified)

diff --git a/index.php b/index.php
index 6a34be5e8022e7bfd9c0bd7d88277824d053dcce..29b8b173d6c08d02af21ef0d9746a4508be5a40b 100644 (file)
--- a/index.php
+++ b/index.php
@@ -56,14 +56,14 @@
 <head>
        <title>Tiny Tiny RSS</title>
 
-       <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
-       <?php echo stylesheet_tag("tt-rss.css"); ?>
-       <?php echo stylesheet_tag("cdm.css"); ?>
+       <?php stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
+       <?php stylesheet_tag("tt-rss.css"); ?>
+       <?php stylesheet_tag("cdm.css"); ?>
 
        <?php if ($_SESSION["uid"]) {
                $theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false);
                if ($theme) {
-                       echo stylesheet_tag("themes/$theme");
+                       stylesheet_tag("themes/$theme");
                }
        }
        ?>
@@ -91,7 +91,7 @@
                                "lib/dojo/tt-rss-layer.js",
                                "errors.php?mode=js") as $jsfile) {
 
-               echo javascript_tag($jsfile);
+               javascript_tag($jsfile);
 
        } ?>
 

diff --git a/install/index.php b/install/index.php
index cd017f99535d73f4790629defd3deca0a3902592..6cb2ace4f370c8b5e0788354c5fd9a66b5e04893 100644 (file)
--- a/install/index.php
+++ b/install/index.php
@@ -89,7 +89,7 @@
                        <span><img src=\"../images/sign_info.svg\"></span><span>$msg</span></div>";
        }
 
-       function db_connect($host, $user, $pass, $db, $type, $port) {
+       function db_connect($host, $user, $pass, $db, $type, $port = false) {
                if ($type == "pgsql") {
 
                        $string = "dbname=$db user=$user";

diff --git a/lib/MiniTemplator.class.php b/lib/MiniTemplator.class.php
index 69281cb5ee9e9841875e4104073c71ffd56b207b..a139473f95f955f6f8e215555fbc684b768db7ff 100644 (file)
--- a/lib/MiniTemplator.class.php
+++ b/lib/MiniTemplator.class.php
@@ -336,7 +336,7 @@ function processBeginBlockCmd ($parms, $cmdTPosBegin, $cmdTPosEnd) {
    $this->openBlocksTab[$this->currentNestingLevel] = $blockNo;\r
    $this->currentNestingLevel += 1;\r
    if ($this->currentNestingLevel > $this->maxNestingLevel) {\r
-      $trhis->triggerError ("Block nesting overflow in template at offset $cmdTPosBegin.");\r
+      $this->triggerError ("Block nesting overflow in template at offset $cmdTPosBegin.");\r
       return false; }\r
    return true; }\r
 \r
@@ -844,7 +844,7 @@ function readFileIntoString ($fileName, &$s) {
    $fh = fopen($fileName,"rb");\r
    if ($fh === false) return false;\r
    $fileSize = filesize($fileName);\r
-   if ($fileSize === false) {close ($fh); return false; }\r
+   if ($fileSize === false) {fclose ($fh); return false; }\r
    $s = fread($fh,$fileSize);\r
    fclose ($fh);\r
    if (strlen($s) != $fileSize) return false;\r

diff --git a/lib/phpqrcode/bindings/tcpdf/qrcode.php b/lib/phpqrcode/bindings/tcpdf/qrcode.php
index 7995460b521583966c0a4811cb1e5b62033d35c3..9001e3a2e19ebfbcd14e7048c1a07a2c5afb2b72 100644 (file)
--- a/lib/phpqrcode/bindings/tcpdf/qrcode.php
+++ b/lib/phpqrcode/bindings/tcpdf/qrcode.php
@@ -1101,7 +1101,7 @@ if (!class_exists('QRcode', false)) {
                 protected function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly=false) {
                        $b = 0;
                        $bitMask = array();
-                       $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
+                       $bitMask = $this->generateMaskNo($maskNo, $width, $s);
                        if ($maskGenOnly) {
                                return;
                        }
@@ -1399,7 +1399,7 @@ if (!class_exists('QRcode', false)) {
                                $p += 2;
                        }
                        $this->items = $this->appendNewInputItem($this->items, QR_MODE_KJ, $p, str_split($this->dataStr));
-                       return $run;
+                       return $p;
                }
 
                /**
@@ -1470,7 +1470,7 @@ if (!class_exists('QRcode', false)) {
                                                break;
                                        }
                                        case QR_MODE_KJ: {
-                                               if ($hint == QR_MODE_KJ) {
+                                               if ($this->hint == QR_MODE_KJ) {
                                                        $length = $this->eatKanji();
                                                } else {
                                                        $length = $this->eat8();
@@ -1499,7 +1499,7 @@ if (!class_exists('QRcode', false)) {
                        $stringLen = strlen($this->dataStr);
                        $p = 0;
                        while ($p < $stringLen) {
-                               $mode = $this->identifyMode(substr($this->dataStr, $p), $this->hint);
+                               $mode = $this->identifyMode(substr($this->dataStr, $p));
                                if ($mode == QR_MODE_KJ) {
                                        $p += 2;
                                } else {

diff --git a/lib/phpqrcode/phpqrcode.php b/lib/phpqrcode/phpqrcode.php
index 80adb9df239cb4cbd05cc51295f5eef5e5bbf8e7..02b8776392394de68a7820c64a6adad35a186a80 100644 (file)
--- a/lib/phpqrcode/phpqrcode.php
+++ b/lib/phpqrcode/phpqrcode.php
@@ -2195,7 +2195,7 @@
                     case QR_MODE_NUM: $length = $this->eatNum(); break;\r
                     case QR_MODE_AN:  $length = $this->eatAn(); break;\r
                     case QR_MODE_KANJI:\r
-                        if ($hint == QR_MODE_KANJI)\r
+                        if ($this->modeHint == QR_MODE_KANJI)\r
                                 $length = $this->eatKanji();\r
                         else    $length = $this->eat8();\r
                         break;\r
@@ -2217,7 +2217,7 @@
             $p = 0;\r
             \r
             while ($p<$stringLen) {\r
-                $mode = self::identifyMode(substr($this->dataStr, $p), $this->modeHint);\r
+                $mode = self::identifyMode(substr($this->dataStr, $p));\r
                 if($mode == QR_MODE_KANJI) {\r
                     $p += 2;\r
                 } else {\r
@@ -2621,13 +2621,13 @@
                 if (file_exists($fileName)) {\r
                     $bitMask = self::unserial(file_get_contents($fileName));\r
                 } else {\r
-                    $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);\r
+                    $bitMask = $this->generateMaskNo($maskNo, $width, $s);\r
                     if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo))\r
                         mkdir(QR_CACHE_DIR.'mask_'.$maskNo);\r
                     file_put_contents($fileName, self::serial($bitMask));\r
                 }\r
             } else {\r
-                $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);\r
+                $bitMask = $this->generateMaskNo($maskNo, $width, $s);\r
             }\r
 \r
             if ($maskGenOnly)\r
@@ -2937,7 +2937,7 @@
         //----------------------------------------------------------------------\r
         public function getCode()\r
         {\r
-            $ret;\r
+            $ret = 0;\r
 \r
             if($this->count < $this->dataLength) {\r
                 $row = $this->count % $this->blocks;\r
@@ -3059,7 +3059,7 @@
             $input = new QRinput($version, $level);\r
             if($input == NULL) return NULL;\r
 \r
-            $ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string));\r
+            $ret = $input->append(QR_MODE_8, strlen($string), str_split($string));\r
             if($ret < 0) {\r
                 unset($input);\r
                 return NULL;\r

diff --git a/lib/phpqrcode/qrencode.php b/lib/phpqrcode/qrencode.php
index 4b77a5bdd4c298b3516df40150e5aa2b32aff9f9..5bdeaec20a4cc49da4974ef8d596c2ff365cc3e8 100644 (file)
--- a/lib/phpqrcode/qrencode.php
+++ b/lib/phpqrcode/qrencode.php
@@ -129,7 +129,7 @@
         //----------------------------------------------------------------------\r
         public function getCode()\r
         {\r
-            $ret;\r
+            $ret = 0;\r
 \r
             if($this->count < $this->dataLength) {\r
                 $row = $this->count % $this->blocks;\r

diff --git a/lib/phpqrcode/qrmask.php b/lib/phpqrcode/qrmask.php
index b14d7ae161f58c0d59f3295884228ca46392e451..43d653ce3f3510c3a3aa916bd468edfe5610a3d9 100644 (file)
--- a/lib/phpqrcode/qrmask.php
+++ b/lib/phpqrcode/qrmask.php
@@ -149,13 +149,13 @@
                 if (file_exists($fileName)) {\r
                     $bitMask = self::unserial(file_get_contents($fileName));\r
                 } else {\r
-                    $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);\r
+                    $bitMask = $this->generateMaskNo($maskNo, $width, $s);\r
                     if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo))\r
                         mkdir(QR_CACHE_DIR.'mask_'.$maskNo);\r
                     file_put_contents($fileName, self::serial($bitMask));\r
                 }\r
             } else {\r
-                $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);\r
+                $bitMask = $this->generateMaskNo($maskNo, $width, $s);\r
             }\r
 \r
             if ($maskGenOnly)\r

diff --git a/lib/phpqrcode/qrsplit.php b/lib/phpqrcode/qrsplit.php
index d75b827371cc9fad4f4b940d5d152846ca943ced..1f9f65c3bd9d7fae2e0577414a58c9cfc533138d 100644 (file)
--- a/lib/phpqrcode/qrsplit.php
+++ b/lib/phpqrcode/qrsplit.php
@@ -186,7 +186,7 @@
             if($ret < 0)\r
                 return -1;\r
 \r
-            return $run;\r
+            return $ret;\r
         }\r
 \r
         //----------------------------------------------------------------------\r
@@ -258,7 +258,7 @@
                     case QR_MODE_NUM: $length = $this->eatNum(); break;\r
                     case QR_MODE_AN:  $length = $this->eatAn(); break;\r
                     case QR_MODE_KANJI:\r
-                        if ($hint == QR_MODE_KANJI)\r
+                        if ($this->modeHint == QR_MODE_KANJI)\r
                                 $length = $this->eatKanji();\r
                         else    $length = $this->eat8();\r
                         break;\r
@@ -280,7 +280,7 @@
             $p = 0;\r
             \r
             while ($p<$stringLen) {\r
-                $mode = self::identifyMode(substr($this->dataStr, $p), $this->modeHint);\r
+                $mode = self::identifyMode(substr($this->dataStr, $p));\r
                 if($mode == QR_MODE_KANJI) {\r
                     $p += 2;\r
                 } else {\r
@@ -308,4 +308,4 @@
                 \r
             return $split->splitString();\r
         }\r
-    }
\ No newline at end of file
+    }

diff --git a/plugins/af_unburn/init.php b/plugins/af_unburn/init.php
index 62b3b4dcfdc5a193e2927eea0457df6b20fcfc10..a97502b12a7ebfd988916722ddc71f7f63496c6f 100644 (file)
--- a/plugins/af_unburn/init.php
+++ b/plugins/af_unburn/init.php
@@ -114,7 +114,7 @@ class Af_Unburn extends Plugin {
                                preg_match("/(Location:|URI:)[^(\n)]*/", $header, $matches);
                                $url = trim(str_replace($matches[1],"",$matches[0]));
                                $url_parsed = parse_url($url);
-                               return (isset($url_parsed))? geturl($url, $referer):'';
+                               return (isset($url_parsed))? geturl($url):'';
                        }
                        $oline='';
                        foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';}

diff --git a/plugins/auth_internal/init.php b/plugins/auth_internal/init.php
index 79a8e8cb39895e00a07311095729d15c64ef61e0..87c8555c082c9851af8ed8cfb7812e6a9359ff95 100644 (file)
--- a/plugins/auth_internal/init.php
+++ b/plugins/auth_internal/init.php
@@ -51,7 +51,7 @@ class Auth_Internal extends Plugin implements IAuthModule {
                                                        $return = urlencode($_REQUEST["return"]);
                                                        ?><html>
                                                                <head><title>Tiny Tiny RSS</title></head>
-                                                               <?php echo stylesheet_tag("utility.css") ?>
+                                                               <?php stylesheet_tag("utility.css") ?>
                                                        <body class="otp"><div class="content">
                                                        <form action="public.php?return=<?php echo $return ?>"
                                                                        method="POST" class="otpform">

diff --git a/plugins/auth_remote/init.php b/plugins/auth_remote/init.php
index 2bf090d5404a2ed86e20d4e4f004a94e3f928d19..2ec2c87b232ca9e0e33c7d00b27763efb95e5041 100644 (file)
--- a/plugins/auth_remote/init.php
+++ b/plugins/auth_remote/init.php
@@ -45,7 +45,7 @@ class Auth_Remote extends Plugin implements IAuthModule {
 #              if (!$try_login) $try_login = "test_qqq";
 
                if ($try_login) {
-                       $user_id = $this->base->auto_create_user($try_login);
+                       $user_id = $this->base->auto_create_user($try_login, $password);
 
                        if ($user_id) {
                                $_SESSION["fake_login"] = $try_login;

diff --git a/prefs.php b/prefs.php
index 9bf610a53ad1daa9508827184278c05fb3528b66..b617d94bc917e754b771d7f374c012ed921a9fe0 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -32,14 +32,14 @@
 <head>
        <title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title>
 
-       <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
-       <?php echo stylesheet_tag("tt-rss.css"); ?>
-       <?php echo stylesheet_tag("prefs.css"); ?>
+       <?php stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
+       <?php stylesheet_tag("tt-rss.css"); ?>
+       <?php stylesheet_tag("prefs.css"); ?>
 
        <?php if ($_SESSION["uid"]) {
                $theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false);
                if ($theme) {
-                       echo stylesheet_tag("themes/$theme");
+                       stylesheet_tag("themes/$theme");
                }
        }
        ?>
@@ -58,7 +58,7 @@
                                "lib/dojo/tt-rss-layer.js",
                                "errors.php?mode=js") as $jsfile) {
 
-               echo javascript_tag($jsfile);
+               javascript_tag($jsfile);
 
        } ?>
 

diff --git a/update.php b/update.php
index d4160c7ba1cc557367184ee0a959b52a6477e62d..f542a390bf833fbfcaed6f4d6a002acbb7ae44ba 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -321,7 +321,7 @@
        }
 
        if (isset($options["list-plugins"])) {
-               $tmppluginhost = new PluginHost(Db::get());
+               $tmppluginhost = new PluginHost();
                $tmppluginhost->load_all($tmppluginhost::KIND_ALL);
                $enabled = array_map("trim", explode(",", PLUGINS));