Changeset 4326

Timestamp:

07/07/07 10:11:24 (2 years ago)

Author:

p_lindheimer

Message:

Added Call Waiting enable/disable on extensions settings, default for new is still set by ENABLECW

Files:

• modules/branches/2.3/core/functions.inc.php (modified) (4 diffs)
• modules/branches/2.3/core/module.xml (modified) (1 diff)

modules/branches/2.3/core/functions.inc.php

@@ -1360 +1360 @@
-                $astman->database_put("AMPUSER",$extension."/voicemail","\"".isset($voicemail)?$voicemail:''."\"");
-                $astman->database_put("AMPUSER",$extension."/device","\"".isset($device)?$device:''."\"");
-
+
+
-                        $astman->database_put("CW",$extension,"\"ENABLED\"");
+                } else if (trim($callwaiting) == 'disabled') {
+                        $astman->database_del("CW",$extension);
+                } else {
+                        echo "ERROR: this state should not exist<br>";
-                }
-
@@ -1433 +1438 @@
-        }
-        if ($astman) {
+                $cw = $astman->database_get("CW",$extension);
+                $results['callwaiting'] = (trim($cw) == 'ENABLED') ? 'enabled' : 'disabled';
-                $results['vmx_state']=$astman->database_get("AMPUSER",$extension."/vmx/unavail/state");
-                $cid_masquerade=$astman->database_get("AMPUSER",$extension."/cidnum");
@@ -2623 +2630 @@
-                $currentcomponent->setoptlistopts('privyn', 'sort', false);
-
+                $currentcomponent->addoptlistitem('callwaiting', 'enabled', 'Enable');
+                $currentcomponent->addoptlistitem('callwaiting', 'disabled', 'Disable');
+                $currentcomponent->setoptlistopts('callwaiting', 'sort', false);
+
-                $currentcomponent->addoptlistitem('ringtime', '0', 'Default');
-                for ($i=1; $i <= 120; $i++) {
@@ -2749 +2760 @@
-                $ringtimer = (isset($ringtimer) ? $ringtimer : '0');
-                $currentcomponent->addguielem($section, new gui_selectbox('ringtimer', $currentcomponent->getoptlist('ringtime'), $ringtimer, 'Ring Time', "Number of seconds to ring prior to going to voicemail. Default will use the value set in the General Tab. If no voicemail is configured this will be ignored.", false));
+                if (!isset($callwaiting)) {
+                        if ($amp_conf['ENABLECW']) {
+                                $callwaiting = 'enabled';
+                        } else {
+                                $callwaiting = 'disabled';
+                        }
+                }
+                $currentcomponent->addguielem($section, new gui_selectbox('callwaiting', $currentcomponent->getoptlist('callwaiting'), $callwaiting, 'Call Waiting', "Set the initial/current Call Waiting state for this user's extension", false));
-
-                $section = 'Recording Options';

modules/branches/2.3/core/module.xml

@@ -4 +4 @@
-        <category>Basic</category>
-        <name>Core</name>
-8.1
+9
-        <candisable>no</candisable>
-        <changelog>
+                *2.3.0beta1.9* Added Call Waiting enable/disable on extensions settings, default for new is still set by ENABLECW
-                *2.3.0beta1.8.1* Added javascript validation to CID Prefix
-                *2.3.0beta1.8* Added CID Prefix Prepend feature to inbound DIDs