pari: trunk r121 - in /trunk/config: ./ scripts/

asterisk-gui-commits at lists.digium.com asterisk-gui-commits at lists.digium.com
Thu Nov 9 14:57:28 MST 2006


Author: pari
Date: Thu Nov  9 15:57:27 2006
New Revision: 121

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=121
Log:
Part3: Installation - fixes

Modified:
    trunk/config/backup.html
    trunk/config/record.html
    trunk/config/scripts/astman.js
    trunk/config/setup.html
    trunk/config/sysinfo.html

Modified: trunk/config/backup.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/backup.html?view=diff&rev=121&r1=120&r2=121
==============================================================================
--- trunk/config/backup.html (original)
+++ trunk/config/backup.html Thu Nov  9 15:57:27 2006
@@ -66,7 +66,7 @@
 					alert("Config Error: " + t.status + ": " + t.statusText);
 				}
 		};
-		opt.parameters="action=originate&channel=" + encodeURIComponent("Local/takebackup@"+asterisk-guitools) + "&Variable=var1%3d"+ encodeURIComponent( bkp_path + $('newbkp_name').value +".tar" )+"&application=noop&timeout=60000";
+		opt.parameters="action=originate&channel=" + encodeURIComponent("Local/takebackup@"+asterisk_guitools) + "&Variable=var1%3d"+ encodeURIComponent( bkp_path + $('newbkp_name').value +".tar" )+"&application=noop&timeout=60000";
 		var tmp = new Ajax.Request("../../rawman", opt);
 }
 
@@ -110,7 +110,7 @@
 					alert("Config Error: " + t.status + ": " + t.statusText);
 				}
 			};
-			opt.parameters="action=originate&channel=" + encodeURIComponent("Local/removefile@" + asterisk-guitools) + "&Variable=var1%3d"+ encodeURIComponent( bkp_path + filename+".tar" )+"&application=noop&timeout=60000";
+			opt.parameters="action=originate&channel=" + encodeURIComponent("Local/removefile@" + asterisk_guitools) + "&Variable=var1%3d"+ encodeURIComponent( bkp_path + filename+".tar" )+"&application=noop&timeout=60000";
 			var tmp = new Ajax.Request("../../rawman", opt);
 	}
 	else{
@@ -191,4 +191,4 @@
 showdiv_statusmessage();
 //-->
 </SCRIPT>
-</body>
+</body>

Modified: trunk/config/record.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/record.html?view=diff&rev=121&r1=120&r2=121
==============================================================================
--- trunk/config/record.html (original)
+++ trunk/config/record.html Thu Nov  9 15:57:27 2006
@@ -42,7 +42,7 @@
 				alert("Config Error: " + t.status + ": " + t.statusText);
 			}
 		};
-		opt.parameters ="action=originate&channel=Local/"+extension + "&context="+asterisk-guitools+"&exten=play_file&priority=1&Variable=var1%3d"+ encodeURIComponent( filename );
+		opt.parameters ="action=originate&channel=Local/"+extension + "&context="+asterisk_guitools+"&exten=play_file&priority=1&Variable=var1%3d"+ encodeURIComponent( filename );
 		var tmp = new Ajax.Request("../../rawman", opt);
 }
 
@@ -82,7 +82,7 @@
 					alert("Config Error: " + t.status + ": " + t.statusText);
 				}
 			};
-			opt.parameters="action=originate&channel=" + encodeURIComponent("Local/removefile@"+asterisk-guitools) + "&Variable=var1%3d"+ encodeURIComponent("/var/lib/asterisk/sounds/" + filename )+"&application=noop&timeout=60000";
+			opt.parameters="action=originate&channel=" + encodeURIComponent("Local/removefile@"+asterisk_guitools) + "&Variable=var1%3d"+ encodeURIComponent("/var/lib/asterisk/sounds/" + filename )+"&application=noop&timeout=60000";
 			var tmp = new Ajax.Request("../../rawman", opt);
 	}
 	else{
@@ -139,7 +139,7 @@
 				alert("Config Error: " + t.status + ": " + t.statusText);
 			}
 		};
-		opt.parameters ="action=originate&channel=Local/"+newvmenu_ext + "&context="+asterisk-guitools+"&exten=record_vmenu&priority=1&Variable=var1%3d"+ encodeURIComponent( filename_torecord );
+		opt.parameters ="action=originate&channel=Local/"+newvmenu_ext + "&context="+asterisk_guitools+"&exten=record_vmenu&priority=1&Variable=var1%3d"+ encodeURIComponent( filename_torecord );
 
 		var tmp = new Ajax.Request("../../rawman", opt);
 }

Modified: trunk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/scripts/astman.js?view=diff&rev=121&r1=120&r2=121
==============================================================================
--- trunk/config/scripts/astman.js (original)
+++ trunk/config/scripts/astman.js Thu Nov  9 15:57:27 2006
@@ -20,7 +20,7 @@
  */
 
  var sc_displaytime = 1000;
- var asterisk-guitools = "asterisk-guitools";
+ var asterisk_guitools = "asterisk_guitools";
 
 function showdiv_statusmessage(){
 		document.write ("<div ID=\"status_message\"  STYLE=\"display:none; position: absolute; left: 170; top: 190; width:350; height:115;  background-color:#F4EFE5;   border-width: 1px; border-color: #7E5538; border-style: solid;\">");
@@ -936,7 +936,7 @@
 			}
 		};
 		var tmp;
-		opt.parameters="action=originate&channel=" + encodeURIComponent("Local/" + tool + "@"+asterisk-guitools ) + "&application=noop&timeout=60000";
+		opt.parameters="action=originate&channel=" + encodeURIComponent("Local/" + tool + "@"+asterisk_guitools ) + "&application=noop&timeout=60000";
 		tmp = new Ajax.Request(this.url, opt);
 	}
 
@@ -1742,4 +1742,4 @@
 }
 
 
-astmanEngine = new Astman();
+astmanEngine = new Astman();

Modified: trunk/config/setup.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup.html?view=diff&rev=121&r1=120&r2=121
==============================================================================
--- trunk/config/setup.html (original)
+++ trunk/config/setup.html Thu Nov  9 15:57:27 2006
@@ -21,7 +21,7 @@
 <script src="scripts/prototype.js"></script>
 <script>
 var cats = new Array();
-var asterisk-guitools = "asterisk-guitools";
+var asterisk_guitools = "asterisk_guitools";
 
 	function show_installed(){
 		alert("Installed");
@@ -35,60 +35,60 @@
 		};
 		opt.parameters="action=updateconfig&reload=yes&srcfilename=extensions.conf&dstfilename=extensions.conf&"  +
 
-		"Action-000000=newcat&Cat-000000=" + asterisk-guitools + "&Var-000000=&Value-000000=" + "&" + 
+		"Action-000000=newcat&Cat-000000=" + asterisk_guitools + "&Var-000000=&Value-000000=" + "&" + 
 		
-		"Action-000001=append&Cat-000001=" + asterisk-guitools + "&Var-000001=exten&Value-000001=" +
+		"Action-000001=append&Cat-000001=" + asterisk_guitools + "&Var-000001=exten&Value-000001=" +
 		encodeURI(		'save_config,1,System(/bin/save_config)' 	) + "&" + 
 
-		"Action-000002=append&Cat-000002=" + asterisk-guitools + "&Var-000002=exten&Value-000002=" +
+		"Action-000002=append&Cat-000002=" + asterisk_guitools + "&Var-000002=exten&Value-000002=" +
 		encodeURI(		'factory_default,1,System(/bin/reset_config)' 	) + "&" + 
 
-		"Action-000003=append&Cat-000003=" + asterisk-guitools + "&Var-000003=exten&Value-000003=" +
+		"Action-000003=append&Cat-000003=" + asterisk_guitools + "&Var-000003=exten&Value-000003=" +
 		encodeURI(		'reboot,1,System(/bin/reboot)' 	) + "&" + 
 
-		"Action-000004=append&Cat-000004=" + asterisk-guitools + "&Var-000004=exten&Value-000004=" +
+		"Action-000004=append&Cat-000004=" + asterisk_guitools + "&Var-000004=exten&Value-000004=" +
 		encodeURI(		'removefile,1,System(/bin/rm ${var1})' 	) + "&" + 
 
-		"Action-000005=append&Cat-000005=" + asterisk-guitools + "&Var-000005=exten&Value-000005=" +
+		"Action-000005=append&Cat-000005=" + asterisk_guitools + "&Var-000005=exten&Value-000005=" +
 		encodeURI(		'removefile,n,Hangup()' 	) + "&" + 
 
-		"Action-000006=append&Cat-000006=" + asterisk-guitools + "&Var-000006=exten&Value-000006=" +
+		"Action-000006=append&Cat-000006=" + asterisk_guitools + "&Var-000006=exten&Value-000006=" +
 		encodeURI(		'sysinfo,1,System(sh /etc/asterisk/gui_sysinfo)' 	) + "&" + 
 
-		"Action-000007=append&Cat-000007=" + asterisk-guitools + "&Var-000007=exten&Value-000007=" +
+		"Action-000007=append&Cat-000007=" + asterisk_guitools + "&Var-000007=exten&Value-000007=" +
 		encodeURI(		'sysinfo,n,Hangup()' 	) + "&" + 
 
-		"Action-000008=append&Cat-000008=" + asterisk-guitools + "&Var-000008=exten&Value-000008=" +
+		"Action-000008=append&Cat-000008=" + asterisk_guitools + "&Var-000008=exten&Value-000008=" +
 		encodeURI(		'takebackup,1,System(/bin/tar -cf ${var1} /etc/asterisk/)' 	) + "&" + 
 
-		"Action-000009=append&Cat-000009=" + asterisk-guitools + "&Var-000009=exten&Value-000009=" +
+		"Action-000009=append&Cat-000009=" + asterisk_guitools + "&Var-000009=exten&Value-000009=" +
 		encodeURI(		'takebackup,n,Hangup()' 	) + "&" + 
 
-		"Action-000010=append&Cat-000010=" + asterisk-guitools + "&Var-000010=exten&Value-000010=" +
+		"Action-000010=append&Cat-000010=" + asterisk_guitools + "&Var-000010=exten&Value-000010=" +
 		encodeURI(		'record_vmenu,1,Answer' 	) + "&" + 
 
-		"Action-000011=append&Cat-000011=" + asterisk-guitools + "&Var-000011=exten&Value-000011=" +
+		"Action-000011=append&Cat-000011=" + asterisk_guitools + "&Var-000011=exten&Value-000011=" +
 		encodeURI(		'record_vmenu,n,Playback(vm-intro)' 	) + "&" + 
 
-		"Action-000012=append&Cat-000012=" + asterisk-guitools + "&Var-000012=exten&Value-000012=" +
+		"Action-000012=append&Cat-000012=" + asterisk_guitools + "&Var-000012=exten&Value-000012=" +
 		encodeURI(		'record_vmenu,n,Record(${var1})' 	) + "&" + 
 
-		"Action-000013=append&Cat-000013=" + asterisk-guitools + "&Var-000013=exten&Value-000013=" +
+		"Action-000013=append&Cat-000013=" + asterisk_guitools + "&Var-000013=exten&Value-000013=" +
 		encodeURI(		'record_vmenu,n,Playback(vm-saved)' 	) + "&" + 
 
-		"Action-000014=append&Cat-000014=" + asterisk-guitools + "&Var-000014=exten&Value-000014=" +
+		"Action-000014=append&Cat-000014=" + asterisk_guitools + "&Var-000014=exten&Value-000014=" +
 		encodeURI(		'record_vmenu,n,Playback(vm-goodbye)' 	) + "&" + 
 
-		"Action-000015=append&Cat-000015=" + asterisk-guitools + "&Var-000015=exten&Value-000015=" +
+		"Action-000015=append&Cat-000015=" + asterisk_guitools + "&Var-000015=exten&Value-000015=" +
 		encodeURI(		'record_vmenu,n,Hangup' 	) + "&" + 
 
-		"Action-000016=append&Cat-000016=" + asterisk-guitools + "&Var-000016=exten&Value-000016=" +
+		"Action-000016=append&Cat-000016=" + asterisk_guitools + "&Var-000016=exten&Value-000016=" +
 		encodeURI(		'play_file,1,Answer' 	) + "&" + 
 
-		"Action-000017=append&Cat-000017=" + asterisk-guitools + "&Var-000017=exten&Value-000017=" +
+		"Action-000017=append&Cat-000017=" + asterisk_guitools + "&Var-000017=exten&Value-000017=" +
 		encodeURI(		'play_file,n,Playback(${var1})' 	) + "&" + 
 
-		"Action-000018=append&Cat-000018=" + asterisk-guitools + "&Var-000018=exten&Value-000018=" +
+		"Action-000018=append&Cat-000018=" + asterisk_guitools + "&Var-000018=exten&Value-000018=" +
 		encodeURI(		'play_file,n,Hangup'  )  ;
 
 		var tmp = new Ajax.Request("../../rawman", opt);
@@ -115,7 +115,7 @@
 		for( var i=0 ; i < lines.length ; i++){
 				if ( lines[i].substr(0,9) == "Category-"  ){
 					var tmp = lines[i].split(": ");
-					if( tmp[1].match(asterisk-guitools) ){
+					if( tmp[1].match(asterisk_guitools) ){
 						alert("Already Installed");
 						return false;
 					}
@@ -123,7 +123,7 @@
 				}
 		}
 		
-		// Install the [asterisk-guitools] section in extensions.conf
+		// Install the [asterisk_guitools] section in extensions.conf
 		installguitools();
 	}
 	
@@ -169,7 +169,7 @@
 <h2>Asterisk&trade; Configuration Engine</h2>
 <BR><BR>
 <center>
-	<span style="margin-left: 4px;font-weight:bold"> This would install a 'asterisk-guitools' context in your extensions.conf </span><BR>
+	<span style="margin-left: 4px;font-weight:bold"> This would install a 'asterisk_guitools' context in your extensions.conf </span><BR>
 	Please enter your username and password defined in manager.conf
 <center>
 <BR>
@@ -185,4 +185,4 @@
 			</td>
 	</tr>
 </table>
-</body>
+</body>

Modified: trunk/config/sysinfo.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/sysinfo.html?view=diff&rev=121&r1=120&r2=121
==============================================================================
--- trunk/config/sysinfo.html (original)
+++ trunk/config/sysinfo.html Thu Nov  9 15:57:27 2006
@@ -124,7 +124,7 @@
 				alert("Config Error: " + t.status + ": " + t.statusText);
 			}
 		};
-		opt.parameters="action=originate&channel=" + encodeURIComponent("Local/sysinfo@"+asterisk-guitools) + "&application=noop&timeout=60000";
+		opt.parameters="action=originate&channel=" + encodeURIComponent("Local/sysinfo@"+asterisk_guitools) + "&application=noop&timeout=60000";
 		var tmp = new Ajax.Request("../../rawman", opt);
 		return;
 }
@@ -200,4 +200,4 @@
 showdiv_statusmessage();
 //-->
 </SCRIPT>
-</body>
+</body>



More information about the asterisk-gui-commits mailing list