- fixed change language

- security update
trippo · Oct 26, 2016 · 0884d64 · 0884d64
1 parent 280e7f4
commit 0884d64
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/filemanager/dialog.php b/filemanager/dialog.php
@@ -212,7 +212,7 @@
 	$filter='';
 }
 
-$extensions='';
+$extensions=null;
 if (isset($_GET['extensions'])){
 	$extensions = json_decode(urldecode($_GET['extensions']));
 	if($extensions){
@@ -232,7 +232,7 @@
 }elseif($_SESSION['RF']['language']){
 	$languages = include 'lang/languages.php';
 	if(array_key_exists($lang,$languages)){
-		$lang = strip_tags($_GET['lang']);
+		$lang = strip_tags($_SESSION['RF']['language']);
 		$_SESSION['RF']['language'] = $lang;
 	}
 }
@@ -265,7 +265,7 @@
 	'lang'      => $lang,
 	'popup'     => $popup,
 	'crossdomain' => $crossdomain,
-	'extensions' => urlencode(json_encode($extensions)),
+	'extensions' => ($extensions) ? urlencode(json_encode($extensions)) : null ,
 	'field_id'  => $field_id,
 	'relative_url' => $return_relative_url,
 	'akey' 		=> (isset($_GET['akey']) && $_GET['akey'] != '' ? $_GET['akey'] : 'key')

diff --git a/filemanager/upload.php b/filemanager/upload.php
@@ -83,8 +83,10 @@
 
 	$info = pathinfo($_FILES['file']['name']);
 	$mime_type = $_FILES['file']['type'];
+	$mime_type = mime_content_type($_FILES['file']['tmp_name']);
 	$extension = get_extension_from_mime($mime_type);
-	if($extension==='' || $extension=='so'){
+
+	if($extension=='so'){
 		$extension = $info['extension'];
 	}