Changeset 6661

Timestamp:

09/09/08 00:15:13 (5 years ago)

Author:

p_lindheimer

Message:

fixes #3173, also moves macro's auto-blkvm and auto-confirm to auto-generation and add some visual feedback to DAHDI compatibility mode re #3077

Files:

• modules/branches/2.5/core/etc/extensions.conf (modified) (1 diff)
• modules/branches/2.5/core/functions.inc.php (modified) (3 diffs)
• modules/branches/2.5/core/install.php (modified) (1 diff)
• modules/branches/2.5/core/module.xml (modified) (1 diff)
• modules/branches/2.5/core/page.trunks.php (modified) (3 diffs)
• modules/branches/2.5/featurecodeadmin/module.xml (modified) (2 diffs)
• modules/branches/2.5/featurecodeadmin/page.featurecodeadmin.php (modified) (1 diff)

modules/branches/2.5/core/etc/extensions.conf

@@ -969 +969 @@
-;------------------------------------------------------------------------
-
-;------------------------------------------------------------------------
-; [macro-auto-confirm]
-;------------------------------------------------------------------------
-; This macro is called from ext-local-confirm to auto-confirm a call so that other extensions
-; are aware that the call has been answered.
-;
-;------------------------------------------------------------------------
-[macro-auto-confirm]
-exten => s,1,Set(__MACRO_RESULT=)
-exten => s,n,Set(__CWIGNORE=)
-exten => s,n,DBDel(${BLKVM_OVERRIDE})
-exten => s,n,DBDel(RG/${ARG1}/${UNIQCHAN})
-
-;------------------------------------------------------------------------
-; [macro-auto-blkvm]
-;------------------------------------------------------------------------
-; This macro is called for any extension dialed form a queue, ringgroup
-; or followme, so that the answering extension can clear the voicemail block
-; override allow subsequent transfers to properly operate.
-;
-;------------------------------------------------------------------------
-[macro-auto-blkvm]
-exten => s,1,Set(__MACRO_RESULT=)
-exten => s,n,Set(__CWIGNORE=)
-exten => s,n,DBDel(${BLKVM_OVERRIDE})
-
-;------------------------------------------------------------------------

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

@@ -1396 +1396 @@
-      $ext->add($context, $exten, '', new ext_macro('hangupcall'));
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-      $exten = 's';
+      $ext->add($context, $exten, '', new ext_setvar('__MACRO_RESULT',''));
+      $ext->add($context, $exten, '', new ext_setvar('__CWIGNORE',''));
+      $ext->add($context, $exten, '', new ext_dbdel('${BLKVM_OVERRIDE}'));
+      $ext->add($context, $exten, '', new ext_dbdel('RG/${ARG1}/${UNIQCHAN}'));
+
+
+      /*
+      ;------------------------------------------------------------------------
+      ; [macro-auto-blkvm]
+      ;------------------------------------------------------------------------
+      ; This macro is called for any extension dialed form a queue, ringgroup
+      ; or followme, so that the answering extension can clear the voicemail block
+      ; override allow subsequent transfers to properly operate.
+      ;
+      ;------------------------------------------------------------------------
+      */
+      $context = 'macro-auto-blkvm';
+      $exten = 's';
+      $ext->add($context, $exten, '', new ext_setvar('__MACRO_RESULT',''));
+      $ext->add($context, $exten, '', new ext_setvar('__CWIGNORE',''));
+      $ext->add($context, $exten, '', new ext_dbdel('${BLKVM_OVERRIDE}'));
-      
-      /*
@@ -1410 +1438 @@
-       * screen of AMP
-       */
+
+      $context = 'macro-dialout-trunk';
+      $exten = 's';
+
-      $ext->add($context, $exten, '', new ext_set('DIAL_TRUNK', '${ARG1}'));
-      $ext->add($context, $exten, '', new ext_execif('$[$["${ARG3}" != ""] & $["${DB(AMPUSER/${AMPUSER}/pinless)}" != "NOPASSWD"]]', 'Authenticate', '${ARG3}'));
@@ -4649 +4681 @@
-
-    $section = _("Device Options");
-
+
+
+
-    $devopts = $currentcomponent->getgeneralarrayitem('devtechs', $devinfo_tech);
-    if (is_array($devopts)) {

modules/branches/2.5/core/install.php

@@ -104 +104 @@
-
-$fcc = new featurecode('core', 'disconnect');
- Call
+-Call Asterisk
-$fcc->setDefault('**');
-$fcc->update();

modules/branches/2.5/core/module.xml

@@ -4 +4 @@
-  <category>Basic</category>
-  <name>Core</name>
-0
+1
-  <candisable>no</candisable>
-  <canuninstall>no</canuninstall>
-  <changelog>
+    *2.5.0rc3.1*  #3173, #3077 auto-blkvm,  auto-confirm to auto generation,  visual feedback to DAHDI compatibility
-    *2.5.0rc3.0* #3150, #3152, #3142, #3167, #3077 (DAHDI Support)
-    *2.5.0rc2.5* #3129, #3144, #3146 and some streamling of dialout-trunk and outbound-callerid

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

@@ -212 +212 @@
-  $baseURL   = $_SERVER['PHP_SELF'].'?display='.urlencode($display).'&';
-  $trunks = array(
-
+.(ast_with_dahdi()?" ("._("DAHDI compatibility mode").")":"" )
-    array('url'=> $baseURL.'tech=IAX2', 'tlabel' =>  _("Add IAX2 Trunk")),
-    array('url'=> $baseURL.'tech=SIP', 'tlabel' =>  _("Add SIP Trunk")),
@@ -276 +276 @@
-    }
-
-
+
+
+
-    $tlabel = sprintf(_("Delete Trunk %s"),substr($channelid,0,20));
-    $label = '<span><img width="16" height="16" border="0" title="'.$tlabel.'" alt="" src="images/core_delete.png"/>&nbsp;'.$tlabel.'</span>';
@@ -320 +322 @@
-    $areacode = "";
-  
-echo "<h2>".sprintf("Add %s Trunk",strtoupper($tech))."</h2>"
-
+$upper_tech = strtoupper($tech)
+
-  } 
-switch ($tech) {

modules/branches/2.5/featurecodeadmin/module.xml

@@ -2 +2 @@
-  <rawname>featurecodeadmin</rawname>
-  <name>Feature Code Admin</name>
-1
+2
-  <candisable>no</candisable>
-  <canuninstall>no</canuninstall>
@@ -12 +12 @@
-  <location>release/2.5/featurecodeadmin-2.5.0.1.tgz</location>
-  <changelog>
+    *2.5.0.2* #3173 don't report conflicting extensions with featurmap codes
-    *2.5.0.1* #2461 Localization now works using i18n from hosting featurecode modules
-    *2.5.0* #2845 tabindex, added ability to define default values in freepbx_featurecodes.conf

modules/branches/2.5/featurecodeadmin/page.featurecodeadmin.php

@@ -39 +39 @@
-      $exten_arr = array();
-      foreach ($featurecodes as $result) {
-
+
+
+
+
+
+
-          $exten_arr[] = ($result['customcode'] != '')?$result['customcode']:$result['defaultcode'];
-        }