misc code cleanup, allow ctrl-key selection in prefs

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

diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index af343cacda8b895b7213d0a67de721d81d434d16..d7a300843dac804912bbb3e5a293f325734bada6 100644 (file)
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -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"]);
                        }
 
                }
@@ -93,15 +108,27 @@
                }
 
                if ($subop == "add") {
-
                        $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;
@@ -123,31 +150,24 @@
                        $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\" 
-                       onclick=\"return addLabel()\" 
-                       value=\"".__('Create label')."\"> ";
+               print"<button onclick=\"return addLabel()\">".
+                       __('Create label')."</button> ";
 
-                       print "<input type=\"submit\" class=\"button\"
-                               onclick=\"javascript:removeSelectedLabels()\" value=\"".__('Remove')."\">";
+               print "<button onclick=\"javascript:removeSelectedLabels()\">".
+                       __('Remove')."</button> ";
 
-                       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\"
-                               onclick=\"labelColorReset()\" value=\"".__('Clear colors')."\">";
+               print "<button onclick=\"labelColorReset()\">".
+                       __('Clear colors')."</button>";
 
 
                print "</div>";
@@ -188,8 +208,8 @@
 
                        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=\"selectPrefRows('label', true)\">".__('All')."</a>,
+                                       <a href=\"#\" onclick=\"selectPrefRows('label', false)\">".__('None')."</a>
                                </td</tr>";
 
 /*                     print "<tr class=\"title\">
@@ -218,7 +238,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'];