Changeset 6010

Timestamp:

07/14/08 15:10:01 (3 months ago)

Author:

p_lindheimer

Message:

#2510 a couple more tweaks to the pickup dialplan, add hangup if call pickup not successful

Files:

• modules/branches/2.5/core/functions.inc.php (modified) (2 diffs)

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

@@ -706 +706 @@
-                                $ext->addInclude('from-internal-additional', 'app-pickup');
-                                $fclen = strlen($fc_pickup);
+                                $ext_pickup = (strstr($version, 'BRI')) ? 'ext_dpickup' : 'ext_pickup';
+
-                                $ext->add('app-pickup', "_$fc_pickup.", '', new ext_NoOp('Attempt to Pickup ${EXTEN:'.$fclen.'} by ${CALLERID(num)}'));
-                                $ext_pickup = (strstr($version, 'BRI')) ? 'ext_dpickup' : 'ext_pickup';
-                                $ext->add('app-pickup', "_$fc_pickup.", '', new $ext_pickup('${EXTEN:'.$fclen.'}'));
-                                $ext->add('app-pickup', "_$fc_pickup.", '', new $ext_pickup('${EXTEN:'.$fclen.'}@from-internal'));
-                                $ext->add('app-pickup', "_$fc_pickup.", '', new $ext_pickup('${EXTEN:'.$fclen.'}@from-did-direct'));
+                                $ext->add('app-pickup', "_$fc_pickup.", '', new ext_hangup(''));
-                                // In order to do call pickup in ringgroups, we will need to try the ringgoup number
-                                // when doing call pickup for that ringgoup so we must see who is a member of what ringgroup
@@ -738 +740 @@
-                                                        $ext->add('app-pickup', "$fc_pickup".$exten, '', new $ext_pickup($grp.'@from-internal'));
-                                                }
+                                                $ext->add('app-pickup', "$fc_pickup".$exten, '', new ext_hangup(''));
-                                        }
-                                }
-                                $ext->add('app-pickup', "$fc_pickup".$exten, '', new ext_hangup(''));
-                        }
-