uploaded_max_filesize conversion to bytes

Elena.Budnik
1 parent 4a75227e
Showing 1 changed file with 26 additions and 4 deletions Show diff stats
php/uploadFile.php
@@ -49,7 +49,23 @@
 		return $ContentLength;
 	}
+	
+	function return_bytes($val) {
+		$val = trim($val);
+		$last = strtolower($val[strlen($val)-1]);
+		switch($last) {
+			// Le modifieur 'G' est disponible depuis PHP 5.1.0
+			case 'g':
+				$val *= 1024;
+			case 'm':
+				$val *= 1024;
+			case 'k':
+				$val *= 1024;
+		}
+		return $val;
+	}
+	
 	/**
 	*  Main
 	*/ 
@@ -59,8 +75,7 @@
 	// error_reporting(E_ERROR | E_WARNING | E_PARSE);
-	if (!isset($_POST['sessionID'])) 
-	{
+	if (!isset($_POST['sessionID'])) {
 		$response = array( 'success' => false, 'error' => ': Check that uploaded file size is less than '.ini_get('upload_max_filesize')); 
 		die(json_encode($response));           
 	}
@@ -70,8 +85,14 @@
 	define('USERWSDIR', USERPATH."/".$_POST['sessionID']."/WS/"); 
 	define('USERWORKINGDIR', USERPATH."/".$_POST['sessionID']."/RES/");
 	define('ATTACHMENTDIR', DATAPATH."/Feedback/Attach/");
-	define('maxSize',$_POST['MAX_FILE_SIZE'] < ini_get('upload_max_filesize'));
+	$upload_max_filesize = return_bytes(ini_get('upload_max_filesize'));
+	
+	if ($upload_max_filesize  > $_POST['MAX_FILE_SIZE'])
+			define('maxSize',$_POST['MAX_FILE_SIZE']);
+	else 
+			define('maxSize',$upload_max_filesize); // NEVER !
+			
 	if (!is_dir(USERTEMPDIR)) mkdir(USERTEMPDIR.'/', 0755, true);
 	if (!is_dir(ATTACHMENTDIR)) mkdir(ATTACHMENTDIR.'/', 0755, true);
@@ -157,7 +178,8 @@
 		if ($fileSize > maxSize) 
 		{
-			$response = array( 'success' => false, 'error' => 'The uploaded file exceeds '.maxSize); 
+			$maxMB = maxSize/1000000;
+			$response = array( 'success' => false, 'error' => 'The uploaded file exceeds '.$maxMB.'MB'); 
 			die(json_encode($response));
 		}