batch feed editor: more work

localized_js.php

@@ -141,8 +141,8 @@ print T_js_decl("Rescoring articles...");
 print T_js_decl("Reset category order?");
 print T_js_decl("Category reordering enabled");
 print T_js_decl("Category reordering disabled");
-#print T_js_decl(
+print T_js_decl("Save changes to selected feeds?");
-#print T_js_decl(
+print T_js_decl("Saving feeds...");
 #print T_js_decl(
 #print T_js_decl(
 #print T_js_decl(

modules/pref-feeds.php

@@ -387,12 +387,10 @@
 
 			$feed_ids = db_escape_string($_REQUEST["ids"]);
 
-			print "<div id=\"infoBoxTitle\">".__('Batch Feed Editor')."</div>";
+			print "<div id=\"infoBoxTitle\">".__('Multiple Feed Editor')."</div>";
 
 			print "<div class=\"infoBoxContents\">";
 
-			print "[$feed_ids]<br/>";
-
 			print "<form id=\"batch_edit_feed_form\" onsubmit=\"return false\">";	
 
 			print "<input type=\"hidden\" name=\"ids\" value=\"$feed_ids\">";
@@ -536,13 +534,14 @@
 			return;
 		}
 
-		if ($subop == "editSave") {
+		if ($subop == "editSave" || $subop == "batchEditSave") {
 
 			$feed_title = db_escape_string(trim($_POST["title"]));
 			$feed_link = db_escape_string(trim($_POST["feed_url"]));
 			$upd_intl = db_escape_string($_POST["update_interval"]);
 			$purge_intl = db_escape_string($_POST["purge_interval"]);
-			$feed_id = db_escape_string($_POST["id"]);
+			$feed_id = db_escape_string($_POST["id"]); /* editSave */
+			$feed_ids = db_escape_string($_POST["ids"]); /* batchEditSave */
 			$cat_id = db_escape_string($_POST["cat_id"]);
 			$auth_login = db_escape_string(trim($_POST["auth_login"]));
 			$auth_pass = db_escape_string(trim($_POST["auth_pass"]));
@@ -581,27 +580,101 @@
 				$cache_images_qpart = "";
 			}
 
-			$result = db_query($link, "UPDATE ttrss_feeds SET 
+			if ($subop == "editSave") {
-				$category_qpart $parent_qpart,
+
-				title = '$feed_title', feed_url = '$feed_link',
+				$result = db_query($link, "UPDATE ttrss_feeds SET 
-				update_interval = '$upd_intl',
+					$category_qpart $parent_qpart,
-				purge_interval = '$purge_intl',
+					title = '$feed_title', feed_url = '$feed_link',
-				auth_login = '$auth_login',
+					update_interval = '$upd_intl',
-				auth_pass = '$auth_pass',
+					purge_interval = '$purge_intl',
-				private = $private,
+					auth_login = '$auth_login',
-				rtl_content = $rtl_content,
+					auth_pass = '$auth_pass',
-				hidden = $hidden,
+					private = $private,
-				$cache_images_qpart
+					rtl_content = $rtl_content,
-				include_in_digest = $include_in_digest,
+					hidden = $hidden,
-				update_method = '$update_method'
+					$cache_images_qpart
-				WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
+					include_in_digest = $include_in_digest,
+					update_method = '$update_method'
+					WHERE $where_qpart AND owner_uid = " . $_SESSION["uid"]);
 
-			if (get_pref($link, 'ENABLE_FEED_CATS')) {
+				if (get_pref($link, 'ENABLE_FEED_CATS')) {
-				# update linked feed categories
+					# update linked feed categories
-				$result = db_query($link, "UPDATE ttrss_feeds SET
+					$result = db_query($link, "UPDATE ttrss_feeds SET
-					$category_qpart_nocomma WHERE parent_feed = '$feed_id' AND
+						$category_qpart_nocomma WHERE parent_feed = '$feed_id' AND
-					owner_uid = " . $_SESSION["uid"]);
+						owner_uid = " . $_SESSION["uid"]);
+				}
+			} else if ($subop == "batchEditSave") {
+				$feed_data = array();
+
+				foreach (array_keys($_POST) as $k) {
+					if ($k != "op" && $k != "subop" && $k != "ids") {
+						$feed_data[$k] = $_POST[$k];
+					}
+				}
+
+				db_query($link, "BEGIN");
+
+				foreach (array_keys($feed_data) as $k) {
+
+					$qpart = "";
+
+					switch ($k) {
+						case "title":							
+							$qpart = "title = '$feed_title'";
+							break;
+
+						case "feed_url":
+							$qpart = "feed_url = '$feed_link'";
+							break;
+
+						case "update_interval":
+							$qpart = "update_interval = '$upd_intl'";
+							break;
+
+						case "purge_interval":
+							$qpart = "purge_interval = '$purge_intl'";
+							break;
+
+						case "auth_login":
+							$qpart = "auth_login = '$auth_login'";
+							break;
+
+						case "auth_pass":
+							$qpart = "auth_pass = '$auth_pass'";
+							break;
+
+						case "private":
+							$qpart = "private = '$private'";
+							break;
+
+						case "hidden":
+							$qpart = "hidden = '$hidden'";
+							break;
+
+						case "include_in_digest":
+							$qpart = "include_in_digest = '$include_in_digest'";
+							break;
+
+						case "update_method":
+							$qpart = "update_method = '$update_method'";
+							break;
+
+						case "cat_id":
+							$qpart = $category_qpart_nocomma;
+							break;
+
+					}
+
+					if ($qpart) {
+						print(
+							"UPDATE ttrss_feeds SET $qpart WHERE id IN ($feed_ids)
+								AND owner_uid = " . $_SESSION["uid"]);
+					}
+				}
+
+				db_query($link, "COMMIT");
 			}
+
 		}
 
 		if ($subop == "remove") {

prefs.js

@@ -2250,9 +2250,21 @@ function feedsEditSave() {
 			return
 		}
 
-		var query = Form.serialize("batch_edit_feed_form");
+		var ok = confirm(__("Save changes to selected feeds?"));
 
-		alert(query);
+		if (ok) {
+
+			var query = Form.serialize("batch_edit_feed_form");
+	
+			closeInfoBox();
+	
+			notify_progress("Saving feeds...");
+	
+			xmlhttp.open("POST", "backend.php", true);
+			xmlhttp.onreadystatechange=feedlist_callback;
+			xmlhttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+			xmlhttp.send(query);
+		}
 
 		return false;
 	} catch (e) {