pari: branch pari/dahdi_support r4446 - in /team/pari/dahdi_support/config: ....

[SVN commits to the Asterisk-GUI project]

Author: pari
Date: Fri Jan 16 17:09:06 2009
New Revision: 4446

URL: http://svn.digium.com/svn-view/asterisk-gui?view=rev&rev=4446
Log:

 More progress w.r.t DAHDI 
 Tested with Digital cards - PRI & BRI(b410p)


Modified:
    team/pari/dahdi_support/config/index.html
    team/pari/dahdi_support/config/js/hardware_dahdi.js

Modified: team/pari/dahdi_support/config/index.html
URL: http://svn.digium.com/svn-view/asterisk-gui/team/pari/dahdi_support/config/index.html?view=diff&rev=4446&r1=4445&r2=4446
==============================================================================
--- team/pari/dahdi_support/config/index.html (original)
+++ team/pari/dahdi_support/config/index.html Fri Jan 16 17:09:06 2009
@@ -71,7 +71,7 @@
 				// note that the above FXO_PORTS_DETECTED, FXS_PORTS_DETECTED are the actual analog FXS, FXO ports
 				// and NOT the channels on a digital span with FXS or FXO signalling
 	DEBUG_LOG : [], // all the debug log messages will be stored in this array (If debug mode is enabled)
-	DEBUG_MODE : false, // set to true when debugging -- parent.sessionData.DEBUG_MODE
+	DEBUG_MODE : true, // set to true when debugging -- parent.sessionData.DEBUG_MODE
 	DEBUG_WHICH: { Ajax: true, Debug: true, Error: true, Console: true, Info: true, Warn: true } , // parent.sessionData.DEBUG_WHICH.Ajax/Debug/Error/Console/Info/Warn
 	REQUIRE_RESTART : false, // this flag is used to know if there are any updates in zapchan settings
 				// like if a FXS is assigned to a user or an analog trunk is created or something 

Modified: team/pari/dahdi_support/config/js/hardware_dahdi.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/pari/dahdi_support/config/js/hardware_dahdi.js?view=diff&rev=4446&r1=4445&r2=4446
==============================================================================
--- team/pari/dahdi_support/config/js/hardware_dahdi.js (original)
+++ team/pari/dahdi_support/config/js/hardware_dahdi.js Fri Jan 16 17:09:06 2009
@@ -709,71 +709,18 @@
 		};
 		setTimeout( storeNewinfo , 700); // leave some time for rm, touch
 	});
-
 };
 
 
 
 var applySettings = {
-	save_opermode_settings: function(){ // applySettings.save_opermode_settings();
-		ASTGUI.dialog.waitWhile('saving...');
-		var u = new listOfSynActions(ASTGUI.globals.configfile);
-
-			if( _$('enable_disable_checkbox_opermode').checked ){
-				u.new_action('update', 'general', 'opermode', ASTGUI.getFieldValue('opermode') );
-			}
-
-			if( _$('enable_disable_checkbox_alawoverride').checked ){
-				u.new_action('update', 'general', 'alawoverride', ASTGUI.getFieldValue('alawoverride') );
-			}
-
-			if( _$('enable_disable_checkbox_fxshonormode').checked ){
-				u.new_action('update', 'general', 'fxshonormode', ASTGUI.getFieldValue('fxshonormode') );
-			}
-
-			if( _$('enable_disable_checkbox_boostringer').checked ){
-				u.new_action('update', 'general', 'boostringer', ASTGUI.getFieldValue('boostringer') );
-			}
-
-			u.new_action('update', 'general', 'ZAPMODULE_NAME', ASTGUI.getFieldValue('zap_moduleName') );
-			u.callActions();
-			u.clearActions();
-
-		if( _$('enable_disable_checkbox_mwimode').checked ){
-			u.new_action('update', 'general', 'mwimode', ASTGUI.getFieldValue('mwimode') );
-			if( ASTGUI.getFieldValue('mwimode') == 'NEON' ){
-				u.new_action('update', 'general', 'neonmwi_level', ASTGUI.getFieldValue('neonmwi_level') );
-				u.new_action('update', 'general', 'neonmwi_offlimit', ASTGUI.getFieldValue('neonmwi_offlimit') );
-			}
-		}
-
-		if( _$('enable_disable_checkbox_lowpower').checked ){
-			u.new_action('update', 'general', 'lowpower', ASTGUI.getFieldValue('lowpower') );
-		}
-
-		if( _$('enable_disable_checkbox_fastringer').checked ){
-			u.new_action('update', 'general', 'fastringer', ASTGUI.getFieldValue('fastringer') );
-		}
-
-		if( _$('enable_disable_checkbox_fwringdetect').checked ){
-			u.new_action('update', 'general', 'fwringdetect', ASTGUI.getFieldValue('fwringdetect') );
-		}
-
-		u.callActions();
-		u.clearActions();
-	
-		ASTGUI.dialog.waitWhile('updating modprobe.conf ...');
-	
-		storeDetectedHardware();
-	},
 
 	generate_zaptel: function(){
 		parent.ASTGUI.systemCmd( top.sessionData.directories.script_generateZaptel + " applysettings" , function(){
-			parent.sessionData.REQUIRE_RESTART = (HAS_ANALOGHARDWARE || HAS_DIGITALHARDWARE)? true : false;
-			parent.ASTGUI.systemCmd( "ztcfg -vv" , function(){
-				applySettings.save_opermode_settings();
-				return true ;
-			});
+			parent.sessionData.REQUIRE_RESTART = ( HAS_ANALOGHARDWARE || HAS_DIGITALHARDWARE )? true : false;
+			storeDetectedHardware();
+			return true ;
+
 		});
 	},
 
@@ -789,7 +736,6 @@
 		var y = new listOfActions(); y.filename('extensions.conf');
 		var pri_trunk = {};
 		for( var k in SPANS ){ if( SPANS.hasOwnProperty(k) ){ if(SPANS[k]['signalling']){
-
 
 			d = 'span_'+ String(k);
 			e = ASTGUI.contexts.TrunkDIDPrefix + d ;
@@ -869,7 +815,7 @@
 
 	},
 
-	updateZaptel: function(){ 
+	updateApplyZap: function(){ 
 	// navigate through the SPANS object and save it to the applyzap.conf, 
 	// then call a script which will generate zaptel.conf from it and asks the user to restart his machine
 		parent.ASTGUI.dialog.waitWhile('Saving Changes ...');
@@ -986,7 +932,7 @@
  	// write to users.conf - update [spans_x] contexts
  	// call the asterisk_guiEditZap - which will generate zaptel.conf from applyzap.conf
 	ASTGUI.showbg(true);
-	applySettings.updateZaptel();
+	applySettings.updateApplyZap();
 };