bkruse: trunk r1120 - in /trunk/config: scripts/astman.js setup/1.html

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Tue Jun 19 15:59:14 2007
New Revision: 1120

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1120
Log:
Rolling back to revision 1080 of astman and 1.html (in the setup folder). We will do optimizations later. Thanks pari

Modified:
    trunk/config/scripts/astman.js
    trunk/config/setup/1.html

Modified: trunk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/scripts/astman.js?view=diff&rev=1120&r1=1119&r2=1120
==============================================================================
--- trunk/config/scripts/astman.js (original)
+++ trunk/config/scripts/astman.js Tue Jun 19 15:59:14 2007
@@ -1092,7 +1092,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: trunk/config/setup/1.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/1.html?view=diff&rev=1120&r1=1119&r2=1120
==============================================================================
--- trunk/config/setup/1.html (original)
+++ trunk/config/setup/1.html Tue Jun 19 15:59:14 2007
@@ -100,64 +100,51 @@
 	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,Wait(1)' 	) + "&" + 
+	encodeURI(		'executecommand,n,Hangup()' 	) + "&" + 
 
 	"Action-000003=append&Cat-000003=" + asterisk_guitools + "&Var-000003=exten&Value-000003=" +
-	encodeURI(		'executecommand,n,Hangup()' 	) + "&" + 
+	encodeURI(		'record_vmenu,1,Answer' 	) + "&" + 
 
 	"Action-000004=append&Cat-000004=" + asterisk_guitools + "&Var-000004=exten&Value-000004=" +
-	encodeURI(		'record_vmenu,1,Answer' 	) + "&" + 
+	encodeURI(		'record_vmenu,n,Playback(vm-intro)' 	) + "&" + 
 
 	"Action-000005=append&Cat-000005=" + asterisk_guitools + "&Var-000005=exten&Value-000005=" +
-	encodeURI(		'record_vmenu,n,Playback(vm-intro)' 	) + "&" + 
+	encodeURI(		'record_vmenu,n,Record(${var1})' 	) + "&" + 
 
 	"Action-000006=append&Cat-000006=" + asterisk_guitools + "&Var-000006=exten&Value-000006=" +
-	encodeURI(		'record_vmenu,n,Record(${var1})' 	) + "&" + 
+	encodeURI(		'record_vmenu,n,Playback(vm-saved)' 	) + "&" + 
 
 	"Action-000007=append&Cat-000007=" + asterisk_guitools + "&Var-000007=exten&Value-000007=" +
-	encodeURI(		'record_vmenu,n,Playback(vm-saved)' 	) + "&" + 
+	encodeURI(		'record_vmenu,n,Playback(vm-goodbye)' 	) + "&" + 
 
 	"Action-000008=append&Cat-000008=" + asterisk_guitools + "&Var-000008=exten&Value-000008=" +
-	encodeURI(		'record_vmenu,n,Playback(vm-goodbye)' 	) + "&" + 
+	encodeURI(		'record_vmenu,n,Hangup' 	) + "&" + 
 
 	"Action-000009=append&Cat-000009=" + asterisk_guitools + "&Var-000009=exten&Value-000009=" +
-	encodeURI(		'record_vmenu,n,Hangup' 	) + "&" + 
-
-	"Action-0000010=append&Cat-0000010=" + asterisk_guitools + "&Var-000010=exten&Value-000010=" +
 	encodeURI(		'play_file,1,Answer' 	) + "&" + 
 
+	"Action-000010=append&Cat-000010=" + asterisk_guitools + "&Var-000010=exten&Value-000010=" +
+	encodeURI(		'play_file,n,Playback(${var1})' 	) + "&" + 
+
 	"Action-000011=append&Cat-000011=" + asterisk_guitools + "&Var-000011=exten&Value-000011=" +
-	encodeURI(		'play_file,n,Playback(${var1})' 	) + "&" + 
-
-	"Action-000012=append&Cat-000012=" + asterisk_guitools + "&Var-000012=exten&Value-000012=" +
 	encodeURI(		'play_file,n,Hangup' 	) + "&" + 
 
-	"Action-000013=append&Cat-000013=" + asterisk_guitools + "&Var-000013=hasbeensetup&Value-000013=" + 'Y';
+	"Action-000012=append&Cat-000012=" + asterisk_guitools + "&Var-000012=hasbeensetup&Value-000012=" + 'Y';
 
 	var tmp = new Ajax.Request(rawman_url, opt);
 }