Changeset 5183

Timestamp:

11/01/07 21:25:19 (1 year ago)

Author:

p_lindheimer

Message:

#1926, #1978 fix deficiencies in intercom, add support for explicit allow and deny, expand phones that can auto-answer

Files:

• modules/branches/2.4/paging/functions.inc.php (modified) (4 diffs)
• modules/branches/2.4/paging/module.xml (modified) (2 diffs)
• modules/branches/2.4/paging/page.paging.php (modified) (2 diffs)

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

@@ -17 +17 @@
-                        // setup for intercom
-                        $fcc = new featurecode('paging', 'intercom-prefix');
-
+intercom_
-                        unset($fcc);
-
@@ -23 +23 @@
-                        // no point in even setting the headers here they will get lost in channel local
-                        //
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                $userlist = core_users_list();
-                                if (is_array($userlist)) {
-                                        foreach($userlist as $item) {
-intercom_code = $
-'ext-intercom-users', '_'.$intercom_code, '', new ext_goto('ext-intercom
+ext_intercom_code = $intercom_
+$extintercomusers, $ext_intercom_code, '', new ext_goto($context.'
-                                        }
-                                }
-
+
+
+
+
-                        
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                
-       $ext->add('ext-paging', "PAGE${xtn}", '', new ext_gotoif('$[ ${AMPUSER} = '.$xtn.'
-       $ext->add('ext-paging', "PAGE${xtn}
-       $ext->add('ext-paging', "PAGE${xtn}
-       $ext->add('ext-paging', "PAGE${xtn}
-       $ext->add('ext-paging', "PAGE${xtn}", 'AVAIL', new ext_chanisavail('${DB(DEVICE/'.$xtn.'
-       $ext->add('ext-paging', "PAGE${xtn}
+$ext->add($extpaging, "_PAGE.", '', new ext_gotoif('$[ ${AMPUSER} = ${EXTEN:4}
+$ext->add($extpaging, "_PAGE.
+$ext->add($extpaging, "_PAGE.
+$ext->add($extpaging, "_PAGE.
+$ext->add($extpaging, "_PAGE.", 'AVAIL', new ext_chanisavail('${DB(DEVICE/${EXTEN:4}
+$ext->add($extpaging, "_PAGE.
-                                
-       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($extpaging, "_PAGE.", '', new ext_macro('autoanswer','${EXTEN:4}'));
+
+$ext->add($extpaging, "_PAGE.", '', new ext_dial('${DIAL}', '5, A(beep)
+$ext->add($extpaging, "_PAGE.", 'skipself', new ext_noop('Not paging originator
+$ext->add($extpaging, "_PAGE.", '', new ext_hangup());
-                                
-
-
-
-
-
-
+
+
-                        // Now get a list of all the paging groups...
-                        $sql = "SELECT page_group, force_page, duplex FROM paging_config";
@@ -129 +227 @@
-                                        }
-
-ext-paging
+".$extpaging."
-                                }
-                                // It will always end with an &, so lets take that off.
@@ -137 +235 @@
-                                        $dialstr .= ",d";
-                                }
-'ext-paging'
-'ext-paging'
-'ext-paging'
+$extpaging
+$extpaging
+$extpaging
-                                // make AMPUSER inherited here, so we can skip the proper 'self' if using cidnum masquerading
-'ext-paging'
-'ext-paging'
+$extpaging
+$extpaging
-                        }
-                        

modules/branches/2.4/paging/module.xml

@@ -2 +2 @@
-        <rawname>paging</rawname>
-        <name>Paging and Intercom</name>
-1.6.7
+2.0.0
-        <type>setup</type>
-        <category>Internal Options &amp; Configuration</category>
-        <changelog>
+                *2.0.0* #1926, #1978 fix deficiencies in intercom, add support for explicit allow and deny, expand phones that can auto-answer
-                *1.6.7* Add support for duplex paging
-                *1.6.6.1* #2376 enable/disable code broke in 1.6.6 and add user-callerid to get proper cid on intercom
@@ -25 +26 @@
-        </requirements>
-        <description>Allows creation of paging groups to make announcements using the speaker built into most SIP phones. 
-
-
+
-        <menuitems>
-                <paging>Paging and Intercom</paging>

modules/branches/2.4/paging/page.paging.php

@@ -54 +54 @@
-
-function paging_text() {
+
+        $fcc = new featurecode('paging', 'intercom-prefix');
+        $intercom_code = $fcc->getCodeActive();
+        unset($fcc);
+        $fcc = new featurecode('paging', 'intercom-on');
+        $oncode = $fcc->getCodeActive();
+        unset($fcc);
+        $fcc = new featurecode('paging', 'intercom-off');
+        $offcode = $fcc->getCodeActive();
+        unset($fcc);
-?>
-
+
+
+
+
+
+
+
-<?php
-}
@@ -88 +104 @@
-        <td><input size='5' type='text' name='pagenbr' value='<?php echo $xtn ?>'></td>
-        </tr>
-extension list:")."<span><br>"._("Select extension(s)to page. If using users and devices mode, this will be the device number to page, potentially confusing if extension numbers and device numbers don't match.
+Device List:")."<span><br>"._("Select Device(s)to page. This is the phone that should be paged. In most installations, this is the same as the Extension. If you are configured to use \"Users & Devices\" this is the acutal Device and not the User. 
-        <br><br></span></a></td>
-        <td valign="top">