Index: /modules/branches/2.7/callforward/module.xml
===================================================================
--- /modules/branches/2.7/callforward/module.xml (revision 8979)
+++ /modules/branches/2.7/callforward/module.xml (revision 9079)
@@ -2,8 +2,9 @@
callforward
Call Forward
- 2.7.0.1
+ 2.7.0.2
FreePBX
GPLv2+
+ *2.7.0.2* #4103, #4104, #4105
*2.7.0.1* localizations
*2.7.0.0* #4047 CF toggle + devstate and hint additions
Index: /modules/branches/2.7/callforward/functions.inc.php
===================================================================
--- /modules/branches/2.7/callforward/functions.inc.php (revision 8833)
+++ /modules/branches/2.7/callforward/functions.inc.php (revision 9079)
@@ -22,4 +22,5 @@
global $ext;
global $amp_conf;
+ global $version;
switch($engine) {
case "asterisk":
@@ -29,4 +30,6 @@
$ext->addGlobal('CFDEVSTATE','TRUE');
}
+ $DEVSTATE = version_compare($version, "1.6", "ge") ? "DEVICE_STATE" : "DEVSTATE";
+
if (is_array($featurelist = featurecodes_getModuleFeatures($modulename))) {
foreach($featurelist as $item) {
@@ -75,7 +78,5 @@
global $ext;
global $amp_conf;
- global $version;
-
- $DEVSTATE = version_compare($version, "1.6", "ge") ? "DEVICE_STATE" : "DEVSTATE";
+ global $DEVSTATE;
$id = "app-cf-toggle"; // The context to be included
@@ -141,4 +142,6 @@
function callforward_cfon($c) {
global $ext;
+ global $amp_conf;
+ global $DEVSTATE;
$id = "app-cf-on"; // The context to be included
@@ -164,5 +167,5 @@
}
if ($amp_conf['FCBEEPONLY']) {
- $ext->add($id, $c, 'hook_2', new ext_playback('beep')); // $cmd,n,Playback(...)
+ $ext->add($id, $c, 'hook_1', new ext_playback('beep')); // $cmd,n,Playback(...)
} else {
$ext->add($id, $c, 'hook_1', new ext_playback('call-fwd-unconditional&for&extension'));
@@ -209,4 +212,6 @@
function callforward_cfoff_any($c) {
global $ext;
+ global $amp_conf;
+ global $DEVSTATE;
$id = "app-cf-off-any"; // The context to be included
@@ -245,4 +250,6 @@
function callforward_cfoff($c) {
global $ext;
+ global $amp_conf;
+ global $DEVSTATE;
$id = "app-cf-off"; // The context to be included