Changeset 11324

Timestamp:

02/08/11 18:51:19 (2 years ago)

Author:

p_lindheimer

Message:

dialplan syntax fixes and function typo

Files:

• modules/branches/2.9/campon/functions.inc.php (modified) (13 diffs)

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

@@ -8 +8 @@
-  case "asterisk":
-    $priority = 'report';
-)
+
-  break;
-  }
@@ -45 +45 @@
-      $ext->add($mcontext,$exten,'', new ext_set('CCSS_SETUP', 'TRUE'));
-      $ext->add($mcontext,$exten,'', new ext_noop_trace('AMPUSER: ${AMPUSER} Calling ${ARG2}:${ARG1} checking if all happy'));
-','monitor_default,1(${ARG1},${ARG2}
-','agent_default,1(${ARG1},${ARG2}
+)','monitor_default,1(${ARG1},${ARG2})
+)','agent_default,1(${ARG1},${ARG2})
-      $ext->add($mcontext,$exten,'', new ext_return('${GOSUB_RETVAL}'));
-
@@ -58 +58 @@
-      // subroutine(monitor_config)
-      $exten = 'monitor_config';
-T
+
-      $ext->add($mcontext,$exten,'', new ext_gotoif('$["CALLCOMPLETION(cc_monitor_policy)" != "never"]','set_monitor'));
-      $ext->add($mcontext,$exten,'', new ext_noop_trace('Callee has no settings and default disabled, returning'));
@@ -64 +64 @@
-      $ext->add($mcontext,$exten,'', new ext_return('FALSE'));
-
-T
+
-      $ext->add($mcontext,$exten,'', new ext_return('TRUE'));
-
@@ -76 +76 @@
-
-      If ($amp_conf['CC_NON_EXTENSION_POLICY'] == 'never') {
-, policy set to never, skipp
+: [${ARG2} / ${DB(AMPUSER/${ARG2}/cidname)}], policy enabled , continu
-        $ext->add($mcontext,$exten,'', new ext_stackpop(''));
-        $ext->add($mcontext,$exten,'', new ext_return('FALSE'));
-      } else {
-
-T
-T
+: [${ARG2} / ${DB(AMPUSER/${ARG2}/cidname)}]
+
+
-        $ext->add($mcontext,$exten,'', new ext_return('TRUE'));
-      }
@@ -92 +92 @@
-      } else {
-        $ext->add($mcontext,$exten,'is_exten', new ext_noop_trace('Callee has no settings and default enabled, continuing'));
-T
-T
+
+
-        $ext->add($mcontext,$exten,'', new ext_return('TRUE'));
-      }
@@ -99 +99 @@
-      // subroutine(agent_config)
-      $exten = 'agent_config';
-T
-T
-T
-T
-
-TION(cc_agent_policy)}" = "generic"]', 'Set', 'CALLCOMPLET
-TION(cc_agent_policy)}" = "generic"]', 'Set', 'CALLCOMPLET
-T
-T
-T
+
+
+
+
+
+ION(cc_agent_policy)}" = "generic"]', 'Set', 'CALLCOMPLE
+ION(cc_agent_policy)}" = "generic"]', 'Set', 'CALLCOMPLE
+
+
+
-      $ext->add($mcontext,$exten,'', new ext_return(''));
-
@@ -120 +120 @@
-        // TODO: is it possible we are not an extension calling here and we need more logic to safeguard?
-        $ext->add($mcontext,$exten,'', new ext_noop_trace('Caller has no settings using default values since policy is enabled'));
-T
-T
-T
-T
+
+
+
+
-        If ($amp_conf['CC_AGENT_POLICY_DEFAULT'] == 'generic') {
-T
+
-        } else {
-T
+
-        }
-
-        If ($amp_conf['CC_AGENT_DIALSTRING_DEFAULT'] == 'extension') {
-T
-T
+
+
-        } else If ($amp_conf['CC_AGENT_DIALSTRING_DEFAULT'] == 'internal') {
-T
-T
+
+
-        }
-        $ext->add($mcontext,$exten,'', new ext_return('TRUE'));
@@ -171 +171 @@
-      $exten = '_X._X.';
-
-
+c
-      $ext->add($context, $exten, 'no_alert', new ext_goto('1','${CUT(EXTEN,_,1)}','from-internal'));
-
@@ -177 +177 @@
-      $exten = '_X._X.';
-
-
+c
-      $ext->add($context, $exten, '', new ext_goto('1','${CUT(EXTEN,_,1)}','ext-local'));
-
@@ -185 +185 @@
-      $mcontext = 'sub-from-ccss';
-      $exten = 's';
-
-
-
-
-
-
+
+
+
+
+
-      if ($amp_conf['CC_FORCE_DEFAULTS'] && $amp_conf['CC_AGENT_ALERT_INFO_DEFAULT']) {
-
+m
-      } elseif ($amp_conf['CC_FORCE_DEFAULTS']) {
-
+m
-      } else {
-
-
-
-
-
+m
+m
+
+m
+m
-    break;
-  }
@@ -215 +214 @@
-  $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}
@@ -235 +233 @@
-  $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}