Changeset 7647

Show
Ignore:
Timestamp:
05/06/09 12:15:57 (11 months ago)
Author:
p_lindheimer
Message:

Merged revisions 7525-7553,7555-7612,7614-7646 via svnmerge from
http://svn.freepbx.org/modules/branches/2.5

........

r7543 | mickecarlsson | 2009-03-21 05:37:55 -0700 (Sat, 21 Mar 2009) | 1 line


Fixes #3591 logic should be AND instead of OR

........

r7571 | mickecarlsson | 2009-04-06 11:18:35 -0700 (Mon, 06 Apr 2009) | 1 line


Re #3616, adds Portuguese (Brasil) to varous modules

........

r7612 | p_lindheimer | 2009-05-02 09:52:03 -0700 (Sat, 02 May 2009) | 1 line


fixes #3653 Skip Busy Agent ignored in some Follow-Me configurations under a queue

........

r7624 | p_lindheimer | 2009-05-02 11:40:34 -0700 (Sat, 02 May 2009) | 1 line


fixes #3457 don't use _. since Asterisk 1.2 will take that over more explicit matches like _s-.

........

r7626 | p_lindheimer | 2009-05-02 12:21:14 -0700 (Sat, 02 May 2009) | 1 line


fixes #3517 no need to test nodest variable, it will be set and empty if not set in the channel

........

r7627 | p_lindheimer | 2009-05-02 13:15:16 -0700 (Sat, 02 May 2009) | 1 line


fixes #3618 generate announce-position in queues.conf for Asterisk 1.6 (yes or no only for now)

........

r7644 | mickecarlsson | 2009-05-05 13:54:37 -0700 (Tue, 05 May 2009) | 1 line


Re #3657, updated Brazilian Portuguese language files

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.6

    • Property svnmerge-integrated changed from /modules/branches/2.5:1-7524 to /modules/branches/2.5:1-7646

  • modules/branches/2.6/blacklist/module.xml

    r7557 r7647  
    22        <rawname>blacklist</rawname> 
    33        <name>Blacklist</name> 
    4         <version>2.5.0.4</version> 
     4        <version>2.6.0.0</version> 
    55        <type>setup</type> 
    66        <category>Inbound Call Control</category> 
    …… 
    99        </menuitems> 
    1010        <changelog> 
    11                 *2.5.0.4* Added support for Unknown/Blocked CID 
     11                *2.6.0.0* Added support for Unknown/Blocked CID 
     12                *2.5.0.5* #3557 and localization updates 
     13                *2.5.0.4* localization updates 
    1214                *2.5.0.3* #3345, translations 
    1315                *2.5.0.2* Swedish Translations 

  • modules/branches/2.6/conferences/i18n/pt_BR/LC_MESSAGES/conferences.po

    r7571 r7647  
    99"Report-Msgid-Bugs-To: \n" 
    1010"POT-Creation-Date: 2008-10-05 10:59+0200\n" 
    11 "PO-Revision-Date: 2009-03-16 09:17-0300\n" 
    12 "Last-Translator: Flavio E Goncalves <flavio@voffice.com.br>\n" 
     11"PO-Revision-Date: 2009-05-05 15:28-0300\n" 
     12"Last-Translator: Marcelo Araujo <marcelo.araujo@voffice.com.br>\n" 
    1313"Language-Team: MidiVTS team <info@midivts.org.br>\n" 
    1414"MIME-Version: 1.0\n" 
    …… 
    223223#: page.conferences.php:225 
    224224msgid "Music on Hold:" 
    225 msgstr "Musica em espera" 
     225msgstr "Música em espera" 
    226226 
    227227#: page.conferences.php:225 

  • modules/branches/2.6/core/agi-bin/dialparties.agi

    r7630 r7647  
    5555$cwignore    = strtoupper(trim($cwignore)); 
    5656 
    57 // Clear it now so subsequent transfers don't honor it any longer 
    58 // 
    59 if ($cwignore) { 
    60         $AGI->set_variable('__CWIGNORE',""); 
    61 } 
    6257$cfignore    = get_var( $AGI, "CFIGNORE" ); 
    6358$cfignore    = strtoupper(trim($cfignore)); 
    …… 
    117112$fmgrp  = get_var( $AGI, "FMGRP" ); 
    118113$nodest = get_var( $AGI, "NODEST" ); 
    119 if (empty($nodest)) { 
    120         $nodest = ''; 
    121 } 
    122114 
    123115$ringgroup_index        = get_var( $AGI, "RINGGROUP_INDEX" ); 
    …… 
    168160} 
    169161 
     162// Clear it now so subsequent transfers don't honor it any longer 
     163// unless it's a ringallv2 in which case it is going to got though 
     164// another level of local channels 
     165// 
     166if ($cwignore && $rgmethod != "ringallv2") { 
     167        $AGI->set_variable('__CWIGNORE',""); 
     168} 
     169 
    170170// call confirmation only works with ringall and ringall-prim. The javascripts in ringgroups 
    171171// and follow-me should enforce this. If that has been overridden then force ringall. 

  • modules/branches/2.6/core/etc/extensions.conf

    r7630 r7647  
    219219exten => s,n,Set(CFBEXT=${DB(CFB/${EXTTOCALL})}) 
    220220 
     221exten => s,n,Set(CWI_TMP=${CWIGNORE}) 
    221222exten => s,n,Macro(dial,${RT},${DIAL_OPTIONS},${EXTTOCALL}) 
     223exten => s,n,Set(__CWIGNORE=${CWI_TMP}) 
    222224 
    223225exten => s,n,Set(PR_DIALSTATUS=${DIALSTATUS}) 

  • modules/branches/2.6/core/module.xml

    r7602 r7647  
    88        <canuninstall>no</canuninstall> 
    99        <changelog> 
    10                 *2.6.0alpha1.2* #3451, $932, #3426, #3474, #3439, #3526, #3534, $3648, #3649, moved macro-vm to auto-generation (WARNING: custom modification of macro-vm in extensions_custom.conf need to be moved to extensions_override_freepbx.conf 
     10                *2.6.0alpha1.2* #3451, $932, #3426, #3474, #3439, #3526, #3534, $3648, #3649, #3517 moved macro-vm to auto-generation (WARNING: custom modification of macro-vm in extensions_custom.conf need to be moved to extensions_override_freepbx.conf 
    1111                *2.6.0alpha1.1* #3380, #3358, #3387, localizations 
    1212                *2.6.0alpha1.0* #3321, #3328, #3345 inbound CID routing fix, adds vm-callme voicemail access option 

  • modules/branches/2.6/customappsreg/i18n/pt_BR/LC_MESSAGES/customappsreg.po

    r7571 r7647  
    99"Report-Msgid-Bugs-To: \n" 
    1010"POT-Creation-Date: 2008-10-05 22:57+0200\n" 
    11 "PO-Revision-Date: 2009-03-19 17:29-0300\n" 
    12 "Last-Translator: Flavio E Goncalves <flavio@voffice.com.br>\n" 
     11"PO-Revision-Date: 2009-05-05 15:28-0300\n" 
     12"Last-Translator: Marcelo Araujo <marcelo.araujo@voffice.com.br>\n" 
    1313"Language-Team: MidiVTS Team <team@midivts.org>\n" 
    1414"MIME-Version: 1.0\n" 

  • modules/branches/2.6/daynight/module.xml

    r7156 r7647  
    22        <rawname>daynight</rawname> 
    33        <name>Day Night Mode</name> 
    4         <version>2.5.0.10</version> 
     4        <version>2.5.0.12</version> 
    55        <type>setup</type> 
    66        <category>Inbound Call Control</category> 
    …… 
    1010        </description> 
    1111        <changelog> 
     12                *2.5.0.12* #3350 
     13                *2.5.0.11* localization updates 
    1214                *2.5.0.10* #3318 set BLF in GUI 
    1315                *2.5.0.9* localization string enclosures 

  • modules/branches/2.6/disa/functions.inc.php

    r6961 r7647  
    113113 
    114114                        $context = 'disa-dial'; 
    115                         $exten = '_.'; 
     115                        $exten = '_[0-9a-zA-Z*#].'; 
    116116                        $ext->add($context, $exten, '', new ext_noop('called ${EXTEN} in ${DISACONTEXT} by ${DISA}')); 
    117117                        $ext->add($context, $exten, '', new ext_dial('Local/${EXTEN}@${DISACONTEXT}', '300,${HANGUP}'));  // Regular Trunk Dial 

  • modules/branches/2.6/disa/module.xml

    r7186 r7647  
    1010        <description>DISA Allows you 'Direct Inward System Access'. This gives you the ability to have an option on an IVR that gives you a dial tone, and you're able to dial out from the FreePBX machine as if you were connected to a standard extension. It appears as a Destination.</description> 
    1111        <changelog> 
     12                *2.5.1.8* #3457 
     13                *2.5.1.7* localization updates 
    1214                *2.5.1.6* localizatoin string enclosures 
    1315                *2.5.1.5* #3138 Sqlite3 fixes 

  • modules/branches/2.6/featurecodeadmin/i18n/pt_BR/LC_MESSAGES/featurecodeadmin.po

    r7571 r7647  
    99"Report-Msgid-Bugs-To: \n" 
    1010"POT-Creation-Date: 2008-09-17 11:15+0200\n" 
    11 "PO-Revision-Date: 2009-03-19 17:35-0300\n" 
    12 "Last-Translator: Flavio E Goncalves <flavio@voffice.com.br>\n" 
     11"PO-Revision-Date: 2009-05-05 15:29-0300\n" 
     12"Last-Translator: Marcelo Araujo <marcelo.araujo@voffice.com.br>\n" 
    1313"Language-Team: midiVTS team <team@midivts.org.br>\n" 
    1414"MIME-Version: 1.0\n" 

  • modules/branches/2.6/fw_ari/module.xml

    r7407 r7647  
    22        <rawname>fw_ari</rawname> 
    33        <name>FreePBX ARI Framework</name> 
    4         <version>2.5.2.rc1</version> 
     4        <version>2.5.2.2</version> 
    55        <candisable>no</candisable> 
    66        <canuninstall>no</canuninstall> 
    77        <changelog> 
     8                *2.5.2.2* #3446, #3540 
    89                *2.5.2.1* fixes some unreported bugs: r7140, r7235, localization updates 
    910                *2.5.2.rc1* #3042 remove player popup, embed in page and add call screening settings to phone features 

  • modules/branches/2.6/infoservices/i18n/pt_BR/LC_MESSAGES/infoservices.po

    r7571 r7647  
    99"Report-Msgid-Bugs-To: \n" 
    1010"POT-Creation-Date: 2008-09-17 11:16+0200\n" 
    11 "PO-Revision-Date: 2009-03-19 17:38-0300\n" 
    12 "Last-Translator: Flavio E Goncalves <flavio@voffice.com.br>\n" 
     11"PO-Revision-Date: 2009-05-05 15:29-0300\n" 
     12"Last-Translator: Marcelo Araujo <marcelo.araujo@voffice.com.br>\n" 
    1313"Language-Team: MidiVTS Team <team@midivts.org>\n" 
    1414"MIME-Version: 1.0\n" 

  • modules/branches/2.6/irc/module.xml

    r6782 r7647  
    22        <rawname>irc</rawname> 
    33        <name>Online Support</name> 
    4         <version>2.5.0</version> 
     4        <version>2.5.0.2</version> 
    55        <type>tool</type> 
    66        <category>Support</category> 
    77        <description>This module lets you connect to the IRC network where developers and other users chat. You can chat to the developers live, if you have problems</description> 
    88        <changelog> 
     9                *2.5.0.2* remove auto display of kernel info into IRC channel r7432 
     10                *2.5.0.1* localization updates 
    911                *2.5.0* localization, Swedish 
    1012                *2.4.0.1* #2843 Russian Translation 

  • modules/branches/2.6/javassh/module.xml

    r6784 r7647  
    22        <rawname>javassh</rawname> 
    33        <name>Java SSH</name> 
    4         <version>2.5.0</version> 
     4        <version>2.5.0.2</version> 
    55        <type>tool</type> 
    66        <category>System Administration</category> 
    …… 
    1010        </menuitems> 
    1111        <changelog> 
     12                *2.5.0.2* security setting updates: r7432 
     13                *2.5.0.1* localization updates 
    1214                *2.5.0* localization fixes, Swedish 
    1315                *2.4.0* bump for 2.4 

  • modules/branches/2.6/music/i18n/pt_BR/LC_MESSAGES/music.po

    r7571 r7647  
    99"Report-Msgid-Bugs-To: \n" 
    1010"POT-Creation-Date: 2008-09-27 15:43+0200\n" 
    11 "PO-Revision-Date: 2009-03-19 19:53-0300\n" 
    12 "Last-Translator: Flavio E Goncalves <flavio@voffice.com.br>\n" 
     11"PO-Revision-Date: 2009-05-05 15:21-0300\n" 
     12"Last-Translator: Marcelo Araujo <marcelo.araujo@voffice.com.br>\n" 
    1313"Language-Team: MidiVTS Team <team@midivts.org>\n" 
    1414"MIME-Version: 1.0\n" 
    …… 
    3636#: page.music.php:187 
    3737msgid "Delete" 
    38 msgstr "Deletar" 
     38msgstr "Apagar" 
    3939 
    4040#: page.music.php:272 

  • modules/branches/2.6/publish.pl

    r7212 r7647  
    272272                        # 
    273273                        if (-f $x && $checkphp) { 
    274                                 if (system("php -l $x")) { 
     274                                if (!($x =~ /.*\.jar/) && system("php -l $x") ) { 
    275275                                        die "FATAL: php syntax error detected in $x\n"; 
    276276                                } 

  • modules/branches/2.6/queues/functions.inc.php

    r7286 r7647  
    4242                // 
    4343                $ver12 = version_compare($ast_version, '1.4', 'lt'); 
     44                $ver16 = version_compare($ast_version, '1.6', 'ge'); 
    4445                 
    4546                // legacy but in case someone was using this we will leave it 
    …… 
    100101                                                case 'ringinuse':  
    101102                                                        break; 
     103                                                case 'announce-position': 
     104                                                        if ($ver16) { 
     105                                                                $output .= $keyword."=".$data."\n"; 
     106                                                        } 
     107                                                        break; 
    102108                                                case 'retry':  
    103109                                                        if ($data == 'none') { 
    …… 
    404410        array($account,'announce-frequency',($_REQUEST['announcefreq'])?$_REQUEST['announcefreq']:'0',0), 
    405411        array($account,'announce-holdtime',($_REQUEST['announceholdtime'])?$_REQUEST['announceholdtime']:'no',0), 
     412        array($account,'announce-position',($_REQUEST['announceposition'])?$_REQUEST['announceposition']:'no',0), 
    406413        array($account,'queue-youarenext',($_REQUEST['announceposition']=='no')?'silence/1':'queue-youarenext',0),  //if no, play no sound 
    407414        array($account,'queue-thereare',($_REQUEST['announceposition']=='no')?'silence/1':'queue-thereare',0),  //if no, play no sound 

  • modules/branches/2.6/queues/module.xml

    r7288 r7647  
    99        </description> 
    1010        <changelog> 
     11                *2.5.4.7* #3618 
     12                *2.5.4.6* localization updates 
    1113                *2.5.4.5* #3400, #3380, various translations 
    1214                *2.5.4.4* #3242, #3230, localization fixes 

  • modules/branches/2.6/recordings/i18n/pt_BR/LC_MESSAGES/recordings.po

    r7571 r7647  
    99"Report-Msgid-Bugs-To: \n" 
    1010"POT-Creation-Date: 2008-09-27 15:08+0200\n" 
    11 "PO-Revision-Date: 2009-03-19 22:46-0300\n" 
    12 "Last-Translator: Flavio E Goncalves <flavio@voffice.com.br>\n" 
     11"PO-Revision-Date: 2009-05-05 15:28-0300\n" 
     12"Last-Translator: Marcelo Araujo <marcelo.araujo@voffice.com.br>\n" 
    1313"Language-Team: MidiVTS Team <team@midivts.org>\n" 
    1414"MIME-Version: 1.0\n" 

  • modules/branches/2.6/ringgroups/module.xml

    r6922 r7647  
    22        <rawname>ringgroups</rawname> 
    33        <name>Ring Groups</name> 
    4         <version>2.5.1.6</version> 
     4        <version>2.5.1.8</version> 
    55        <type>setup</type> 
    66        <category>Inbound Call Control</category> 
    …… 
    99        </description> 
    1010        <changelog> 
     11                *2.5.1.8* #3580, localization updates 
     12                *2.5.1.7* #3380, localization updates 
    1113                *2.5.1.6* localization fixes 
    1214                *2.5.1.5* #3222 sqlite3 

  • modules/branches/2.6/timeconditions/i18n/sv_SE/LC_MESSAGES/timeconditions.po

    r6959 r7647  
    99"Report-Msgid-Bugs-To: \n" 
    1010"POT-Creation-Date: 2008-10-06 12:39+0200\n" 
    11 "PO-Revision-Date: 2008-10-12 15:35+0100\n" 
     11"PO-Revision-Date: 2009-03-11 18:03+0100\n" 
    1212"Last-Translator: Mikael Carlsson <mickecamino@gmail.com>\n" 
    1313"Language-Team: Svenska\n" 
    …… 
    2222#, php-format 
    2323msgid "Time Condition: %s" 
    24 msgstr "Tidkondition: %s" 
     24msgstr "Tidsvillkor: %s" 
    2525 
    2626#: functions.inc.php:354 
    …… 
    243243#: page.timeconditions.php:89 
    244244msgid "Add Time Condition" 
    245 msgstr "LÀgg till tidskondition" 
     245msgstr "LÀgg till tidsvillkor" 
    246246 
    247247#: page.timeconditions.php:63 
    248248msgid "Time Condition" 
    249 msgstr "Tidskondition" 
     249msgstr "Tidsvillkor" 
    250250 
    251251#: page.timeconditions.php:63 
    …… 
    255255#: page.timeconditions.php:66 
    256256msgid "Time Condition:" 
    257 msgstr "Tidskondition:" 
     257msgstr "Tidsvillkor:" 
    258258 
    259259#: page.timeconditions.php:71 
    260260#, php-format 
    261261msgid "Delete Time Condition: %s" 
    262 msgstr "Ta bort tidskondition: %s" 
     262msgstr "Ta bort tidsvillkor: %s" 
    263263 
    264264#: page.timeconditions.php:89 
    265265msgid "Edit Time Condition" 
    266 msgstr "Redigera tidskondition" 
     266msgstr "Redigera tidsvillkor" 
    267267 
    268268#: page.timeconditions.php:96 
    269269msgid "Time Condition name:" 
    270 msgstr "Namn för tidskondition:" 
     270msgstr "Namn för tidsvillkor:" 
    271271 
    272272#: page.timeconditions.php:96 
    273273msgid "Give this Time Condition a brief name to help you identify it." 
    274 msgstr "Ge denna tidskondition ett kortfattat namn som hjÀlper dig att identifiera den." 
     274msgstr "Ge denna tidsvillkor ett kortfattat namn som hjÀlper dig att identifiera den." 
    275275 
    276276#: page.timeconditions.php:100 
    …… 
    300300#: page.timeconditions.php:151 
    301301msgid "Please enter a valid Time Conditions Name" 
    302 msgstr "Skriv in ett giltigt namn för tidvalet" 
     302msgstr "Skriv in ett giltigt namn för tidvillkoret" 
    303303 
    304304#: page.timeconditions.php:152 
    305305msgid "You have not selected a time group to associate with this timecondition. It will go to the un-matching destination until you update it with a valid group" 
    306 msgstr "Du har inte valt en tidgrupp för denna tidkondition. Detta innebÀr att Destination om tiden inte matchar alltid kommer att vara aktiv." 
     306msgstr "Du har inte valt en tidgrupp för detta tidsvillkoret. Detta innebÀr att Destination, om tiden inte matchar, alltid kommer att vara aktiv." 
    307307 
    308308#: page.timegroups.php:26 
    …… 
    312312#: module.xml 
    313313msgid "Time Conditions" 
    314 msgstr "Tidskonditioner" 
     314msgstr "Tidsvillkor" 
    315315 
    316316msgid "Time Groups" 

  • modules/branches/2.6/voicemail/i18n/pt_BR/LC_MESSAGES/voicemail.po

    r7571 r7647  
    99"Report-Msgid-Bugs-To: \n" 
    1010"POT-Creation-Date: 2008-10-10 17:24+0200\n" 
    11 "PO-Revision-Date: 2009-03-19 20:43-0300\n" 
    12 "Last-Translator: Flavio E Goncalves <flavio@voffice.com.br>\n" 
     11"PO-Revision-Date: 2009-05-05 15:29-0300\n" 
     12"Last-Translator: Marcelo Araujo <marcelo.araujo@voffice.com.br>\n" 
    1313"Language-Team: Team MidiVTS <team@midivts.org.br>\n" 
    1414"MIME-Version: 1.0\n"