Changeset 6364

Timestamp:

08/12/08 16:26:45 (4 years ago)

Author:

p_lindheimer

Message:

Merged revisions 6363 via svnmerge from re #3040
http://svn.freepbx.org/modules/branches/2.5

........

r6363 | p_lindheimer | 2008-08-12 14:23:58 -0700 (Tue, 12 Aug 2008) | 1 line

fixes #3040 use OUTBOUND_GROUP instead of GROUP() to count outbound calls so the count is attached to the outboudn channel, otherwise features like a subsequently parked call loses the count

........

Files:

• modules/branches/2.4 (modified) (1 prop)
• modules/branches/2.4/core/functions.inc.php (modified) (3 diffs)

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

@@ -1197 +1197 @@
-      $ext->add($context, $exten, '', new ext_set('DIAL_NUMBER', '${ARG2}')); // fixlocalprefix depends on this
-      $ext->add($context, $exten, '', new ext_set('DIAL_TRUNK_OPTIONS', '${DIAL_OPTIONS}')); // will be reset to TRUNK_OPTIONS if not intra-company
-GROUP()
+OUTBOUND_GROUP
-      $ext->add($context, $exten, '', new ext_gotoif('$["${OUTMAXCHANS_${DIAL_TRUNK}}foo" = "foo"]', 'nomax'));
-
+=
-      $ext->add($context, $exten, 'nomax', new ext_gotoif('$["${INTRACOMPANYROUTE}" = "YES"]', 'skipoutcid'));  // Set to YES if treated like internal
-      $ext->add($context, $exten, '', new ext_set('DIAL_TRUNK_OPTIONS', '${TRUNK_OPTIONS}'));
@@ -1271 +1271 @@
-      $ext->add($context, $exten, '', new ext_set('DIAL_NUMBER', '${ARG2}')); // fixlocalprefix depends on this
-      $ext->add($context, $exten, '', new ext_set('DIAL_TRUNK_OPTIONS', '${DIAL_OPTIONS}')); // will be reset to TRUNK_OPTIONS if not intra-company
-GROUP()
+OUTBOUND_GROUP
-      $ext->add($context, $exten, '', new ext_gotoif('$["${OUTMAXCHANS_${DIAL_TRUNK}}foo" = "foo"]', 'nomax'));
-
+=
-      $ext->add($context, $exten, 'nomax', new ext_gotoif('$["${INTRACOMPANYROUTE}" = "YES"]', 'skipoutcid'));  // Set to YES if treated like internal
-      $ext->add($context, $exten, '', new ext_set('DIAL_TRUNK_OPTIONS', '${TRUNK_OPTIONS}'));
@@ -1381 +1381 @@
-      $ext->add($context, $exten, '', new ext_execif('$[$["${ARG3}" != ""] & $["${DB(AMPUSER/${AMPUSER}/pinless)}" != "NOPASSWD"]]', 'Authenticate', '${ARG3}'));
-      $ext->add($context, $exten, '', new ext_macro('outbound-callerid', '${ARG1}'));
-GROUP()
+OUTBOUND_GROUP
-      $ext->add($context, $exten, '', new ext_gotoif('$["${OUTMAXCHANS_${ARG1}}foo" = "foo"]', 'nomax'));
-
+=
-      $ext->add($context, $exten, 'nomax', new ext_set('DIAL_NUMBER', '${ARG2}'));
-      $ext->add($context, $exten, '', new ext_set('DIAL_TRUNK', '${ARG1}'));