properly handle on-the-fly adding of labels

functions.js

@@ -2250,18 +2250,47 @@ function labelSelectOnChange(elem) {
 				elem.selectedIndex = 0;
 
 			addLabel(elem, function(transport) {
-					var response = transport.responseXML;
 
-					var payload = response.getElementsByTagName("payload")[0];
+					try {
 
-					if (payload)
-						elem.innerHTML = payload.firstChild.nodeValue;
+						var response = transport.responseXML;
+						var select = response.getElementsByTagName("select")[0];
+						var options = select.getElementsByTagName("option");
+
+						dropbox_replace_options(elem, options);
+
+						notify('');
+					} catch (e) {
+						exception_error("addLabel", e);
+					}
 			});
 		}
 
 	} catch (e) {
-		exception_error("catSelectOnChange", e);
+		exception_error("labelSelectOnChange", e);
 	}
 }
 
+function dropbox_replace_options(elem, options) {
+
+	try {
+		while (elem.hasChildNodes())
+			elem.removeChild(elem.firstChild);
+
+		var sel_idx = -1;
+
+		for (var i = 0; i < options.length; i++) {
+			var text = options[i].firstChild.nodeValue;
+			var value = options[i].getAttribute("value");
+			var issel = options[i].getAttribute("selected") == "1";
+			elem.insert(new Option(text, value, issel));
+			if (issel) sel_idx = i;
+		}
 
+		// Chrome doesn't seem to just select stuff when you pass new Option(x, y, true)
+		if (sel_idx >= 0) elem.selectedIndex = sel_idx;
+
+	} catch (e) {
+		exception_error("dropbox_replace_options", e);
+	}
+}

functions.php

@@ -3020,7 +3020,7 @@
 
 		while ($line = db_fetch_assoc($result)) {
 			if ($line["id"] == $default_id) {
-				$is_selected = "selected";
+				$is_selected = "selected=\"1\"";
 			} else {
 				$is_selected = "";
 			}
@@ -3052,7 +3052,7 @@
 
 		while ($line = db_fetch_assoc($result)) {
 			if ($line["id"] == $default_id) {
-				$is_selected = "selected";
+				$is_selected = "selected=\"1\"";
 			} else {
 				$is_selected = "";
 			}

modules/pref-filters.php

@@ -523,14 +523,14 @@
 		$result = db_query($link, "SELECT caption FROM ttrss_labels2
 			WHERE owner_uid = '".$_SESSION["uid"]."' ORDER BY caption");
 
-		print "<select default=\"$value\" name=\"$name\" style=\"$style\" 
-			onchange=\"labelSelectOnChange(this)\" >";
+		print "<select default=\"$value\" name=\"" . htmlspecialchars($name) . 
+			"\" style=\"$style\" onchange=\"labelSelectOnChange(this)\" >";
 
 		while ($line = db_fetch_assoc($result)) {
 
-			$issel = ($line["caption"] == $value) ? "selected" : "";
+			$issel = ($line["caption"] == $value) ? "selected=\"1\"" : "";
 
-			print "<option $issel>" . $line["caption"] . "</option>";
+			print "<option $issel>" . htmlspecialchars($line["caption"]) . "</option>";
 
 		}
 

modules/pref-labels.php

@@ -107,12 +107,12 @@
 				if ($output == "select") {
 					header("Content-Type: text/xml");
 
-					print "<rpc-reply><payload><![CDATA[";
+					print "<rpc-reply><payload>";
 
 					print_label_select($link, "select_label", 
 						$caption, "");
 
-					print "]]></payload></rpc-reply>";
+					print "</payload></rpc-reply>";
 				}
 			}