Changeset 6972

Timestamp:

10/12/08 18:02:15 (2 months ago)

Author:

p_lindheimer

Message:

fixes #3274 add context in the gosub() calls for sstate as some usage of the feature codes are falling through to the wrong subroutine

Files:

• modules/branches/2.5/donotdisturb/functions.inc.php (modified) (4 diffs)
• modules/branches/2.5/findmefollow/functions.inc.php (modified) (2 diffs)

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

@@ -72 +72 @@
-        if ($amp_conf['USEDEVSTATE']) {
-                $ext->add($id, $c, '', new ext_setvar('STATE', 'BUSY'));
-
+, $id
-        }
-        $ext->add($id, $c, '', new ext_playback('do-not-disturb&activated')); // $cmd,n,Playback(...)
@@ -107 +107 @@
-        if ($amp_conf['USEDEVSTATE']) {
-                $ext->add($id, $c, '', new ext_setvar('STATE', 'NOT_INUSE'));
-
+, $id
-        }
-        $ext->add($id, $c, '', new ext_playback('do-not-disturb&de-activated')); // $cmd,n,Playback(...)
@@ -144 +144 @@
-        if ($amp_conf['USEDEVSTATE']) {
-                $ext->add($id, $c, '', new ext_setvar('STATE', 'BUSY'));
-
+, $id
-        }
-        $ext->add($id, $c, '', new ext_playback('do-not-disturb&activated'));
@@ -152 +152 @@
-        if ($amp_conf['USEDEVSTATE']) {
-                $ext->add($id, $c, '', new ext_setvar('STATE', 'NOT_INUSE'));
-
+, $id
-        }
-        $ext->add($id, $c, '', new ext_playback('do-not-disturb&de-activated'));

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

@@ -466 +466 @@
-        if ($amp_conf['USEDEVSTATE']) {
-                $ext->add($id, $c, '', new ext_setvar('STATE', 'NOT_INUSE'));
-
+, $id
-        }
-        $ext->add($id, $c, '', new ext_playback('followme&de-activated'));
@@ -474 +474 @@
-        if ($amp_conf['USEDEVSTATE']) {
-                $ext->add($id, $c, '', new ext_setvar('STATE', 'INUSE'));
-
+, $id
-        }
-        $ext->add($id, $c, '', new ext_playback('followme&activated'));