bkruse: branch aadk r1122 - in /branches/aadk: ./ config/scripts/ config/setup/

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Tue Jun 19 16:01:25 2007
New Revision: 1122

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1122
Log:
Merged revisions 1120 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/trunk

........
r1120 | bkruse | 2007-06-19 15:59:14 -0500 (Tue, 19 Jun 2007) | 1 line

Rolling back to revision 1080 of astman and 1.html (in the setup folder). We will do optimizations later. Thanks pari
........

Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/scripts/astman.js
    branches/aadk/config/setup/1.html

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 19 16:01:25 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-1081,1085,1090,1094,1097,1100,1103,1116
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-1081,1085,1090,1094,1097,1100,1103,1116,1120

Modified: branches/aadk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/scripts/astman.js?view=diff&rev=1122&r1=1121&r2=1122
==============================================================================
--- branches/aadk/config/scripts/astman.js (original)
+++ branches/aadk/config/scripts/astman.js Tue Jun 19 16:01:25 2007
@@ -1095,7 +1095,7 @@
 			}
 		};
 		var tmp;
-		opt.parameters="action=originate&channel=" + encodeURIComponent("Local/executecommand@"+asterisk_guitools ) + "&application=system&data="+ encodeURIComponent(tool) + "&timeout=60000";
+		opt.parameters="action=originate&channel=" + encodeURIComponent("Local/executecommand@"+asterisk_guitools ) + "&Variable=command%3d"+ encodeURIComponent(tool) + "&application=noop&timeout=60000";
 		tmp = new Ajax.Request(this.url, opt);
 	};
 

Modified: branches/aadk/config/setup/1.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/1.html?view=diff&rev=1122&r1=1121&r2=1122
==============================================================================
--- branches/aadk/config/setup/1.html (original)
+++ branches/aadk/config/setup/1.html Tue Jun 19 16:01:25 2007
@@ -100,29 +100,19 @@
 	installguitools();
 }
 
-function actionreload() {
-	var opt = {
-		method: 'get',
-		asynchornous: true,
+
+function installguitools(){
+	var opt = {
+		method: 'get',
+		asynchronous: true,
 		onComplete: scan_zapteldevices
 	};
-	opt.paramaters="action=command&command=dialplan%20reload";
-
-	var tmp = new Ajax.Request(rawman_url, opt);
-}
-
-function installguitools(){
-	var opt = {
-		method: 'get',
-		asynchronous: true,
-		onComplete: actionreload
-	};
-	opt.parameters="action=updateconfig&srcfilename=extensions.conf&dstfilename=extensions.conf&"  +
+	opt.parameters="action=updateconfig&reload=yes&srcfilename=extensions.conf&dstfilename=extensions.conf&"  +
 
 	"Action-000000=newcat&Cat-000000=" + asterisk_guitools + "&Var-000000=&Value-000000=" + "&" + 
 	
 	"Action-000001=append&Cat-000001=" + asterisk_guitools + "&Var-000001=exten&Value-000001=" +
-	encodeURI(		'executecommand,1,Answer()' 	) + "&" + 
+	encodeURI(		'executecommand,1,System(${command})' 	) + "&" + 
 
 	"Action-000002=append&Cat-000002=" + asterisk_guitools + "&Var-000002=exten&Value-000002=" +
 	encodeURI(		'executecommand,n,Hangup()' 	) + "&" +