Merge branch 'master' of git@github.com:tonyg/reversehttp

tonyg · Aug 3, 2009 · bc2ef91 · bc2ef91
2 parents f315651 + 041dbcc
commit bc2ef91
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 6 deletions.
diff --git a/priv/www/demolog.js b/priv/www/demolog.js
@@ -11,6 +11,10 @@ function log() {
     }
 }
 
+function clearLog() {
+    $("#logOutput").empty();
+}
+
 function formatErrorReports(errorReports) {
     var r = [];
     for (var i = 0; i < errorReports.length; i++) {

diff --git a/priv/www/endpoint.html b/priv/www/endpoint.html
@@ -15,6 +15,9 @@ <h1>PubSubHubBub Endpoint Demo</h1>
 	<p>
 	  This endpoint is available at URL <a id="endpointLocation" href="???">???</a>.
 	</p>
+	<p>
+	  <button onclick="clearLog()">Clear log</button>
+	</p>
 	<pre id="logOutput"></pre>
 	<script type="text/javascript">endpoint_main();</script>
       </div>

diff --git a/priv/www/httpd.js b/priv/www/httpd.js
@@ -66,15 +66,25 @@ Url.prototype.toString = function () {
 
 function parse_qs(qs) {
     var result = {};
+    var multiple = {};
     if (qs) {
 	var keyvals = qs.split('&');
 	for (var i = 0; i < keyvals.length; i++) {
 	    var eqPos = keyvals[i].indexOf('=');
 	    if (eqPos == -1) {
-		result[unescape(keyvals[i])] = true;
+		result[decodeURIComponent(keyvals[i])] = true;
 	    } else {
-		result[unescape(keyvals[i].substr(0, eqPos))] =
-		    unescape(keyvals[i].substr(eqPos + 1));
+		var key = decodeURIComponent(keyvals[i].substr(0, eqPos));
+		var v = decodeURIComponent(keyvals[i].substr(eqPos + 1));
+		if (typeof result[key] === 'undefined') {
+		    result[key] = v;
+		} else {
+		    if (!multiple[key]) {
+			result[key] = [result[key]];
+			multiple[key] = true;
+		    }
+		    result[key].push(v);
+		}
 	    }
 	}
     }
@@ -84,7 +94,14 @@ function parse_qs(qs) {
 function unparse_qs(params) {
     result = [];
     for (var key in params) {
-	result.push(escape(key) + "=" + escape(params[key]));
+	var v = params[key];
+	if (typeof v === 'object' && typeof v.length !== 'undefined') {
+	    for (var i = 0; i < v.length; i++) {
+		result.push(encodeURIComponent(key) + "=" + encodeURIComponent(v[i]));
+	    }
+	} else {
+	    result.push(encodeURIComponent(key) + "=" + encodeURIComponent(v));
+	}
     }
     return result.join("&");
 };

diff --git a/priv/www/messaging.js b/priv/www/messaging.js
@@ -228,7 +228,7 @@ Messaging.RemoteSource.prototype.subscribe =
 	Messaging.HubModeRequest(this.url, "POST", "subscribe",
 				 {"hub.callback": callbackUrl,
 				  "hub.topic": topic,
-				  "hub.verify": verifyModes.join(","),
+				  "hub.verify": verifyModes,
 				  "hub.verify_token": token},
 				 function (reply) { return k(reply && reply.isOk()); });
     };
@@ -238,7 +238,7 @@ Messaging.RemoteSource.prototype.unsubscribe =
 	Messaging.HubModeRequest(this.url, "POST", "unsubscribe",
 				 {"hub.callback": callbackUrl,
 				  "hub.topic": topic,
-				  "hub.verify": verifyModes.join(","),
+				  "hub.verify": verifyModes,
 				  "hub.verify_token": token},
 				 function (reply) { return k(reply && reply.isOk()); });
     };
diff --git a/priv/www/style.css b/priv/www/style.css
@@ -50,6 +50,7 @@ div#outerContainer {
 
 div#innerContainer {
     padding: 10px;
+    clear: both;
 }
 
 hr {
@@ -64,6 +65,7 @@ ul.mainNav {
 	margin: 0;
 	color: white;
 	background: #154050;
+	width: 100%;
 	border-bottom: 2px solid #6eaa52;
 	border-right: 2px solid #6eaa52;
 }