Changeset 4905 for modules/branches/2.3

Timestamp:

08/21/07 00:41:29 (6 years ago)

Author:

p_lindheimer

Message:

- #2295 generate bad-nubmer in core, disable with AMPBADNUMBER=false
- #2172 replace | with
- #2299 except dialparties.agi
- #2193 hard code moh paths
- #2296 privacy manger for 1.4 does not work with jump to 101

Files:

• modules/branches/2.3/core/etc/extensions.conf (modified) (13 diffs)
• modules/branches/2.3/core/functions.inc.php (modified) (3 diffs)
• modules/branches/2.3/core/module.xml (modified) (1 diff)
• modules/branches/2.3/core/page.did.php (modified) (1 diff)
• modules/branches/2.3/core/page.routing.php (modified) (1 diff)

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

@@ -393 +393 @@
-;
-exten => dovm,1,Noop(VMX Timeout - go to voicemail)
-|
+,
-exten => dovm,n,Goto(exit-${VMSTATUS},1)
-
-exten => s-BUSY,1,NoOp(BUSY voicemail)
-exten => s-BUSY,n,Macro(get-vmcontext,${ARG1})
-|
+,
-exten => s-BUSY,n,Goto(exit-${VMSTATUS},1)
-
-exten => s-NOMESSAGE,1,NoOp(NOMESSAGE (beeb only) voicemail)
-exten => s-NOMESSAGE,n,Macro(get-vmcontext,${ARG1})
-|
+,
-exten => s-NOMESSAGE,n,Goto(exit-${VMSTATUS},1)
-
-exten => s-DIRECTDIAL,1,NoOp(DIRECTDIAL voicemail)
-exten => s-DIRECTDIAL,n,Macro(get-vmcontext,${ARG1})
-|
+,
-exten => s-DIRECTDIAL,n,Goto(exit-${VMSTATUS},1)
-
-exten => _s-.,1,Macro(get-vmcontext,${ARG1})
-|
+,
-exten => _s-.,n,Goto(exit-${VMSTATUS},1)
-
@@ -721 +721 @@
-exten => s,7,GotoIf($["${ARG2}" = ""]?9:8)  ; arg2 is queue password
-exten => s,8,Authenticate(${ARG2})
-|
-|
+,
+,
-exten => s,11,Wait(1)
-exten => s,12,Playback(agent-loginok)
@@ -736 +736 @@
-exten => s,5,Set(CALLBACKNUM=${CALLERID(number)})
-exten => s,6,GotoIf($["${CALLBACKNUM}" = ""]?2) ; if still no number, start over
-|
+,
-exten => s,8,UserEvent(RefreshQueue)
-exten => s,9,Wait(1)
@@ -763 +763 @@
-exten => s,n,Set(DIALARR=${CUT(DIALARR,%,2-)})
-exten => s,n,Dial(${TRYDIAL})
-exten => s,n(dodial),Dial(${DIALSTR})
-exten => s,n,NoOp(Dial exited in macro-enum-dialout with ${DIALSTATUS})
-
@@ -913 +912 @@
-exten => docheck,n,Goto(confmenu,1)
-
-|m|${LANGUAGE}|
-||1|||
+,m,${LANGUAGE},
+,,1,,,
-exten => confmenu,n,GotoIf($["x${RECRESULT}"="x*"]?dorecord,1)
-exten => confmenu,n,GotoIf($["x${RECRESULT}"="x1"]?docheck,1)
@@ -1033 +1032 @@
-exten => s,n(CLEARCID),Set(CALLERID(num)=)
-exten => s,n(PRIVMGR),PrivacyManager()
+exten => s,n,GotoIf($["${PRIVACYMGRSTATUS}"="FAILED"]?fail)
-exten => s,n,SetCallerPres(allowed_passed_screen); stop gap until app_privacy.c clears unavailble bit
-
+(fail)
-exten => s,n,Playback(sorry-youre-having-problems)
-exten => s,n,Playback(goodbye)
@@ -1055 +1055 @@
-exten => s,n,GotoIf($["${PLAYBACKSTATUS}"="SUCCESS"]?done)
-; call tts-saytext. This should set MACRO_OFFSET=101 if it was successful
-|${ARG1}|${ARG2}|
+,${ARG1},${ARG2},
-exten => s,n,Noop(No text-to-speech handler for SayText, cannot say "${ARG1}")
-exten => s,n,Goto(done)
@@ -1067 +1067 @@
-exten => s,n,GotoIf($["${PLAYBACKSTATUS}"="SUCCESS"]?done)
-; call tts-sayalpha. This should set MACRO_OFFSET=101 if it was successful
-|${ARG1}|${ARG2}|
+,${ARG1},${ARG2},
-exten => s,n,SayAlpha(${ARG1})
-exten => s,n,Goto(done)
@@ -1078 +1078 @@
-exten => s,n,GotoIf($["${PLAYBACKSTATUS}"="SUCCESS"]?done)
-; call tts-saynumber. This should set MACRO_OFFSET=101 if it was successful
-|${ARG1}|${ARG2}|
+,${ARG1},${ARG2},
-exten => s,n,SayNumber(${ARG1})
-exten => s,n,Goto(done)
@@ -1089 +1089 @@
-exten => s,n,GotoIf($["${PLAYBACKSTATUS}"="SUCCESS"]?done)
-; call tts-saydigits. This should set MACRO_OFFSET=101 if it was successful
-|${ARG1}|${ARG2}|
+,${ARG1},${ARG2},
-exten => s,n,SayDigits(${ARG1})
-exten => s,n,Goto(done)
@@ -1143 +1143 @@
-include => from-internal-xfer
-include => bad-number
-
-;------------------------------------------------------------------------
-; [bad-number]
-;------------------------------------------------------------------------
-; This is where all calls go that don't have any other destination provided
-;
-;------------------------------------------------------------------------
-[bad-number]
-exten => _X.,1,Wait(1)
-exten => _X.,n,Playback(silence/1&cannot-complete-as-dialed&check-number-dial-again,noanswer)
-exten => _X.,n,Wait(1)
-exten => _X.,n,Congestion(20)
-exten => _X.,n,Hangup()
-
-exten => _*.,1,Wait(1)
-exten => _*.,n,Playback(silence/1&feature-not-avail-line&silence/1&cannot-complete-as-dialed&check-number-dial-again,noanswer)
-exten => _*.,n,Wait(1)
-exten => _*.,n,Congestion(20)
-exten => _*.,n,Hangup()
-;------------------------------------------------------------------------
-
-[from-zaptel]
@@ -1317 +1297 @@
-; to confirm. Something along the lines of 'You have an incoming call. Press 1 to accept, 9 to reject'
-exten => s,n,Set(MSG1=${IF($["foo${ARG1}" != "foo"]?${ARG1}:"incoming-call-1-accept-2-decline")})
-|${MSG1}|1||1|
+,${MSG1},1,,1,
-
-; So. We've now read something, or nothing. We should check to make sure that the call hasn't
@@ -1423 +1403 @@
-exten => analog_fax,4,Hangup
-;exten => out_fax,1,wait(7)
-|
+,
-exten => out_fax,2,Hangup
-exten => h,1,system(/var/lib/asterisk/bin/fax-process.pl --to ${EMAILADDR} --from ${FAX_RX_FROM} --subject "Fax from ${URIENCODE(${CALLERID(number)})} ${URIENCODE(${CALLERID(name)})}" --attachment fax_${URIENCODE(${CALLERID(number)})}.pdf --type application/pdf --file ${FAXFILE});

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

@@ -505 +505 @@
-      $ext->add('app-blackhole', 'busy', '', new ext_busy());
-      $ext->add('app-blackhole', 'busy', '', new ext_hangup());
+
+      if ($amp_conf['AMPBADNUMBER'] !== false) {
+        $context = 'bad-number';
+        $exten = '_X.';
+        $ext->add($context, $exten, '', new ext_wait('1'));
+        $ext->add($context, $exten, '', new ext_playback('silence/1&cannot-complete-as-dialed&check-number-dial-again,noanswer'));
+        $ext->add($context, $exten, '', new ext_wait('1'));
+        $ext->add($context, $exten, '', new ext_congestion('20'));
+        $ext->add($context, $exten, '', new ext_hangup());
+
+        $exten = '_*.';
+        $ext->add($context, $exten, '', new ext_wait('1'));
+        $ext->add($context, $exten, '', new ext_playback('silence/1&feature-not-avail-line&silence/1&cannot-complete-as-dialed&check-number-dial-again,noanswer'));
+        $ext->add($context, $exten, '', new ext_wait('1'));
+        $ext->add($context, $exten, '', new ext_congestion('20'));
+        $ext->add($context, $exten, '', new ext_hangup());
+      }
+
-    break;
-  }
@@ -2644 +2662 @@
-function core_users_configpageinit($dispnum) {
-  global $currentcomponent;
+  global $amp_conf;
-
-  if ( $dispnum == 'users' || $dispnum == 'extensions' ) {
@@ -2677 +2696 @@
-
-    if (function_exists('music_list')) {
-    $tresults = music_list("/var/lib/asterisk
+   $tresults = music_list($amp_conf['ASTVARLIBDIR']."
-        if (isset($tresults[0])) {
-      foreach ($tresults as $tresult) {

modules/branches/2.3/core/module.xml

@@ -8 +8 @@
-  <canuninstall>no</canuninstall>
-  <changelog>
-.0* #2295 generate bad-nubmer in core, disable with AMPBADNUMBER=false, #2172 replace | with ,#2299 except dialparties.agi
-*2.3.0RC1.1.2* #2265 remove DeadAGI, #2189 add no-msg dest for vm
-1.1* #2253 remove default jbenable, jbforce
+RC1.3* #2295 generate bad-nubmer in core, disable with AMPBADNUMBER=false, #2172 replace | with ,
+             #2299 except dialparties.agi, #2193 hard code paths, #2296 privacy manger for 1.4
+2* #2253 remove default jbenable, jbforce, remove DeadAGI, #2189 add no-msg dest for vm
-    *2.3.0RC1.1* bump to RC1 because of bug not using proper version compare
-    *2.3.0rc1.0* bump for rc1

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

@@ -214 +214 @@
-        &nbsp;&nbsp;<select name="mohclass"/>
-        <?php
-"/var/lib/asterisk
+$amp_conf['ASTVARLIBDIR']."
-          $cur = (isset($mohclass) && $mohclass != "" ? $mohclass : 'default');
-          echo '<option value="none">'._("No Music")."</option>";

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

@@ -333 +333 @@
-        &nbsp;&nbsp;<select name="mohsilence"/>
-        <?php
-"/var/lib/asterisk
+$amp_conf['ASTVARLIBDIR']."
-          $cur = (isset($mohsilence) && $mohsilence != "" ? $mohsilence : 'default');
-          if (isset($tresults[0])) {