bkruse: trunk r1433 - in /trunk: ./ config/setup/install.html

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Thu Aug 23 13:33:58 2007
New Revision: 1433

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1433
Log:
Merged revisions 1432 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/branches/1.4

........
r1432 | bkruse | 2007-08-23 13:33:30 -0500 (Thu, 23 Aug 2007) | 4 lines

Greenbox and Weasel00 brought to my attention that the permissions
commit did not work, as .search always returned true, of course.
closes 10517

........

Modified:
    trunk/   (props changed)
    trunk/config/setup/install.html

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Aug 23 13:33:58 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1291,1293,1298-1300,1326,1332,1336-1338,1342,1346,1349,1356,1359,1362,1381,1384,1395,1399,1402,1413,1416,1426
+/branches/1.4:1-1291,1293,1298-1300,1326,1332,1336-1338,1342,1346,1349,1356,1359,1362,1381,1384,1395,1399,1402,1413,1416,1426,1432

Modified: trunk/config/setup/install.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/install.html?view=diff&rev=1433&r1=1432&r2=1433
==============================================================================
--- trunk/config/setup/install.html (original)
+++ trunk/config/setup/install.html Thu Aug 23 13:33:58 2007
@@ -44,10 +44,18 @@
 
 /* Make sure the user has proper permissions */
 function check_auth() {
-	makerequest("", "", "action=command&command=http%20show%20status", function(t) { t = t.split("\n"); if(t[1].search("Message: Permission Denied")) { 
-	alert("Your Permissions are not setup Correctly\nPlease add the proper read/write permissions in manager.conf\nClick OK when the changes are made.\n\nExample User:\n\n[kruz]\nsecret = blah\npermit = 127.0.0.1/255.0.0.0\nread = system,call,log,verbose,command,agent,user,config\nwrite = system,call,log,verbose,command,agent,user,config"); log_red(); return false;} else { return true; }})
+	makerequest('g',"users.conf",'', function(t){
+	var response = t.split("\n");
+	if(response[1].match("Message: Permission denied")) {
+		alert("Your Permissions are not setup Correctly\nPlease add the proper read/write permissions in manager.conf\nClick OK when the changes are made.\n\nExample User:\n\n[kruz]\nsecret = blah\npermit = 127.0.0.1/255.0.0.0\nread = system,call,log,verbose,command,agent,user,config\nwrite = system,call,log,verbose,command,agent,user,config"); 
+		log_red(); 
+		return false;
+	} else { 
+		return true; 
+	}});
 
 }
+
 function pingevery(a){
 	keepPinging = setInterval( makeping, a*250 );
 }