savefeedorder, savefilterorder: do not use clean() on json payload

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

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 0b5a445f3f0ef8bf69c6ec16ab343b9ee7999e0a..245eea04a621d7596ffd425972e2d7093dd51d1d 100755 (executable)
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -389,7 +389,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);
@@ -742,7 +742,7 @@ class Pref_Feeds extends Handler_Protected {
                        <input type=\"hidden\" name=\"method\" value=\"uploadicon\">                    
                        <button class=\"\" dojoType=\"dijit.form.Button\" onclick=\"return uploadFeedIcon();\"
                                type=\"submit\">".__('Replace')."</button>
-                       <button class=\"danger\" dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\"
+                       <button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\"
                                type=\"submit\">".__('Remove')."</button>
                        </form>";
 
@@ -760,7 +760,7 @@ class Pref_Feeds extends Handler_Protected {
 
                        print "<div class='dlgButtons'>
                        <div style=\"float : left\">
-                       <button class=\"danger\" dojoType=\"dijit.form.Button\" onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
+                       <button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
                                __('Unsubscribe')."</button>";
 
                        print "</div>";
@@ -1467,7 +1467,7 @@ class Pref_Feeds extends Handler_Protected {
 
                print "<div class='dlgButtons'>";
                print "<div style='float : left'>";
-               print "<button class=\"danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
+               print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
                        .__('Unsubscribe from selected feeds')."</button> ";
                print "</div>";
 
@@ -1534,7 +1534,7 @@ class Pref_Feeds extends Handler_Protected {
 
                print "<div class='dlgButtons'>";
                print "<div style='float : left'>";
-               print "<button class=\"danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
+               print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
                        .__('Unsubscribe from selected feeds')."</button> ";
                print "</div>";
 
@@ -1554,6 +1554,14 @@ class Pref_Feeds extends Handler_Protected {
        }
 
        static function remove_feed($id, $owner_uid) {
+               $debug = isset($_REQUEST["debug"]);
+
+               foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) {
+                       if( ! $p->hook_unsubscribe_feed($id, $owner_uid)){
+                                       if($debug) _debug("Feed not removed due to Error in Plugin. (HOOK_UNSUBSCRIBE_FEED)");
+                                       return;
+                       }
+               }
 
                $pdo = Db::pdo();
 
@@ -1780,4 +1788,4 @@ class Pref_Feeds extends Handler_Protected {
                return $url_path;
        }
 
-}
\ No newline at end of file
+}