Changeset 5571

Timestamp:

01/12/08 08:38:18 (1 year ago)

Author:

pnlarsson

Message:

Fixes #2578, setting language in asterisk trunk/1.6

Files:

• modules/branches/2.4/core/etc/extensions.conf (modified) (1 diff)
• modules/branches/2.4/core/functions.inc.php (modified) (2 diffs)
• modules/branches/2.4/languages/functions.inc.php (modified) (1 diff)
• modules/branches/2.4/languages/module.xml (modified) (1 diff)

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

@@ -757 +757 @@
-exten => s-FIXED,n,Hangup ;TODO should play msg indicated device cannot be logged into 
-
-[macro-systemrecording]
-exten => s,1,Goto(${ARG1},1)
-
-exten => dorecord,1,Record(/tmp/${AMPUSER}-ivrrecording:wav)
-exten => dorecord,n,Wait(1)
-exten => dorecord,n,Goto(confmenu,1)
-
-exten => docheck,1,Playback(/tmp/${AMPUSER}-ivrrecording)
-exten => docheck,n,Wait(1)
-exten => docheck,n,Goto(confmenu,1)
-
-exten => confmenu,1,Background(to-listen-to-it&press-1&to-rerecord-it&press-star,m,${LANGUAGE},macro-systemrecording)
-exten => confmenu,n,Read(RECRESULT,,1,,,4)
-exten => confmenu,n,GotoIf($["x${RECRESULT}"="x*"]?dorecord,1)
-exten => confmenu,n,GotoIf($["x${RECRESULT}"="x1"]?docheck,1)
-exten => confmenu,n,Goto(1)
-
-exten => 1,1,Goto(docheck,1)
-exten => *,1,Goto(dorecord,1)
-
-exten => t,1,Playback(goodbye)
-exten => t,n,Hangup
-
-exten => i,1,Playback(pm-invalid-option)
-exten => i,n,Goto(confmenu,1)
-
-exten => h,1,Hangup
-
-

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

@@ -1272 +1272 @@
-                        $ext->add($context, $exten, '', new ext_set('CALLERID(all)', '"${AMPUSERCIDNAME}" <${AMPUSERCID}>'));
-                        $ext->add($context, $exten, '', new ext_set('REALCALLERIDNUM', '${DB(DEVICE/${REALCALLERIDNUM}/user)}'));
-
+
+
+
+
+
-                        $ext->add($context, $exten, 'report', new ext_noop('TTL: ${TTL} ARG1: ${ARG1}'));
-                        $ext->add($context, $exten, '', new ext_gotoif('$[ "${ARG1}" = "SKIPTTL" ]', 'continue'));
@@ -1421 +1425 @@
-                        $ext->add($context, $exten, '', new ext_hangup());
-
+                        $context = 'macro-systemrecording';
+                        
+                        $ext->add($context, 's', '', new ext_goto(1, '${ARG1}'));
+                        
+                        $exten = 'dorecord';
+                        
+                        $ext->add($context, $exten, '', new ext_record('/tmp/${AMPUSER}-ivrrecording:wav'));
+                        $ext->add($context, $exten, '', new ext_wait(1));
+                        $ext->add($context, $exten, '', new ext_goto(1, 'confmenu'));
+
+                        $exten = 'docheck';
+                        
+                        $ext->add($context, $exten, '', new ext_playback('/tmp/${AMPUSER}-ivrrecording'));
+                        $ext->add($context, $exten, '', new ext_wait(1));
+                        $ext->add($context, $exten, '', new ext_goto(1, 'confmenu'));
+
+                        $exten = 'confmenu';
+                        if (version_compare($version, "1.4", "ge")) { 
+                                $ext->add($context, $exten, '', new ext_background('to-listen-to-it&press-1&to-rerecord-it&press-star,m,${CHANNEL(language)},macro-systemrecording'));
+                        } else {
+                                $ext->add($context, $exten, '', new ext_background('to-listen-to-it&press-1&to-rerecord-it&press-star,m,${LANGUAGE},macro-systemrecording'));
+                        }
+                        $ext->add($context, $exten, '', new ext_read('RECRESULT', '', 1, '', '', 4));
+                        $ext->add($context, $exten, '', new ext_gotoif('$["x${RECRESULT}"="x*"]', 'dorecord,1'));
+                        $ext->add($context, $exten, '', new ext_gotoif('$["x${RECRESULT}"="x1"]', 'docheck,1'));
+                        $ext->add($context, $exten, '', new ext_goto(1));
+                        
+                        $ext->add($context, '1', '', new ext_goto(1, 'docheck'));
+                        $ext->add($context, '*', '', new ext_goto(1, 'dorecord'));
+                        
+                        $ext->add($context, 't', '', new ext_playback('goodbye'));
+                        $ext->add($context, 't', '', new ext_hangup());
+                        
+                        $ext->add($context, 'i', '', new ext_playback('pm-invalid-option'));
+                        $ext->add($context, 'i', '', new ext_goto(1, 'confmenu'));
+
+                        $ext->add($context, 'h', '', new ext_hangup());
+                        
-                break;
-        }

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

@@ -40 +40 @@
-                        foreach (languages_list() as $row) {
-                                        $ext->add('app-languages',$row['language_id'], '', new ext_noop('Changing Channel to language: '.$row['lang_code'].' ('.$row['description'].')'));
-var('LANGUAGE()',
+language(
-                                        $ext->add('app-languages',$row['language_id'], '', new ext_goto($row['dest']));
-                        }

modules/branches/2.4/languages/module.xml

@@ -12 +12 @@
-        </menuitems>
-        <changelog>
+                        Set language moved to extensions conf to support asterisk trunk
-                *2.4.0* First release of module
-        </changelog>