Changeset 10463
- Timestamp:
- 11/01/10 15:34:33 (2 years ago)
- Files:
-
- modules/branches/2.3 (modified) (1 prop)
- modules/branches/2.3/core/module.xml (modified) (1 diff)
- modules/branches/2.3/core/page.trunks.php (modified) (1 diff)
- modules/branches/2.3/music/module.xml (modified) (2 diffs)
- modules/branches/2.3/music/page.music.php (modified) (3 diffs)
- modules/branches/2.3/phonebook/module.xml (modified) (2 diffs)
- modules/branches/2.3/phonebook/page.phonebook.php (modified) (1 diff)
- modules/branches/2.3/recordings/module.xml (modified) (2 diffs)
- modules/branches/2.3/recordings/page.recordings.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.3
- Property svnmerge-integrated changed from /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544-5545,5548-5549,5555,5564,5570,5572-5574,5576-5578,5596,5606-5610,5612,5615-5618,5623-5624,5628,5630-5642,5644-5646,5648-5651,5653-5654,5656-5657,5660,5687-5699,5701-5702,5704-5715,5723-5727,5729-5730,5733-5741,5752-5753,5756,5830-5831,5842-5843,5881,6280,7876,7881,7887,7892,10303,10343 to /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544-5545,5548-5549,5555,5564,5570,5572-5574,5576-5578,5596,5606-5610,5612,5615-5618,5623-5624,5628,5630-5642,5644-5646,5648-5651,5653-5654,5656-5657,5660,5687-5699,5701-5702,5704-5715,5723-5727,5729-5730,5733-5741,5752-5753,5756,5830-5831,5842-5843,5881,6280,7876,7881,7887,7892,10303,10343,10462
modules/branches/2.3/core/module.xml
r9402 r10463 4 4 <category>Basic</category> 5 5 <name>Core</name> 6 <version>2.3.1. 5</version>6 <version>2.3.1.6</version> 7 7 <candisable>no</candisable> 8 8 <canuninstall>no</canuninstall> 9 9 <changelog> 10 *2.3.1.6* #4615 (Security Bug) 10 11 *2.3.1.5* #4075 11 12 *2.3.1.4* #2607 fix display problems with custom trunks starting with A, M or P modules/branches/2.3/core/page.trunks.php
r7882 r10463 18 18 $extdisplay=isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:''; 19 19 $action = isset($_REQUEST['action'])?$_REQUEST['action']:''; 20 $tech = strtolower(isset($_REQUEST['tech'])? $_REQUEST['tech']:'');20 $tech = strtolower(isset($_REQUEST['tech'])?htmlentities($_REQUEST['tech']):''); 21 21 22 22 $trunknum = ltrim($extdisplay,'OUT_'); modules/branches/2.3/music/module.xml
r5999 r10463 2 2 <rawname>music</rawname> 3 3 <name>Music on Hold</name> 4 <version>1.5.1. 6</version>4 <version>1.5.1.7</version> 5 5 <candisable>no</candisable> 6 6 <canuninstall>no</canuninstall> … … 9 9 <description>Uploading and management of sound files (wav, mp3) to be used for on-hold music.</description> 10 10 <changelog> 11 *1.5.1.7* #4615 (Security Bug) 11 12 *1.5.1.6* #2773 change change from exec of rm to unlink to remove security vulnerability 12 13 *1.5.1.5* #2193 moh path hardcoded modules/branches/2.3/music/page.music.php
r5998 r10463 179 179 $output = 0; 180 180 $returncode = 0; 181 $mohfile = escapeshellcmd($mohfile); 181 182 $origmohfile=$path_to_dir."/orig_".$mohfile; 182 183 $newname = strtr($mohfile,"&", "_"); … … 281 282 echo "<h5> PHP "._("Error Processing")."! "._("No file provided")." "._("Please select a file to upload")."</h5>"; 282 283 } else { 283 echo "<h5> PHP "._("Error Processing")." ". $_FILES['mohfile']['name']."! "._("Check")." upload_max_filesize "._("in")." /etc/php.ini</h5>";284 echo "<h5> PHP "._("Error Processing")." ".htmlentities($_FILES['mohfile']['name'])."! "._("Check")." upload_max_filesize "._("in")." /etc/php.ini</h5>"; 284 285 } 285 286 } … … 289 290 $process_err = process_mohfile($_FILES['mohfile']['name']); 290 291 if (isset($process_err)) { 291 echo "<h5>"._("Error Processing").": \"$process_err\" for ". $_FILES['mohfile']['name']."!</h5>\n";292 echo "<h5>"._("Error Processing").": \"$process_err\" for ".htmlentities($_FILES['mohfile']['name'])."!</h5>\n"; 292 293 echo "<h5>"._("This is not a fatal error, your Music on Hold may still work.")."</h5>\n"; 293 294 } else { 294 echo "<h5>"._("Completed processing")." ". $_FILES['mohfile']['name']."!</h5>";295 echo "<h5>"._("Completed processing")." ".htmlentities($_FILES['mohfile']['name'])."!</h5>"; 295 296 } 296 297 needreload(); modules/branches/2.3/phonebook/module.xml
r4936 r10463 2 2 <rawname>phonebook</rawname> 3 3 <name>Phonebook</name> 4 <version>1.1.5. 7</version>4 <version>1.1.5.8</version> 5 5 <description>Provides a phonebook for FreePBX, it can be used as base for Caller ID Lookup and Speed Dial</description> 6 6 <type>tool</type> … … 12 12 <md5sum>ac2f7115bc943a66faa552dab0dd4dc6</md5sum> 13 13 <changelog> 14 *1.1.5.8* #4590 14 15 *1.1.5.7* changed categories 15 16 *1.1.5.6* bump for rc1 modules/branches/2.3/phonebook/page.phonebook.php
r4767 r10463 55 55 if (is_array($fields) && count($fields) == 3 && is_numeric($fields[2]) && ($fields[3] == '' || is_numeric($fields[3]))) { 56 56 phonebook_del($fields[2], $numbers[$fields[2]]['speeddial']); 57 phonebook_add( $fields[2], addslashes($fields[1]), $fields[3]);57 phonebook_add(htmlentities($fields[2],ENT_QUOTES), addslashes(htmlentities($fields[1],ENT_QUOTES)), htmlentities($fields[3],ENT_QUOTES)); 58 58 $i++; 59 59 } modules/branches/2.3/recordings/module.xml
r10354 r10463 2 2 <rawname>recordings</rawname> 3 3 <name>Recordings</name> 4 <version>3.3.5. 7</version>4 <version>3.3.5.8</version> 5 5 <candisable>no</candisable> 6 6 <canuninstall>no</canuninstall> … … 9 9 <description>Creates and manages system recordings, used by many other modules (eg, IVR).</description> 10 10 <changelog> 11 *3.3.5.8* #4615 (Security Bug) 11 12 *3.3.5.7* #4568 Security Patch 12 13 *3.3.5.6* #4553 Security Patch modules/branches/2.3/recordings/page.recordings.php
r10344 r10463 62 62 break; 63 63 case "recorded": 64 // Clean up the filename, take out any nasty characters64 // Clean up the filename,suffix, take out any nasty characters 65 65 $filename = escapeshellcmd(strtr($rname, '/ ', '__')); 66 $suffix = escapeshellcmd(strtr($suffix, '/ ', '__')); 66 67 if (!file_exists($astsnd."custom")) { 67 68 if (!mkdir($astsnd."custom", 0775)) {
