Changeset 10165 for contributed_modules/modules

Timestamp:

07/20/10 09:15:55 (3 years ago)

Author:

mbrevda

Message:

closes #4316; re #4284 - not sure what wrong, but I cant seem to figure it out

Files:

• contributed_modules/modules/setcid/functions.inc.php (modified) (6 diffs)
• contributed_modules/modules/setcid/page.setcid.php (modified) (3 diffs)

contributed_modules/modules/setcid/functions.inc.php

@@ -1 +1 @@
-<?php
-
-function setcid_destinations() {
-  global $module_page;
-  $extens = array();
-
-  // it makes no sense to point at another callerid (and it can be an infinite loop)
-  if ($module_page == 'setcid') {
-    return false;
-  }
-
-  // return an associative array with destination and description
-  foreach (setcid_list() as $row) {
-    $extens[] = array('destination' => 'app-setcid,' . $row['cid_id'] . ',1', 'description' => $row['description']);
-  }
-  return $extens;
-}
-
-function setcid_getdest($exten) {
-  return array('app-setcid,'.$exten.',1');
-}
-
-function setcid_getdestinfo($dest) {
-  global $active_modules;
-
-  if (substr(trim($dest),0,14) == 'app-setcid,') {
-    $exten = explode(',',$dest);
-    $exten = $exten[1];
-    $thisexten = setcid_get($exten);
-    if (empty($thisexten)) {
-      return array();
-    } else {
-      $type = isset($active_modules['setcid']['type'])?$active_modules['setcid']['type']:'setup';
-      return array('description' => 'Callerid_name : '.$thisexten['description'],
-                   'edit_url' => 'config.php?display=setcid&type='.$type.'&extdisplay='.urlencode($exten),
-                  );
-    }
-  } else {
-    return false;
-  }
-}
-
-function setcid_get_config($engine) {
@@ -47 +8 @@
-      $ext->addInclude('from-internal-additional', 'app-setcid');
-      foreach (setcid_list() as $row) {
-Changing Callerid from ${CALLERID(all)} to CALLERID(name): '.$row['cid_name'].', CALLERID(num): '. $row['cid_num'].'; ('.$row['description'].')
+('.$row['description'].') Changing cid to '.$row['cid_name'].' <'. $row['cid_num'].'>
-          $ext->add('app-setcid',$row['cid_id'], '', new ext_set('CALLERID(name)', $row['cid_name']));
-          $ext->add('app-setcid',$row['cid_id'], '', new ext_set('CALLERID(num)', $row['cid_num']));
@@ -66 +27 @@
-  }
-  return $results;
+}
+
+function setcid_destinations() {
+  global $module_page;
+  $extens = array();
+
+  // it makes no sense to point at another callerid (and it can be an infinite loop)
+  if ($module_page == 'setcid') {
+    return false;
+  }
+
+  // return an associative array with destination and description
+  foreach (setcid_list() as $row) {
+    $extens[] = array('destination' => 'app-setcid,' . $row['cid_id'] . ',1', 'description' => $row['description']);
+  }
+  return $extens;
-}
-
@@ -115 +92 @@
-}
-
+
+
+//----------------------------------------------------------------------------
+// Dynamic Destination Registry and Recordings Registry Functions
+
-function setcid_check_destinations($dest=true) {
-  global $active_modules;
@@ -122 +104 @@
-    return $destlist;
-  }
-t, des
+
-  if ($dest !== true) {
-dest
+cid_id
-  }
-  $results = sql($sql,"getAll",DB_FETCHMODE_ASSOC);
@@ -131 +113 @@
-
-  foreach ($results as $result) {
-t
+cription
-    $thisid   = $result['cid_id'];
-    $destlist[] = array(
-      'dest' => $thisdest,
-CallerID Change
-'.$type.'&extdisplay
+Set CallerID
+tool&id
-    );
-  }
-  return $destlist;
-}
+
+function setcid_getdest($id) {
+  return array("app-setcid,$id,1");
+}
+
+function setcid_getdestinfo($dest) {dbug('$thiscid',$dest);
+  if (substr(trim($dest),0,10) == 'app-setcid,') {
+    $grp = explode(',',$dest);
+    $id = $grp[1];
+    $thiscid = setcid_get($id);
+    dbug('$thiscid',$grp);
+    if (empty($thiscid)) {
+      return array();
+    } else {
+      return array('description' => sprintf(_("Set CallerID %s: "),$thiscid['description']),
+                   'edit_url' => 'config.php?display=setcid&id='.urlencode($id),
+                  );
+    }
+  } else {
+    return false;
+  }
+}
+
-?>

contributed_modules/modules/setcid/page.setcid.php

@@ -78 +78 @@
-
-  echo "<h2>"._("Edit: ")."$description ($cid_name)"."</h2>";
+
+    $usage_list = framework_display_destination_usage(setcid_getdest($extdisplay));
+    if (!empty($usage_list)) {
+    ?>
+      <tr><td colspan="2">
+      <a href="#" class="info"><?php echo $usage_list['text']?>:<span><?php echo $usage_list['tooltip']?></span></a>
+      </td></tr><br /><br />
+    <?php
+    }
+
-} else {
-  echo "<h2>"._("Add CallerID")."</h2>";
@@ -85 +95 @@
-echo $helptext;
-echo $row['dest'];
+
+
+
-?>
-
@@ -114 +127 @@
-    </td>   
-
-    <?php
-    if ($extdisplay) {
-      $usage_list = framework_display_destination_usage(setcid_getdest($extdisplay));
-      if (!empty($usage_list)) {
-      ?>
-        <tr><td colspan="2">
-        <a href="#" class="info"><?php echo $usage_list['text']?>:<span><?php echo $usage_list['tooltip']?></span></a>
-        </td></tr>
-      <?php
-      }
-    }
-    ?>
-  </tr>
-</table>