Changeset 4041

Timestamp:

06/09/07 11:00:38 (1 year ago)

Author:

p_lindheimer

Message:

changed the feature codes to identify the phone based on the ${AMPUSER} instead of ${CALLERID(number)} after calling macro-user-callerid. This is set in macro-user-callerid

Files:

• modules/branches/2.3/callforward/functions.inc.php (modified) (9 diffs)
• modules/branches/2.3/callforward/module.xml (modified) (1 diff)
• modules/branches/2.3/callwaiting/functions.inc.php (modified) (2 diffs)
• modules/branches/2.3/callwaiting/module.xml (modified) (1 diff)
• modules/branches/2.3/dictate/functions.inc.php (modified) (2 diffs)
• modules/branches/2.3/dictate/module.xml (modified) (1 diff)
• modules/branches/2.3/donotdisturb/functions.inc.php (modified) (2 diffs)
• modules/branches/2.3/donotdisturb/module.xml (modified) (1 diff)
• modules/branches/2.3/gabcast/functions.inc.php (modified) (1 diff)
• modules/branches/2.3/gabcast/module.xml (modified) (2 diffs)
• modules/branches/2.3/infoservices/functions.inc.php (modified) (2 diffs)
• modules/branches/2.3/infoservices/module.xml (modified) (1 diff)
• 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/speeddial/functions.inc.php (modified) (3 diffs)
• modules/branches/2.3/speeddial/module.xml (modified) (1 diff)
• modules/branches/2.3/voicemail/functions.inc.php (modified) (1 diff)
• modules/branches/2.3/voicemail/module.xml (modified) (1 diff)

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

@@ -39 +39 @@
-        $ext->add($id, $c, '', new ext_answer('')); // $cmd,1,Answer
-        $ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
+        $ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-        $ext->add($id, $c, '', new ext_playback('call-fwd-unconditional'));
-        $ext->add($id, $c, '', new ext_playback('please-enter-your&extension'));
-        $ext->add($id, $c, '', new ext_read('fromext', 'then-press-pound'));
-CALLERID(number)
+AMPUSER
-        $ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
-        $ext->add($id, $c, 'startread', new ext_playback('ent-target-attendant'));
@@ -60 +61 @@
-        $ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
-        $ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-CALLERID
-
-CALLERID(number)
+AMPUSER
+
+AMPUSER
-        $ext->add($id, $c, '', new ext_playback('is-set-to'));
-        $ext->add($id, $c, '', new ext_saydigits('${EXTEN:'.$clen.'}'));
@@ -98 +99 @@
-        $ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
-        $ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-CALLERID(number)
+AMPUSER
-        $ext->add($id, $c, '', new ext_playback('call-fwd-unconditional&de-activated')); // $cmd,n,Playback(...)
-        $ext->add($id, $c, '', new ext_macro('hangupcall')); // $cmd,n,Macro(user-callerid)
@@ -126 +127 @@
-        $ext->add($id, $c, '', new ext_answer('')); // $cmd,1,Answer
-        $ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
+        $ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-        $ext->add($id, $c, '', new ext_playback('call-fwd-on-busy'));
-        $ext->add($id, $c, '', new ext_playback('please-enter-your&extension'));
-        $ext->add($id, $c, '', new ext_read('fromext', 'then-press-pound'));
-CALLERID(number)
+AMPUSER
-        $ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
-        $ext->add($id, $c, 'startread', new ext_playback('ent-target-attendant'));
@@ -147 +149 @@
-        $ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
-        $ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-CALLERID(number)
-
-CALLERID(number)
+AMPUSER
+
+AMPUSER
-        $ext->add($id, $c, '', new ext_playback('is-set-to'));
-        $ext->add($id, $c, '', new ext_saydigits('${EXTEN:'.$clen.'}'));
@@ -185 +187 @@
-        $ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
-        $ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-CALLERID(number)
+AMPUSER
-        $ext->add($id, $c, '', new ext_playback('call-fwd-on-busy&de-activated')); // $cmd,n,Playback(...)
-        $ext->add($id, $c, '', new ext_macro('hangupcall')); // $cmd,n,Macro(user-callerid)
@@ -214 +216 @@
-        $ext->add($id, $c, '', new ext_answer('')); // $cmd,1,Answer
-        $ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
+        $ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-        $ext->add($id, $c, '', new ext_playback('call-fwd-no-ans'));
-        $ext->add($id, $c, '', new ext_playback('please-enter-your&extension'));
-        $ext->add($id, $c, '', new ext_read('fromext', 'then-press-pound'));
-CALLERID(number)
+AMPUSER
-        $ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
-        $ext->add($id, $c, 'startread', new ext_playback('ent-target-attendant'));
@@ -236 +239 @@
-        $ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
-        $ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-CALLERID(number)
+AMPUSER
-        $ext->add($id, $c, '', new ext_playback('call-fwd-no-ans&for&extension'));
-CALLERID(number)
+AMPUSER
-        $ext->add($id, $c, '', new ext_playback('is-set-to'));
-        $ext->add($id, $c, '', new ext_saydigits('${EXTEN:'.$clen.'}'));
@@ -255 +258 @@
-        $ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
-        $ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-CALLERID(number)
+AMPUSER
-        $ext->add($id, $c, '', new ext_playback('call-fwd-no-ans&de-activated')); // $cmd,n,Playback(...)
-        $ext->add($id, $c, '', new ext_macro('hangupcall')); // $cmd,n,Macro(user-callerid)

modules/branches/2.3/callforward/module.xml

@@ -2 +2 @@
-        <rawname>callforward</rawname>
-        <name>Call Forward</name>
-
-
+
+
+
+
-        </changelog>
-        <type>setup</type>

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

@@ -39 +39 @@
-        $ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
-        $ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-CALLERID(number)
+AMPUSER
-        $ext->add($id, $c, '', new ext_playback('call-waiting&activated')); // $cmd,n,Playback(...)
-        $ext->add($id, $c, '', new ext_macro('hangupcall')); // $cmd,n,Macro(user-callerid)
@@ -55 +55 @@
-        $ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
-        $ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-CALLERID(number)
+AMPUSER
-        $ext->add($id, $c, '', new ext_playback('call-waiting&de-activated')); // $cmd,n,Playback(...)
-        $ext->add($id, $c, '', new ext_macro('hangupcall')); // $cmd,n,Macro(user-callerid)

modules/branches/2.3/callwaiting/module.xml

@@ -2 +2 @@
-        <rawname>callwaiting</rawname>
-        <name>Call Waiting</name>
-1
+2
-        <changelog>
+        *1.1.2* changed ${CALLERID(number)} to ${AMPUSER} to accomodate CID number masquerading
-        *1.1.1* Fixed typo Provdes to Provides*
-        *1.1* First release for 2.2

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

@@ -39 +39 @@
-        $ext->add($id, $c, '', new ext_answer(''));
-        $ext->add($id, $c, '', new ext_macro('user-callerid'));
-CALLERID(num)
-CALLERID(num)
+AMPUSER
+AMPUSER
-        $ext->add($id, $c, '', new ext_gotoif('$[$["x${DICTENABLED}"="x"]|$["x${DICTENABLED}"="xdisabled"]]','nodict', 'dictok'));
-        $ext->add($id, $c, 'nodict', new ext_playback('feature-not-avail-line'));
-        $ext->add($id, $c, '', new ext_hangup(''));
-CALLERID(num)
+AMPUSER
-        $ext->add($id, $c, '', new ext_macro('hangupcall'));
-}
@@ -56 +56 @@
-        $ext->add($id, $c, '', new ext_answer(''));
-        $ext->add($id, $c, '', new ext_macro('user-callerid'));
-CALLERID(num)
-CALLERID(num)
+AMPUSER
+AMPUSER
-        $ext->add($id, $c, '', new ext_gotoif('$[$["x${DICTENABLED}"="x"]|$["x${DICTENABLED}"="xdisabled"]]','nodict', 'dictok'));
-        $ext->add($id, $c, 'nodict', new ext_playback('feature-not-avail-line'));
-        $ext->add($id, $c, '', new ext_hangup(''));
-        $ext->add($id, $c, 'dictok', new ext_read('DICTFILE','enter-filename-short'));
-CALLERID(num)
-CALLERID(num)
-CALLERID(num)
+AMPUSER
+AMPUSER
+AMPUSER
-        $ext->add($id, $c, '', new ext_playback('dictation-being-processed'));
-CALLERID(num)
+AMPUSER
-        $ext->add($id, $c, '', new ext_playback('dictation-sent'));
-        $ext->add($id, $c, '', new ext_macro('hangupcall'));

modules/branches/2.3/dictate/module.xml

@@ -2 +2 @@
-        <rawname>dictate</rawname>
-        <name>Dictation</name>
-1
+2
-        <type>setup</type>
-        <category>Provides a Feature Code</category>
-        <changelog>
+          *1.1.2* changed ${CALLERID(number)} to ${AMPUSER} to accomodate CID number masquerading
-                *1.1.1* Fix for Dictation not appearing on User page when in Device and User mode.
-                *1.1* Fix changes not sticking when creating an extension, replace Rob-sounds with Allison-sounds.

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

@@ -39 +39 @@
-        $ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
-        $ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-CALLERID(number)
+AMPUSER
-        $ext->add($id, $c, '', new ext_playback('do-not-disturb&activated')); // $cmd,n,Playback(...)
-        $ext->add($id, $c, '', new ext_macro('hangupcall')); // $cmd,n,Macro(user-callerid)
@@ -54 +54 @@
-        $ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
-        $ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-CALLERID(number)
+AMPUSER
-        $ext->add($id, $c, '', new ext_playback('do-not-disturb&de-activated')); // $cmd,n,Playback(...)
-        $ext->add($id, $c, '', new ext_macro('hangupcall')); // $cmd,n,Macro(user-callerid)

modules/branches/2.3/donotdisturb/module.xml

@@ -2 +2 @@
-        <rawname>donotdisturb</rawname>
-        <name>Do-Not-Disturb (DND)</name>
-
+
+
+
+
+
-        <type>setup</type>
-        <category>Provides a Feature Code</category>

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

@@ -133 +133 @@
-        $id = "app-gabcast"; // The context to be included
-                $ext->addInclude('from-internal-additional', $id);
-
+
+
-/*              
-        $ext->add($id, $c, '', new ext_macro('user-callerid'));

modules/branches/2.3/gabcast/module.xml

@@ -2 +2 @@
-        <rawname>gabcast</rawname>
-        <name>Gabcast</name>
-3
+4
-        <type>tool</type>
-        <category>Third Party Addon</category>
@@ -9 +9 @@
-        </menuitems>
-        <changelog>
+          *1.2.4* changed ${CALLERID(number)} to ${AMPUSER} to accomodate CID number masquerading
-                *1.2.3* Add he_IL translation
-                *1.2.2* Fix issue where you were unable to add a channel 

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

@@ -64 +64 @@
-        $id = 'app-calltrace-perform';
-        $c = 's';
-        $ext->add($id, $c, '', new ext_macro('user-callerid')); 
-        $ext->add($id, $c, '', new ext_answer(''));
-        $ext->add($id, $c, '', new ext_wait('1'));
+        $ext->add($id, $c, '', new ext_macro('user-callerid')); 
-        $ext->add($id, $c, '', new ext_playback('info-about-last-call&telephone-number'));
-CALLERID(number)
+AMPUSER
-        $ext->add($id, $c, '', new ext_gotoif('$[ $[ "${lastcaller}" = "" ] | $[ "${lastcaller}" = "unknown" ] ]', 'noinfo'));
-        $ext->add($id, $c, '', new ext_saydigits('${lastcaller}'));
@@ -146 +146 @@
-        $ext->add($id, $c, '', new ext_playback('number'));
-        $ext->add($id, $c, '', new ext_playback('is'));
-CALLERID(number)
+AMPUSER
-        $ext->add($id, $c, '', new ext_wait('2')); // $cmd,n,Wait(1)
-        $ext->add($id, $c, '', new ext_hangup(''));

modules/branches/2.3/infoservices/module.xml

@@ -2 +2 @@
-        <rawname>infoservices</rawname>
-        <name>Info Services</name>
-3
+4
-        <type>setup</type>
-        <category>Provides a Feature Code</category>
-        <description>Provides a number of applications accessable by feature codes: company directory, call trace (last call information), echo test, speaking clock, and speak current extension number.</description>
-        <changelog>
-
-
-
+
+
+
+
-        </changelog>
-        <location>release/2.3/infoservices-1.3.3.tgz</location>

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

@@ -81 +81 @@
-                                }
-                                
-CALLERID(number)
+AMPUSER
-                                $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'));
@@ -120 +120 @@
-                                $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));
-                        }
@@ -161 +163 @@
-                                        $ext->add('ext-intercom', $oncode, '', new ext_wait('1')); // $cmd,n,Wait(1)
-                                        $ext->add('ext-intercom', $oncode, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-CALLERID(number)
+AMPUSER
-                                        $ext->add('ext-intercom', $oncode, '', new ext_playback('intercom&enabled')); // $cmd,n,Playback(...)
-                                        $ext->add('ext-intercom', $oncode, '', new ext_macro('hangupcall')); // $cmd,n,Macro(user-callerid)
@@ -174 +176 @@
-                                        $ext->add('ext-intercom', $offcode, '', new ext_wait('1')); // $cmd,n,Wait(1)
-                                        $ext->add('ext-intercom', $offcode, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-CALLERID(number)
+AMPUSER
-                                        $ext->add('ext-intercom', $offcode, '', new ext_playback('intercom&disabled')); // $cmd,n,Playback(...)
-                                        $ext->add('ext-intercom', $offcode, '', new ext_macro('hangupcall')); // $cmd,n,Macro(user-callerid)

modules/branches/2.3/paging/module.xml

@@ -2 +2 @@
-        <rawname>paging</rawname>
-        <name>Paging and Intercom</name>
-2
+3
-        <type>setup</type>
-        <category>Internal Options &amp; Configuration</category>
-        <changelog>
+                *1.6.3* changed ${CALLERID(number)} to ${AMPUSER} to accomodate CID number masquerading
-                *1.6.2* Fix callerid bug
-                *1.6.1* Fix install bug

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

@@ -54 +54 @@
-                                $ext->add('app-speeddial', '_'.$callcode.'.', '', new ext_set('SPEEDDIALLOCATION','${EXTEN:'.(strlen($callcode)).'}'));
-                                $ext->add('app-speeddial', '_'.$callcode.'.', '', new ext_macro('speeddial-clean','SPEEDDIALLOCATION'));
-CALLERID(num)
+AMPUSER
-                                $ext->add('app-speeddial', '_'.$callcode.'.', '', new ext_gotoif('$["${SPEEDDIALNUMBER}"=""]','failed'));
-                                $ext->add('app-speeddial', '_'.$callcode.'.', '', new ext_dial('Local/${SPEEDDIALNUMBER}@from-internal/n','',''));
@@ -73 +73 @@
-                        $ext->add('app-speeddial-set', 's', 'setloc', new ext_read('newlocation','speed-enterlocation'));
-                        $ext->add('app-speeddial-set', 's', '', new ext_macro('speeddial-clean','newlocation'));
-CALLERID(num)
+AMPUSER
-                        $ext->add('app-speeddial-set', 's', 'lookup', new ext_gotoif('$["${SPEEDDIALNUMBER}"!=""]', 'conflicts'));
-                        
@@ -80 +80 @@
-                        
-                        
-CALLERID(num)
+AMPUSER
-                        // "speed dial location "
-                        $ext->add('app-speeddial-set', 's', '', new ext_playback('speed-dial'));

modules/branches/2.3/speeddial/module.xml

@@ -2 +2 @@
-        <rawname>speeddial</rawname>
-        <name>Speed dial functions</name>
-
+
+
+
+
+
+
-        <type>module</type>
-        <category>CID &amp; Number Management</category>

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

@@ -39 +39 @@
-        $ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
-        $ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-CALLERID(num)
-CALLERID(num)
+AMPUSER
+AMPUSER
-        $ext->add($id, $c, '', new ext_vmmain('')); // n,VoiceMailMain(${VMCONTEXT})
-        $ext->add($id, $c, '', new ext_macro('hangupcall')); // $cmd,n,Macro(user-callerid)
-CALLERID(num)
+AMPUSER
-        $ext->add($id, $c, '', new ext_macro('hangupcall')); // $cmd,n,Macro(user-callerid)
-}

modules/branches/2.3/voicemail/module.xml

@@ -2 +2 @@
-        <rawname>voicemail</rawname>
-        <name>Voicemail</name>
-1.1
+2
-        <changelog>
+          *2.0.2* changed ${CALLERID(number)} to ${AMPUSER} to accomodate CID number masquerading
-                *2.0.1.1* removed depends on 2.2.2 - classes are in all version of 2.3
-                *2.0.1* #1976 - check if mailbox exists and enter with no arguments if not