pari: trunk r1210 - /trunk/config/

[SVN commits to the Asterisk-GUI project]

Author: pari
Date: Tue Jul  3 17:24:10 2007
New Revision: 1210

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1210
Log:
[*] Added options to change httpport and httpbindaddr

[*] Removing unnecessary option - Room Override 

[*] Zap Channels are now shown along with their user names

[*] the provided field is for 'Attach format(attachfmt)' and not for 'Message Format(format)'



Modified:
    trunk/config/cfgbasic.html
    trunk/config/meetme.html
    trunk/config/ringgroups.html
    trunk/config/voicemail.html

Modified: trunk/config/cfgbasic.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/cfgbasic.html?view=diff&rev=1210&r1=1209&r2=1210
==============================================================================
--- trunk/config/cfgbasic.html (original)
+++ trunk/config/cfgbasic.html Tue Jul  3 17:24:10 2007
@@ -178,6 +178,7 @@
 	newpanel( ["Asterisk Logs", "syslog.html", "Asterisk Log messages."]);
 	newpanel( ["File Editor", "feditor.html", "Edit Asterisk Config Files"]);
 	newpanel( ["Asterisk CLI", "cli.html", "Asterisk Command Line Interface"]);
+	newpanel( ["GUI Access", "http_options.html", "GUI Access settings."]);
 	newpanel( ["Backup", "backup.html", "Backup Management."]);
 	newpanel( ["Options", "localexts.html", "Admin Settings"]);
 	return panels;

Modified: trunk/config/meetme.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/meetme.html?view=diff&rev=1210&r1=1209&r2=1210
==============================================================================
--- trunk/config/meetme.html (original)
+++ trunk/config/meetme.html Tue Jul  3 17:24:10 2007
@@ -65,8 +65,6 @@
 		flags += 'A';
 	if (subfields['quiet'] != 'no')
 		flags += 'q';
-	if (subfields['room'].length > 0)
-		room = subfields['room'];
 	return _$('name').value + ",1,MeetMe(" + room + "|" + flags + ")";
 }
 
@@ -145,7 +143,7 @@
 	tmp['music'] = 'yes';
 	tmp['menu'] = 'no';
 	tmp['announce'] = 'yes';
-	tmp['room'] = '';
+	tmp['room'] = '${EXTEN}';
 	tmp['>'] = true;
 	return new Array(specialcontext, 'exten', tmp);
 }
@@ -404,10 +402,9 @@
 			<td align=center  cellspacing='0' cellpadding='0' width=305 border=0>
 				<table cellspacing='2' cellpadding='1' width=200 border=0>
 				<tr>	<td class="field_text" tip="en,meetme,0">Extension:</td>
-					<td>&nbsp;<input size='5' id='name' pattern='^\d*$' class="input8"></td>
-				</tr>
-				<tr>	<td class="field_text" tip="en,meetme,7">Room Override:</td>
-					<td>&nbsp;<input size='5' id='room' pattern='^\d*$' class="input8"></td>
+					<td>&nbsp;<input size='5' id='name' pattern='^\d*$' class="input8">
+						<input id='room' type="hidden">
+					</td>
 				</tr>
 				<tr>	<td colspan='2' height=15></td>	</tr>
 				</table>

Modified: trunk/config/ringgroups.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/ringgroups.html?view=diff&rev=1210&r1=1209&r2=1210
==============================================================================
--- trunk/config/ringgroups.html (original)
+++ trunk/config/ringgroups.html Tue Jul  3 17:24:10 2007
@@ -320,7 +320,8 @@
 	//
 	// so we need to load users.conf and extensions.conf
 	//
-	config2json('users.conf', 1, get_users) ;
+	//config2json('users.conf', 1, get_users) ;
+	config2json('zapscan.conf', 1, read_zapchannels) ;
 
 	parent.loadscreen(this);
 }
@@ -345,6 +346,13 @@
 				LISTOFCHANNELS['IAX2/' + l] = {};
 				LISTOFCHANNELS['IAX2/' + l]['ChannelName'] = 'IAX2/' + l + " -- " + n[l]['fullname'];
 			}
+			if( n[l]['zapchan'] ){
+				var m = n[l]['zapchan'];
+				if( LISTOFCHANNELS[ 'Zap/' + m ] ){
+					LISTOFCHANNELS['Zap/'+m]['ChannelName'] = "Analog Phone -- " + n[l]['fullname'];
+				}
+			}
+
 			ASTGUI.selectbox.append(el, l + " -- " + n[l]['fullname'] , 'Voicemail(' + l + ',b)');
 		}
 	}}
@@ -395,7 +403,10 @@
 			ASTGUI.selectbox.append(el,get_menuname(n[l]), 'Goto('+ n[l] + '|s|1)' );
 		}
 	}}
-	config2json('zapscan.conf', 1, read_zapchannels) ;
+
+	clear_table();
+	showlist_of_rules();
+	//config2json('zapscan.conf', 1, read_zapchannels) ;
 }
 
 
@@ -403,12 +414,11 @@
 	for( var d in c ){
 		if ( c.hasOwnProperty(d) && c[d]['port'] && (c[d]['port'] == 'fxo' ) ) {
 			LISTOFCHANNELS['Zap/'+d] = {};
-			LISTOFCHANNELS['Zap/'+d]['ChannelName'] = 'Zap/' + d;
-		}
-	}
-
-	clear_table();
-	showlist_of_rules();
+			LISTOFCHANNELS['Zap/'+d]['ChannelName'] = 'Analog Phone ' + d;
+		}
+	}
+
+	config2json('users.conf', 1, get_users) ;
 }
 
 
@@ -455,11 +465,6 @@
 	// finally take a look at last step - if no one answers
 	this_ringgroup.laststep = v[v.length-1].split('s,n,')[1];
 }
-
-
-
-
-
 
 
 function add_rg(){
@@ -486,7 +491,6 @@
 }
 
 function cancel_rg(){ _$('ringgroup_editdiv').style.display = 'none'; }
-
 
 </script>
 <body onload="localajaxinit()"  bgcolor="FFFFFF">

Modified: trunk/config/voicemail.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/voicemail.html?view=diff&rev=1210&r1=1209&r2=1210
==============================================================================
--- trunk/config/voicemail.html (original)
+++ trunk/config/voicemail.html Tue Jul  3 17:24:10 2007
@@ -337,7 +337,7 @@
 			<div>	<fieldset  style="width: 225px;">
 				<legend>&nbsp;Message Options:&nbsp;</legend>
 				<table align='center' cellpadding=1 cellspacing=1 border=0 width=270>
-					<tr>	<td class="field_text" align=right tip="en,voicemail,10">Message&nbsp;Format:</td>
+					<tr>	<td class="field_text" align=right tip="en,voicemail,10">Attach&nbsp;Format:</td>
 						<td>
 							<select id='attachfmt' class="input8">
 							<option value='wav49'>WAV (GSM)</option>