Changeset 2721

Timestamp:

10/16/06 00:45:57 (7 years ago)

Author:

p_lindheimer

Message:

moved require_once() into funcitons, was breaking page.extensions.php ???

Files:

• modules/branches/2.2/findmefollow/functions.inc.php (modified) (5 diffs)
• modules/branches/2.2/findmefollow/module.xml (modified) (1 diff)

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

@@ -1 @@
-
-
-
-
+
-
-// The destinations this module provides
@@ -130 +127 @@
-function findmefollow_add($grpnum,$strategy,$grptime,$grplist,$postdest,$grppre='',$annmsg='',$dring,$needsconf,$remotealert,$toolate,$ringing,$pre_ring) {
-  global $amp_conf;
+  require_once($amp_conf['AMPWEBROOT'].'/admin/common/php-asmanager.php');
+
-
-  $sql = "INSERT INTO findmefollow (grpnum, strategy, grptime, grppre, grplist, annmsg, postdest, dring, needsconf, remotealert, toolate, ringing, pre_ring) VALUES (".$grpnum.", '".str_replace("'", "''", $strategy)."', ".str_replace("'", "''", $grptime).", '".str_replace("'", "''", $grppre)."', '".str_replace("'", "''", $grplist)."', '".str_replace("'", "''", $annmsg)."', '".str_replace("'", "''", $postdest)."', '".str_replace("'", "''", $dring)."', '$needsconf', '$remotealert', '$toolate', '$ringing', '$pre_ring')";
@@ -150 +149 @@
-function findmefollow_del($grpnum) {
-  global $amp_conf;
+  require_once($amp_conf['AMPWEBROOT'].'/admin/common/php-asmanager.php');
-
-  $results = sql("DELETE FROM findmefollow WHERE grpnum = $grpnum","query");
@@ -233 +233 @@
-function findmefollow_get($grpnum, $check_astdb=0) {
-  global $amp_conf;
+  require_once($amp_conf['AMPWEBROOT'].'/admin/common/php-asmanager.php');
-
-  $results = sql("SELECT grpnum, strategy, grptime, grppre, grplist, annmsg, postdest, dring, needsconf, remotealert, toolate, ringing, pre_ring FROM findmefollow WHERE grpnum = $grpnum","getRow",DB_FETCHMODE_ASSOC);
@@ -311 +312 @@
-}
-
-
-// this function builds the AMPUSE/<grpnum>/followme tree for each user who has a group number
-// it's purpose is to convert after an upgrade
-// 
-function findmefollow_users2astdb(){
-  checkAstMan();
-  global $amp_conf;
-  $sql = "SELECT * FROM findmefollow";
-  $userresults = sql($sql,"getAll",DB_FETCHMODE_ASSOC);
-  
-  //add details to astdb
-  $astman = new AGI_AsteriskManager();
-  if ($res = $astman->connect("127.0.0.1", $amp_conf["AMPMGRUSER"] , $amp_conf["AMPMGRPASS"])) {
-    foreach($userresults as $usr) {
-
-      extract($usr);
-
-      $astman->database_put("AMPUSER",$grpnum."/followme/prering",isset($pre_ring)?$pre_ring:'');
-      $astman->database_put("AMPUSER",$grpnum."/followme/grptime",isset($grptime)?$grptime:'');
-      $astman->database_put("AMPUSER",$grpnum."/followme/grplist",isset($grplist)?$grplist:'');
-      $confvalue = ($needsconf == 'CHECKED')?'ENABLED':'DISABLED';
-      $astman->database_put("AMPUSER",$grpnum."/followme/grpconf",isset($needsconf)?$confvalue:'');
-    } 
-  } else {
-    echo _("Cannot connect to Asterisk Manager with ").$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"];
-  }
-  return $astman->disconnect();
-}
-
-?>

modules/branches/2.2/findmefollow/module.xml

@@ -2 +2 @@
-  <rawname>findmefollow</rawname>
-  <name>Follow Me</name>
-3
+4
-  <changelog>
+    2.2.4: moved require_once() in functions.php, was breaking other stuff
-    2.2.3: full path in require_once to keep retrieve_conf from dieing
-    2.2.2: bug fix = should be ==