XOOPS / XoopsCore

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

htdocs/class/xoopseditor/tinymce4/include/xoopsemotions.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: xoopsemotions.php 8066 2011-11-06 05:09:33Z beckmi $
 */

include_once \XoopsBaseConfig::get('root-path') . "/modules/system/constants.php";
// Add your code here to check acces by groups
return true;

\ 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: xoopsemotions.php 8066 2011-11-06 05:09:33Z beckmi $
 */

include_once \XoopsBaseConfig::get('root-path')."/modules/system/constants.php"; // Add your code here to check acces by groups
return true;

\ No newline at end of file

htdocs/class/xoopseditor/tinymce4/language/english.php

Spacing +3 added lines, -3 removed lines

@@ -14,12 +14,12 @@
  * Assocated with editor_registry.php
  */
 // Name of the editor
-define("_XOOPS_EDITOR_TINYMCE4","TinyMCE4");
+define("_XOOPS_EDITOR_TINYMCE4", "TinyMCE4");
 
 // The value must be the same as /tinymce/jscripts/langs/your_language_code, for example, "en" for English, "fr" for French
 // For details, check http://tinymce.moxiecode.com/download_i18n.php
-define("_XOOPS_EDITOR_TINYMCE4_LANGUAGE","en");
+define("_XOOPS_EDITOR_TINYMCE4_LANGUAGE", "en");
 
 // FONT LIST, FORMAT: "Name=value1,value2;Name=value"
 
-define("_XOOPS_EDITOR_TINYMCE4_FONTS","Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings");
+define("_XOOPS_EDITOR_TINYMCE4_FONTS", "Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings");