Changeset 9217

Timestamp:

03/15/10 01:38:42 (3 years ago)

Author:

p_lindheimer

Message:

added bunch of the dahdi code re #4135, removed optional use of USEDIALONE re #4068 if detected will use it - WARNING some of this code is still untested

Files:

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

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

@@ -73 +73 @@
-        break;
-      case 'chan_dahdi_additional.conf':
-
+
+
+
+
+
-        break;
-      case 'zapata_additional.conf':
@@ -515 +519 @@
-  }
-
-
+, $table_name = 'zap'
-    global $db;
-
-    $table_name = "zap";
-
-    $additional = "";
@@ -772 +774 @@
-  global $core_conf;
-  global $chan_dahdi;
-
+
+
-
-  $modulename = "core";
@@ -1222 +1225 @@
-      }
-
-
+or macro-from-dahdi-nnn 
-      // Send it to from-trunk so it is handled as other dids would be handled.
-      //
+      // to this point we have both zap and dahdi configuration options. At generation though they can't co-exists. If compatibility
+      // mode then it's still from-zaptel, otherwise it is which ever is present. We cant use ast_with_dahdi() (chan_dadi) because
+      // it is for detection with compatibility mode. We need to actually determine if chan_dahdi is present or not at this point
+      //
+      if (!isset($chan_dahdi_loaded) {
+        if ($ast_ge_14 && isset($astman) && $astman->connected() {
+          $response = $astman->send_request('Command', array('Command' => 'module show like chan_dahdi'));
+          $chan_dahdi_loaded = (preg_match('/1 modules loaded/', $response['data']) > 0);
+        }
+      }
+      $context_type = $chan_dahdi_loaded ? 'dahdi' : 'zaptel';
-      foreach (core_zapchandids_list() as $row) {
-        $channel = $row['channel'];
-        $did     = $row['did'];
-
-zap_context = "macro-from-zaptel-{$channel}
-zap
+this_context = "macro-from-$context_type-$channel
+this
-        $ext->add($zap_context, 's', '', new ext_setvar('__FROM_DID',$did));
-        $ext->add($zap_context, 's', '', new ext_goto('1',$did,'from-trunk'));
@@ -2401 +2415 @@
-      $ext->add($context, $exten, '', new ext_noop('Returned from Macro from-zaptel-${CHAN}'));
-      $ext->add($context, $exten, '', new ext_goto(1, '${DID}', 'from-pstn'));
+
+
+      if (!$chan_dahdi) {
+        $context = 'from-dahdi';
+        $exten = '_X.';
+      
+        $ext->add($context, $exten, '', new ext_set('DID', '${EXTEN}'));
+        $ext->add($context, $exten, '', new ext_goto(1, 's'));
+
+        $exten = 's';
+        $ext->add($context, $exten, '', new ext_noop('Entering from-dahdi with DID == ${DID}'));
+        // Some trunks _require_ a RINGING be sent before an Answer. 
+        $ext->add($context, $exten, '', new ext_ringing());
+        // If ($did == "") { $did = "s"; }
+        $ext->add($context, $exten, '', new ext_set('DID', '${IF($["${DID}"= ""]?s:${DID})}'));
+        $ext->add($context, $exten, '', new ext_noop('DID is now ${DID}'));
+        $ext->add($context, $exten, '', new ext_gotoif('$["${CHANNEL:0:5}"="DAHDI"]', 'dahdiok', 'notdahdi'));
+        $ext->add($context, $exten, 'notdahdi', new ext_goto('1', '${DID}', 'from-pstn'));
+        // If there's no ext-did,s,1, that means there's not a no did/no cid route. Hangup.
+        $ext->add($context, $exten, '', new ext_macro('Hangupcall', 'dummy'));
+        $ext->add($context, $exten, 'dahdiok', new ext_noop('Is a Zaptel Channel'));
+        $ext->add($context, $exten, '', new ext_set('CHAN', '${CHANNEL:6}'));
+        $ext->add($context, $exten, '', new ext_set('CHAN', '${CUT(CHAN,-,1)}'));
+        $ext->add($context, $exten, '', new ext_macro('from-dahdi-${CHAN}', '${DID},1'));
+        // If nothing there, then treat it as a DID
+        $ext->add($context, $exten, '', new ext_noop('Returned from Macro from-dahdi-${CHAN}'));
+        $ext->add($context, $exten, '', new ext_goto(1, '${DID}', 'from-pstn'));
+      }
-
-      /*
@@ -2793 +2835 @@
-      $ext->add($mcontext,$exten,'checkrecord', new ext_macro('record-enable','${EXTTOCALL},IN'));
-
-amp_conf['USEDIALONE'] && $
+
-        $ext->add($mcontext,$exten,'macrodial', new ext_macro('dial-one','${RT},${DIAL_OPTIONS},${EXTTOCALL}'));
-      } else {
@@ -2859 +2901 @@
-      $ext->add($mcontext,$exten,'', new ext_set("CFBEXT", '${DB(CFB/${EXTTOCALL})}'));
-      $ext->add($mcontext,$exten,'', new ext_set("CWI_TMP", '${CWIGNORE}'));
-amp_conf['USEDIALONE'] && $
+
-        $ext->add($mcontext,$exten,'macrodial', new ext_macro('dial-one','${RT},${DIAL_OPTIONS},${EXTTOCALL}'));
-      } else {
@@ -2938 +2980 @@
-            un-documented USEMACRODIALONE = true flag.
-      */
-amp_conf['USEDIALONE'] && $
+
-
-        $mcontext = 'macro-dial-one';
@@ -3279 +3321 @@
-    case "SIP":
-    case "ZAP":
+    case "DAHDI":
-      $sql .= " WHERE tech = '".strtolower($tech)."'";
-      break;
@@ -3342 +3385 @@
-  }
-  //unless defined, $dial is TECH/id
- $dial == '' 
- is an exception
- strtolower($tech) == "zap" 
-zap
-'ZAP/'.$zap
+$dial == ''
+, dahdi are exceptions
+strtolower($tech) == "zap" || strtolower($tech) == 'dahdi'
+this
+strtoupper($tech).'/'.$this
-    } else {
-      $dial = strtoupper($tech)."/".$id;
@@ -3821 +3864 @@
-}
-
+function core_devices_adddahdi($account) {
+  global $db;
+  global $currentFile;
+    
+  foreach ($_REQUEST as $req=>$data) {
+    if ( substr($req, 0, 8) == 'devinfo_' ) {
+      $keyword = substr($req, 8);
+      if ( $keyword == 'dial' && $data == '' ) {
+        $dahdichan = $_REQUEST['devinfo_channel'] != '' ? $_REQUEST['devinfo_channel'] : $_REQUEST['channel'];
+        $dahdifields[] = array($account, $keyword, 'DAHDI/'.$dahdichan);
+      } elseif ($keyword == 'mailbox' && $data == '') {
+        $dahdifields[] = array($account,'mailbox',$account.'@device');
+      } else {
+        $dahdifields[] = array($account, $keyword, $data);
+      }
+    }
+  }
+  
+  if ( !is_array($dahdifields) ) { // left for compatibilty....lord knows why !
+    $dahdifields = array(
+      array($account,'context',$db->escapeSimple(($_REQUEST['context'])?$_REQUEST['context']:'from-internal')),
+      array($account,'mailbox',$db->escapeSimple(($_REQUEST['mailbox'])?$_REQUEST['mailbox']:$account.'@device')),
+      array($account,'immediate',$db->escapeSimple(($_REQUEST['immediate'])?$_REQUEST['immediate']:'no')),
+      array($account,'signalling',$db->escapeSimple(($_REQUEST['signalling'])?$_REQUEST['signalling']:'fxo_ks')),
+      array($account,'echocancel',$db->escapeSimple(($_REQUEST['echocancel'])?$_REQUEST['echocancel']:'yes')),
+      array($account,'echocancelwhenbridged',$db->escapeSimple(($_REQUEST['echocancelwhenbridged'])?$_REQUEST['echocancelwhenbridged']:'no')),
+      array($account,'immediate',$db->escapeSimple(($_REQUEST['immediate'])?$_REQUEST['immediate']:'no')),  
+      array($account,'echotraining',$db->escapeSimple(($_REQUEST['echotraining'])?$_REQUEST['echotraining']:'800')),
+      array($account,'busydetect',$db->escapeSimple(($_REQUEST['busydetect'])?$_REQUEST['busydetect']:'no')),
+      array($account,'busycount',$db->escapeSimple(($_REQUEST['busycount'])?$_REQUEST['busycount']:'7')),
+      array($account,'callprogress',$db->escapeSimple(($_REQUEST['callprogress'])?$_REQUEST['callprogress']:'no')),
+      array($account,'accountcode',$db->escapeSimple((isset($_REQUEST['accountcode']))?$_REQUEST['accountcode']:'')),
+      array($account,'callgroup',$db->escapeSimple((isset($_REQUEST['callgroup']))?$_REQUEST['callgroup']:'')),
+      array($account,'pickupgroup',$db->escapeSimple((isset($_REQUEST['pickupgroup']))?$_REQUEST['pickupgroup']:'')),
+      array($account,'channel',$db->escapeSimple(($_REQUEST['channel'])?$_REQUEST['channel']:''))
+    );
+  }
+
+  // Very bad
+  $dahdifields[] = array($account,'account',$db->escapeSimple($account)); 
+  $dahdifields[] = array($account,'callerid',$db->escapeSimple(($_REQUEST['description'])?$_REQUEST['description']." <".$account.'>':'device'." <".$account.'>'));
+  
+  // Where is this in the interface ??????
+  $dahdifields[] = array($account,'record_in',$db->escapeSimple(($_REQUEST['record_in'])?$_REQUEST['record_in']:'On-Demand'));
+  $dahdifields[] = array($account,'record_out',$db->escapeSimple(($_REQUEST['record_out'])?$_REQUEST['record_out']:'On-Demand'));
+
+  $compiled = $db->prepare('INSERT INTO dahdi (id, keyword, data) values (?,?,?)');
+  $result = $db->executeMultiple($compiled,$dahdifields);
+  if(DB::IsError($result)) {
+    die_freepbx($result->getMessage()."<br><br>error adding to DAHDI table"); 
+  }
+}
+
-function core_devices_delzap($account) {
-  global $db;
@@ -3832 +3928 @@
-}
-
+function core_devices_deldahdi($account) {
+  global $db;
+  global $currentFile;
+  
+  $sql = "DELETE FROM dahdi WHERE id = '$account'";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) {
+    die_freepbx($result->getMessage().$sql);
+  }
+}
+
-function core_devices_getzap($account) {
-  global $db;
-  $sql = "SELECT keyword,data FROM zap WHERE id = '$account'";
+  $results = $db->getAssoc($sql);
+  if(DB::IsError($results)) {
+    $results = null;
+  }
+  return $results;
+}
+
+function core_devices_getdahdi($account) {
+  global $db;
+  $sql = "SELECT keyword,data FROM dahdi WHERE id = '$account'";
-  $results = $db->getAssoc($sql);
-  if(DB::IsError($results)) {
@@ -4665 +4782 @@
-  global $db;
-
-  $values = array();
-  $rules_arr = array();
-  $i = 1;
-  foreach ($dialrules as $rule) {
-    $rules_arr[] = array($db->escapeSimple($rule),$i);
-
-
-
+
+
-  sql("DELETE FROM `trunks_dialpatterns` WHERE `trunkid` = $trunknum");
-  $compiled = $db->prepare("INSERT INTO `trunks_dialpatterns` (trunkid, rule, seq) VALUES ($trunknum,?,?)");
@@ -4693 +4808 @@
-    $rule_hash['trunk-'.$pattern['trunkid']]['rule'.$rule_num++] = $pattern['rule'];
-  }
-  
-  return $rule_hash;
-}
-
-/* DEPRECATED - SHOULD NO LONGER BE USED, generated from core_conf in retrieve_conf
- *
-function core_trunks_writeDialRulesFile($conf) {
-  global $amp_conf;
-  $localPrefixFile = $amp_conf['ASTETCDIR']."/localprefixes.conf";
-  
-  $fd = fopen($localPrefixFile,"w");
-  foreach ($conf as $section=>$values) {
-    fwrite($fd, "[".$section."]\n");
-    foreach ($values as $key=>$value) {
-      fwrite($fd, $key."=".$value."\n");
-    }
-    fwrite($fd, "\n");
-  }
-  fclose($fd);
-}
-*/
-
-/* THIS HAS BEEN DEPRECATED BUT WILL REMAIN IN FOR A FEW RELEASES */
@@ -4761 +4857 @@
-  $tech = core_trunks_getTrunkTech($trunknum);
-  
-
+"dahdi" || $tech ==
-  
-  $results = sql("SELECT keyword,data FROM $tech WHERE `id` = 'tr-peer-$trunknum' ORDER BY flags, keyword DESC","getAll");
@@ -4786 +4882 @@
-  $tech = core_trunks_getTrunkTech($trunknum);
-  
-
+"dahdi" || $tech ==
-  
-  $results = sql("SELECT keyword,data FROM $tech WHERE `id` = 'tr-user-$trunknum' ORDER BY flags, keyword DESC","getAll");
@@ -4805 +4901 @@
-  $tech = core_trunks_getTrunkTech($trunknum);
-  
-
+dahdi" || $tech == "
-  
-  $results = sql("SELECT `keyword`, `data` FROM $tech WHERE `id` = 'tr-reg-$trunknum'","getAll");
@@ -5678 +5774 @@
-    $currentcomponent->addgeneralarrayitem('devtechs', 'zap', $tmparr);
-    unset($tmparr);
+
+    // dahdi
+    $tmparr = array();
+    $tmparr['channel'] = array('value' => '', 'level' => 0, 'jsvalidation' => 'isEmpty()', 'failvalidationmsg' => $msgInvalidChannel);
+    $tmparr['context'] = array('value' => 'from-internal', 'level' => 1);
+    $tmparr['immediate'] = array('value' => 'no', 'level' => 1);
+    $tmparr['signalling'] = array('value' => 'fxo_ks', 'level' => 1);
+    $tmparr['echocancel'] = array('value' => 'yes', 'level' => 1);
+    $tmparr['echocancelwhenbridged'] = array('value' => 'no', 'level' => 1);
+    $tmparr['echotraining'] = array('value' => '800', 'level' => 1);
+    $tmparr['busydetect'] = array('value' => 'no', 'level' => 1);
+    $tmparr['busycount'] = array('value' => '7', 'level' => 1);
+    $tmparr['callprogress'] = array('value' => 'no', 'level' => 1);
+    $tmparr['dial'] = array('value' => '', 'level' => 1);
+    $tmparr['accountcode'] = array('value' => '', 'level' => 1);
+    $tmparr['callgroup'] = array('value' => '', 'level' => 1);
+    $tmparr['pickupgroup'] = array('value' => '', 'level' => 1);
+    $tmparr['mailbox'] = array('value' => '', 'level' => 1);
+    $currentcomponent->addgeneralarrayitem('devtechs', 'dahdi', $tmparr);
+    unset($tmparr);
-    
-    // iax2
@@ -5734 +5850 @@
-    $currentcomponent->addoptlistitem('devicelist', 'iax2_generic', _("Generic IAX2 Device"));
-    $currentcomponent->addoptlistitem('devicelist', 'zap_generic', _("Generic ZAP Device"));
+    if (!ast_with_dahdi()) {
+      $currentcomponent->addoptlistitem('devicelist', 'dahdi_generic', _("Generic DAHDI Device"));
+    }
-    $currentcomponent->addoptlistitem('devicelist', 'custom_custom', _("Other (Custom) Device"));
-    }

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

@@ -213 +213 @@
-<?php
-  $baseURL   = $_SERVER['PHP_SELF'].'?display='.urlencode($display).'&';
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  foreach ($trunks as $trunk) {
-    $label = '<span><img width="16" height="16" border="0" title="'.$trunk['tlabel'].'" alt="" src="images/core_add.png"/>&nbsp;'.$trunk['tlabel'].'</span>';
@@ -313 +314 @@
-    $dialoutprefix = "";
-    
-"zap"
-"g0"
+'zap' || $tech == 'dahdi'
+'g0'
-    } else {
-""
+''
-    }
-    
@@ -364 +365 @@
-      <tr>
-        <td>
-Description
+Name
-        </td><td>
-          <input type="text" size="30" name="trunk_name" value="<?php echo $trunk_name;?>" tabindex="<?php echo ++$tabindex;?>"/>
@@ -463 +464 @@
-          <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>
-
+and DAHDI 
-          <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>
-          </span></a>:
@@ -695 +696 @@
-        <tr>
-          <td>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-          </td><td>
-            <input type="text" size="8" name="channelid" value="<?php echo htmlspecialchars($channelid) ?>" tabindex="<?php echo ++$tabindex;?>"/>