Changeset 11283

Timestamp:

02/01/11 01:17:46 (2 years ago)

Author:

p_lindheimer

Message:

fixes some initial gui bugs re #778, still no real testing nor even dialpan generation, coming soon

Files:

• modules/branches/2.9/campon/functions.inc.php (modified) (8 diffs)
• modules/branches/2.9/campon/install.php (modified) (4 diffs)

modules/branches/2.9/campon/functions.inc.php

@@ -81 +81 @@
-        $ext->add($mcontext,$exten,'', new ext_noop_trace('calling a non-extesnion, policy enabled , continuing',6));
-        $ext->add($mcontext,$exten,'', new ext_set('CALLCOMPLETTION(cc_monitor_policy)', $amp_conf['CC_NON_EXTENSION_POLICY']));
-
+S
-      }
-      $ext->add($mcontext,$exten,'', new ext_return(''));
@@ -91 +91 @@
-        $ext->add($mcontext,$exten,'is_exten', new ext_noop_trace('Callee has no settings and default enabled, continuing'));
-        $ext->add($mcontext,$exten,'is_exten', new ext_set('CALLCOMPLETTION(cc_monitor_policy)', $amp_conf['CC_MONITOR_POLICY_DEFAULT']));
-
+S
-      }
-      $ext->add($mcontext,$exten,'', new ext_return(''));
@@ -145 +145 @@
-      }
-      $ext->add($mcontext,$exten,'', new ext_return(''));
+
+      // TODO: Add from-ccss-extension
+
+      // TODO: Add from-ccss-internal
+
+      // TODO: Add something (SHARED(), current blkvm, to voicemail to block recall from going there
+
+      // TODO: Alert-Info and CID Prepend probably in macro but determin
-    break;
-  }
@@ -318 +326 @@
-
-    $section = _('Call Camp-On Services');
-    $currentcomponent->addguielem($section, new gui_selectbox('cc_agent_policy', $currentcomponent->getoptlist('cc_agent_policy'), $cc_agent_policy_label, $cc_agent_policy_tt, '', false));
-    $currentcomponent->addguielem($section, new gui_selectbox('cc_monitor_policy', $currentcomponent->getoptlist('cc_monitor_policy'), $cc_monitor_policy_label, $cc_monitor_policy_tt, '', false));
-
-    // If we are forcing defaults, don't bother showing other settings
-    if ($amp_conf['CC_FORCE_DEFAULTS']) {
-Configured to force
-"
- 
+Forcing
+_("The following settings are being used for all extensions. To configure individually set 'Only Use Default Camp-On Settings' to false on the Advanced Settings page. Active settings:") . 
+"
-          <li>$cc_offer_timer_label: " . $amp_conf['CC_OFFER_TIMER_DEFAULT'] . "</li> 
-          <li>$ccnr_available_timer_label: " . $amp_conf['CCNR_AVAILABLE_TIMER_DEFAULT'] . "</li>
@@ -336 +341 @@
-          <li>$cc_cid_prepend_label: " . $amp_conf['CC_CID_PREPEND_DEFAULT'] . "</li>
-        </ul>";
-
+
+
+
+
+
-      return;
-    }
+
-
-    $cc_offer_timer =       $ccss['cc_offer_timer'];
@@ -365 +375 @@
-    $msgInvalidCIDPrefix = _('Please enter a valid CID Prefix');
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-    //TODO: put in validation functions after the tt
@@ -396 +407 @@
-    $ccss['cc_agent_dialstring'] =  isset($_REQUEST['cc_agent_dialstring']) ? $_REQUEST['cc_agent_dialstring'] : $amp_conf['CC_AGENT_DIALSTRING_DEFAULT'];
-    $ccss['cc_monitor_policy'] =    isset($_REQUEST['cc_monitor_policy']) ? $_REQUEST['cc_monitor_policy'] : $amp_conf['CC_MONITOR_POLICY_DEFAULT'];
-
+S
-    $ccss['cc_alert_info'] =        isset($_REQUEST['cc_alert_info']) ? $_REQUEST['cc_alert_info'] : $amp_conf['CC_ALERT_INFO_DEFAULT'];
-    $ccss['cc_cid_prepend'] =       isset($_REQUEST['cc_cid_prepend']) ? $_REQUEST['cc_cid_prepend'] : $amp_conf['CC_CID_PREPEND_DEFAULT'];
@@ -452 +463 @@
-      $ccss['cc_max_agents'] =        $amp_conf['CC_MAX_AGENTS_DEFAULT'];
-      $ccss['cc_agent_dialstring'] =  $amp_conf['CC_AGENT_DIALSTRING_DEFAULT'];
-
+S
-      $ccss['cc_alert_info'] =        $amp_conf['CC_ALERT_INFO_DEFAULT'];
-      $ccss['cc_cid_prepend'] =       $amp_conf['CC_CID_PREPEND_DEFAULT'];

modules/branches/2.9/campon/install.php

@@ -88 +88 @@
-// CC_OFFER_TIMER_DEFAULT
-//
-generic
+30
-$set['defaultval'] =& $set['value'];
-$set['options'] = array('20', '30', '45', '60', '120', '180', '240', '300', '600');
@@ -140 +140 @@
-  $options[] = $i;
-}
-
+1
-$set['defaultval'] =& $set['value'];
-$set['options'] = $options;
@@ -190 +190 @@
-$freepbx_conf->define_conf_setting('CC_AGENT_DIALSTRING_DEFAULT',$set);
-
-
+S
-//
-unset($options);
@@ -208 +208 @@
-$set['description'] = "Asterisk: cc_max_monitors. This is the maximum number of callers that are allowed to queue up call completion requests against this extension.";
-$set['type'] = CONF_TYPE_SELECT;
-
+S
-
-// CC_ALERT_INFO_DEFAULT