Changeset 15393

Timestamp:

03/20/13 00:50:30 (2 months ago)

Author:

tm1000

Message:

Fixes #6434,#6436 (only show fwringer of module is wctdm) added italian re #6361

Files:

• modules/branches/2.11/dahdiconfig/functions.inc.php (modified) (2 diffs)
• modules/branches/2.11/dahdiconfig/includes/dahdi_cards.class.php (modified) (3 diffs)
• modules/branches/2.11/dahdiconfig/module.xml (modified) (2 diffs)
• modules/branches/2.11/dahdiconfig/page.dahdi.php (modified) (3 diffs)
• modules/branches/2.11/dahdiconfig/views/dahdi_global_settings.php (modified) (1 diff)
• modules/branches/2.11/dahdiconfig/views/dahdi_modprobe_settings.php (modified) (2 diffs)

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

@@ -32 +32 @@
- }
- */
- 
-//Get dahdi version
-global $astman;
-$o = $astman->send_request('Command', array('Command' => 'dahdi show version'));
-
-$dahdi_info = explode("\n",$o['data']);
-if(preg_match('/DAHDI Version:(.*)Echo Canceller:/i',$o['data'],$matches)) {
-  $dahdi_version = trim($matches[1]);
-} else {
-  $dahdi_version = 9999;
-}
-$dahdi_ge_260 = version_compare($dahdi_version,'2.6.0','ge');
- 
-require_once('includes/dahdi_cards.class.php');
@@ -580 +568 @@
-  $currentcomponent->addguielem('_top', new guielement('dahdi-chan-html', $js, ''));
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

modules/branches/2.11/dahdiconfig/includes/dahdi_cards.class.php

@@ -885 +885 @@
-          $this->spans[$key]['dsid'] = $key;
-        $this->spans[$key][$attr] = $span[$attr];
-$this->spans[$key]['devicetype'] == 'W400') ? 'gsm' : $this->spans[$key]['type']
+isset($this->spans[$key]['devicetype']) && ($this->spans[$key]['devicetype'] == 'W400')) ? 'gsm' : (isset($this->spans[$key]['type']) ? $this->spans[$key]['type'] : '')
-        switch($attr) {
-        case 'location':
@@ -1371 +1371 @@
-  public function write_modprobe() {
-        global $amp_conf;
-
+
+
-    $file = $amp_conf['DAHDIMODPROBELOC'];
-        
@@ -1395 +1396 @@
-            
-            $opts = array('opermode'=>'opermode', 'alawoverride'=>'alawoverride', 'boostringer'=>'boostringer', 'lowpower'=>'lowpower', 'fastringer'=>'fastringer', 'ringdetect'=>'fwringdetect', 'fxs_honor_mode'=>'fxshonormode', 'mode'=>'mode', 'defaultlinemode'=>'defaultline_mode');
-
+ && $data['module_name'] != 'wctdm'
-          unset($opts['ringdetect']);
-        }

modules/branches/2.11/dahdiconfig/module.xml

@@ -4 +4 @@
-  <category>Connectivity</category>
-  <name>DAHDi Config</name>
-0
+1
-  <publisher>Schmoozecom</publisher>
-  <license>GPLv2</license>
@@ -10 +10 @@
-  <canuninstall>yes</canuninstall>
-  <changelog>
+    *2.11.21* Fixes #6434,#6436 (only show fwringer of module is wctdm) added italian re #6361
-    *2.11.20* Fixes #6420 dont allow usage of fwringdetect in 2.6.0 and greater
-    *2.11.19* Add sangoma GSM card control and setup

modules/branches/2.11/dahdiconfig/page.dahdi.php

@@ -13 +13 @@
-    }
-}
+
+$dahdi_info = dahdiconfig_getinfo();
+$dahdi_ge_260 = version_compare(dahdiconfig_getinfo('version'),'2.6.0','ge');
-
-//Check to make sure dahdi is running. Display an error if it's not
@@ -266 +269 @@
-                    $('#mp_setting_origsetting_key_0').val('')
-                    
+          if(j.module == "wctdm") {
+            $('#tr_ringdetect').show();
+          } else {
+            $('#tr_ringdetect').hide();
+          }
+          
-                    if(j.module == "wctc4xxp") { 
-                        $('#normal_mp_settings').hide();
@@ -326 +335 @@
-            })
-        } else {
+      if($(this).val() == "wctdm") {
+        $('#tr_ringdetect').show();
+      } else {
+        $('#tr_ringdetect').hide();
+      }
+      
-            if(($(this).val() == "wct4xxp") || ($(this).val() == "wcte12xp")) {
-                $('#wct4xxp_wcte12xp_settings').show();
+        $('#normal_mp_settings').hide();
-            } else {
-                $('#wct4xxp_wcte12xp_settings').hide();
+        $('#normal_mp_settings').show();
-            }
-            

modules/branches/2.11/dahdiconfig/views/dahdi_global_settings.php

@@ -12 +12 @@
-                <select id="language" name="language">
-                  <option value="en">English</option>
+          <option value="it">Italian</option>
-              </select>
-            </td>

modules/branches/2.11/dahdiconfig/views/dahdi_modprobe_settings.php

@@ -177 +177 @@
-              </td>
-            </tr>
-
-
+
-                <td style="width:10px;">
-                    <label for="ringdetect_checkbox"><a href="#" class="info">Ring Detect:<span>Specify whether to apply normal ring detection, or a full wave detection to prevent false ring detection for lines where CallerID is sent before the first ring and proceeded by a polarity reversal (as in the United Kingdom). If you are experiencing trouble with detecting CallerID from analog service providers, or have lines which exhibit a polarity reversal before CallerID is transmitted from the provider, then select Full Wave. If no choice is specified, the default is standard.</span></a></label>
@@ -190 +189 @@
-                </td>
-            </tr>
-      <?php } ?>
-            <tr>
-                <td style="width:10px;">