Changeset 13471

Timestamp:

02/18/12 14:33:58 (1 year ago)

Author:

p_lindheimer

Message:

closes #5169 adds advanced option to auto-create followme along with default settings for ring/pre-ring, strategy, enabled state also used as defaults when adding new followme

Files:

• modules/branches/2.10/findmefollow/functions.inc.php (modified) (6 diffs)
• modules/branches/2.10/findmefollow/install.php (modified) (1 diff)
• modules/branches/2.10/findmefollow/module.xml (modified) (1 diff)
• modules/branches/2.10/findmefollow/page.findmefollow.php (modified) (2 diffs)

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

@@ -275 +275 @@
-  global $astman;
-  global $db;
+
+  if (empty($postdest)) {
+    $postdest = "ext-local,$grpnum,dest";
+  }
-
-  $sql = "INSERT INTO findmefollow (grpnum, strategy, grptime, grppre, grplist, annmsg_id, postdest, dring, needsconf, remotealert_id, toolate_id, ringing, pre_ring) VALUES ('".$db->escapeSimple($grpnum)."', '".$db->escapeSimple($strategy)."', ".$db->escapeSimple($grptime).", '".$db->escapeSimple($grppre)."', '".$db->escapeSimple($grplist)."', '".$db->escapeSimple($annmsg_id)."', '".$db->escapeSimple($postdest)."', '".$db->escapeSimple($dring)."', '$needsconf', '$remotealert_id', '$toolate_id', '$ringing', '$pre_ring')";
@@ -391 +395 @@
-    $results['voicemail'] = sql("SELECT `voicemail` FROM `users` WHERE `extension` = '".$db->escapeSimple($grpnum)."'","getOne");
-  }
+  if (!isset($results['strategy'])) {
+    $results['strategy'] = $amp_conf['FOLLOWME_RG_STRATEGY'];
+  }
-
-  if ($check_astdb) {
@@ -418 +425 @@
-      $astdb_ddial   = $astman->database_get("AMPUSER",$grpnum."/followme/ddial");                                     
-    // If the values are different then use what is in astdb as it may have been changed.
+    // If sql returned no results for pre_ring/grptime then it's not configued so we reset
+    // the astdb defaults as well
-    //
-    $changed=0;
-    if (!isset($results['pre_ring'])) {
-''
+$astdb_prering = $amp_conf['FOLLOWME_PRERING']
-    }
-    if (!isset($results['grptime'])) {
-''
+$astdb_grptime = $amp_conf['FOLLOWME_TIME']
-    }
-    if (!isset($results['grplist'])) {
@@ -465 +474 @@
-      $ddial = '';
-    } else {
-Bogus value, should not get here but treat as disabled
-
+ If here then followme must not be set so use default
+$amp_conf['FOLLOWME_DISABLED'] ? 'CHECKED' : 
-    }
-    $results['ddial'] = $ddial;
@@ -483 +492 @@
-function findmefollow_configpageinit($dispnum) {
-  global $currentcomponent;
+  global $amp_conf;
-
-  if ( ($dispnum == 'users' || $dispnum == 'extensions') ) {
-    $currentcomponent->addguifunc('findmefollow_configpageload');
+
+    if ($amp_conf['FOLLOWME_AUTO_CREATE']) {
+      $action = isset($_REQUEST['action'])?$_REQUEST['action']:null;
+      if ($action=="add") {
+        $currentcomponent->addprocessfunc('findmefollow_configprocess', 8);
+      }
+    }
-  }
-}
@@ -514 +531 @@
-}
-
+// If we are auto-creating a followme for each extension then add the hook funcitons for
+// extensions and users.
+//
+if ($amp_conf['FOLLOWME_AUTO_CREATE']) {
+  function findmefollow_configprocess() {
+    global $amp_conf;
+
+    //create vars from the request
+    $action = isset($_REQUEST['action'])?$_REQUEST['action']:null;
+    $ext = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:null;
+    $extn = isset($_REQUEST['extension'])?$_REQUEST['extension']:null;
+
+    if ($ext=='') { 
+      $extdisplay = $extn; 
+    } else {
+      $extdisplay = $ext;
+    } 
+    if ($action == "add") {
+      if (!isset($GLOBALS['abort']) || $GLOBALS['abort'] !== true) {
+
+        $ddial = $amp_conf['FOLLOWME_DISABLED'] ? 'CHECKED' : '';
+        findmefollow_add($extdisplay, $amp_conf['FOLLOWME_RG_STRATEGY'], $amp_conf['FOLLOWME_TIME'],
+          $extdisplay, "", "", "", "", "", "", "","", $amp_conf['FOLLOWME_PRERING'], $ddial,'default','');
+      }
+    }
+  }
+}
+
-function findmefollow_check_destinations($dest=true) {
-  global $active_modules;

modules/branches/2.10/findmefollow/install.php

@@ -293 +293 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

modules/branches/2.10/findmefollow/module.xml

@@ -3 +3 @@
-  <repo>standard</repo>
-  <name>Follow Me</name>
-2
+3
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
-  <changelog>
+    *2.10.0.3* #5358, #5521, #5169
-    *2.10.0.2* #5478 
-    *2.10.0.1* call recording bug fixes

modules/branches/2.10/findmefollow/page.findmefollow.php

@@ -24 +24 @@
-isset($_REQUEST['extdisplay'])?$extdisplay=$_REQUEST['extdisplay']:$extdisplay='';
-isset($_REQUEST['account'])?$account = $_REQUEST['account']:$account='';
-''
+$amp_conf['FOLLOWME_TIME']
-isset($_REQUEST['grppre'])?$grppre = $_REQUEST['grppre']:$grppre='';
-''
+$amp_conf['FOLLOWME_RG_STRATEGY']
-isset($_REQUEST['annmsg_id'])?$annmsg_id = $_REQUEST['annmsg_id']:$annmsg_id='';
-isset($_REQUEST['dring'])?$dring = $_REQUEST['dring']:$dring='';
@@ -33 +33 @@
-isset($_REQUEST['toolate_id'])?$toolate_id = $_REQUEST['toolate_id']:$toolate_id='';
-isset($_REQUEST['ringing'])?$ringing = $_REQUEST['ringing']:$ringing='';
-
-
+
-isset($_REQUEST['changecid'])?$changecid = $_REQUEST['changecid']:$changecid='default';
-isset($_REQUEST['fixedcid'])?$fixedcid = $_REQUEST['fixedcid']:$fixedcid='';
-
+$ddial = isset($_REQUEST['ddial']) ? $_REQUEST['ddial'] : ($amp_conf['FOLLOWME_DISABLED'] ? 'CHECKED' : '');
-
-if (isset($_REQUEST['goto0']) && isset($_REQUEST[$_REQUEST['goto0']."0"])) {
-        
+ 
-} else {
-
-
-
+
+
-
-if (isset($_REQUEST["grplist"])) {