Changeset 5091

Timestamp:

10/02/07 16:25:00 (1 year ago)

Author:

p_lindheimer

Message:

Merged revisions 5090 via svnmerge from
http://svn.freepbx.org/modules/branches/2.4

........

r5090 | p_lindheimer | 2007-10-02 16:22:26 -0700 (Tue, 02 Oct 2007) | 1 line

add pre-dial-hook to macro-dialout-trunk and create from-trunk context to use for inbound calls to count towards trunk max

........

Files:

• modules/branches/2.3 (modified) (1 prop)
• modules/branches/2.3/core/etc/extensions.conf (modified) (2 diffs)
• modules/branches/2.3/core/functions.inc.php (modified) (1 diff)
• modules/branches/2.3/core/page.trunks.php (modified) (2 diffs)

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

@@ -635 +635 @@
-exten => s,105,Macro(outisbusy)
-
+[macro-dialout-trunk-predial-hook]
+; this macro intentially left blank so it may be safely overwritten for any custom
+; requirements that an installatin may have.
+
+
-; dialout using a trunk, using pattern matching (don't strip any prefix)
-; arg1 = trunk number, arg2 = number, arg3 = route password
@@ -677 +682 @@
-exten => s,n,GotoIf($[$["${MOHCLASS}" = "default"] | $["foo${MOHCLASS}" = "foo"]]?gocall) ; Set to YES if we should pump silence
-exten => s,n,Set(DIAL_TRUNK_OPTIONS=M(setmusic^${MOHCLASS})${DIAL_TRUNK_OPTIONS})       ; set MoH or off
+
+; This macro call will always be blank and is provided as a hook for customization required prior to making a call
+; such as adding SIP header information or other requirements. All the channel variables from above are present
+;
+exten => s,n,Macro(dialout-trunk-predial-hook)
-
-exten => s,n(gocall),GotoIf($["${custom}" = "AMP"]?customtrunk)

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

@@ -402 +402 @@
-                                }
-                        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        /* dialplan globals */
-                        // modules should NOT use the globals table to store anything!

modules/branches/2.3/core/page.trunks.php

@@ -344 +344 @@
-                        <tr>
-                                <td>
+<?php
+        if ($tech == "sip" || substr($tech,0,3) == "iax") {
+?>
+                                        <a href=# class="info"><?php echo _("Maximum channels")?><span><?php echo sprintf(_("Controls the maximum number of outbound channels (simultaneous calls) that can be used on this trunk. To count inbound calls against this maximum, use the auto-generated context: %s as the inbound trunk's context. (see extensions_additional.conf) Leave blank to specify no maximum."),((isset($channelid) && trim($channelid)!="")?"from-trunk-$channelid":"from-trunk-[trunkname]"))?></span></a>: 
+<?php
+        } else {
+?>
-                                        <a href=# class="info"><?php echo _("Maximum channels")?><span><?php echo _("Controls the maximum number of outbound channels (simultaneous calls) that can be used on this trunk. Inbound calls are not counted against the maximum. Leave blank to specify no maximum.")?></span></a>: 
+<?php
+        }
+?>
-                                </td><td>
-                                        <input type="text" size="3" name="maxchans" value="<?php echo htmlspecialchars($maxchans); ?>"/>
@@ -773 +783 @@
-        <?php } ?>
-
-$tech == "iax2
+substr($tech,0,3) == "iax
-        if ((isEmpty(theForm.usercontext.value) || isWhitespace(theForm.usercontext.value)) && 
-                (!isEmpty(theForm.userconfig.value) && !isWhitespace(theForm.userconfig.value)) &&