Changeset 6318

Timestamp:

08/10/08 14:32:04 (5 years ago)

Author:

p_lindheimer

Message:

fixes #3029 remove call to macro-user-callerid from macro-simple-dial, also removes extra call to recordingcheck agi script which helps performance

Files:

• modules/branches/2.5/core/etc/extensions.conf (modified) (1 diff)
• modules/branches/2.5/findmefollow/functions.inc.php (modified) (3 diffs)

modules/branches/2.5/core/etc/extensions.conf

@@ -513 +513 @@
-;------------------------------------------------------------------------
-[macro-simple-dial]
-
-
+
-exten => s,n,Set(RT=${ARG2})
-exten => s,n,Set(CFUEXT=${DB(CFU/${EXTTOCALL})})
-exten => s,n,Set(CFBEXT=${DB(CFB/${EXTTOCALL})})
-exten => s,n,Macro(record-enable,${EXTTOCALL},IN)
-
-exten => s,n,Macro(dial,${RT},${DIAL_OPTIONS},${EXTTOCALL})

modules/branches/2.5/findmefollow/functions.inc.php

@@ -105 +105 @@
-            $ext->add($contextname, $grpnum, '', new ext_setvar('CALLERID(name)','${RGPREFIX}${CALLERID(name)}'));
-          }
+          // recording stuff
+          $ext->add($contextname, $grpnum, '', new ext_setvar('RecordMethod','Group'));
+          $ext->add($contextname, $grpnum, '', new ext_macro('record-enable','${DB(AMPUSER/'."$grpnum/followme/grplist)}".',${RecordMethod}'));
-
-          // MODIFIED (PL)
@@ -122 +125 @@
-          }
-
-          // recording stuff
-          $ext->add($contextname, $grpnum, 'skipsimple', new ext_setvar('RecordMethod','Group'));
-          $ext->add($contextname, $grpnum, '', new ext_macro('record-enable','${DB(AMPUSER/'."$grpnum/followme/grplist)}".',${RecordMethod}'));
-
-          // group dial
-
+skipsimple
-          $ext->add($contextname, $grpnum, '', new ext_setvar('_FMGRP',$grpnum));
-          if ((isset($annmsg_id) ? $annmsg_id : '')) {
@@ -461 +460 @@
-    //$ext->add($id, $c, '', new ext_setvar('DEVSTATE(Custom:FOLLOWME${AMPUSER})', 'NOT_INUSE'));
-  }
-end
-
+
+end
-
-  $ext->add($id, $c, 'activate', new ext_setvar('DB(AMPUSER/${AMPUSER}/followme/ddial)', 'DIRECT'));