XOOPS / XoopsCore

htdocs/class/xoopseditor/tinymce4/external_plugins/filemanager/include/utils.php

Indentation +87 added lines, -87 removed lines

@@ -14,63 +14,63 @@ 
 
 function duplicate_file($old_path,$name){
     if(file_exists($old_path)){
-	$info=pathinfo($old_path);
-	$new_path=$info['dirname']."/".$name.".".$info['extension'];
-	if(file_exists($new_path)) return false;
-	return copy($old_path,$new_path);
+    $info=pathinfo($old_path);
+    $new_path=$info['dirname']."/".$name.".".$info['extension'];
+    if(file_exists($new_path)) return false;
+    return copy($old_path,$new_path);
     }
 }
 
 function rename_file($old_path,$name,$transliteration){
     $name=fix_filename($name,$transliteration);
     if(file_exists($old_path)){
-	$info=pathinfo($old_path);
-	$new_path=$info['dirname']."/".$name.".".$info['extension'];
-	if(file_exists($new_path)) return false;
-	return rename($old_path,$new_path);
+    $info=pathinfo($old_path);
+    $new_path=$info['dirname']."/".$name.".".$info['extension'];
+    if(file_exists($new_path)) return false;
+    return rename($old_path,$new_path);
     }
 }
 
 function rename_folder($old_path,$name,$transliteration){
     $name=fix_filename($name,$transliteration);
     if(file_exists($old_path)){
-	$new_path=fix_dirname($old_path)."/".$name;
-	if(file_exists($new_path)) return false;
-	return rename($old_path,$new_path);
+    $new_path=fix_dirname($old_path)."/".$name;
+    if(file_exists($new_path)) return false;
+    return rename($old_path,$new_path);
     }
 }
 
 function create_img_gd($imgfile, $imgthumb, $newwidth, $newheight="") {
     if(image_check_memory_usage($imgfile,$newwidth,$newheight)){
-	require_once('php_image_magician.php');
-	$magicianObj = new imageLib($imgfile);
-	$magicianObj -> resizeImage($newwidth, $newheight, 'crop');
-	$magicianObj -> saveImage($imgthumb,80);
-	return true;
+    require_once('php_image_magician.php');
+    $magicianObj = new imageLib($imgfile);
+    $magicianObj -> resizeImage($newwidth, $newheight, 'crop');
+    $magicianObj -> saveImage($imgthumb,80);
+    return true;
     }
     return false;
 }
 
 function create_img($imgfile, $imgthumb, $newwidth, $newheight="") {
     if(image_check_memory_usage($imgfile,$newwidth,$newheight)){
-	require_once('php_image_magician.php');
-	$magicianObj = new imageLib($imgfile);
-	$magicianObj -> resizeImage($newwidth, $newheight, 'auto');
-	$magicianObj -> saveImage($imgthumb,80);
-	return true;
+    require_once('php_image_magician.php');
+    $magicianObj = new imageLib($imgfile);
+    $magicianObj -> resizeImage($newwidth, $newheight, 'auto');
+    $magicianObj -> saveImage($imgthumb,80);
+    return true;
     }else{
-	return false;
+    return false;
     }
 }
 
 function makeSize($size) {
-   $units = array('B','KB','MB','GB','TB');
-   $u = 0;
-   while ( (round($size / 1024) > 0) && ($u < 4) ) {
-     $size = $size / 1024;
-     $u++;
-   }
-   return (number_format($size, 0) . " " . $units[$u]);
+    $units = array('B','KB','MB','GB','TB');
+    $u = 0;
+    while ( (round($size / 1024) > 0) && ($u < 4) ) {
+        $size = $size / 1024;
+        $u++;
+    }
+    return (number_format($size, 0) . " " . $units[$u]);
 }
 
 function foldersize($path) {
@@ -127,14 +127,14 @@ 
 
 function check_files_extensions_on_path($path,$ext){
     if(!is_dir($path)){
-	$fileinfo = pathinfo($path);
-	if(!in_array(mb_strtolower($fileinfo['extension']),$ext))
-	    unlink($path);
+    $fileinfo = pathinfo($path);
+    if(!in_array(mb_strtolower($fileinfo['extension']),$ext))
+        unlink($path);
     }else{
-	$files = scandir($path);
-	foreach($files as $file){
-	    check_files_extensions_on_path(trim($path,'/')."/".$file,$ext);
-	}
+    $files = scandir($path);
+    foreach($files as $file){
+        check_files_extensions_on_path(trim($path,'/')."/".$file,$ext);
+    }
     }
 }
 
@@ -162,16 +162,16 @@ 
 
 function fix_filename($str,$transliteration){
     if($transliteration){
-    	if( function_exists( 'transliterator_transliterate' ) )
-    	{
-    	   $str = transliterator_transliterate( 'Accents-Any', $str );
-    	}
-    	else
-    	{
-    	   $str = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);
-    	}
+        if( function_exists( 'transliterator_transliterate' ) )
+        {
+            $str = transliterator_transliterate( 'Accents-Any', $str );
+        }
+        else
+        {
+            $str = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);
+        }
 
-	$str = preg_replace( "/[^a-zA-Z0-9\.\[\]_| -]/", '', $str );
+    $str = preg_replace( "/[^a-zA-Z0-9\.\[\]_| -]/", '', $str );
     }
 
     $str=str_replace(array('"',"'","/","\\"),"",$str);
@@ -182,7 +182,7 @@ 
     // So we add that default 'file' name to fix that issue.
     if( strpos( $str, '.' ) === 0 )
     {
-       $str = 'file'.$str;
+        $str = 'file'.$str;
     }
 
     return trim( $str );
@@ -194,45 +194,45 @@ 
 
 function fix_strtoupper($str){
     if( function_exists( 'mb_strtoupper' ) )
-	return mb_strtoupper($str);
+    return mb_strtoupper($str);
     else
-	return strtoupper($str);
+    return strtoupper($str);
 }
 
 
 function fix_strtolower($str){
     if( function_exists( 'mb_strtoupper' ) )
-	return mb_strtolower($str);
+    return mb_strtolower($str);
     else
-	return strtolower($str);
+    return strtolower($str);
 }
 
 function fix_path($path,$transliteration){
     $info=pathinfo($path);
     $tmp_path = $info['dirname'];
-	$str=fix_filename($info['filename'],$transliteration);
+    $str=fix_filename($info['filename'],$transliteration);
     if($tmp_path!="")
-		return $tmp_path.DIRECTORY_SEPARATOR.$str;
+        return $tmp_path.DIRECTORY_SEPARATOR.$str;
     else
-		return $str;
+        return $str;
 }
 
 function base_url(){
-  return sprintf(
+    return sprintf(
     "%s://%s",
     isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http',
     $_SERVER['HTTP_HOST']
-  );
+    );
 }
 
 function config_loading($current_path,$fld){
     if(file_exists($current_path.$fld.".config")){
-	require_once($current_path.$fld.".config");
-	return true;
+    require_once($current_path.$fld.".config");
+    return true;
     }
     echo "!!!!".$parent=fix_dirname($fld);
     if($parent!=="." && !empty($parent)){
-	config_loading($current_path,$parent);
+    config_loading($current_path,$parent);
     }
 
     return false;
@@ -241,16 +241,16 @@ 
 
 function image_check_memory_usage($img, $max_breedte, $max_hoogte){
     if(file_exists($img)){
-	$K64 = 65536;    // number of bytes in 64K
-	$memory_usage = memory_get_usage();
-	$memory_limit = abs((int)(str_replace('M','',ini_get('memory_limit'))*1024*1024));
-	$image_properties = getimagesize($img);
-	$image_width = $image_properties[0];
-	$image_height = $image_properties[1];
-	$image_bits = $image_properties['bits'];
-	$image_memory_usage = $K64 + ($image_width * $image_height * ($image_bits )  * 2);
-	$thumb_memory_usage = $K64 + ($max_breedte * $max_hoogte * ($image_bits ) * 2);
-	$memory_needed = (int)($memory_usage + $image_memory_usage + $thumb_memory_usage);
+    $K64 = 65536;    // number of bytes in 64K
+    $memory_usage = memory_get_usage();
+    $memory_limit = abs((int)(str_replace('M','',ini_get('memory_limit'))*1024*1024));
+    $image_properties = getimagesize($img);
+    $image_width = $image_properties[0];
+    $image_height = $image_properties[1];
+    $image_bits = $image_properties['bits'];
+    $image_memory_usage = $K64 + ($image_width * $image_height * ($image_bits )  * 2);
+    $thumb_memory_usage = $K64 + ($max_breedte * $max_hoogte * ($image_bits ) * 2);
+    $memory_needed = (int)($memory_usage + $image_memory_usage + $thumb_memory_usage);
 
         if($memory_needed > $memory_limit){
                 ini_set('memory_limit',((int)($memory_needed/1024/1024)+5) . 'M');
@@ -262,8 +262,8 @@ 
         }else{
             return true;
         }
-	    }else{
-	    return false;
+        }else{
+        return false;
     }
 }
 
@@ -276,26 +276,26 @@ 
     //create relative thumbs
     $all_ok=true;
     if($relative_image_creation){
-	foreach($relative_path_from_current_pos as $k=>$path){
-	    if($path!="" && $path[strlen($path)-1]!="/") $path.="/";
-	    if (!file_exists($targetPath.$path)) create_folder($targetPath.$path,false);
-	    $info=pathinfo($name);
-	    if(!endsWith($targetPath,$path))
-		if(!create_img($targetFile, $targetPath.$path.$relative_image_creation_name_to_prepend[$k].$info['filename'].$relative_image_creation_name_to_append[$k].".".$info['extension'], $relative_image_creation_width[$k], $relative_image_creation_height[$k]))
-		    $all_ok=false;
-	}
+    foreach($relative_path_from_current_pos as $k=>$path){
+        if($path!="" && $path[strlen($path)-1]!="/") $path.="/";
+        if (!file_exists($targetPath.$path)) create_folder($targetPath.$path,false);
+        $info=pathinfo($name);
+        if(!endsWith($targetPath,$path))
+        if(!create_img($targetFile, $targetPath.$path.$relative_image_creation_name_to_prepend[$k].$info['filename'].$relative_image_creation_name_to_append[$k].".".$info['extension'], $relative_image_creation_width[$k], $relative_image_creation_height[$k]))
+            $all_ok=false;
+    }
     }
 
     //create fixed thumbs
     if($fixed_image_creation){
-	foreach($fixed_path_from_filemanager as $k=>$path){
-	    if($path!="" && $path[strlen($path)-1]!="/") $path.="/";
-	    $base_dir=$path.substr_replace($targetPath, '', 0, strlen($current_path));
-	    if (!file_exists($base_dir)) create_folder($base_dir,false);
-	    $info=pathinfo($name);
-	    if(!create_img($targetFile, $base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'], $fixed_image_creation_width[$k], $fixed_image_creation_height[$k]))
-		$all_ok=false;
-	}
+    foreach($fixed_path_from_filemanager as $k=>$path){
+        if($path!="" && $path[strlen($path)-1]!="/") $path.="/";
+        $base_dir=$path.substr_replace($targetPath, '', 0, strlen($current_path));
+        if (!file_exists($base_dir)) create_folder($base_dir,false);
+        $info=pathinfo($name);
+        if(!create_img($targetFile, $base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'], $fixed_image_creation_width[$k], $fixed_image_creation_height[$k]))
+        $all_ok=false;
+    }
     }
     return $all_ok;
 }
@@ -456,7 +456,7 @@ 
 function debugger($input, $trace = false, $halt = fale){
     \Xmf\Debug::dump($input);
     if ($trace){
-         \Xmf\Debug::backtrace();
+            \Xmf\Debug::backtrace();
     }
     if ($halt){
         exit();

Spacing +128 added lines, -128 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") die('forbiden');
+if ($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") die('forbiden');
 
 function deleteDir($dir) {
     if (!file_exists($dir)) return true;
@@ -12,75 +12,75 @@ 
     return rmdir($dir);
 }
 
-function duplicate_file($old_path,$name){
-    if(file_exists($old_path)){
-	$info=pathinfo($old_path);
-	$new_path=$info['dirname']."/".$name.".".$info['extension'];
-	if(file_exists($new_path)) return false;
-	return copy($old_path,$new_path);
+function duplicate_file($old_path, $name) {
+    if (file_exists($old_path)) {
+	$info = pathinfo($old_path);
+	$new_path = $info['dirname']."/".$name.".".$info['extension'];
+	if (file_exists($new_path)) return false;
+	return copy($old_path, $new_path);
     }
 }
 
-function rename_file($old_path,$name,$transliteration){
-    $name=fix_filename($name,$transliteration);
-    if(file_exists($old_path)){
-	$info=pathinfo($old_path);
-	$new_path=$info['dirname']."/".$name.".".$info['extension'];
-	if(file_exists($new_path)) return false;
-	return rename($old_path,$new_path);
+function rename_file($old_path, $name, $transliteration) {
+    $name = fix_filename($name, $transliteration);
+    if (file_exists($old_path)) {
+	$info = pathinfo($old_path);
+	$new_path = $info['dirname']."/".$name.".".$info['extension'];
+	if (file_exists($new_path)) return false;
+	return rename($old_path, $new_path);
     }
 }
 
-function rename_folder($old_path,$name,$transliteration){
-    $name=fix_filename($name,$transliteration);
-    if(file_exists($old_path)){
-	$new_path=fix_dirname($old_path)."/".$name;
-	if(file_exists($new_path)) return false;
-	return rename($old_path,$new_path);
+function rename_folder($old_path, $name, $transliteration) {
+    $name = fix_filename($name, $transliteration);
+    if (file_exists($old_path)) {
+	$new_path = fix_dirname($old_path)."/".$name;
+	if (file_exists($new_path)) return false;
+	return rename($old_path, $new_path);
     }
 }
 
-function create_img_gd($imgfile, $imgthumb, $newwidth, $newheight="") {
-    if(image_check_memory_usage($imgfile,$newwidth,$newheight)){
+function create_img_gd($imgfile, $imgthumb, $newwidth, $newheight = "") {
+    if (image_check_memory_usage($imgfile, $newwidth, $newheight)) {
 	require_once('php_image_magician.php');
 	$magicianObj = new imageLib($imgfile);
 	$magicianObj -> resizeImage($newwidth, $newheight, 'crop');
-	$magicianObj -> saveImage($imgthumb,80);
+	$magicianObj -> saveImage($imgthumb, 80);
 	return true;
     }
     return false;
 }
 
-function create_img($imgfile, $imgthumb, $newwidth, $newheight="") {
-    if(image_check_memory_usage($imgfile,$newwidth,$newheight)){
+function create_img($imgfile, $imgthumb, $newwidth, $newheight = "") {
+    if (image_check_memory_usage($imgfile, $newwidth, $newheight)) {
 	require_once('php_image_magician.php');
 	$magicianObj = new imageLib($imgfile);
 	$magicianObj -> resizeImage($newwidth, $newheight, 'auto');
-	$magicianObj -> saveImage($imgthumb,80);
+	$magicianObj -> saveImage($imgthumb, 80);
 	return true;
-    }else{
+    } else {
 	return false;
     }
 }
 
 function makeSize($size) {
-   $units = array('B','KB','MB','GB','TB');
+   $units = array('B', 'KB', 'MB', 'GB', 'TB');
    $u = 0;
-   while ( (round($size / 1024) > 0) && ($u < 4) ) {
+   while ((round($size / 1024) > 0) && ($u < 4)) {
      $size = $size / 1024;
      $u++;
    }
-   return (number_format($size, 0) . " " . $units[$u]);
+   return (number_format($size, 0)." ".$units[$u]);
 }
 
 function foldersize($path) {
     $total_size = 0;
     $files = scandir($path);
-    $cleanPath = rtrim($path, '/'). '/';
+    $cleanPath = rtrim($path, '/').'/';
 
-    foreach($files as $t) {
+    foreach ($files as $t) {
         if ($t !== "." && $t !== "..") {
-            $currentFile = $cleanPath . $t;
+            $currentFile = $cleanPath.$t;
             if (is_dir($currentFile)) {
                 $size = foldersize($currentFile);
                 $total_size += $size;
@@ -98,11 +98,11 @@ 
 function filescount($path) {
     $total_count = 0;
     $files = scandir($path);
-    $cleanPath = rtrim($path, '/'). '/';
+    $cleanPath = rtrim($path, '/').'/';
 
-    foreach($files as $t) {
+    foreach ($files as $t) {
         if ($t !== "." && $t !== "..") {
-            $currentFile = $cleanPath . $t;
+            $currentFile = $cleanPath.$t;
             if (is_dir($currentFile)) {
                 $size = filescount($currentFile);
                 $total_count += $size;
@@ -116,108 +116,108 @@ 
     return $total_count;
 }
 
-function create_folder($path=false,$path_thumbs=false){
+function create_folder($path = false, $path_thumbs = false) {
     $oldumask = umask(0);
     if ($path && !file_exists($path))
         mkdir($path, 0777, true); // or even 01777 so you get the sticky bit set
-    if($path_thumbs && !file_exists($path_thumbs))
+    if ($path_thumbs && !file_exists($path_thumbs))
         mkdir($path_thumbs, 0777, true) or die("$path_thumbs cannot be found"); // or even 01777 so you get the sticky bit set
     umask($oldumask);
 }
 
-function check_files_extensions_on_path($path,$ext){
-    if(!is_dir($path)){
+function check_files_extensions_on_path($path, $ext) {
+    if (!is_dir($path)) {
 	$fileinfo = pathinfo($path);
-	if(!in_array(mb_strtolower($fileinfo['extension']),$ext))
+	if (!in_array(mb_strtolower($fileinfo['extension']), $ext))
 	    unlink($path);
-    }else{
+    } else {
 	$files = scandir($path);
-	foreach($files as $file){
-	    check_files_extensions_on_path(trim($path,'/')."/".$file,$ext);
+	foreach ($files as $file) {
+	    check_files_extensions_on_path(trim($path, '/')."/".$file, $ext);
 	}
     }
 }
 
-function check_files_extensions_on_phar( $phar, &$files, $basepath, $ext ) {
-    foreach( $phar as $file )
+function check_files_extensions_on_phar($phar, &$files, $basepath, $ext) {
+    foreach ($phar as $file)
     {
-        if( $file->isFile() )
+        if ($file->isFile())
         {
-            if(in_array(mb_strtolower($file->getExtension()),$ext))
+            if (in_array(mb_strtolower($file->getExtension()), $ext))
             {
                 $files[] = $basepath.$file->getFileName( );
             }
         }
-        else if( $file->isDir() )
+        else if ($file->isDir())
         {
-            $iterator = new DirectoryIterator( $file );
+            $iterator = new DirectoryIterator($file);
             check_files_extensions_on_phar($iterator, $files, $basepath.$file->getFileName().'/', $ext);
         }
     }
 }
 
-function fix_get_params($str){
-    return strip_tags(preg_replace( "/[^a-zA-Z0-9\.\[\]_| -]/", '', $str));
+function fix_get_params($str) {
+    return strip_tags(preg_replace("/[^a-zA-Z0-9\.\[\]_| -]/", '', $str));
 }
 
-function fix_filename($str,$transliteration){
-    if($transliteration){
-    	if( function_exists( 'transliterator_transliterate' ) )
+function fix_filename($str, $transliteration) {
+    if ($transliteration) {
+    	if (function_exists('transliterator_transliterate'))
     	{
-    	   $str = transliterator_transliterate( 'Accents-Any', $str );
+    	   $str = transliterator_transliterate('Accents-Any', $str);
     	}
     	else
     	{
     	   $str = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);
     	}
 
-	$str = preg_replace( "/[^a-zA-Z0-9\.\[\]_| -]/", '', $str );
+	$str = preg_replace("/[^a-zA-Z0-9\.\[\]_| -]/", '', $str);
     }
 
-    $str=str_replace(array('"',"'","/","\\"),"",$str);
-    $str=strip_tags($str);
+    $str = str_replace(array('"', "'", "/", "\\"), "", $str);
+    $str = strip_tags($str);
 
     // Empty or incorrectly transliterated filename.
     // Here is a point: a good file UNKNOWN_LANGUAGE.jpg could become .jpg in previous code.
     // So we add that default 'file' name to fix that issue.
-    if( strpos( $str, '.' ) === 0 )
+    if (strpos($str, '.') === 0)
     {
        $str = 'file'.$str;
     }
 
-    return trim( $str );
+    return trim($str);
 }
 
-function fix_dirname($str){
-    return str_replace('~',' ',dirname(str_replace(' ','~',$str)));
+function fix_dirname($str) {
+    return str_replace('~', ' ', dirname(str_replace(' ', '~', $str)));
 }
 
-function fix_strtoupper($str){
-    if( function_exists( 'mb_strtoupper' ) )
+function fix_strtoupper($str) {
+    if (function_exists('mb_strtoupper'))
 	return mb_strtoupper($str);
     else
 	return strtoupper($str);
 }
 
 
-function fix_strtolower($str){
-    if( function_exists( 'mb_strtoupper' ) )
+function fix_strtolower($str) {
+    if (function_exists('mb_strtoupper'))
 	return mb_strtolower($str);
     else
 	return strtolower($str);
 }
 
-function fix_path($path,$transliteration){
-    $info=pathinfo($path);
+function fix_path($path, $transliteration) {
+    $info = pathinfo($path);
     $tmp_path = $info['dirname'];
-	$str=fix_filename($info['filename'],$transliteration);
-    if($tmp_path!="")
+	$str = fix_filename($info['filename'], $transliteration);
+    if ($tmp_path != "")
 		return $tmp_path.DIRECTORY_SEPARATOR.$str;
     else
 		return $str;
 }
 
-function base_url(){
+function base_url() {
   return sprintf(
     "%s://%s",
     isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http',
@@ -225,44 +225,44 @@ 
   );
 }
 
-function config_loading($current_path,$fld){
-    if(file_exists($current_path.$fld.".config")){
+function config_loading($current_path, $fld) {
+    if (file_exists($current_path.$fld.".config")) {
 	require_once($current_path.$fld.".config");
 	return true;
     }
-    echo "!!!!".$parent=fix_dirname($fld);
-    if($parent!=="." && !empty($parent)){
-	config_loading($current_path,$parent);
+    echo "!!!!".$parent = fix_dirname($fld);
+    if ($parent !== "." && !empty($parent)) {
+	config_loading($current_path, $parent);
     }
 
     return false;
 }
 
 
-function image_check_memory_usage($img, $max_breedte, $max_hoogte){
-    if(file_exists($img)){
-	$K64 = 65536;    // number of bytes in 64K
+function image_check_memory_usage($img, $max_breedte, $max_hoogte) {
+    if (file_exists($img)) {
+	$K64 = 65536; // number of bytes in 64K
 	$memory_usage = memory_get_usage();
-	$memory_limit = abs((int)(str_replace('M','',ini_get('memory_limit'))*1024*1024));
+	$memory_limit = abs((int)(str_replace('M', '', ini_get('memory_limit')) * 1024 * 1024));
 	$image_properties = getimagesize($img);
 	$image_width = $image_properties[0];
 	$image_height = $image_properties[1];
 	$image_bits = $image_properties['bits'];
-	$image_memory_usage = $K64 + ($image_width * $image_height * ($image_bits )  * 2);
-	$thumb_memory_usage = $K64 + ($max_breedte * $max_hoogte * ($image_bits ) * 2);
+	$image_memory_usage = $K64 + ($image_width * $image_height * ($image_bits) * 2);
+	$thumb_memory_usage = $K64 + ($max_breedte * $max_hoogte * ($image_bits) * 2);
 	$memory_needed = (int)($memory_usage + $image_memory_usage + $thumb_memory_usage);
 
-        if($memory_needed > $memory_limit){
-                ini_set('memory_limit',((int)($memory_needed/1024/1024)+5) . 'M');
-                if(ini_get('memory_limit') == ((int)($memory_needed/1024/1024)+5) . 'M'){
+        if ($memory_needed > $memory_limit) {
+                ini_set('memory_limit', ((int)($memory_needed / 1024 / 1024) + 5).'M');
+                if (ini_get('memory_limit') == ((int)($memory_needed / 1024 / 1024) + 5).'M') {
                 return true;
-            }else{
+            } else {
                 return false;
             }
-        }else{
+        } else {
             return true;
         }
-	    }else{
+	    } else {
 	    return false;
     }
 }
@@ -272,29 +272,29 @@ 
     return $needle === "" || substr($haystack, -strlen($needle)) === $needle;
 }
 
-function new_thumbnails_creation($targetPath,$targetFile,$name,$current_path,$relative_image_creation,$relative_path_from_current_pos,$relative_image_creation_name_to_prepend,$relative_image_creation_name_to_append,$relative_image_creation_width,$relative_image_creation_height,$fixed_image_creation,$fixed_path_from_filemanager,$fixed_image_creation_name_to_prepend,$fixed_image_creation_to_append,$fixed_image_creation_width,$fixed_image_creation_height){
+function new_thumbnails_creation($targetPath, $targetFile, $name, $current_path, $relative_image_creation, $relative_path_from_current_pos, $relative_image_creation_name_to_prepend, $relative_image_creation_name_to_append, $relative_image_creation_width, $relative_image_creation_height, $fixed_image_creation, $fixed_path_from_filemanager, $fixed_image_creation_name_to_prepend, $fixed_image_creation_to_append, $fixed_image_creation_width, $fixed_image_creation_height) {
     //create relative thumbs
-    $all_ok=true;
-    if($relative_image_creation){
-	foreach($relative_path_from_current_pos as $k=>$path){
-	    if($path!="" && $path[strlen($path)-1]!="/") $path.="/";
-	    if (!file_exists($targetPath.$path)) create_folder($targetPath.$path,false);
-	    $info=pathinfo($name);
-	    if(!endsWith($targetPath,$path))
-		if(!create_img($targetFile, $targetPath.$path.$relative_image_creation_name_to_prepend[$k].$info['filename'].$relative_image_creation_name_to_append[$k].".".$info['extension'], $relative_image_creation_width[$k], $relative_image_creation_height[$k]))
-		    $all_ok=false;
+    $all_ok = true;
+    if ($relative_image_creation) {
+	foreach ($relative_path_from_current_pos as $k=>$path) {
+	    if ($path != "" && $path[strlen($path) - 1] != "/") $path .= "/";
+	    if (!file_exists($targetPath.$path)) create_folder($targetPath.$path, false);
+	    $info = pathinfo($name);
+	    if (!endsWith($targetPath, $path))
+		if (!create_img($targetFile, $targetPath.$path.$relative_image_creation_name_to_prepend[$k].$info['filename'].$relative_image_creation_name_to_append[$k].".".$info['extension'], $relative_image_creation_width[$k], $relative_image_creation_height[$k]))
+		    $all_ok = false;
 	}
     }
 
     //create fixed thumbs
-    if($fixed_image_creation){
-	foreach($fixed_path_from_filemanager as $k=>$path){
-	    if($path!="" && $path[strlen($path)-1]!="/") $path.="/";
-	    $base_dir=$path.substr_replace($targetPath, '', 0, strlen($current_path));
-	    if (!file_exists($base_dir)) create_folder($base_dir,false);
-	    $info=pathinfo($name);
-	    if(!create_img($targetFile, $base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'], $fixed_image_creation_width[$k], $fixed_image_creation_height[$k]))
-		$all_ok=false;
+    if ($fixed_image_creation) {
+	foreach ($fixed_path_from_filemanager as $k=>$path) {
+	    if ($path != "" && $path[strlen($path) - 1] != "/") $path .= "/";
+	    $base_dir = $path.substr_replace($targetPath, '', 0, strlen($current_path));
+	    if (!file_exists($base_dir)) create_folder($base_dir, false);
+	    $info = pathinfo($name);
+	    if (!create_img($targetFile, $base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'], $fixed_image_creation_width[$k], $fixed_image_creation_height[$k]))
+		$all_ok = false;
 	}
     }
     return $all_ok;
@@ -323,18 +323,18 @@ 
 }
 
 // test for dir/file writability properly
-function is_really_writable($dir){
+function is_really_writable($dir) {
     $dir = rtrim($dir, '/');
     // linux, safe off
-    if (DIRECTORY_SEPARATOR === '/' && @ini_get("safe_mode") == FALSE){
+    if (DIRECTORY_SEPARATOR === '/' && @ini_get("safe_mode") == FALSE) {
         return is_writable($dir);
     }
 
     // Windows, safe ON. (have to write a file :S)
-    if (is_dir($dir)){
-        $dir = $dir.'/'.md5(mt_rand(1,1000).mt_rand(1,1000));
+    if (is_dir($dir)) {
+        $dir = $dir.'/'.md5(mt_rand(1, 1000).mt_rand(1, 1000));
 
-        if (($fp = @fopen($dir, 'ab')) === FALSE){
+        if (($fp = @fopen($dir, 'ab')) === FALSE) {
             return FALSE;
         }
 
@@ -343,7 +343,7 @@ 
         @unlink($dir);
         return TRUE;
     }
-    elseif ( ! is_file($dir) || ($fp = @fopen($dir, 'ab')) === FALSE){
+    elseif (!is_file($dir) || ($fp = @fopen($dir, 'ab')) === FALSE) {
         return FALSE;
     }
 
@@ -358,7 +358,7 @@ 
  * Returns TRUE if callable and everything is OK
  * Otherwise returns FALSE
  */
-function is_function_callable($name){
+function is_function_callable($name) {
     if (function_exists($name) === FALSE) return FALSE;
     $disabled = explode(',', ini_get('disable_functions'));
     return !in_array($name, $disabled);
@@ -367,24 +367,24 @@ 
 // recursivly copies everything
 function rcopy($source, $destination, $is_rec = FALSE) {
     if (is_dir($source)) {
-        if ($is_rec === FALSE){
+        if ($is_rec === FALSE) {
             $pinfo = pathinfo($source);
             $destination = rtrim($destination, '/').DIRECTORY_SEPARATOR.$pinfo['basename'];
         }
-        if (is_dir($destination) === FALSE){
+        if (is_dir($destination) === FALSE) {
             mkdir($destination, 0777, true);
         }
 
         $files = scandir($source);
-        foreach ($files as $file){
+        foreach ($files as $file) {
             if ($file !== "." && $file !== "..") {
                 rcopy($source.DIRECTORY_SEPARATOR.$file, rtrim($destination, '/').DIRECTORY_SEPARATOR.$file, TRUE);
             }
         }
     }
     else {
-        if (file_exists($source)){
-            if (is_dir($destination) === TRUE){
+        if (file_exists($source)) {
+            if (is_dir($destination) === TRUE) {
                 $pinfo = pathinfo($source);
                 $dest2 = rtrim($destination, '/').DIRECTORY_SEPARATOR.$pinfo['basename'];
             }
@@ -403,24 +403,24 @@ 
 // Need more feedback from users and refactor if needed
 function rrename($source, $destination, $is_rec = FALSE) {
     if (is_dir($source)) {
-        if ($is_rec === FALSE){
+        if ($is_rec === FALSE) {
             $pinfo = pathinfo($source);
             $destination = rtrim($destination, '/').DIRECTORY_SEPARATOR.$pinfo['basename'];
         }
-        if (is_dir($destination) === FALSE){
+        if (is_dir($destination) === FALSE) {
             mkdir($destination, 0777, true);
         }
 
         $files = scandir($source);
-        foreach ($files as $file){
+        foreach ($files as $file) {
             if ($file !== "." && $file !== "..") {
                 rrename($source.DIRECTORY_SEPARATOR.$file, rtrim($destination, '/').DIRECTORY_SEPARATOR.$file, TRUE);
             }
         }
     }
     else {
-        if (file_exists($source)){
-            if (is_dir($destination) === TRUE){
+        if (file_exists($source)) {
+            if (is_dir($destination) === TRUE) {
                 $pinfo = pathinfo($source);
                 $dest2 = rtrim($destination, '/').DIRECTORY_SEPARATOR.$pinfo['basename'];
             }
@@ -441,7 +441,7 @@ 
 
     foreach ($files as $file) {
         if ($file !== "." && $file !== "..") {
-            if (is_dir($source.DIRECTORY_SEPARATOR.$file)){
+            if (is_dir($source.DIRECTORY_SEPARATOR.$file)) {
                 rrename_after_cleaner($source.DIRECTORY_SEPARATOR.$file);
             }
             else {
@@ -453,12 +453,12 @@ 
     return rmdir($source);
 }
 
-function debugger($input, $trace = false, $halt = fale){
+function debugger($input, $trace = false, $halt = fale) {
     \Xmf\Debug::dump($input);
-    if ($trace){
+    if ($trace) {
          \Xmf\Debug::backtrace();
     }
-    if ($halt){
+    if ($halt) {
         exit();
     }
 }

Braces +89 added lines, -63 removed lines

@@ -1,13 +1,23 @@ 
 <?php
 
-if($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") die('forbiden');
+if($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") {
+    die('forbiden');
+}
 
 function deleteDir($dir) {
-    if (!file_exists($dir)) return true;
-    if (!is_dir($dir)) return unlink($dir);
+    if (!file_exists($dir)) {
+        return true;
+    }
+    if (!is_dir($dir)) {
+        return unlink($dir);
+    }
     foreach (scandir($dir) as $item) {
-        if ($item === '.' || $item === '..') continue;
-        if (!deleteDir($dir.DIRECTORY_SEPARATOR.$item)) return false;
+        if ($item === '.' || $item === '..') {
+            continue;
+        }
+        if (!deleteDir($dir.DIRECTORY_SEPARATOR.$item)) {
+            return false;
+        }
     }
     return rmdir($dir);
 }
@@ -16,7 +26,9 @@ 
     if(file_exists($old_path)){
 	$info=pathinfo($old_path);
 	$new_path=$info['dirname']."/".$name.".".$info['extension'];
-	if(file_exists($new_path)) return false;
+	if(file_exists($new_path)) {
+	    return false;
+	}
 	return copy($old_path,$new_path);
     }
 }
@@ -26,7 +38,9 @@ 
     if(file_exists($old_path)){
 	$info=pathinfo($old_path);
 	$new_path=$info['dirname']."/".$name.".".$info['extension'];
-	if(file_exists($new_path)) return false;
+	if(file_exists($new_path)) {
+	    return false;
+	}
 	return rename($old_path,$new_path);
     }
 }
@@ -35,7 +49,9 @@ 
     $name=fix_filename($name,$transliteration);
     if(file_exists($old_path)){
 	$new_path=fix_dirname($old_path)."/".$name;
-	if(file_exists($new_path)) return false;
+	if(file_exists($new_path)) {
+	    return false;
+	}
 	return rename($old_path,$new_path);
     }
 }
@@ -58,7 +74,7 @@ 
 	$magicianObj -> resizeImage($newwidth, $newheight, 'auto');
 	$magicianObj -> saveImage($imgthumb,80);
 	return true;
-    }else{
+    } else{
 	return false;
     }
 }
@@ -84,8 +100,7 @@ 
             if (is_dir($currentFile)) {
                 $size = foldersize($currentFile);
                 $total_size += $size;
-            }
-            else {
+            } else {
                 $size = filesize($currentFile);
                 $total_size += $size;
             }
@@ -106,8 +121,7 @@ 
             if (is_dir($currentFile)) {
                 $size = filescount($currentFile);
                 $total_count += $size;
-            }
-            else {
+            } else {
                 $total_count += 1;
             }
         }
@@ -118,19 +132,24 @@ 
 
 function create_folder($path=false,$path_thumbs=false){
     $oldumask = umask(0);
-    if ($path && !file_exists($path))
-        mkdir($path, 0777, true); // or even 01777 so you get the sticky bit set
-    if($path_thumbs && !file_exists($path_thumbs))
-        mkdir($path_thumbs, 0777, true) or die("$path_thumbs cannot be found"); // or even 01777 so you get the sticky bit set
+    if ($path && !file_exists($path)) {
+            mkdir($path, 0777, true);
+    }
+    // or even 01777 so you get the sticky bit set
+    if($path_thumbs && !file_exists($path_thumbs)) {
+            mkdir($path_thumbs, 0777, true) or die("$path_thumbs cannot be found");
+    }
+    // or even 01777 so you get the sticky bit set
     umask($oldumask);
 }
 
 function check_files_extensions_on_path($path,$ext){
     if(!is_dir($path)){
 	$fileinfo = pathinfo($path);
-	if(!in_array(mb_strtolower($fileinfo['extension']),$ext))
-	    unlink($path);
-    }else{
+	if(!in_array(mb_strtolower($fileinfo['extension']),$ext)) {
+		    unlink($path);
+	}
+    } else{
 	$files = scandir($path);
 	foreach($files as $file){
 	    check_files_extensions_on_path(trim($path,'/')."/".$file,$ext);
@@ -147,8 +166,7 @@ 
             {
                 $files[] = $basepath.$file->getFileName( );
             }
-        }
-        else if( $file->isDir() )
+        } else if( $file->isDir() )
         {
             $iterator = new DirectoryIterator( $file );
             check_files_extensions_on_phar($iterator, $files, $basepath.$file->getFileName().'/', $ext);
@@ -165,8 +183,7 @@ 
     	if( function_exists( 'transliterator_transliterate' ) )
     	{
     	   $str = transliterator_transliterate( 'Accents-Any', $str );
-    	}
-    	else
+    	} else
     	{
     	   $str = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);
     	}
@@ -193,29 +210,32 @@ 
 }
 
 function fix_strtoupper($str){
-    if( function_exists( 'mb_strtoupper' ) )
-	return mb_strtoupper($str);
-    else
-	return strtoupper($str);
-}
+    if( function_exists( 'mb_strtoupper' ) ) {
+    	return mb_strtoupper($str);
+    } else {
+    	return strtoupper($str);
+    }
+    }
 
 
 function fix_strtolower($str){
-    if( function_exists( 'mb_strtoupper' ) )
-	return mb_strtolower($str);
-    else
-	return strtolower($str);
-}
+    if( function_exists( 'mb_strtoupper' ) ) {
+    	return mb_strtolower($str);
+    } else {
+    	return strtolower($str);
+    }
+    }
 
 function fix_path($path,$transliteration){
     $info=pathinfo($path);
     $tmp_path = $info['dirname'];
 	$str=fix_filename($info['filename'],$transliteration);
-    if($tmp_path!="")
-		return $tmp_path.DIRECTORY_SEPARATOR.$str;
-    else
-		return $str;
-}
+    if($tmp_path!="") {
+    		return $tmp_path.DIRECTORY_SEPARATOR.$str;
+    } else {
+    		return $str;
+    }
+    }
 
 function base_url(){
   return sprintf(
@@ -256,13 +276,13 @@ 
                 ini_set('memory_limit',((int)($memory_needed/1024/1024)+5) . 'M');
                 if(ini_get('memory_limit') == ((int)($memory_needed/1024/1024)+5) . 'M'){
                 return true;
-            }else{
+            } else{
                 return false;
             }
-        }else{
+        } else{
             return true;
         }
-	    }else{
+	    } else{
 	    return false;
     }
 }
@@ -277,24 +297,34 @@ 
     $all_ok=true;
     if($relative_image_creation){
 	foreach($relative_path_from_current_pos as $k=>$path){
-	    if($path!="" && $path[strlen($path)-1]!="/") $path.="/";
-	    if (!file_exists($targetPath.$path)) create_folder($targetPath.$path,false);
+	    if($path!="" && $path[strlen($path)-1]!="/") {
+	        $path.="/";
+	    }
+	    if (!file_exists($targetPath.$path)) {
+	        create_folder($targetPath.$path,false);
+	    }
 	    $info=pathinfo($name);
-	    if(!endsWith($targetPath,$path))
-		if(!create_img($targetFile, $targetPath.$path.$relative_image_creation_name_to_prepend[$k].$info['filename'].$relative_image_creation_name_to_append[$k].".".$info['extension'], $relative_image_creation_width[$k], $relative_image_creation_height[$k]))
+	    if(!endsWith($targetPath,$path)) {
+	    		if(!create_img($targetFile, $targetPath.$path.$relative_image_creation_name_to_prepend[$k].$info['filename'].$relative_image_creation_name_to_append[$k].".".$info['extension'], $relative_image_creation_width[$k], $relative_image_creation_height[$k]))
 		    $all_ok=false;
+	    }
 	}
     }
 
     //create fixed thumbs
     if($fixed_image_creation){
 	foreach($fixed_path_from_filemanager as $k=>$path){
-	    if($path!="" && $path[strlen($path)-1]!="/") $path.="/";
+	    if($path!="" && $path[strlen($path)-1]!="/") {
+	        $path.="/";
+	    }
 	    $base_dir=$path.substr_replace($targetPath, '', 0, strlen($current_path));
-	    if (!file_exists($base_dir)) create_folder($base_dir,false);
+	    if (!file_exists($base_dir)) {
+	        create_folder($base_dir,false);
+	    }
 	    $info=pathinfo($name);
-	    if(!create_img($targetFile, $base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'], $fixed_image_creation_width[$k], $fixed_image_creation_height[$k]))
-		$all_ok=false;
+	    if(!create_img($targetFile, $base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'], $fixed_image_creation_width[$k], $fixed_image_creation_height[$k])) {
+	    		$all_ok=false;
+	    }
 	}
     }
     return $all_ok;
@@ -342,8 +372,7 @@ 
         @chmod($dir, 0777);
         @unlink($dir);
         return TRUE;
-    }
-    elseif ( ! is_file($dir) || ($fp = @fopen($dir, 'ab')) === FALSE){
+    } elseif ( ! is_file($dir) || ($fp = @fopen($dir, 'ab')) === FALSE){
         return FALSE;
     }
 
@@ -359,7 +388,9 @@ 
  * Otherwise returns FALSE
  */
 function is_function_callable($name){
-    if (function_exists($name) === FALSE) return FALSE;
+    if (function_exists($name) === FALSE) {
+        return FALSE;
+    }
     $disabled = explode(',', ini_get('disable_functions'));
     return !in_array($name, $disabled);
 }
@@ -381,14 +412,12 @@ 
                 rcopy($source.DIRECTORY_SEPARATOR.$file, rtrim($destination, '/').DIRECTORY_SEPARATOR.$file, TRUE);
             }
         }
-    }
-    else {
+    } else {
         if (file_exists($source)){
             if (is_dir($destination) === TRUE){
                 $pinfo = pathinfo($source);
                 $dest2 = rtrim($destination, '/').DIRECTORY_SEPARATOR.$pinfo['basename'];
-            }
-            else {
+            } else {
                 $dest2 = $destination;
             }
 
@@ -417,14 +446,12 @@ 
                 rrename($source.DIRECTORY_SEPARATOR.$file, rtrim($destination, '/').DIRECTORY_SEPARATOR.$file, TRUE);
             }
         }
-    }
-    else {
+    } else {
         if (file_exists($source)){
             if (is_dir($destination) === TRUE){
                 $pinfo = pathinfo($source);
                 $dest2 = rtrim($destination, '/').DIRECTORY_SEPARATOR.$pinfo['basename'];
-            }
-            else {
+            } else {
                 $dest2 = $destination;
             }
 
@@ -443,8 +470,7 @@ 
         if ($file !== "." && $file !== "..") {
             if (is_dir($source.DIRECTORY_SEPARATOR.$file)){
                 rrename_after_cleaner($source.DIRECTORY_SEPARATOR.$file);
-            }
-            else {
+            } else {
                 unlink($source.DIRECTORY_SEPARATOR.$file);
             }
         }

htdocs/class/xoopseditor/tinymce4/external_plugins/filemanager/dialog.php

Indentation +182 added lines, -182 removed lines

@@ -24,8 +24,8 @@ 
 
 if($subdir==""){
     if(!empty($_COOKIE['last_position'])
-	&& strpos($_COOKIE['last_position'],'.')===FALSE)
-	$subdir= trim($_COOKIE['last_position']);
+    && strpos($_COOKIE['last_position'],'.')===FALSE)
+    $subdir= trim($_COOKIE['last_position']);
 }
 
 if($subdir==="/"){
@@ -47,7 +47,7 @@ 
 if(!file_exists($current_path . $rfm_subfolder.$subdir)){
     $subdir='';
     if(!file_exists($current_path . $rfm_subfolder.$subdir)){
-	$rfm_subfolder="";
+    $rfm_subfolder="";
     }
 }
     
@@ -70,8 +70,8 @@ 
     $i++;
     if($parent==="./") $parent="";
     if(file_exists($current_path.$parent."config.php")){
-	require_once($current_path.$parent."config.php");
-	$cycle=false;
+    require_once($current_path.$parent."config.php");
+    $cycle=false;
     }
     
     if($parent=="") $cycle=false;
@@ -116,7 +116,7 @@ 
         $language_file = 'lang/' .$path_parts['basename']. '.php';
     }
     else {
-    	echo "<script>console.log('The ".$lang." language file is not readable! Falling back...');</script>";
+        echo "<script>console.log('The ".$lang." language file is not readable! Falling back...');</script>";
     }
 }
 
@@ -154,20 +154,20 @@ 
         <link href="css/style.css" rel="stylesheet" type="text/css" />
 	<link href="css/dropzone.min.css" type="text/css" rel="stylesheet" />
 	<?php
-	$sprite_lang_file = 'img/spritemap_'.$lang.'.png';
-	$sprite_lang_file2 = 'img/spritemap@2x_'.$lang.'.png';
+    $sprite_lang_file = 'img/spritemap_'.$lang.'.png';
+    $sprite_lang_file2 = 'img/spritemap@2x_'.$lang.'.png';
 	
-	if ( ! file_exists($sprite_lang_file) || ! file_exists($sprite_lang_file2)){
-		//fallback
-		$sprite_lang_file = 'img/spritemap_en_EN.png';
-		$sprite_lang_file2 = 'img/spritemap@2x_en_EN.png';
-		if ( ! file_exists($sprite_lang_file) || ! file_exists($sprite_lang_file2)){
-			// we are in deep ****
-			echo '<script>console.log("Error: Spritemap not found!");</script>';
-			// exit();
-		}
-	}
-	?>
+    if ( ! file_exists($sprite_lang_file) || ! file_exists($sprite_lang_file2)){
+        //fallback
+        $sprite_lang_file = 'img/spritemap_en_EN.png';
+        $sprite_lang_file2 = 'img/spritemap@2x_en_EN.png';
+        if ( ! file_exists($sprite_lang_file) || ! file_exists($sprite_lang_file2)){
+            // we are in deep ****
+            echo '<script>console.log("Error: Spritemap not found!");</script>';
+            // exit();
+        }
+    }
+    ?>
 	<style>
 		.dropzone .dz-default.dz-message,
 		.dropzone .dz-preview .dz-error-mark,
@@ -219,8 +219,8 @@ 
 	<script type="text/javascript" src="js/imagesloaded.pkgd.min.js"></script>
 	<script type="text/javascript" src="js/jquery.queryloader2.min.js"></script>
 	<?php
-	if($aviary_active){
-	if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443) { ?>
+    if($aviary_active){
+    if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443) { ?>
 	    <script type="text/javascript" src="https://dme0ih8comzn4.cloudfront.net/js/feather.js"></script>
 	<?php }else{ ?>
 	    <script type="text/javascript" src="http://feather.aviary.com/js/feather.js "></script>
@@ -402,16 +402,16 @@ 
     if($file===".") $current_folder=array('file'=>$file);
     elseif($file==="..") $prev_folder=array('file'=>$file);
     elseif(is_dir($current_path.$rfm_subfolder.$subdir.$file)){
-	$date=filemtime($current_path.$rfm_subfolder.$subdir. $file);
-	$size=foldersize($current_path.$rfm_subfolder.$subdir. $file);
-	$file_ext=lang_Type_dir;
-	$sorted[$k]=array('file'=>$file,'date'=>$date,'size'=>$size,'extension'=>$file_ext);
+    $date=filemtime($current_path.$rfm_subfolder.$subdir. $file);
+    $size=foldersize($current_path.$rfm_subfolder.$subdir. $file);
+    $file_ext=lang_Type_dir;
+    $sorted[$k]=array('file'=>$file,'date'=>$date,'size'=>$size,'extension'=>$file_ext);
     }else{
-	$file_path=$current_path.$rfm_subfolder.$subdir.$file;
-	$date=filemtime($file_path);
-	$size=filesize($file_path);
-	$file_ext = substr(strrchr($file,'.'),1);
-	$sorted[$k]=array('file'=>$file,'date'=>$date,'size'=>$size,'extension'=>$file_ext);
+    $file_path=$current_path.$rfm_subfolder.$subdir.$file;
+    $date=filemtime($file_path);
+    $size=filesize($file_path);
+    $file_ext = substr(strrchr($file,'.'),1);
+    $sorted[$k]=array('file'=>$file,'date'=>$date,'size'=>$size,'extension'=>$file_ext);
     }
 }
 
@@ -430,19 +430,19 @@ 
 
 switch($sort_by){
     case 'name':
-	usort($sorted, 'filenameSort');
-	break;
+    usort($sorted, 'filenameSort');
+    break;
     case 'date':
-	usort($sorted, 'dateSort');
-	break;
+    usort($sorted, 'dateSort');
+    break;
     case 'size':
-	usort($sorted, 'sizeSort');
-	break;
+    usort($sorted, 'sizeSort');
+    break;
     case 'extension':
-	usort($sorted, 'extensionSort');
-	break;
+    usort($sorted, 'extensionSort');
+    break;
     default:
-	break;
+    break;
     
 }
 
@@ -517,24 +517,24 @@ 
     
     <div class="row-fluid">
 	<?php	
-	$link="dialog.php?".$get_params;
-	?>
+    $link="dialog.php?".$get_params;
+    ?>
 	<ul class="breadcrumb">	
 	<li class="pull-left"><a href="<?php echo $link?>/"><i class="icon-home"></i></a></li>
 	<li><span class="divider">/</span></li>
 	<?php
-	$bc=explode("/",$subdir);
-	$tmp_path='';
-	if(!empty($bc))
-	foreach($bc as $k=>$b){ 
-		$tmp_path.=$b."/";
-		if($k==count($bc)-2){
-	?> <li class="active"><?php echo $b?></li><?php
-		}elseif($b!=""){ ?>
+    $bc=explode("/",$subdir);
+    $tmp_path='';
+    if(!empty($bc))
+    foreach($bc as $k=>$b){ 
+        $tmp_path.=$b."/";
+        if($k==count($bc)-2){
+    ?> <li class="active"><?php echo $b?></li><?php
+        }elseif($b!=""){ ?>
 		<li><a href="<?php echo $link.$tmp_path?>"><?php echo $b?></a></li><li><span class="divider"><?php echo "/"; ?></span></li>
 	<?php }
-	}
-	?>
+    }
+    ?>
 	<li class="pull-right"><a class="btn-small" href="javascript:void('')" id="info"><i class="icon-question-sign"></i></a></li>
 	<li class="pull-right"><a id="refresh" class="btn-small" href="dialog.php?<?php echo $get_params.$subdir."&".uniqid() ?>"><i class="icon-refresh"></i></a></li>
 	
@@ -583,39 +583,39 @@ 
 	    <ul class="grid cs-style-2 <?php echo "list-view".$view; ?>" id="main-item-container">
 		<?php
 		
-		$jplayer_ext=array("mp4","flv","webmv","webma","webm","m4a","m4v","ogv","oga","mp3","midi","mid","ogg","wav");
-		foreach ($files as $file_array) {
-		    $file=$file_array['file'];
-			if($file === '.' || (isset($file_array['extension']) && $file_array['extension']!=lang_Type_dir) || ($file === '..' && $subdir == '') || in_array($file, $hidden_folders) || ($filter!='' && $file!==".." && strpos($file,$filter)===false))
-			    continue;
-			$new_name=fix_filename($file,$transliteration);
-			if($file!=='..' && $file!=$new_name){
-			    //rename
-			    rename_folder($current_path.$subdir.$new_name,$new_name,$transliteration);
-			    $file=$new_name;
-			}
-			//add in thumbs folder if not exist 
-			if (!file_exists($thumbs_path.$subdir.$file)) create_folder(false,$thumbs_path.$subdir.$file);
-			$class_ext = 3;			
-			if($file==='..' && trim($subdir) != '' ){
-			    $src = explode("/",$subdir);
-			    unset($src[count($src)-2]);
-			    $src=implode("/",$src);
-			    if($src==='') $src="/";
-			}
-			elseif ($file!=='..') {
-			    $src = $subdir . $file."/";
-			}
+        $jplayer_ext=array("mp4","flv","webmv","webma","webm","m4a","m4v","ogv","oga","mp3","midi","mid","ogg","wav");
+        foreach ($files as $file_array) {
+            $file=$file_array['file'];
+            if($file === '.' || (isset($file_array['extension']) && $file_array['extension']!=lang_Type_dir) || ($file === '..' && $subdir == '') || in_array($file, $hidden_folders) || ($filter!='' && $file!==".." && strpos($file,$filter)===false))
+                continue;
+            $new_name=fix_filename($file,$transliteration);
+            if($file!=='..' && $file!=$new_name){
+                //rename
+                rename_folder($current_path.$subdir.$new_name,$new_name,$transliteration);
+                $file=$new_name;
+            }
+            //add in thumbs folder if not exist 
+            if (!file_exists($thumbs_path.$subdir.$file)) create_folder(false,$thumbs_path.$subdir.$file);
+            $class_ext = 3;			
+            if($file==='..' && trim($subdir) != '' ){
+                $src = explode("/",$subdir);
+                unset($src[count($src)-2]);
+                $src=implode("/",$src);
+                if($src==='') $src="/";
+            }
+            elseif ($file!=='..') {
+                $src = $subdir . $file."/";
+            }
 			
-			?>
+            ?>
 			    <li data-name="<?php echo $file ?>" <?php if($file==='..') echo 'class="back"'; else echo 'class="dir"'; ?>><?php
-			    $file_prevent_rename = false;
-			    $file_prevent_delete = false;
-			    if (isset($filePermissions[$file])) {
-				$file_prevent_rename = isset($filePermissions[$file]['prevent_rename']) && $filePermissions[$file]['prevent_rename'];
-				$file_prevent_delete = isset($filePermissions[$file]['prevent_delete']) && $filePermissions[$file]['prevent_delete'];
-			    }
-			    ?>	<figure data-name="<?php echo $file ?>" class="<?php if($file==="..") echo "back-"; ?>directory" data-type="<?php if($file!==".."){ echo "dir"; } ?>">
+                $file_prevent_rename = false;
+                $file_prevent_delete = false;
+                if (isset($filePermissions[$file])) {
+                $file_prevent_rename = isset($filePermissions[$file]['prevent_rename']) && $filePermissions[$file]['prevent_rename'];
+                $file_prevent_delete = isset($filePermissions[$file]['prevent_delete']) && $filePermissions[$file]['prevent_delete'];
+                }
+                ?>	<figure data-name="<?php echo $file ?>" class="<?php if($file==="..") echo "back-"; ?>directory" data-type="<?php if($file!==".."){ echo "dir"; } ?>">
 				    <a class="folder-link" href="dialog.php?<?php echo $get_params.rawurlencode($src)."&".uniqid() ?>">
 				    <div class="img-precontainer">
 					<div class="img-container directory"><span></span>
@@ -657,116 +657,116 @@ 
 			    </figure>
 			</li>
 			<?php
-		    }
+            }
 			
             $files_prevent_duplicate = array();
-		    foreach ($files as $nu=>$file_array) {		
-			$file=$file_array['file'];
+            foreach ($files as $nu=>$file_array) {		
+            $file=$file_array['file'];
 		    
-			    if($file === '.' || $file === '..' || is_dir($current_path.$rfm_subfolder.$subdir.$file) || in_array($file, $hidden_files) || !in_array(fix_strtolower($file_array['extension']), $ext) || ($filter!='' && strpos($file,$filter)===false))
-				    continue;
+                if($file === '.' || $file === '..' || is_dir($current_path.$rfm_subfolder.$subdir.$file) || in_array($file, $hidden_files) || !in_array(fix_strtolower($file_array['extension']), $ext) || ($filter!='' && strpos($file,$filter)===false))
+                    continue;
 			    
-			    $file_path=$current_path.$rfm_subfolder.$subdir.$file;
-			    //check if file have illegal caracter
+                $file_path=$current_path.$rfm_subfolder.$subdir.$file;
+                //check if file have illegal caracter
 			    
-			    $filename=substr($file, 0, '-' . (strlen($file_array['extension']) + 1));
+                $filename=substr($file, 0, '-' . (strlen($file_array['extension']) + 1));
 			    
-			    if($file!=fix_filename($file,$transliteration)){
-				$file1=fix_filename($file,$transliteration);
-				$file_path1=($current_path.$rfm_subfolder.$subdir.$file1);
-				if(file_exists($file_path1)){
-				    $i = 1;
-				    $info=pathinfo($file1);
-				    while(file_exists($current_path.$rfm_subfolder.$subdir.$info['filename'].".[".$i."].".$info['extension'])) {
-					    $i++;
-				    }
-				    $file1=$info['filename'].".[".$i."].".$info['extension'];
-				    $file_path1=($current_path.$rfm_subfolder.$subdir.$file1);
-				}
+                if($file!=fix_filename($file,$transliteration)){
+                $file1=fix_filename($file,$transliteration);
+                $file_path1=($current_path.$rfm_subfolder.$subdir.$file1);
+                if(file_exists($file_path1)){
+                    $i = 1;
+                    $info=pathinfo($file1);
+                    while(file_exists($current_path.$rfm_subfolder.$subdir.$info['filename'].".[".$i."].".$info['extension'])) {
+                        $i++;
+                    }
+                    $file1=$info['filename'].".[".$i."].".$info['extension'];
+                    $file_path1=($current_path.$rfm_subfolder.$subdir.$file1);
+                }
 				
-				$filename=substr($file1, 0, '-' . (strlen($file_array['extension']) + 1));
-				rename_file($file_path,fix_filename($filename,$transliteration),$transliteration);
-				$file=$file1;
-				$file_array['extension']=fix_filename($file_array['extension'],$transliteration);
-				$file_path=$file_path1;
-			    }
+                $filename=substr($file1, 0, '-' . (strlen($file_array['extension']) + 1));
+                rename_file($file_path,fix_filename($filename,$transliteration),$transliteration);
+                $file=$file1;
+                $file_array['extension']=fix_filename($file_array['extension'],$transliteration);
+                $file_path=$file_path1;
+                }
 			    
-			    $is_img=false;
-			    $is_video=false;
-			    $is_audio=false;
-			    $show_original=false;
-			    $show_original_mini=false;
-			    $mini_src="";
-			    $src_thumb="";
-			    $extension_lower=fix_strtolower($file_array['extension']);
-			    if(in_array($extension_lower, $ext_img)){
-				$src = $base_url . $cur_dir . rawurlencode($file);
-				$mini_src = $src_thumb = $thumbs_path.$subdir. $file;
-				//add in thumbs folder if not exist
-				if(!file_exists($src_thumb)){
-				    try {
-					create_img_gd($file_path, $src_thumb, 122, 91);
-					new_thumbnails_creation($current_path.$rfm_subfolder.$subdir,$file_path,$file,$current_path,$relative_image_creation,$relative_path_from_current_pos,$relative_image_creation_name_to_prepend,$relative_image_creation_name_to_append,$relative_image_creation_width,$relative_image_creation_height,$fixed_image_creation,$fixed_path_from_filemanager,$fixed_image_creation_name_to_prepend,$fixed_image_creation_to_append,$fixed_image_creation_width,$fixed_image_creation_height);
-				    } catch (Exception $e) {
-					$src_thumb=$mini_src="";
-				    }
-				}
-				$is_img=true;
-				//check if is smaller than thumb
-				list($img_width, $img_height, $img_type, $attr)=getimagesize($file_path);
-				if($img_width<122 && $img_height<91){ 
-					$src_thumb=$current_path.$rfm_subfolder.$subdir.$file;
-					$show_original=true;
-				}
+                $is_img=false;
+                $is_video=false;
+                $is_audio=false;
+                $show_original=false;
+                $show_original_mini=false;
+                $mini_src="";
+                $src_thumb="";
+                $extension_lower=fix_strtolower($file_array['extension']);
+                if(in_array($extension_lower, $ext_img)){
+                $src = $base_url . $cur_dir . rawurlencode($file);
+                $mini_src = $src_thumb = $thumbs_path.$subdir. $file;
+                //add in thumbs folder if not exist
+                if(!file_exists($src_thumb)){
+                    try {
+                    create_img_gd($file_path, $src_thumb, 122, 91);
+                    new_thumbnails_creation($current_path.$rfm_subfolder.$subdir,$file_path,$file,$current_path,$relative_image_creation,$relative_path_from_current_pos,$relative_image_creation_name_to_prepend,$relative_image_creation_name_to_append,$relative_image_creation_width,$relative_image_creation_height,$fixed_image_creation,$fixed_path_from_filemanager,$fixed_image_creation_name_to_prepend,$fixed_image_creation_to_append,$fixed_image_creation_width,$fixed_image_creation_height);
+                    } catch (Exception $e) {
+                    $src_thumb=$mini_src="";
+                    }
+                }
+                $is_img=true;
+                //check if is smaller than thumb
+                list($img_width, $img_height, $img_type, $attr)=getimagesize($file_path);
+                if($img_width<122 && $img_height<91){ 
+                    $src_thumb=$current_path.$rfm_subfolder.$subdir.$file;
+                    $show_original=true;
+                }
 				
-				if($img_width<45 && $img_height<38){
-				    $mini_src=$current_path.$rfm_subfolder.$subdir.$file;
-				    $show_original_mini=true;
-				}
-			    }
+                if($img_width<45 && $img_height<38){
+                    $mini_src=$current_path.$rfm_subfolder.$subdir.$file;
+                    $show_original_mini=true;
+                }
+                }
 			    
-			    $is_icon_thumb=false;
-			    $is_icon_thumb_mini=false;
-			    $no_thumb=false;
-			    if($src_thumb==""){
-				$no_thumb=true;
-				if(file_exists('img/'.$icon_theme.'/'.$extension_lower.".jpg")){
-					$src_thumb ='img/'.$icon_theme.'/'.$extension_lower.".jpg";
-				}else{
-					$src_thumb = "img/".$icon_theme."/default.jpg";
-				}
-				$is_icon_thumb=true;
-			    }
-			    if($mini_src==""){
-				$is_icon_thumb_mini=false;
-			    }
+                $is_icon_thumb=false;
+                $is_icon_thumb_mini=false;
+                $no_thumb=false;
+                if($src_thumb==""){
+                $no_thumb=true;
+                if(file_exists('img/'.$icon_theme.'/'.$extension_lower.".jpg")){
+                    $src_thumb ='img/'.$icon_theme.'/'.$extension_lower.".jpg";
+                }else{
+                    $src_thumb = "img/".$icon_theme."/default.jpg";
+                }
+                $is_icon_thumb=true;
+                }
+                if($mini_src==""){
+                $is_icon_thumb_mini=false;
+                }
 			    
-			    $class_ext=0;
-			    if (in_array($extension_lower, $ext_video)) {
-				    $class_ext = 4;
-				    $is_video=true;
-			    }elseif (in_array($extension_lower, $ext_img)) {
-				    $class_ext = 2;
-			    }elseif (in_array($extension_lower, $ext_music)) {
-				    $class_ext = 5;
-				    $is_audio=true;
-			    }elseif (in_array($extension_lower, $ext_misc)) {
-				    $class_ext = 3;
-			    }else{
-				    $class_ext = 1;
-			    }
-			    if((!($_GET['type']==1 && !$is_img) && !(($_GET['type']==3 && !$is_video) && ($_GET['type']==3 && !$is_audio))) && $class_ext>0){
+                $class_ext=0;
+                if (in_array($extension_lower, $ext_video)) {
+                    $class_ext = 4;
+                    $is_video=true;
+                }elseif (in_array($extension_lower, $ext_img)) {
+                    $class_ext = 2;
+                }elseif (in_array($extension_lower, $ext_music)) {
+                    $class_ext = 5;
+                    $is_audio=true;
+                }elseif (in_array($extension_lower, $ext_misc)) {
+                    $class_ext = 3;
+                }else{
+                    $class_ext = 1;
+                }
+                if((!($_GET['type']==1 && !$is_img) && !(($_GET['type']==3 && !$is_video) && ($_GET['type']==3 && !$is_audio))) && $class_ext>0){
 ?>
 		    <li class="ff-item-type-<?php echo $class_ext; ?> file"  data-name="<?php echo $file; ?>"><?php
-		    $file_prevent_rename = false;
-		    $file_prevent_delete = false;
-		    if (isset($filePermissions[$file])) {
-			if (isset($filePermissions[$file]['prevent_duplicate']) && $filePermissions[$file]['prevent_duplicate']) {
-			    $files_prevent_duplicate[] = $file;
-			}
-			$file_prevent_rename = isset($filePermissions[$file]['prevent_rename']) && $filePermissions[$file]['prevent_rename'];
-			$file_prevent_delete = isset($filePermissions[$file]['prevent_delete']) && $filePermissions[$file]['prevent_delete'];
-		    }
+            $file_prevent_rename = false;
+            $file_prevent_delete = false;
+            if (isset($filePermissions[$file])) {
+            if (isset($filePermissions[$file]['prevent_duplicate']) && $filePermissions[$file]['prevent_duplicate']) {
+                $files_prevent_duplicate[] = $file;
+            }
+            $file_prevent_rename = isset($filePermissions[$file]['prevent_rename']) && $filePermissions[$file]['prevent_rename'];
+            $file_prevent_delete = isset($filePermissions[$file]['prevent_delete']) && $filePermissions[$file]['prevent_delete'];
+            }
             ?>		<figure data-name="<?php echo $file ?>" data-type="<?php if($is_img){ echo "img"; }else{ echo "file"; } ?>">
 				<a href="javascript:void('')" class="link" data-file="<?php echo $file; ?>" data-field_id="<?php echo $field_id; ?>" data-function="<?php echo $apply; ?>">
 				<div class="img-precontainer">
@@ -827,10 +827,10 @@ 
 			</figure>			
 		</li>
 			<?php
-			}
-		    }
+            }
+            }
 		
-	?></div>
+    ?></div>
 	    </ul>
 	    <?php } ?>
 	</div>

Switch Indentation +14 added lines, -14 removed lines

@@ -429,20 +429,20 @@
 }
 
 switch($sort_by){
-    case 'name':
-	usort($sorted, 'filenameSort');
-	break;
-    case 'date':
-	usort($sorted, 'dateSort');
-	break;
-    case 'size':
-	usort($sorted, 'sizeSort');
-	break;
-    case 'extension':
-	usort($sorted, 'extensionSort');
-	break;
-    default:
-	break;
+        case 'name':
+	    usort($sorted, 'filenameSort');
+	    break;
+        case 'date':
+	    usort($sorted, 'dateSort');
+	    break;
+        case 'size':
+	    usort($sorted, 'sizeSort');
+	    break;
+        case 'extension':
+	    usort($sorted, 'extensionSort');
+	    break;
+        default:
+	    break;
     
 }
 

Spacing +247 added lines, -247 removed lines

@@ -1,119 +1,119 @@ 
 <?php
 include('config/config.php');
 
-$_SESSION['RF']["verify"]= "RESPONSIVEfilemanager";
+$_SESSION['RF']["verify"] = "RESPONSIVEfilemanager";
 
-if(isset($_POST['submit'])){
+if (isset($_POST['submit'])) {
 
 include('upload.php');
 
-}else{
+} else {
 
 include('include/utils.php');
 
 if (isset($_GET['fldr'])
     && !empty($_GET['fldr'])
-    && strpos($_GET['fldr'],'../')===FALSE
-    && strpos($_GET['fldr'],'./')===FALSE)
-    $subdir = urldecode(trim(strip_tags($_GET['fldr']),"/") ."/");
+    && strpos($_GET['fldr'], '../') === FALSE
+    && strpos($_GET['fldr'], './') === FALSE)
+    $subdir = urldecode(trim(strip_tags($_GET['fldr']), "/")."/");
 else
     $subdir = '';
     
 //remember last position
-setcookie('last_position',$subdir,time() + (86400 * 7)); 
+setcookie('last_position', $subdir, time() + (86400 * 7)); 
 
-if($subdir==""){
-    if(!empty($_COOKIE['last_position'])
-	&& strpos($_COOKIE['last_position'],'.')===FALSE)
-	$subdir= trim($_COOKIE['last_position']);
+if ($subdir == "") {
+    if (!empty($_COOKIE['last_position'])
+	&& strpos($_COOKIE['last_position'], '.') === FALSE)
+	$subdir = trim($_COOKIE['last_position']);
 }
 
-if($subdir==="/"){
-    $subdir="";
+if ($subdir === "/") {
+    $subdir = "";
 }
 
 
 /***
  *SUB-DIR CODE
  ***/
-if(!isset($_SESSION['RF']["subfolder"])) $_SESSION['RF']["subfolder"]='';
+if (!isset($_SESSION['RF']["subfolder"])) $_SESSION['RF']["subfolder"] = '';
 $rfm_subfolder = '';
-if(!empty($_SESSION['RF']["subfolder"]) && strpos($_SESSION['RF']["subfolder"],'../')===FALSE
-   && strpos($_SESSION['RF']["subfolder"],'./')===FALSE && strpos($_SESSION['RF']["subfolder"],"/")!==0
-    && strpos($_SESSION['RF']["subfolder"],'.')===FALSE) $rfm_subfolder= $_SESSION['RF']['subfolder'];
+if (!empty($_SESSION['RF']["subfolder"]) && strpos($_SESSION['RF']["subfolder"], '../') === FALSE
+   && strpos($_SESSION['RF']["subfolder"], './') === FALSE && strpos($_SESSION['RF']["subfolder"], "/") !== 0
+    && strpos($_SESSION['RF']["subfolder"], '.') === FALSE) $rfm_subfolder = $_SESSION['RF']['subfolder'];
    
-if($rfm_subfolder!="" && $rfm_subfolder[strlen($rfm_subfolder)-1]!=="/") $rfm_subfolder.="/";
+if ($rfm_subfolder != "" && $rfm_subfolder[strlen($rfm_subfolder) - 1] !== "/") $rfm_subfolder .= "/";
    
-if(!file_exists($current_path . $rfm_subfolder.$subdir)){
-    $subdir='';
-    if(!file_exists($current_path . $rfm_subfolder.$subdir)){
-	$rfm_subfolder="";
+if (!file_exists($current_path.$rfm_subfolder.$subdir)) {
+    $subdir = '';
+    if (!file_exists($current_path.$rfm_subfolder.$subdir)) {
+	$rfm_subfolder = "";
     }
 }
     
-if(trim($rfm_subfolder)==""){
-    $cur_dir = $upload_dir . $subdir;
-    $cur_path = $current_path . $subdir;
+if (trim($rfm_subfolder) == "") {
+    $cur_dir = $upload_dir.$subdir;
+    $cur_path = $current_path.$subdir;
     $thumbs_path = $thumbs_base_path;
-    $parent=$subdir;
-}else{
-    $cur_dir = $upload_dir . $rfm_subfolder.$subdir;
-    $cur_path = $current_path . $rfm_subfolder.$subdir;
-    $thumbs_path = $thumbs_base_path. $rfm_subfolder;
-    $parent=$rfm_subfolder.$subdir;
+    $parent = $subdir;
+} else {
+    $cur_dir = $upload_dir.$rfm_subfolder.$subdir;
+    $cur_path = $current_path.$rfm_subfolder.$subdir;
+    $thumbs_path = $thumbs_base_path.$rfm_subfolder;
+    $parent = $rfm_subfolder.$subdir;
 }
 
-$cycle=true;
-$max_cycles=50;
-$i=0;
-while($cycle && $i<$max_cycles){
+$cycle = true;
+$max_cycles = 50;
+$i = 0;
+while ($cycle && $i < $max_cycles) {
     $i++;
-    if($parent==="./") $parent="";
-    if(file_exists($current_path.$parent."config.php")){
+    if ($parent === "./") $parent = "";
+    if (file_exists($current_path.$parent."config.php")) {
 	require_once($current_path.$parent."config.php");
-	$cycle=false;
+	$cycle = false;
     }
     
-    if($parent=="") $cycle=false;
-    else $parent=fix_dirname($parent)."/";
+    if ($parent == "") $cycle = false;
+    else $parent = fix_dirname($parent)."/";
 }
 
-if(!is_dir($thumbs_path.$subdir)){
+if (!is_dir($thumbs_path.$subdir)) {
     create_folder(false, $thumbs_path.$subdir);
 }
 
-if(isset($_GET['popup'])) $popup= strip_tags($_GET['popup']); else $popup=0;
+if (isset($_GET['popup'])) $popup = strip_tags($_GET['popup']); else $popup = 0;
 //Sanitize popup
-$popup=!!$popup;
+$popup = !!$popup;
 
 //view type
-if(!isset($_SESSION['RF']["view_type"])){ $view=$default_view; $_SESSION['RF']["view_type"] = $view; }
-if(isset($_GET['view'])){ $view=fix_get_params($_GET['view']); $_SESSION['RF']["view_type"] = $view; }
-$view=$_SESSION['RF']["view_type"];
+if (!isset($_SESSION['RF']["view_type"])) { $view = $default_view; $_SESSION['RF']["view_type"] = $view; }
+if (isset($_GET['view'])) { $view = fix_get_params($_GET['view']); $_SESSION['RF']["view_type"] = $view; }
+$view = $_SESSION['RF']["view_type"];
 
-if(isset($_GET["filter"])) $filter=fix_get_params($_GET["filter"]);
-else $filter='';
+if (isset($_GET["filter"])) $filter = fix_get_params($_GET["filter"]);
+else $filter = '';
 
-if(!isset($_SESSION['RF']['sort_by'])) $_SESSION['RF']['sort_by']='';
-if(isset($_GET["sort_by"])) $sort_by=$_SESSION['RF']['sort_by']=fix_get_params($_GET["sort_by"]);
-else $sort_by=$_SESSION['RF']['sort_by'];
+if (!isset($_SESSION['RF']['sort_by'])) $_SESSION['RF']['sort_by'] = '';
+if (isset($_GET["sort_by"])) $sort_by = $_SESSION['RF']['sort_by'] = fix_get_params($_GET["sort_by"]);
+else $sort_by = $_SESSION['RF']['sort_by'];
 
-if(!isset($_SESSION['RF']['descending'])) $_SESSION['RF']['descending']=false;
-if(isset($_GET["descending"])) $descending=$_SESSION['RF']['descending']=fix_get_params($_GET["descending"])==="true";
-else $descending=$_SESSION['RF']['descending'];
+if (!isset($_SESSION['RF']['descending'])) $_SESSION['RF']['descending'] = false;
+if (isset($_GET["descending"])) $descending = $_SESSION['RF']['descending'] = fix_get_params($_GET["descending"]) === "true";
+else $descending = $_SESSION['RF']['descending'];
 
 
-$lang=$default_language;
-if(isset($_GET['lang']) && $_GET['lang'] !== 'undefined' && $_GET['lang']!='') {
-    $lang=fix_get_params($_GET['lang']);
-    $lang=trim($lang);
+$lang = $default_language;
+if (isset($_GET['lang']) && $_GET['lang'] !== 'undefined' && $_GET['lang'] != '') {
+    $lang = fix_get_params($_GET['lang']);
+    $lang = trim($lang);
 }
 
 $language_file = 'lang/'.$default_language.'.php'; 
-if ($lang!=$default_language) {
+if ($lang != $default_language) {
     $path_parts = pathinfo($lang);
-    if(is_readable('lang/' .$path_parts['basename']. '.php')){ 
-        $language_file = 'lang/' .$path_parts['basename']. '.php';
+    if (is_readable('lang/'.$path_parts['basename'].'.php')) { 
+        $language_file = 'lang/'.$path_parts['basename'].'.php';
     }
     else {
     	echo "<script>console.log('The ".$lang." language file is not readable! Falling back...');</script>";
@@ -124,11 +124,11 @@ 
 $_SESSION['RF']['language_file'] = $language_file;
 require_once $language_file;
 
-if(!isset($_GET['type'])) $_GET['type']=0;
-if(!isset($_GET['field_id'])) $_GET['field_id']='';
+if (!isset($_GET['type'])) $_GET['type'] = 0;
+if (!isset($_GET['field_id'])) $_GET['field_id'] = '';
 
-$field_id=isset($_GET['field_id']) ? fix_get_params($_GET['field_id']) : '';
-$type_param=fix_get_params($_GET['type']);
+$field_id = isset($_GET['field_id']) ? fix_get_params($_GET['field_id']) : '';
+$type_param = fix_get_params($_GET['type']);
 
 $get_params = http_build_query(array(
     'type'      => $type_param,
@@ -157,11 +157,11 @@ 
 	$sprite_lang_file = 'img/spritemap_'.$lang.'.png';
 	$sprite_lang_file2 = 'img/spritemap@2x_'.$lang.'.png';
 	
-	if ( ! file_exists($sprite_lang_file) || ! file_exists($sprite_lang_file2)){
+	if (!file_exists($sprite_lang_file) || !file_exists($sprite_lang_file2)) {
 		//fallback
 		$sprite_lang_file = 'img/spritemap_en_EN.png';
 		$sprite_lang_file2 = 'img/spritemap@2x_en_EN.png';
-		if ( ! file_exists($sprite_lang_file) || ! file_exists($sprite_lang_file2)){
+		if (!file_exists($sprite_lang_file) || !file_exists($sprite_lang_file2)) {
 			// we are in deep ****
 			echo '<script>console.log("Error: Spritemap not found!");</script>';
 			// exit();
@@ -219,10 +219,10 @@ 
 	<script type="text/javascript" src="js/imagesloaded.pkgd.min.js"></script>
 	<script type="text/javascript" src="js/jquery.queryloader2.min.js"></script>
 	<?php
-	if($aviary_active){
+	if ($aviary_active) {
 	if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443) { ?>
 	    <script type="text/javascript" src="https://dme0ih8comzn4.cloudfront.net/js/feather.js"></script>
-	<?php }else{ ?>
+	<?php } else { ?>
 	    <script type="text/javascript" src="http://feather.aviary.com/js/feather.js "></script>
 	<?php }} ?>
 	
@@ -237,11 +237,11 @@ 
 	<script>
 	    var ext_img=new Array('<?php echo implode("','", $ext_img)?>');
 	    var allowed_ext=new Array('<?php echo implode("','", $ext)?>');
-	    var loading_bar=<?php echo $loading_bar?"true":"false"; ?>;
-	    var image_editor=<?php echo $aviary_active?"true":"false"; ?>;
+	    var loading_bar=<?php echo $loading_bar ? "true" : "false"; ?>;
+	    var image_editor=<?php echo $aviary_active ? "true" : "false"; ?>;
 	    //dropzone config
 	    Dropzone.options.myAwesomeDropzone = {
-		    dictInvalidFileType: "<?php echo lang_Error_extension;?>",
+		    dictInvalidFileType: "<?php echo lang_Error_extension; ?>",
 		    dictFileTooBig: "<?php echo lang_Error_Upload; ?>",
 		    dictResponseError: "SERVER ERROR",
 		    paramName: "file", // The name that will be used to transfer the file
@@ -254,7 +254,7 @@ 
 					done();
 			    }
 			    else { 
-			    	done("<?php echo lang_Error_extension;?>"); 
+			    	done("<?php echo lang_Error_extension; ?>"); 
 				}
 		    }
 	    };
@@ -306,18 +306,18 @@ 
 	<input type="hidden" id="cancel" value="<?php echo lang_Cancel; ?>" />
 	<input type="hidden" id="rename" value="<?php echo lang_Rename; ?>" />
 	<input type="hidden" id="lang_duplicate" value="<?php echo lang_Duplicate; ?>" />
-	<input type="hidden" id="duplicate" value="<?php if($duplicate_files) echo 1; else echo 0; ?>" />
+	<input type="hidden" id="duplicate" value="<?php if ($duplicate_files) echo 1; else echo 0; ?>" />
 	<input type="hidden" id="base_url" value="<?php echo $base_url?>"/>
 	<input type="hidden" id="base_url_true" value="<?php echo base_url(); ?>"/>
 	<input type="hidden" id="fldr_value" value="<?php echo $subdir; ?>"/>
 	<input type="hidden" id="sub_folder" value="<?php echo $rfm_subfolder; ?>"/>
 	<input type="hidden" id="file_number_limit_js" value="<?php echo $file_number_limit_js; ?>" />
-	<input type="hidden" id="descending" value="<?php echo $descending?"true":"false"; ?>" />
+	<input type="hidden" id="descending" value="<?php echo $descending ? "true" : "false"; ?>" />
 	<?php $protocol = 'http'; ?>
-	<input type="hidden" id="current_url" value="<?php echo str_replace(array('&filter='.$filter),array(''),$protocol."://".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']); ?>" />
+	<input type="hidden" id="current_url" value="<?php echo str_replace(array('&filter='.$filter), array(''), $protocol."://".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']); ?>" />
 	<input type="hidden" id="lang_show_url" value="<?php echo lang_Show_url; ?>" />
-	<input type="hidden" id="copy_cut_files_allowed" value="<?php if($copy_cut_files) echo 1; else echo 0; ?>" />
-	<input type="hidden" id="copy_cut_dirs_allowed" value="<?php if($copy_cut_dirs) echo 1; else echo 0; ?>" />
+	<input type="hidden" id="copy_cut_files_allowed" value="<?php if ($copy_cut_files) echo 1; else echo 0; ?>" />
+	<input type="hidden" id="copy_cut_dirs_allowed" value="<?php if ($copy_cut_dirs) echo 1; else echo 0; ?>" />
 	<input type="hidden" id="copy_cut_max_size" value="<?php echo $copy_cut_max_size; ?>" />
 	<input type="hidden" id="copy_cut_max_count" value="<?php echo $copy_cut_max_count; ?>" />
 	<input type="hidden" id="lang_copy" value="<?php echo lang_Copy; ?>" />
@@ -331,15 +331,15 @@ 
 	<input type="hidden" id="lang_file_info" value="<?php echo fix_strtoupper(lang_File_info); ?>" />
 	<input type="hidden" id="lang_edit_image" value="<?php echo lang_Edit_image; ?>" />
 	<input type="hidden" id="lang_extract" value="<?php echo lang_Extract; ?>" />
-	<input type="hidden" id="transliteration" value="<?php echo $transliteration?"true":"false"; ?>" />
-<?php if($upload_files){ ?>
+	<input type="hidden" id="transliteration" value="<?php echo $transliteration ? "true" : "false"; ?>" />
+<?php if ($upload_files) { ?>
 <!-- uploader div start -->
 
 <div class="uploader">
     <center><button class="btn btn-inverse close-uploader"><i class="icon-backward icon-white"></i> <?php echo lang_Return_Files_List?></button></center>
 	<div class="space10"></div><div class="space10"></div>
 	<div class="tabbable upload-tabbable"> <!-- Only required for left/right tabs -->
-		<?php if($java_upload){ ?>
+		<?php if ($java_upload) { ?>
 	    <ul class="nav nav-tabs">
 			<li class="active"><a href="#tab1" data-toggle="tab"><?php echo lang_Upload_base; ?></a></li>
 			<li><a href="#tab2" id="uploader-btn" data-toggle="tab"><?php echo lang_Upload_java; ?></a></li>
@@ -364,7 +364,7 @@ 
 				</form>
 			</div>
 		    <div class="upload-help"><?php echo lang_Upload_base_help; ?></div>
-			<?php if($java_upload){ ?>
+			<?php if ($java_upload) { ?>
 			</div>
 			<div class="tab-pane" id="tab2">
 		    	<div id="iframe-container"></div>
@@ -385,50 +385,50 @@ 
 $class_ext = '';
 $src = '';
 
-if ($_GET['type']==1) 	 $apply = 'apply_img';
-elseif($_GET['type']==2) $apply = 'apply_link';
-elseif($_GET['type']==0 && $_GET['field_id']=='') $apply = 'apply_none';
-elseif($_GET['type']==3) $apply = 'apply_video';
+if ($_GET['type'] == 1) 	 $apply = 'apply_img';
+elseif ($_GET['type'] == 2) $apply = 'apply_link';
+elseif ($_GET['type'] == 0 && $_GET['field_id'] == '') $apply = 'apply_none';
+elseif ($_GET['type'] == 3) $apply = 'apply_video';
 else $apply = 'apply';
 
 $files = scandir($current_path.$rfm_subfolder.$subdir);
-$n_files=count($files);
+$n_files = count($files);
 
 //php sorting
-$sorted=array();
-$current_folder=array();
-$prev_folder=array();
-foreach($files as $k=>$file){
-    if($file===".") $current_folder=array('file'=>$file);
-    elseif($file==="..") $prev_folder=array('file'=>$file);
-    elseif(is_dir($current_path.$rfm_subfolder.$subdir.$file)){
-	$date=filemtime($current_path.$rfm_subfolder.$subdir. $file);
-	$size=foldersize($current_path.$rfm_subfolder.$subdir. $file);
-	$file_ext=lang_Type_dir;
-	$sorted[$k]=array('file'=>$file,'date'=>$date,'size'=>$size,'extension'=>$file_ext);
-    }else{
-	$file_path=$current_path.$rfm_subfolder.$subdir.$file;
-	$date=filemtime($file_path);
-	$size=filesize($file_path);
-	$file_ext = substr(strrchr($file,'.'),1);
-	$sorted[$k]=array('file'=>$file,'date'=>$date,'size'=>$size,'extension'=>$file_ext);
+$sorted = array();
+$current_folder = array();
+$prev_folder = array();
+foreach ($files as $k=>$file) {
+    if ($file === ".") $current_folder = array('file'=>$file);
+    elseif ($file === "..") $prev_folder = array('file'=>$file);
+    elseif (is_dir($current_path.$rfm_subfolder.$subdir.$file)) {
+	$date = filemtime($current_path.$rfm_subfolder.$subdir.$file);
+	$size = foldersize($current_path.$rfm_subfolder.$subdir.$file);
+	$file_ext = lang_Type_dir;
+	$sorted[$k] = array('file'=>$file, 'date'=>$date, 'size'=>$size, 'extension'=>$file_ext);
+    } else {
+	$file_path = $current_path.$rfm_subfolder.$subdir.$file;
+	$date = filemtime($file_path);
+	$size = filesize($file_path);
+	$file_ext = substr(strrchr($file, '.'), 1);
+	$sorted[$k] = array('file'=>$file, 'date'=>$date, 'size'=>$size, 'extension'=>$file_ext);
     }
 }
 
 function filenameSort($x, $y) {
-    return $x['file'] <  $y['file'];
+    return $x['file'] < $y['file'];
 }
 function dateSort($x, $y) {
-    return $x['date'] <  $y['date'];
+    return $x['date'] < $y['date'];
 }
 function sizeSort($x, $y) {
-    return $x['size'] -  $y['size'];
+    return $x['size'] - $y['size'];
 }
 function extensionSort($x, $y) {
-    return $x['extension'] <  $y['extension'];
+    return $x['extension'] < $y['extension'];
 }
 
-switch($sort_by){
+switch ($sort_by) {
     case 'name':
 	usort($sorted, 'filenameSort');
 	break;
@@ -446,11 +446,11 @@ 
     
 }
 
-if($descending){
-    $sorted=array_reverse($sorted);
+if ($descending) {
+    $sorted = array_reverse($sorted);
 }
 
-$files=array_merge(array($prev_folder),array($current_folder),$sorted);
+$files = array_merge(array($prev_folder), array($current_folder), $sorted);
 ?>          
 <!-- header div start -->
 <div class="navbar navbar-fixed-top">
@@ -466,13 +466,13 @@ 
 		<div class="filters">
 		    <div class="row-fluid">
 			<div class="span3 half"> 
-			    <?php if($upload_files){ ?>
+			    <?php if ($upload_files) { ?>
 						    <button class="tip btn upload-btn" title="<?php echo  lang_Upload_file; ?>"><i class="icon-plus"></i><i class="icon-file"></i></button> 
 			    <?php } ?>
-			    <?php if($create_folders){ ?>
+			    <?php if ($create_folders) { ?>
 						    <button class="tip btn new-folder" title="<?php echo  lang_New_Folder?>"><i class="icon-plus"></i><i class="icon-folder-open"></i></button> 
 			    <?php } ?>
-			    <?php if($copy_cut_files || $copy_cut_dirs){ ?>
+			    <?php if ($copy_cut_files || $copy_cut_dirs) { ?>
 				    <button class="tip btn paste-here-btn" title="<?php echo lang_Paste_Here; ?>"><i class="rficon-clipboard-apply"></i></button> 
 				    <button class="tip btn clear-clipboard-btn" title="<?php echo lang_Clear_Clipboard; ?>"><i class="rficon-clipboard-clear"></i></button> 
 				<?php } ?>
@@ -480,13 +480,13 @@ 
 			<div class="span3 half view-controller">
 
 				<span><?php echo lang_View; ?>:</span>
-			    <button class="btn tip<?php if($view==0) echo " btn-inverse"; ?>" id="view0" data-value="0" title="<?php echo lang_View_boxes; ?>"><i class="icon-th <?php if($view==0) echo "icon-white"; ?>"></i></button>
-			    <button class="btn tip<?php if($view==1) echo " btn-inverse"; ?>" id="view1" data-value="1" title="<?php echo lang_View_list; ?>"><i class="icon-align-justify <?php if($view==1) echo "icon-white"; ?>"></i></button>
-			    <button class="btn tip<?php if($view==2) echo " btn-inverse"; ?>" id="view2" data-value="2" title="<?php echo lang_View_columns_list; ?>"><i class="icon-fire <?php if($view==2) echo "icon-white"; ?>"></i></button>
+			    <button class="btn tip<?php if ($view == 0) echo " btn-inverse"; ?>" id="view0" data-value="0" title="<?php echo lang_View_boxes; ?>"><i class="icon-th <?php if ($view == 0) echo "icon-white"; ?>"></i></button>
+			    <button class="btn tip<?php if ($view == 1) echo " btn-inverse"; ?>" id="view1" data-value="1" title="<?php echo lang_View_list; ?>"><i class="icon-align-justify <?php if ($view == 1) echo "icon-white"; ?>"></i></button>
+			    <button class="btn tip<?php if ($view == 2) echo " btn-inverse"; ?>" id="view2" data-value="2" title="<?php echo lang_View_columns_list; ?>"><i class="icon-fire <?php if ($view == 2) echo "icon-white"; ?>"></i></button>
 			</div>
 			<div class="span6 half types"> 
 				<span><?php echo lang_Filters; ?>:</span>
-			    <?php if($_GET['type']!=1 && $_GET['type']!=3){ ?>
+			    <?php if ($_GET['type'] != 1 && $_GET['type'] != 3) { ?>
 			    <input id="select-type-1" name="radio-sort" type="radio" data-item="ff-item-type-1" checked="checked"  class="hide"  />
 			    <label id="ff-item-type-1" title="<?php echo lang_Files; ?>" for="select-type-1" class="tip btn ff-label-type-1"><i class="icon-file"></i></label>
 			    <input id="select-type-2" name="radio-sort" type="radio" data-item="ff-item-type-2" class="hide"  />
@@ -498,10 +498,10 @@ 
 			    <input id="select-type-5" name="radio-sort" type="radio" data-item="ff-item-type-5" class="hide"  />
 			    <label id="ff-item-type-5" title="<?php echo lang_Music; ?>" for="select-type-5" class="tip btn ff-label-type-5"><i class="icon-music"></i></label>
 			    <?php } ?>
-			    <input accesskey="f" type="text" class="filter-input <?php echo (($_GET['type']!=1 && $_GET['type']!=3) ? '' : 'filter-input-notype'); ?>" id="filter-input" name="filter" placeholder="<?php echo fix_strtolower(lang_Text_filter); ?>..." value="<?php echo $filter; ?>"/><?php if($n_files>$file_number_limit_js){ ?><label id="filter" class="btn"><i class="icon-play"></i></label><?php } ?>
+			    <input accesskey="f" type="text" class="filter-input <?php echo (($_GET['type'] != 1 && $_GET['type'] != 3) ? '' : 'filter-input-notype'); ?>" id="filter-input" name="filter" placeholder="<?php echo fix_strtolower(lang_Text_filter); ?>..." value="<?php echo $filter; ?>"/><?php if ($n_files > $file_number_limit_js) { ?><label id="filter" class="btn"><i class="icon-play"></i></label><?php } ?>
 			    
 			    <input id="select-type-all" name="radio-sort" type="radio" data-item="ff-item-type-all" class="hide"  />
-			     <label id="ff-item-type-all" title="<?php echo lang_All; ?>" <?php if($_GET['type']==1 || $_GET['type']==3){ ?>style="visibility: hidden;" <?php } ?> data-item="ff-item-type-all" for="select-type-all" style="margin-rigth:0px;" class="tip btn btn-inverse ff-label-type-all"><i class="icon-align-justify icon-white"></i></label>
+			     <label id="ff-item-type-all" title="<?php echo lang_All; ?>" <?php if ($_GET['type'] == 1 || $_GET['type'] == 3) { ?>style="visibility: hidden;" <?php } ?> data-item="ff-item-type-all" for="select-type-all" style="margin-rigth:0px;" class="tip btn btn-inverse ff-label-type-all"><i class="icon-align-justify icon-white"></i></label>
 			    
 			</div>
 		    </div>
@@ -517,20 +517,20 @@ 
     
     <div class="row-fluid">
 	<?php	
-	$link="dialog.php?".$get_params;
+	$link = "dialog.php?".$get_params;
 	?>
 	<ul class="breadcrumb">	
 	<li class="pull-left"><a href="<?php echo $link?>/"><i class="icon-home"></i></a></li>
 	<li><span class="divider">/</span></li>
 	<?php
-	$bc=explode("/",$subdir);
-	$tmp_path='';
-	if(!empty($bc))
-	foreach($bc as $k=>$b){ 
-		$tmp_path.=$b."/";
-		if($k==count($bc)-2){
+	$bc = explode("/", $subdir);
+	$tmp_path = '';
+	if (!empty($bc))
+	foreach ($bc as $k=>$b) { 
+		$tmp_path .= $b."/";
+		if ($k == count($bc) - 2) {
 	?> <li class="active"><?php echo $b?></li><?php
-		}elseif($b!=""){ ?>
+		}elseif ($b != "") { ?>
 		<li><a href="<?php echo $link.$tmp_path?>"><?php echo $b?></a></li><li><span class="divider"><?php echo "/"; ?></span></li>
 	<?php }
 	}
@@ -546,10 +546,10 @@ 
 		</a>
 		<ul class="dropdown-menu pull-left sorting">
 		    <li><center><strong><?php echo lang_Sorting ?></strong></center></li>
-		<li><a class="sorter sort-name <?php if($sort_by==="name"){ echo ($descending)?"descending":"ascending"; } ?>" href="javascript:void('')" data-sort="name"><?php echo lang_Filename; ?></a></li>
-		<li><a class="sorter sort-date <?php if($sort_by==="date"){ echo ($descending)?"descending":"ascending"; } ?>" href="javascript:void('')" data-sort="date"><?php echo lang_Date; ?></a></li>
-		<li><a class="sorter sort-size <?php if($sort_by==="size"){ echo ($descending)?"descending":"ascending"; } ?>" href="javascript:void('')" data-sort="size"><?php echo lang_Size; ?></a></li>
-		<li><a class="sorter sort-extension <?php if($sort_by==="extension"){ echo ($descending)?"descending":"ascending"; } ?>" href="javascript:void('')" data-sort="extension"><?php echo lang_Type; ?></a></li>
+		<li><a class="sorter sort-name <?php if ($sort_by === "name") { echo ($descending) ? "descending" : "ascending"; } ?>" href="javascript:void('')" data-sort="name"><?php echo lang_Filename; ?></a></li>
+		<li><a class="sorter sort-date <?php if ($sort_by === "date") { echo ($descending) ? "descending" : "ascending"; } ?>" href="javascript:void('')" data-sort="date"><?php echo lang_Date; ?></a></li>
+		<li><a class="sorter sort-size <?php if ($sort_by === "size") { echo ($descending) ? "descending" : "ascending"; } ?>" href="javascript:void('')" data-sort="size"><?php echo lang_Size; ?></a></li>
+		<li><a class="sorter sort-extension <?php if ($sort_by === "extension") { echo ($descending) ? "descending" : "ascending"; } ?>" href="javascript:void('')" data-sort="extension"><?php echo lang_Type; ?></a></li>
 		</ul>
 	      </div>
 	</li>
@@ -558,22 +558,22 @@ 
     <!-- breadcrumb div end -->
     <div class="row-fluid ff-container">
 	<div class="span12">	    
-	    <?php if(@opendir($current_path.$rfm_subfolder.$subdir)===FALSE){ ?>
+	    <?php if (@opendir($current_path.$rfm_subfolder.$subdir) === FALSE) { ?>
 	    <br/>
 	    <div class="alert alert-error">There is an error! The upload folder there isn't. Check your config.php file. </div> 
-	    <?php }else{ ?>
+	    <?php } else { ?>
 	    <h4 id="help"><?php echo lang_Swipe_help; ?></h4>
-	    <?php if(isset($folder_message)){ ?>
+	    <?php if (isset($folder_message)) { ?>
 		<div class="alert alert-block"><?php echo $folder_message; ?></div>
 	    <?php } ?>
-	    <?php if($show_sorting_bar){ ?>
+	    <?php if ($show_sorting_bar) { ?>
 	    <!-- sorter -->
 	    <div class="sorter-container <?php echo "list-view".$view; ?>">
-		<div class="file-name"><a class="sorter sort-name <?php if($sort_by==="name"){ echo ($descending)?"descending":"ascending"; } ?>" href="javascript:void('')" data-sort="name"><?php echo lang_Filename; ?></a></div>
-		<div class="file-date"><a class="sorter sort-date <?php if($sort_by==="date"){ echo ($descending)?"descending":"ascending"; } ?>" href="javascript:void('')" data-sort="date"><?php echo lang_Date; ?></a></div>
-		<div class="file-size"><a class="sorter sort-size <?php if($sort_by==="size"){ echo ($descending)?"descending":"ascending"; } ?>" href="javascript:void('')" data-sort="size"><?php echo lang_Size; ?></a></div>
+		<div class="file-name"><a class="sorter sort-name <?php if ($sort_by === "name") { echo ($descending) ? "descending" : "ascending"; } ?>" href="javascript:void('')" data-sort="name"><?php echo lang_Filename; ?></a></div>
+		<div class="file-date"><a class="sorter sort-date <?php if ($sort_by === "date") { echo ($descending) ? "descending" : "ascending"; } ?>" href="javascript:void('')" data-sort="date"><?php echo lang_Date; ?></a></div>
+		<div class="file-size"><a class="sorter sort-size <?php if ($sort_by === "size") { echo ($descending) ? "descending" : "ascending"; } ?>" href="javascript:void('')" data-sort="size"><?php echo lang_Size; ?></a></div>
 		<div class='img-dimension'><?php echo lang_Dimension; ?></div>
-		<div class='file-extension'><a class="sorter sort-extension <?php if($sort_by==="extension"){ echo ($descending)?"descending":"ascending"; } ?>" href="javascript:void('')" data-sort="extension"><?php echo lang_Type; ?></a></div>
+		<div class='file-extension'><a class="sorter sort-extension <?php if ($sort_by === "extension") { echo ($descending) ? "descending" : "ascending"; } ?>" href="javascript:void('')" data-sort="extension"><?php echo lang_Type; ?></a></div>
 		<div class='file-operations'><?php echo lang_Operations; ?></div>
 	    </div>
 	    <?php } ?>
@@ -583,74 +583,74 @@ 
 	    <ul class="grid cs-style-2 <?php echo "list-view".$view; ?>" id="main-item-container">
 		<?php
 		
-		$jplayer_ext=array("mp4","flv","webmv","webma","webm","m4a","m4v","ogv","oga","mp3","midi","mid","ogg","wav");
+		$jplayer_ext = array("mp4", "flv", "webmv", "webma", "webm", "m4a", "m4v", "ogv", "oga", "mp3", "midi", "mid", "ogg", "wav");
 		foreach ($files as $file_array) {
-		    $file=$file_array['file'];
-			if($file === '.' || (isset($file_array['extension']) && $file_array['extension']!=lang_Type_dir) || ($file === '..' && $subdir == '') || in_array($file, $hidden_folders) || ($filter!='' && $file!==".." && strpos($file,$filter)===false))
+		    $file = $file_array['file'];
+			if ($file === '.' || (isset($file_array['extension']) && $file_array['extension'] != lang_Type_dir) || ($file === '..' && $subdir == '') || in_array($file, $hidden_folders) || ($filter != '' && $file !== ".." && strpos($file, $filter) === false))
 			    continue;
-			$new_name=fix_filename($file,$transliteration);
-			if($file!=='..' && $file!=$new_name){
+			$new_name = fix_filename($file, $transliteration);
+			if ($file !== '..' && $file != $new_name) {
 			    //rename
-			    rename_folder($current_path.$subdir.$new_name,$new_name,$transliteration);
-			    $file=$new_name;
+			    rename_folder($current_path.$subdir.$new_name, $new_name, $transliteration);
+			    $file = $new_name;
 			}
 			//add in thumbs folder if not exist 
-			if (!file_exists($thumbs_path.$subdir.$file)) create_folder(false,$thumbs_path.$subdir.$file);
+			if (!file_exists($thumbs_path.$subdir.$file)) create_folder(false, $thumbs_path.$subdir.$file);
 			$class_ext = 3;			
-			if($file==='..' && trim($subdir) != '' ){
-			    $src = explode("/",$subdir);
-			    unset($src[count($src)-2]);
-			    $src=implode("/",$src);
-			    if($src==='') $src="/";
+			if ($file === '..' && trim($subdir) != '') {
+			    $src = explode("/", $subdir);
+			    unset($src[count($src) - 2]);
+			    $src = implode("/", $src);
+			    if ($src === '') $src = "/";
 			}
-			elseif ($file!=='..') {
-			    $src = $subdir . $file."/";
+			elseif ($file !== '..') {
+			    $src = $subdir.$file."/";
 			}
 			
 			?>
-			    <li data-name="<?php echo $file ?>" <?php if($file==='..') echo 'class="back"'; else echo 'class="dir"'; ?>><?php
+			    <li data-name="<?php echo $file ?>" <?php if ($file === '..') echo 'class="back"'; else echo 'class="dir"'; ?>><?php
 			    $file_prevent_rename = false;
 			    $file_prevent_delete = false;
 			    if (isset($filePermissions[$file])) {
 				$file_prevent_rename = isset($filePermissions[$file]['prevent_rename']) && $filePermissions[$file]['prevent_rename'];
 				$file_prevent_delete = isset($filePermissions[$file]['prevent_delete']) && $filePermissions[$file]['prevent_delete'];
 			    }
-			    ?>	<figure data-name="<?php echo $file ?>" class="<?php if($file==="..") echo "back-"; ?>directory" data-type="<?php if($file!==".."){ echo "dir"; } ?>">
+			    ?>	<figure data-name="<?php echo $file ?>" class="<?php if ($file === "..") echo "back-"; ?>directory" data-type="<?php if ($file !== "..") { echo "dir"; } ?>">
 				    <a class="folder-link" href="dialog.php?<?php echo $get_params.rawurlencode($src)."&".uniqid() ?>">
 				    <div class="img-precontainer">
 					<div class="img-container directory"><span></span>
-					<img class="directory-img"  src="img/<?php echo $icon_theme; ?>/folder<?php if($file===".."){ echo "_back"; }?>.jpg" alt="folder" />
+					<img class="directory-img"  src="img/<?php echo $icon_theme; ?>/folder<?php if ($file === "..") { echo "_back"; }?>.jpg" alt="folder" />
 					</div>
 				    </div>
 				    <div class="img-precontainer-mini directory">
 					<div class="img-container-mini">
 					    <span></span>
-					    <img class="directory-img"  src="img/<?php echo $icon_theme; ?>/folder<?php if($file===".."){ echo "_back"; }?>.png" alt="folder" />
+					    <img class="directory-img"  src="img/<?php echo $icon_theme; ?>/folder<?php if ($file === "..") { echo "_back"; }?>.png" alt="folder" />
 					</div>
 				    </div>
-			<?php if($file===".."){ ?>
+			<?php if ($file === "..") { ?>
 				    <div class="box no-effect">
 					<h4><?php echo lang_Back ?></h4>
 				    </div>
 				    </a>
 				    
-			<?php }else{ ?>
+			<?php } else { ?>
 				    </a>
 				    <div class="box">
-					<h4 class="<?php if($ellipsis_title_after_first_row){ echo "ellipsis"; } ?>"><a class="folder-link" data-file="<?php echo $file ?>" href="dialog.php?<?php echo $get_params.rawurlencode($src)."&".uniqid() ?>"><?php echo $file; ?></a></h4>
+					<h4 class="<?php if ($ellipsis_title_after_first_row) { echo "ellipsis"; } ?>"><a class="folder-link" data-file="<?php echo $file ?>" href="dialog.php?<?php echo $get_params.rawurlencode($src)."&".uniqid() ?>"><?php echo $file; ?></a></h4>
 				    </div>
 				    <input type="hidden" class="name" value=""/>
 				    <input type="hidden" class="date" value="<?php echo $file_array['date']; ?>"/>
-				    <input type="hidden" class="size" value="<?php echo $file_array['size'];  ?>"/>
+				    <input type="hidden" class="size" value="<?php echo $file_array['size']; ?>"/>
 				    <input type="hidden" class="extension" value="<?php echo lang_Type_dir; ?>"/>
-				    <div class="file-date"><?php echo date(lang_Date_type,$file_array['date'])?></div>
-				    <?php if($show_folder_size){ ?><div class="file-size"><?php echo makeSize($file_array['size'])?></div><?php } ?>
+				    <div class="file-date"><?php echo date(lang_Date_type, $file_array['date'])?></div>
+				    <?php if ($show_folder_size) { ?><div class="file-size"><?php echo makeSize($file_array['size'])?></div><?php } ?>
 				    <div class='file-extension'><?php echo lang_Type_dir; ?></div>
 				    <figcaption>
-					    <a href="javascript:void('')" class="tip-left edit-button rename-file-paths <?php if($rename_folders && !$file_prevent_rename) echo "rename-folder"; ?>" title="<?php echo lang_Rename?>" data-path="<?php echo $rfm_subfolder.$subdir.$file; ?>" data-thumb="<?php echo $thumbs_path.$subdir.$file; ?>">
-					    <i class="icon-pencil <?php if(!$rename_folders || $file_prevent_rename) echo 'icon-white'; ?>"></i></a>
-					    <a href="javascript:void('')" class="tip-left erase-button <?php if($delete_folders && !$file_prevent_delete) echo "delete-folder"; ?>" title="<?php echo lang_Erase?>" data-confirm="<?php echo lang_Confirm_Folder_del; ?>" data-path="<?php echo $rfm_subfolder.$subdir.$file; ?>"  data-thumb="<?php echo $thumbs_path.$subdir .$file; ?>">
-					    <i class="icon-trash <?php if(!$delete_folders || $file_prevent_delete) echo 'icon-white'; ?>"></i>
+					    <a href="javascript:void('')" class="tip-left edit-button rename-file-paths <?php if ($rename_folders && !$file_prevent_rename) echo "rename-folder"; ?>" title="<?php echo lang_Rename?>" data-path="<?php echo $rfm_subfolder.$subdir.$file; ?>" data-thumb="<?php echo $thumbs_path.$subdir.$file; ?>">
+					    <i class="icon-pencil <?php if (!$rename_folders || $file_prevent_rename) echo 'icon-white'; ?>"></i></a>
+					    <a href="javascript:void('')" class="tip-left erase-button <?php if ($delete_folders && !$file_prevent_delete) echo "delete-folder"; ?>" title="<?php echo lang_Erase?>" data-confirm="<?php echo lang_Confirm_Folder_del; ?>" data-path="<?php echo $rfm_subfolder.$subdir.$file; ?>"  data-thumb="<?php echo $thumbs_path.$subdir.$file; ?>">
+					    <i class="icon-trash <?php if (!$delete_folders || $file_prevent_delete) echo 'icon-white'; ?>"></i>
 					    </a>
 				    </figcaption>
 			<?php } ?>
@@ -661,101 +661,101 @@ 
 			
             $files_prevent_duplicate = array();
 		    foreach ($files as $nu=>$file_array) {		
-			$file=$file_array['file'];
+			$file = $file_array['file'];
 		    
-			    if($file === '.' || $file === '..' || is_dir($current_path.$rfm_subfolder.$subdir.$file) || in_array($file, $hidden_files) || !in_array(fix_strtolower($file_array['extension']), $ext) || ($filter!='' && strpos($file,$filter)===false))
+			    if ($file === '.' || $file === '..' || is_dir($current_path.$rfm_subfolder.$subdir.$file) || in_array($file, $hidden_files) || !in_array(fix_strtolower($file_array['extension']), $ext) || ($filter != '' && strpos($file, $filter) === false))
 				    continue;
 			    
-			    $file_path=$current_path.$rfm_subfolder.$subdir.$file;
+			    $file_path = $current_path.$rfm_subfolder.$subdir.$file;
 			    //check if file have illegal caracter
 			    
-			    $filename=substr($file, 0, '-' . (strlen($file_array['extension']) + 1));
+			    $filename = substr($file, 0, '-'.(strlen($file_array['extension']) + 1));
 			    
-			    if($file!=fix_filename($file,$transliteration)){
-				$file1=fix_filename($file,$transliteration);
-				$file_path1=($current_path.$rfm_subfolder.$subdir.$file1);
-				if(file_exists($file_path1)){
+			    if ($file != fix_filename($file, $transliteration)) {
+				$file1 = fix_filename($file, $transliteration);
+				$file_path1 = ($current_path.$rfm_subfolder.$subdir.$file1);
+				if (file_exists($file_path1)) {
 				    $i = 1;
-				    $info=pathinfo($file1);
-				    while(file_exists($current_path.$rfm_subfolder.$subdir.$info['filename'].".[".$i."].".$info['extension'])) {
+				    $info = pathinfo($file1);
+				    while (file_exists($current_path.$rfm_subfolder.$subdir.$info['filename'].".[".$i."].".$info['extension'])) {
 					    $i++;
 				    }
-				    $file1=$info['filename'].".[".$i."].".$info['extension'];
-				    $file_path1=($current_path.$rfm_subfolder.$subdir.$file1);
+				    $file1 = $info['filename'].".[".$i."].".$info['extension'];
+				    $file_path1 = ($current_path.$rfm_subfolder.$subdir.$file1);
 				}
 				
-				$filename=substr($file1, 0, '-' . (strlen($file_array['extension']) + 1));
-				rename_file($file_path,fix_filename($filename,$transliteration),$transliteration);
-				$file=$file1;
-				$file_array['extension']=fix_filename($file_array['extension'],$transliteration);
-				$file_path=$file_path1;
+				$filename = substr($file1, 0, '-'.(strlen($file_array['extension']) + 1));
+				rename_file($file_path, fix_filename($filename, $transliteration), $transliteration);
+				$file = $file1;
+				$file_array['extension'] = fix_filename($file_array['extension'], $transliteration);
+				$file_path = $file_path1;
 			    }
 			    
-			    $is_img=false;
-			    $is_video=false;
-			    $is_audio=false;
-			    $show_original=false;
-			    $show_original_mini=false;
-			    $mini_src="";
-			    $src_thumb="";
-			    $extension_lower=fix_strtolower($file_array['extension']);
-			    if(in_array($extension_lower, $ext_img)){
-				$src = $base_url . $cur_dir . rawurlencode($file);
-				$mini_src = $src_thumb = $thumbs_path.$subdir. $file;
+			    $is_img = false;
+			    $is_video = false;
+			    $is_audio = false;
+			    $show_original = false;
+			    $show_original_mini = false;
+			    $mini_src = "";
+			    $src_thumb = "";
+			    $extension_lower = fix_strtolower($file_array['extension']);
+			    if (in_array($extension_lower, $ext_img)) {
+				$src = $base_url.$cur_dir.rawurlencode($file);
+				$mini_src = $src_thumb = $thumbs_path.$subdir.$file;
 				//add in thumbs folder if not exist
-				if(!file_exists($src_thumb)){
+				if (!file_exists($src_thumb)) {
 				    try {
 					create_img_gd($file_path, $src_thumb, 122, 91);
-					new_thumbnails_creation($current_path.$rfm_subfolder.$subdir,$file_path,$file,$current_path,$relative_image_creation,$relative_path_from_current_pos,$relative_image_creation_name_to_prepend,$relative_image_creation_name_to_append,$relative_image_creation_width,$relative_image_creation_height,$fixed_image_creation,$fixed_path_from_filemanager,$fixed_image_creation_name_to_prepend,$fixed_image_creation_to_append,$fixed_image_creation_width,$fixed_image_creation_height);
+					new_thumbnails_creation($current_path.$rfm_subfolder.$subdir, $file_path, $file, $current_path, $relative_image_creation, $relative_path_from_current_pos, $relative_image_creation_name_to_prepend, $relative_image_creation_name_to_append, $relative_image_creation_width, $relative_image_creation_height, $fixed_image_creation, $fixed_path_from_filemanager, $fixed_image_creation_name_to_prepend, $fixed_image_creation_to_append, $fixed_image_creation_width, $fixed_image_creation_height);
 				    } catch (Exception $e) {
-					$src_thumb=$mini_src="";
+					$src_thumb = $mini_src = "";
 				    }
 				}
-				$is_img=true;
+				$is_img = true;
 				//check if is smaller than thumb
-				list($img_width, $img_height, $img_type, $attr)=getimagesize($file_path);
-				if($img_width<122 && $img_height<91){ 
-					$src_thumb=$current_path.$rfm_subfolder.$subdir.$file;
-					$show_original=true;
+				list($img_width, $img_height, $img_type, $attr) = getimagesize($file_path);
+				if ($img_width < 122 && $img_height < 91) { 
+					$src_thumb = $current_path.$rfm_subfolder.$subdir.$file;
+					$show_original = true;
 				}
 				
-				if($img_width<45 && $img_height<38){
-				    $mini_src=$current_path.$rfm_subfolder.$subdir.$file;
-				    $show_original_mini=true;
+				if ($img_width < 45 && $img_height < 38) {
+				    $mini_src = $current_path.$rfm_subfolder.$subdir.$file;
+				    $show_original_mini = true;
 				}
 			    }
 			    
-			    $is_icon_thumb=false;
-			    $is_icon_thumb_mini=false;
-			    $no_thumb=false;
-			    if($src_thumb==""){
-				$no_thumb=true;
-				if(file_exists('img/'.$icon_theme.'/'.$extension_lower.".jpg")){
-					$src_thumb ='img/'.$icon_theme.'/'.$extension_lower.".jpg";
-				}else{
+			    $is_icon_thumb = false;
+			    $is_icon_thumb_mini = false;
+			    $no_thumb = false;
+			    if ($src_thumb == "") {
+				$no_thumb = true;
+				if (file_exists('img/'.$icon_theme.'/'.$extension_lower.".jpg")) {
+					$src_thumb = 'img/'.$icon_theme.'/'.$extension_lower.".jpg";
+				} else {
 					$src_thumb = "img/".$icon_theme."/default.jpg";
 				}
-				$is_icon_thumb=true;
+				$is_icon_thumb = true;
 			    }
-			    if($mini_src==""){
-				$is_icon_thumb_mini=false;
+			    if ($mini_src == "") {
+				$is_icon_thumb_mini = false;
 			    }
 			    
-			    $class_ext=0;
+			    $class_ext = 0;
 			    if (in_array($extension_lower, $ext_video)) {
 				    $class_ext = 4;
-				    $is_video=true;
+				    $is_video = true;
 			    }elseif (in_array($extension_lower, $ext_img)) {
 				    $class_ext = 2;
 			    }elseif (in_array($extension_lower, $ext_music)) {
 				    $class_ext = 5;
-				    $is_audio=true;
+				    $is_audio = true;
 			    }elseif (in_array($extension_lower, $ext_misc)) {
 				    $class_ext = 3;
-			    }else{
+			    } else {
 				    $class_ext = 1;
 			    }
-			    if((!($_GET['type']==1 && !$is_img) && !(($_GET['type']==3 && !$is_video) && ($_GET['type']==3 && !$is_audio))) && $class_ext>0){
+			    if ((!($_GET['type'] == 1 && !$is_img) && !(($_GET['type'] == 3 && !$is_video) && ($_GET['type'] == 3 && !$is_audio))) && $class_ext > 0) {
 ?>
 		    <li class="ff-item-type-<?php echo $class_ext; ?> file"  data-name="<?php echo $file; ?>"><?php
 		    $file_prevent_rename = false;
@@ -767,39 +767,39 @@ 
 			$file_prevent_rename = isset($filePermissions[$file]['prevent_rename']) && $filePermissions[$file]['prevent_rename'];
 			$file_prevent_delete = isset($filePermissions[$file]['prevent_delete']) && $filePermissions[$file]['prevent_delete'];
 		    }
-            ?>		<figure data-name="<?php echo $file ?>" data-type="<?php if($is_img){ echo "img"; }else{ echo "file"; } ?>">
+            ?>		<figure data-name="<?php echo $file ?>" data-type="<?php if ($is_img) { echo "img"; } else { echo "file"; } ?>">
 				<a href="javascript:void('')" class="link" data-file="<?php echo $file; ?>" data-field_id="<?php echo $field_id; ?>" data-function="<?php echo $apply; ?>">
 				<div class="img-precontainer">
-				    <?php if($is_icon_thumb){ ?><div class="filetype"><?php echo $extension_lower ?></div><?php } ?>
+				    <?php if ($is_icon_thumb) { ?><div class="filetype"><?php echo $extension_lower ?></div><?php } ?>
 				    <div class="img-container">
 					    <span></span>
-					    <img alt="<?php echo $filename." thumbnails";?>" class="<?php echo $show_original ? "original" : "" ?> <?php echo $is_icon_thumb ? "icon" : "" ?>" src="<?php echo $src_thumb; ?>">
+					    <img alt="<?php echo $filename." thumbnails"; ?>" class="<?php echo $show_original ? "original" : "" ?> <?php echo $is_icon_thumb ? "icon" : "" ?>" src="<?php echo $src_thumb; ?>">
 				    </div>
 				</div>
-				<div class="img-precontainer-mini <?php if($is_img) echo 'original-thumb' ?>">
-				    <div class="filetype <?php echo $extension_lower ?> <?php if(!$is_icon_thumb){ echo "hide"; }?>"><?php echo $extension_lower ?></div>
+				<div class="img-precontainer-mini <?php if ($is_img) echo 'original-thumb' ?>">
+				    <div class="filetype <?php echo $extension_lower ?> <?php if (!$is_icon_thumb) { echo "hide"; }?>"><?php echo $extension_lower ?></div>
 				    <div class="img-container-mini">
 					<span></span>
-					<?php if($mini_src!=""){ ?>
-					<img alt="<?php echo $filename." thumbnails";?>" class="<?php echo $show_original_mini ? "original" : "" ?> <?php echo $is_icon_thumb_mini ? "icon" : "" ?>" src="<?php echo $mini_src; ?>">
+					<?php if ($mini_src != "") { ?>
+					<img alt="<?php echo $filename." thumbnails"; ?>" class="<?php echo $show_original_mini ? "original" : "" ?> <?php echo $is_icon_thumb_mini ? "icon" : "" ?>" src="<?php echo $mini_src; ?>">
 					<?php } ?>
 				    </div>
 				</div>
-				<?php if($is_icon_thumb){ ?>
+				<?php if ($is_icon_thumb) { ?>
 				<div class="cover"></div>
 				<?php } ?>
 				</a>	
 				<div class="box">				
-				<h4 class="<?php if($ellipsis_title_after_first_row){ echo "ellipsis"; } ?>"><a href="javascript:void('')" class="link" data-file="<?php echo $file; ?>" data-field_id="<?php echo $field_id; ?>" data-function="<?php echo $apply; ?>">
+				<h4 class="<?php if ($ellipsis_title_after_first_row) { echo "ellipsis"; } ?>"><a href="javascript:void('')" class="link" data-file="<?php echo $file; ?>" data-field_id="<?php echo $field_id; ?>" data-function="<?php echo $apply; ?>">
 				<?php echo $filename; ?></a> </h4>
 				</div>
 				<input type="hidden" class="date" value="<?php echo $file_array['date']; ?>"/>
 				<input type="hidden" class="size" value="<?php echo $file_array['size'] ?>"/>
 				<input type="hidden" class="extension" value="<?php echo $extension_lower; ?>"/>
 				<input type="hidden" class="name" value=""/>
-				<div class="file-date"><?php echo date(lang_Date_type,$file_array['date'])?></div>
+				<div class="file-date"><?php echo date(lang_Date_type, $file_array['date'])?></div>
 				<div class="file-size"><?php echo makeSize($file_array['size'])?></div>
-				<div class='img-dimension'><?php if($is_img){ echo $img_width."x".$img_height; } ?></div>
+				<div class='img-dimension'><?php if ($is_img) { echo $img_width."x".$img_height; } ?></div>
 				<div class='file-extension'><?php echo $extension_lower; ?></div>
 				<figcaption>
 				    <form action="force_download.php" method="post" class="download-form" id="form<?php echo $nu; ?>">
@@ -807,20 +807,20 @@ 
 					<input type="hidden" class="name_download" name="name" value="<?php echo $file?>"/>
 					
 				    <a title="<?php echo lang_Download?>" class="tip-right" href="javascript:void('')" onclick="$('#form<?php echo $nu; ?>').submit();"><i class="icon-download"></i></a>
-				    <?php if($is_img && $src_thumb!=""){ ?>
-				    <a class="tip-right preview" title="<?php echo lang_Preview?>" data-url="<?php echo $src;?>" data-toggle="lightbox" href="#previewLightbox"><i class=" icon-eye-open"></i></a>
-				    <?php }elseif(($is_video || $is_audio) && in_array($extension_lower,$jplayer_ext)){ ?>
-				    <a class="tip-right modalAV <?php if($is_audio){ echo "audio"; }else{ echo "video"; } ?>"
-					title="<?php echo lang_Preview?>" data-url="ajax_calls.php?action=media_preview&title=<?php echo $filename; ?>&file=<?php echo $current_path.$rfm_subfolder.$subdir.$file;; ?>"
+				    <?php if ($is_img && $src_thumb != "") { ?>
+				    <a class="tip-right preview" title="<?php echo lang_Preview?>" data-url="<?php echo $src; ?>" data-toggle="lightbox" href="#previewLightbox"><i class=" icon-eye-open"></i></a>
+				    <?php }elseif (($is_video || $is_audio) && in_array($extension_lower, $jplayer_ext)) { ?>
+				    <a class="tip-right modalAV <?php if ($is_audio) { echo "audio"; } else { echo "video"; } ?>"
+					title="<?php echo lang_Preview?>" data-url="ajax_calls.php?action=media_preview&title=<?php echo $filename; ?>&file=<?php echo $current_path.$rfm_subfolder.$subdir.$file; ; ?>"
 					href="javascript:void('');" ><i class=" icon-eye-open"></i></a>
-				    <?php }else{ ?>
+				    <?php } else { ?>
 				    <a class="preview disabled"><i class="icon-eye-open icon-white"></i></a>
 				    <?php } ?>
-				    <a href="javascript:void('')" class="tip-left edit-button rename-file-paths <?php if($rename_files && !$file_prevent_rename) echo "rename-file"; ?>" title="<?php echo lang_Rename?>" data-path="<?php echo $rfm_subfolder.$subdir .$file; ?>" data-thumb="<?php echo $thumbs_path.$subdir .$file; ?>">
- 				    <i class="icon-pencil <?php if(!$rename_files || $file_prevent_rename) echo 'icon-white'; ?>"></i></a>
+				    <a href="javascript:void('')" class="tip-left edit-button rename-file-paths <?php if ($rename_files && !$file_prevent_rename) echo "rename-file"; ?>" title="<?php echo lang_Rename?>" data-path="<?php echo $rfm_subfolder.$subdir.$file; ?>" data-thumb="<?php echo $thumbs_path.$subdir.$file; ?>">
+ 				    <i class="icon-pencil <?php if (!$rename_files || $file_prevent_rename) echo 'icon-white'; ?>"></i></a>
 
-				    <a href="javascript:void('')" class="tip-left erase-button <?php if($delete_files && !$file_prevent_delete) echo "delete-file"; ?>" title="<?php echo lang_Erase?>" data-confirm="<?php echo lang_Confirm_del; ?>" data-path="<?php echo $rfm_subfolder.$subdir.$file; ?>" data-thumb="<?php echo $thumbs_path.$subdir .$file; ?>">
- 				    <i class="icon-trash <?php if(!$delete_files || $file_prevent_delete) echo 'icon-white'; ?>"></i>
+				    <a href="javascript:void('')" class="tip-left erase-button <?php if ($delete_files && !$file_prevent_delete) echo "delete-file"; ?>" title="<?php echo lang_Erase?>" data-confirm="<?php echo lang_Confirm_del; ?>" data-path="<?php echo $rfm_subfolder.$subdir.$file; ?>" data-thumb="<?php echo $thumbs_path.$subdir.$file; ?>">
+ 				    <i class="icon-trash <?php if (!$delete_files || $file_prevent_delete) echo 'icon-white'; ?>"></i>
 				    </a>
 				    </form>
 				</figcaption>
@@ -840,7 +840,7 @@ 
     var files_prevent_duplicate = new Array();
     <?php
     foreach ($files_prevent_duplicate as $key => $value): ?>
-        files_prevent_duplicate[<?php echo $key;?>] = '<?php echo $value; ?>';
+        files_prevent_duplicate[<?php echo $key; ?>] = '<?php echo $value; ?>';
     <?php endforeach; ?>
 </script>
 

Braces +192 added lines, -77 removed lines

@@ -7,26 +7,28 @@ 
 
 include('upload.php');
 
-}else{
+} else{
 
 include('include/utils.php');
 
 if (isset($_GET['fldr'])
     && !empty($_GET['fldr'])
     && strpos($_GET['fldr'],'../')===FALSE
-    && strpos($_GET['fldr'],'./')===FALSE)
+    && strpos($_GET['fldr'],'./')===FALSE) {
     $subdir = urldecode(trim(strip_tags($_GET['fldr']),"/") ."/");
-else
+} else {
     $subdir = '';
+}
     
 //remember last position
 setcookie('last_position',$subdir,time() + (86400 * 7)); 
 
 if($subdir==""){
     if(!empty($_COOKIE['last_position'])
-	&& strpos($_COOKIE['last_position'],'.')===FALSE)
-	$subdir= trim($_COOKIE['last_position']);
-}
+	&& strpos($_COOKIE['last_position'],'.')===FALSE) {
+    	$subdir= trim($_COOKIE['last_position']);
+    }
+    }
 
 if($subdir==="/"){
     $subdir="";
@@ -36,13 +38,19 @@ 
 /***
  *SUB-DIR CODE
  ***/
-if(!isset($_SESSION['RF']["subfolder"])) $_SESSION['RF']["subfolder"]='';
+if(!isset($_SESSION['RF']["subfolder"])) {
+    $_SESSION['RF']["subfolder"]='';
+}
 $rfm_subfolder = '';
 if(!empty($_SESSION['RF']["subfolder"]) && strpos($_SESSION['RF']["subfolder"],'../')===FALSE
    && strpos($_SESSION['RF']["subfolder"],'./')===FALSE && strpos($_SESSION['RF']["subfolder"],"/")!==0
-    && strpos($_SESSION['RF']["subfolder"],'.')===FALSE) $rfm_subfolder= $_SESSION['RF']['subfolder'];
+    && strpos($_SESSION['RF']["subfolder"],'.')===FALSE) {
+    $rfm_subfolder= $_SESSION['RF']['subfolder'];
+}
    
-if($rfm_subfolder!="" && $rfm_subfolder[strlen($rfm_subfolder)-1]!=="/") $rfm_subfolder.="/";
+if($rfm_subfolder!="" && $rfm_subfolder[strlen($rfm_subfolder)-1]!=="/") {
+    $rfm_subfolder.="/";
+}
    
 if(!file_exists($current_path . $rfm_subfolder.$subdir)){
     $subdir='';
@@ -56,7 +64,7 @@ 
     $cur_path = $current_path . $subdir;
     $thumbs_path = $thumbs_base_path;
     $parent=$subdir;
-}else{
+} else{
     $cur_dir = $upload_dir . $rfm_subfolder.$subdir;
     $cur_path = $current_path . $rfm_subfolder.$subdir;
     $thumbs_path = $thumbs_base_path. $rfm_subfolder;
@@ -68,21 +76,30 @@ 
 $i=0;
 while($cycle && $i<$max_cycles){
     $i++;
-    if($parent==="./") $parent="";
+    if($parent==="./") {
+        $parent="";
+    }
     if(file_exists($current_path.$parent."config.php")){
 	require_once($current_path.$parent."config.php");
 	$cycle=false;
     }
     
-    if($parent=="") $cycle=false;
-    else $parent=fix_dirname($parent)."/";
-}
+    if($parent=="") {
+        $cycle=false;
+    } else {
+        $parent=fix_dirname($parent)."/";
+    }
+    }
 
 if(!is_dir($thumbs_path.$subdir)){
     create_folder(false, $thumbs_path.$subdir);
 }
 
-if(isset($_GET['popup'])) $popup= strip_tags($_GET['popup']); else $popup=0;
+if(isset($_GET['popup'])) {
+    $popup= strip_tags($_GET['popup']);
+} else {
+    $popup=0;
+}
 //Sanitize popup
 $popup=!!$popup;
 
@@ -91,16 +108,29 @@ 
 if(isset($_GET['view'])){ $view=fix_get_params($_GET['view']); $_SESSION['RF']["view_type"] = $view; }
 $view=$_SESSION['RF']["view_type"];
 
-if(isset($_GET["filter"])) $filter=fix_get_params($_GET["filter"]);
-else $filter='';
+if(isset($_GET["filter"])) {
+    $filter=fix_get_params($_GET["filter"]);
+} else {
+    $filter='';
+}
 
-if(!isset($_SESSION['RF']['sort_by'])) $_SESSION['RF']['sort_by']='';
-if(isset($_GET["sort_by"])) $sort_by=$_SESSION['RF']['sort_by']=fix_get_params($_GET["sort_by"]);
-else $sort_by=$_SESSION['RF']['sort_by'];
+if(!isset($_SESSION['RF']['sort_by'])) {
+    $_SESSION['RF']['sort_by']='';
+}
+if(isset($_GET["sort_by"])) {
+    $sort_by=$_SESSION['RF']['sort_by']=fix_get_params($_GET["sort_by"]);
+} else {
+    $sort_by=$_SESSION['RF']['sort_by'];
+}
 
-if(!isset($_SESSION['RF']['descending'])) $_SESSION['RF']['descending']=false;
-if(isset($_GET["descending"])) $descending=$_SESSION['RF']['descending']=fix_get_params($_GET["descending"])==="true";
-else $descending=$_SESSION['RF']['descending'];
+if(!isset($_SESSION['RF']['descending'])) {
+    $_SESSION['RF']['descending']=false;
+}
+if(isset($_GET["descending"])) {
+    $descending=$_SESSION['RF']['descending']=fix_get_params($_GET["descending"])==="true";
+} else {
+    $descending=$_SESSION['RF']['descending'];
+}
 
 
 $lang=$default_language;
@@ -114,8 +144,7 @@ 
     $path_parts = pathinfo($lang);
     if(is_readable('lang/' .$path_parts['basename']. '.php')){ 
         $language_file = 'lang/' .$path_parts['basename']. '.php';
-    }
-    else {
+    } else {
     	echo "<script>console.log('The ".$lang." language file is not readable! Falling back...');</script>";
     }
 }
@@ -124,8 +153,12 @@ 
 $_SESSION['RF']['language_file'] = $language_file;
 require_once $language_file;
 
-if(!isset($_GET['type'])) $_GET['type']=0;
-if(!isset($_GET['field_id'])) $_GET['field_id']='';
+if(!isset($_GET['type'])) {
+    $_GET['type']=0;
+}
+if(!isset($_GET['field_id'])) {
+    $_GET['field_id']='';
+}
 
 $field_id=isset($_GET['field_id']) ? fix_get_params($_GET['field_id']) : '';
 $type_param=fix_get_params($_GET['type']);
@@ -222,7 +255,7 @@ 
 	if($aviary_active){
 	if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443) { ?>
 	    <script type="text/javascript" src="https://dme0ih8comzn4.cloudfront.net/js/feather.js"></script>
-	<?php }else{ ?>
+	<?php } else{ ?>
 	    <script type="text/javascript" src="http://feather.aviary.com/js/feather.js "></script>
 	<?php }} ?>
 	
@@ -306,7 +339,12 @@ 
 	<input type="hidden" id="cancel" value="<?php echo lang_Cancel; ?>" />
 	<input type="hidden" id="rename" value="<?php echo lang_Rename; ?>" />
 	<input type="hidden" id="lang_duplicate" value="<?php echo lang_Duplicate; ?>" />
-	<input type="hidden" id="duplicate" value="<?php if($duplicate_files) echo 1; else echo 0; ?>" />
+	<input type="hidden" id="duplicate" value="<?php if($duplicate_files) {
+    echo 1;
+} else {
+    echo 0;
+}
+?>" />
 	<input type="hidden" id="base_url" value="<?php echo $base_url?>"/>
 	<input type="hidden" id="base_url_true" value="<?php echo base_url(); ?>"/>
 	<input type="hidden" id="fldr_value" value="<?php echo $subdir; ?>"/>
@@ -316,8 +354,18 @@ 
 	<?php $protocol = 'http'; ?>
 	<input type="hidden" id="current_url" value="<?php echo str_replace(array('&filter='.$filter),array(''),$protocol."://".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']); ?>" />
 	<input type="hidden" id="lang_show_url" value="<?php echo lang_Show_url; ?>" />
-	<input type="hidden" id="copy_cut_files_allowed" value="<?php if($copy_cut_files) echo 1; else echo 0; ?>" />
-	<input type="hidden" id="copy_cut_dirs_allowed" value="<?php if($copy_cut_dirs) echo 1; else echo 0; ?>" />
+	<input type="hidden" id="copy_cut_files_allowed" value="<?php if($copy_cut_files) {
+    echo 1;
+} else {
+    echo 0;
+}
+?>" />
+	<input type="hidden" id="copy_cut_dirs_allowed" value="<?php if($copy_cut_dirs) {
+    echo 1;
+} else {
+    echo 0;
+}
+?>" />
 	<input type="hidden" id="copy_cut_max_size" value="<?php echo $copy_cut_max_size; ?>" />
 	<input type="hidden" id="copy_cut_max_count" value="<?php echo $copy_cut_max_count; ?>" />
 	<input type="hidden" id="lang_copy" value="<?php echo lang_Copy; ?>" />
@@ -385,11 +433,17 @@ 
 $class_ext = '';
 $src = '';
 
-if ($_GET['type']==1) 	 $apply = 'apply_img';
-elseif($_GET['type']==2) $apply = 'apply_link';
-elseif($_GET['type']==0 && $_GET['field_id']=='') $apply = 'apply_none';
-elseif($_GET['type']==3) $apply = 'apply_video';
-else $apply = 'apply';
+if ($_GET['type']==1) {
+    $apply = 'apply_img';
+} elseif($_GET['type']==2) {
+    $apply = 'apply_link';
+} elseif($_GET['type']==0 && $_GET['field_id']=='') {
+    $apply = 'apply_none';
+} elseif($_GET['type']==3) {
+    $apply = 'apply_video';
+} else {
+    $apply = 'apply';
+}
 
 $files = scandir($current_path.$rfm_subfolder.$subdir);
 $n_files=count($files);
@@ -399,14 +453,16 @@ 
 $current_folder=array();
 $prev_folder=array();
 foreach($files as $k=>$file){
-    if($file===".") $current_folder=array('file'=>$file);
-    elseif($file==="..") $prev_folder=array('file'=>$file);
-    elseif(is_dir($current_path.$rfm_subfolder.$subdir.$file)){
+    if($file===".") {
+        $current_folder=array('file'=>$file);
+    } elseif($file==="..") {
+        $prev_folder=array('file'=>$file);
+    } elseif(is_dir($current_path.$rfm_subfolder.$subdir.$file)){
 	$date=filemtime($current_path.$rfm_subfolder.$subdir. $file);
 	$size=foldersize($current_path.$rfm_subfolder.$subdir. $file);
 	$file_ext=lang_Type_dir;
 	$sorted[$k]=array('file'=>$file,'date'=>$date,'size'=>$size,'extension'=>$file_ext);
-    }else{
+    } else{
 	$file_path=$current_path.$rfm_subfolder.$subdir.$file;
 	$date=filemtime($file_path);
 	$size=filesize($file_path);
@@ -480,9 +536,27 @@ 
 			<div class="span3 half view-controller">
 
 				<span><?php echo lang_View; ?>:</span>
-			    <button class="btn tip<?php if($view==0) echo " btn-inverse"; ?>" id="view0" data-value="0" title="<?php echo lang_View_boxes; ?>"><i class="icon-th <?php if($view==0) echo "icon-white"; ?>"></i></button>
-			    <button class="btn tip<?php if($view==1) echo " btn-inverse"; ?>" id="view1" data-value="1" title="<?php echo lang_View_list; ?>"><i class="icon-align-justify <?php if($view==1) echo "icon-white"; ?>"></i></button>
-			    <button class="btn tip<?php if($view==2) echo " btn-inverse"; ?>" id="view2" data-value="2" title="<?php echo lang_View_columns_list; ?>"><i class="icon-fire <?php if($view==2) echo "icon-white"; ?>"></i></button>
+			    <button class="btn tip<?php if($view==0) {
+    echo " btn-inverse";
+}
+?>" id="view0" data-value="0" title="<?php echo lang_View_boxes; ?>"><i class="icon-th <?php if($view==0) {
+    echo "icon-white";
+}
+?>"></i></button>
+			    <button class="btn tip<?php if($view==1) {
+    echo " btn-inverse";
+}
+?>" id="view1" data-value="1" title="<?php echo lang_View_list; ?>"><i class="icon-align-justify <?php if($view==1) {
+    echo "icon-white";
+}
+?>"></i></button>
+			    <button class="btn tip<?php if($view==2) {
+    echo " btn-inverse";
+}
+?>" id="view2" data-value="2" title="<?php echo lang_View_columns_list; ?>"><i class="icon-fire <?php if($view==2) {
+    echo "icon-white";
+}
+?>"></i></button>
 			</div>
 			<div class="span6 half types"> 
 				<span><?php echo lang_Filters; ?>:</span>
@@ -525,12 +599,13 @@ 
 	<?php
 	$bc=explode("/",$subdir);
 	$tmp_path='';
-	if(!empty($bc))
-	foreach($bc as $k=>$b){ 
+	if(!empty($bc)) {
+		foreach($bc as $k=>$b){ 
 		$tmp_path.=$b."/";
+	}
 		if($k==count($bc)-2){
 	?> <li class="active"><?php echo $b?></li><?php
-		}elseif($b!=""){ ?>
+		} elseif($b!=""){ ?>
 		<li><a href="<?php echo $link.$tmp_path?>"><?php echo $b?></a></li><li><span class="divider"><?php echo "/"; ?></span></li>
 	<?php }
 	}
@@ -561,7 +636,7 @@ 
 	    <?php if(@opendir($current_path.$rfm_subfolder.$subdir)===FALSE){ ?>
 	    <br/>
 	    <div class="alert alert-error">There is an error! The upload folder there isn't. Check your config.php file. </div> 
-	    <?php }else{ ?>
+	    <?php } else{ ?>
 	    <h4 id="help"><?php echo lang_Swipe_help; ?></h4>
 	    <?php if(isset($folder_message)){ ?>
 		<div class="alert alert-block"><?php echo $folder_message; ?></div>
@@ -586,8 +661,9 @@ 
 		$jplayer_ext=array("mp4","flv","webmv","webma","webm","m4a","m4v","ogv","oga","mp3","midi","mid","ogg","wav");
 		foreach ($files as $file_array) {
 		    $file=$file_array['file'];
-			if($file === '.' || (isset($file_array['extension']) && $file_array['extension']!=lang_Type_dir) || ($file === '..' && $subdir == '') || in_array($file, $hidden_folders) || ($filter!='' && $file!==".." && strpos($file,$filter)===false))
-			    continue;
+			if($file === '.' || (isset($file_array['extension']) && $file_array['extension']!=lang_Type_dir) || ($file === '..' && $subdir == '') || in_array($file, $hidden_folders) || ($filter!='' && $file!==".." && strpos($file,$filter)===false)) {
+						    continue;
+			}
 			$new_name=fix_filename($file,$transliteration);
 			if($file!=='..' && $file!=$new_name){
 			    //rename
@@ -595,27 +671,38 @@ 
 			    $file=$new_name;
 			}
 			//add in thumbs folder if not exist 
-			if (!file_exists($thumbs_path.$subdir.$file)) create_folder(false,$thumbs_path.$subdir.$file);
+			if (!file_exists($thumbs_path.$subdir.$file)) {
+			    create_folder(false,$thumbs_path.$subdir.$file);
+			}
 			$class_ext = 3;			
 			if($file==='..' && trim($subdir) != '' ){
 			    $src = explode("/",$subdir);
 			    unset($src[count($src)-2]);
 			    $src=implode("/",$src);
-			    if($src==='') $src="/";
-			}
-			elseif ($file!=='..') {
+			    if($src==='') {
+			        $src="/";
+			    }
+			} elseif ($file!=='..') {
 			    $src = $subdir . $file."/";
 			}
 			
 			?>
-			    <li data-name="<?php echo $file ?>" <?php if($file==='..') echo 'class="back"'; else echo 'class="dir"'; ?>><?php
+			    <li data-name="<?php echo $file ?>" <?php if($file==='..') {
+    echo 'class="back"';
+} else {
+    echo 'class="dir"';
+}
+?>><?php
 			    $file_prevent_rename = false;
 			    $file_prevent_delete = false;
 			    if (isset($filePermissions[$file])) {
 				$file_prevent_rename = isset($filePermissions[$file]['prevent_rename']) && $filePermissions[$file]['prevent_rename'];
 				$file_prevent_delete = isset($filePermissions[$file]['prevent_delete']) && $filePermissions[$file]['prevent_delete'];
 			    }
-			    ?>	<figure data-name="<?php echo $file ?>" class="<?php if($file==="..") echo "back-"; ?>directory" data-type="<?php if($file!==".."){ echo "dir"; } ?>">
+			    ?>	<figure data-name="<?php echo $file ?>" class="<?php if($file==="..") {
+			        echo "back-";
+			    }
+			    ?>directory" data-type="<?php if($file!==".."){ echo "dir"; } ?>">
 				    <a class="folder-link" href="dialog.php?<?php echo $get_params.rawurlencode($src)."&".uniqid() ?>">
 				    <div class="img-precontainer">
 					<div class="img-container directory"><span></span>
@@ -634,7 +721,7 @@ 
 				    </div>
 				    </a>
 				    
-			<?php }else{ ?>
+			<?php } else{ ?>
 				    </a>
 				    <div class="box">
 					<h4 class="<?php if($ellipsis_title_after_first_row){ echo "ellipsis"; } ?>"><a class="folder-link" data-file="<?php echo $file ?>" href="dialog.php?<?php echo $get_params.rawurlencode($src)."&".uniqid() ?>"><?php echo $file; ?></a></h4>
@@ -647,10 +734,22 @@ 
 				    <?php if($show_folder_size){ ?><div class="file-size"><?php echo makeSize($file_array['size'])?></div><?php } ?>
 				    <div class='file-extension'><?php echo lang_Type_dir; ?></div>
 				    <figcaption>
-					    <a href="javascript:void('')" class="tip-left edit-button rename-file-paths <?php if($rename_folders && !$file_prevent_rename) echo "rename-folder"; ?>" title="<?php echo lang_Rename?>" data-path="<?php echo $rfm_subfolder.$subdir.$file; ?>" data-thumb="<?php echo $thumbs_path.$subdir.$file; ?>">
-					    <i class="icon-pencil <?php if(!$rename_folders || $file_prevent_rename) echo 'icon-white'; ?>"></i></a>
-					    <a href="javascript:void('')" class="tip-left erase-button <?php if($delete_folders && !$file_prevent_delete) echo "delete-folder"; ?>" title="<?php echo lang_Erase?>" data-confirm="<?php echo lang_Confirm_Folder_del; ?>" data-path="<?php echo $rfm_subfolder.$subdir.$file; ?>"  data-thumb="<?php echo $thumbs_path.$subdir .$file; ?>">
-					    <i class="icon-trash <?php if(!$delete_folders || $file_prevent_delete) echo 'icon-white'; ?>"></i>
+					    <a href="javascript:void('')" class="tip-left edit-button rename-file-paths <?php if($rename_folders && !$file_prevent_rename) {
+    echo "rename-folder";
+}
+?>" title="<?php echo lang_Rename?>" data-path="<?php echo $rfm_subfolder.$subdir.$file; ?>" data-thumb="<?php echo $thumbs_path.$subdir.$file; ?>">
+					    <i class="icon-pencil <?php if(!$rename_folders || $file_prevent_rename) {
+    echo 'icon-white';
+}
+?>"></i></a>
+					    <a href="javascript:void('')" class="tip-left erase-button <?php if($delete_folders && !$file_prevent_delete) {
+    echo "delete-folder";
+}
+?>" title="<?php echo lang_Erase?>" data-confirm="<?php echo lang_Confirm_Folder_del; ?>" data-path="<?php echo $rfm_subfolder.$subdir.$file; ?>"  data-thumb="<?php echo $thumbs_path.$subdir .$file; ?>">
+					    <i class="icon-trash <?php if(!$delete_folders || $file_prevent_delete) {
+    echo 'icon-white';
+}
+?>"></i>
 					    </a>
 				    </figcaption>
 			<?php } ?>
@@ -663,8 +762,9 @@ 
 		    foreach ($files as $nu=>$file_array) {		
 			$file=$file_array['file'];
 		    
-			    if($file === '.' || $file === '..' || is_dir($current_path.$rfm_subfolder.$subdir.$file) || in_array($file, $hidden_files) || !in_array(fix_strtolower($file_array['extension']), $ext) || ($filter!='' && strpos($file,$filter)===false))
-				    continue;
+			    if($file === '.' || $file === '..' || is_dir($current_path.$rfm_subfolder.$subdir.$file) || in_array($file, $hidden_files) || !in_array(fix_strtolower($file_array['extension']), $ext) || ($filter!='' && strpos($file,$filter)===false)) {
+			    				    continue;
+			    }
 			    
 			    $file_path=$current_path.$rfm_subfolder.$subdir.$file;
 			    //check if file have illegal caracter
@@ -732,7 +832,7 @@ 
 				$no_thumb=true;
 				if(file_exists('img/'.$icon_theme.'/'.$extension_lower.".jpg")){
 					$src_thumb ='img/'.$icon_theme.'/'.$extension_lower.".jpg";
-				}else{
+				} else{
 					$src_thumb = "img/".$icon_theme."/default.jpg";
 				}
 				$is_icon_thumb=true;
@@ -745,14 +845,14 @@ 
 			    if (in_array($extension_lower, $ext_video)) {
 				    $class_ext = 4;
 				    $is_video=true;
-			    }elseif (in_array($extension_lower, $ext_img)) {
+			    } elseif (in_array($extension_lower, $ext_img)) {
 				    $class_ext = 2;
-			    }elseif (in_array($extension_lower, $ext_music)) {
+			    } elseif (in_array($extension_lower, $ext_music)) {
 				    $class_ext = 5;
 				    $is_audio=true;
-			    }elseif (in_array($extension_lower, $ext_misc)) {
+			    } elseif (in_array($extension_lower, $ext_misc)) {
 				    $class_ext = 3;
-			    }else{
+			    } else{
 				    $class_ext = 1;
 			    }
 			    if((!($_GET['type']==1 && !$is_img) && !(($_GET['type']==3 && !$is_video) && ($_GET['type']==3 && !$is_audio))) && $class_ext>0){
@@ -767,7 +867,7 @@ 
 			$file_prevent_rename = isset($filePermissions[$file]['prevent_rename']) && $filePermissions[$file]['prevent_rename'];
 			$file_prevent_delete = isset($filePermissions[$file]['prevent_delete']) && $filePermissions[$file]['prevent_delete'];
 		    }
-            ?>		<figure data-name="<?php echo $file ?>" data-type="<?php if($is_img){ echo "img"; }else{ echo "file"; } ?>">
+            ?>		<figure data-name="<?php echo $file ?>" data-type="<?php if($is_img){ echo "img"; } else{ echo "file"; } ?>">
 				<a href="javascript:void('')" class="link" data-file="<?php echo $file; ?>" data-field_id="<?php echo $field_id; ?>" data-function="<?php echo $apply; ?>">
 				<div class="img-precontainer">
 				    <?php if($is_icon_thumb){ ?><div class="filetype"><?php echo $extension_lower ?></div><?php } ?>
@@ -776,8 +876,11 @@ 
 					    <img alt="<?php echo $filename." thumbnails";?>" class="<?php echo $show_original ? "original" : "" ?> <?php echo $is_icon_thumb ? "icon" : "" ?>" src="<?php echo $src_thumb; ?>">
 				    </div>
 				</div>
-				<div class="img-precontainer-mini <?php if($is_img) echo 'original-thumb' ?>">
-				    <div class="filetype <?php echo $extension_lower ?> <?php if(!$is_icon_thumb){ echo "hide"; }?>"><?php echo $extension_lower ?></div>
+				<div class="img-precontainer-mini <?php if($is_img) {
+    echo 'original-thumb' ?>">
+				    <div class="filetype <?php echo $extension_lower ?> <?php if(!$is_icon_thumb){ echo "hide";
+}
+}?>"><?php echo $extension_lower ?></div>
 				    <div class="img-container-mini">
 					<span></span>
 					<?php if($mini_src!=""){ ?>
@@ -809,18 +912,30 @@ 
 				    <a title="<?php echo lang_Download?>" class="tip-right" href="javascript:void('')" onclick="$('#form<?php echo $nu; ?>').submit();"><i class="icon-download"></i></a>
 				    <?php if($is_img && $src_thumb!=""){ ?>
 				    <a class="tip-right preview" title="<?php echo lang_Preview?>" data-url="<?php echo $src;?>" data-toggle="lightbox" href="#previewLightbox"><i class=" icon-eye-open"></i></a>
-				    <?php }elseif(($is_video || $is_audio) && in_array($extension_lower,$jplayer_ext)){ ?>
-				    <a class="tip-right modalAV <?php if($is_audio){ echo "audio"; }else{ echo "video"; } ?>"
+				    <?php } elseif(($is_video || $is_audio) && in_array($extension_lower,$jplayer_ext)){ ?>
+				    <a class="tip-right modalAV <?php if($is_audio){ echo "audio"; } else{ echo "video"; } ?>"
 					title="<?php echo lang_Preview?>" data-url="ajax_calls.php?action=media_preview&title=<?php echo $filename; ?>&file=<?php echo $current_path.$rfm_subfolder.$subdir.$file;; ?>"
 					href="javascript:void('');" ><i class=" icon-eye-open"></i></a>
-				    <?php }else{ ?>
+				    <?php } else{ ?>
 				    <a class="preview disabled"><i class="icon-eye-open icon-white"></i></a>
 				    <?php } ?>
-				    <a href="javascript:void('')" class="tip-left edit-button rename-file-paths <?php if($rename_files && !$file_prevent_rename) echo "rename-file"; ?>" title="<?php echo lang_Rename?>" data-path="<?php echo $rfm_subfolder.$subdir .$file; ?>" data-thumb="<?php echo $thumbs_path.$subdir .$file; ?>">
- 				    <i class="icon-pencil <?php if(!$rename_files || $file_prevent_rename) echo 'icon-white'; ?>"></i></a>
+				    <a href="javascript:void('')" class="tip-left edit-button rename-file-paths <?php if($rename_files && !$file_prevent_rename) {
+    echo "rename-file";
+}
+?>" title="<?php echo lang_Rename?>" data-path="<?php echo $rfm_subfolder.$subdir .$file; ?>" data-thumb="<?php echo $thumbs_path.$subdir .$file; ?>">
+ 				    <i class="icon-pencil <?php if(!$rename_files || $file_prevent_rename) {
+    echo 'icon-white';
+}
+?>"></i></a>
 
-				    <a href="javascript:void('')" class="tip-left erase-button <?php if($delete_files && !$file_prevent_delete) echo "delete-file"; ?>" title="<?php echo lang_Erase?>" data-confirm="<?php echo lang_Confirm_del; ?>" data-path="<?php echo $rfm_subfolder.$subdir.$file; ?>" data-thumb="<?php echo $thumbs_path.$subdir .$file; ?>">
- 				    <i class="icon-trash <?php if(!$delete_files || $file_prevent_delete) echo 'icon-white'; ?>"></i>
+				    <a href="javascript:void('')" class="tip-left erase-button <?php if($delete_files && !$file_prevent_delete) {
+    echo "delete-file";
+}
+?>" title="<?php echo lang_Erase?>" data-confirm="<?php echo lang_Confirm_del; ?>" data-path="<?php echo $rfm_subfolder.$subdir.$file; ?>" data-thumb="<?php echo $thumbs_path.$subdir .$file; ?>">
+ 				    <i class="icon-trash <?php if(!$delete_files || $file_prevent_delete) {
+    echo 'icon-white';
+}
+?>"></i>
 				    </a>
 				    </form>
 				</figcaption>

htdocs/class/xoopseditor/tinymce4/external_plugins/filemanager/config/config.php

Indentation +9 added lines, -9 removed lines

@@ -14,13 +14,13 @@ 
 $chemin_scheme =  $chemin_array["scheme"]; // http
 $chemin_host =  $chemin_array["host"]; // www.example.com  or // localhost
 //  $chemin_path =  $chemin_array["path"]; // /myweb1
-  if (!isset($chemin_array['path']))
+    if (!isset($chemin_array['path']))
     {
-      $chemin_path = '';
+        $chemin_path = '';
     }
-  else
+    else
     {
-      $chemin_path =  $chemin_array["path"];
+        $chemin_path =  $chemin_array["path"];
     }
 // XOOPS
 
@@ -73,7 +73,7 @@ 
 
 // SERVER OVERRIDE
 if ((int)(ini_get('post_max_size')) < $MaxSizeUpload){
-	$MaxSizeUpload = (int)(ini_get('post_max_size'));
+    $MaxSizeUpload = (int)(ini_get('post_max_size'));
 }
 
 $default_language 	= "en_EN"; //default language file name
@@ -140,11 +140,11 @@ 
     $usergroups = $GLOBALS['xoopsUser']->getGroups();
     $result_upload = array_intersect($usergroups, $allowed_groups_upload);
         if ($result_upload || $result_upload!=null) {
-           $upload_files = TRUE;
+            $upload_files = TRUE;
         }
-  $result_createfolder = array_intersect($usergroups, $allowed_groups_createfolder);
-       if ($result_createfolder || $result_createfolder!=null) {
-          $create_folders = TRUE;
+    $result_createfolder = array_intersect($usergroups, $allowed_groups_createfolder);
+        if ($result_createfolder || $result_createfolder!=null) {
+            $create_folders = TRUE;
         }
 }
 // XOOPS

Spacing +36 added lines, -36 removed lines

@@ -1,18 +1,18 @@ 
 <?php
 // XOOPS
 $current_path = __DIR__;
-if ( DIRECTORY_SEPARATOR !== "/" ) {
-    $current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path);
+if (DIRECTORY_SEPARATOR !== "/") {
+    $current_path = str_replace(DIRECTORY_SEPARATOR, "/", $current_path);
 }
 $xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), "/class/xoopseditor/tinymce4/"));
-include_once $xoops_root_path . "/mainfile.php";
+include_once $xoops_root_path."/mainfile.php";
 
 $xoops = \Xoops::getInstance();
 $xoops->logger()->quiet();
 
-$chemin_array=parse_url(\XoopsBaseConfig::get('url'));
-$chemin_scheme =  $chemin_array["scheme"]; // http
-$chemin_host =  $chemin_array["host"]; // www.example.com  or // localhost
+$chemin_array = parse_url(\XoopsBaseConfig::get('url'));
+$chemin_scheme = $chemin_array["scheme"]; // http
+$chemin_host = $chemin_array["host"]; // www.example.com  or // localhost
 //  $chemin_path =  $chemin_array["path"]; // /myweb1
   if (!isset($chemin_array['path']))
     {
@@ -20,7 +20,7 @@ 
     }
   else
     {
-      $chemin_path =  $chemin_array["path"];
+      $chemin_path = $chemin_array["path"];
     }
 // XOOPS
 
@@ -28,7 +28,7 @@ 
 
 //XOOPS
 //session_start();
-if(!isset($_SESSION))
+if (!isset($_SESSION))
 {
 session_start();
 }
@@ -54,7 +54,7 @@ 
 //    |   |   |   |   |- plugin.min.js
 
 //$base_url="http://www.site.com";  // base url (only domain) of site (without final /). If you prefer relative urls leave empty
-$base_url=$chemin_scheme."://".$chemin_host;
+$base_url = $chemin_scheme."://".$chemin_host;
 
 //$upload_dir = '/source/'; // path from base_url to base of upload folder (with start and final /)
 
@@ -72,16 +72,16 @@ 
 $MaxSizeUpload = 100; //Mb
 
 // SERVER OVERRIDE
-if ((int)(ini_get('post_max_size')) < $MaxSizeUpload){
+if ((int)(ini_get('post_max_size')) < $MaxSizeUpload) {
 	$MaxSizeUpload = (int)(ini_get('post_max_size'));
 }
 
 $default_language 	= "en_EN"; //default language file name
-$icon_theme 		= "ico"; //ico or ico_dark you can cusatomize just putting a folder inside filemanager/img
+$icon_theme = "ico"; //ico or ico_dark you can cusatomize just putting a folder inside filemanager/img
 $show_folder_size 	= TRUE; //Show or not show folder size in list view feature in filemanager (is possible, if there is a large folder, to greatly increase the calculations)
 $show_sorting_bar 	= TRUE; //Show or not show sorting feature in filemanager
-$loading_bar 		= TRUE; //Show or not show loading bar
-$transliteration 	= FALSE; //active or deactive the transliteration (mean convert all strange characters in A..Za..z0..9 characters)
+$loading_bar = TRUE; //Show or not show loading bar
+$transliteration = FALSE; //active or deactive the transliteration (mean convert all strange characters in A..Za..z0..9 characters)
 
 //*******************************************
 //Images limit and resizing configuration
@@ -126,7 +126,7 @@ 
 $rename_folders	 = FALSE;
 $duplicate_files = FALSE;
 $copy_cut_files	 = FALSE; // for copy/cut files
-$copy_cut_dirs	 = FALSE; // for copy/cut directories
+$copy_cut_dirs = FALSE; // for copy/cut directories
 
 // XOOPS
 global $xoopsUser;
@@ -139,43 +139,43 @@ 
 if ($xoopsUser) {
     $usergroups = $GLOBALS['xoopsUser']->getGroups();
     $result_upload = array_intersect($usergroups, $allowed_groups_upload);
-        if ($result_upload || $result_upload!=null) {
+        if ($result_upload || $result_upload != null) {
            $upload_files = TRUE;
         }
   $result_createfolder = array_intersect($usergroups, $allowed_groups_createfolder);
-       if ($result_createfolder || $result_createfolder!=null) {
+       if ($result_createfolder || $result_createfolder != null) {
           $create_folders = TRUE;
         }
 }
 // XOOPS
 // defines size limit for paste in MB / operation
 // set 'FALSE' for no limit
-$copy_cut_max_size	 = 100;
+$copy_cut_max_size = 100;
 // defines file count limit for paste / operation
 // set 'FALSE' for no limit
-$copy_cut_max_count	 = 200;
+$copy_cut_max_count = 200;
 //IF any of these limits reached, operation won't start and generate warning
 
 //**********************
 //Allowed extensions (lowercase insert)
 //**********************
 $ext_img = array('jpg', 'jpeg', 'png', 'gif', 'bmp', 'tiff', 'svg'); //Images
-$ext_file = array('doc', 'docx','rtf', 'pdf', 'xls', 'xlsx', 'txt', 'csv','html','xhtml','psd','sql','log','fla','xml','ade','adp','mdb','accdb','ppt','pptx','odt','ots','ott','odb','odg','otp','otg','odf','ods','odp','css','ai'); //Files
-$ext_video = array('mov', 'mpeg', 'mp4', 'avi', 'mpg','wma',"flv","webm"); //Video
-$ext_music = array('mp3', 'm4a', 'ac3', 'aiff', 'mid','ogg','wav'); //Audio
-$ext_misc = array('zip', 'rar','gz','tar','iso','dmg'); //Archives
+$ext_file = array('doc', 'docx', 'rtf', 'pdf', 'xls', 'xlsx', 'txt', 'csv', 'html', 'xhtml', 'psd', 'sql', 'log', 'fla', 'xml', 'ade', 'adp', 'mdb', 'accdb', 'ppt', 'pptx', 'odt', 'ots', 'ott', 'odb', 'odg', 'otp', 'otg', 'odf', 'ods', 'odp', 'css', 'ai'); //Files
+$ext_video = array('mov', 'mpeg', 'mp4', 'avi', 'mpg', 'wma', "flv", "webm"); //Video
+$ext_music = array('mp3', 'm4a', 'ac3', 'aiff', 'mid', 'ogg', 'wav'); //Audio
+$ext_misc = array('zip', 'rar', 'gz', 'tar', 'iso', 'dmg'); //Archives
 
-$ext = array_merge($ext_img, $ext_file, $ext_misc, $ext_video,$ext_music); //allowed extensions
+$ext = array_merge($ext_img, $ext_file, $ext_misc, $ext_video, $ext_music); //allowed extensions
 
 
 /******************
  * AVIARY config
 *******************/
 $aviary_active 	= TRUE;
-$aviary_key 	= "dvh8qudbp6yx2bnp";
-$aviary_secret	= "m6xaym5q42rpw433";
+$aviary_key = "dvh8qudbp6yx2bnp";
+$aviary_secret = "m6xaym5q42rpw433";
 $aviary_version	= 3;
-$aviary_language= 'en';
+$aviary_language = 'en';
 
 
 //The filter and sorter are managed through both javascript and php scripts because if you have a lot of
@@ -213,11 +213,11 @@ 
 // path_from_filemanager/test/test1/
 // PS if there isn't write permission in your destination folder you must set it
 $fixed_image_creation                   = FALSE; //activate or not the creation of one or more image resized with fixed path from filemanager folder
-$fixed_path_from_filemanager            = array('../test/','../test1/'); //fixed path of the image folder from the current position on upload folder
-$fixed_image_creation_name_to_prepend   = array('','test_'); //name to prepend on filename
-$fixed_image_creation_to_append         = array('_test',''); //name to appendon filename
-$fixed_image_creation_width             = array(300,400); //width of image (you can leave empty if you set height)
-$fixed_image_creation_height            = array(200,''); //height of image (you can leave empty if you set width)
+$fixed_path_from_filemanager            = array('../test/', '../test1/'); //fixed path of the image folder from the current position on upload folder
+$fixed_image_creation_name_to_prepend   = array('', 'test_'); //name to prepend on filename
+$fixed_image_creation_to_append         = array('_test', ''); //name to appendon filename
+$fixed_image_creation_width             = array(300, 400); //width of image (you can leave empty if you set height)
+$fixed_image_creation_height            = array(200, ''); //height of image (you can leave empty if you set width)
 
 
 // New image resized creation with relative path inside to upload folder after uploading (thumbnails in relative mode)
@@ -225,8 +225,8 @@ 
 // just simply add a value in the array
 // The image creation path is always relative so if i'm inside source/test/test1 and I upload an image, the path start from here
 $relative_image_creation                = FALSE; //activate or not the creation of one or more image resized with relative path from upload folder
-$relative_path_from_current_pos         = array('thumb/','thumb/'); //relative path of the image folder from the current position on upload folder
-$relative_image_creation_name_to_prepend= array('','test_'); //name to prepend on filename
-$relative_image_creation_name_to_append = array('_test',''); //name to append on filename
-$relative_image_creation_width          = array(300,400); //width of image (you can leave empty if you set height)
-$relative_image_creation_height         = array(200,''); //height of image (you can leave empty if you set width)
+$relative_path_from_current_pos         = array('thumb/', 'thumb/'); //relative path of the image folder from the current position on upload folder
+$relative_image_creation_name_to_prepend = array('', 'test_'); //name to prepend on filename
+$relative_image_creation_name_to_append = array('_test', ''); //name to append on filename
+$relative_image_creation_width          = array(300, 400); //width of image (you can leave empty if you set height)
+$relative_image_creation_height         = array(200, ''); //height of image (you can leave empty if you set width)

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
   if (!isset($chemin_array['path']))
     {
       $chemin_path = '';
-    }
-  else
+    } else
     {
       $chemin_path =  $chemin_array["path"];
     }

htdocs/class/xoopseditor/tinymce4/external_plugins/filemanager/config/config.ref.php

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 
 // SERVER OVERRIDE
 if ((int)(ini_get('post_max_size')) < $MaxSizeUpload){
-	$MaxSizeUpload = (int)(ini_get('post_max_size'));
+    $MaxSizeUpload = (int)(ini_get('post_max_size'));
 }
 
 $default_language 	= "en_EN"; //default language file name

Spacing +26 added lines, -26 removed lines

@@ -19,7 +19,7 @@ 
 //    |   |   |   |- responsivefilemanager
 //    |   |   |   |   |- plugin.min.js
 
-$base_url ="http://".$_SERVER['HTTP_HOST'];  // DON'T TOUCH (base url (only domain) of site (without final /)).
+$base_url = "http://".$_SERVER['HTTP_HOST']; // DON'T TOUCH (base url (only domain) of site (without final /)).
 $upload_dir = '/source/'; // path from base_url to base of upload folder (with start and final /)
 $current_path = '../source/'; // relative path from filemanager folder to upload folder (with final /)
 //thumbs folder can't put inside upload folder
@@ -32,16 +32,16 @@ 
 $MaxSizeUpload = 100; //Mb
 
 // SERVER OVERRIDE
-if ((int)(ini_get('post_max_size')) < $MaxSizeUpload){
+if ((int)(ini_get('post_max_size')) < $MaxSizeUpload) {
 	$MaxSizeUpload = (int)(ini_get('post_max_size'));
 }
 
 $default_language 	= "en_EN"; //default language file name
-$icon_theme 		= "ico"; //ico or ico_dark you can cusatomize just putting a folder inside filemanager/img
+$icon_theme = "ico"; //ico or ico_dark you can cusatomize just putting a folder inside filemanager/img
 $show_folder_size 	= TRUE; //Show or not show folder size in list view feature in filemanager (is possible, if there is a large folder, to greatly increase the calculations)
 $show_sorting_bar 	= TRUE; //Show or not show sorting feature in filemanager
-$loading_bar 		= TRUE; //Show or not show loading bar
-$transliteration 	= FALSE; //active or deactive the transliteration (mean convert all strange characters in A..Za..z0..9 characters)
+$loading_bar = TRUE; //Show or not show loading bar
+$transliteration = FALSE; //active or deactive the transliteration (mean convert all strange characters in A..Za..z0..9 characters)
 
 //*******************************************
 //Images limit and resizing configuration
@@ -86,36 +86,36 @@ 
 $rename_folders	 = TRUE;
 $duplicate_files = TRUE;
 $copy_cut_files	 = TRUE; // for copy/cut files
-$copy_cut_dirs	 = TRUE; // for copy/cut directories
+$copy_cut_dirs = TRUE; // for copy/cut directories
 
 
 // defines size limit for paste in MB / operation
 // set 'FALSE' for no limit
-$copy_cut_max_size	 = 100;
+$copy_cut_max_size = 100;
 // defines file count limit for paste / operation
 // set 'FALSE' for no limit
-$copy_cut_max_count	 = 200;
+$copy_cut_max_count = 200;
 //IF any of these limits reached, operation won't start and generate warning
 
 //**********************
 //Allowed extensions (lowercase insert)
 //**********************
 $ext_img = array('jpg', 'jpeg', 'png', 'gif', 'bmp', 'tiff', 'svg'); //Images
-$ext_file = array('doc', 'docx','rtf', 'pdf', 'xls', 'xlsx', 'txt', 'csv','html','xhtml','psd','sql','log','fla','xml','ade','adp','mdb','accdb','ppt','pptx','odt','ots','ott','odb','odg','otp','otg','odf','ods','odp','css','ai'); //Files
-$ext_video = array('mov', 'mpeg', 'mp4', 'avi', 'mpg','wma',"flv","webm"); //Video 
-$ext_music = array('mp3', 'm4a', 'ac3', 'aiff', 'mid','ogg','wav'); //Audio
-$ext_misc = array('zip', 'rar','gz','tar','iso','dmg'); //Archives
+$ext_file = array('doc', 'docx', 'rtf', 'pdf', 'xls', 'xlsx', 'txt', 'csv', 'html', 'xhtml', 'psd', 'sql', 'log', 'fla', 'xml', 'ade', 'adp', 'mdb', 'accdb', 'ppt', 'pptx', 'odt', 'ots', 'ott', 'odb', 'odg', 'otp', 'otg', 'odf', 'ods', 'odp', 'css', 'ai'); //Files
+$ext_video = array('mov', 'mpeg', 'mp4', 'avi', 'mpg', 'wma', "flv", "webm"); //Video 
+$ext_music = array('mp3', 'm4a', 'ac3', 'aiff', 'mid', 'ogg', 'wav'); //Audio
+$ext_misc = array('zip', 'rar', 'gz', 'tar', 'iso', 'dmg'); //Archives
 
-$ext = array_merge($ext_img, $ext_file, $ext_misc, $ext_video,$ext_music); //allowed extensions
+$ext = array_merge($ext_img, $ext_file, $ext_misc, $ext_video, $ext_music); //allowed extensions
 
 /******************
  * AVIARY config
 *******************/
 $aviary_active 	= TRUE;
-$aviary_key 	= "dvh8qudbp6yx2bnp";
-$aviary_secret	= "m6xaym5q42rpw433";
+$aviary_key = "dvh8qudbp6yx2bnp";
+$aviary_secret = "m6xaym5q42rpw433";
 $aviary_version	= 3;
-$aviary_language= 'en';
+$aviary_language = 'en';
 
 
 //The filter and sorter are managed through both javascript and php scripts because if you have a lot of
@@ -150,11 +150,11 @@ 
 // path_from_filemanager/test/test1/
 // PS if there isn't write permission in your destination folder you must set it
 $fixed_image_creation                   = FALSE; //activate or not the creation of one or more image resized with fixed path from filemanager folder
-$fixed_path_from_filemanager            = array('../test/','../test1/'); //fixed path of the image folder from the current position on upload folder
-$fixed_image_creation_name_to_prepend   = array('','test_'); //name to prepend on filename
-$fixed_image_creation_to_append         = array('_test',''); //name to appendon filename
-$fixed_image_creation_width             = array(300,400); //width of image (you can leave empty if you set height)
-$fixed_image_creation_height            = array(200,''); //height of image (you can leave empty if you set width)
+$fixed_path_from_filemanager            = array('../test/', '../test1/'); //fixed path of the image folder from the current position on upload folder
+$fixed_image_creation_name_to_prepend   = array('', 'test_'); //name to prepend on filename
+$fixed_image_creation_to_append         = array('_test', ''); //name to appendon filename
+$fixed_image_creation_width             = array(300, 400); //width of image (you can leave empty if you set height)
+$fixed_image_creation_height            = array(200, ''); //height of image (you can leave empty if you set width)
 
 
 // New image resized creation with relative path inside to upload folder after uploading (thumbnails in relative mode)
@@ -162,8 +162,8 @@ 
 // just simply add a value in the array
 // The image creation path is always relative so if i'm inside source/test/test1 and I upload an image, the path start from here
 $relative_image_creation                = FALSE; //activate or not the creation of one or more image resized with relative path from upload folder
-$relative_path_from_current_pos         = array('thumb/','thumb/'); //relative path of the image folder from the current position on upload folder
-$relative_image_creation_name_to_prepend= array('','test_'); //name to prepend on filename
-$relative_image_creation_name_to_append = array('_test',''); //name to append on filename
-$relative_image_creation_width          = array(300,400); //width of image (you can leave empty if you set height)
-$relative_image_creation_height         = array(200,''); //height of image (you can leave empty if you set width)
+$relative_path_from_current_pos         = array('thumb/', 'thumb/'); //relative path of the image folder from the current position on upload folder
+$relative_image_creation_name_to_prepend = array('', 'test_'); //name to prepend on filename
+$relative_image_creation_name_to_append = array('_test', ''); //name to append on filename
+$relative_image_creation_width          = array(300, 400); //width of image (you can leave empty if you set height)
+$relative_image_creation_height         = array(200, ''); //height of image (you can leave empty if you set width)

htdocs/class/xoopseditor/tinymce4/external_plugins/filemanager/force_download.php

Spacing +10 added lines, -10 removed lines

@@ -1,28 +1,28 @@
 <?php
 include('config/config.php');
-if($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") die('forbiden');
+if ($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") die('forbiden');
 include('include/utils.php');
 
-if(strpos($_POST['path'],'/')===0
-    || strpos($_POST['path'],'../')!==FALSE
-    || strpos($_POST['path'],'./')===0)
+if (strpos($_POST['path'], '/') === 0
+    || strpos($_POST['path'], '../') !== FALSE
+    || strpos($_POST['path'], './') === 0)
     die('wrong path');
 
-if(strpos($_POST['name'],'/')!==FALSE)
+if (strpos($_POST['name'], '/') !== FALSE)
     die('wrong path');
 
-$path=$current_path.$_POST['path'];
-$name=$_POST['name'];
+$path = $current_path.$_POST['path'];
+$name = $_POST['name'];
 
-$info=pathinfo($name);
-if(!in_array(fix_strtolower($info['extension']), $ext)){
+$info = pathinfo($name);
+if (!in_array(fix_strtolower($info['extension']), $ext)) {
     die('wrong extension');
 }
 
 header('Pragma: private');
 header('Cache-control: private, must-revalidate');
 header("Content-Type: application/octet-stream");
-header("Content-Length: " .(string)(filesize($path.$name)) );
+header("Content-Length: ".(string)(filesize($path.$name)));
 header('Content-Disposition: attachment; filename="'.($name).'"');
 readfile($path.$name);
 

Braces +7 added lines, -3 removed lines

@@ -1,15 +1,19 @@
 <?php
 include('config/config.php');
-if($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") die('forbiden');
+if($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") {
+    die('forbiden');
+}
 include('include/utils.php');
 
 if(strpos($_POST['path'],'/')===0
     || strpos($_POST['path'],'../')!==FALSE
-    || strpos($_POST['path'],'./')===0)
+    || strpos($_POST['path'],'./')===0) {
     die('wrong path');
+}
 
-if(strpos($_POST['name'],'/')!==FALSE)
+if(strpos($_POST['name'],'/')!==FALSE) {
     die('wrong path');
+}
 
 $path=$current_path.$_POST['path'];
 $name=$_POST['name'];

htdocs/class/xoopseditor/tinymce4/external_plugins/filemanager/execute.php

Indentation +55 added lines, -55 removed lines

@@ -39,8 +39,8 @@ 
     
     if (file_exists($path."config.php"))
     {
-	   require_once($path."config.php");
-	   $cycle = FALSE;
+        require_once($path."config.php");
+        $cycle = FALSE;
     }
     $path = fix_dirname($path)."/";
     $cycle = FALSE;
@@ -69,54 +69,54 @@ 
                 unlink($path);
                 if (file_exists($path_thumb)) unlink($path_thumb);
 		    
-        		$info=pathinfo($path);
-        		if ($relative_image_creation){
-        		    foreach($relative_path_from_current_pos as $k=>$path)
+                $info=pathinfo($path);
+                if ($relative_image_creation){
+                    foreach($relative_path_from_current_pos as $k=>$path)
                     {
                         if ($path!="" && $path[strlen($path)-1]!=="/") $path.="/";
 
-            			if (file_exists($info['dirname']."/".$path.$relative_image_creation_name_to_prepend[$k].$info['filename'].$relative_image_creation_name_to_append[$k].".".$info['extension']))
+                        if (file_exists($info['dirname']."/".$path.$relative_image_creation_name_to_prepend[$k].$info['filename'].$relative_image_creation_name_to_append[$k].".".$info['extension']))
                         {
-            			    unlink($info['dirname']."/".$path.$relative_image_creation_name_to_prepend[$k].$info['filename'].$relative_image_creation_name_to_append[$k].".".$info['extension']);
-            			}
-        		    }
-        		}
+                            unlink($info['dirname']."/".$path.$relative_image_creation_name_to_prepend[$k].$info['filename'].$relative_image_creation_name_to_append[$k].".".$info['extension']);
+                        }
+                    }
+                }
         		
-        		if ($fixed_image_creation)
+                if ($fixed_image_creation)
                 {
-        		    foreach($fixed_path_from_filemanager as $k=>$path)
+                    foreach($fixed_path_from_filemanager as $k=>$path)
                     {
-            			if ($path!="" && $path[strlen($path)-1] !== "/") $path.="/";
+                        if ($path!="" && $path[strlen($path)-1] !== "/") $path.="/";
 
-            			$base_dir=$path.substr_replace($info['dirname']."/", '', 0, strlen($current_path));
-            			if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension']))
+                        $base_dir=$path.substr_replace($info['dirname']."/", '', 0, strlen($current_path));
+                        if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension']))
                         {
-            			    unlink($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension']);
-            			}
-        		    }
-        		}
+                            unlink($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension']);
+                        }
+                    }
+                }
             }
             break;
         case 'delete_folder':
             if ($delete_folders){
-        		if (is_dir($path_thumb))
+                if (is_dir($path_thumb))
                 {
-        		    deleteDir($path_thumb);
+                    deleteDir($path_thumb);
                 }
 
-        		if (is_dir($path))
+                if (is_dir($path))
                 {
-        		    deleteDir($path);	
-        		    if ($fixed_image_creation)
+                    deleteDir($path);	
+                    if ($fixed_image_creation)
                     {
-            			foreach($fixed_path_from_filemanager as $k=>$paths){
-            			    if ($paths!="" && $paths[strlen($paths)-1] !== "/") $paths.="/";
+                        foreach($fixed_path_from_filemanager as $k=>$paths){
+                            if ($paths!="" && $paths[strlen($paths)-1] !== "/") $paths.="/";
 
-            			    $base_dir=$paths.substr_replace($path, '', 0, strlen($current_path));
-            			    if (is_dir($base_dir)) deleteDir($base_dir);
-            			}
-        		    }
-        		}
+                            $base_dir=$paths.substr_replace($path, '', 0, strlen($current_path));
+                            if (is_dir($base_dir)) deleteDir($base_dir);
+                        }
+                    }
+                }
             }
             break;
         case 'create_folder':
@@ -134,14 +134,14 @@ 
                     if (!rename_folder($path,$name,$transliteration)) die(lang_Rename_existing_folder);
 
                     rename_folder($path_thumb,$name,$transliteration);
-        		    if ($fixed_image_creation){
-            			foreach($fixed_path_from_filemanager as $k=>$paths){
-            			    if ($paths!="" && $paths[strlen($paths)-1] !== "/") $paths.="/";
+                    if ($fixed_image_creation){
+                        foreach($fixed_path_from_filemanager as $k=>$paths){
+                            if ($paths!="" && $paths[strlen($paths)-1] !== "/") $paths.="/";
             			    
                             $base_dir=$paths.substr_replace($path, '', 0, strlen($current_path));
-            			    rename_folder($base_dir,$name,$transliteration);
-            			}
-		           }
+                            rename_folder($base_dir,$name,$transliteration);
+                        }
+                    }
                 }
                 else {
                     die(lang_Empty_name);
@@ -157,28 +157,28 @@ 
 
                     rename_file($path_thumb,$name,$transliteration);
 
-        		    if ($fixed_image_creation)
+                    if ($fixed_image_creation)
                     {
                         $info=pathinfo($path);
 
-            			foreach($fixed_path_from_filemanager as $k=>$paths)
+                        foreach($fixed_path_from_filemanager as $k=>$paths)
                         {
-            			    if ($paths!="" && $paths[strlen($paths)-1] !== "/") $paths.="/";
+                            if ($paths!="" && $paths[strlen($paths)-1] !== "/") $paths.="/";
 
-            			    $base_dir = $paths.substr_replace($info['dirname']."/", '', 0, strlen($current_path));
-            			    if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension']))
+                            $base_dir = $paths.substr_replace($info['dirname']."/", '', 0, strlen($current_path));
+                            if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension']))
                             {
-            				    rename_file($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'],$fixed_image_creation_name_to_prepend[$k].$name.$fixed_image_creation_to_append[$k],$transliteration);
-            			    }
-            			}
-        		    }
+                                rename_file($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'],$fixed_image_creation_name_to_prepend[$k].$name.$fixed_image_creation_to_append[$k],$transliteration);
+                            }
+                        }
+                    }
                 }
                 else {
                     die(lang_Empty_name);
                 }
             }
             break;
-	   case 'duplicate_file':
+        case 'duplicate_file':
             if ($duplicate_files)
             {
                 $name = fix_filename($name,$transliteration);
@@ -191,18 +191,18 @@ 
                     if ($fixed_image_creation)
                     {
                         $info=pathinfo($path);
-            			foreach($fixed_path_from_filemanager as $k=>$paths)
+                        foreach($fixed_path_from_filemanager as $k=>$paths)
                         {
-            			    if ($paths!="" && $paths[strlen($paths)-1] !== "/") $paths.= "/";
+                            if ($paths!="" && $paths[strlen($paths)-1] !== "/") $paths.= "/";
 
-            			    $base_dir=$paths.substr_replace($info['dirname']."/", '', 0, strlen($current_path));
+                            $base_dir=$paths.substr_replace($info['dirname']."/", '', 0, strlen($current_path));
 
-            			    if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension']))
+                            if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension']))
                             {
-            				duplicate_file($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'],$fixed_image_creation_name_to_prepend[$k].$name.$fixed_image_creation_to_append[$k]);
-            			    }
-            			}
-        		    }
+                            duplicate_file($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'],$fixed_image_creation_name_to_prepend[$k].$name.$fixed_image_creation_to_append[$k]);
+                            }
+                        }
+                    }
                 }
                 else
                 {

Spacing +60 added lines, -60 removed lines

@@ -4,24 +4,24 @@ 
 include('include/utils.php');
 
 
-$thumb_pos  = strpos($_POST['path_thumb'], $thumbs_base_path);
+$thumb_pos = strpos($_POST['path_thumb'], $thumbs_base_path);
 
-if ($thumb_pos !=0
-    || strpos($_POST['path_thumb'],'../',strlen($thumbs_base_path)+$thumb_pos)!==FALSE
-    || strpos($_POST['path'],'/')===0
-    || strpos($_POST['path'],'../')!==FALSE
-    || strpos($_POST['path'],'./')===0)
+if ($thumb_pos != 0
+    || strpos($_POST['path_thumb'], '../', strlen($thumbs_base_path) + $thumb_pos) !== FALSE
+    || strpos($_POST['path'], '/') === 0
+    || strpos($_POST['path'], '../') !== FALSE
+    || strpos($_POST['path'], './') === 0)
 {
     die('wrong path');
 }
 
 $language_file = 'lang/en_EN.php'; 
-if (isset($_GET['lang']) && $_GET['lang'] !== 'undefined' && $_GET['lang']!='')
+if (isset($_GET['lang']) && $_GET['lang'] !== 'undefined' && $_GET['lang'] != '')
 {
     $path_parts = pathinfo($_GET['lang']);
-    if (is_readable('lang/' .$path_parts['basename']. '.php'))
+    if (is_readable('lang/'.$path_parts['basename'].'.php'))
     { 
-        $language_file = 'lang/' .$path_parts['basename']. '.php';
+        $language_file = 'lang/'.$path_parts['basename'].'.php';
     }
 }
 
@@ -32,10 +32,10 @@ 
 $cycle = TRUE;
 $max_cycles = 50;
 $i = 0;
-while($cycle && $i<$max_cycles)
+while ($cycle && $i < $max_cycles)
 {
     $i++;
-    if ($path == $base)  $cycle=FALSE;
+    if ($path == $base)  $cycle = FALSE;
     
     if (file_exists($path."config.php"))
     {
@@ -51,29 +51,29 @@ 
 if (isset($_POST['name']))
 {
     $name = $_POST['name'];
-    if (strpos($name,'../') !== FALSE) die('wrong name');
+    if (strpos($name, '../') !== FALSE) die('wrong name');
 }
 
 $info = pathinfo($path);
-if (isset($info['extension']) && !(isset($_GET['action']) && $_GET['action']==='delete_folder') && !in_array(strtolower($info['extension']), $ext))
+if (isset($info['extension']) && !(isset($_GET['action']) && $_GET['action'] === 'delete_folder') && !in_array(strtolower($info['extension']), $ext))
 {
     die('wrong extension');
 }
     
 if (isset($_GET['action']))
 {
-    switch($_GET['action'])
+    switch ($_GET['action'])
     {
         case 'delete_file':
-            if ($delete_files){
+            if ($delete_files) {
                 unlink($path);
                 if (file_exists($path_thumb)) unlink($path_thumb);
 		    
-        		$info=pathinfo($path);
-        		if ($relative_image_creation){
-        		    foreach($relative_path_from_current_pos as $k=>$path)
+        		$info = pathinfo($path);
+        		if ($relative_image_creation) {
+        		    foreach ($relative_path_from_current_pos as $k=>$path)
                     {
-                        if ($path!="" && $path[strlen($path)-1]!=="/") $path.="/";
+                        if ($path != "" && $path[strlen($path) - 1] !== "/") $path .= "/";
 
             			if (file_exists($info['dirname']."/".$path.$relative_image_creation_name_to_prepend[$k].$info['filename'].$relative_image_creation_name_to_append[$k].".".$info['extension']))
                         {
@@ -84,11 +84,11 @@ 
         		
         		if ($fixed_image_creation)
                 {
-        		    foreach($fixed_path_from_filemanager as $k=>$path)
+        		    foreach ($fixed_path_from_filemanager as $k=>$path)
                     {
-            			if ($path!="" && $path[strlen($path)-1] !== "/") $path.="/";
+            			if ($path != "" && $path[strlen($path) - 1] !== "/") $path .= "/";
 
-            			$base_dir=$path.substr_replace($info['dirname']."/", '', 0, strlen($current_path));
+            			$base_dir = $path.substr_replace($info['dirname']."/", '', 0, strlen($current_path));
             			if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension']))
                         {
             			    unlink($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension']);
@@ -98,7 +98,7 @@ 
             }
             break;
         case 'delete_folder':
-            if ($delete_folders){
+            if ($delete_folders) {
         		if (is_dir($path_thumb))
                 {
         		    deleteDir($path_thumb);
@@ -109,10 +109,10 @@ 
         		    deleteDir($path);	
         		    if ($fixed_image_creation)
                     {
-            			foreach($fixed_path_from_filemanager as $k=>$paths){
-            			    if ($paths!="" && $paths[strlen($paths)-1] !== "/") $paths.="/";
+            			foreach ($fixed_path_from_filemanager as $k=>$paths) {
+            			    if ($paths != "" && $paths[strlen($paths) - 1] !== "/") $paths .= "/";
 
-            			    $base_dir=$paths.substr_replace($path, '', 0, strlen($current_path));
+            			    $base_dir = $paths.substr_replace($path, '', 0, strlen($current_path));
             			    if (is_dir($base_dir)) deleteDir($base_dir);
             			}
         		    }
@@ -122,24 +122,24 @@ 
         case 'create_folder':
             if ($create_folders)
             {
-                create_folder(fix_path($path,$transliteration),fix_path($path_thumb,$transliteration));
+                create_folder(fix_path($path, $transliteration), fix_path($path_thumb, $transliteration));
             }
             break;
         case 'rename_folder':
-            if ($rename_folders){
-                $name=fix_filename($name,$transliteration);
-                $name=str_replace('.','',$name);
+            if ($rename_folders) {
+                $name = fix_filename($name, $transliteration);
+                $name = str_replace('.', '', $name);
 		
-                if (!empty($name)){
-                    if (!rename_folder($path,$name,$transliteration)) die(lang_Rename_existing_folder);
+                if (!empty($name)) {
+                    if (!rename_folder($path, $name, $transliteration)) die(lang_Rename_existing_folder);
 
-                    rename_folder($path_thumb,$name,$transliteration);
-        		    if ($fixed_image_creation){
-            			foreach($fixed_path_from_filemanager as $k=>$paths){
-            			    if ($paths!="" && $paths[strlen($paths)-1] !== "/") $paths.="/";
+                    rename_folder($path_thumb, $name, $transliteration);
+        		    if ($fixed_image_creation) {
+            			foreach ($fixed_path_from_filemanager as $k=>$paths) {
+            			    if ($paths != "" && $paths[strlen($paths) - 1] !== "/") $paths .= "/";
             			    
-                            $base_dir=$paths.substr_replace($path, '', 0, strlen($current_path));
-            			    rename_folder($base_dir,$name,$transliteration);
+                            $base_dir = $paths.substr_replace($path, '', 0, strlen($current_path));
+            			    rename_folder($base_dir, $name, $transliteration);
             			}
 		           }
                 }
@@ -149,26 +149,26 @@ 
             }
             break;
         case 'rename_file':
-            if ($rename_files){
-                $name=fix_filename($name,$transliteration);
+            if ($rename_files) {
+                $name = fix_filename($name, $transliteration);
                 if (!empty($name))
                 {
-                    if (!rename_file($path,$name,$transliteration)) die(lang_Rename_existing_file);
+                    if (!rename_file($path, $name, $transliteration)) die(lang_Rename_existing_file);
 
-                    rename_file($path_thumb,$name,$transliteration);
+                    rename_file($path_thumb, $name, $transliteration);
 
         		    if ($fixed_image_creation)
                     {
-                        $info=pathinfo($path);
+                        $info = pathinfo($path);
 
-            			foreach($fixed_path_from_filemanager as $k=>$paths)
+            			foreach ($fixed_path_from_filemanager as $k=>$paths)
                         {
-            			    if ($paths!="" && $paths[strlen($paths)-1] !== "/") $paths.="/";
+            			    if ($paths != "" && $paths[strlen($paths) - 1] !== "/") $paths .= "/";
 
             			    $base_dir = $paths.substr_replace($info['dirname']."/", '', 0, strlen($current_path));
             			    if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension']))
                             {
-            				    rename_file($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'],$fixed_image_creation_name_to_prepend[$k].$name.$fixed_image_creation_to_append[$k],$transliteration);
+            				    rename_file($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'], $fixed_image_creation_name_to_prepend[$k].$name.$fixed_image_creation_to_append[$k], $transliteration);
             			    }
             			}
         		    }
@@ -181,25 +181,25 @@ 
 	   case 'duplicate_file':
             if ($duplicate_files)
             {
-                $name = fix_filename($name,$transliteration);
+                $name = fix_filename($name, $transliteration);
                 if (!empty($name))
                 {
-                    if (!duplicate_file($path,$name)) die(lang_Rename_existing_file);
+                    if (!duplicate_file($path, $name)) die(lang_Rename_existing_file);
                     
-                    duplicate_file($path_thumb,$name);
+                    duplicate_file($path_thumb, $name);
         		    
                     if ($fixed_image_creation)
                     {
-                        $info=pathinfo($path);
-            			foreach($fixed_path_from_filemanager as $k=>$paths)
+                        $info = pathinfo($path);
+            			foreach ($fixed_path_from_filemanager as $k=>$paths)
                         {
-            			    if ($paths!="" && $paths[strlen($paths)-1] !== "/") $paths.= "/";
+            			    if ($paths != "" && $paths[strlen($paths) - 1] !== "/") $paths .= "/";
 
-            			    $base_dir=$paths.substr_replace($info['dirname']."/", '', 0, strlen($current_path));
+            			    $base_dir = $paths.substr_replace($info['dirname']."/", '', 0, strlen($current_path));
 
             			    if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension']))
                             {
-            				duplicate_file($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'],$fixed_image_creation_name_to_prepend[$k].$name.$fixed_image_creation_to_append[$k]);
+            				duplicate_file($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'], $fixed_image_creation_name_to_prepend[$k].$name.$fixed_image_creation_to_append[$k]);
             			    }
             			}
         		    }
@@ -211,7 +211,7 @@ 
             }
             break;
         case 'paste_clipboard':
-            if ( ! isset($_SESSION['RF']['clipboard_action'], $_SESSION['RF']['clipboard']['path'], $_SESSION['RF']['clipboard']['path_thumb']) 
+            if (!isset($_SESSION['RF']['clipboard_action'], $_SESSION['RF']['clipboard']['path'], $_SESSION['RF']['clipboard']['path_thumb']) 
                 || $_SESSION['RF']['clipboard_action'] == '' 
                 || $_SESSION['RF']['clipboard']['path'] == ''
                 || $_SESSION['RF']['clipboard']['path_thumb'] == '')
@@ -230,22 +230,22 @@ 
             }
 
             // user wants to paste folder to it's own sub folder.. baaaah.
-            if (is_dir($data['path']) && strpos($path, $data['path']) !== FALSE){
+            if (is_dir($data['path']) && strpos($path, $data['path']) !== FALSE) {
                 die();
             } 
 
             // something terribly gone wrong
-            if ($action !== 'copy' && $action !== 'cut'){
+            if ($action !== 'copy' && $action !== 'cut') {
                 die('no action');
             }
 
             // check for writability
-            if (is_really_writable($path) === FALSE || is_really_writable($path_thumb) === FALSE){
+            if (is_really_writable($path) === FALSE || is_really_writable($path_thumb) === FALSE) {
                 die($path.'--'.$path_thumb.'--'.lang_Dir_No_Write);
             }
 
             // check if server disables copy or rename
-            if (is_function_callable(($action === 'copy' ? 'copy' : 'rename')) === FALSE){
+            if (is_function_callable(($action === 'copy' ? 'copy' : 'rename')) === FALSE) {
                 die(sprintf(lang_Function_Disabled, ($action === 'copy' ? lcfirst(lang_Copy) : lcfirst(lang_Cut))));
             }
 
@@ -260,7 +260,7 @@ 
                 rrename($data['path_thumb'], $path_thumb);
 
                 // cleanup
-                if (is_dir($data['path']) === TRUE){
+                if (is_dir($data['path']) === TRUE) {
                     rrename_after_cleaner($data['path']);
                     rrename_after_cleaner($data['path_thumb']);
                 }

Braces +47 added lines, -23 removed lines

@@ -1,6 +1,8 @@ 
 <?php
 include('config/config.php');
-if ($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") die('forbiden');
+if ($_SESSION['RF']["verify"] !== "RESPONSIVEfilemanager") {
+    die('forbiden');
+}
 include('include/utils.php');
 
 
@@ -35,7 +37,9 @@ 
 while($cycle && $i<$max_cycles)
 {
     $i++;
-    if ($path == $base)  $cycle=FALSE;
+    if ($path == $base) {
+        $cycle=FALSE;
+    }
     
     if (file_exists($path."config.php"))
     {
@@ -51,8 +55,10 @@ 
 if (isset($_POST['name']))
 {
     $name = $_POST['name'];
-    if (strpos($name,'../') !== FALSE) die('wrong name');
-}
+    if (strpos($name,'../') !== FALSE) {
+        die('wrong name');
+    }
+    }
 
 $info = pathinfo($path);
 if (isset($info['extension']) && !(isset($_GET['action']) && $_GET['action']==='delete_folder') && !in_array(strtolower($info['extension']), $ext))
@@ -67,13 +73,17 @@ 
         case 'delete_file':
             if ($delete_files){
                 unlink($path);
-                if (file_exists($path_thumb)) unlink($path_thumb);
+                if (file_exists($path_thumb)) {
+                    unlink($path_thumb);
+                }
 		    
         		$info=pathinfo($path);
         		if ($relative_image_creation){
         		    foreach($relative_path_from_current_pos as $k=>$path)
                     {
-                        if ($path!="" && $path[strlen($path)-1]!=="/") $path.="/";
+                        if ($path!="" && $path[strlen($path)-1]!=="/") {
+                            $path.="/";
+                        }
 
             			if (file_exists($info['dirname']."/".$path.$relative_image_creation_name_to_prepend[$k].$info['filename'].$relative_image_creation_name_to_append[$k].".".$info['extension']))
                         {
@@ -86,7 +96,9 @@ 
                 {
         		    foreach($fixed_path_from_filemanager as $k=>$path)
                     {
-            			if ($path!="" && $path[strlen($path)-1] !== "/") $path.="/";
+            			if ($path!="" && $path[strlen($path)-1] !== "/") {
+            			    $path.="/";
+            			}
 
             			$base_dir=$path.substr_replace($info['dirname']."/", '', 0, strlen($current_path));
             			if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension']))
@@ -110,10 +122,14 @@ 
         		    if ($fixed_image_creation)
                     {
             			foreach($fixed_path_from_filemanager as $k=>$paths){
-            			    if ($paths!="" && $paths[strlen($paths)-1] !== "/") $paths.="/";
+            			    if ($paths!="" && $paths[strlen($paths)-1] !== "/") {
+            			        $paths.="/";
+            			    }
 
             			    $base_dir=$paths.substr_replace($path, '', 0, strlen($current_path));
-            			    if (is_dir($base_dir)) deleteDir($base_dir);
+            			    if (is_dir($base_dir)) {
+            			        deleteDir($base_dir);
+            			    }
             			}
         		    }
         		}
@@ -131,19 +147,22 @@ 
                 $name=str_replace('.','',$name);
 		
                 if (!empty($name)){
-                    if (!rename_folder($path,$name,$transliteration)) die(lang_Rename_existing_folder);
+                    if (!rename_folder($path,$name,$transliteration)) {
+                        die(lang_Rename_existing_folder);
+                    }
 
                     rename_folder($path_thumb,$name,$transliteration);
         		    if ($fixed_image_creation){
             			foreach($fixed_path_from_filemanager as $k=>$paths){
-            			    if ($paths!="" && $paths[strlen($paths)-1] !== "/") $paths.="/";
+            			    if ($paths!="" && $paths[strlen($paths)-1] !== "/") {
+            			        $paths.="/";
+            			    }
             			    
                             $base_dir=$paths.substr_replace($path, '', 0, strlen($current_path));
             			    rename_folder($base_dir,$name,$transliteration);
             			}
 		           }
-                }
-                else {
+                } else {
                     die(lang_Empty_name);
                 }
             }
@@ -153,7 +172,9 @@ 
                 $name=fix_filename($name,$transliteration);
                 if (!empty($name))
                 {
-                    if (!rename_file($path,$name,$transliteration)) die(lang_Rename_existing_file);
+                    if (!rename_file($path,$name,$transliteration)) {
+                        die(lang_Rename_existing_file);
+                    }
 
                     rename_file($path_thumb,$name,$transliteration);
 
@@ -163,7 +184,9 @@ 
 
             			foreach($fixed_path_from_filemanager as $k=>$paths)
                         {
-            			    if ($paths!="" && $paths[strlen($paths)-1] !== "/") $paths.="/";
+            			    if ($paths!="" && $paths[strlen($paths)-1] !== "/") {
+            			        $paths.="/";
+            			    }
 
             			    $base_dir = $paths.substr_replace($info['dirname']."/", '', 0, strlen($current_path));
             			    if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension']))
@@ -172,8 +195,7 @@ 
             			    }
             			}
         		    }
-                }
-                else {
+                } else {
                     die(lang_Empty_name);
                 }
             }
@@ -184,7 +206,9 @@ 
                 $name = fix_filename($name,$transliteration);
                 if (!empty($name))
                 {
-                    if (!duplicate_file($path,$name)) die(lang_Rename_existing_file);
+                    if (!duplicate_file($path,$name)) {
+                        die(lang_Rename_existing_file);
+                    }
                     
                     duplicate_file($path_thumb,$name);
         		    
@@ -193,7 +217,9 @@ 
                         $info=pathinfo($path);
             			foreach($fixed_path_from_filemanager as $k=>$paths)
                         {
-            			    if ($paths!="" && $paths[strlen($paths)-1] !== "/") $paths.= "/";
+            			    if ($paths!="" && $paths[strlen($paths)-1] !== "/") {
+            			        $paths.= "/";
+            			    }
 
             			    $base_dir=$paths.substr_replace($info['dirname']."/", '', 0, strlen($current_path));
 
@@ -203,8 +229,7 @@ 
             			    }
             			}
         		    }
-                }
-                else
+                } else
                 {
                     die(lang_Empty_name);
                 }
@@ -253,8 +278,7 @@ 
             {
                 rcopy($data['path'], $path);
                 rcopy($data['path_thumb'], $path_thumb);
-            }
-            elseif ($action === 'cut')
+            } elseif ($action === 'cut')
             {
                 rrename($data['path'], $path);
                 rrename($data['path_thumb'], $path_thumb);

htdocs/class/xoopseditor/tinymce4/editor_registry.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<?php

/**
 *  TinyMCE adapter for XOOPS
 *
 * @copyright       XOOPS Project (http://xoops.org)
 * @license             GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
 * @package         class
 * @subpackage      editor
 * @since           2.3.0
 * @author          Taiwen Jiang <phppp@users.sourceforge.net>
 * @version         $Id: editor_registry.php 8066 2011-11-06 05:09:33Z beckmi $
 */

return $config = array(
        "name"      =>  "tinymce4",
        "class"     =>  "XoopsFormTinymce4",
        "file"      =>  \XoopsBaseConfig::get('root-path') . "/class/xoopseditor/tinymce4/formtinymce.php",
        "title"     =>  _XOOPS_EDITOR_TINYMCE4,
        "order"     =>  5,
        "nohtml"    =>  0
    );

\ No newline at end of file
+<?php

/**
 *  TinyMCE adapter for XOOPS
 *
 * @copyright       XOOPS Project (http://xoops.org)
 * @license             GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
 * @package         class
 * @subpackage      editor
 * @since           2.3.0
 * @author          Taiwen Jiang <phppp@users.sourceforge.net>
 * @version         $Id: editor_registry.php 8066 2011-11-06 05:09:33Z beckmi $
 */

return $config = array("name"      =>  "tinymce4", "class"     =>  "XoopsFormTinymce4", "file"      =>  \XoopsBaseConfig::get('root-path')."/class/xoopseditor/tinymce4/formtinymce.php", "title"     =>  _XOOPS_EDITOR_TINYMCE4, "order"     =>  5, "nohtml"    =>  0);

\ No newline at end of file

htdocs/class/xoopseditor/tinymce4/include/xoopsimagemanager.php

Spacing +2 added lines, -2 removed lines

@@ -15,8 +15,8 @@
  */
 
 // check categories readability by group
-$groups = is_object($GLOBALS["xoopsUser"]) ? $GLOBALS["xoopsUser"]->getGroups() : array(FixedGroups::ANONYMOUS );
-$imgcat_handler =& xoops_getHandler('imagecategory');
+$groups = is_object($GLOBALS["xoopsUser"]) ? $GLOBALS["xoopsUser"]->getGroups() : array(FixedGroups::ANONYMOUS);
+$imgcat_handler = & xoops_getHandler('imagecategory');
 if (count($imgcat_handler->getList($groups, 'imgcat_read', 1)) == 0) {
     return false;
 }

htdocs/class/xoopseditor/tinymce4/include/xoopsmlcontent.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<?php

/**
 *  TinyMCE adapter for XOOPS
 *
 * @copyright       XOOPS Project (http://xoops.org)
 * @license         GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
 * @package         class
 * @subpackage      editor
 * @since           2.3.0
 * @author          Laurent JEN <dugris@frxoops.org>
 * @version         $Id: xoopsmlcontent.php 8066 2011-11-06 05:09:33Z beckmi $
 */

// Xlanguage
if ( $GLOBALS["module_handler"]->getByDirname("xlanguage") && defined("XLANGUAGE_LANG_TAG") ) {
    return true;
}

// Easiest Multi-Language Hack (EMLH)
if ( defined('EASIESTML_LANGS') && defined('EASIESTML_LANGNAMES') ) {
    return true;
}

return false;

\ No newline at end of file
+<?php

/**
 *  TinyMCE adapter for XOOPS
 *
 * @copyright       XOOPS Project (http://xoops.org)
 * @license         GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
 * @package         class
 * @subpackage      editor
 * @since           2.3.0
 * @author          Laurent JEN <dugris@frxoops.org>
 * @version         $Id: xoopsmlcontent.php 8066 2011-11-06 05:09:33Z beckmi $
 */

// Xlanguage
if ($GLOBALS["module_handler"]->getByDirname("xlanguage") && defined("XLANGUAGE_LANG_TAG")) {
    return true; }

// Easiest Multi-Language Hack (EMLH)
if (defined('EASIESTML_LANGS') && defined('EASIESTML_LANGNAMES')) {
    return true; }

return false;

\ No newline at end of file