Changeset 9210

Timestamp:

03/13/10 01:44:59 (2 years ago)

Author:

p_lindheimer

Message:

closes #2833 add trunks as a destination option

Files:

• modules/branches/2.8/core/functions.inc.php (modified) (5 diffs)
• modules/branches/2.8/core/module.xml (modified) (1 diff)
• modules/branches/2.8/core/page.trunks.php (modified) (1 diff)

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

@@ -629 +629 @@
-    }
-  }
+
+  $trunklist = core_trunks_listbyid();
+  if (is_array($trunklist)) foreach ($trunklist as $trunk) {
+    switch($trunk['tech']) {
+      case 'enum':
+        break;
+      default:
+        $extens[] = array('destination' => 'ext-trunk,'.$trunk['trunkid'].',1', 'description' => $trunk['name'].' ('.$trunk['tech'].')', 'category' => 'Trunks');
+        break;
+    }
+  }
-  
-  if (isset($extens))
@@ -638 +649 @@
-function core_getdest($exten) {
-  $dests[] = 'from-did-direct,'.$exten.',1';
+  $dests[] = 'ext-trunk,'.$exten.',1';
-  if (!function_exists('voicemail_mailbox_get')) {
-    return $dests;
@@ -670 +682 @@
-                   'edit_url' => "config.php?type=setup&display=$display&extdisplay=".urlencode($exten)."&skip=0",
-                  );
+    }
+
+
+  } else if (substr(trim($dest),0,10) == 'ext-trunk,') {
+    $exten = explode(',',$dest);
+    $exten = $exten[1];
+    $thisexten = core_trunks_getDetails($exten);
+    if (empty($thisexten)) {
+      return array();
+    } else {
+      $display = 'trunks';
+      return array('description' => sprintf(_('Trunk: %s (%s)'),$thisexten['name'],$thisexten['tech']),
+                  'edit_url' => "config.php?type=setup&display=$display&extdisplay=OUT_".urlencode($exten),
+                  );
+
-    }
-
@@ -1309 +1336 @@
-      }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        foreach ($trunklist as $trunkprops) {
-
-
+
-            continue;
-          }
-          switch ($trunkprops['tech']) {
-DUNDI
-substr($trunkprops['globalvar'],4)
-name
+dundi
+$trunkprops['trunkid']
+channelid
-              $ext->add($macro_name, 's', '', new ext_goto('1','${ARG1}'));
-
-
-
-
-
-
+
+
+
+
-              $ext->add($trunkcontext, '_.', '', new ext_goto('1','${EXTEN}','from-trunk'));
+
+              $ext->add($tcontext,$trunkprops['trunkid'],'',new ext_set('OUTBOUND_GROUP', 'OUT_${DIAL_TRUNK}'));
+              $ext->add($tcontext,$trunkprops['trunkid'],'',new ext_gotoif('$["${OUTMAXCHANS_${DIAL_TRUNK}}" = ""]', 'nomax'));
+              $ext->add($tcontext,$trunkprops['trunkid'],'',new ext_gotoif('$[${GROUP_COUNT(OUT_${DIAL_TRUNK})} >= ${OUTMAXCHANS_${DIAL_TRUNK}}]', 'hangit'));
+              if ($ast_lt_16) { 
+                $ext->add($tcontext,$trunkprops['trunkid'],'nomax',new ext_execif('$["${CALLINGPRES_SV}" != ""]', 'SetCallerPres', '${CALLINGPRES_SV}'));
+              } else {
+                $ext->add($tcontext,$trunkprops['trunkid'],'nomax',new ext_execif('$["${CALLINGPRES_SV}" != ""]', 'Set', 'CALLERPRES()=${CALLINGPRES_SV}'));
+              }
+              $ext->add($tcontext,$trunkprops['trunkid'],'',new ext_set('DIAL_NUMBER','${FROM_DID}'));
+              $ext->add($tcontext,$trunkprops['trunkid'],'',new ext_execif('$["${PREFIX_TRUNK_${DIAL_TRUNK}}" != ""]','AGI','fixlocalprefix'));
+              $ext->add($tcontext, $trunkprops['trunkid'], '', new ext_macro('dundi-${DIAL_TRUNK}','${OUTNUM}'));
+              $ext->add($tcontext,$trunkprops['trunkid'],'hangit',new ext_hangup());
+              break;
+
+            case 'iax':
+              $trukprops['tech'] = 'iax2';
+              // fall-through
+            case 'iax2':
+            case 'sip':
+              $trunkgroup = 'OUT_'.$trunkprops['trunkid'];
+              $trunkcontext  = "from-trunk-".$trunkprops['tech']."-".$trunkprops['channelid'];
+              $ext->add($trunkcontext, '_.', '', new ext_set('GROUP()',$trunkgroup));
+              $ext->add($trunkcontext, '_.', '', new ext_goto('1','${EXTEN}','from-trunk'));
+              // fall-through
+            case 'zap':
+            case 'dahdi':
+              $ext->add($tcontext, $trunkprops['trunkid'], '', new ext_set('TDIAL_STRING',strtoupper($trunkprops['tech']).'/'.$trunkprops['channelid']));
+              $ext->add($tcontext, $trunkprops['trunkid'], '', new ext_set('DIAL_TRUNK',$trunkprops['trunkid'] ));
+              $ext->add($tcontext, $trunkprops['trunkid'], '', new ext_goto('1',$texten,'ext-trunk'));
+              $generate_texten = true;
+              break;
+
+            // TODO we don't have the OUTNUM until later so fix this...
+            case 'custom':
+              $dial_string = str_replace('$OUTNUM$','\\\\$\\\\{OUTNUM\\\\}',$trunkprops['channelid']);
+              $ext->add($tcontext, $trunkprops['trunkid'], '', new ext_set('TDIAL_STRING',$dial_string));
+              $ext->add($tcontext, $trunkprops['trunkid'], '', new ext_set('DIAL_TRUNK',$trunkprops['trunkid'] ));
+              $ext->add($tcontext, $trunkprops['trunkid'], '', new ext_goto('1',$tcustom,'ext-trunk'));
+              $generate_tcustom = true;
+              break;
+
+            case 'enum':
+              // Not Supported
-              break;
-            default:
-          }
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      /* dialplan globals */
-      // modules should NOT use the globals table to store anything!
@@ -1942 +2047 @@
-      $ext->add($context, $exten, '', new ext_gotoif('$["${PREDIAL_HOOK_RET}" = "BYPASS"]', 'bypass,1'));
-    
-      $ext->add($context, $exten, '', new ext_gotoif('$["${custom}" = "AMP"]', 'customtrunk'));
-
-      $ext->add($context, $exten, '', new ext_macro('dundi-${DIAL_TRUNK}','${OUTNUM}'));
-      $ext->add($context, $exten, '', new ext_goto(1, 's-${DIALSTATUS}'));

modules/branches/2.8/core/module.xml

@@ -10 +10 @@
-  <canuninstall>no</canuninstall>
-  <changelog>
-
+, #2833
-    *2.8.0.0beta1.0* #4100, #4102, #4110 New Outbound Routing Schema and features
-    *2.7.0.2* really fix #4092

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

@@ -299 +299 @@
-      echo "</span></a>";
-    }
+    $usage_list = framework_display_destination_usage(core_getdest(ltrim($extdisplay,'OUT_')));
+    if (!empty($usage_list)) {
+    ?>
+      <a href="#" class="info"><?php echo $usage_list['text']?><span><?php echo $usage_list['tooltip']?></span></a>
+    <?php
+    }
+
-
-  } else {