From be080893a09bf4583419fa52073afa7bcd2002cd Mon Sep 17 00:00:00 2001
From: horse69 <horse69@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Tue, 4 Sep 2012 22:27:52 +0000
Subject: [PATCH] Error with update reception button. Changed dynamic to static
 html

git-svn-id: https://svn.code.sf.net/p/freetel/code@661 01035d8c-6547-0410-b346-abe4f91aad63
---
 mini-asterisk-gui2/cgi-bin/setring.cgi |  4 +--
 mini-asterisk-gui2/minicommon.js       | 48 ++++++++++++++++++++++++++
 mini-asterisk-gui2/phones.html         |  2 +-
 mini-asterisk-gui2/phones.js           | 35 ++++++++++++++-----
 4 files changed, 78 insertions(+), 11 deletions(-)

diff --git a/mini-asterisk-gui2/cgi-bin/setring.cgi b/mini-asterisk-gui2/cgi-bin/setring.cgi
index 6b7d43f0..aa22a796 100755
--- a/mini-asterisk-gui2/cgi-bin/setring.cgi
+++ b/mini-asterisk-gui2/cgi-bin/setring.cgi
@@ -23,7 +23,7 @@ EOF
 
 echo "Input $QUERY_STRING"
 
-a=`echo "$QUERY_STRING" | sed -n 's,_,/,pg'`
+a=`echo "$QUERY_STRING" | sed -n "s/=on*//pg" | sed -n 's,_,/,pg'`
 
 # escape & if present
 echo "$a" | grep "&" >> /dev/null
@@ -32,8 +32,8 @@ if [ $? -eq 0 ]; then
 fi
 
 echo "Mods $a"
-#sed -i "s_s,1,Dial(.*) ;; mini-asterisk_s,1,Dial($a) ;; mini-asterisk_" /etc/asterisk/extensions.conf
 sed -i "s_s,1,Dial(.*) ;; mini-asterisk_s,1,Dial($a) ;; mini-asterisk_" /etc/asterisk/extensions.conf
+#sed -i "s_s,1,Dial(.*) ;; mini-asterisk_s,1,Dial($a) ;; mini-asterisk_" /etc/asterisk/extensions.conf
 
 #reload extensions.conf
 
diff --git a/mini-asterisk-gui2/minicommon.js b/mini-asterisk-gui2/minicommon.js
index 935f820a..fef0d5da 100644
--- a/mini-asterisk-gui2/minicommon.js
+++ b/mini-asterisk-gui2/minicommon.js
@@ -233,6 +233,15 @@ function OnRestartReturn(doc,status) {
       initialisePage();
 }
 
+function GenericReturn(doc,status) {
+    loadHtmlTextFile(doc, function(line) {
+	    //parseSipShowPeers(line);
+	}
+	);
+
+      initialisePage();
+}
+
 function OnUpgradeReturn(doc,status) {
     loadHtmlTextFile(doc, function(line) {
 	    //parseSipShowPeers(line);
@@ -362,4 +371,43 @@ function downloadUrl(url, callback) {
 
 }
 
+/**
+ * This functions wraps XMLHttpRequest open/send function.
+ * It lets you specify a URL and will call the callback if
+ * it gets a status code of 200.
+ * @param {String} url The URL to retrieve
+ * @param {Function} callback The function to call once retrieved.
+ */
+function downloadUrl2(url, callback) {
+    var status = -1;
+    var request = createXmlHttpRequest();
+    if (!request) {
+	return false;
+    }
+
+/*    request.onreadystatechange = function() {
+	if (request.readyState == 4) {
+	    try {
+		status = request.status;
+	    } catch (e) {
+		// Usually indicates request timed out in FF.
+	    }
+	    if (status == 200) {
+		callback(request.responseText, request.status);
+		request.onreadystatechange = function() {};
+	    }
+	}
+    }
+ */
+
+   request.open('GET', url, true);
+    try {
+	request.send(null);
+    } catch (e) {
+	changeStatus(e);
+    }
+
+}
+
+
 
diff --git a/mini-asterisk-gui2/phones.html b/mini-asterisk-gui2/phones.html
index a299aa01..03347709 100644
--- a/mini-asterisk-gui2/phones.html
+++ b/mini-asterisk-gui2/phones.html
@@ -22,8 +22,8 @@
   <tr>
     <td><div id="menu"></div></td>
     <td><div id="phones_table"></div></td>
+    <td><input type="button" style="width:100%" value="update reception" onClick="onClickUpdateReception()"></td>
   </tr>
-
   </table>
 </body>
 </html>
diff --git a/mini-asterisk-gui2/phones.js b/mini-asterisk-gui2/phones.js
index c8404bec..cad21f9a 100644
--- a/mini-asterisk-gui2/phones.js
+++ b/mini-asterisk-gui2/phones.js
@@ -66,7 +66,7 @@ function initialisePage() {
 
             html += "</td>";
 	
-	    html += "<td>(Reception)</td>";
+//	    html += "<td>(Reception)</td>";
             html += "<td>" + '<img src="tick.png" />' + "</td>";
             html += "</tr>";
 	}
@@ -110,15 +110,16 @@ function initialisePage() {
     }
 
     // print out submit button
-
+	//doesn't work ... Only use static html buttons
 
     html += "<tr>";
     html += "<td>";
     html += "<a href=ipphones.html    /a>Add IP Phone";
     html += "</td>";
-    html += "<td>";
-    html += "<input type='submit' value='Update Reception' onClick='onClickApply(event)'/>";
+/*    html += "<td>";
+    html += "<input type='submit' value='Update Reception' onClick='onUpdateReception()'/>";
     html += "</td>";
+*/
     html += "</tr>";
 
 
@@ -158,6 +159,10 @@ function initialisePage() {
 
     downloadUrl("/cgi-bin/ifconfig.cgi?arg=eth0", processIfconfig);
 //    downloadUrl("/cgi-bin/ifconfig.cgi?arg=eth1", processIfconfig);
+
+	// downloadUrl works fine here.
+//    downloadUrl("/cgi-bin/setring.cgi?Zap_3=on", null);
+
 }
 
 
@@ -176,11 +181,11 @@ function processIfconfig(doc, status) {
     document.getElementById('ipaddress').innerHTML = ip;
 }
 
-function onClickApply(e) {
+function onClickUpdateReception() {
 
 	// get the arguments from the form  selected[]
 	///document.myform.elements['fav[]'].checked
-	var arg ='';
+	var arg ="";
 
 
 	//	number of check boxes in the form
@@ -199,11 +204,25 @@ function onClickApply(e) {
 				arg = arg+"&";
 
 			// got to make up new codes
-			arg = arg + recept_code[i];
+			arg = arg + recept_code[i] + "=on";
 		}
 
 	}
+        var arg2 =  "/cgi-bin/setring.cgi?" + arg;
+	downloadUrl(arg2,null);
+
 
-	downloadUrl("/cgi-bin/setring.cgi?"+arg,null);
+/*	
 
+	// ok looks like static buttons work but my dynamic button line 112 doesnt.
+
+    var ret = downloadUrl("/cgi-bin/setring.cgi?Zap_3=on", GenericReturn);
+    if (ret == false) {
+	throw new Error("XMLHttpRequest not supported");
+	}
+*/
 }
+
+
+
+
-- 
2.25.1