Changeset 11677

Timestamp:

03/04/11 18:35:30 (2 years ago)

Author:

p_lindheimer

Message:

closes #4915 adds DAHDISHOWDIGITALCHANS and some custom includes

Files:

• modules/branches/2.9/dahdiconfig/etc/chan_dahdi.conf (modified) (1 diff)
• modules/branches/2.9/dahdiconfig/functions.inc.php (modified) (3 diffs)
• modules/branches/2.9/dahdiconfig/install.php (modified) (1 diff)

modules/branches/2.9/dahdiconfig/etc/chan_dahdi.conf

@@ -3 +3 @@
-[general]
-
+; generated by module
-#include chan_dahdi_general.conf
-
+; for user additions not provided by module
+#include chan_dahdi_general_custom.conf
+
-[channels]
+
+; for user additions not provided by module
+#include chan_dahdi_channels_custom.conf
-
-; include dahdi groups defined by DAHDI module of FreePBX

modules/branches/2.9/dahdiconfig/functions.inc.php

@@ -1418 +1418 @@
-  $digital_chan = array();
-
-  if (isset($amp_conf['DAHDISHOWDIGITALCHANS'])) {
-    $chan_setting = strtolower($amp_conf['DAHDISHOWDIGITALCHANS']);
-    switch ($chan_setting) {
-    case 'true':
-    case 'yes':
-    case 'on':
-    case '1':
-      $show_digital_chans = true;
-    break;
-    default:
-      $show_digital_chans = false;
-    break;
-    }
-  } else {
-    $show_digital_chans = false;
-  }
-
-  $dahdi_cards = new dahdi_cards();
-  $analog_ports = $dahdi_cards->get_fxo_ports();
@@ -1469 +1452 @@
-      }
-    }
-show_digital_chans
+amp_conf['DAHDISHOWDIGITALCHANS']
-      $basechan = $span['basechan'];
-      $definedchans = $span['definedchans'];
@@ -1480 +1463 @@
-  uksort($avail_group,'_dahdiconfig_gsort');
-  ksort($analog_chan);
-show_digital_chans
+amp_conf['DAHDISHOWDIGITALCHANS']
-    ksort($digital_chan);
-    $avail_identifiers = $avail_group + $analog_chan + $digital_chan;

modules/branches/2.9/dahdiconfig/install.php

@@ -154 +154 @@
-unset($result);
-
+$freepbx_conf =& freepbx_conf::create();
+
+// DAHDISHOWDIGITALCHANS
+//
+$set['value'] = false;
+$set['defaultval'] =& $set['value'];
+$set['readonly'] = 0;
+$set['hidden'] = 0;
+$set['level'] = 0;
+$set['module'] = 'dahdiconfig';
+$set['category'] = 'DAHDi Configuration Module';
+$set['emptyok'] = 0;
+$set['name'] = 'Allow PRI Discrete Channels';
+$set['description'] = 'DAHDi trunk configuration is normally done using groups for PRI configuration. If there is a need to configure trunks to specific channels, setting this to true will allow each channel to be configured. This can be useful when troubleshooting a PRI and trying to isolate a bad B Channel.';
+$set['type'] = CONF_TYPE_BOOL;
+$freepbx_conf->define_conf_setting('DAHDISHOWDIGITALCHANS',$set,true);
+
-//end of file