Changeset 4663

Timestamp:

08/03/07 08:49:28 (1 year ago)

Author:

p_lindheimer

Message:

#1861 create intercom dialplan always when enabled

Files:

• modules/branches/2.3/paging/functions.inc.php (modified) (4 diffs)
• modules/branches/2.3/paging/module.xml (modified) (1 diff)

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

@@ -15 +15 @@
-        switch($engine) {
-                case "asterisk":
-                        // Get a list of all the phones used for paging
-                        $sql = "SELECT DISTINCT ext FROM paging_groups";
-                        $results = $db->getAll($sql);
-                        if (!isset($results[0][0])) {
-                                // There are no phones here, no paging support, lets give up now.
-                                return 0;
-                        }
-                        // We have paging support.
-                        $ext->addInclude('from-internal-additional','ext-paging');
-                        // Lets give all the phones their PAGExxx lines.
-                        // TODO: Support for specific phones configurations
-                        foreach ($results as $grouparr) {
-                                $skipheaders = false;
-                                $xtn=trim($grouparr[0]);
-                                if (strtoupper(substr($xtn,-1)) == "X") {
-                                        // hack for allowing no SIP headers
-                                        //TODO : replace this with DevicesTakeTwo stuff
-                                        $xtn = rtrim($xtn,"xX");
-                                        $skipheaders = true;
-                                }
-                                
-                                $ext->add('ext-paging', "PAGE${xtn}", '', new ext_gotoif('$[ ${AMPUSER} = '.$xtn.' ]','skipself'));
-                                $ext->add('ext-paging', "PAGE${xtn}", '', new ext_gotoif('$[ ${FORCE_PAGE} != 1 ]','AVAIL'));
-                                $ext->add('ext-paging', "PAGE${xtn}", '', new ext_setvar('AVAILSTATUS', 'not checked'));
-                                $ext->add('ext-paging', "PAGE${xtn}", '', new ext_goto('SKIPCHECK'));
-                                $ext->add('ext-paging', "PAGE${xtn}", 'AVAIL', new ext_chanisavail('${DB(DEVICE/'.$xtn.'/dial)}', 'js'));
-                                $ext->add('ext-paging', "PAGE${xtn}", 'SKIPCHECK', new ext_noop('Seems to be available (state = ${AVAILSTATUS}'));
-                                
-                                if (!$skipheaders) {
-                                        $ext->add('ext-paging', "PAGE${xtn}", '', new ext_sipaddheader('Call-Info','\;answer-after=0'));
-                                        $ext->add('ext-paging', "PAGE${xtn}", '', new ext_alertinfo('Ring Answer'));
-                                        $ext->add('ext-paging', "PAGE${xtn}", '', new ext_setvar('__SIP_URI_OPTIONS', 'intercom=true'));
-                                }
-                                
-                                $ext->add('ext-paging', "PAGE${xtn}", '', new ext_dial("\${DB(DEVICE/${xtn}/dial)}", '5, A(beep)'));
-                                $ext->add('ext-paging', "PAGE${xtn}", 'skipself', new ext_noop('Not paging originator'));
-                                $ext->add('ext-paging', "PAGE${xtn}", '', new ext_hangup());
-                                
-                                $ext->add('ext-paging', "PAGE${xtn}", '', new ext_noop('Channel ${AVAILCHAN} is not available (state = ${AVAILSTATUS})'), 'AVAIL',101);
-                        }
-                        // Now get a list of all the paging groups...
-                        $sql = "SELECT page_group, force_page FROM paging_config";
-                        $paging_groups = $db->getAll($sql, DB_FETCHMODE_ASSOC);
-                        foreach ($paging_groups as $thisgroup) {
-                                $grp=trim($thisgroup['page_group']);
-                                $sql = "SELECT ext FROM paging_groups WHERE page_number='$grp'";
-                                $all_exts = $db->getAll($sql);
-                                $dialstr='';
-                                foreach($all_exts as $local_dial) {
-                                        if (strtoupper(substr($local_dial[0],-1)) == "X") {
-                                                $local_dial[0] = rtrim($local_dial[0],"xX");
-                                        }
-
-                                        $dialstr .= "LOCAL/PAGE".trim($local_dial[0])."@ext-paging&";
-                                }
-                                // It will always end with an &, so lets take that off.
-                                $dialstr = rtrim($dialstr, "&");
-                                $ext->add('ext-paging', "Debug", '', new ext_noop("dialstr is $dialstr"));
-                                $ext->add('ext-paging', $grp, '', new ext_setvar("_FORCE_PAGE", ($thisgroup['force_page']?1:0)));
-                                $ext->add('ext-paging', $grp, '', new ext_macro('user-callerid'));
-                                // make AMPUSER inherited here, so we can skip the proper 'self' if using cidnum masquerading
-                                $ext->add('ext-paging', $grp, '', new ext_setvar('_AMPUSER', '${AMPUSER}'));
-                                $ext->add('ext-paging', $grp, '', new ext_page($dialstr));
-                        }
-                        
-
-                        
-                        // setup for intercom
-                        $fcc = new featurecode('paging', 'intercom-prefix');
@@ -105 +38 @@
-                                $ext->add('ext-intercom', '_'.$code.'.', '', new ext_playback('is&disabled'));
-                                $ext->add('ext-intercom', '_'.$code.'.', '', new ext_congestion());
-                        
-                        
-
-                                $ext->addInclude('from-internal-additional', 'ext-intercom');
-                        
-                        
-                                $fcc = new featurecode('paging', 'intercom-on');
@@ -116 +46 @@
-
-                                if ($oncode) {
- // $cmd,1,Answer
- // $cmd,n,Wait(1)
- // $cmd,n,Macro(user-callerid)
- // $cmd,n,Set(...=enabled)
- // $cmd,n,Playback(...)
- // $cmd,n,Macro(user-callerid)
-                      
+
+
+
+
+
+
+
-                        
-                                $fcc = new featurecode('paging', 'intercom-off');
@@ -129 +59 @@
-        
-                                if ($offcode) {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                break;
-        }

modules/branches/2.3/paging/module.xml

@@ -2 +2 @@
-        <rawname>paging</rawname>
-        <name>Paging and Intercom</name>
-
+.1
-        <type>setup</type>
-        <category>Internal Options &amp; Configuration</category>
-        <changelog>
+                *1.6.5.1* #1861 create intercom dialplan always when enabled
-                *1.6.5* #2168 fix intercom, #2165 change module to get rid of first time propagation
-                *1.6.4* fixed deprecated use of ALERT_INFO and SIPHEADER