Changeset 7186
- Timestamp:
- 10/29/08 21:03:53 (5 years ago)
- Files:
-
- modules/branches/2.6 (modified) (1 prop)
- modules/branches/2.6/blacklist/functions.inc.php (modified) (1 diff)
- modules/branches/2.6/blacklist/module.xml (modified) (3 diffs)
- modules/branches/2.6/cidlookup/functions.inc.php (modified) (1 diff)
- modules/branches/2.6/cidlookup/module.xml (modified) (2 diffs)
- modules/branches/2.6/core/functions.inc.php (modified) (4 diffs)
- modules/branches/2.6/core/module.xml (modified) (1 diff)
- modules/branches/2.6/dashboard/class.astinfo.php (modified) (4 diffs)
- modules/branches/2.6/disa/module.xml (modified) (1 diff)
- modules/branches/2.6/fw_ari/module.xml (modified) (2 diffs)
- modules/branches/2.6/fw_langpacks/module.xml (modified) (1 diff)
- modules/branches/2.6/timeconditions/module.xml (modified) (1 diff)
- modules/branches/2.6/vmblast/module.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.6
- Property svnmerge-integrated changed from /modules/branches/2.5:1-7080,7098-7099,7126-7127,7133-7134,7153-7154 to /modules/branches/2.5:1-7185
modules/branches/2.6/blacklist/functions.inc.php
r6450 r7186 145 145 146 146 if ($cidnum != '' && $exten == '') { 147 $exten = ' _.';147 $exten = 's'; 148 148 $pricid = ($item['pricid']) ? true:false; 149 149 } else if (($cidnum != '' && $exten != '') || ($cidnum == '' && $exten == '')) { modules/branches/2.6/blacklist/module.xml
r6614 r7186 2 2 <rawname>blacklist</rawname> 3 3 <name>Blacklist</name> 4 <version>2.5.0. 2</version>4 <version>2.5.0.3</version> 5 5 <type>setup</type> 6 6 <category>Inbound Call Control</category> … … 9 9 </menuitems> 10 10 <changelog> 11 *2.5.0.3* #3345, translations 11 12 *2.5.0.2* Swedish Translations 12 13 *2.5.0.1* #3100, #3101 changes to work with new inbound route changes and fixes previous bug … … 26 27 *1.1* First 2.2 release. Fix minor warnings. 27 28 </changelog> 28 <location>release/2.5/blacklist-2.5.0.2.tgz</location> 29 <md5sum>3d1b36c0438fb7a514afd8aa1a6fc481</md5sum> 29 <depends> 30 <module>core ge 2.5.1.2</module> 31 </depends> 32 <location>release/2.5/blacklist-2.5.0.3.tgz</location> 33 <md5sum>605c5c2d522cdc52ce800ebc4654b6c2</md5sum> 30 34 </module> modules/branches/2.6/cidlookup/functions.inc.php
r7049 r7186 85 85 86 86 if ($cidnum != '' && $exten == '') { 87 $exten = ' _.';87 $exten = 's'; 88 88 $pricid = ($item['pricid']) ? true:false; 89 89 } else if (($cidnum != '' && $exten != '') || ($cidnum == '' && $exten == '')) { modules/branches/2.6/cidlookup/module.xml
r7050 r7186 2 2 <rawname>cidlookup</rawname> 3 3 <name>Caller ID Lookup</name> 4 <version>2.5.0. 4</version>4 <version>2.5.0.5</version> 5 5 <description>Allows Caller ID Lookup of incoming calls against different sources (MySQL, HTTP, ENUM, Phonebook Module)</description> 6 6 <type>setup</type> … … 11 11 <depends> 12 12 <engine>asterisk 1.2</engine> 13 <module>core ge 2.5.1.2</module> 13 14 </depends> 14 <location>release/2.5/cidlookup-2.5.0. 4.tgz</location>15 <md5sum> 312c8e4b082edd1cb8a90f83d3e77aad</md5sum>15 <location>release/2.5/cidlookup-2.5.0.5.tgz</location> 16 <md5sum>28fef73b27256deb1a6bbde1d4bc5354</md5sum> 16 17 <changelog> 18 *2.5.0.5* #3345 17 19 *2.5.0.4* #3260, other localization work 18 20 *2.5.0.3* localization fixes, Swedish modules/branches/2.6/core/functions.inc.php
r7124 r7186 886 886 // route a non-numeric did 887 887 // 888 $cidroute = false; 888 889 if ($cidnum != '' && $exten == '') { 889 890 $exten = '_.'; 890 891 $pricid = ($item['pricid']) ? true:false; 892 $cidroute = true; 891 893 } else if (($cidnum != '' && $exten != '') || ($cidnum == '' && $exten == '')) { 892 894 $pricid = true; … … 899 901 $exten = $exten.(empty($cidnum)?"":"/".$cidnum); //if a CID num is defined, add it 900 902 901 $ext->add($context, $exten, '', new ext_setvar('__FROM_DID','${EXTEN}')); 903 if ($cidroute) { 904 $ext->add($context, $exten, '', new ext_setvar('__FROM_DID','${EXTEN}')); 905 $ext->add($context, $exten, '', new ext_goto('1','s')); 906 $exten = "s/$cidnum"; 907 $ext->add($context, $exten, '', new ext_execif('$["${FROM_DID}" = ""]','Set','__FROM_DID=${EXTEN}')); 908 } else { 909 $ext->add($context, $exten, '', new ext_setvar('__FROM_DID','${EXTEN}')); 910 } 902 911 // always set callerID name 903 $ext->add($context, $exten, '', new ext_gotoif('$[ "${CALLERID(name)}" != "" ] ','cidok')); 904 $ext->add($context, $exten, '', new ext_setvar('CALLERID(name)','${CALLERID(num)}')); 905 $ext->add($context, $exten, 'cidok', new ext_noop('CallerID is ${CALLERID(all)}')); 912 $ext->add($context, $exten, '', new ext_execif('$[ "${CALLERID(name)}" = "" ] ','Set','CALLERID(name)=${CALLERID(num)}')); 906 913 907 914 if (!empty($item['mohclass']) && trim($item['mohclass']) != 'default') { … … 1878 1885 $ext->add($context, 's', '', new ext_answer()); 1879 1886 $ext->add($context, 's', '', new ext_wait(1)); 1880 $ext->add($context, 's', 'repeat', new ext_background('${MSG}&silence/2&vm-repeat '));1887 $ext->add($context, 's', 'repeat', new ext_background('${MSG}&silence/2&vm-repeat&vm-starmain')); 1881 1888 $ext->add($context, 's', '', new ext_waitexten(15)); 1882 1889 … … 1885 1892 $ext->add($context, '#', '', new ext_playback('vm-goodbye')); 1886 1893 $ext->add($context, '#', '', new ext_hangup()); 1894 1895 $ext->add($context, '*', '', new ext_macro('get-vmcontext', '${MBOX}')); 1896 $ext->add($context, '*', '', new ext_vmmain('${MBOX}@${VMCONTEXT},s')); 1887 1897 1888 1898 $ext->add($context, 'i', '', new ext_playback('pm-invalid-option')); modules/branches/2.6/core/module.xml
r7102 r7186 4 4 <category>Basic</category> 5 5 <name>Core</name> 6 <version>2.5.1. 1</version>6 <version>2.5.1.2</version> 7 7 <candisable>no</candisable> 8 8 <canuninstall>no</canuninstall> 9 9 <changelog> 10 *2.5.1.2* #3345 inbound CID routing fix, adds vm-callme voicemail access option 10 11 *2.5.1.1* #3311, revert #3266 (r7001) 11 12 *2.5.1.0* #3304, #3276, #3299 modules/branches/2.6/dashboard/class.astinfo.php
r5566 r7186 123 123 $pos = strpos($line,"State"); 124 124 } else { 125 // subsequent lines, check if it s yas "Registered" at that position125 // subsequent lines, check if it says "Registered" at that position 126 126 if (substr($line,$pos,10) == "Registered") { 127 127 $return['sip_registrations_online']++; 128 } else {128 } elseif (strlen($line) > $pos) { 129 129 $return['sip_registrations_offline']++; 130 130 } … … 133 133 } 134 134 135 136 135 $response = $this->astman->send_request('Command',array('Command'=>"iax2 show peers")); 137 136 $astout = explode("\n",$response['data']); … … 165 164 // subsequent lines, check if it syas "Registered" at that position 166 165 if (substr($line,$pos,10) == "Registered") { 167 $return[' sip_registrations_online']++;168 } else {169 $return[' sip_registrations_offline']++;166 $return['iax2_registrations_online']++; 167 } elseif (strlen($line) > $pos) { 168 $return['iax2_registrations_offline']++; 170 169 } 171 170 } … … 173 172 } 174 173 175 176 174 $return['sip_users_total'] = $return['sip_users_online'] + $return['sip_users_offline']; 177 175 $return['sip_trunks_total'] = $return['sip_trunks_online'] + $return['sip_trunks_offline']; modules/branches/2.6/disa/module.xml
r7021 r7186 8 8 <disa>DISA</disa> 9 9 </menuitems> 10 <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>10 <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> 11 11 <changelog> 12 12 *2.5.1.6* localizatoin string enclosures modules/branches/2.6/fw_ari/module.xml
r6794 r7186 2 2 <rawname>fw_ari</rawname> 3 3 <name>FreePBX ARI Framework</name> 4 <version>2.5. 1.1</version>4 <version>2.5.2.rc1</version> 5 5 <candisable>no</candisable> 6 6 <canuninstall>no</canuninstall> 7 7 <changelog> 8 *2.5.2.rc1* #3042 remove player popup, embed in page and add call screening settings to phone features 8 9 *2.5.1.1* #3202, #3203 9 10 *2.5.1* #3184 SECURITY VULNERABILITY fix … … 18 19 <type>setup</type> 19 20 <category>Basic</category> 20 <location>release/2.5/fw_ari-2.5. 1.1.tgz</location>21 <md5sum> beeaec94adc98ca9381281807e115521</md5sum>21 <location>release/2.5/fw_ari-2.5.2.rc1.tgz</location> 22 <md5sum>e73c82a07628a3b91c65de4e028073d0</md5sum> 22 23 </module> modules/branches/2.6/fw_langpacks/module.xml
r7067 r7186 10 10 </changelog> 11 11 <description> 12 This module provides a facility to install new and updated localization translations for all compone ts in FreePBX. Localization i18n translations are still kept with each module and other components such as the User Portal (ARI). This provides an easy ability to bring all components up-to-date without the need of publishing dozens of modules for every minor change. The localization updates used will be the latest available for all modules and will not consider the curent version you are running.12 This module provides a facility to install new and updated localization translations for all components in FreePBX. Localization i18n translations are still kept with each module and other components such as the User Portal (ARI). This provides an easy ability to bring all components up-to-date without the need of publishing dozens of modules for every minor change. The localization updates used will be the latest available for all modules and will not consider the current version you are running. 13 13 </description> 14 14 <type>setup</type> modules/branches/2.6/timeconditions/module.xml
r7137 r7186 6 6 <category>Inbound Call Control</category> 7 7 <description> 8 Creates a condition where calls will to one of two destinations (eg, an extension, IVR, ring group..) based on the time and/or date. This can be used for example to ring a receptionist during the day, or go directly to an IVR at night.8 Creates a condition where calls will go to one of two destinations (eg, an extension, IVR, ring group..) based on the time and/or date. This can be used for example to ring a receptionist during the day, or go directly to an IVR at night. 9 9 </description> 10 10 <changelog> modules/branches/2.6/vmblast/module.xml
r7031 r7186 6 6 <category>Internal Options & Configuration</category> 7 7 <description> 8 Creates a group of extensions that Calls a group of voicemail boxes and allows you to leave a Msgfor them all at once.8 Creates a group of extensions that Calls a group of voicemail boxes and allows you to leave a message for them all at once. 9 9 </description> 10 10 <changelog>
