Changeset 1881

Timestamp:

05/06/06 15:37:59 (7 years ago)

Author:

mheydon1973

Message:

Added ability to use a FeatureCode? without having to type the featurecode digits, which obviously could be changed

Files:

• modules/branches/2.1/miscdests/functions.inc.php (modified) (3 diffs)
• modules/branches/2.1/miscdests/module.xml (modified) (1 diff)
• modules/branches/2.1/miscdests/page.miscdests.php (modified) (4 diffs)

modules/branches/2.1/miscdests/functions.inc.php

@@ -25 +25 @@
-    case "asterisk":
-      $contextname = 'ext-miscdests';
+      $fctemplate = '/\{(.+)\:(.+)\}/';
+      
-      if(is_array($destlist = miscdests_list())) {
-        
@@ -34 +36 @@
-          $miscdialdest = $miscdest['destdial'];
-
+          // exchange {mod:fc} for the relevent feature codes in $miscdialdest
+          $miscdialdest = preg_replace_callback($fctemplate, "miscdests_lookupfc", $miscdialdest);
+
+          // write out the dialplan details
-          $ext->add($contextname, $miscid, '', new ext_noop('MiscDest: '.$miscdescription));
-          $ext->add($contextname, $miscid, '', new ext_dial('Local/'.$miscdialdest.'@from-internal', ''));
@@ -74 +80 @@
-}
-
+function miscdests_lookupfc($matches) {
+  $modulename = $matches[1];
+  $featurename = $matches[2];
+
+  $fcc = new featurecode($modulename, $featurename);
+  $fc = $fcc->getCodeActive();
+  return $fc;
+}
-?>

modules/branches/2.1/miscdests/module.xml

@@ -2 +2 @@
-  <rawname>miscdests</rawname>
-  <name>Misc Destinations</name>
-
+1.
-  <type>setup</type>
-  <category>Basic</category>

modules/branches/2.1/miscdests/page.miscdests.php

@@ -33 +33 @@
-}
-
-//get meetme rooms
-//this function needs to be available to other modules (those that use goto destinations)
-//therefore we put it in globalfunctions.php
-$miscdests = miscdests_list();
+
+// Make array of feature code for <SELECT> list
+$featurecodes = featurecodes_getAllFeaturesDetailed();
+if (isset($featurecodes)) {
+  foreach ($featurecodes as $item) {
+    $moduledesc = _($item['moduledescription']);
+    $moduleena = ($item['moduleenabled'] == 1 ? true : false);
+    if ($moduleena) {
+      $featureena = ($item['featureenabled'] == 1 ? true : false);
+      if ($featureena) {
+        $featureid = $item['modulename'] . ':' . $item['featurename'];
+        $featuredesc = _($item['featuredescription']);
+        
+        $featurecodedefault = (isset($item['defaultcode']) ? $item['defaultcode'] : '');
+        $featurecodecustom = (isset($item['customcode']) ? $item['customcode'] : '');
+        $featureactualcode = ($featurecodecustom != '' ? $featurecodecustom : $featurecodedefault);
+        
+        $fclist[$featureid] = $featuredesc;
+      }
+    }
+  }
+  asort($fclist);
+}
+
-?>
-
@@ -63 +84 @@
-    $thisMiscDest = miscdests_get($extdisplay);
-    //create variables
+    $description = "";
+    $destdial = "";
-    extract($thisMiscDest);
-  }
@@ -91 +114 @@
-  <tr>
-    <td><a href="#" class="info"><?php echo _("dial:")?><span><?php echo _("Enter the digits to dial for this Misc Destination.")?></span></a></td>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  </tr>
-
-  
-  <tr>
-
+
+
-  </tr>
-  </table>
@@ -118 +156 @@
-  if (!isAlphanumeric(theForm.description.value))
-    return warnInvalid(theForm.description, msgInvalidDescription);
+
+  // go thru text and remove the {} bits so we only check the actual dial digits
+  var fldText = theForm.destdial.value;
+  var chkText = "";
+  
+  if ( (fldText.indexOf("{") > -1) && (fldText.indexOf("}") > -1) ) { // has one or more sets of {mod:fc}
-    
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return warnInvalid(theForm.destdial, msgInvalidDial);
- 
+
-  return true;
-}
-
+function fc_onchange() {
+  theForm.destdial.value = theForm.fc.value;
+  theForm.fc.selectedIndex = 0;
+}
-//-->
-</script>