aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_upload.php
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/13031] Guess with all mimetype guessers and pick best guessMarc Alexander2014-09-051-2/+2
| | | | PHPBB3-13031
* [ticket/13031] Only use mimetype guesser guess if it helps usMarc Alexander2014-09-031-1/+6
| | | | | | | | | | If we already have a mimetype and the guesser's guess is the default fallback, we should keep the already existing mimetype the browser supplied. Otherwise, platforms that might not support mimetype guessers will cause us to always have the mimetype set to application/octet-stream on images. This will prevent users from uploading images. PHPBB3-13031
* [ticket/12941] Fix remaining Sami complaints.Andreas Fischer2014-08-091-0/+2
| | | | PHPBB3-12941
* Merge pull request #2477 from n-aleha/ticket/12557ascraeusJoas Schilling2014-08-071-1/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12557] Fix doc block errors found by Sami for ascraeus * n-aleha/ticket/12557ascraeus: [ticket/12557] Fix load active module description [ticket/12557] Fix php file description [ticket/12557] Fix post data description for notifications [ticket/12557] Fix pass by reference doc blocks [ticket/12557] Fix doc block in extension base class [ticket/12557] Fix doc block in mimetype guesser [ticket/12557] Fix var $preserve_cr description [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Template fixes [ticket/12557] Search, cron and profilefields fixes [ticket/12557] Notification fixes [ticket/12557] Fix doc block errors found by Sami pt1 [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami
| * [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-031-2/+2
| | | | | | | | PHPBB3-12557
| * [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-031-1/+1
| | | | | | | | | | | | More corrections. PHPBB3-12557
| * [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-031-0/+4
| | | | | | | | PHPBB3-12557
* | Merge remote-tracking branch 'github-marc1706/ticket/11148' into ↵Nils Adermann2014-08-071-35/+25
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/11148: [ticket/11148] Remove unneeded variable mimetype and use type octet-stream [ticket/11148] Change expected output with disallowed content in test [ticket/11148] Always use the output of the mimetype guesser in get_mimetype [ticket/11148] Get rid of extra line in mimetype guesser setter doc block [ticket/11148] Add missing parts to docblock of get_mimetype() method [ticket/11148] Default to application/octet-stream if no mimetype given [ticket/11148] Use mimetype guesser for uploaded avatars [ticket/11148] Pass mimetype guesser to upload_attachment() function [ticket/11148] Add mimetype guesser to filespec and fileupload class
| * [ticket/11148] Remove unneeded variable mimetype and use type octet-streamMarc Alexander2014-06-231-2/+1
| | | | | | | | | | | | | | | | The variable $mimetype is not used in the method local_upload() afterwards so it shouldn't be assigned. The correct default mimetype should be application/octet-stream and not application/octetstream according to RFC 2046. PHPBB3-11148
| * [ticket/11148] Always use the output of the mimetype guesser in get_mimetypeMarc Alexander2014-06-231-6/+1
| | | | | | | | PHPBB3-11148
| * [ticket/11148] Add missing parts to docblock of get_mimetype() methodMarc Alexander2014-06-231-0/+2
| | | | | | | | PHPBB3-11148
| * [ticket/11148] Default to application/octet-stream if no mimetype givenMarc Alexander2014-06-231-1/+1
| | | | | | | | | | | | | | This should prevent us from having an empty mimetype while uploading a file using local_upload(). PHPBB3-11148
| * [ticket/11148] Add mimetype guesser to filespec and fileupload classMarc Alexander2014-06-231-32/+26
| | | | | | | | | | | | | | | | The mimetype guesser will be used to get the mimetype of uploaded files. Until now, this was only used for files uploaded with plupload. If a file doesn't have a mimetype supplied, we will now try to get the correct mimetype. PHPBB3-11148
* | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-06-241-2/+29
|\ \ | |/ |/| | | | | | | | | | | | | * develop-olympus: [ticket/12755] Apply de morgan to conditional [ticket/12755] Terminate upload loop if upload reaches filesize [ticket/12755] Change upload in remote_upload() method to fit get_remote_file [ticket/12755] Add language string for timed out remote upload [ticket/12755] Add timeout to remote upload to prevent infinite loop
| * [ticket/12755] Apply de morgan to conditionalMarc Alexander2014-06-241-1/+1
| | | | | | | | PHPBB3-12755
| * [ticket/12755] Terminate upload loop if upload reaches filesizeMarc Alexander2014-06-241-2/+12
| | | | | | | | | | | | | | Terminate the upload loop if the expected filesize has been reached instead of trying to read more bytes until the timeout has been reached. PHPBB3-12755
| * [ticket/12755] Change upload in remote_upload() method to fit get_remote_fileMarc Alexander2014-06-241-12/+14
| | | | | | | | PHPBB3-12755
| * [ticket/12755] Add language string for timed out remote uploadMarc Alexander2014-06-231-1/+1
| | | | | | | | PHPBB3-12755
| * [ticket/12755] Add timeout to remote upload to prevent infinite loopMarc Alexander2014-06-211-0/+15
| | | | | | | | PHPBB3-12755
* | [ticket/12673] IMAGETYPE_SWC might be missing when SWC is not supported.Andreas Fischer2014-06-081-2/+8
| | | | | | | | PHPBB3-12673
* | Merge pull request #2432 from Nicofuma/ticket/11226Joas Schilling2014-05-291-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11226] filespec::move_file() should error correctly * Nicofuma/ticket/11226: [ticket/11226] Explicity set file_moved to false [ticket/11226] Add tests [ticket/11226] Use $user->lang() [ticket/11226] filespec::move_file() should error correctly
| * | [ticket/11226] Explicity set file_moved to falseTristan Darricau2014-05-281-0/+1
| | | | | | | | | | | | PHPBB3-11226
| * | [ticket/11226] Use $user->lang()Tristan Darricau2014-05-101-1/+1
| | | | | | | | | | | | PHPBB3-11226
| * | [ticket/11226] filespec::move_file() should error correctlyTristan Darricau2014-05-101-0/+2
| | | | | | | | | | | | PHPBB3-11226
* | | [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-271-8/+7
|/ / | | | | | | PHPBB3-12594
* | [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.Andreas Fischer2014-04-291-1/+1
| | | | | | | | | | | | | | | | | | * There MUST NOT be trailing whitespace at the end of lines. * There MUST NOT be whitespace before the first content of a file. * There MUST NOT be whitespace after the last content of a file. * Functions MUST NOT contain multiple empty lines in a row. PHPBB3-12458
* | [ticket/12211] Do not run attachment file names twice through htmlspecialcharsMarc Alexander2014-04-111-1/+1
| | | | | | | | | | | | | | | | Upload filenames are already processed via htmlspecialchars in the type_cast_helper of the new request class. There is no need to run it through htmlspecialchars() again in the filespec class. PHPBB3-12211
* | [feature/plupload/integration] Integration of PluploadAndreas Fischer2013-10-111-5/+26
| | | | | | | | | | | | | | | | This commit is a highly-refactored and up-to-date version of Fyorl's work which was part of his Google Summer of Code 2012 project "Attachment Improvements". PHPBB3-10929
* | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-161-1/+1
| | | | | | | | PHPBB3-11700
* | [ticket/11700] Modify all code to use the new interface namesNils Adermann2013-07-141-1/+1
| | | | | | | | PHPBB3-11700
* | [ticket/10763] Use self when calling get_extension() in filespec classMarc Alexander2012-12-171-1/+1
| | | | | | | | PHPBB3-10763
* | [ticket/10763] Make functions for remote avatars staticMarc Alexander2012-12-171-5/+10
| | | | | | | | | | | | | | | | | | fileupload::image_types() and filespec::get_extension() are called statically while submitting the form for the remote avatar. Make them static as described in the ticket in order to prevent a PHP notice. Also change the tests to use the static functions. PHPBB3-10763
* | [ticket/10939] Modified functions_upload to not use $_FILESFyorl2012-08-151-20/+25
| | | | | | | | PHPBB3-10939
* | [ticket/10944] strpos now stricter and removed superfluous ternaryFyorl2012-07-171-1/+1
| | | | | | | | PHPBB3-10944
* | [ticket/10944] Reverted changes in PHPBB3-10963Fyorl2012-07-171-6/+9
| | | | | | | | | | | | | | is_image now just checks the mimetype reported by the browser and get_mimetype goes back to being unused. PHPBB3-10944
* | [ticket/10963] filespec::get_mimetype now usedFyorl2012-07-041-11/+4
| | | | | | | | | | | | | | filespec::get_mimetype now uses the finfo class in order to detect the mimetype of a given filename. filespec::is_image() now uses this method. PHPBB3-10963
* | [ticket/10963] Removed superfluous ternary statement and strpos now stricterFyorl2012-07-021-1/+1
| | | | | | | | PHPBB3-10963
* | [ticket/10963] Modified filespec::is_image() to check actual mimetypeFyorl2012-07-021-1/+5
| | | | | | | | | | | | | | Modified filespec::is_image() to check the Fileinfo mimetype rather than trusting the browser. PHPBB3-10963
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-311-4/+29
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/10908] Document that 0 filesize configuration means limited by PHP [ticket/10908] Download files only up to max_upload_filesize if limit is 0
| * [ticket/10908] Download files only up to max_upload_filesize if limit is 0Nils Adermann2012-05-291-4/+29
| | | | | | | | PHPBB3-10908
* | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-311-2/+1
| | | | | | | | PHPBB3-9916
* | [ticket/10345] Use the plural function in some more places.Joas Schilling2011-11-251-1/+7
| | | | | | | | | | | | | | I added two function avatar_explanation_string() and avatar_error_wrong_size() for easier handling of the "pixels"-languages, as they are used quite often. PHPBB3-10345
* | Merge branch 'develop-olympus' into developIgor Wiedler2011-01-101-2/+2
|\ \ | |/
| * [ticket/9764] Allow $config['mime_triggers'] to be an empty string.Andreas Fischer2010-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | explode('|', '') and explode('|', NULL) both return array(0 => '') which can cause filespec::check_content() to reject everything starting with a '<' character in case $config['mime_triggers'] is an empty string or not set. fileupload::set_disallowed_content() now filters out empty strings by calling array_diff() on the passed array, so setting $config['mime_triggers'] to an empty string will turn off mime checking completely. On the other side we want to fail safe if $config['mime_triggers'] is not set at all. To do this, the array fileupload::$disallowed_content now contains some default strings to be filtered out. PHPBB3-9764
* | [ticket/9556] Drop php closing tags, add trailing newlineIgor Wiedler2010-11-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Closing tags converted using Oleg's script. remove-php-end-tags.py -a . Trailing newlines added using the following where $ext is file extension. find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s; Extensions: php, css, html, js, xml. PHPBB3-9556
* | Merge branch 'ticket/bantu/7252' into developIgor Wiedler2010-09-121-16/+16
|\ \ | | | | | | | | | | | | | | | | | | * ticket/bantu/7252: [ticket/7252] Align array keys and values to "=>". [ticket/7252] Replace magic values with PHP constants. [ticket/7252] Replace magic values with PHP constants.
| * | [ticket/7252] Align array keys and values to "=>".Andreas Fischer2010-09-121-16/+16
| | | | | | | | | | | | PHPBB3-7252
| * | [ticket/7252] Replace magic values with PHP constants.Chris Smith2010-09-101-16/+16
| |/ | | | | | | | | | | | | fileupload::image_types() contained hardcoded references to values of built in PHP constants, these have been replaced with the constants instead now. PHPBB3-7252
* | [ticket/9394] Fix comment in functions_uploadIgor Wiedler2010-09-021-1/+1
|/ | | | PHPBB3-9394
* [ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()Andreas Fischer2010-08-041-2/+3
| | | | | | | | | | | | When magic_quotes_gpc is 'On' it also affects the $_FILES array and a filename like 'bantu"s testfile.txt' will be returned as 'bantu\"s testfile.txt'. Because utf8_basename() also strips off anything before the last backslash the filename was returned as '"s testfile.txt'. Calling stripslashes() before utf8_basename() solves the problem. PHPBB3-9615