Changeset 5864

Timestamp:

07/01/08 21:32:39 (2 months ago)

Author:

p_lindheimer

Message:

Add enable/disable featurecode with blf support, new confirmation sound file announces cid availability

Files:

• modules/branches/2.5/findmefollow/functions.inc.php (modified) (3 diffs)
• modules/branches/2.5/findmefollow/install.php (modified) (1 diff)
• modules/branches/2.5/findmefollow/module.xml (modified) (1 diff)
• modules/branches/2.5/findmefollow/sounds/followme.sln (added)
• modules/branches/2.5/findmefollow/sounds/incoming-call-1-accept-2-decline.sln (modified) (previous)
• modules/branches/2.5/findmefollow/uninstall.php (modified) (1 diff)

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

@@ -6 +6 @@
-function findmefollow_get_config($engine) {
-        global $ext;  // is this the best way to pass this?
+        global $amp_conf;
-        switch($engine) {
-                case "asterisk":
+
+                        $fcc = new featurecode('findmefollow', 'fmf_toggle');
+                        $fmf_code = $fcc->getCodeActive();
+                        unset($fcc);
+
+                        if ($fmf_code != '') {
+                                findmefollow_fmf_toggle($fmf_code);
+                        }
+
-                        $ext->addInclude('from-internal-additional','ext-findmefollow');
-                        $ext->addInclude('from-internal-additional','fmgrps');
@@ -39 +49 @@
-                                        }
-
+                                        if ($fmf_code != '') {
+                                                $ext->add($contextname, $fmf_code.$grpnum, '', new ext_goto("1",$fmf_code,"app-fmf-toggle"));
+                                                if ($amp_conf['USEDEVSTATE']) {
+                                                        $ext->addHint($contextname, $fmf_code.$grpnum, "Custom:FOLLOWME".$grpnum);
+                                                }
+                                        }
-
-                                        // Direct target to Follow-Me come here bypassing the followme/ddial conditional check
-                                        //
-$grpnum,FM
+FM$grpnum","
-
-                                        //
@@ -387 +403 @@
-}
-
+function findmefollow_fmf_toggle($c) {
+        global $ext;
+        global $amp_conf;
+
+        $id = "app-fmf-toggle"; // The context to be included
+        $ext->addInclude('from-internal-additional', $id); // Add the include from from-internal
+
+        $ext->add($id, $c, '', new ext_goto('start','s',$id));
+        $c = 's';
+
+        $ext->add($id, $c, 'start', new ext_answer(''));
+        $ext->add($id, $c, '', new ext_wait('1'));
+        $ext->add($id, $c, '', new ext_macro('user-callerid'));
+
+        $ext->add($id, $c, '', new ext_gotoif('$["${DB(AMPUSER/${AMPUSER}/followme/ddial)}" = "EXTENSION"]', 'activate'));
+        $ext->add($id, $c, '', new ext_gotoif('$["${DB(AMPUSER/${AMPUSER}/followme/ddial)}" = "DIRECT"]', 'deactivate','end'));
+
+        $ext->add($id, $c, 'deactivate', new ext_setvar('DB(AMPUSER/${AMPUSER}/followme/ddial)', 'EXTENSION'));
+        if ($amp_conf['USEDEVSTATE']) {
+                $ext->add($id, $c, '', new ext_setvar('DEVSTATE(Custom:FOLLOWME${AMPUSER})', 'NOT_INUSE'));
+        }
+        $ext->add($id, $c, 'end', new ext_playback('followme&de-activated'));
+        $ext->add($id, $c, '', new ext_macro('hangupcall'));
+
+        $ext->add($id, $c, 'activate', new ext_setvar('DB(AMPUSER/${AMPUSER}/followme/ddial)', 'DIRECT'));
+        if ($amp_conf['USEDEVSTATE']) {
+                $ext->add($id, $c, '', new ext_setvar('DEVSTATE(Custom:FOLLOWME${AMPUSER})', 'INUSE'));
+        }
+        $ext->add($id, $c, '', new ext_playback('followme&activated'));
+        $ext->add($id, $c, '', new ext_macro('hangupcall'));
+
+}
+
-?>

modules/branches/2.5/findmefollow/install.php

@@ -2 +2 @@
-
-global $db;
+
+//TODO: Also need to create all the states if enabled
+
+$fcc = new featurecode('findmefollow', 'fmf_toggle');
+$fcc->setDescription('Findme Follow Toggle');
+$fcc->setDefault('*21');
+$fcc->update();
+unset($fcc);
-
-// Adding support for a pre_ring before follow-me group

modules/branches/2.5/findmefollow/module.xml

@@ -2 +2 @@
-        <rawname>findmefollow</rawname>
-        <name>Follow Me</name>
-4.14.2
+5.0
-        <changelog>
+                *2.5.0* Add enable/disable featurecode with blf support, new confirmation sound file announces cid availability
-                *2.4.14.2* #2604, #2843 fix mal-formed html tags, Russian Translation
-                *2.4.14.1* added depends on 2.4.0

modules/branches/2.5/findmefollow/uninstall.php

@@ -15 +15 @@
-global $amp_conf;
-
+$fcc = new featurecode('findmefollow', 'fmf_toggle');
+$fcc->delete();
+unset($fcc);
+
-$sql = "SELECT * FROM users";
-$userresults = sql($sql,"getAll",DB_FETCHMODE_ASSOC);