Changeset 10462
- Timestamp:
- 11/01/10 15:25:23 (2 years ago)
- Files:
-
- modules/branches/2.4 (modified) (1 prop)
- modules/branches/2.4/core/module.xml (modified) (1 diff)
- modules/branches/2.4/core/page.trunks.php (modified) (1 diff)
- modules/branches/2.4/music/module.xml (modified) (2 diffs)
- modules/branches/2.4/music/page.music.php (modified) (3 diffs)
- modules/branches/2.4/phonebook/module.xml (modified) (2 diffs)
- modules/branches/2.4/phonebook/page.phonebook.php (modified) (1 diff)
- modules/branches/2.4/recordings/module.xml (modified) (2 diffs)
- modules/branches/2.4/recordings/page.recordings.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.4
- Property svnmerge-integrated changed from /modules/branches/2.3:1-5233,5245,5333,5336 /modules/branches/2.5:1-5852,5880,5930,5995,6016-6017,6030-6031,6142,6218,6291,6361,6363,6413-6414,6422,6428-6430,6442-6443,6557,6710,6714-6715,6969-6970,6984,7248,7281,7858-7859,7875,7878,7886,7890,8615,8622,10302,10342 to /modules/branches/2.3:1-5233,5245,5333,5336 /modules/branches/2.5:1-5852,5880,5930,5995,6016-6017,6030-6031,6142,6218,6291,6361,6363,6413-6414,6422,6428-6430,6442-6443,6557,6710,6714-6715,6969-6970,6984,7248,7281,7858-7859,7875,7878,7886,7890,8615,8622,10302,10342,10461
modules/branches/2.4/core/module.xml
r9401 r10462 4 4 <category>Basic</category> 5 5 <name>Core</name> 6 <version>2.4.1. 4</version>6 <version>2.4.1.5</version> 7 7 <candisable>no</candisable> 8 8 <canuninstall>no</canuninstall> 9 9 <changelog> 10 *2.4.1.5* #4615 (Security Bug) 10 11 *2.4.1.4* #4075 11 12 *2.4.1.3* fixed missing global modules/branches/2.4/core/page.trunks.php
r7881 r10462 17 17 $extdisplay=isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:''; 18 18 $action = isset($_REQUEST['action'])?$_REQUEST['action']:''; 19 $tech = strtolower(isset($_REQUEST['tech'])? $_REQUEST['tech']:'');19 $tech = strtolower(isset($_REQUEST['tech'])?htmlentities($_REQUEST['tech']):''); 20 20 21 21 $trunknum = ltrim($extdisplay,'OUT_'); modules/branches/2.4/music/module.xml
r5997 r10462 2 2 <rawname>music</rawname> 3 3 <name>Music on Hold</name> 4 <version>2.4.0. 3</version>4 <version>2.4.0.4</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 *2.4.0.4* #4615 (Security Bug) 11 12 *2.4.0.3* #2773 change change from exec of rm to unlink to remove security vulnerability 12 13 *2.4.0.2* #2843 Russian Translation modules/branches/2.4/music/page.music.php
r7005 r10462 179 179 $output = 0; 180 180 $returncode = 0; 181 $mohfile = escapeshellcmd($mohfile); 181 182 182 183 $origmohfile=$path_to_dir."/orig_".$mohfile; … … 300 301 echo "<h5> PHP "._("Error Processing")."! "._("No file provided")." "._("Please select a file to upload")."</h5>"; 301 302 } else { 302 echo "<h5> PHP "._("Error Processing")." ". $_FILES['mohfile']['name']."! "._("Check")." upload_max_filesize "._("in")." /etc/php.ini</h5>";303 echo "<h5> PHP "._("Error Processing")." ".htmlentities($_FILES['mohfile']['name'])."! "._("Check")." upload_max_filesize "._("in")." /etc/php.ini</h5>"; 303 304 } 304 305 } … … 310 311 311 312 if (isset($process_err)) { 312 echo "<h5>"._("Error Processing").": \"$process_err\" for ". $_FILES['mohfile']['name']."!</h5>\n";313 echo "<h5>"._("Error Processing").": \"$process_err\" for ".htmlentities($_FILES['mohfile']['name'])."!</h5>\n"; 313 314 echo "<h5>"._("This is not a fatal error, your Music on Hold may still work.")."</h5>\n"; 314 315 } else { 315 echo "<h5>"._("Completed processing")." ". $_FILES['mohfile']['name']."!</h5>";316 echo "<h5>"._("Completed processing")." ".htmlentities($_FILES['mohfile']['name'])."!</h5>"; 316 317 } 317 318 needreload(); modules/branches/2.4/phonebook/module.xml
r5807 r10462 2 2 <rawname>phonebook</rawname> 3 3 <name>Phonebook</name> 4 <version>2.4.0. 1</version>4 <version>2.4.0.2</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>2a22268a76e4761b33ea3cd23cd0a85b</md5sum> 13 13 <changelog> 14 *2.4.0.2* #4590 14 15 *2.4.0.1* #2843 Russian Translation 15 16 *2.4.0* it translation, bump for 2.4 modules/branches/2.4/phonebook/page.phonebook.php
r4767 r10462 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.4/recordings/module.xml
r10353 r10462 2 2 <rawname>recordings</rawname> 3 3 <name>Recordings</name> 4 <version>3.3.6. 5</version>4 <version>3.3.6.6</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.6.6* #4615 (Security Bug) 11 12 *3.3.6.5* #4568 Security Patch 12 13 *3.3.6.4* #4553 Security Patch modules/branches/2.4/recordings/page.recordings.php
r10343 r10462 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)) {
