Changeset 3643

Timestamp:

01/24/07 23:14:53 (2 years ago)

Author:

naftali5

Message:

Merged revisions 3614-3622 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/freepbx/trunk

........

r3614 | naftali5 | 2007-01-23 00:34:28 -0500 (Tue, 23 Jan 2007) | 1 line

limit rnav width ticket 1647

........

r3616 | naftali5 | 2007-01-23 01:24:27 -0500 (Tue, 23 Jan 2007) | 1 line

fixed panel displaying extensions over 9999 as trunks - ticket #1710

........

r3620 | naftali5 | 2007-01-23 11:08:57 -0500 (Tue, 23 Jan 2007) | 1 line

List device technology on page when editing Ticket #1711

........

r3621 | naftali5 | 2007-01-23 12:42:21 -0500 (Tue, 23 Jan 2007) | 1 line

fixed trunks stripping AMP: which removed ANY occurance of the letters A,M,P,: from the beginning of all trunks, also unified the display on the routing page - partially noted in #1713

........

r3622 | naftali5 | 2007-01-23 16:31:06 -0500 (Tue, 23 Jan 2007) | 1 line

CFB when dialparties.agi decides not to - offhook, user hits ignore/reject, etc. - patch #1681

........

Files:

• freepbx/branches/2.2 (modified) (1 prop)
• freepbx/branches/2.2/amp_conf/astetc/extensions.conf (modified) (6 diffs)
• freepbx/branches/2.2/amp_conf/bin/retrieve_op_conf_from_mysql.pl (modified) (1 diff)
• freepbx/branches/2.2/amp_conf/htdocs/admin/common/mainstyle.css (modified) (1 diff)
• freepbx/branches/2.2/amp_conf/htdocs/admin/modules/core/functions.inc.php (modified) (2 diffs)
• freepbx/branches/2.2/amp_conf/htdocs/admin/modules/core/page.routing.php (modified) (2 diffs)
• freepbx/branches/2.2/amp_conf/htdocs/admin/modules/core/page.trunks.php (modified) (1 diff)

freepbx/branches/2.2/amp_conf/astetc/extensions.conf

@@ -97 +97 @@
-exten => s,n,Set(EXTTOCALL=${ARG2})
-exten => s,n,Set(CFUEXT=${DB(CFU/${EXTTOCALL})})
+exten => s,n,Set(CFBEXT=${DB(CFB/${EXTTOCALL})})
-exten => s,n,Set(RT=${IF($[$["${VMBOX}"!="novm"] | $["foo${CFUEXT}"!="foo"]]?${RINGTIMER}:"")})
-exten => s,n,Macro(record-enable,${EXTTOCALL},IN)
@@ -102 +103 @@
-exten => s,n,Macro(dial,${RT},${DIAL_OPTIONS},${EXTTOCALL})
-exten => s,n,GosubIf($[$["${DIALSTATUS}"="NOANSWER"] & $["foo${CFUEXT}"!="foo"]]?docfu,1) ; check for CFU in use on no answer
+exten => s,n,GosubIf($[$["${DIALSTATUS}"="BUSY"] & $["foo${CFBEXT}"!="foo"]]?docfb,1) ; check for CFB in use on busy
-exten => s,n,NoOp(Voicemail is '${VMBOX}')
-exten => s,n,GotoIf($["${VMBOX}" = "novm"]?s-${DIALSTATUS},1) ; no voicemail in use for this extension
@@ -111 +113 @@
-exten => docfu,n,Dial(Local/${CFUEXT}@from-internal/n,${RTCFU},${DIAL_OPTIONS})
-exten => docfu,n,Return
+
+; Try the Call Forward on Busy number
+exten => docfb,1,Set(RTCFB=${IF($["${VMBOX}"!="novm"]?${RINGTIMER}:"")})
+exten => docfb,n,Dial(Local/${CFBEXT}@from-internal/n,${RTCFB},${DIAL_OPTIONS})
+exten => docfb,n,Return
-
-; Extensions with no Voicemail box reporting BUSY come here
@@ -197 +204 @@
-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)
-
@@ -206 +214 @@
-;
-exten => s,n,GosubIf($[$["${DIALSTATUS}"="NOANSWER"] & $["foo${CFUEXT}"!="foo"]]?docfu,1) ; check for CFU in use on no answer
+exten => s,n,GosubIf($[$["${DIALSTATUS}"="BUSY"] & $["foo${CFBEXT}"!="foo"]]?docfb,1) ; check for CFB in use on busy
-
-; Nothing yet, then go to the end (which will just return, but in case we decide to do something with certain
@@ -226 +235 @@
-exten => docfu,n(chlocal),Dial(Local/${CFUEXT}@from-internal/n,${RT},${DIAL_OPTIONS})
-exten => docfu,n,Return
+
+; Try the Call Forward on Busy number
+exten => docfb,1,GotoIf( $[ "foo${DB(AMPUSER/${CFBEXT}/device)}" = "foo" ]?chlocal)
+exten => docfb,n,Dial(Local/${CFBEXT}@ext-local,${RT},${DIAL_OPTIONS})
+exten => docfb,n,Return
+exten => docfb,n(chlocal),Dial(Local/${CFBEXT}@from-internal/n,${RT},${DIAL_OPTIONS})
+exten => docfb,n,Return
-
-; In all cases of no connection, come here and simply return, since the calling dialplan will

freepbx/branches/2.2/amp_conf/bin/retrieve_op_conf_from_mysql.pl

@@ -221 +221 @@
-foreach $table ("sip","iax") {
-        if (table_exists($dbh,$table)) {
-
+0
-                $result = $dbh->selectall_arrayref($statement);
-                @resultSet = @{$result};

freepbx/branches/2.2/amp_conf/htdocs/admin/common/mainstyle.css

@@ -282 +282 @@
-        /* make it scroll */
-        max-height:35em;
+        max-width:275px;
-        overflow:auto;
-}

freepbx/branches/2.2/amp_conf/htdocs/admin/modules/core/functions.inc.php

@@ -1550 +1550 @@
-        
-        if(strpos($results[0][0],"AMP:") === 0) {  //custom trunks begin with AMP:
-ltrim($results[0][0],"AMP:"
+substr($results[0][0],4
-        } else {
-        strtok($results[0][0],'/');
@@ -2597 +2597 @@
-
-                $section = 'Device Options';
+                $currentcomponent->addguielem($section, new gui_label('techlabel', sprintf(_("This device uses %s technology."),$devinfo_tech)),4);
-                $devopts = $currentcomponent->getgeneralarrayitem('devtechs', $devinfo_tech);
-                foreach ($devopts as $devopt=>$devoptarr) {

freepbx/branches/2.2/amp_conf/htdocs/admin/modules/core/page.routing.php

@@ -487 +487 @@
-                                <?php 
-                                foreach ($trunks as $name=>$display) {
-$display
+(strpos($display,'AMP:')===0 ? substr($display,4) : $display)
-                                }
-                                ?>
@@ -527 +527 @@
-                                <?php 
-                                foreach ($trunks as $name=>$display) {
-ltrim($display,"AMP:"
+(strpos($display,'AMP:')===0 ? substr($display,4) : $display
-                                }
-                                ?>

freepbx/branches/2.2/amp_conf/htdocs/admin/modules/core/page.trunks.php

@@ -184 +184 @@
-
-foreach ($tresults as $tresult) {
-substr(ltrim($tresult[1],"AMP:"),0,15
+(strpos($tresult[1],'AMP:')===0 ? substr($tresult[1],4,15) : substr($tresult[1],0,15)
-}
-