Changeset 11956 for modules/branches

Timestamp:

04/02/11 17:30:23 (2 years ago)

Author:

mickecarlsson

Message:

core, standardize on DAHDi

Files:

• modules/branches/2.9/core/functions.inc.php (modified) (4 diffs)
• modules/branches/2.9/core/page.trunks.php (modified) (5 diffs)

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

@@ -2727 +2727 @@
-      $ext->add($context, $exten, '', new ext_macro('Hangupcall', 'dummy'));
-
-I
+i
-      $ext->add($context, $exten, '', new ext_set('CHAN', '${CHANNEL:6}'));
-      $ext->add($context, $exten, '', new ext_set('CHAN', '${CUT(CHAN,-,1)}'));
@@ -4557 +4557 @@
-  $result = $db->executeMultiple($compiled,$dahdifields);
-  if(DB::IsError($result)) {
-I
+i
-  }
-}
@@ -6883 +6883 @@
-    }
-    if (ast_with_dahdi()) {
-I
+i
-    }
-    $currentcomponent->addoptlistitem('devicelist', 'custom_custom', _("Other (Custom) Device"));
@@ -7021 +7021 @@
-      $section = _("Device Options");
-
-I
+i
-      $currentcomponent->addguielem($section, new gui_label('techlabel', $device_uses),4);
-      $devopts = $currentcomponent->getgeneralarrayitem('devtechs', $devinfo_tech);

modules/branches/2.9/core/page.trunks.php

@@ -361 +361 @@
-  $trunks[] = array('url'=> $baseURL.'tech=SIP', 'tlabel' =>  _("Add SIP Trunk"));
-  if (ast_with_dahdi()) {
-I
+i
-  }
-I
+i
-  $trunks[] = array('url'=> $baseURL.'tech=IAX2', 'tlabel' =>  _("Add IAX2 Trunk"));
-  //--------------------------------------------------------------------------------------
@@ -423 +423 @@
-      $trunk_name = ($upper_tech == 'ZAP'|$upper_tech == 'DAHDI'?sprintf(_('%s Channel %s'),$upper_tech,$channelid):$channelid);
-    }
-I
+i
-    $tlabel = sprintf(_("Delete Trunk %s"),substr($trunk_name,0,20));
-    $label = '<span><img width="16" height="16" border="0" title="'.$tlabel.'" alt="" src="images/core_delete.png"/>&nbsp;'.$tlabel.'</span>';
@@ -475 +475 @@
-  
-    $upper_tech = strtoupper($tech);
-I
+i
-  } 
-  if (!isset($dialpattern_array)) {
@@ -659 +659 @@
-          <a href=# class="info"><?php echo _("Dial Rules Wizards")?><span>
-          <strong><?php echo _("Always dial with prefix")?></strong> <?php echo _("is useful for VoIP trunks, where if a number is dialed as \"5551234\", it can be converted to \"16135551234\".")?><br>
-I
+i
-          <strong><?php echo _("Setup directory assistance")?></strong> <?php echo _("is useful to translate a call to directory assistance")?><br>
-          <strong><?php echo _("Lookup numbers for local trunk")?></strong> <?php echo _("This looks up your local number on www.localcallingguide.com (NA-only), and sets up so you can dial either 7 or 10 digits (regardless of what your PSTN is) on a local trunk (where you have to dial 1+area code for long distance, but only 5551234 (7-digit dialing) or 6135551234 (10-digit dialing) for local calls")?><br>
@@ -842 +842 @@
-        <tr>
-          <td>
-I Identifier")?><span><?php echo _("DAHDI
+i Identifier")?><span><?php echo _("DAHDi
-          </td><td>
-            <input type="text" size="8" name="channelid" value="<?php echo htmlspecialchars($channelid) ?>" tabindex="<?php echo ++$tabindex;?>"/>