Changeset 13934 for modules

Timestamp:

03/27/12 14:01:15 (1 year ago)

Author:

p_lindheimer

Message:

fixes #5734 properly validate new destinations

Files:

• modules/branches/2.10/findmefollow/functions.inc.php (modified) (2 diffs)

modules/branches/2.10/findmefollow/functions.inc.php

@@ -399 +399 @@
-
-  $results = sql("SELECT grpnum, strategy, grptime, grppre, grplist, annmsg_id, postdest, dring, needsconf, remotealert_id, toolate_id, ringing, pre_ring, voicemail FROM findmefollow INNER JOIN `users` ON `extension` = `grpnum` WHERE grpnum = '".$db->escapeSimple($grpnum)."'","getRow",DB_FETCHMODE_ASSOC);
+  if (empty($results)) {
+    return array();
+  }
-  if (!isset($results['voicemail'])) {
-    $results['voicemail'] = sql("SELECT `voicemail` FROM `users` WHERE `extension` = '".$db->escapeSimple($grpnum)."'","getOne");
@@ -566 +569 @@
-}
-
+// we only return the destination that other modules might use, e.g. extenions/users
+function findmefollow_getdest($exten) {
+  return array('ext-findmefollow,FM' . $exten . ',1');
+}
+
+function findmefollow_getdestinfo($dest) {
+  if (substr(trim($dest),0,17) == 'ext-findmefollow,' || substr(trim($dest),0,10) == 'ext-local,' && substr(trim($dest),-4) == 'dest') {
+    $grp = explode(',',$dest);
+    $grp = ltrim($grp[1],'FM');
+    $thisgrp = findmefollow_get($grp);
+    if (empty($thisgrp)) {
+      return array();
+    } else {
+      return array('description' => sprintf(_("Follow Me: %s"),urlencode($grp)),
+                   'edit_url' => 'config.php?display=findmefollow&extdisplay=GRP-'.urlencode($grp),
+                  );
+    }
+  } else {
+    return false;
+  }
+}
+
-function findmefollow_check_destinations($dest=true) {
-  global $active_modules;