pari: branch asterisknow r366 - in /branches/asterisknow: ./ config/scripts/

[asterisk-gui-commits at lists.digium.com]

Author: pari
Date: Mon Feb 19 12:49:50 2007
New Revision: 366

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

........
r365 | pari | 2007-02-19 12:47:40 -0600 (Mon, 19 Feb 2007) | 1 line

if contactinfo.conf or zapscan.conf are not found .. create those files without throwing an error at the user 
........

Modified:
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/scripts/astman.js

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb 19 12:49:50 2007
@@ -1,1 +1,1 @@
-/trunk:1-362
+/trunk:1-365

Modified: branches/asterisknow/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/scripts/astman.js?view=diff&rev=366&r1=365&r2=366
==============================================================================
--- branches/asterisknow/config/scripts/astman.js (original)
+++ branches/asterisknow/config/scripts/astman.js Mon Feb 19 12:49:50 2007
@@ -1551,16 +1551,15 @@
 			widgets['status'].innerHTML = "";
 	};
 	this.doConfig = function(t, box) {
-		if(t[0].headers['message']){
-			if( box.config_file == "zapscan.conf" ){
-				//alert( "Note: Unable to find /etc/asterisk/zapscan.conf\nPlease run Zapscan manually ! \n\n Click 'OK' to try loading the rest of the page." );
-				parent.astmanEngine.run_tool("/bin/touch /etc/asterisk/zapscan.conf",	function(){	  window.location.href = window.location.href ; } );
-				return ;
-			} else if( t[0].headers['message'] == "Config file not found" && box.config_file != "zapscan.conf"){
-				alert( "Asterisk says it cannot find a required config file (" + box.config_file + ") \n You will be now redirected to the main page !" );
-				parent.window.location.href = parent.window.location.href ;
-				return ;
-			}
+		if( t[0].headers['message'] && t[0].headers['message'] == "Config file not found" ){
+					if( box.config_file == "zapscan.conf" || box.config_file == "contactinfo.conf" ){
+						parent.astmanEngine.run_tool("/bin/touch /etc/asterisk/"+box.config_file,	function(){	  window.location.href = window.location.href ; } );
+						return ;
+					} else {
+						alert( "Asterisk says it cannot find a required config file (" + box.config_file + ") \n You will be now redirected to the main page !" );
+						parent.window.location.href = parent.window.location.href ;
+						return ;
+					}
 		}
 		var x,y=0;
 		var cfg = new Object;