diff -Naur asterisk-gui-old/config/cfgbasic.html asterisk-gui/config/cfgbasic.html
--- asterisk-gui-old/config/cfgbasic.html	2008-11-28 12:44:29.000000000 -0500
+++ asterisk-gui/config/cfgbasic.html	2009-01-12 08:33:30.000000000 -0500
@@ -20,7 +20,7 @@
  *
 -->
 <script>
-var browser_alert = "Your browser is not supported by this version of GUI !<BR><A href='http://www.getfirefox.com' style='font-size: 13px; font-family:arial,sans-serif,Helvetica,Trebuchet MS; color : #6C74A3;' target='_blank'>We recommend using Firefox</A>";
+var browser_alert = "Internet Explorer is not supported by this version of GUI ! Using Internet Explorer may potentially corrupt the asterisk configuration files.<BR><A href='http://www.getfirefox.com' style='font-size: 13px; font-family:arial,sans-serif,Helvetica,Trebuchet MS; color : #6C74A3;' target='_blank'>We recommend using Firefox</A>";
 </script>
 <script src="scripts/prototype.js"></script>
 <script src="scripts/astman.js"></script>
@@ -111,11 +111,11 @@
 	var minimumheight = 150;
 	var c =_$('configpanel'); 
 	c.WIH = t;
-	_$('TOP_MAINTABLE').rows[1].cells[0].height = (t - 70) ;
+	_$('TOP_MAINTABLE').rows[1].cells[0].height = (t - 90) ;
 	var pnameheight = 22;
 	c.pnameheight = pnameheight;
 	var panels = returnpanels();
-	var pheight = (( t - 70)  - (pnameheight*panels.length) ) ;
+	var pheight = (( t - 90)  - (pnameheight*panels.length) ) ;
 	if(pheight > minimumheight){
 		c.pheight = pheight;
 	}else{
@@ -234,30 +234,30 @@
 	newpanel( ["Users", "users.html", "Users is a short cut for quickly adding and removing all the necessary configuration components for any new phone."]);
 	newpanel( ["Conferencing", "meetme.html", "MeetMe conference bridging allow quick, ad-hoc conferences with or without security."]);
 	newpanel( ["Voicemail", "voicemail.html", "General settings for voicemail"]);
-	newpanel( ["Call Queues", "queues.html", "Call queues allow calls to be sequenced to one or more agents."]);
+	//newpanel( ["Call Queues", "queues.html", "Call queues allow calls to be sequenced to one or more agents."]);
 	newpanel( ["Service Providers", "trunks.html", "Service Providers are outbound lines used to allow the system to make calls to the real world.  Trunks can be VoIP lines or traditional telephony lines."]);
-	newpanel( ["Setup Hardware", "digital.html", "Configure & setup your T1/E1/Analog Cards."]);
+//	newpanel( ["Setup Hardware", "digital.html", "Configure & setup your T1/E1/Analog Cards."]);
 	//newpanel( ["Manage IAXys", "iaxyprov.html", "(beta) Provision your IAXys."]);
-	newpanel( ["mISDN Config", "misdn.html", "mISDN configuration from the asterisk GUI"]); // Uncomment when mISDN is completed.
+	newpanel( ["BRI Config", "misdn.html", "BRI configuration from the asterisk GUI"]); // Uncomment when mISDN is completed.
 	newpanel( ["Calling Rules", "numberplan.html", "The Calling Rules define dialing permissions and least cost routing rules."]);
 	newpanel( ["Incoming Calls", "incoming.html", "Define how your incoming calls should be handled & configure DID (Direct inward Dialing)"]);
 	newpanel( ["Voice Menus", "menus.html", "Menus allow for more efficient routing of calls from incoming callers. Also known as IVR (Interactive Voice Response) menus or Digital Receptionist"]);
 //	newpanel( ["Time Based Rules", "timerules.html", "define call routing rules based on date and time"]);
 	newpanel( ["Call Parking", "callparking.html", "configure call parking features"]);
 	newpanel( ["Ring Groups", "ringgroups.html", "define RingGroups to dial more than one extension"]);
-	newpanel( ["Record a Menu", "record.html", "Allows you to record custom voicemenus over a phone"]);
-	newpanel( ["Active Channels", "status.html", "Monitor active channels."]);
+//	newpanel( ["Record a Menu", "record.html", "Allows you to record custom voicemenus over a phone"]);
+	newpanel( ["Active Channels", "status.html", "Monitor active analog channels."]);
 	// newpanel( ["Graphs", "graphs.html", "View Graphs of your System Information."]);
-	newpanel( ["System Info", "sysinfo.html", "System Information."]);
-	newpanel( ["Asterisk Logs", "syslog.html", "Asterisk Log messages."]);
-	newpanel( ["Global SIP options", "sip.html", "Global SIP settings."]);
-	newpanel( ["Global IAX options", "iax.html", "Global IAX settings."]);
+//	newpanel( ["System Info", "sysinfo.html", "System Information."]);
+//	newpanel( ["Asterisk Logs", "syslog.html", "Asterisk Log messages."]);
+//	newpanel( ["Global SIP options", "sip.html", "Global SIP settings."]);
+//	newpanel( ["Global IAX options", "iax.html", "Global IAX settings."]);
 	// newpanel( ["CDR Configuration", "cdr_conf.html", "CDR Engine Configuration."]); // Uncomment when cdr_conf.html is finished, there are still some errors. 
 	//newpanel( ["CDR Reader", "cdr_conf.html", "Read all your call records from Asterisk."]);
-	newpanel( ["File Editor", "feditor.html", "Edit Asterisk Config Files"]);
+//	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( ["Backup", "backup.html", "Backup Management."]);
 	/*
 	if( (asterisk_guirPath && !asterisk_guiANOW) || ( !asterisk_guirPath && !asterisk_guiANOW) ){ // if is BE 
 	newpanel( ["Provisioning", "provisioning.html", "Settings related to Polycom auto provisioning."]);
@@ -271,10 +271,10 @@
 function pingevery(a){
 	window.setTimeout(makeping, 1000);
 	keepPinging = setInterval( makeping, a*250 );
-	astmanEngine.run_tool(asterisk_guiZtscan, function(t) { // run ztscan and then try loading ztscan.conf
-		setTimeout( function(){config2json('ztscan.conf', 0, get_FXOFXSPORTS);} , 200);
-		// leave some time for ztscan to generate ztscan.conf
-	});
+	//astmanEngine.run_tool(asterisk_guiZtscan, function(t) { // run ztscan and then try loading ztscan.conf
+//		setTimeout( function(){config2json('ztscan.conf', 0, get_FXOFXSPORTS);} , 200);
+//		// leave some time for ztscan to generate ztscan.conf
+//	});
 }
 
 function makeping(){
@@ -323,15 +323,27 @@
 	createpanels();
 	var links_str = "";
 	if(asterisk_guirPath){ links_str += '<a href="#" onclick="system_link()">System Configuration</a><BR>'; }
-	links_str += '<a target="_extern" href="http://www.digium.com/en/company/profile/">About Digium</a>&nbsp;|&nbsp;';
+//	links_str += '<a target="_extern" href="http://www.digium.com/en/company/profile/">About Digium</a>&nbsp;|&nbsp;';
 	if(asterisk_guiANOW){ links_str += '<a target="_extern" href="http://www.asterisknow.org/bugs">Report a Bug</a>&nbsp;|&nbsp;'
 		+ '<a target="_extern" href="http://www.asterisknow.org/help">Help</a>&nbsp;' ;
 	}
 	_$('linksToshow').innerHTML = links_str;
 	_$('mainscreen').src = "home.html" ;
-	if( navigator.userAgent.indexOf("MSIE") != -1 || navigator.userAgent.indexOf("Konqueror") != -1 || navigator.userAgent.indexOf("Safari") != -1 ){
-		gui_feedback(browser_alert, 'green');
+	if( navigator.userAgent.indexOf("MSIE") != -1 ){
+		browser_alert = "Internet Explorer is not supported by this version of GUI ! Using Internet Explorer may potentially corrupt the asterisk configuration files.<BR><A href='http://www.getfirefox.com' style='font-size: 13px; font-family:arial,sans-serif,Helvetica,Trebuchet MS; color : #6C74A3;' target='_blank'>We recommend using Firefox</A>";
+		gui_alert(browser_alert);
 	}
+	if( navigator.userAgent.indexOf("Konqueror") != -1 ){
+		browser_alert = "2Konqueror is not supported by this version of GUI ! Using Konqueror may potentially corrupt the asterisk configuration files.<BR><A href='http://www.getfirefox.com' style='font-size: 13px; font-family:arial,sans-serif,Helvetica,Trebuchet MS; color : #6C74A3;' target='_blank'>We recommend using Firefox</A>";
+		gui_alert(browser_alert);
+	}
+	if( navigator.userAgent.indexOf("Safari") != -1 ){
+		browser_alert = "Safari is not supported by this version of GUI ! Using Safari may potentially corrupt the asterisk configuration files.<BR><A href='http://www.getfirefox.com' style='font-size: 13px; font-family:arial,sans-serif,Helvetica,Trebuchet MS; color : #6C74A3;' target='_blank'>We recommend using Firefox</A>";
+		gui_alert(browser_alert);
+	}
+	
+
+// || navigator.userAgent.indexOf("Konqueror") != -1 || navigator.userAgent.indexOf("Safari") != -1
 }
 
 function Logoff() {
@@ -389,7 +401,7 @@
 
 function goto_advancedoption(){ 
 	_$('mainscreen').style.visibility = "hidden";
-	if( _$('AdvancedOptionsSelect').value == 'TOSETUP'){top.window.location.href = "./setup/install.html"; return;}
+//	if( _$('AdvancedOptionsSelect').value == 'TOSETUP'){top.window.location.href = "./setup/install.html"; return;}
 
 	var t;
 	var panels = returnpanels();
@@ -406,13 +418,12 @@
 </script>
 <head>
 	<title>Asterisk Configuration GUI</title>
-	<link rel="shortcut icon" href="images/favicon.ico" />
 </head>
 <body onload="registerajax()" topmargin=1>
 <table align="center" bgcolor="#dddddd" border="0" cellpadding="0" cellspacing="0" width="950" id="TOP_MAINTABLE">
 <tbody>
-	<tr height="47">
-		<td align="right" bgcolor="white" height="47" valign="bottom" id="dimg"><img src="images/digiumlogo.gif" align="left"></td>
+	<tr height="61">
+		<td align="right" bgcolor="white" height="61" valign="bottom" id="dimg">&nbsp;</td>
 		<td align="center" bgcolor="white" valign="middle">
 		<div id="feedback_round" style="background-color: #FFFFFF; width: 400px; display: none;">
 			<div id="feedback" style="font-family: Arial,sans-serif,Helvetica,Trebuchet MS; font-size: 13px; font-weight: bold;"></div>
@@ -426,11 +437,11 @@
 		<div id="configpanel" style="border-bottom: 1px solid rgb(31, 102, 155); width: 150px;"></div>
 	</td>
 	<td id="screenholder" bgcolor="#efefef" valign="top" width="550">
-		<div id="titlebar" class="mainscreenTitleBar" style="position: absolute; top: 48px;">
+		<div id="titlebar" class="mainscreenTitleBar" style="position: absolute; top: 62px;">
 			<span style="margin-left: 4px; font-weight: bold;">Loading Screen&nbsp;<img src="images/dots.gif"></span>
 		</div>
 		<div id="borderbox" class="mainscreenBorderBox" height="100%"></div>
-		<iframe border="0" marginheight="0" marginwidth="0" id="mainscreen" style="position: absolute; top: 48px;" frameborder="0" scrolling="no" width="540"></iframe>
+		<iframe border="0" marginheight="0" marginwidth="0" id="mainscreen" style="position: absolute; top: 62px;" frameborder="0" scrolling="no" width="540"></iframe>
 	</td>
 	<td valign="top" width="250">
 		<div class="mainscreenTooltipBar" align="right">
diff -Naur asterisk-gui-old/config/cli.html asterisk-gui/config/cli.html
--- asterisk-gui-old/config/cli.html	2008-11-28 12:44:29.000000000 -0500
+++ asterisk-gui/config/cli.html	2008-12-23 17:10:30.000000000 -0500
@@ -85,8 +85,8 @@
 
 </script>
 <body id="foo" onload="localajaxinit()"  bgcolor="#FFFFFF" onunload="resetmainscreen();">
-<div style="font-size : 12px; padding : 4px 6px 4px 6px; border-style : solid none solid none; border-top-color : #BDC7E7; border-bottom-color : #182052; border-width : 1px 0px 1px 0px; background-color : #ef8700; color : #ffffff;">
-	<span style="margin-left: 4px;font-weight:bold;">Asterisk Command Line Interface</span>
+<div style="font-size : 12px; padding : 4px 6px 4px 6px; border-style : solid none solid none; border-top-color : #BDC7E7; border-bottom-color : #182052; border-width : 1px 0px 1px 0px; background-color : #5886a7; color : #ffffff;">	
+    <span style="margin-left: 4px;font-weight:bold;">Asterisk Command Line Interface</span>
 	<span style="cursor: pointer; cursor: hand;" onclick="window.location.href=window.location.href;" >&nbsp;<img src="images/refresh.png" title=" Refresh " border=0 >&nbsp;</span>
 	&nbsp;&nbsp;
 </div>
diff -Naur asterisk-gui-old/config/home.html asterisk-gui/config/home.html
--- asterisk-gui-old/config/home.html	2008-11-28 12:44:29.000000000 -0500
+++ asterisk-gui/config/home.html	2008-12-23 17:10:30.000000000 -0500
@@ -1,4 +1,4 @@
-<!--
+<!--    
  * Asterisk-GUI	-	an Asterisk configuration interface
  *
  * Initial login screen
@@ -166,6 +166,12 @@
 	}
 }
 
+function doReboot() {
+	if (confirm("Are you sure you want to reboot the appliance?")) {
+		parent.gui_feedback("Rebooting!","blue","40000");
+		parent.astmanEngine.run_tool("/sbin/reboot",onSuccess = function() { } );
+	}
+}
 
 function checkWritePermissions(){
 	// check if gui has write permissions
@@ -246,11 +252,11 @@
 			updateTrunkDial();
 			return;
 		}
-		if( !op.hasOwnProperty(asterisk_guitools) ){	// if no context by name asterisk_guitools 
-			installguitools();
-		}else{
+		//if( !op.hasOwnProperty(asterisk_guitools) ){	// if no context by name asterisk_guitools 
+		//	installguitools();
+		//}else{
 			parent.asterisk_guitools_inextconf = 1;
-		}
+		//}
 	};
 	config2json('extensions.conf',0,checkExtconfig);
 }
@@ -284,7 +290,7 @@
 				&nbsp;&nbsp;&nbsp;&nbsp;
 				<input type="submit" id="logoff" value="Logoff" disabled=1 onClick="doLogoff()" class="input">
 				&nbsp;&nbsp;&nbsp;&nbsp;
-				<input type="submit" id="reboot" value="Reboot" disabled=1 onClick='parent.reboot()' class="input">
+				<input type="submit" id="reboot" value="Reboot" disabled=1 onClick="doReboot()" class="input">
 			</td>
 		</tr>
 		</table>
diff -Naur asterisk-gui-old/config/incoming.html asterisk-gui/config/incoming.html
--- asterisk-gui-old/config/incoming.html	2008-11-28 12:44:29.000000000 -0500
+++ asterisk-gui/config/incoming.html	2008-12-23 17:10:30.000000000 -0500
@@ -128,7 +128,7 @@
 		try{
 			if( n == "ERROR: CONFIG FILE NOT FOUND"){ } // misdn.conf not found
 			for( var l in n ){ 
-				if( n.hasOwnProperty(l) && l.beginsWith('trunk_m') && n[l]['hasmisdn'] =='yes' ){
+				if( n.hasOwnProperty(l) && l.beginsWith('digital') && n[l]['hasmisdn'] =='yes' ){
 					didtrunks[l] = new Object();
 					didtrunks[l].trunkname = n[l]['trunkname']; 
 				}
@@ -141,7 +141,7 @@
 			parent.loadscreen(this);
 		}
 	};
-	config2json("misdn.conf", 1, parseUsersConf);
+	config2json("users.conf", 1, parseUsersConf);
 }
 
 
diff -Naur asterisk-gui-old/config/meetme.html asterisk-gui/config/meetme.html
--- asterisk-gui-old/config/meetme.html	2008-11-28 12:44:29.000000000 -0500
+++ asterisk-gui/config/meetme.html	2008-12-23 17:10:30.000000000 -0500
@@ -108,8 +108,7 @@
 			}
 		}
 	}
-	_ext.contentEditable = 'true';
-	_ext.disabled = 0;
+	_ext.disabled = false;
 	_ext.style.height = "415px";
 	parent.loadscreen(this);
 }
@@ -341,7 +340,7 @@
 	ASTGUI.events.add(document, 'mouseover', show_tooltip);
 	setWindowTitle("Conferencing");
 
-	_$('extensions').contentEditable = 'false';
+	_$('extensions').disabled = 'true';
 	for (var x =0; x < fieldnames.length; x++) {
 		widgets[fieldnames[x]] = _$(fieldnames[x]);
 		widgets[fieldnames[x]].disabled = true;
diff -Naur asterisk-gui-old/config/menus.html asterisk-gui/config/menus.html
--- asterisk-gui-old/config/menus.html	2008-11-28 12:44:29.000000000 -0500
+++ asterisk-gui/config/menus.html	2008-12-23 17:10:30.000000000 -0500
@@ -17,25 +17,6 @@
 <script src="scripts/astman.js"></script>
 <script src="scripts/tooltip.js"></script>
 <link href="stylesheets/schwing.css" media="all" rel="Stylesheet" type="text/css" />
-<style type="text/css">
-	.page_header {
-		font-size : 12px;
-		padding : 4px 6px 4px 6px;
-		border-style : solid none solid none;
-		border-top-color : #BDC7E7;
-		border-bottom-color : #182052;
-		border-width : 1px 0px 1px 0px;
-		background-color : #ef8700;
-		margin-bottom: 10px;
-		color : #ffffff;
-	}
-
-	.VoiceMenuMainTable{
-		border : 0;
-		width	: 750px; 
-		font-size: 11px;
-	}
-</style>
 <script>
 var widgets = {};
 var adstatus;
@@ -1042,7 +1023,6 @@
 
 
 function localajaxinit() {
-	parent._$('mainscreen').width= 798;
 	ASTGUI.events.add(document, 'mouseover', show_tooltip);
 	showdiv_statusmessage();
 	setWindowTitle("Voice Menus");
@@ -1212,7 +1192,6 @@
 }
 
 function free_mem(){
-	parent._$('mainscreen').width= 540;
 	if( navigator.userAgent.indexOf("MSIE") == -1 ){ return true; }
 	try{
 		widgets['save'].hostselectbox = null ;
@@ -1235,20 +1214,20 @@
 
 </script>
 <body id="foo" onload="localajaxinit()"  bgcolor="EFEFEF" onunload="free_mem()">
-<div class="page_header">
+<div class="mainscreenTitleBar">
 	<span style="margin-left: 4px;font-weight:bold;">Voice Menus Configuration</span>
 	<span style="cursor: pointer; cursor: hand;" onclick="window.location.href=window.location.href;" >&nbsp;<img src="images/refresh.png" title=" Refresh " border=0 >&nbsp;</span>
 </div>
 <div class="mainscreenContentBox" id="userscontent">
-<table class="VoiceMenuMainTable" align="left">
+<table class="mainscreenTable" align="center">
 	<tr valign="top">
 		<td colspan='2'> Voice Menus: </td>
 	</tr>
 	<tr valign="top">
 		<td>	<select size="25" id="vmenus" style="width:180px;" class="input10"><option>Loading...</option></select>	</td>
-		<td valign=top align="right" width=560 height=415>
+		<td valign=top align="right" width=346 height=415>
 			<select id='extensions' style='display:none;width:0px;height:0px'></select><select id='users' style='display:none;width:0px;height:0px'></select><select id='recorded_files' style='display:none;width:0px;height:0px'></select>
-			<table align="center" width="560">
+			<table align="center" width="346">
 			<tr>
 				<td width="50" align=left class="field_text" tip="en,menus,0">Name:</td>
 				<td align=left class="field_text">
@@ -1266,7 +1245,7 @@
 					<input  style='width:45'  type="button" id="stepUp" value="Up" disabled onClick="step_up()" class="buttonbold"><BR><BR>
 					<input  style='width:45' type="button" id="stepDown" value="Down" disabled onClick="step_down()" class="buttonbold">
 				</td>
-				<td><select id='steps' size=8  style="width:550px;" onClick="step_onselect()" disabled class="input8"></select></td>
+				<td><select id='steps' size=8  style="width:290px;" onClick="step_onselect()" disabled class="input8"></select></td>
 			</tr>
 
 			<tr>	<td> </td>
@@ -1314,7 +1293,7 @@
 		<input style='width:80' type='button' id='new' value='New' class="buttonbold">&nbsp;
 		<input style='width:80' type='button' id='delete' value='Delete' class="buttonbold">&nbsp;
 	</td>
-	<td align='right'>
+	<td align='right'2>
 		<input type="hidden" id="save">
 		<input type='button' id='savevmenu' onClick="save_vmenu()" value='Save' disabled class="buttonbold">&nbsp;
 		<input type='button' id='cancel' value='Cancel' class="buttonbold">&nbsp;
@@ -1322,18 +1301,18 @@
 	</tr>
 </table>
 </div>
-<div id="NewStep_Content" STYLE="display:none; position: absolute; left: 40; top: 64; width:580; height:60;  background-color:#F4EFE5;   border-width: 1px; border-color: #7E5538; border-style: solid; z-index:100">
+<div id="NewStep_Content" STYLE="display:none; position: absolute; left: 0; top: 64; width:560; height:60;  background-color:#F4EFE5;   border-width: 1px; border-color: #7E5538; border-style: solid; z-index:100">
 	<table width="100%" cellpadding=0 cellspacing=0  onmousedown="ASTGUI.startDrag(event , 'NewStep_Content');">
 	<TR bgcolor="#7E5538"  style="background-image:url('images/title_gradient.gif');">
 		<TD tip="en,menus,2"><font color="#FFFFFF">&nbsp;&nbsp;<B>Add a new Step:</B></FONT></TD>
-		<TD Height="20" align="right" style="cursor: move">
+		<TD Height="20" align="left" style="cursor: move">
 			<A href="#" onclick="hide_addStep();" style="color:#FFFFFF; font-size: 12px; font-weight:bold;">X</A>
 		</TD>
 		<TD width=4></TD>
 	</TR>
 	</table>
 	<table cellpadding=2 cellspacing=2 border=0 width="100%" align="center">
-	<tr>	<td colspan=2 class="field_text" align=center height=40 valign=middle>
+	<tr>	<td colspan=2 class="field_text" align=left height=40 valign=middle>
 		<NOBR>
 		Add new Step: 
 		<select id='newstep_action' disabled onChange="update_newstep_var()" class="input8">
diff -Naur asterisk-gui-old/config/misdn.html asterisk-gui/config/misdn.html
--- asterisk-gui-old/config/misdn.html	2008-11-28 12:44:29.000000000 -0500
+++ asterisk-gui/config/misdn.html	2009-01-12 13:43:52.000000000 -0500
@@ -59,17 +59,22 @@
 		background-color:#FFFFFF;
 	}
 
-	.pageheading{
+/*	.pageheading{
 		padding : 10px 10px 10px 10px;
 		font-size: 135%;
 		text-align: center;
 		font-weight: bold;
 	}
+*/
 </style>
 <script>
 var CARDS = 0;
 var PORTS = {}; // each port corresponds to a physical port on the bri card
 var pmode_defs = {
+	'te':'TE',
+       'nt':'NT',
+       'p2p': 'P2P',
+       'p2mp': 'P2MP',  
 	'te_ptp':'TE-Mode, PTP',
 	'te_ptmp':'TE-Mode, PTMP',
 	'te_capi_ptp':'TE-Mode(Capi), PTP',
@@ -83,19 +88,19 @@
 function resetmainscreen(){ top._$('mainscreen').width= 540; }
 
 function localajaxinit(){
-	setWindowTitle("misdn Cards Configuration");
+	setWindowTitle("BRI Cards Configuration");
 	top._$('mainscreen').width= 798;
 	showdiv_statusmessage(); // create status message dialog
 	_$('message_text').innerHTML = "Detecting BRI Cards ...";
 	_$('status_message').style.display='';
-	setTimeout("_$('status_message').style.display='none';", 4000);
+	setTimeout("_$('status_message').style.display='none';", 1000);
 
 	parent.loadscreen(this);
 	setTimeout(
 		function(){
-			 parent.astmanEngine.run_tool("touch /etc/asterisk/misdninit_guiRead.conf", function(t){
+		// parent.astmanEngine.run_tool("touch /etc/asterisk/misdninit_guiRead.conf", function(t){
 				misdnConfig.detectCards();
-			})
+		//	})
 		}
 	, 1000 );
 }
@@ -103,47 +108,53 @@
 var misdnConfig = {
 
 	detectCards: function(){
-		parent.astmanEngine.run_tool(asterisk_guiMisdn_scan, function(t) { // run 'misdn-init scan'
+	//	parent.astmanEngine.run_tool(asterisk_guiMisdn_scan, function(t) { // run 'misdn-init scan'
 			var loadScanHtml = function(){
-				new Ajax.Request("./scan.html", {
+				new Ajax.Request("scan.html", {
 					method : "get",
 					asynchronous : true,
 					onComplete : function(c){
 						try{
+						
 							var records = c.responseText.split("\n");
+                                                       
 							var span=1, ns;
 							for(var mn = 0; mn < records.length; mn++) {
-								if(records[mn].contains('card')) { /* assume b410p */
-									CARDS++; ns = (span + 3);
+								if(records[mn].contains('digital')) { /* assume b410p */
+									CARDS++; ns = 0;
 									var csp = 1;
 									while(span <= ns) {
 										if(!PORTS[span]) {
 											PORTS[span] = {}; 
 											PORTS[span]['card'] = records[mn];
-											PORTS[span]['cardno'] = CARDS;
+											//PORTS[span]['cardno'] = CARDS;
 											PORTS[span]['card_portno'] = csp;
 										} span++; csp++;
 									}
 								}
 							}
+						
 							if(CARDS == 0) {
-								_$('errmsg').innerHTML = "No mISDN Cards detected (found 0 spans)!";
+								_$('errmsg').innerHTML = "No BRI Cards detected (found 0 spans)!";
 								_$('errmsg').style.display = '';
 								_$('div_misdncardstable').style.display = 'none';
 								_$('div_misdnTrunkstable').style.display = 'none';
-								gui_feedback("No mISDN Cards found !!");
+								gui_feedback("No BRI Cards found !!");
 								return false;
 							}
-							_$('b410p_cards').innerHTML = "<B>"+CARDS+"</B> B410p Card(s) detected !";
+							_$('b410p_cards').innerHTML = "<B>"+CARDS/4+"</B> BRI Card(s) detected !";
 						}catch(err){
-							_$('errmsg').innerHTML = "No mISDN Cards detected (found 0 spans)!";
+							_$('errmsg').innerHTML = "No BRI Cards detected (found 0 spans)!";
 							_$('errmsg').style.display = '';
 							_$('div_misdncardstable').style.display = 'none';
-							gui_feedback("No mISDN Cards found !!");
+							gui_feedback("No BRI Cards found !!");
 							return false;
 						}
 						finally{
 							misdnConfig.readCardsConfiguration(); // reads and parses misdn-init.conf
+						//	load_Config();
+
+
 						}
 						
 						return true;
@@ -154,63 +165,33 @@
 					}
 				});
 			};
-			setTimeout( function(){loadScanHtml();} , 1000); // leave some time for 'misdn-init scan' to generate scan.html
-		});
+		setTimeout( function(){loadScanHtml();} , 1000); // leave some time for 'misdn-init scan' to generate scan.html
+	//	});
 	},
 	readCardsConfiguration: function(){
 
-		var parseMisdnInit = function(c){
-			/*
-			// gui expects misdn-init.conf in the following format
-			card = 1,0x4
-			te_ptp = 1,2,3,4
-			poll = 128
-			dsp_options = 0
-			debug = 0 
-			*/
-			var records = c['general'] ;
-			var a,b,c,d;
-
-			for(var t=0; t < records.length; t++ ){
-				if( records[t].beginsWith('nt_ptp') || records[t].beginsWith('nt_ptmp') || records[t].beginsWith('te_ptp') || records[t].beginsWith('te_ptmp')  || records[t].beginsWith('te_capi_ptp') || records[t].beginsWith('te_capi_ptmp') ){
-					a = records[t].split("=")[0];
-					b = records[t].split("=")[1];
-					if(!b.length){ continue; }
-					if( b.contains(",") ){
-						c = b.split(",");
-						c.each( function(d) {
-							PORTS[d]['portType'] = a.strip(); // set port type of port d to a
-						});
-					}else{
-						PORTS[b]['portType'] = a.strip(); // set port type of port d to a
-					}
-				}
+		load_Config();	       
+              load_mISDNtrunks();
 
-				if(records[t].beginsWith('option=')){ // 'option=1,master_clock' or 'option=2,ais,nocrc4'
-					var a = ASTGUI.parseContextLine.read(records[t]); // a[1] is '1,master_clock' or '2,ais,nocrc4'
-					var b = a[1].split(',')[0]; // b is is the misdn port numer
-					var c = records[t].split(',').slice(1).join(','); // 'master_clock' or 'ais,nocrc4'
-					PORTS[b]['option'] = c ;
-				}
-			}
-			// done parsing misdn-init.conf
+		// done parsing misdn-init.conf
 			// show table
-			parent.astmanEngine.run_tool("touch /etc/asterisk/applymisdn.conf", function(t){}) // just to make sure it is there later when we write to it
-			try{
+			//parent.astmanEngine.run_tool("touch /etc/asterisk/applymisdn.conf", function(t){}) // just to make sure it is there later when we write to it
+			/*try{
 				misdnConfig.showMisdnConfiginTable();
 			}catch(err){
 
-			}finally{
-				load_mISDNtrunks();
-			}
-		};
+			}*/
+		
+					
+
+		
 
 		var somefunction = function(){
 			var c = 0;
 			var uri = build_action('delcat', c, 'general', "", ""); c++;
 			uri += build_action('newcat', c, 'general', "", ""); c++;
-			uri += build_action('update', c, 'general', '#include "../misdn-init.conf" ;', ''); c++;
-			makerequest('u', "misdninit_guiRead.conf", uri, function(t) { config2json("misdninit_guiRead.conf", 0, parseMisdnInit); });
+			uri += build_action('update', c, 'general', '#include "/persistent/etc/pika/pikagp_aoh.cfg" ;', ''); c++;
+			//makerequest('u', "misdninit_guiRead.conf", uri, function(t) { config2json("misdninit_guiRead.conf", 0, parseMisdnInit); });
 		}();
 	},
 
@@ -223,11 +204,14 @@
 			var newCell0 = newRow.insertCell(0);
 			newCell0.innerHTML = "Card/Port";
 	
-			var newCell1 = newRow.insertCell(1);
-			newCell1.innerHTML = "Mode";
-	
-			var newCell2 = newRow.insertCell(2);
-			newCell2.innerHTML =  "";
+			var newCell2 = newRow.insertCell(1);
+			newCell2.innerHTML =  "Node";
+
+			var newCell3 = newRow.insertCell(2);
+			newCell3.innerHTML =  "Configuration";
+
+			var newCell4 = newRow.insertCell(3);
+			newCell4.innerHTML =  "Country";
 		};
 
 		var addrow_totable = function(port_no){
@@ -238,16 +222,29 @@
 			if( PORTS[port_no]['edited'] ){ newRow.style.background = "#C9AAAA"; }
 
 			var newCell0 = newRow.insertCell(0);
-			newCell0.innerHTML = PORTS[port_no]['cardno'] + "/" + PORTS[port_no]['card_portno'];
+			newCell0.innerHTML = PORTS[port_no]['cardno'];// + "/" + PORTS[port_no]['card_portno'];
 			newCell0.align = "center";
 
-			var newCell1 = newRow.insertCell(1);
-			newCell1.innerHTML = pmode_defs[PORTS[port_no]['portType']] ;
-			newCell1.align = "center";
 
-			var newCell2 = newRow.insertCell(2);
-			newCell2.innerHTML = '<input type=button value="Edit" onclick="edit_port(' + port_no  + ')">';
+			var newCell2 = newRow.insertCell(1);
+			if ((PORTS[port_no]['portNode']) == 'client'){ 
+	              	newCell2.innerHTML = PORTS[port_no]['portNode'] + " (TE) " ;
+			}
+		       else{
+				newCell2.innerHTML = PORTS[port_no]['portNode'] + " (NT) " ;
+			}
 			newCell2.align = "center";
+
+
+			var newCell3 = newRow.insertCell(2);
+			newCell3.innerHTML = PORTS[port_no]['portConfig'];
+			newCell3.align = "center";
+
+
+			var newCell4 = newRow.insertCell(3);
+			newCell4.innerHTML = PORTS[port_no]['country'] ;
+			newCell4.align = "center";
+
 		};
 
 		ASTGUI.domActions.clear_table(tbl);
@@ -257,6 +254,9 @@
 	}
 };
 
+
+
+
 function edit_port(p){
 	if( !PORTS[p].hasOwnProperty('option') ) { PORTS[p]['option'] = ''; }
 	ASTGUI.selectbox.selectOption( _$('editport_option'), PORTS[p]['option'] );
@@ -338,7 +338,8 @@
 
 	makerequest('u', "applymisdn.conf", uri, function(t) {
 		// call the script that would generate /etc/misdn-init.conf from /etc/asterisk/applymisdn.conf
-		parent.astmanEngine.run_tool("sh /var/lib/asterisk/scripts/editmisdn.sh applysettings", function(t) {
+
+		parent.astmanEngine.run_tool("sh /var/lib/asterisk/static-http/config/scripts/editmisdn.sh ", function(t) {
 			alert("You need to restart your machine for these settings to take effect");
 			window.location.href= "misdn.html";
 			return true; 
@@ -359,8 +360,8 @@
 		var newCell1 = newRow.insertCell(1);
 		newCell1.innerHTML = "Ports";
 
-		var newCell2 = newRow.insertCell(2);
-		newCell2.innerHTML =  "";
+		//var newCell2 = newRow.insertCell(2);
+		//newCell2.innerHTML =  "";
 	};
 
 	var addrow_totable = function(trunk){
@@ -378,12 +379,12 @@
 		newCell1.innerHTML = mISDNTRUNKS[trunk]['ports']  ;
 		newCell1.align = "center";
 
-		var newCell2 = newRow.insertCell(2);
-//		newCell2.innerHTML = "<input type=button value=Edit onclick=\"edit_trunk('" + trunk  + "')\">&nbsp;&nbsp;" +
-//					"<input type=button value='Delete' onclick=\"delete_trunk('" + trunk  + "')\">" ;
-		newCell2.innerHTML = "<input type=button value='Delete' onclick=\"delete_trunk('" + trunk  + "')\">" ;
+	//	var newCell2 = newRow.insertCell(2);
+       //	newCell2.innerHTML = "<input type=button value=Edit onclick=\"edit_trunk('" + trunk  + "')\">&nbsp;&nbsp;" +
+       //		"<input type=button value='Delete' onclick=\"delete_trunk('" + trunk  + "')\">" ;
+	//	newCell2.innerHTML = "<input type=button value='Delete' onclick=\"delete_trunk('" + trunk  + "')\">" ;
 
-		newCell2.align = "center";
+	//	newCell2.align = "center";
 	};
 
 	ASTGUI.domActions.clear_table(tbl);
@@ -391,21 +392,54 @@
 	for( var k in mISDNTRUNKS ){ if( mISDNTRUNKS.hasOwnProperty(k) ){ addrow_totable(k); }}
 	if(tbl.rows.length == 1){
 		tbl.style.display = 'none';
-		_$('div_noTrunks').innerHTML = '<BR><BR>You donot have any mISDN trunks defined';
+		_$('div_noTrunks').innerHTML = '<BR><BR>You do not have any BRI trunks defined';
 	}else{
 		tbl.style.display = '';
-		_$('div_noTrunks').innerHTML = '<BR>List of mISDN Service providers (trunks)';
+		_$('div_noTrunks').innerHTML = '<BR>List of BRI Service providers (trunks)';
 	}
 }
 
+
+function load_Config(){
+	var parsePikaConf = function(n){
+	if( n == "ERROR: CONFIG FILE NOT FOUND"){// pikagp_aoh.cfg not found
+			return false;
+		}
+
+		for( var l in n ){ 
+			if( n.hasOwnProperty(l) && l.beginsWith('BRI_') ){
+				if(!PORTS[l]) {PORTS[l] = {};}
+		
+				PORTS[l]['cardno'] = n[l]['interface'];
+
+
+				PORTS[l]['portNode'] = n[l]['node']; 
+				if (!PORTS[l]['portNode']){ PORTS[l]['portNode'] ="-";}
+
+				PORTS[l]['country'] = n[l]['countrycode'];
+				if (!PORTS[l]['country']){ PORTS[l]['country'] = "-";}
+				
+				PORTS[l]['portConfig'] = n[l]['networkconfig'];
+				if (!PORTS[l]['portConfig']){ PORTS[l]['portConfig'] = "-";}
+
+								
+			}
+		};
+
+		misdnConfig.showMisdnConfiginTable();
+	};
+	config2json("/persistent/etc/pika/pikagp_aoh.cfg", 1, parsePikaConf);
+}
+
+
 function load_mISDNtrunks(){
 	var parseUsersConf = function(n){
-		if( n == "ERROR: CONFIG FILE NOT FOUND"){// misdn.conf not found
+		if( n == "ERROR: CONFIG FILE NOT FOUND"){// users.conf not found
 			return false;
 		}
 
 		for( var l in n ){ 
-			if( n.hasOwnProperty(l) && l.beginsWith('trunk_m') && n[l]['hasmisdn'] =='yes' ){
+			if( n.hasOwnProperty(l) && l.beginsWith('digital_') && n[l]['hasmisdn'] =='yes' ){
 				if(!mISDNTRUNKS[l]) { mISDNTRUNKS[l] = {};}
 				mISDNTRUNKS[l]['trunkname'] = n[l]['trunkname'];
 				mISDNTRUNKS[l]['context'] = n[l]['context'];
@@ -415,7 +449,7 @@
 
 		showMisdnTrunksinTable();
 	};
-	config2json("misdn.conf", 1, parseUsersConf);
+	config2json("users.conf", 1, parseUsersConf);
 }
 
 
@@ -439,20 +473,25 @@
 
 var delete_trunk = function(k){
 	if(!confirm("Are you sure you want to delete this BRI Trunk ?")){ return true; }
-	//delete in misdn.conf
+	//delete in users.conf
 	// delete in globals in extensions.conf
 	// delete the DID context in extensions.conf
 	var c = 0;
 	var uri = build_action('delcat', c, k, "", ""); c++;
-	makerequest('u', "misdn.conf", uri, function(t) { 
+	makerequest('u', "users.conf", uri, function(t) { 
 		var c1 = 0;
 		var uri1 = build_action('delcat', c1, "DID_" + k , "", ""); c1++;
 		uri1 += build_action('delete', c1, "globals", k, '', "mISDN/g:" + k ); c1++;
-		makerequest('u', "extensions.conf", uri1, function(t) { 
+		//makerequest('u', "extensions.conf", uri1, function(t) { 
 			delete mISDNTRUNKS[k];
-			showMisdnTrunksinTable();
-		});
+			
+		//});
+			load_mISDNtrunks();
 	});
+
+	
+
+
 };
 
 var updateTrunkInfo = function(){
@@ -463,8 +502,8 @@
 		var getnextavailabletrunk_number = function(){
 			var ts = [];
 			for(var t in mISDNTRUNKS){ if( mISDNTRUNKS.hasOwnProperty(t) ){
-					var i = t.split('trunk_m');
-					ts.push( Number(t.split('trunk_m')[1] ) );
+					var i = t.split('digital_');
+					ts.push( Number(t.split('digital_')[1] ) );
 			}}
 
 			if(!ts.length){ return "1"; }
@@ -479,7 +518,8 @@
 			return c;
 		};
 		var y = getnextavailabletrunk_number();
-		var newtrunkname =  "trunk_m" + y;
+		var newtrunkname =  "digital_" + y;
+		
 		
 	/////////////////uri += build_action('append' , c , d , "poll" , "128") ; c++ ;
 	/////////////////	uri += build_action('newcat', c, d , "", ""); c++;
@@ -487,40 +527,57 @@
 		var c = 0, uri ='';
 		uri += build_action('newcat', c, newtrunkname , "", ""); c++;
 		uri += build_action('append' , c , newtrunkname , "trunkname", _$('edit_MTrunk_trunkName').value  ) ; c++ ;
-		uri += build_action('append' , c , newtrunkname , "context", "DID_" + newtrunkname) ; c++ ;
+		uri += build_action('append' , c , newtrunkname , "context", "DID_digital_1") ; c++ ;
 		uri += build_action('append' , c , newtrunkname , "ports", _$('edit_MTrunk_ports').value ) ; c++ ;
+		//uri += build_action('append' , c , newtrunkname , "pikachan", "digital/" + _$('edit_MTrunk_ports').value ) ; c++ ;
 		uri += build_action('append' , c , newtrunkname , "hasmisdn", 'yes') ; c++ ;
 		uri += build_action('append' , c , newtrunkname , "msns", '*') ; c++ ;
-		makerequest('u', "misdn.conf", uri, function(t) {
+		uri += build_action('append' , c , newtrunkname , "trunkstyle", 'digital') ; c++ ;
+		makerequest('u', "users.conf", uri, function(t) {
 			var c1 = 0, uri2 ='';
 			uri2 += build_action('newcat', c1, "DID_"+newtrunkname, "", ""); c1++;
-			uri2 += build_action('append' , c1, "DID_"+newtrunkname, 'include', 'default') ; c1++ ;
+			uri2 += build_action('append' , c1, "DID_"+newtrunkname, 'include', 'digital') ; c1++ ;
 			uri2 += build_action('update', c1, 'globals', newtrunkname, 'mISDN/g:' + newtrunkname ); c++;	
-			makerequest('u', "extensions.conf", uri2, function(t) {
+		//	makerequest('u', "extensions.conf", uri2, function(t) { 
 				try{
 				if(mISDNTRUNKS[newtrunkname]) { delete mISDNTRUNKS[newtrunkname];}
 				mISDNTRUNKS[newtrunkname] = {};
 				mISDNTRUNKS[newtrunkname]['trunkname'] = _$('edit_MTrunk_trunkName').value ;
 				mISDNTRUNKS[newtrunkname]['context'] = "DID_" + newtrunkname;
-				mISDNTRUNKS[newtrunkname]['ports'] = _$('edit_MTrunk_ports').value;
+				mISDNTRUNKS[newtrunkname]['ports'] =  _$('edit_MTrunk_ports').value;
+				mISDNTRUNKS[newtrunkname]['pikachan'] = "digital/" + _$('edit_MTrunk_ports').value;
+	
 				showMisdnTrunksinTable();
 				}catch(err){
 
 				}finally{
 					_$('edit_trunk').style.display = "none";
 				}
-			});
+		//	});
+			
 		});
+
+		//Add to Users.conf as well
+             /*   makerequest('u', "users.conf", uri, function(t) {
+                        var c1 = 0, uri2 ='';
+                        uri2 += build_action('newcat', c1, "DID_digital", "", ""); c1++;
+                        uri2 += build_action('append' , c1, "DID_digital", 'include', 'default', 'include', 'digital') ; c1++ ;
+                        uri2 += build_action('update', c1, 'globals', newtrunkname, 'mISDN/g:' + newtrunkname ); c++;
+                });*/
+
+
 	}else{
 		// update existing trunk
 		var k = _$('edit_trunk')['trunk_being_Edited'];
 		var c = 0;
 		var uri = build_action('update', c, k, 'ports', _$('edit_MTrunk_ports').value ); c++;
 		uri += build_action('update', c, k, 'trunkname', _$('edit_MTrunk_trunkName').value ); c++;
-		makerequest('u', "misdn.conf", uri, function(t) {
+		makerequest('u', "users.conf", uri, function(t) {
 			try{
 				mISDNTRUNKS[k]['trunkname'] = _$('edit_MTrunk_trunkName').value ;
-				mISDNTRUNKS[k]['ports'] = _$('edit_MTrunk_ports').value ;
+				mISDNTRUNKS[k]['ports'] = "digital" + _$('edit_MTrunk_ports').value ;
+				mISDNTRUNKS[k]['pikachan'] = "digital" + _$('edit_MTrunk_ports').value ;
+
 				showMisdnTrunksinTable();
 			}catch(err){
 
@@ -528,6 +585,19 @@
 				_$('edit_trunk').style.display = "none";
 			}
 		});
+               /* makerequest('u', "users.conf", uri, function(t) {
+			try{
+				mISDNTRUNKS[k]['trunkname'] = _$('edit_MTrunk_trunkName').value ;
+				mISDNTRUNKS[k]['ports'] = _$('edit_MTrunk_ports').value ;
+				showMisdnTrunksinTable();
+			}catch(err){
+
+			}finally{
+				_$('edit_trunk').style.display = "none";
+			}
+                });*/
+                
+
 	}
 
 }
@@ -535,26 +605,27 @@
 
 </script>
 <body onload="localajaxinit()" onunload="resetmainscreen()"  bgcolor="#EFEFEF">
-<div style="font-size : 12px; padding : 4px 6px 4px 6px; border-style : solid none solid none; border-top-color : #BDC7E7; border-bottom-color : #182052; border-width : 1px 0px 1px 0px; background-color : #ef8700; color : #ffffff;">
+<div style="font-size : 12px; padding : 4px 6px 4px 6px; border-style : solid none solid none; border-top-color : #BDC7E7; border-bottom-color : #182052; border-width : 1px 0px 1px 0px; background-color :  #5886a7; color : #ffffff;">
 	<span style="margin-left: 4px;font-weight:bold;">Digital Card Configuration Wizard</span>
 	<span style="cursor: pointer; cursor: hand;" onclick="window.location.href=window.location.href;" >&nbsp;<img src="images/refresh.png" title=" Refresh " border=0 >&nbsp;</span>
 </div>
 
 <div style="overflow:auto;left:40" id="div_misdncardstable">
 	<h2 align="center"><div id="b410p_cards"></div></h2>
+	<h2 align="center"><div id='b410p_cards'>(Edit pikagp_aoh.cfg to modify)</div></h2>
+</div>
+
+
 	<table class="taglist" id="misdntable" cellpadding=5 cellspacing=1 border=0 align=center></table>
 	<center>
-		<input type="button" id="save_a" value="Update" onclick="generate_applyMisdn();">&nbsp;&nbsp;
-		<input type="button" id="cancel_a" value="Cancel" onclick="reloadpage();">
+		
 	</center>
 </div>
 
 <div style="overflow:auto;left:40" id="div_misdnTrunkstable">
-	<h2 align="center"><div id='div_noTrunks'>List of mISDN Service providers (trunks)</div></h2>
+	<h2 align="center"><div id='div_noTrunks'>List of BRI Service providers (trunks)</div></h2>
 	<table class="taglist" id="misdntrunkstable" cellpadding=5 cellspacing=1 border=0 align=center></table>
-	<center>
-		<input type="button" value="Add" onclick="new_misdntrunk();">
-	</center>
+
 </div>
 
 <div id="edit_trunk" STYLE="display:none; position: absolute; left: 30; top: 40; width:500; height:180;  background-color:#F4EFE5;   border-width: 1px; border-color: #7E5538; border-style: solid; z-index:5">
@@ -621,12 +692,9 @@
 			</select>
 		</TD>
 	</TR>
-	<TR>	<TD colspan=2 align=center height=50 valign=middle>  
-			<input type="button" id="save_a" value="Update" onclick="updatePortInfo();">&nbsp;&nbsp;
-			<input type="button" id="cancel_a" value="Cancel" onclick="canelPortInfo();">
-		</TD>
-	</TR>
+	
+
 	</TABLE>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff -Naur asterisk-gui-old/config/numberplan.html asterisk-gui/config/numberplan.html
--- asterisk-gui-old/config/numberplan.html	2008-11-28 12:44:29.000000000 -0500
+++ asterisk-gui/config/numberplan.html	2008-12-23 17:10:30.000000000 -0500
@@ -38,6 +38,7 @@
 var pattern_beingedited_priority ;
 var np_oldselect;
 
+
 function update_parkedcalls() {
 	var _exten = _$('extensions').innerHTML;
 	var _context = _$('extensions').value;
@@ -58,7 +59,7 @@
 	} 
 	if(!_$("parked").checked) {
 		gui_feedback("Parking lots now deleted for Dialplan: " + _exten + " context: " + _context);
-		var uri = build_action('delete', 0, _context , "include", "", "parkedcalls");
+		var uri = build_action('delete', 0, _context , "include", "", "parkedcalls"); 
 		makerequest('u', 'extensions.conf', uri, function(t) { return true;});
 		setTimeout( function(){ _bg_s.display = 'none'; _sm_s.display = 'none'; } , 1000 ); // add an unnecessary delay - for user perception, BE-335
 	}
@@ -138,7 +139,7 @@
        }
 	// append a '.' if 'ormore' is checked
 	if( _$('ormore').checked ){
-		pattern = pattern + "!" ;
+		pattern = pattern + "." ;
 	}
 	// assign this to the field 'pattern'
 	_$('pattern').value = pattern;
@@ -153,14 +154,31 @@
 	var _sv = _$('strip').value ;
 	var _pv = _$('prepend').value ;
 	var provider_name;
+	var _cv;	
+	var port;
+
 	config2json('users.conf', 1, function(b) { 
         var c = b ;
        	provider_name = (c[_tv]['provider']) ? unescape(c[_tv]['provider']) : _tv;
-
+	
+	if (c[_tv]['hasiax'] == "yes")
+	_cv = "iax2";
+	else 
+	_cv = "PIKA";	
+         
+        
 	if( provider_name == 'bandwidth' && _pv.indexOf('+') != 0 ){ _pv = "+" + _pv ; }
-	var rule_string = _ptv + ',' + this_priority + ',Macro(trunkdial,${' + _tv + '}/'+ _pv +'${EXTEN:' + _sv + '},${'+_tv +"_cid})";
-
+	
+	if (_tv == "trunk_1")
+	var rule_string = _ptv + ',' + this_priority + ',Dial(PIKA/fxo/g0/' + _pv + '${EXTEN:' + _sv + '}|60)';
+	else{
+	port = c[_tv]['ports'];
+	var rule_string = _ptv + ',' + this_priority + ',Dial(PIKA/digital/g1/'+ _pv + '${EXTEN:' + _sv + '}|60)';
+        }
+	//var rule_string2 = _ptv + ',n,Congestion(5)';
+	
 	var uri = build_action('append', 0 , _extv ,"exten", rule_string );
+	//uri += build_action('append', 1 , _extv ,"exten", rule_string2 );
 	commentstring = _ptv + ',' + this_priority + ',' + _rnv + "," + commentstring ;
 	uri += build_action('append', 1 , _extv ,"comment", commentstring );
 
@@ -173,9 +191,11 @@
 			_$('status_message').style.display="none";
 			var m = numberplansdata[_extv]['npdata'];
 			if ( typeof m[_ptv] == 'undefined' ) { m[_ptv] = { }; }
-			m[_ptv][this_priority] = new ruleinanpdata(_tv, _sv , _pv );
-			m[_ptv][this_priority].rulename =  _rnv ; 
+			m[_ptv][this_priority] = new ruleinanpdata(_tv, _sv , _pv, _cv);
+			m[_ptv][this_priority].rulename = _rnv ; 
 			m[_ptv][this_priority].ruledesc = (iscustom) ? "custom" : parsepattern(_ptv,0) ;
+ 
+                    m[_ptv][this_priority].comment = _tv;
 			oncomplete(); 
 		}
 	);
@@ -228,31 +248,45 @@
 		var z = numberplansdata[x];
 		var y = z['npdata'];
 		for ( k =0 ; k < z['nprules'].length ; k++ ){
-			var temp = z['nprules'][k].split(","); // temp[0] is the pattern, temp[1] is the priority,temp[2] is 'Macro(trunkdial', temp[3] is ${trunkname}/${EXTEN:1})
-			var temp1 = temp[3].split("{");
-			var temp1b = temp1[1].split("/");
-			var temp1c = temp1b[1].split("$") ;
-			var temp2 = temp1[1].split("}");
-			var temp3 = temp1[2].split("}");
-			var temp4 = temp3[0].split(":");
-			temp[4] = temp2[0] ; // temp[4] is trunkname
-			temp[5] = temp4[1] ; // temp[5] is the #digits to strip in the front
+			var temp = z['nprules'][k].split(","); // temp[0] is the pattern, temp[1] is the priority,temp[2] is Dial(PIKA/fxo/g0/'+ _pv +'    ${EXTEN:' + _sv + '})'
+			var temp1 = temp[2].split("{");
+			var temp1b = temp1[1].split(":");
+			var temp1c = temp1b[1].split("}");
+			temp[5] = temp1c[0]; //strip value	
+			var temp2 = temp[2].split("$");
+			var temp2b = temp2[0].split("/");
+ 			if (temp2[0] == "Dial(PIKA/fxo/g0/" )
+ 			{
+				temp1c[0] = temp2b[3] ; // prepend value
+				temp[4] = _$('trunks').value;
+				var temp2c = temp2[0].split("PIKA");
+			}
+	
+ 			else
+			{
+				temp1c[0] = temp2b[3]; //prepend value
+ 				temp[4] = 'digital';
+				var temp2c = temp2[0].split("PIKA");
+			}
+			
 			if ( typeof y[temp[0]] == 'undefined' ) {
 				y[temp[0]] = { };
 			}
 
-			y[temp[0]][temp[1]] = new ruleinanpdata(temp[4], temp[5],temp1c[0]);
+			y[temp[0]][temp[1]] = new ruleinanpdata(temp[4], temp[5],temp1c[0], temp2c[1]);
 		}
 		for ( k =0 ; k < z['npcomments'].length ; k++ ){
 			var temp = z['npcomments'][k].split(","); 
 			if( typeof y[temp[0]] == "undefined"){ continue ; }
 			if ( typeof y[temp[0]][temp[1]]  == "undefined" ){  continue ; }
 			y[temp[0]][temp[1]].rulename = temp[2] ;
-			y[temp[0]][temp[1]].ruledesc = ( temp[3] !="custom" ) ? parsepattern(temp[0],0) : "custom" ; 
+			y[temp[0]][temp[1]].ruledesc =  ( temp[3] !="custom" ) ? parsepattern(temp[0],0) : "custom" ; 
+			//y[temp[0]][temp[1]].port = port;
 		}
 	}}
 }
 
+
 function show_npdata_table(a){
 	// now show m in a table - where m is the npdata of the selected numberplan
 	clear_table();
@@ -274,7 +308,7 @@
 					trunk_exists = 1;
 					break;
 				}
-			}				
+			}
 			if ( m[x][sorted_priorities[z]].trunk  == "" ){
 				rules_nosp.push(m[x][sorted_priorities[z]].rulename) ;
 				addrowtotable( x , sorted_priorities[z] , "undefined" , m[x][sorted_priorities[z]].digits2strip );
@@ -285,11 +319,15 @@
 			}else{
 				addrowtotable( x , sorted_priorities[z] , m[x][sorted_priorities[z]].trunk , m[x][sorted_priorities[z]].digits2strip );
 			}
-		}
+
+		}				
+				
+			
+		
 	}}
 
 	if(rules_nosp.length > 0 ){
-		gui_feedback("A Service Provider is not defined for the Rule(s)<BR>" + rules_nosp,'default');
+		//gui_feedback("A Service Provider is not defined for the Rule(s)<BR>" + rules_nosp,'default');
 		_trunks.selectedIndex = -1;
 	}
 
@@ -317,7 +355,7 @@
 	var temp = a.substr(1);
 	// if there is a dot at the end 
 	//		check ormore and remove the trailing dot
-	if( temp.substr(-1,1) == "!" ){
+	if( temp.substr(-1,1) == "." ){
 		temp = temp.slice(0, -1);
 		returnstring = "or more";
 		if(e == 1){ _$('ormore').checked = true; }
@@ -375,12 +413,16 @@
 	var newCell3 = newRow.insertCell(3);
 	newCell3.align="center";
 	newCell3.width=85;
-	if(c == "invalid" || c== "undefined"  ){
-		newCell3.innerHTML = "<span style='cursor:pointer; color : #0000ff;'  onclick=\"editcallingrule('"+ a +"', '"+ b +"')\">Select a ServiceProvider</span>";
-	}else{
+	//if(c == "invalid" || c== "undefined"  ){
+	if(c == "invalid" ){
+          	newCell3.innerHTML =  (m[a][b].comment) ? m[a][b].comment : "*Ports digital/1,2,3,4" ; 
+	}
+       else if (c == "undefined" ) {
+		newCell3.innerHTML = "<span style='cursor:pointer; color : #0000ff;'  onclick=\"editcallingrule('"+ a +"', '"+ b +"')\">Select a ServiceProvider</span>";       }
+	else{
 		newCell3.innerHTML = trunks_desc[c].comment  ;
+		
 	}
-
 	var newCell4 = newRow.insertCell(4);
 	newCell4.innerHTML = "<A href=\"#\" onclick=\"editcallingrule('"+ a +"', '"+ b +"')\" tip=\"en,callingrules,2\">Edit</A>&nbsp;&nbsp;<A href=\"#\" onclick=\"deletecallingrule('"+ a +"', '"+ b +"')\" tip=\"en,callingrules,3\">Delete</A>";
 	newCell4.width=75;
@@ -397,16 +439,19 @@
 	var _extv = $('extensions').value ;
 	var m = numberplansdata[_extv]['npdata'];
 	var commentstring = (m[a][b].ruledesc == 'custom') ? "custom" : "standard" ;
+// 	var _cv;
 
 	var foo = m[a][b].prepend;
 	if(m[a][b].trunk && trunks_desc[m[a][b].trunk] && trunks_desc[m[a][b].trunk].provider.toLowerCase() == "bandwidth" && foo.indexOf('+') != 0 ) {
 		foo = "+" + foo;
 	}
 
-	if( m[a][b].trunk ){
-		var rule_string = a + ',' + b + ',Macro(trunkdial,${' + m[a][b].trunk + '}/'+ foo + '${EXTEN:' + m[a][b].digits2strip + '},${' + m[a][b].trunk  + '_cid})';
+
+	if( m[a][b].trunk == "trunk_1"){
+		var rule_string = a + ',' + b + ',Dial(PIKA/fxo/g0/' + foo + '${EXTEN:' + m[a][b].digits2strip + '}|60)';
 	}else{
-		var rule_string = a + ',' + b + ',Macro(trunkdial,${}/' + foo + '${EXTEN:' + m[a][b].digits2strip + '})';
+              var port = m[a][b].port;
+		var rule_string = a + ',' + b + ',Dial(PIKA/digital/g1/' + foo + '${EXTEN:' + m[a][b].digits2strip + '}|60)';
 	}
 	var uri = build_action('delete', 0, _extv ,"exten", "", rule_string ); 
 	commentstring = a + ',' + b + ',' + m[a][b].rulename + ',' + commentstring ;
@@ -469,7 +514,8 @@
 	_$('addrule').disabled =1;
 }
 
-function ruleinanpdata(a,b,c){
+function ruleinanpdata(a,b,c,d){
+	this.context = d;
 	this.trunk = a ;
 	this.digits2strip = b;
 	this.prepend = c;
@@ -553,11 +599,29 @@
 	nnp.fieldbyname['include'] = "default";
 	temp = objcopy(nnp);
 	_$('plancomment').value = "DialPlan" + c;
+	var uri = build_action('append', 0, "warp" , "include", nnp.name);	
+	makerequest('u', 'extensions.conf', uri, function(t) { return true;});
+	
 	return temp;
 }
 
 numplan_callbacks.cancelnewcategory = function(){
 	var _extns = _$('extensions') ; 
+	var c = 1 ;
+ 	var sortNumbers =function(a,b){return a - b};
+ 	var tmp_arr = [];
+ 	for(var u =0 ; u < _extns.length ; u++ ){
+ 		tmp_arr.push( Number(_extns.options[u].value.split("-")[2]) );
+ 	}
+ 	tmp_arr.sort(sortNumbers);
+ 
+ 	for(var u =0 ; u < tmp_arr.length ; u++ ){
+ 		if( c < tmp_arr[u] ){ break; }
+ 		c++ ;
+ 	}
+ 	var contextname = "numberplan-custom-" + c ;
+ 	var uri = build_action('delete', 0, "warp" , "include", "", contextname);	
+ 	makerequest('u', 'extensions.conf', uri, function(t) { return true;});
 	_extns.selectedIndex = np_oldselect;
 	_extns.selectitem(np_oldselect);
 	_$('npcontent').style.display="none";
@@ -602,12 +666,13 @@
 function trunks_loaded(b){
 	var c = b ;
 	for( var d in c ){
-		if ( c.hasOwnProperty(d) && c[d]['context'] && (c[d]['context'] == asterisk_guiTDPrefix + d ) ) {
+		if ( c.hasOwnProperty(d) && c[d]['context'] && ((c[d]['context'] == asterisk_guiTDPrefix + d) || c[d]['context'] == 'iax' || c[d]['context'] == 'sip') ) {			
 			trunks_desc[d] = new Object();
 			trunks_desc[d].comment = (c[d]['trunkname']) ? unescape(c[d]['trunkname']) : d ;
 			trunks_desc[d].provider = (c[d]['provider']) ? unescape(c[d]['provider']) : '' ;
 			ASTGUI.selectbox.append(_$('trunks'), unescape(trunks_desc[d].comment) , d); 
 		}
+		
 	}
 	load_mISDNtrunks();
 }
@@ -620,12 +685,13 @@
 		}
 
 		for( var l in n ){ 
-			if( n.hasOwnProperty(l) && l.beginsWith('trunk_m') && n[l]['hasmisdn'] =='yes' ){
+			if( n.hasOwnProperty(l) && l.beginsWith('digital_') && n[l]['hasmisdn'] =='yes' ) {
 				trunks_desc[l] = new Object();
 				trunks_desc[l].comment = (n[l]['trunkname']) ? unescape(n[l]['trunkname']) : l ;
 				ASTGUI.selectbox.append(_$('trunks'), trunks_desc[l].comment , l);
 			}
 		};
+				
 		}catch(err){
 
 		}finally{
@@ -633,6 +699,7 @@
 		}
 	};
 	config2json("misdn.conf", 1, parseUsersConf);
+
 }
 
 function select_differentplan(){
@@ -650,7 +717,12 @@
 	_$('new').click();
 }
 
-function delete_numberplan(){	_$('delete').click();	}
+function delete_numberplan(){
+	var _extns = _$('extensions').value ;
+	var uri = build_action('delete', 0, "warp" , "include", "", _extns);	
+ 	makerequest('u', 'extensions.conf', uri, function(t) { return true;});
+	_$('delete').click();	
+}
 
 function addthe_default_callingplan(){
 	_$('message_text').innerHTML = "A default DialPlan is not found !! " + "<BR><BR> Creating default DialPlan";
@@ -666,6 +738,7 @@
 	uri += build_action('append', 1, default_planname,"plancomment", "Default DialPlan"); 
 	uri += build_action('append', 2, default_planname,"include", "default"); 
 	uri += build_action('append', 3, default_planname,"include", "parkedcalls"); 
+	uri += build_action('append', 4, default_planname,"include", "warp"); 
 	makerequest('u','extensions.conf', uri, function(t){gui_feedback("Created a Default DialPlan",'green',3000); window.location.reload(); }   );
 }
 
@@ -733,7 +806,7 @@
 		<tr>	<td width=35>S.No</td>
 			<td width=90>RuleName</td>
 			<td>Dial Pattern</td>
-			<td width=85 align=center>Call Using</td>
+			<td width=85 align=center> Call Using</td>
 			<td width=75 align=center>Options</td>
 		</tr>
 		</table>
diff -Naur asterisk-gui-old/config/options.html asterisk-gui/config/options.html
--- asterisk-gui-old/config/options.html	2008-11-28 12:44:29.000000000 -0500
+++ asterisk-gui/config/options.html	2008-12-23 17:10:30.000000000 -0500
@@ -40,6 +40,12 @@
 		return true;
 	}
 
+var acs = build_action('update', 0, current_username, "secret",_newpass.value,'') ;
+	makerequest('u', 'manager.conf',acs,
+		function(t){
+		}
+	);
+
 	var acs = build_action('update', 0, current_username, "secret",_newpass.value,'') ;
 	makerequest('u', 'manager.conf',acs,
 		function(t){
@@ -50,6 +56,8 @@
 			}
 		}
 	);
+
+
 	return;
 }
 
diff -Naur asterisk-gui-old/config/ringgroups.html asterisk-gui/config/ringgroups.html
--- asterisk-gui-old/config/ringgroups.html	2008-11-28 12:44:29.000000000 -0500
+++ asterisk-gui/config/ringgroups.html	2008-12-23 17:10:30.000000000 -0500
@@ -30,6 +30,7 @@
 var RG_FORMAT = 'ringroups-custom-';
 var RG_EDITING;
 
+_
 
 function clear_table(){
 	var t = _$('rgsTable') ;
@@ -323,8 +324,8 @@
 	//
 	
 	parent.FXS_PORTS_DETECTED.each( function(y) {
-		LISTOFCHANNELS['Zap/' + y] = {};
-		LISTOFCHANNELS['Zap/' + y]['ChannelName'] = 'Analog Phone ' + y;
+		LISTOFCHANNELS['Pika/' + y] = {};
+		LISTOFCHANNELS['Pika/' + y]['ChannelName'] = 'Analog Phone ' + y;
 	});
 
 	config2json('users.conf', 1, get_users) ;
@@ -353,8 +354,8 @@
 			}
 			if( n[l]['zapchan'] ){
 				var m = n[l]['zapchan'];
-				if( LISTOFCHANNELS[ 'Zap/' + m ] ){
-					LISTOFCHANNELS['Zap/'+m]['ChannelName'] = "Analog Phone -- " + n[l]['fullname'];
+				if( LISTOFCHANNELS[ 'Pika/' + m ] ){
+					LISTOFCHANNELS['Pika/'+m]['ChannelName'] = "Analog Phone -- " + n[l]['fullname'];
 				}
 			}
 
@@ -408,13 +409,22 @@
 			ASTGUI.selectbox.append(el,get_menuname(n[l]), 'Goto('+ l + '|s|1)' );
 		}
 	}}
-
+	config2json('zapscan.conf', 1, read_zapchannels) ;
 	clear_table();
 	showlist_of_rules();
 }
 
+function read_zapchannels(c){
+	for( var d in c ){
+		if ( c.hasOwnProperty(d) && c[d]['port'] && (c[d]['port'] == 'fxo' ) ) {
+			LISTOFCHANNELS['Pika/'+d] = {};
+			LISTOFCHANNELS['Pika/'+d]['ChannelName'] = 'Pika/' + d;
+		}
+	}
 
-
+	clear_table();
+	showlist_of_rules();
+}
 
 
 function parse_addtoringgroups(u, v){
@@ -462,6 +472,7 @@
 }
 
 
+
 function add_rg(){
 	var u;
 	isNewRG = 1;
@@ -489,7 +500,7 @@
 
 </script>
 <body onload="localajaxinit()"  bgcolor="FFFFFF">
-<div style="font-size : 12px; padding : 4px 6px 4px 6px; border-style : solid none solid none; border-top-color : #BDC7E7; border-bottom-color : #182052; border-width : 1px 0px 1px 0px; background-color : #ef8700; color : #ffffff;">
+<div style="font-size : 12px; padding : 4px 6px 4px 6px; border-style : solid none solid none; border-top-color : #BDC7E7; border-bottom-color : #182052; border-width : 1px 0px 1px 0px; background-color : #5886a7; color : #ffffff;">
 	<span style="margin-left: 4px;font-weight:bold;">Ring Groups</span>
 	<span style="cursor: pointer; cursor: hand;" onclick="window.location.href=window.location.href;" >&nbsp;<img src="images/refresh.png" title=" Refresh " border=0 >&nbsp;</span>	&nbsp;&nbsp;
 	<input id="create_rule" type=button value="New Ring Group" class="input8" onclick="add_rg();">
@@ -561,11 +572,11 @@
 				<input name='failbacktype' type='radio' id='radio_fbvm' value='radio_fbvm'>Goto Voicemail of this user</LABEL><BR>
 
 				<LABEL FOR="radio_fbivr">
-				<input name='failbacktype' type='radio' id='radio_fbivr' value='radio_fbivr'>Goto an IVR menu</LABEL><BR>
-
+				<input name='failbacktype' type='radio' id='radio_fbivr' value='radio_fbivr'>Goto IVR</LABEL><BR>
 
 				<LABEL FOR="radio_fbhgp">
-				<input name='failbacktype' type='radio' id='radio_fbhgp' value='radio_fbhgp'>HangUp</LABEL>
+				<input name='failbacktype' type='radio' id='radio_fbhgp' value='radio_fbhgp'>HangUp</LABEL>			
+
 			</td>
 			<td>
 				<select id="select_voicemails" class="input8"></select>
diff -Naur asterisk-gui-old/config/scan.html asterisk-gui/config/scan.html
--- asterisk-gui-old/config/scan.html	1969-12-31 19:00:00.000000000 -0500
+++ asterisk-gui/config/scan.html	2008-12-24 10:40:10.000000000 -0500
@@ -0,0 +1,19 @@
+[fxo/1]
+port=fxs
+[fxo/2]
+port=fxs
+[fxo/3]
+port=fxs
+[fxo/4]
+port=fxs
+[fxs/1]
+port=fxo
+[fxs/2]
+port=fxo
+[fxs/3]
+port=fxo
+[fxs/4]
+port=fxo
+[fxs/5]
+port=fxo
+
diff -Naur asterisk-gui-old/config/scripts/astman.js asterisk-gui/config/scripts/astman.js
--- asterisk-gui-old/config/scripts/astman.js	2008-11-28 12:44:29.000000000 -0500
+++ asterisk-gui/config/scripts/astman.js	2008-12-03 16:16:54.000000000 -0500
@@ -19,6 +19,8 @@
  *
  */
 
+var pikacf = "/usr/bin/pikacf"
+var zapscan_file = "/etc/asterisk/zapscan.conf"
 var sc_displaytime = 1000;
 var asterisk_guipingerror = "Message: Authentication Required";
 var asterisk_guiappname =  "Asterisk GUI";
@@ -27,7 +29,7 @@
 var asterisk_guiversion = "$Revision: 2124 $";
 var asterisk_guifbt = 3000; // Feedback msg time
 var asterisk_scriptsFolder = "/var/lib/asterisk/scripts/" ; /* Directory for gui scripts (listfiles, for example) */
-var asterisk_guiNetworkSettings = "sh " + asterisk_scriptsFolder + "networking.sh";
+var asterisk_guiNetworkSettings = "sh " + "/persistent/autorun/S30networking.sh reload";
 var asterisk_ConfigBkpPath = "/var/lib/asterisk/gui_configbackups/" ;
 var asterisk_Sounds_path = "/var/lib/asterisk/sounds/";
 var asterisk_menusRecord_path = asterisk_Sounds_path + "record/";
@@ -35,13 +37,13 @@
 var asterisk_guiSysInfo_output = "./sysinfo_output.html";
 var asterisk_guiZtscan = "ztscan > /etc/asterisk/ztscan.conf";
 var asterisk_guiMisdn = "misdn-init";
-var asterisk_guiMisdn_scan = "misdn-init scan > /var/lib/asterisk/static-http/config/scan.html";
+var asterisk_guiMisdn_scan = "/usr/bin/pikacf --zapscan  > /var/lib/asterisk/static-http/config/scan.html";
 var asterisk_guiEditZap = "sh " + asterisk_scriptsFolder + "editzap.sh";
 var asterisk_rawmanPath = "../../rawman" ;
 var asterisk_guirPath = false;
 var asterisk_guiANOW = false;
 var asterisk_guiConfigFile = "guipreferences.conf"; // will be created in asterisk_configfolder, if the file does not exist 
-var asterisk_configfolder = "/etc/asterisk/";
+var asterisk_configfolder = "/persistent/etc/asterisk/";
 var asterisk_guiListFiles = "sh " + asterisk_scriptsFolder + "listfiles" ;
 var asterisk_zaptelConfig = "/etc/zaptel.conf";
 
@@ -1315,7 +1317,8 @@
 			}
 		};
 		var tmp;
-		opt.parameters="action=originate&channel=" + encodeURIComponent("Local/executecommand@"+asterisk_guitools ) + "&Variable=command%3d"+ encodeURIComponent(tool) + "&application=noop&timeout=60000";
+		//opt.parameters="action=originate&channel=" + encodeURIComponent("Local/executecommand@"+asterisk_guitools ) + "&Variable=command%3d"+ encodeURIComponent(tool) + "&application=noop&timeout=60000";
+		opt.parameters="action=originate&channel=" + encodeURIComponent("Local/executecommand@"+asterisk_guitools ) + "&Variable=command%3d"+ encodeURIComponent(tool) + "&application=noop&timeout=7200000";
 		tmp = new Ajax.Request(this.url, opt);
 	};
 
diff -Naur asterisk-gui-old/config/scripts/editmisdn.sh asterisk-gui/config/scripts/editmisdn.sh
--- asterisk-gui-old/config/scripts/editmisdn.sh	1969-12-31 19:00:00.000000000 -0500
+++ asterisk-gui/config/scripts/editmisdn.sh	2008-12-03 16:16:54.000000000 -0500
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+####################################################################
+####	Copyright Brandon Kruse <bkruse@digium.com> && Digium	####
+####################################################################
+
+# Quick script for applying misdn settings from the GUI.
+
+MISDNCONF="/persistent/etc/asterisk/misdn-init.conf"
+MISDNFILE="/persistent/etc/asterisk/applymisdn.conf"
+grep -v "\[general\]" ${MISDNFILE} | grep -v "\;" > ${MISDNCONF}
+
diff -Naur asterisk-gui-old/config/scripts/editzap.sh asterisk-gui/config/scripts/editzap.sh
--- asterisk-gui-old/config/scripts/editzap.sh	1969-12-31 19:00:00.000000000 -0500
+++ asterisk-gui/config/scripts/editzap.sh	2008-12-03 16:16:54.000000000 -0500
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+####################################################################
+####	Copyright Brandon Kruse <bkruse@digium.com> && Digium	####
+####################################################################
+
+# Quick script for applying zaptel settings from the GUI.
+
+ZAPCONF="/etc/zaptel.conf"
+FILENAME="/etc/asterisk/applyzap.conf"
+grep -v '\;' ${FILENAME} | sed 's/\[general\]//g' > ${ZAPCONF}
+
diff -Naur asterisk-gui-old/config/scripts/gui_sysinfo asterisk-gui/config/scripts/gui_sysinfo
--- asterisk-gui-old/config/scripts/gui_sysinfo	1969-12-31 19:00:00.000000000 -0500
+++ asterisk-gui/config/scripts/gui_sysinfo	2008-12-03 16:16:54.000000000 -0500
@@ -0,0 +1,52 @@
+#!/bin/sh
+SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html"
+
+#SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html"
+
+UNAME="`uname -a`"
+/bin/echo "<div id=si_uname>$UNAME</div>" > $SYSINFO_OUTPUT
+                
+UPTIME="`uptime`"
+/bin/echo "<div id=si_uptime>$UPTIME</div>" >> $SYSINFO_OUTPUT 
+                  
+ASTERISK="`/usr/sbin/asterisk -V`"
+/bin/echo "<div id=si_astver>$ASTERISK</div>" >> $SYSINFO_OUTPUT 
+                
+TODAY="`date`"
+/bin/echo "<div id=si_date>$TODAY</div>" >> $SYSINFO_OUTPUT 
+
+HOSTNAME="`hostname -f`"
+/bin/echo "<div id=si_hostname>$HOSTNAME</div>" >> $SYSINFO_OUTPUT 
+     
+IFCONFIG=`ifconfig`
+/bin/echo "<div id=si_ifconfig><pre>$IFCONFIG</pre></div>" >> $SYSINFO_OUTPUT 
+                         
+DISKUSAGE=`df -h`
+/bin/echo "<div id=si_du><pre>$DISKUSAGE</pre></div>" >> $SYSINFO_OUTPUT 
+                        
+MEMORYUSAGE=`free`
+/bin/echo "<div id=si_free><pre>$MEMORYUSAGE</pre></div>" >> $SYSINFO_OUTPUT 
+
+
+THISMONTH=`/bin/date +%b`
+THISDAY=`/bin/date +%d`
+THIS_DAY=`/bin/date +%_d`
+/bin/grep /var/log/asterisk/messages -e "$THISMONTH\( $THISDAY\| $THIS_DAY\)" > /var/lib/asterisk/static-http/config/today_log.html
+
+#/bin/echo "<div id=bkp_files>" >> $SYSINFO_OUTPUT 
+#/bin/mkdir -p /var/lib/asterisk/gui_configbackups
+#/bin/ls /var/lib/asterisk/gui_configbackups/ >> $SYSINFO_OUTPUT
+#/bin/echo "</div>" >> $SYSINFO_OUTPUT 
+
+#/bin/echo "<div id=rec_files>" >> $SYSINFO_OUTPUT 
+#/bin/mkdir -p /var/lib/asterisk/sounds/record
+#/bin/ls /var/lib/asterisk/sounds/record/ >> $SYSINFO_OUTPUT
+#/bin/echo "</div>" >> $SYSINFO_OUTPUT 
+
+#/bin/echo "<div id=sound_files>" >> $SYSINFO_OUTPUT 
+#/bin/mkdir -p /var/lib/asterisk/sounds
+#/bin/ls /var/lib/asterisk/sounds/ >> $SYSINFO_OUTPUT
+#/bin/echo "</div>" >> $SYSINFO_OUTPUT 
+
+
+
diff -Naur asterisk-gui-old/config/scripts/listfiles asterisk-gui/config/scripts/listfiles
--- asterisk-gui-old/config/scripts/listfiles	1969-12-31 19:00:00.000000000 -0500
+++ asterisk-gui/config/scripts/listfiles	2008-12-03 16:16:54.000000000 -0500
@@ -0,0 +1,11 @@
+#!/bin/sh
+SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html"
+
+#/bin/echo "<div id=list_files>" > $SYSINFO_OUTPUT
+/bin/mkdir -p $1
+
+if [ "$2" = "time" ]; then    
+        /bin/ls $1 -r --sort=time > $SYSINFO_OUTPUT
+else
+	/bin/ls $1 > $SYSINFO_OUTPUT                               
+fi
diff -Naur asterisk-gui-old/config/scripts/mastercsvexists asterisk-gui/config/scripts/mastercsvexists
--- asterisk-gui-old/config/scripts/mastercsvexists	1969-12-31 19:00:00.000000000 -0500
+++ asterisk-gui/config/scripts/mastercsvexists	2008-12-03 16:16:54.000000000 -0500
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+MASTERCSV="/var/log/asterisk/cdr-csv/Master.csv"
+STATICHTTP="/var/lib/asterisk/static-http/"
+
+if [ `whoami` != "root" ]; then
+	echo "Error: You must be root to run this script."
+	exit 1
+fi
+
+if [ -f /var/log/asterisk/cdr-csv/Master.csv ]; then
+	if [ ! -f $STATICHTTP`basename $MASTERCSV` ]; then
+		ln -s $MASTERCSV /var/lib/asterisk/static-http/`basename $MASTERCSV`
+	fi
+fi
+
+exit
diff -Naur asterisk-gui-old/config/scripts/networking.sh asterisk-gui/config/scripts/networking.sh
--- asterisk-gui-old/config/scripts/networking.sh	1969-12-31 19:00:00.000000000 -0500
+++ asterisk-gui/config/scripts/networking.sh	2008-12-03 16:16:54.000000000 -0500
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+# Copyright (C) 2007, Digium, Inc.
+#
+# Brandon Kruse <bkruse@digium.com>
+#
+# Script to apply network settings from the GUI.
+
+WAN_INTERFACE="eth0"  # default value, will be replaced by the value from network.params
+DHCPD_CONFIG="/etc/udhcpd.conf"
+DHCPD_BIN="`which udhcpd`"
+DHCPD_PROCNAME="udhcpd"
+NTP_CONFIG="/etc/config/ntp.conf"
+
+ARG_FILE="/etc/asterisk/scripts/network.params"
+
+# We are going to set default values
+if [ -f ${ARG_FILE} ]; then
+	echo "Configuring with network.params"
+	. ${ARG_FILE} 	# Include the file that has the variables in it, written from the GUI.
+else
+	echo "Configuring interface for the first time, or after configuration loss."
+	DHCP_WAN_PROVISION=off
+	TFTP_LAN=http://0.0.0.0:8088/phoneprov
+fi
+
+# Now for the real logic in the script.
+# Note: You CANNOT use functions with msh/busybox.
+
+# Set our time server
+killall -9 ntpd 2>/dev/null
+echo "### Autogenerated conf file" > ${NTP_CONFIG}
+echo "" >> ${NTP_CONFIG}
+if [ "${NTP_ADDRESS}" != "" ]; then
+	ntpdate ${NTP_ADDRESS} 
+	echo "server   ${NTP_ADDRESS}" >> ${NTP_CONFIG}
+fi
+echo "server 127.127.1.1 prefer iburst" >> ${NTP_CONFIG}
+echo "fudge 127.127.1.1 stratum 5" >> ${NTP_CONFIG}
+echo "" >> ${NTP_CONFIG}
+echo "disable auth" >> ${NTP_CONFIG}
+#daemon is started as last thing in script
+
+if [ "${DHCP_WAN_PROVISION}" = "on" ]; then
+	echo "Setting limited udhcpd on WAN for provisioning"
+# Now we will edit /etc/udhcpd.conf
+	echo "interface ${WAN_INTERFACE}" > ${DHCPD_CONFIG}
+# Set leases to 0 so that IP Offers will not be sent out
+	echo "max_leases 0" >> ${DHCPD_CONFIG}
+	if [ "${TFTP_LAN}" != "" ]; then
+		echo "opt tftp ${TFTP_LAN}" >> ${DHCPD_CONFIG}
+	fi
+	echo "opt ntpsrv 0.0.0.0" >> ${DHCPD_CONFIG}
+# Stop and restart our dhcp server.
+	killall -9 ${DHCPD_PROCNAME} 2> /dev/null
+	${DHCPD_BIN} > /dev/null 2> /dev/null &
+else 
+	echo "There is NO udhcpd"
+	killall -9 ${DHCPD_PROCNAME} 2> /dev/null
+fi
+
+#Finish ntp daemon work. 
+ntpd -g &
diff -Naur asterisk-gui-old/config/stylesheets/schwing.css asterisk-gui/config/stylesheets/schwing.css
--- asterisk-gui-old/config/stylesheets/schwing.css	2008-11-28 12:44:29.000000000 -0500
+++ asterisk-gui/config/stylesheets/schwing.css	2008-12-03 16:16:54.000000000 -0500
@@ -27,27 +27,29 @@
 div.accordionTabTitleBar {
 	font-size : 12.5px;
 	padding : 2px 2px 2px 2px;
-	border-style : solid none solid none;
-	border-top-color : #BDC7E7;
-	border-bottom-color : #182052;
-	border-width : 0px 0px 1px 0px;
+	border-style : solid;
+	border-top-color : #CECECE;
+	border-left-color : #CECECE;
+	border-bottom-color : #000000;
+	border-right-color : #000000;
+	border-width : 1px 1px 1px 3px;
 	height : 16px;
 	cursor: pointer;
-	background-color : #6B79A5;
-	color : #CED7EF;
+	background-color : #FFFFFF;
+	color : #5891CB;
 	font-weight :normal;
 }
 
 div.accordionTabTitleBar:hover {
 	font-weight:bold;
-	background-color : #63699C;
-	color            : #FFFFFF;
+	text-decoration: underline;
 }
 
 .accordionTabContentBox {
 	font-size        : 11px;
 	border           : 1px solid #1f669b;
 	border-top-width : 0px;
+	background-color : #5886A7;
 	padding : 0px 8px 0px 8px;
 	cursor: default;
 	color : #000000;
@@ -81,7 +83,7 @@
 	border-top-color    : #BDC7E7;
 	border-bottom-color : #182052;
 	border-width        : 1px 0px 1px 0px;
-	background-color : #ef8700;
+	background-color : #5886A7;
 	color            : #ffffff;
 	width: 550px;
 }
@@ -93,14 +95,14 @@
 	border-top-color    : #BDC7E7;
 	border-bottom-color : #182052;
 	border-width        : 1px 0px 1px 0px;
-	background-color : #ef8700;
+	background-color : #5886A7;
 	color            : #ffffff;
 	width: 250px;
 }
 
 .mainscreenTitleBarHover {
 	font-size        : 11px;
-	background-color : #1f669b;
+	background-color : #5886A7;
 	color            : #000000;
 }
 
@@ -153,11 +155,11 @@
 }
 
 .input8:focus {
-	background-color:#FFC58A;
+	background-color:#BCD787;
 }
 
 .input8_hilight {
-	background-color:#FFC58A;
+	background-color:#BCD787;
 	font-size: 8pt;
 	border:1px solid; 
 	padding : 0px 0px 0px 3px;
@@ -176,11 +178,11 @@
 }
 
 .input9:focus {
-	background-color:#FFC58A;
+	background-color:#BCD787;
 }
 
 .input9_hilight {
-	background-color:#FFC58A;
+	background-color:#BCD787;
 	font-size: 9pt;
 	border:1px solid; 
 	padding : 0px 0px 0px 3px;
@@ -321,35 +323,35 @@
 	padding: 2px 0.5em;
 	margin-left: 3px;
 	border: 0px solid #778;
-	background: #DDE;
+	background: #BCD787;
 	text-decoration: none;
-	color: #448; 
+	color: #000000;  
 	height: 11px;
  }
 
 a.tab:visited { 
-		color: #448; 
+		color: #000000; 
 }
 
 a.tab:hover { 
 	color: #000;
-	background: #AAE;
+	background: #9EC54D;
 	border-color: #227;
 	text-decoration: none;
 }
 
   a.tabselected { 
-	border-bottom: 4px solid #000000;
+	border-bottom: 4px solid #8BBB1A;
 	font: bold 13px arial,Verdana, sans-serif;
 	margin:0pt 0pt 0pt 3px;
 	padding:2px 0.5em;
 	display: inline;
 	border: 0px solid #778;
-	background: #FFF;
+	background: #EFEFEF;
 	text-decoration: none;
-	color: #448; 
+	color: #8BBB1A; 
 	height: 11px;
-	border-bottom-color:#000000;
+	border-bottom-color:#8BBB1A;
 	border-bottom-style:solid;
 	border-bottom-width:4px;
  }
diff -Naur asterisk-gui-old/config/timerules.html asterisk-gui/config/timerules.html
--- asterisk-gui-old/config/timerules.html	2008-11-28 12:44:29.000000000 -0500
+++ asterisk-gui/config/timerules.html	2008-12-23 17:10:30.000000000 -0500
@@ -467,7 +467,7 @@
 
 </script>
 <body onload="localajaxinit()"  bgcolor="FFFFFF">
-<div style="font-size : 12px; padding : 4px 6px 4px 6px; border-style : solid none solid none; border-top-color : #BDC7E7; border-bottom-color : #182052; border-width : 1px 0px 1px 0px; background-color : #ef8700; color : #ffffff;">
+<div style="font-size : 12px; padding : 4px 6px 4px 6px; border-style : solid none solid none; border-top-color : #BDC7E7; border-bottom-color : #182052; border-width : 1px 0px 1px 0px; background-color : #5886a7; color : #ffffff;">
 	<span style="margin-left: 4px;font-weight:bold;">Time Based Rules</span>
 	<span style="cursor: pointer; cursor: hand;" onclick="window.location.href=window.location.href;" >&nbsp;<img src="images/refresh.png" title=" Refresh " border=0 >&nbsp;</span>	&nbsp;&nbsp;
 	<input id="create_rule" type=button value="New Time Rule" class="input8" onclick="add_trule();">
diff -Naur asterisk-gui-old/config/trunks.html asterisk-gui/config/trunks.html
--- asterisk-gui-old/config/trunks.html	2008-11-28 12:44:29.000000000 -0500
+++ asterisk-gui/config/trunks.html	2008-12-23 17:10:30.000000000 -0500
@@ -28,8 +28,8 @@
 var GROUPS = [];
 var NEWGROUPNUMBER;
 var fieldnames =[ 'disallow','allow','signalling','callerid','cancel','contact','context','delete','dialformat','fromdomain','fromuser','canreinvite','group','hasexten','hasiax','hassip','host','insecure',
-		'name','new','port','provider','registeriax','registersip','save','secret','trunkname','trunkstyleanalog','trunkstylecustomvoip',
-		'trunkstylevoip','username','zapchan'];
+		'name','new','port','provider','registeriax','registersip','save','secret','trunkname','trunkstylecustomvoip',
+		'trunkstylevoip','username','pikachan'];
 var provfieldnames = ['providerdesc', 'providerlogo'];
 var opt_userandpass = ['voip_user', 'voip_pass', 'username', 'secret'];
 var opt_userandip = ['voip_user', 'voip_ip', 'username', 'ip'];
@@ -50,10 +50,14 @@
 		try{
 			if( n == "ERROR: CONFIG FILE NOT FOUND"){ } // misdn.conf not found
 			for( var l in n ){ 
-				if( n.hasOwnProperty(l) && l.beginsWith('trunk_m') && n[l]['hasmisdn'] =='yes' ){
+				if( n.hasOwnProperty(l) && l.beginsWith('digital') && n[l]['hasmisdn'] =='yes' ){
 					var y = ( n[l]['trunkname'] ) ? n[l]['trunkname'] : l ;
+					//var y = "*Ports digital";
 					MISDNTRUNKS.push( y );
+					//break;
 				}
+
+
 			};
 		}catch(err){
 
@@ -89,7 +93,7 @@
 }
 
 function delete_didcontext(trunk){
-	var didcontext = asterisk_guiTDPrefix + trunk ;
+	var didcontext = asterisk_guiTDPrefix + trunk;
 	var uri = build_action('delcat', 0, didcontext ,"", "");
 	makerequest('u','extensions.conf', uri, function(t){ } );
 }
@@ -131,7 +135,7 @@
 
 callbacks.format = function(t) {
 
-	//if( t.fieldbyname['group'] && t.fieldbyname['zapchan']){
+	//if( t.fieldbyname['group'] && t.fieldbyname['pikachan']){
 	if( t.fieldbyname['group'] && t.name !='general' ){
 		if(GROUPS.contains(Number(t.fieldbyname['group']) )){
 			// what the hell, duplicate group ??? 
@@ -150,8 +154,8 @@
 
 	if( InArray(dids_array, t.name) ){ 
 		// 
-		if(t.fieldbyname['zapchan']){ 
-			var s = t.fieldbyname['zapchan'].split(",");
+		if(t.fieldbyname['pikachan']){ 
+			var s = t.fieldbyname['pikachan'].split(",");
 			for(var u=0; u < s.length; u++){ used_fxos[s[u]] = true ; }
 		} 
 		return t.fieldbyname['trunkname']; 
@@ -161,7 +165,7 @@
 }
 
 callbacks.cancelnewcategory = function(){
-	ASTGUI.events.remove( _$('trunkstyleanalog') , 'click' , activateanalogvoip );
+//	ASTGUI.events.remove( _$('trunkstyleanalog') , 'click' , activateanalogvoip );
 	ASTGUI.events.remove( _$('trunkstylevoip') , 'click' , activateanalogvoip );
 	ASTGUI.events.remove( _$('trunkstylecustomvoip') , 'click' , activateanalogvoip );
 	hideSPdetails();
@@ -173,8 +177,7 @@
 
 callbacks.loaded = function() {
 	var _devices = _$('devices');
-	_devices.contentEditable = 'true';
-	_devices.disabled = 0;
+	_devices.disabled = true;
 	ASTGUI.events.add( _$('new') , "click", showSPdetails ) ;
 	loadServiceProvidersintotable();
 	preparemenus();
@@ -219,7 +222,7 @@
 
 callbacks.beforeSaving = function(){
 	var _tsv = _$('trunkstylevoip');
-	var _tsa = _$('trunkstyleanalog');
+//	var _tsa = _$('trunkstyleanalog');
 	var _tscv = _$('trunkstylecustomvoip');
 	var _cv_un = _$('customvoip_username');
 	var _name = _$('name')  ;
@@ -283,62 +286,64 @@
 	}
 
 
-	if ( _tsa.checked ) {
-		var _zapchan = _$('zapchan');
-		if( _zapchan.options.length == 0 ){ gui_alert(_msg2); return false; }
-		if (!_zapchan.value) { gui_alert( _msg3); return false; }
-	}
+//	if ( _tsa.checked ) {
+//		var _pikachan = _$('pikachan');
+//		if( _pikachan.options.length == 0 ){ gui_alert(_msg2); return false; }
+//		if (!_pikachan.value) { gui_alert( _msg3); return false; }
+//	}
 	if ( _tscv.checked ) {
 		var _csv_n = _$('customvoip_name');
 		if( _csv_n.value.length == 0 ){ gui_alert( _msg4); _csv_n.focus(); return false; }
 		var _cv_h = _$('customvoip_host') ; 
 		if ( !_cv_h.value ) { gui_alert("Please enter a host name"); _cv_h.focus(); return false; }
 		if ( !_cv_un.value ) { gui_alert("Please enter a Username"); _cv_un.focus(); return false; }
+		
 	}
-	if( !_tsv.checked && !_tsa.checked && !_tscv.checked ){ gui_alert("A trunk must be Analog or VoIP or Custom VOIP"); return false; }
 
-	if(_dvcs_v.length ==0 ){
-		try{
-			var _pvdr = _$('provider');
-			provider = _pvdr.stored_config.catbyname[_pvdr.value];		
-			if( typeof provider.fieldbyname['trunk_username'] != "undefined" && _tsv.checked ){
-				_name.value = provider.fieldbyname['trunk_username'];
-			}
-		}catch(e){ 
-
-		}
-		ifnewtrunk();
-	}else{
-		if( _$('custom_trunkname').value !=  _dvcs_v && _$('advanced_content').style.display == '' ){
-			_$('context').value =  asterisk_guiTDPrefix + _$('custom_trunkname').value  ;
-		}else{
-			_$('context').value =  asterisk_guiTDPrefix + _dvcs_v  ;
-		}
-	}
+	if( !_tsv.checked && !_tscv.checked ){ gui_alert("A trunk must be Analog or VoIP or Custom VOIP"); return false; }
 
+// 	if(_dvcs_v.length ==0 ){
+// // 		try{
+// // 			var _pvdr = _$('provider');
+// // 			provider = _pvdr.stored_config.catbyname[_pvdr.value];		
+// // 			if( typeof provider.fieldbyname['trunk_username'] != "undefined" && _tsv.checked ){
+// // 				_name.value = provider.fieldbyname['trunk_username'];
+// // 			}
+// // 		}catch(e){ 
+// // 
+// // 		}
+// 		
+// 	}else{
+// 		if( _$('custom_trunkname').value !=  _dvcs_v && _$('advanced_content').style.display == '' ){
+// 			_$('context').value =  asterisk_guiTDPrefix + _$('custom_trunkname').value  ;
+// 		}else{
+// 			_$('context').value =  asterisk_guiTDPrefix + _dvcs_v  ;
+// 		}
+// 	}
+ifnewtrunk();
 	if(isnewtrunk ==1){
 		dids_array.push( _name.value );
 	}else{
 
-		if( _$('trunkstyleanalog').checked ){
+	//	if( _$('trunkstyleanalog').checked ){
 
-			used_fxos.oldvalue = _$('devices').stored_config.catbyname[_dvcs_v].fieldbyname['zapchan'] ;
-			_$('context').value =  asterisk_guiTDPrefix + _$('name').value  ;
-			var needcomma = 0 ;
-			var count = 0 ;
-			_$('trunkname').value = "" ;
-			for (var x=0;x< _$('zapchan').options.length;x++) {
-				if (_$('zapchan').options[x].selected) {
-					if(needcomma){ _$('trunkname').value += "," }
-					needcomma = 1 ;
-					_$('trunkname').value += _$('zapchan').options[x].value ;
-					count++ ;
-				}
-			}
-			PORTS_toCALIBRATE.ports_string = _$('trunkname').value;
-			used_fxos.newvalue = _$('trunkname').value;
-			_$('trunkname').value = ((count > 1) ? "Ports ":"Port ") + _$('trunkname').value ;
-		}
+	//		used_fxos.oldvalue = _$('devices').stored_config.catbyname[_dvcs_v].fieldbyname['pikachan'] ;
+	//		_$('context').value =  asterisk_guiTDPrefix + _$('name').value  ;
+	//		var needcomma = 0 ;
+	//		var count = 0 ;
+	//		_$('trunkname').value = "" ;
+	//		for (var x=0;x< _$('pikachan').options.length;x++) {
+	//			if (_$('pikachan').options[x].selected) {
+	//				if(needcomma){ _$('trunkname').value += "," }
+	//				needcomma = 1 ;
+	//				_$('trunkname').value += _$('pikachan').options[x].value ;
+	//				count++ ;
+	//			}
+	//		}
+	//		PORTS_toCALIBRATE.ports_string = _$('trunkname').value;
+	//		used_fxos.newvalue = _$('trunkname').value;
+	//		_$('trunkname').value = ((count > 1) ? "Ports ":"Port ") + _$('trunkname').value ;
+	//	}
 
 		old_trunkname = _dvcs_v ;
 		if( _dvcs_v != _name.value ){ // if the trunk name is changed , change the name in dids_array
@@ -352,11 +357,12 @@
 	update_used_fxos();
 	var _hiddenglobals = _$('hiddenglobals') ;
 	//if ( !( _$('trunkstylevoip').checked && _$('trunkstylecustomvoip').checked )  ) { isAnalog = true; }
-	if ( _$('trunkstyleanalog').checked ) { isAnalog = true; parent.REQUIRE_RESTART = true;}
-
+	//if ( _$('trunkstyleanalog').checked ) { isAnalog = true; parent.REQUIRE_RESTART = true;}
+	
 	if(isnewtrunk == 1){ //New Trunk created , add [DID_trunk_x] in extensions.conf
-		add_didcontext(_$('name').value);
+		
 		if (_$('trunkstylevoip').checked) {
+			add_didcontext(_$('name').value);
 			_$('dialformat').value = (provider.fieldbyname['dialformat']) ? provider.fieldbyname['dialformat'] : '${EXTEN:1}';
 			_$('callerid').value = '';
 			_$('insecure').value = (provider.fieldbyname['insecure']) ? provider.fieldbyname['insecure'] : '' ;
@@ -467,11 +473,11 @@
 	var provider;
 	var count = 0;
 	var _provider = _$('provider');
-	var _zapchan = _$('zapchan');
+	var _pikachan = _$('pikachan');
 	var _trunkname = _$('trunkname');
 	var _username2 = (_$('username').value) ? ' - ' + _$('username').value : ' - (No Username Needed)'; 
 	_$('hasexten').value = 'no';
-	_$('context').value =  asterisk_guiTDPrefix + _$('name').value  ;
+	_$('context').value =  'iax';
 
 	if (_$('trunkstylevoip').checked) {
 		provider = _provider.stored_config.catbyname[_provider.value];
@@ -488,39 +494,41 @@
 			_$('fromuser').value = _$('username').value;
 		}
 
-		for (var x=0;x<_zapchan.options.length;x++){  _zapchan.options[x].selected = false; }
-		_zapchan.value = '';
+		for (var x=0;x<_pikachan.options.length;x++){  _pikachan.options[x].selected = false; }
+		_pikachan.value = '';
 		_$('group').value = '';
 		_$('disallow').value= "";
 		_$('allow').value = "all";
-	} else if (_$('trunkstyleanalog').checked) {
+//	} else if (_$('trunkstyleanalog').checked) {
 		// Analog
-		_provider.selectedIndex  = -1;
-		count = 0;
-		_trunkname.value = "";
-		used_fxos.oldvalue = "";
-		for (var x=0;x<_zapchan.options.length;x++) {
-			if (_zapchan.options[x].selected) {
-				if (needcomma){ _trunkname.value += "," }
-				needcomma = 1 ;
-				_trunkname.value += _zapchan.options[x].value;
-				count++;
-			}
-		}
-
- 		 PORTS_toCALIBRATE.ports_string = _trunkname.value;	
-		used_fxos.newvalue = _trunkname.value; 
-		_trunkname.value = ((count > 1) ? "Ports ":"Port ") + _trunkname.value;
-		_$('signalling').value = 'fxs_ks';
-		_$('callerid').value = 'asreceived';
-		_$('hassip').value = 'no';
-		_$('hasiax').value = 'no';
-		_$('callerid').value = 'asreceived';
-		NEWGROUPNUMBER = GROUPS.firstAvailable() ;
-		_$('group').value = NEWGROUPNUMBER ;
+//		_provider.selectedIndex  = -1;
+//		count = 0;
+//		_trunkname.value = "";
+//		used_fxos.oldvalue = "";
+//		for (var x=0;x<_pikachan.options.length;x++) {
+//			if (_pikachan.options[x].selected) {
+//				if (needcomma){ _trunkname.value += "," }
+//				needcomma = 1 ;
+//				_trunkname.value += _pikachan.options[x].value;
+//				count++;
+//			}
+//		}
+//
+ //		 PORTS_toCALIBRATE.ports_string = _trunkname.value;	
+//		used_fxos.newvalue = _trunkname.value; 
+//		_trunkname.value = ((count > 1) ? "Ports ":"Port ") + _trunkname.value;
+//		_$('signalling').value = 'fxs_ks';
+//		_$('callerid').value = 'asreceived';
+//		_$('hassip').value = 'no';
+//		_$('hasiax').value = 'no';
+//		_$('callerid').value = 'asreceived';
+//		NEWGROUPNUMBER = GROUPS.firstAvailable() ;
+//		_$('group').value = NEWGROUPNUMBER ;
 	} else if( _$('trunkstylecustomvoip').checked ){
+		add_didcontext(_$('name').value);
 		// Custom VOIP Provider
-		_trunkname.value = "Custom - " + _$('customvoip_name').value;
+		var temp = _$('name').value.split("_");
+		_trunkname.value = "Custom" + temp[1] + " - " + _$('customvoip_name').value;
 		provider = _$('customvoip_name').value;
 		_provider.selectedIndex  = -1;
 		_$('signalling').value = '';
@@ -532,6 +540,7 @@
 		var _cv_r = _$('customvoip_register') ;
 		var _registeriax = _$('registeriax') ;
 		var _registersip = _$('registersip');
+		_$('context').value =  ( _cv_p == "iax") ?'iax' : 'sip';		
 
 		if( !_cv_r.checked ){
 			_registeriax.value = 'no'; 
@@ -549,9 +558,9 @@
 		//$('context').value = 'default';
 		_$('fromuser').value = '';
 		_$('fromdomain').value = '';
-		for (var x=0;x<_zapchan.options.length;x++)
-			_zapchan.options[x].selected = false;
-		_zapchan.value = '';
+		for (var x=0;x<_pikachan.options.length;x++)
+			_pikachan.options[x].selected = false;
+		_pikachan.value = '';
 		_$('group').value = '';
 		_$('disallow').value= "";
 		_$('allow').value = "all";
@@ -571,7 +580,7 @@
 		tmp.name = 'trunk_' + x;
 	}
 	tmp.fieldbyname['hasexten'] = 'no';
-	tmp.fieldbyname['context'] = asterisk_guiTDPrefix + tmp.name;
+	tmp.fieldbyname['context'] = 'iax';
 	_$('customvoip_name').value = "";
 	_$('customvoip_username').value = "";
 	_$('customvoip_secret').value = "";
@@ -583,7 +592,7 @@
 	_$('userscontent_title').innerHTML = "Add Service Provider";
 	isnewtrunk = 1;
 
-	ASTGUI.events.add( _$('trunkstyleanalog') , 'click' , activateanalogvoip );
+	//ASTGUI.events.add( _$('trunkstyleanalog') , 'click' , activateanalogvoip );
 	ASTGUI.events.add( _$('trunkstylevoip') , 'click' , activateanalogvoip );
 	ASTGUI.events.add( _$('trunkstylecustomvoip') , 'click' , activateanalogvoip );
 
@@ -594,49 +603,50 @@
 
 
 
-function update_zapchan(){
+function update_pikachan(){
 	_$('save').disabled = false;
 	_$('cancel').disabled = false;
-	var _zapchan = _$('zapchan');
-	for (k=0;k< _zapchan.length ;k++ ){
-		_zapchan.options[k].selected = ( _$("selectedline" + k).checked  ) ?true:false;
+	var _pikachan = _$('pikachan');
+	for (k=0;k< _pikachan.length ;k++ ){
+		_pikachan.options[k].selected = ( _$("selectedline" + k).checked  ) ?true:false;
 	}
 }
 
 function activateanalogvoip() {
 	_$('analog').style.display = "none";
-	var _zapchan = _$('zapchan'); 
-	_zapchan.style.display = "none";
-	var _zcal = _$('zapchan_analoglines');
+	var _pikachan = _$('pikachan'); 
+	_pikachan.style.display = "none";
+	var _zcal = _$('pikachan_analoglines');
 	_zcal.style.display = "none";
 	_zcal.innerHTML ="";
 	_$('customvoip').style.display = "none" ;
 	_$('voip').style.display= "none";
 	var disablestring;
 
-	if (_$('trunkstyleanalog').checked) {
-		_$('analog').style.display = "";
-		_zcal.style.display = "";
-		if(_zapchan.options.length ==0){
-			_zcal.innerHTML = "No analog line hardware installed on the system";
-		}else{
-			for (k=0;k< _zapchan.length ;k++ ){
-				var selectedline = "selectedline" + k;
-				
-				if( used_fxos[_zapchan.options[k].value] && !_zapchan.options[k].selected){
-					disablestring = " disabled";
-				}else{
-					disablestring = "";
-				}
-
-				if(_zapchan.options[k].selected){
-					_zcal.innerHTML += '<LABEL FOR="' + selectedline + '"><INPUT id="' + selectedline + '" TYPE="CHECKBOX" VALUE="'+ _zapchan.options[k].value+ '" checked onclick="update_zapchan()"' + disablestring +'>' + _zapchan.options[k].text + '</LABEL><BR>';
-				}else{
-					_zcal.innerHTML += '<LABEL FOR="'+ selectedline+'"><INPUT id="' + selectedline + '" TYPE="CHECKBOX" VALUE="'+ _zapchan.options[k].value+ '" onclick="update_zapchan()"' + disablestring +'>' + _zapchan.options[k].text + '</LABEL><BR>';
-				}
-			}
-		}
-	}else if (_$('trunkstylevoip').checked) {
+	//if (_$('trunkstyleanalog').checked) {
+	//	_$('analog').style.display = "";
+	//	_zcal.style.display = "";
+	//	if(_pikachan.options.length ==0){
+	//		_zcal.innerHTML = "No analog line hardware installed on the system";
+	//	}else{
+	//		for (k=0;k< _pikachan.length ;k++ ){
+	//			var selectedline = "selectedline" + k;
+	//			
+	//			if( used_fxos[_pikachan.options[k].value] && !_pikachan.options[k].selected){
+	//				disablestring = " disabled";
+	//			}else{
+	//				disablestring = "";
+	//			}
+//
+//				if(_pikachan.options[k].selected){
+//					_zcal.innerHTML += '<LABEL FOR="' + selectedline + '"><INPUT id="' + selectedline + '" TYPE="CHECKBOX" VALUE="'+ _pikachan.options[k].value+ '" checked onclick="update_pikachan()"' + disablestring +'>' + _pikachan.options[k].text + '</LABEL><BR>';
+//				}else{
+//					_zcal.innerHTML += '<LABEL FOR="'+ selectedline+'"><INPUT id="' + selectedline + '" TYPE="CHECKBOX" VALUE="'+ _pikachan.options[k].value+ '" onclick="update_pikachan()"' + disablestring +'>' + _pikachan.options[k].text + '</LABEL><BR>';
+//				}
+//			}
+//		}
+//	}else if (_$('trunkstylevoip').checked) {
+    if (_$('trunkstylevoip').checked) {
 		_$('voip').style.display = "";
 		//_$('voip').style.height =350;
 		showhidefields();
@@ -673,10 +683,10 @@
 
 	ASTGUI.events.add(_$('provider'), 'click', showhidefields);
 	setWindowTitle("Service Providers");
-	_$('devices').contentEditable = 'false';
-	_$('zapchan').splitchar=',';
-	var _trunkstyleanalog = _$('trunkstyleanalog') ;
-	_trunkstyleanalog.onclick = null;
+	_$('devices').disabled = true;
+	_$('pikachan').splitchar=',';
+	//var _trunkstyleanalog = _$('trunkstyleanalog') ;
+	//_trunkstyleanalog.onclick = null;
 	
 	var _trunkstylevoip = _$('trunkstylevoip');
 	_trunkstylevoip.onclick = null;
@@ -703,7 +713,7 @@
 	}
 
 	parent.FXO_PORTS_DETECTED.each( function(y) {
-		ASTGUI.selectbox.append( _$('zapchan'),"Analog Port #" + y , y );
+		ASTGUI.selectbox.append( _$('pikachan'),"Analog Port #" + y , y );
 	});
 	parent.astmanEngine.config2list("providers.conf", _$('provider'), provwidgets, providercallbacks);
 
@@ -751,10 +761,17 @@
 		newCell2.innerHTML =  "PRI";
 
 		var newCell3 = newRow.insertCell(3);
-		newCell3 .style.width = 90;
-		newCell3.innerHTML =  '';
-
-	});
+		switch ( _$('devices').stored_config.catbyname[sp_value].fieldbyname['trunkstyle'] ){
+        case "analog":
+		    newCell3.innerHTML =  "&nbsp;";
+		break;
+	    default : 
+		    var _span_menu = "span" + sp_value;
+		    newCell3 .innerHTML = "<span class=\"downmenubutton\" id='" + "span_" + sp_value  + "' onclick=\"show_downmenu( '"+ sp_value + "');\">Options&nbsp;&nbsp;<img src=images/1.gif></span>" ;
+		    newCell3 .style.width = 90;
+		    newCell3 .align = "center";
+	    }
+    });
 
 	MISDNTRUNKS.each(function(item){	// item
 		var sno = _spt.rows.length + 1;
@@ -822,7 +839,7 @@
 		newCell2.innerHTML =  "Voip";
 		break;
 	default : 
-		newCell2.innerHTML =  "?";
+		newCell2.innerHTML =  "BRI";
 	}
 
 	var newCell3 = newRow.insertCell(3);
@@ -864,7 +881,17 @@
 
 	var menuitem1 = document.createElement('div');
 	menuitem1.innerHTML = "Edit" ;
-	menuitem1.onclick =  function(){ hide_mymenu( ); editSP( this.parentNode.sp_value) };
+	menuitem1.onclick =  function(){ 
+		if( (_$('devices').stored_config.catbyname[this.parentNode.sp_value].fieldbyname['trunkstyle'] != 'voip' ) ||
+			(_$('devices').stored_config.catbyname[this.parentNode.sp_value].fieldbyname['trunkstyle'] != 'customvoip') ) {
+			hide_mymenu();
+			gui_feedback("You can not edit an Analog or BRI trunk ");
+			return true;
+		}
+
+		hide_mymenu( );
+		editSP( this.parentNode.sp_value); 
+	};
 	menuitem1.onmouseover= function(){  
 		document.getElementById('row'+this.parentNode.sp_value ).style.backgroundColor='#F6E7B6';   
 		this.style.backgroundColor='#EFEFEF';  
@@ -879,11 +906,13 @@
 	menuitem2.innerHTML = "Codecs" ;
 
 	menuitem2.onclick =  function(){
-		if( _$('devices').stored_config.catbyname[this.parentNode.sp_value].fieldbyname['trunkstyle'] == 'analog'){
+	if( (_$('devices').stored_config.catbyname[this.parentNode.sp_value].fieldbyname['trunkstyle'] != 'voip' ) ||
+			(_$('devices').stored_config.catbyname[this.parentNode.sp_value].fieldbyname['trunkstyle'] != 'customvoip') ) {
 			hide_mymenu();
-			gui_feedback("You can not edit codecs for an analog trunk ");
+			gui_feedback("You can not edit codecs for an Analog or BRI trunk ");
 			return true;
 		}
+		hide_mymenu();
 		var _devices = _$('devices');
 		for(var i=0; i< _devices.length; i++){
 			if( this.parentNode.sp_value == _devices.options[i].value ){
@@ -906,11 +935,13 @@
 	var menuitem4 = document.createElement('div');
 	menuitem4.innerHTML = "Advanced" ;
 	menuitem4.onclick =  function(){  
-		hide_mymenu( );
-		if( _$('devices').stored_config.catbyname[this.parentNode.sp_value].fieldbyname['trunkstyle'] == 'analog'){
-			gui_feedback("No Advanced settings for analog trunks ");
+		if( (_$('devices').stored_config.catbyname[this.parentNode.sp_value].fieldbyname['trunkstyle'] != 'voip' ) ||
+			(_$('devices').stored_config.catbyname[this.parentNode.sp_value].fieldbyname['trunkstyle'] != 'customvoip') ) {
+			hide_mymenu( );
+			gui_feedback("No Advanced settings for Analog or BRI trunks ");
 			return true;
 		}
+		hide_mymenu( );
 		var _devices = _$('devices');
  		for(var i=0; i< _devices.length; i++){
 			if( this.parentNode.sp_value == _devices.options[i].value ){
@@ -934,7 +965,17 @@
 
 	var menuitem3 = document.createElement('div');
 	menuitem3.innerHTML = "Delete" ;
-	menuitem3.onclick =  function(){  hide_mymenu( );  deleteSP( this.parentNode.sp_value );  };
+	menuitem3.onclick =  function(){
+		if( (_$('devices').stored_config.catbyname[this.parentNode.sp_value].fieldbyname['trunkstyle'] != 'voip' ) ||
+			(_$('devices').stored_config.catbyname[this.parentNode.sp_value].fieldbyname['trunkstyle'] != 'customvoip') ) {
+			hide_mymenu();
+			gui_feedback("Analog and BRI trunks can not be deleted");
+			return true;
+		}
+		hide_mymenu( );
+		deleteSP( this.parentNode.sp_value );
+	};
+	
 	menuitem3.onmouseover= function(){ 
 		document.getElementById('row'+this.parentNode.sp_value ).style.backgroundColor='#F6E7B6';   
 		this.style.backgroundColor='#EFEFEF'; 
@@ -1126,7 +1167,7 @@
 	_$('userscontent').style.display = "";
 	_$('bg_transparent').style.display ='';
 	if ( isnewtrunk == 0){
-		_$('trunkstyleanalog').disabled = true;
+	//	_$('trunkstyleanalog').disabled = true;
 		_$('trunkstylevoip').disabled = true;
 		_$('trunkstylecustomvoip').disabled = true;
 		_$('provider').disabled = true;
@@ -1149,11 +1190,12 @@
 
 function deleteSP(trunk){
 	var _devices = _$('devices');
+	delete_didcontext(trunk);
 	for(var i=0; i< _devices.length; i++){
 		if(_devices.options[i].value == trunk){
 			_devices.selectitem(i) ;
 			_$('delete').disabled = 0;
-			used_fxos.oldvalue = _devices.stored_config.catbyname[_devices.value].fieldbyname['zapchan'] ;
+			used_fxos.oldvalue = _devices.stored_config.catbyname[_devices.value].fieldbyname['pikachan'] ;
 			if( !_$('delete').click() ){ return; }
 			break;
 		}
@@ -1162,6 +1204,7 @@
 
 function deletesp_fromui(trunk){
 	var delete_id = "row" + trunk;
+	delete_didcontext(trunk);
 	var _sp_t = _$('serviceproviderstable');
 	for( var i=0; i <  _sp_t. rows.length; i++){
 		if  ( _sp_t.rows[i].id == delete_id  ){
@@ -1293,7 +1336,7 @@
 
 function editVolumeLevels( spName ){
 
-	var portsArray = _$('devices').stored_config.catbyname[ spName ].fieldbyname['zapchan'].split( ',' );
+	var portsArray = _$('devices').stored_config.catbyname[ spName ].fieldbyname['pikachan'].split( ',' );
 	var efgh = function(){
 		var y = _$('al_ports');
 		var z = "";
@@ -1487,7 +1530,7 @@
 		<input id="name" size=10  style="display:none">
 
 		<legend><B>&nbsp;Provider Type:&nbsp;</B></legend>
-		<LABEL FOR="trunkstyleanalog"><input name='trunkstyle' type='radio' id='trunkstyleanalog' value='analog'>Analog</LABEL>
+		<!-- <LABEL FOR="trunkstyleanalog"><input name='trunkstyle' type='radio' id='trunkstyleanalog' value='analog'>Analog</LABEL> -->
 		<LABEL FOR="trunkstylevoip"><input name='trunkstyle' type='radio' id='trunkstylevoip' value='voip'>VoIP</LABEL>
 		<LABEL FOR="trunkstylecustomvoip"><input name='trunkstyle' type='radio' id='trunkstylecustomvoip' value='customvoip'>Custom VoIP</LABEL>
 	</fieldset>
@@ -1500,8 +1543,8 @@
 		<tr>	<td style='width:80px' valign='top' class="field_text"  tip="en,trunks,2">
 				Lines:
 			</td>
-			<td>	<select multiple='true' id='zapchan' style='display:none'></select>
-				<div id="zapchan_analoglines" style='height:110px; width: 200px; overflow :auto; display:none'></div>
+			<td>	<select multiple='true' id='pikachan' style='display:none'></select>
+				<div id="pikachan_analoglines" style='height:110px; width: 200px; overflow :auto; display:none'></div>
 			</td>
 		</tr>
 		</table>
diff -Naur asterisk-gui-old/config/trunks_digital.html asterisk-gui/config/trunks_digital.html
--- asterisk-gui-old/config/trunks_digital.html	1969-12-31 19:00:00.000000000 -0500
+++ asterisk-gui/config/trunks_digital.html	2008-12-23 17:10:30.000000000 -0500
@@ -0,0 +1,129 @@
+<!--
+ * Asterisk-GUI	- an Asterisk configuration interface
+ *
+ * Manage T1/E1/BRI trunks
+ *
+ * Copyright (C) 2007-2008, Digium, Inc.
+ *
+ * Pari Nannapaneni <pari@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ *
+-->
+<script src="js/jquery.js"></script>
+<script src="js/astman.js"></script>
+<link href="stylesheets/schwing.css" media="all" rel="Stylesheet" type="text/css" />
+<style type="text/css">
+
+	#table_DigitalTrunks_list {
+		border: 0px solid #666666;
+		margin-top: 8px;
+		padding : 1px;
+		width: 96%;
+	}
+
+	#table_DigitalTrunks_list {
+		border: 1px solid #666666;
+		margin-top: 5px;
+		margin-bottom:10px;
+		width: 96%;
+		text-align: center;
+		padding : 1px;
+	}
+	#table_DigitalTrunks_list tr.frow { background: #6b79a5; color: #CED7EF; }
+	#table_DigitalTrunks_list tr.frow td{ font-weight:bold; }
+	#table_DigitalTrunks_list tr td{ padding : 3px; }
+	#table_DigitalTrunks_list tr.even { background: #DFDFDF; }
+	#table_DigitalTrunks_list tr.odd{ background: #FFFFFF; }
+	#table_DigitalTrunks_list tr.even:hover, #table_DigitalTrunks_list tr.odd:hover {
+		background: #a8b6e5;
+		cursor: default;
+	}
+
+
+</style>
+<script>
+
+var load_DigitalTrunksTable = function(){
+	var addCell = ASTGUI.domActions.tr_addCell; // temporarily store the function
+	(function(){ // add first row
+		var newRow = DOM_table_DigitalTrunks_list.insertRow(-1);
+		newRow.className = "frow";
+		addCell( newRow , { html:'', width:'15px' } );
+		addCell( newRow , { html:'Trunk'} );
+		addCell( newRow , { html:'Signalling'} );
+		addCell( newRow , { html:'Channels'} );
+		addCell( newRow , { html:''} );
+	})();	
+
+	(function (){
+		var c = parent.sessionData.pbxinfo['trunks']['pri'] ;
+		for(var d in c){if(c.hasOwnProperty(d)){
+			var newRow = DOM_table_DigitalTrunks_list.insertRow(-1);
+			newRow.className = ((DOM_table_DigitalTrunks_list.rows.length)%2==1)?'odd':'even';
+			addCell( newRow , { html:'', width:'15px' });
+			addCell( newRow , { html: c[d]['trunkname'] });
+			addCell( newRow , { html: c[d]['signalling'] }); // 
+			addCell( newRow , { html: c[d]['zapchan'] });
+			addCell( newRow , { html:''} );
+		}}
+
+
+		var c = parent.sessionData.pbxinfo['trunks']['bri'] ;
+		for(var d in c){if(c.hasOwnProperty(d)){
+			var newRow = DOM_table_DigitalTrunks_list.insertRow(-1);
+			newRow.className = ((DOM_table_DigitalTrunks_list.rows.length)%2==1)?'odd':'even';
+			addCell( newRow , { html:'', width:'15px' });
+			addCell( newRow , { html: c[d]['trunkname'] });
+			addCell( newRow , { html: 'BRI' });
+			addCell( newRow , { html: c[d]['ports'] });
+			addCell( newRow , { html:''} );
+		}}
+	})();
+
+	if( DOM_table_DigitalTrunks_list.rows.length == 1  ){
+		ASTGUI.domActions.clear_table(DOM_table_DigitalTrunks_list);
+		var newRow = DOM_table_DigitalTrunks_list.insertRow(-1);
+		addCell( newRow , { html: "<BR> <B>No T1/E1/BRI Trunks found !!</B><BR> Your digital hardware can be configured using the 'Configure Hardware', 'mISDN Config' sections of the GUI.<BR><BR>" } );
+	}
+};
+
+
+
+var localajaxinit = function(){
+	top.document.title = 'Manage PRI/BRI Trunks ' ;
+	var tmp_providersPage = ( parent.sessionData.PLATFORM.isAA50 || parent.sessionData.PLATFORM.isABE ) ? 'trunks_sps.html' : 'trunks_providers.html';
+	ASTGUI.tabbedOptions( _$('tabbedMenu') , [
+		{url:'trunks_analog.html', desc:'Analog Trunks'} ,
+		{url: tmp_providersPage, desc:'Service Providers'} ,
+		{url:'trunks_voip.html', desc:'VOIP Trunks'} ,
+		{url:'#', desc:'T1/E1/BRI Trunks', selected:true }
+	]);
+	// show digital trunks in table_DigitalTrunks_list - parent.sessionData.pbxinfo['trunks']['pri']
+	DOM_table_DigitalTrunks_list = _$('table_DigitalTrunks_list');
+
+	load_DigitalTrunksTable();
+}
+
+
+
+</script>
+<body bgcolor="EFEFEF">
+<div class="iframeTitleBar"> 
+	Digital(T1/E1/BRI) Trunks
+	<span style="cursor: pointer; cursor: hand;" onclick="window.location.reload();" >&nbsp;<img src="images/refresh.png" title=" Refresh " border=0 >&nbsp;</span>
+</div>
+
+<div id="tabbedMenu"></div>
+
+<table id='table_DigitalTrunks_list' cellpadding=0 cellspacing=0 border=0 align=center></table>
+
+</body>
\ No newline at end of file
diff -Naur asterisk-gui-old/config/users.html asterisk-gui/config/users.html
--- asterisk-gui-old/config/users.html	2008-11-28 12:44:29.000000000 -0500
+++ asterisk-gui/config/users.html	2008-12-23 17:10:30.000000000 -0500
@@ -21,6 +21,7 @@
 -->
 <script src="scripts/prototype.js"></script>
 <script src="scripts/astman.js"></script>
+<script src="scripts/lang.js"></script>
 <script src="scripts/tooltip.js"></script>
 <link href="stylesheets/schwing.css" media="all" rel="Stylesheet" type="text/css" />
 <script>
@@ -29,24 +30,24 @@
 var callbacks = new Object;
 var extencallbacks = new Object;
 var allcodecs = new Array;
-var fieldnames = ['callwaiting' ,'cancel' ,'cid_number' ,'context' ,'delete' ,'email' ,'fullname' ,'group' ,'hasagent' ,'hasdirectory' ,'hasiax' ,'hasmanager' ,'hassip' ,'hasvoicemail' ,'deletevoicemail' ,'host' ,'mailbox' ,'name' ,'new' ,'save' ,'secret' ,'threewaycalling' ,'vmsecret' ,'zapchan', 'registeriax', 'registersip','macaddress','autoprov','label','canreinvite','nat','dtmfmode', 'disallow','allow', 'insecure'];
-
+//var fieldnames = ['callwaiting' ,'cancel' ,'cid_number' ,'context' ,'delete' ,'email' ,'fullname' ,'group' ,'hasagent' ,'hasdirectory' ,'hasiax' ,'hasmanager' ,'hassip' ,'hasvoicemail' ,'deletevoicemail' ,'host' ,'mailbox' ,'name' ,'new' ,'save' ,'secret' ,'threewaycalling' ,'vmsecret' ,'zapchan', 'registeriax', 'registersip','macaddress','autoprov','label','canreinvite','nat','dtmfmode', 'disallow','allow', 'insecure'];
+var fieldnames = ['call-limit','callwaiting' ,'cancel' ,'cid_number' , 'context' ,'delete' ,'email' ,'fullname' ,'group' ,'hasagent' ,'hasdirectory' ,'hasiax' ,'hasmanager' ,'hassip' ,'hasvoicemail' ,'deletevoicemail' ,'host' ,'mailbox' ,'name' ,'new' ,'save' ,'secret' ,'threewaycalling' ,'vmsecret' ,'pikachan', 'registeriax', 'registersip','macaddress','autoprov','label','canreinvite','nat','dtmfmode', 'disallow','allow', 'insecure'];
 var localextenlength = 4;
 var allow_aliasextns = "no";
 var allow_an_extns = "no" ;
 
-var USER_ZAPCHAN = '' ; // this global variable is used to know if the selected user's zapchan is changed between
+var USER_PIKACHAN = '' ; // this global variable is used to know if the selected user's pikachan is changed between
 // callbacks.postselect and callbacks.savechanges, if it is changed we set parent.REQUIRE_RESTART to true;
 // and if parent.REQUIRE_RESTART is true - we nolonger care about updating/keeping track of this variable anyway.
 
 function load_customerinfo(){
-	parent.$('buynow_div').innerHTML = "Need a phone, some software, or something else?<BR> Click on the 'Where to Buy' button to get directly to products.<BR/><BR/><input type=\"button\" id=\"buynow_button\" value=\"Where to Buy\">";
-
-	parent.$('buynow_button').onclick = function(){	 
-		win=window.open('','myWin');
-		document.buynow_form.target='myWin';
-		document.buynow_form.submit();
-	}
+//	parent.$('buynow_div').innerHTML = "Need a phone, some software, or something else?<BR> Click on the 'Where to Buy' button to get directly to products.<BR/><BR/><input type=\"button\" id=\"buynow_button\" value=\"Where to Buy\">";
+//
+//	parent.$('buynow_button').onclick = function(){	 
+//		win=window.open('','myWin');
+//		document.buynow_form.target='myWin';
+//		document.buynow_form.submit();
+//	}
 }
 
 extencallbacks.format = function(t, x) {
@@ -63,17 +64,17 @@
 extencallbacks.eachline = true;
 
 var add_DigitalChannels = function(k){ // k could be 'x', 'x-y'
-	var n, _zapchan = _$('zapchan') ;
+	var n, _pikachan = _$('pikachan') ;
 
 	if( k.contains('-') ){
 		var l = Number(k.split('-')[0]);
 		var m = Number(k.split('-')[1]);
 		for( n = l ; n <= m; n++ ){
-			ASTGUI.selectbox.append(_zapchan,"Channel #" + n, n);
+			ASTGUI.selectbox.append(_pikachan,"Channel #" + n, n);
 		}
 	}else{
 		n = Number(k);
-		ASTGUI.selectbox.append(_zapchan,"Channel #" + n, n);
+		ASTGUI.selectbox.append(_pikachan,"Channel #" + n, n);
 	}
 }
 
@@ -93,8 +94,8 @@
 		return null;
 	}
 	
-	if ( t.name.beginsWith('span_') && t.fieldbyname['signalling'].beginsWith('fxo') && t.fieldbyname['zapchan'] ) {
-		add_DigitalChannels(t.fieldbyname['zapchan']);
+	if ( t.name.beginsWith('span_') && t.fieldbyname['signalling'].beginsWith('fxo') && t.fieldbyname['pikachan'] ) {
+		add_DigitalChannels(t.fieldbyname['pikachan']);
 		return null;
 	}
 
@@ -109,13 +110,12 @@
 	}
 }
 callbacks.loaded = function() {
-	_$('devices').contentEditable = 'true';
-	_$('devices').disabled = 0;
+	_$('devices').disabled = false;
 
-	if( _$('zapchan').options.length == 0) {
-		_$('zapchan').style.display="none";
-		_$('noanaloglines').style.display="";
-	}
+//	if( _$('pikachan').options.length == 0) {
+//		_$('pikachan').style.display="none";
+//		_$('noanaloglines').style.display="";
+//	}	
 
 	parent.astmanEngine.config2list("extensions.conf", _$('extensions'), new Array(), extencallbacks);
 }
@@ -195,11 +195,11 @@
 		var tmp_usedanaloglines = [] ;
 		for ( var i=1; i < _devices.stored_config.categories.length ; i++){
 			if ( _devices.stored_config.categories[i] != null ){
-			if ( _devices.stored_config.categories[i].fieldbyname['zapchan'] && _devices.stored_config.categories[i].fieldbyname.zapchan.length && _devices.stored_config.categories[i].name != _devices.value )
-				tmp_usedanaloglines.push( _devices.stored_config.categories[i].fieldbyname.zapchan);
+			if ( _devices.stored_config.categories[i].fieldbyname['pikachan'] && _devices.stored_config.categories[i].fieldbyname.pikachan.length && _devices.stored_config.categories[i].name != _devices.value )
+				tmp_usedanaloglines.push( _devices.stored_config.categories[i].fieldbyname.pikachan);
 			}
 		}
-		if ( InArray(tmp_usedanaloglines,_$('zapchan').value)){
+		if ( InArray(tmp_usedanaloglines,_$('pikachan').value)){
 			gui_alert("This Analog Phone has already been assigned to another user extension.\n Please select a different Phone");
 			return false;
 		}
@@ -251,15 +251,16 @@
 		}
 	}
 	showhide();
+	CIDshowhide();
 	/* check to see if we need to display out email/voicemail settings. */
 	_$('codecs_text').innerHTML = 'disallow: '+ _$('disallow').value + ' <BR> allow:' + _$('allow').value ;
 
-	USER_ZAPCHAN = _$('zapchan').value ;
+	USER_PIKACHAN = _$('pikachan').value ;
 }
 
 
 callbacks.savechanges = function(){
-	if( parent.REQUIRE_RESTART == false && _$('zapchan').value != USER_ZAPCHAN ){
+	if( parent.REQUIRE_RESTART == false && _$('pikachan').value != USER_PIKACHAN ){
 		parent.REQUIRE_RESTART = true;
 	}
 
@@ -268,10 +269,29 @@
 	makerequest( 'u', 'users.conf' , uri1 , function(t){ } );
 }
 
+function analoglines_loaded(b){
+	var c = b ;
+	var _pikachan = _$('pikachan') ;
+
+	for( var d in c ){
+		if ( c.hasOwnProperty(d) && c[d]['port'] && (c[d]['port'] == 'fxo' ) ) {
+			ASTGUI.selectbox.append(_pikachan,"Port PIKA/" + d, d);
+		}
+	}
+	
+	if( _pikachan.options.length == 0) {
+		_pikachan.style.display="none";
+		_$('noanaloglines').style.display="";
+	}
+	//ASTGUI.selectbox.insert_before(_pikachan,"None", "", 0);
+	//config2json('extensions.conf', 1, dialplans_loaded ) ;
+	//parent.astmanEngine.config2list("extensions.conf", _$('context'), new Array(), numcallbacks);
+}
 
 function dialplans_loaded(b){
 	var c =  b ;
-	var _context = _$('context') ;
+	var _context = "test";// _$('context') ; 
+
 
 	for( var d in c ){
 		if ( c.hasOwnProperty(d) && d.substr(0,11) == 'numberplan-'  ) {
@@ -281,6 +301,7 @@
 	}
 
 	parent.astmanEngine.config2list("users.conf", _$('devices'), widgets, callbacks);
+
 }
 
 function localajaxinit() {
@@ -298,12 +319,13 @@
 	*/
 
 	setWindowTitle("User Extensions");
-	_$('devices').contentEditable = 'false';
+	_$('devices').disabled = true;
 	for (var x =0; x < fieldnames.length; x++ ) {
 		widgets[fieldnames[x]] = _$(fieldnames[x]);
 		widgets[fieldnames[x]].disabled = true;
 	}
 	
+	config2json('zapscan.conf', 1, analoglines_loaded ) ;
 	load_codecs_fromast();
 	//parent.astmanEngine.config2list("zapscan.conf", _$('zapchan'), new Array(), phonecallbacks);
 }
@@ -330,21 +352,21 @@
 				}
 			}
 		}
-		var _zapchan = _$('zapchan') ;
+		var _pikachan = _$('pikachan') ;
 		parent.FXS_PORTS_DETECTED.each( function(y) {
-			ASTGUI.selectbox.append( _zapchan,"Analog Port #" + y , y );
+			ASTGUI.selectbox.append( _pikachan,"Analog Port #" + y , y );
 		});
 
-		ASTGUI.selectbox.insert_before(_zapchan,"None", "", 0);
-		config2json('extensions.conf', 1, dialplans_loaded ) ;
+		ASTGUI.selectbox.insert_before(_pikachan,"None", "", 0);
+		config2json('users.conf', 1, dialplans_loaded ) ;
 		return true;
 	});
 }
 
 
 function free_mem(){
-	parent.$('buynow_button').onclick = null;
-	parent.$('buynow_div').innerHTML = "";
+//	parent.$('buynow_button').onclick = null;
+//	parent.$('buynow_div').innerHTML = "";
 	if( navigator.userAgent.indexOf("MSIE") == -1 ){ return true; }
 	try{
 		widgets['save'].hostselectbox = null ;
@@ -470,15 +492,29 @@
 	}
 }
 
+function CIDshowhide()
+{
+	if (_$('hasiax').checked || _$('hassip').checked)
+	{
+		_$('cid_number').style.display="";
+		_$('cid_txt').style.display="";
+		_$('cid').style.display="";
+		
+	}
+	else
+	{
+		_$('cid_number').style.display='none';
+		_$('cid_txt').style.display='none';
+		_$('cid').style.display='none';
+	}	
+return true;
+}
+
 function showhide() {
 	var t = _$('hasvoicemail');
 	var fields_z = ['deletevoicemail', 'deletevoicemail_2', 'deletevoicemail_3']
 	if(t.checked) {
 		for(var x=0; x < fields_z.length; x++) {
-			_$(fields_z[x]).style.display="";
-		}
-	} else {
-		for(var x=0; x < fields_z.length; x++) {
 			_$(fields_z[x]).style.display="none";
 		}
 	}
@@ -507,9 +543,9 @@
 				<tr><td class="field_text" tip="en,users,1">Name:</td><td><input size='20' id='fullname' pattern='^[a-zA-Z_0-9 ]*$' class="input8"></td></tr>
 				<tr><td class="field_text" tip="en,users,2">Password:</td><td><input size='5' id='secret' pattern='^[a-zA-Z_0-9]*$'  class="input8"></td></tr>
 				<tr><td class="field_text" tip="en,users,16">VM Password:</td><td><input size='5' id='vmsecret' pattern='^[0-9*]*$'  class="input8"></td></tr>
-				<tr><td class="field_text" tip="en,users,3">E-mail:</td><td><input size='20' id='email' pattern='^[0-9a-zA-Z\.\-\_\@]*$' class="input8"></td></tr>
-				<tr><td class="field_text" tip="en,users,4">Caller ID:</td><td><input size='12' id='cid_number'  pattern='^[\d\-]*$' class="input8"></td></tr>
-				<tr><td class="field_text" tip="en,users,5">Analog Phone:</td><td><select size="1" id='zapchan' style='width:140px' class="input8"></select>
+				<tr><td style="display:none" class="field_text" tip="en,users,3">E-mail:</td><td><input style="display:none" size='20' id='email' pattern='^[0-9a-zA-Z\.\-\_\@]*$' class="input8"></td></tr>
+				<tr style="display:none" id='cid'><td style="display:none" id="cid_txt" class="field_text" tip="en,users,4">Caller ID:</td><td><input style="display:none" size='12' id='cid_number'  pattern='^[\d\-]*$' class="input8"></td></tr>
+				<tr><td class="field_text" tip="en,users,5">Analog Phone:</td><td><select size="1" id='pikachan' style='width:140px' class="input8"></select>
 				<span id="noanaloglines" style="display:none" class="field_text"><I>&nbsp;No Analog lines detected.</I></span></td></tr>
 				<tr><td class="field_text" tip="en,users,6">Dial Plan:</td><td><select size='1' id='context' style='width:120px' class="input8"></select></td></tr>
 
@@ -539,7 +575,7 @@
 					<td style="display:none" id='deletevoicemail_2' class="field_text" tip="en,users,25">Email Only</td>
 				</tr>
 				<tr>
-					<td align=right><input type='checkbox' id='hassip'></td>
+					<td align=right><input onClick="CIDshowhide();" type='checkbox' id='hassip'></td>
 					<td class="field_text" tip="en,users,10">SIP</td>
 
 					<td align=right><input type='checkbox' id='hasiax'></td>
@@ -552,6 +588,7 @@
 					<td align=right>
 						<input type='checkbox' id='hasagent' dfalt='1'>
 						<input type='hidden' dfalt='dynamic' id='host'>
+						<input type='hidden' dfalt='100' id='call-limit'>
 					</td>
 					<td class="field_text" tip="en,users,15">Is&nbsp;Agent</td>
 				</tr>
diff -Naur asterisk-gui-old/config/voicemail.html asterisk-gui/config/voicemail.html
--- asterisk-gui-old/config/voicemail.html	2008-11-28 12:44:29.000000000 -0500
+++ asterisk-gui/config/voicemail.html	2008-12-23 17:10:30.000000000 -0500
@@ -86,8 +86,7 @@
 			}
 		}
 	}
-	$('extensions').contentEditable = 'true';
-	$('extensions').disabled = 0;
+	$('extensions').disabled = false;
 	$('extensions').current_category = specialcontext;
 
 	ASTGUI.events.add( $('name') , 'keydown', function(){ this.oldvalue = this.value ;} );
@@ -268,7 +267,7 @@
 	setWindowTitle("Voicemail");
 	//$('advancedi').style.width = $('split').width - 60;
 
-	$('extensions').contentEditable = 'false';
+	$('extensions').disabled = true;
 
 	/*
 	if( navigator.userAgent.indexOf("MSIE") != -1){
@@ -321,8 +320,8 @@
 				<tr>	<td class="field_text" tip="en,voicemail,0">Extension for checking messages:</td>
 					<td>&nbsp;<input size='5' id='name' pattern='^\d*$' onKeyUp="$('cancel').disabled=false;"  class="input8" ></td>
 				</tr>
-				<tr>	<td class="field_text" tip="en,voicemail,1">Attach recordings to e-mail:</td>
-					<td><input type='checkbox' id='attach'></td>
+				<tr>	<td style="display:none" class="field_text" tip="en,voicemail,1">Attach recordings to e-mail:</td>
+					<td><input style="display:none" type='checkbox' id='attach'></td>
 				</tr>
 
 				<tr>	<td class="field_text" tip="en,voicemail,13">Max&nbsp;greeting&nbsp;(seconds)</td>
@@ -337,9 +336,9 @@
 			<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">Attach&nbsp;Format:</td>
+					<tr>	<td style="display:none" class="field_text" align=right tip="en,voicemail,10">Attach&nbsp;Format:</td>
 						<td>
-							<select id='attachfmt' class="input8">
+							<select style="display:none" id='attachfmt' class="input8">
 							<option value='wav49'>WAV (GSM)</option>
 							<option value='wav'>WAV (16-bit)</option>
 							<option value='gsm'>Raw GSM</option>
@@ -388,8 +387,8 @@
 			<div>	<fieldset  style="width: 225px;">
 				<legend>&nbsp;Playback Options:&nbsp;</legend>
 				<table align='center' cellpadding=1 cellspacing=0 border=0 width=270>
-				<tr>	<td><input type='checkbox' id='deletevoicemail'></td>
-					<td class="field_text" tip="en,voicemail,4">Send messages by e-mail only</td>
+				<tr>	<td><input style="display:none" type='checkbox' id='deletevoicemail'></td>
+					<td style="display:none" class="field_text" tip="en,voicemail,4">Send messages by e-mail only</td>
 				</tr>
 
 				<tr>	<td><input type='checkbox' id='saycid'></td>