Changeset 11301

Timestamp:

02/06/11 02:23:35 (2 years ago)

Author:

p_lindheimer

Message:

more tuning of dialplan and a few added abilities re #778, still not really tested so not publishing yet and depends on some new macros not checked into core yet

Files:

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

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

@@ -8 +8 @@
-  case "asterisk":
-    $priority = 'report';
-,${MACRO_CONTEXT},${MACRO_EXTEN
+(${MACRO_CONTEXT},${CALLERID(dnid))
-  break;
-  }
@@ -45 +45 @@
-      $ext->add($mcontext,$exten,'', new ext_execif('$[${LEN(${CCSS_SETUP})}]','Return'));
-      $ext->add($mcontext,$exten,'', new ext_set('CCSS_SETUP', 'TRUE'));
-
-
-
+monitor
+agent
+${GOSUB_RETVAL}
-
-      /**
@@ -62 +62 @@
-      $ext->add($mcontext,$exten,'', new ext_noop_trace('Callee has no settings and default disabled, returning'));
-      $ext->add($mcontext,$exten,'', new ext_stackpop(''));
-
+FALSE
-
-      $ext->add($mcontext,$exten,'set_monitor', new ext_set('CALLCOMPLETTION(cc_max_monitors)', '${DB(AMPUSER/${ARG2}/ccss/max_monitors)}'));
-
+TRUE
-
-      /**
@@ -78 +78 @@
-        $ext->add($mcontext,$exten,'', new ext_noop_trace('calling a non-extesnion, policy set to never, skipping',6));
-        $ext->add($mcontext,$exten,'', new ext_stackpop(''));
+        $ext->add($mcontext,$exten,'', new ext_return('FALSE'));
-      } else {
-        $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']));
-        $ext->add($mcontext,$exten,'', new ext_set('CALLCOMPLETTION(cc_max_monitors)', $amp_conf['CC_MAX_MONITORS_DEFAULT']));
+        $ext->add($mcontext,$exten,'', new ext_return('TRUE'));
-      }
-      $ext->add($mcontext,$exten,'', new ext_return(''));
-
-      If ($amp_conf['CC_MONITOR_POLICY_DEFAULT'] == 'never') {
-        $ext->add($mcontext,$exten,'is_exten', new ext_noop_trace('Callee has no settings and default is never so disabling'));
-        $ext->add($mcontext,$exten,'is_exten', new ext_stackpop(''));
+        $ext->add($mcontext,$exten,'', new ext_return('FALSE'));
-      } else {
-        $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']));
-        $ext->add($mcontext,$exten,'', new ext_set('CALLCOMPLETTION(cc_max_monitors)', $amp_conf['CC_MAX_MONITORS_DEFAULT']));
+        $ext->add($mcontext,$exten,'', new ext_return('TRUE'));
-      }
-      $ext->add($mcontext,$exten,'', new ext_return(''));
-
-      // subroutine(agent_config)
@@ -102 +104 @@
-      $ext->add($mcontext,$exten,'', new ext_set('CALLCOMPLETTION(ccnr_available_timer)', '${DB(AMPUSER/${ARG2}/ccss/ccnr_available_timer)}'));
-
-      // TODO: need to decide implementation here. The though is when they set Alert-Info or CID-Prepend, then we generate a unique macro for
-      //       that user and in that macro we set the prepend info, alert-info stuff since unique to that user, or maybe no need to be unique
-      //       I know who the exten is, cause they just called back, I think. Hmm, it's late, not thinking straight, re-visit this later since
-      //       as mentioned, need to work out the details for this one.
-      //
-      $ext->add($mcontext,$exten,'', new ext_set('CALLCOMPLETTION(cc_callback_macro)', '${DB(AMPUSER/${ARG2}/ccss/cc_callback_macro)}'));
-
-      $ext->add($mcontext, $exten, '', new ext_execif('$["${CALLCOMPLETTION(cc_agent_policy)}" = "generic"]', 'Set', 'CALLCOMPLETTION(cc_recall_timer)=${DB(AMPUSER/${AMPUSER}/ccss/cc_recall_timer)}'));
-      $ext->add($mcontext, $exten, '', new ext_execif('$["${CALLCOMPLETTION(cc_agent_policy)}" = "generic"]', 'Set', 'CALLCOMPLETTION(cc_max_agents)=${DB(AMPUSER/${AMPUSER}/ccss/cc_max_agents)}'));
-
-
+
+
+
-      $ext->add($mcontext,$exten,'', new ext_return(''));
-
@@ -120 +116 @@
-        $ext->add($mcontext,$exten,'', new ext_noop_trace('Caller has no settings and default is never so disabling'));
-        $ext->add($mcontext,$exten,'', new ext_stackpop(''));
+        $ext->add($mcontext,$exten,'', new ext_return('FALSE'));
-      } else {
-        // TODO: is it possible we are not an extension calling here and we need more logic to safeguard?
@@ -135 +132 @@
-        If ($amp_conf['CC_AGENT_DIALSTRING_DEFAULT'] == 'extension') {
-          $ext->add($mcontext, $exten, '', new ext_set('CALLCOMPLETTION(cc_agent_dialstring)','Local/${AMPUSER}@from-ccss-extension'));
+          $ext->add($mcontext, $exten, '', new ext_set('CALLCOMPLETTION(cc_callback_macro)','ccss-default'));
-        } else If ($amp_conf['CC_AGENT_DIALSTRING_DEFAULT'] == 'internal') {
-          $ext->add($mcontext, $exten, '', new ext_set('CALLCOMPLETTION(cc_agent_dialstring)','Local/${AMPUSER}@from-ccss-internal'));
-        }
-        // TODO: What about default cc_callback_macro, once we deterimine exactly how we use that, then we can see what condition
-        //       needs to set this and if it looks proper
-        if (false) {
-          $ext->add($mcontext, $exten, '', new ext_set('CALLCOMPLETTION(cc_callback_macro)','ccss-default'));
-        }
+        $ext->add($mcontext,$exten,'', new ext_return('TRUE'));
-      }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    break;
-  }
-}
-
-// TODO: test response code to see if we can generate meaningful success/fail feedback
-function campon_request($c) {
-  global $ext;
@@ -166 +213 @@
-  $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_set('CCSS_SETUP', 'TRUE')); // keep from calling normal sub-ccss
-  $ext->add($id, $c, '', new ext_macro('user-callerid'));
+  $ext->add($id, $c, '', new ext_gosub('sub-ccss,s,agent'));
+  $ext->add($id, $c, '', new ext_noop_trace('GoSub(sub-ccss,s,agent) RETVAL: ${GOSUB_RETVAL}'));
+  // TODO: If they are not enabled, handle it here letting them know ${GOSUB_RETVAL}
+  //
+
-  $ext->add($id, $c, '', new ext_callcompletionrequest(''));
-  $ext->add($id, $c, '', new ext_noop_trace('CC_REQUEST_RESULT: ${CC_REQUEST_RESULT}'));
@@ -173 +226 @@
-}
-
-// TODO: test response code to see if we can generate meaningful success/fail feedback
-function campon_cancel($c) {
-  global $ext;
@@ -181 +233 @@
-  $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_set('CCSS_SETUP', 'TRUE')); // keep from calling normal sub-ccss
-  $ext->add($id, $c, '', new ext_macro('user-callerid'));
+  $ext->add($id, $c, '', new ext_gosub('sub-ccss,s,agent'));
+  $ext->add($id, $c, '', new ext_noop_trace('GoSub(sub-ccss,s,agent) RETVAL: ${GOSUB_RETVAL}'));
+  // TODO: If they are not enabled, handle it here letting them know ${GOSUB_RETVAL}
+  //
+
-  $ext->add($id, $c, '', new ext_callcompletioncancel(''));
-  $ext->add($id, $c, '', new ext_noop_trace('CC_REQUEST_RESULT: ${CC_REQUEST_RESULT}'));
@@ -283 +341 @@
-  $currentcomponent->setoptlistopts('cc_monitor_policy', 'sort', false);
-
+  $currentcomponent->addoptlistitem('cc_announce_monitor', 'announce', _('Announce'));
+  $currentcomponent->addoptlistitem('cc_announce_monitor', 'silent', _('Silent'));
+  $currentcomponent->setoptlistopts('cc_announce_monitor', 'sort', false);
+
-  for ($i=1;$i<=20;$i++) {
-    $currentcomponent->addoptlistitem('cc_max_monitors', $i, sprintf(_('%s Incoming Requests'),$i));
@@ -319 +381 @@
-    $cc_agent_dialstring_label =  _("Caller Callback Mode");
-    $cc_max_monitors_label =      _("Max Queued Callers");
-
-
+
+
+
+
+
-
-    $cc_agent_policy_tt =      _("Asterisk: cc_agent_policy. Used to enable Camp-On for this user and set the Technology Mode that will be used when engaging the feature. In most cases 'Generic Device' should be chosen unless you have phones designed to work with channel specific capabilities.");
@@ -338 +403 @@
-          <li>$cc_agent_dialstring_label: " . $amp_conf['CC_AGENT_DIALSTRING_DEFAULT'] . "</li>
-          <li>$cc_max_monitors_label: " . $amp_conf['CC_MAX_MONITORS_DEFAULT'] . "</li>
-
-
+
+
+
+
+
-        </ul>";
-      $currentcomponent->addguielem($section, new gui_link_label('cc_default_settings', $cc_default_settings_label, $cc_default_settings_tt, true));
@@ -350 +418 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-    $cc_offer_timer_tt =       _("Asterisk: cc_offer_timer. How long after dialing an extenion a user has to make a call completion request.");
@@ -369 +440 @@
-    $cc_max_monitors_tt =      _("Asterisk: cc_max_monitors. This is the maximum number of callers that are allowed to queue up call completion requests against this extension.");
-
-
-
+
+
+
+
+
+
-
-    $msgInvalidAlertInfo = _('Please enter a valid Alert-Info');
@@ -384 +459 @@
-    $currentcomponent->addguielem($section, new gui_selectbox('cc_max_monitors', $currentcomponent->getoptlist('cc_max_monitors'), $cc_max_monitors, $cc_max_monitors_label, $cc_max_monitors_tt, '', false));
-
+    $currentcomponent->addguielem($section, new gui_radio('cc_announce_monitor', $currentcomponent->getoptlist('cc_announce_monitor'), $cc_announce_monitor, $cc_announce_monitor_label, $cc_announce_monitor_tt, false));
+
-    //TODO: put in validation functions after the tt
-
-
+
+
+
+
+
-  }
-}
@@ -408 +488 @@
-    $ccss['cc_monitor_policy'] =    isset($_REQUEST['cc_monitor_policy']) ? $_REQUEST['cc_monitor_policy'] : $amp_conf['CC_MONITOR_POLICY_DEFAULT'];
-    $ccss['cc_max_monitors'] =      isset($_REQUEST['cc_max_monitors']) ? $_REQUEST['cc_max_monitors'] : $amp_conf['CC_MAX_MONITORS_DEFAULT'];
-
-
+
+
+
+
-  }
-
@@ -454 +536 @@
-      $ccss['cc_agent_dialstring'] = $astman->database_get("AMPUSER",$xtn."/ccss/cc_agent_dialstring");
-      $ccss['cc_max_monitors'] = $astman->database_get("AMPUSER",$xtn."/ccss/cc_max_monitors");
-
-
+
+
+
+
+
+
+
+
-    } else {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-  } else {
@@ -498 +589 @@
-}
-
+/* TODO: NOTES/ISSUES
+ *
+ * CallCompletionRequest
+ * CallCompletionCancel
+ *
+ * These simply fail if request can't be made or canceled. Can't have any intellignent dialplan to deal with it, really
+ * bad!
+ * 
+ * It would be useful to put some information in channel variables when using the dialplan mode, who called, to avoid the
+ * ugly hoops of XXX_XXX format we are doing to retain the information.
+ */

modules/branches/2.9/campon/install.php

@@ -54 +54 @@
-$freepbx_conf->define_conf_setting('CC_FORCE_DEFAULTS',$set);
-
+// CC_ANNOUNCE_MONITOR_DEFAULT
+//
+$set['value'] = true;
+$set['defaultval'] =& $set['value'];
+$set['readonly'] = 0;
+$set['hidden'] = 0;
+$set['level'] = 1;
+$set['module'] = 'campon';
+$set['category'] = 'Camp-On Module';
+$set['emptyok'] = 0;
+$set['name'] = 'Announce the Callee Extension';
+$set['description'] = 'When set to true the target extension being called will be announced upone answering the Callback prior to ringing the extension. Setting this to false will go directly to ringing the extension, the CID information will still reflect who is being called back.';
+$set['type'] = CONF_TYPE_BOOL;
+$freepbx_conf->define_conf_setting('CC_ANNOUNCE_MONITOR_DEFAULT',$set);
+
-// CC_AGENT_POLICY_DEFAULT
-//
@@ -210 +225 @@
-$freepbx_conf->define_conf_setting('CC_MAX_MONITORS_DEFAULT',$set);
-
-
+GENT_A
-//
-$set['value'] = '';
@@ -224 +239 @@
-$set['description'] = "An optional Alert-Info setting that can be used when initiating a callback. Only valid when 'Caller Policy' is set to 'generic' device'";
-$set['type'] = CONF_TYPE_TEXT;
-
-
-
+GENT_A
+
+AGENT_
-//
-$set['value'] = '';
@@ -240 +255 @@
-$set['description'] = "An optional CID Prepend setting that can be used when initiating a callback. Only valid when 'Caller Policy' is set to a 'generic' device'";
-$set['type'] = CONF_TYPE_TEXT;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-$freepbx_conf->commit_conf_settings();