Added step to get form_token.

gallery · Nov 21, 2007 · 24582de · 24582de
1 parent 087bf7c
commit 24582de
Showing 1 changed file with 47 additions and 35 deletions.
diff --git a/com/gallery/GalleryRemote/util/PostChangeLog.java b/com/gallery/GalleryRemote/util/PostChangeLog.java
@@ -107,22 +107,12 @@ public void execute() throws BuildException {
 			System.out.println("Got changes: " + changes);
 
 			NVPair form_data_login[] = {
-				new NVPair("edit[name]", changeProps.getProperty("username")),
-				new NVPair("edit[pass]", changeProps.getProperty("password")),
-				new NVPair("edit[form_id]", "user_login"),
+				new NVPair("name", changeProps.getProperty("username")),
+				new NVPair("pass", changeProps.getProperty("password")),
+				new NVPair("form_id", "user_login"),
 				new NVPair("op", "Log in"),
 			};
 
-			NVPair form_data[] = {
-				new NVPair("edit[url]", "galleryremote/beta"),
-				new NVPair("edit[note]", note.toString()),
-				new NVPair("edit[form_id]", "gmc_versioncheck_form"),
-				new NVPair("op", "Update")
-			};
-
-			// update Menalto
-			System.out.println("Uploading to Menalto: " + form_data);
-
 			// set cookie handling
 			CookieModule.setCookiePolicyHandler(new CookiePolicyHandler() {
 				public boolean acceptCookie(Cookie cookie, RoRequest req, RoResponse resp) {
@@ -145,29 +135,51 @@ public boolean sendCookie(Cookie cookie, RoRequest req) {
 			response = new String(rsp.getData()).trim();
 			System.out.println("Login response: " + response);
 
-			// upload
-			rsp = mConnection.Post("/admin/gmc_versioncheck/save/5", form_data);
-			response = new String(rsp.getData()).trim();
-			System.out.println("Upload response: " + response);
-
-			// activate
-			//rsp = mConnection.Get("/admin/galleryremote/current/beta/1");
-			//response = new String(rsp.getData()).trim();
-			//System.out.println("Activate response: " + response);
-
-			// test
-			HTTPConnection mConnection1 = new HTTPConnection("gallery.sourceforge.net");
-			rsp = mConnection1.Get("/gallery_remote_version_check_beta.php");
+			// get form
+			rsp = mConnection.Get("/admin/gmc_versioncheck/save/5");
 			response = new String(rsp.getData()).trim();
-			System.out.println("Test response: " + response);
-
-			if (response.startsWith("version=" + currentBuildS)) {
-				// worked
-				System.out.println("Success: writing to postlogchange properties");
-				changeProps.setIntProperty("siteBetaBuild", currentBetaBuild);
-				changeProps.write();
-			} else {
-				System.out.println("Failed to update Menalto");
+			System.out.println("Get form response: " + response);
+
+			Pattern p = Pattern.compile("^<input type=\"hidden\" name=\"form_token\".*value=\"(.*)\".*$", 
+					Pattern.MULTILINE);
+			m = p.matcher(response);
+
+			if (m.matches()) {
+				String formToken = m.group(1);
+
+				NVPair form_data_submit[] = {
+					new NVPair("url", "galleryremote/beta"),
+					new NVPair("note", note.toString()),
+					new NVPair("id", "5"),
+					new NVPair("form_token", formToken),
+					new NVPair("form_id", "gmc_versioncheck_form"),
+					new NVPair("op", "Update")
+				};
+
+				// login
+				rsp = mConnection.Post("/admin/gmc_versioncheck/save/5", form_data_submit);
+				response = new String(rsp.getData()).trim();
+				System.out.println("Submit response: " + response);
+
+				// activate
+				//rsp = mConnection.Get("/admin/galleryremote/current/beta/1");
+				//response = new String(rsp.getData()).trim();
+				//System.out.println("Activate response: " + response);
+
+				// test
+				HTTPConnection mConnection1 = new HTTPConnection("gallery.sourceforge.net");
+				rsp = mConnection1.Get("/gallery_remote_version_check_beta.php");
+				response = new String(rsp.getData()).trim();
+				System.out.println("Test response: " + response);
+
+				if (response.startsWith("version=" + currentBuildS)) {
+					// worked
+					System.out.println("Success: writing to postlogchange properties");
+					changeProps.setIntProperty("siteBetaBuild", currentBetaBuild);
+					changeProps.write();
+				} else {
+					System.out.println("Failed to update Menalto");
+				}
 			}
 		} catch (FileNotFoundException e) {
 			e.printStackTrace();