Changeset 5858

Timestamp:

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

Author:

p_lindheimer

Message:

added func_devstate support and toggle feature to DND

Files:

• modules/branches/2.5/donotdisturb/functions.inc.php (modified) (5 diffs)
• modules/branches/2.5/donotdisturb/install.php (modified) (1 diff)
• modules/branches/2.5/donotdisturb/module.xml (modified) (1 diff)
• modules/branches/2.5/donotdisturb/uninstall.php (modified) (1 diff)

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

@@ -8 +8 @@
-        switch($engine) {
-                case "asterisk":
+
+                        // If Using DND then set this so AGI scripts can determine
+                        //
+                        if ($amp_conf['USEDEVSTATE']) {
+                                $ext->addGlobal('DNDDEVSTATE','TRUE');
+                        }
+
-                        if (is_array($featurelist = featurecodes_getModuleFeatures($modulename))) {
-                                foreach($featurelist as $item) {
@@ -31 +38 @@
-function donotdisturb_dnd_on($c) {
-        global $ext;
+        global $amp_conf;
-
-        $id = "app-dnd-on"; // The context to be included
@@ -40 +48 @@
-        $ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-        $ext->add($id, $c, '', new ext_setvar('DB(DND/${AMPUSER})', 'YES')); // $cmd,n,Set(...=YES)
+        if ($amp_conf['USEDEVSTATE']) {
+                $ext->add($id, $c, '', new ext_setvar('DEVSTATE(Custom:DND${AMPUSER})', 'BUSY')); // $cmd,n,Set(...=YES)
+        }
-        $ext->add($id, $c, '', new ext_playback('do-not-disturb&activated')); // $cmd,n,Playback(...)
-        $ext->add($id, $c, '', new ext_macro('hangupcall')); // $cmd,n,Macro(user-callerid)
@@ -46 +57 @@
-function donotdisturb_dnd_off($c) {
-        global $ext;
+        global $amp_conf;
-
-        $id = "app-dnd-off"; // The context to be included
@@ -55 +67 @@
-        $ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-        $ext->add($id, $c, '', new ext_dbdel('DND/${AMPUSER}')); // $cmd,n,DBdel(..)
+        if ($amp_conf['USEDEVSTATE']) {
+                $ext->add($id, $c, '', new ext_setvar('DEVSTATE(Custom:DND${AMPUSER})', 'NOT_INUSE')); // $cmd,n,Set(...=YES)
+        }
-        $ext->add($id, $c, '', new ext_playback('do-not-disturb&de-activated')); // $cmd,n,Playback(...)
-        $ext->add($id, $c, '', new ext_macro('hangupcall')); // $cmd,n,Macro(user-callerid)
-}
-
+function donotdisturb_dnd_toggle($c) {
+        global $ext;
+        global $amp_conf;
+
+        $id = "app-dnd-toggle"; // The context to be included
+        $ext->addInclude('from-internal-additional', $id); // Add the include from from-internal
+
+        $ext->add($id, $c, '', 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(DND/${AMPUSER})}" = ""]', 'activate', 'deactivate'));
+
+        $ext->add($id, $c, 'activate', new ext_setvar('DB(DND/${AMPUSER})', 'YES'));
+        if ($amp_conf['USEDEVSTATE']) {
+                $ext->add($id, $c, '', new ext_setvar('DEVSTATE(Custom:DND${AMPUSER})', 'BUSY'));
+        }
+        $ext->add($id, $c, '', new ext_playback('do-not-disturb&activated'));
+        $ext->add($id, $c, '', new ext_macro('hangupcall'));
+
+        $ext->add($id, $c, 'deactivate', new ext_dbdel('DND/${AMPUSER}'));
+        if ($amp_conf['USEDEVSTATE']) {
+                $ext->add($id, $c, '', new ext_setvar('DEVSTATE(Custom:DND${AMPUSER})', 'NOT_INUSE'));
+        }
+        $ext->add($id, $c, '', new ext_playback('do-not-disturb&de-activated'));
+        $ext->add($id, $c, '', new ext_macro('hangupcall'));
+}
+
-?>

modules/branches/2.5/donotdisturb/install.php

@@ -15 +15 @@
-unset($fcc);    
-
+// Register FeatureCode - Activate
+$fcc = new featurecode('donotdisturb', 'dnd_toggle');
+$fcc->setDescription('DND Toggle');
+$fcc->setDefault('*0078');
+$fcc->update();
+unset($fcc);
+
-?>

modules/branches/2.5/donotdisturb/module.xml

@@ -2 +2 @@
-        <rawname>donotdisturb</rawname>
-        <name>Do-Not-Disturb (DND)</name>
-4
+5
-        <changelog>
+                *2.5.0* added toggle and support for func_devstate
-                *2.4.0* bunp for 2.4
-                *1.0.2.2* changed category

modules/branches/2.5/donotdisturb/uninstall.php

@@ -5 +5 @@
-// from a function...?
-global $astman;
+
+// Register FeatureCode - Activate
+$fcc = new featurecode('donotdisturb', 'dnd_on');
+$fcc->delete();
+unset($fcc);
+
+// Register FeatureCode - Deactivate
+$fcc = new featurecode('donotdisturb', 'dnd_off');
+$fcc->delete();
+unset($fcc);    
+
+// Register FeatureCode - Activate
+$fcc = new featurecode('donotdisturb', 'dnd_toggle');
+$fcc->delete();
+unset($fcc);
-
-// remove all D-N-D options in effect on extensions