js: misc fixes, code cleanup

[tt-rss.git] / modules / pref-labels.php

diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index 3362288017d1ed1cb3b959816fa4ac9f6a4528a6..ac25d01e186aa1828d96c16aa1c85cf8ea29e50a 100644 (file)
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -1,7 +1,7 @@
 <?php
        function module_pref_labels($link) {
 
-               $subop = $_GET["subop"];
+               $subop = $_REQUEST["subop"];
 
                if ($subop == "color-set") {
                        $kind = db_escape_string($_REQUEST["kind"]);
@@ -21,6 +21,14 @@
                                                fg_color = '$fg', bg_color = '$bg' WHERE id = '$id'
                                                AND owner_uid = " . $_SESSION["uid"]);                  
                                }
+
+                               $caption = db_escape_string(label_find_caption($link, $id, $_SESSION["uid"]));
+
+                               /* Remove cached data */
+
+                               db_query($link, "UPDATE ttrss_user_entries SET label_cache = ''
+                                       WHERE label_cache LIKE '%$caption%' AND owner_uid = " . $_SESSION["uid"]);
+
                        }
 
                        return;
@@ -33,6 +41,13 @@
                                db_query($link, "UPDATE ttrss_labels2 SET
                                        fg_color = '', bg_color = '' WHERE id = '$id'
                                        AND owner_uid = " . $_SESSION["uid"]);                  
+
+                               $caption = db_escape_string(label_find_caption($link, $id, $_SESSION["uid"]));
+
+                               /* Remove cached data */
+
+                               db_query($link, "UPDATE ttrss_user_entries SET label_cache = ''
+                                       WHERE label_cache LIKE '%$caption%' AND owner_uid = " . $_SESSION["uid"]);
                        }
 
                }
@@ -61,6 +76,8 @@
 
                                                /* Update filters that reference label being renamed */
 
+                                               $old_caption = db_escape_string($old_caption);
+
                                                db_query($link, "UPDATE ttrss_filters SET
                                                        action_param = '$caption' WHERE action_param = '$old_caption'
                                                        AND action_id = 7
@@ -82,7 +99,7 @@
 
                if ($subop == "remove") {
 
-                       $ids = split(",", db_escape_string($_GET["ids"]));
+                       $ids = split(",", db_escape_string($_REQUEST["ids"]));
 
                        foreach ($ids as $id) {
                                label_remove($link, $id, $_SESSION["uid"]);
@@ -91,15 +108,27 @@
                }
 
                if ($subop == "add") {
-
-                       $caption = db_escape_string($_GET["caption"]);
+                       $caption = db_escape_string($_REQUEST["caption"]);
+                       $output = db_escape_string($_REQUEST["output"]);
 
                        if ($caption) {
 
                                if (label_create($link, $caption)) {
-                                       print T_sprintf("Created label <b>%s</b>", htmlspecialchars($caption));
+                                       if (!$output) {
+                                               print T_sprintf("Created label <b>%s</b>", htmlspecialchars($caption));
+                                       }
                                }
 
+                               if ($output == "select") {
+                                       header("Content-Type: text/xml");
+
+                                       print "<rpc-reply><payload>";
+
+                                       print_label_select($link, "select_label", 
+                                               $caption, "");
+
+                                       print "</payload></rpc-reply>";
+                               }
                        }
 
                        return;
@@ -107,35 +136,41 @@
 
                set_pref($link, "_PREFS_ACTIVE_TAB", "labelConfig");
 
-               $sort = db_escape_string($_GET["sort"]);
+               $sort = db_escape_string($_REQUEST["sort"]);
 
                if (!$sort || $sort == "undefined") {
                        $sort = "caption";
                }
 
-               $label_search = db_escape_string($_GET["search"]);
+               $label_search = db_escape_string($_REQUEST["search"]);
 
-               if (array_key_exists("search", $_GET)) {
+               if (array_key_exists("search", $_REQUEST)) {
                        $_SESSION["prefs_label_search"] = $label_search;
                } else {
                        $label_search = $_SESSION["prefs_label_search"];
                }
 
-               print "<div class=\"feedEditSearch\">
+               print "<div style='float : right'>
                        <input id=\"label_search\" size=\"20\" type=\"search\"
                                onfocus=\"javascript:disableHotkeys();\" 
                                onblur=\"javascript:enableHotkeys();\"
                                onchange=\"javascript:updateLabelList()\" value=\"$label_search\">
-                       <input type=\"submit\" class=\"button\" 
-                               onclick=\"javascript:updateLabelList()\" value=\"".__('Search')."\">
+                       <button onclick=\"javascript:updateLabelList()\">".__('Search')."</button>
                        </div>";
 
                print "<div class=\"prefGenericAddBox\">";
 
-               print"<input type=\"submit\" class=\"button\" 
-                       id=\"label_create_btn\"
-                       onclick=\"return addLabel()\" 
-                       value=\"".__('Create label')."\"></div>";
+               print"<button onclick=\"return addLabel()\">".
+                       __('Create label')."</button> ";
+
+               print "<button onclick=\"javascript:removeSelectedLabels()\">".
+                       __('Remove')."</button> ";
+
+               print "<button onclick=\"labelColorReset()\">".
+                       __('Clear colors')."</button>";
+
+
+               print "</div>";
 
                if ($label_search) {
 
@@ -164,8 +199,6 @@
                                owner_uid = ".$_SESSION["uid"]."
                        ORDER BY $sort");
 
-//             print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
-
                if (db_num_rows($result) != 0) {
 
                        print "<p><table width=\"100%\" cellspacing=\"0\" 
@@ -173,16 +206,10 @@
 
                        print "<tr><td class=\"selectPrompt\" colspan=\"8\">
                                ".__('Select:')." 
-                                       <a href=\"javascript:selectPrefRows('label', true)\">".__('All')."</a>,
-                                       <a href=\"javascript:selectPrefRows('label', false)\">".__('None')."</a>
+                                       <a href=\"#\" onclick=\"selectTableRows('prefLabelList', 'all')\">".__('All')."</a>,
+                                       <a href=\"#\" onclick=\"selectTableRows('prefLabelList', 'none')\">".__('None')."</a>
                                </td</tr>";
 
-/*                     print "<tr class=\"title\">
-                                               <td width=\"5%\">&nbsp;</td>
-                                               <td width=\"95%\"><a href=\"javascript:updateLabelList('caption')\">".__('Caption')."</a></td>
-                                               </td>
-                                               </tr>"; */
-                       
                        $lnum = 0;
                        
                        while ($line = db_fetch_assoc($result)) {
@@ -203,7 +230,7 @@
                                if (!$bg_color) $bg_color = "";
 
                                print "<td width='5%' align='center'><input 
-                                       onclick='toggleSelectPrefRow(this, \"label\");' 
+                                       onclick='toggleSelectRow(this);' 
                                        type=\"checkbox\" id=\"LICHK-".$line["id"]."\"></td>";
        
                                $id = $line['id'];
@@ -231,20 +258,6 @@
 
                        print "</table>";
        
-                       print "<p id=\"labelOpToolbar\">";
-
-                       print "<input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"javascript:removeSelectedLabels()\" value=\"".__('Remove')."\">";
-
-                       print "&nbsp;";
-/*                     print "&nbsp;<input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"labelColorSet('fg')\" value=\"".__('Fg')."\">&nbsp;";
-                       print "<input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"labelColorSet('bg')\" value=\"".__('Bg')."\">&nbsp;"; */
-                       print "<input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"labelColorReset()\" value=\"".__('Clear colors')."\">";
-
-                       print "</p>";
 
                } else {
                        print "<p>";