Changeset 13230 for contributed_modules

Timestamp:

01/17/12 22:45:28 (4 months ago)

Author:

p_lindheimer

Message:

updated module from 2.10 prior to removing from 2.10 repo given lack of maintenance

Files:

• contributed_modules/modules/dahdiconfig/etc/chan_dahdi.conf (modified) (1 diff)
• contributed_modules/modules/dahdiconfig/functions.inc.php (modified) (9 diffs)
• contributed_modules/modules/dahdiconfig/i18n (copied) (copied from modules/branches/2.10/dahdiconfig/i18n)
• contributed_modules/modules/dahdiconfig/install.php (modified) (2 diffs)
• contributed_modules/modules/dahdiconfig/module.xml (modified) (3 diffs)
• contributed_modules/modules/dahdiconfig/page.dahdi.php (modified) (1 diff)
• contributed_modules/modules/dahdiconfig/uninstall.php (modified) (1 diff)

contributed_modules/modules/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

contributed_modules/modules/dahdiconfig/functions.inc.php

@@ -1 +1 @@
-<?php
+if (!defined('FREEPBX_IS_AUTH')) { die('No direct script access allowed'); }
-
-/**
@@ -588 +589 @@
-
-      $hasaline = false;
-     for($i=0;$i<sizeof($lines);$i++
+      foreach ($lines as $line
-        // its a comment, like this line
-
+ || trim($line) == ''
-          continue;
-        }
-
-        $hasaline = true;
+        break;
-      }
-
@@ -765 +766 @@
-
-    /* If there is a DAHDI_Dummy then there is no hardware to parse */
-
+if (isset($cxts)) 
-      if (strpos($cxt['description'],'DAHDI_DUMMY') === false) {
-        continue;
@@ -1418 +1419 @@
-  $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 +1453 @@
-      }
-    }
-show_digital_chans
+amp_conf['DAHDISHOWDIGITALCHANS']
-      $basechan = $span['basechan'];
-      $definedchans = $span['definedchans'];
@@ -1480 +1464 @@
-  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;
@@ -1507 +1491 @@
-      $extdisplay = '';
-    } else {
-isset($_REQUEST['extdisplay']) &&
+!isset($_REQUEST['extdisplay']) ||
-        return true;
-      }
@@ -1518 +1502 @@
-  
-    $channel_select  = dahdiconfig_get_unused_fxs_channels($extdisplay);
+    $currentcomponent->addoptlistitem('dahdi_channel_select', '', _('==Choose=='));
-    foreach ($channel_select as $val) {
-      $currentcomponent->addoptlistitem('dahdi_channel_select', $val['channel'].':'.$val['signalling'], $val['channel']);
@@ -1632 +1617 @@
-      $(document).ready(function(){
-        $("#dahdi_channel").val($("#devinfo_channel").val()+":"+$("#devinfo_signalling").val());
+        if ($("#dahdi_channel").val() == null) {
+          $("#dahdi_channel").val("");
+        }
-        $("#devinfo_channel").parent().parent().hide();
-        $("#devinfo_signalling").parent().parent().hide();

contributed_modules/modules/dahdiconfig/install.php

@@ -1 +1 @@
-<?php
+if (!defined('FREEPBX_IS_AUTH')) { die('No direct script access allowed'); }
-
-/**
@@ -154 +155 @@
-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

contributed_modules/modules/dahdiconfig/module.xml

@@ -1 +1 @@
-<module>
-  <rawname>dahdiconfig</rawname>
-type>setup</type
-Basic
+repo>unsupported</repo
+Connectivity
-  <name>DAHDi Config</name>
-8.0.1
+10.0.0
-  <publisher>Digium</publisher>
-  <license>GPLv2</license>
@@ -10 +10 @@
-  <canuninstall>yes</canuninstall>
-  <changelog>
+    *2.10.0.0* new version changes
+    *2.9.0.1* #4921
+    *2.9.0.0* #4914, #4915 
-    *2.8.0.1* dependency set to 2.8 because of dahdi tables
-    *2.8.0.0* adds hooks into extensions and trunks pages and other fixes and tweaks
@@ -25 +28 @@
-  </requirements>
-  <menuitems>
- sort="-4"
+
-  </menuitems>
-contributed_modules/release/dahdiconfig-2.8.0.1
-a415741aec4aa93cceba58c29f3ea30e
+release/2.10/dahdiconfig-2.10.0.0
+cd9ce04080bed2f9f89ffb25b6072ca5
-</module>

contributed_modules/modules/dahdiconfig/page.dahdi.php

@@ -1 +1 @@
-<?php
+if (!defined('FREEPBX_IS_AUTH')) { die('No direct script access allowed'); }
-
-/**

contributed_modules/modules/dahdiconfig/uninstall.php

@@ -1 +1 @@
-<?php
+if (!defined('FREEPBX_IS_AUTH')) { die('No direct script access allowed'); }
-
-/**