adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-20 08:33:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bug 56 : wrong error message for exceeding filesize picture

Browse Source 
- bug 40 : case issue for uploaded pictures


git-svn-id: http://piwigo.org/svn/trunk@585 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
z0rglub
2004-10-25 20:35:35 +00:00
parent 691a834cd3
commit 54bfd62e17
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
upload.php
+3 -3
View File
@@ -40,13 +40,13 @@ include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
function validate_upload( $temp_name, $my_max_file_size,
$image_max_width, $image_max_height )
{
global $lang;
global $conf, $lang;
$result = array();
$result['error'] = array();
//echo $_FILES['picture']['name']."<br />".$temp_name;
$extension = get_extension( $_FILES['picture']['name'] );
if ( $extension != 'gif' and $extension != 'jpg' and $extension != 'png' )
if (!in_array($extension, $conf['picture_ext']))
{
array_push( $result['error'], $lang['upload_advise_filetype'] );
return $result;
@@ -59,7 +59,7 @@ function validate_upload( $temp_name, $my_max_file_size,
else if ( $_FILES['picture']['size'] > $my_max_file_size * 1024 )
{
array_push( $result['error'],
$lang['upload_advise_width'].$my_max_file_size.' KB' );
$lang['upload_advise_filesize'].$my_max_file_size.' KB' );
}
else
{