strip_harmful_tags: remove data- attributes

[tt-rss.git] / include / functions.php

diff --git a/include/functions.php b/include/functions.php
index 006d17a4887c3683920bd73b2d5bdbaddd8345ef..9125df3bd8a367cd65cca22d4be2596d67cc77b1 100755 (executable)
--- a/include/functions.php
+++ b/include/functions.php
@@ -13,7 +13,6 @@
        $fetch_last_error_content = false; // curl only for the time being
        $fetch_effective_url = false;
        $fetch_curl_used = false;
-       $suppress_debugging = false;
 
        libxml_disable_entity_loader(true);
 
@@ -156,67 +155,11 @@
 
        $schema_version = false;
 
-       function _debug_suppress($suppress) {
-               global $suppress_debugging;
-
-               $suppress_debugging = $suppress;
+       // TODO: compat wrapper, remove at some point
+       function _debug($msg) {
+           Debug::log($msg);
        }
 
-       /**
-        * Print a timestamped debug message.
-        *
-        * @param string $msg The debug message.
-        * @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')) {
-                       $ts = "$ts/" . posix_getpid();
-               }
-
-               if ($show && !(defined('QUIET') && QUIET)) {
-                       print "[$ts] $msg\n";
-               }
-
-               if (defined('LOGFILE'))  {
-                       $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);
-                       }
-               }
-
-       } // function _debug
-
        /**
         * Purge a feed old posts.
         *
@@ -227,7 +170,7 @@
         * @access public
         * @return void
         */
-       function purge_feed($feed_id, $purge_interval, $debug = false) {
+       function purge_feed($feed_id, $purge_interval) {
 
                if (!$purge_interval) $purge_interval = feed_purge_interval($feed_id);
 
@@ -292,9 +235,7 @@
 
                CCache::update($feed_id, $owner_uid);
 
-               if ($debug) {
-                       _debug("Purged feed $feed_id ($purge_interval): deleted $rows articles");
-               }
+        Debug::log("Purged feed $feed_id ($purge_interval): deleted $rows articles");
 
                return $rows;
        } // function purge_feed
@@ -421,7 +362,7 @@
                                // holy shit closures in php
                                // download & upload are *expected* sizes respectively, could be zero
                                curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curl_handle, $download_size, $downloaded, $upload_size, $uploaded) use( &$max_size) {
-                                       //_debug("[curl progressfunction] $downloaded $max_size");
+                                       Debug::log("[curl progressfunction] $downloaded $max_size", Debug::$LOG_EXTENDED);
 
                                        return ($downloaded > $max_size) ? 1 : 0; // if max size is set, abort when exceeding it
                                });
@@ -714,8 +655,8 @@
 
                        if ($user_id && !$check_only) {
 
-                               session_regenerate_id(true);
                                session_start();
+                               session_regenerate_id(true);
 
                                $_SESSION["uid"] = $user_id;
                                $_SESSION["version"] = VERSION_STATIC;
@@ -1223,8 +1164,7 @@
                                "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"),
-                               "toggle_cdm_expanded" => __("Toggle auto expand in combined mode")),
+                               "toggle_combined_mode" => __("Toggle combined mode")),
                        __("Go to") => array(
                                "goto_all" => __("All articles"),
                                "goto_fresh" => __("Fresh"),
@@ -1292,7 +1232,6 @@
                        "f *d" => "feed_debug_update",
                        "f *g" => "feed_debug_viewfeed",
                        "f *c" => "toggle_combined_mode",
-                       "f c" => "toggle_cdm_expanded",
                        "*q" => "catchup_all",
                        "x" => "cat_toggle_collapse",
        //                      "goto" => array(
@@ -1369,7 +1308,6 @@
                $data["num_feeds"] = (int) $num_feeds;
 
                $data['last_article_id'] = Article::getLastArticleId();
-               $data['cdm_expanded'] = get_pref('CDM_EXPANDED');
 
                $data['dep_ts'] = calculate_dep_timestamp();
                $data['reload_on_ts_change'] = !defined('_NO_RELOAD_ON_TS_CHANGE');
@@ -1823,6 +1761,10 @@
                                                array_push($attrs_to_remove, $attr);
                                        }
 
+                                       if (strpos($attr->nodeName, "data-") === 0) {
+                                               array_push($attrs_to_remove, $attr);
+                                       }
+
                                        if ($attr->nodeName == 'href' && stripos($attr->value, 'javascript:') === 0) {
                                                array_push($attrs_to_remove, $attr);
                                        }
@@ -2152,7 +2094,7 @@
                $sth = $pdo->prepare("SELECT access_key FROM ttrss_access_keys
                                WHERE feed_id = ? AND is_cat = ?
                                AND owner_uid = ?");
-               $sth->execute([$feed_id, (int)$is_cat, $owner_uid]);
+               $sth->execute([$feed_id, $is_cat, $owner_uid]);
 
                if ($row = $sth->fetch()) {
                        return $row["access_key"];
@@ -2163,7 +2105,7 @@
                                        (access_key, feed_id, is_cat, owner_uid)
                                        VALUES (?, ?, ?, ?)");
 
-                       $sth->execute([$key, $feed_id, (int)$is_cat, $owner_uid]);
+                       $sth->execute([$key, $feed_id, $is_cat, $owner_uid]);
 
                        return $key;
                }