Changeset 13067 for modules/branches/2.10

Timestamp:

12/12/11 13:06:22 (2 years ago)

Author:

p_lindheimer

Message:

only do CONNECTEDLINE() calls when the caller is another extension on the system to avoid propagating confusing SIP updates back to provider trunks

Files:

• modules/branches/2.10/core/functions.inc.php (modified) (6 diffs)

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

@@ -2355 +2355 @@
-      if ($amp_conf['AST_FUNC_MASTER_CHANNEL'] && $amp_conf['AST_FUNC_CONNECTEDLINE']) {
-        // Check that it is numeric so we don't pollute it with odd dialplan stuff like FMGL-blah from followme
-]
-]
+ && "${DB(AMPUSER/${AMPUSER}/cidname)}]" != ""
+ && "${DB(AMPUSER/${AMPUSER}/cidname)}]" != ""
-      }
-
@@ -2376 +2376 @@
-      if ($amp_conf['AST_FUNC_MASTER_CHANNEL'] && $amp_conf['AST_FUNC_CONNECTEDLINE']) {
-        // Check that it is numeric so we don't pollute it with odd dialplan stuff like FMGL-blah from followme
-
-
+ && "${DB(AMPUSER/${AMPUSER}/cidname)}" != ""
+ && "${DB(AMPUSER/${AMPUSER}/cidname)}" != ""
-      }
-
@@ -2457 +2457 @@
-
-      if ($amp_conf['AST_FUNC_CONNECTEDLINE'] && $amp_conf['OUTBOUND_DIAL_UPDATE']) {
-CONNECTEDLINE(num,i)', '
+$["${DB(AMPUSER/${AMPUSER}/cidname)}" != ""]','Set','CONNECTEDLINE(num,i)=
-      }
-      if ($amp_conf['AST_FUNC_CONNECTEDLINE'] && $amp_conf['OUTBOUND_CID_UPDATE']) {
-CONNECTEDLINE(name,i)', '
+$["${DB(AMPUSER/${AMPUSER}/cidname)}" != ""]','Set','CONNECTEDLINE(name,i)=
-      }
-    
@@ -2597 +2597 @@
-
-      if ($amp_conf['AST_FUNC_CONNECTEDLINE'] && $amp_conf['OUTBOUND_DIAL_UPDATE']) {
-CONNECTEDLINE(num,i)', '
+$["${DB(AMPUSER/${AMPUSER}/cidname)}" != ""]','Set','CONNECTEDLINE(num,i)=
-      }
-      if ($amp_conf['AST_FUNC_CONNECTEDLINE'] && $amp_conf['OUTBOUND_CID_UPDATE']) {
-CONNECTEDLINE(name,i)', '
+$["${DB(AMPUSER/${AMPUSER}/cidname)}" != ""]','Set','CONNECTEDLINE(name,i)=
-      }
-    
@@ -2789 +2789 @@
-
-      if ($amp_conf['AST_FUNC_CONNECTEDLINE'] && $amp_conf['OUTBOUND_DIAL_UPDATE']) {
-CONNECTEDLINE(num,i)', '
+$["${DB(AMPUSER/${AMPUSER}/cidname)}" != ""]','Set','CONNECTEDLINE(num,i)=
-      }
-      if ($amp_conf['AST_FUNC_CONNECTEDLINE'] && $amp_conf['OUTBOUND_CID_UPDATE']) {
-CONNECTEDLINE(name,i)', '
+$["${DB(AMPUSER/${AMPUSER}/cidname)}" != ""]','Set','CONNECTEDLINE(name,i)=
-      }
-
@@ -3884 +3884 @@
-
-        // Once setting CONNECTEDLINE(), add the I option to Dial() so the device doesn't further update the value with the
-
+, don't send an update if the calling party is not an extension it breaks some providers
-        //
-        if ($amp_conf['AST_FUNC_CONNECTEDLINE']) {
-
+ || "${DB(AMPUSER/${AMPUSER}/cidname)}" = ""
-          $ext->add($mcontext,$exten,'', new ext_set('CONNECTEDLINE(name,i)', '${DB(AMPUSER/${EXTTOCALL}/cidname)}'));
-          $ext->add($mcontext,$exten,'', new ext_set('CONNECTEDLINE(num)', '${EXTTOCALL}'));