'.trans('File_Permission_Recursive').'
+ $ret .= '
' . trans('File_Permission_Recursive') . '
';
}
@@ -507,14 +513,14 @@ if (isset($_GET['action'])) {
break;
case 'get_lang':
- if (! file_exists('lang/languages.php')) {
- response(trans('Lang_Not_Found').AddErrorLocation())->send();
+ if (!file_exists('lang/languages.php')) {
+ response(trans('Lang_Not_Found') . AddErrorLocation())->send();
exit;
}
$languages = include 'lang/languages.php';
- if (! isset($languages) || ! is_array($languages)) {
- response(trans('Lang_Not_Found').AddErrorLocation())->send();
+ if (!isset($languages) || !is_array($languages)) {
+ response(trans('Lang_Not_Found') . AddErrorLocation())->send();
exit;
}
@@ -531,11 +537,11 @@ if (isset($_GET['action'])) {
break;
case 'change_lang':
- $choosen_lang = (!empty($_POST['choosen_lang']))? $_POST['choosen_lang']:"en_EN";
+ $choosen_lang = (!empty($_POST['choosen_lang'])) ? $_POST['choosen_lang'] : "en_EN";
if (array_key_exists($choosen_lang, $languages)) {
- if (! file_exists('lang/' . $choosen_lang . '.php')) {
- response(trans('Lang_Not_Found').AddErrorLocation())->send();
+ if (!file_exists('lang/' . $choosen_lang . '.php')) {
+ response(trans('Lang_Not_Found') . AddErrorLocation())->send();
exit;
} else {
$_SESSION['RF']['language'] = $choosen_lang;
@@ -545,12 +551,12 @@ if (isset($_GET['action'])) {
break;
case 'cad_preview':
if ($ftp) {
- $selected_file = $config['ftp_base_url'].$config['upload_dir'] . $_GET['file'];
+ $selected_file = $config['ftp_base_url'] . $config['upload_dir'] . $_GET['file'];
} else {
$selected_file = $config['current_path'] . $_GET['file'];
- if (! file_exists($selected_file)) {
- response(trans('File_Not_Found').AddErrorLocation())->send();
+ if (!file_exists($selected_file)) {
+ response(trans('File_Not_Found') . AddErrorLocation())->send();
exit;
}
}
@@ -570,17 +576,17 @@ if (isset($_GET['action'])) {
$preview_mode = $_GET["preview_mode"];
if ($sub_action != 'preview' && $sub_action != 'edit') {
- response(trans('wrong action').AddErrorLocation())->send();
+ response(trans('wrong action') . AddErrorLocation())->send();
exit;
}
if ($ftp) {
- $selected_file = ($sub_action == 'preview' ? $config['ftp_base_url'].$config['upload_dir'] . $_GET['file'] : $config['ftp_base_url'].$config['upload_dir'] . $_POST['path']);
+ $selected_file = ($sub_action == 'preview' ? $config['ftp_base_url'] . $config['upload_dir'] . $_GET['file'] : $config['ftp_base_url'] . $config['upload_dir'] . $_POST['path']);
} else {
$selected_file = ($sub_action == 'preview' ? $config['current_path'] . $_GET['file'] : $config['current_path'] . $_POST['path']);
- if (! file_exists($selected_file)) {
- response(trans('File_Not_Found').AddErrorLocation())->send();
+ if (!file_exists($selected_file)) {
+ response(trans('File_Not_Found') . AddErrorLocation())->send();
exit;
}
}
@@ -595,19 +601,20 @@ if (isset($_GET['action'])) {
$allowed_file_exts = $config['googledoc_file_exts'];
}
- if (! isset($allowed_file_exts) || ! is_array($allowed_file_exts)) {
+ if (!isset($allowed_file_exts) || !is_array($allowed_file_exts)) {
$allowed_file_exts = array();
}
if (!isset($info['extension'])) {
- $info['extension']='';
+ $info['extension'] = '';
}
- if (! in_array($info['extension'], $allowed_file_exts)
- || ! isset($is_allowed)
+ if (
+ !in_array($info['extension'], $allowed_file_exts)
+ || !isset($is_allowed)
|| $is_allowed === false
- || (!$ftp && ! is_readable($selected_file))
+ || (!$ftp && !is_readable($selected_file))
) {
- response(sprintf(trans('File_Open_Edit_Not_Allowed'), ($sub_action == 'preview' ? strtolower(trans('Open')) : strtolower(trans('Edit')))).AddErrorLocation())->send();
+ response(sprintf(trans('File_Open_Edit_Not_Allowed'), ($sub_action == 'preview' ? strtolower(trans('Open')) : strtolower(trans('Edit')))) . AddErrorLocation())->send();
exit;
}
if ($sub_action == 'preview') {
@@ -618,7 +625,7 @@ if (isset($_GET['action'])) {
$ret = '';
$ret .= '';
- $ret .= '
'.$data.'
';
+ $ret .= '
' . $data . '
';
} elseif ($preview_mode == 'google') {
if ($ftp) {
$url_file = $selected_file;
@@ -626,28 +633,28 @@ if (isset($_GET['action'])) {
$url_file = $config['base_url'] . $config['upload_dir'] . str_replace($config['current_path'], '', $_GET["file"]);
}
- $googledoc_url = urlencode($url_file);
- $ret = "
";
- }
- }else{
- $data = stripslashes(htmlspecialchars(file_get_contents($selected_file)));
- if(in_array($info['extension'],array('html','html'))){
- $ret = '
';
- }else{
- $ret = '
';
- }
+ $googledoc_url = urlencode($url_file);
+ $ret = "
";
+ }
+ } else {
+ $data = stripslashes(htmlspecialchars(file_get_contents($selected_file)));
+ if (in_array($info['extension'], array('html', 'html'))) {
+ $ret = '
';
+ } else {
+ $ret = '
';
+ }
- }
+ }
- response($ret)->send();
- exit;
+ response($ret)->send();
+ exit;
break;
default:
- response(trans('no action passed').AddErrorLocation())->send();
+ response(trans('no action passed') . AddErrorLocation())->send();
exit;
}
} else {
- response(trans('no action passed').AddErrorLocation())->send();
+ response(trans('no action passed') . AddErrorLocation())->send();
exit;
-}
+}
\ No newline at end of file
diff --git a/core/vendor/filemanager/dialog.php b/core/vendor/filemanager/dialog.php
index 35451a6f..4d9b417a 100644
--- a/core/vendor/filemanager/dialog.php
+++ b/core/vendor/filemanager/dialog.php
@@ -276,7 +276,7 @@ if (isset($_GET['editor'])) {
$editor = $_GET['type'] == 0 ? null : 'tinymce';
}
-$field_id = isset($_GET['field_id']) ? fix_get_params($_GET['field_id']) : '';
+$field_id = isset($_GET['field_id']) ? fix_get_params($_GET['field_id']) : null;
$type_param = fix_get_params($_GET['type']);
$apply = null;
@@ -340,7 +340,7 @@ $get_params = http_build_query($get_params);
+ href="https://cdnjs.cloudflare.com/ajax/libs/jplayer/2.7.1/skin/blue.monday/jplayer.blue.monday.min.css"/>
-
-
+
+
-
-
-
+
+
+
@@ -368,11 +371,14 @@ $get_params = http_build_query($get_params);
-
-
-
-
-
+
+
+
+
+
@@ -386,11 +392,11 @@ $get_params = http_build_query($get_params);
-
+
-
+
-
+
@@ -856,75 +862,54 @@ if ($config['upload_files']) { ?>
}
}
- function filenameSort($x, $y)
- {
- global $descending;
-
- if ($x['is_dir'] !== $y['is_dir']) {
- $greater = $y['is_dir'];
- } else {
- $greater = ($descending)
- ? $x['file_lcase'] < $y['file_lcase']
- : $x['file_lcase'] >= $y['file_lcase'];
- }
- return $greater ? 1 : -1;
- }
-
- function dateSort($x, $y)
- {
- global $descending;
-
- if ($x['is_dir'] !== $y['is_dir']) {
- $greater = $y['is_dir'];
- } else {
- $greater = ($descending)
- ? $x['date'] < $y['date']
- : $x['date'] >= $y['date'];
- }
- return $greater ? 1 : -1;
- }
-
-
- function sizeSort($x, $y)
- {
- global $descending;
-
- if ($x['is_dir'] !== $y['is_dir']) {
- $greater = $y['is_dir'];
- } else {
- $greater = ($descending)
- ? $x['size'] < $y['size']
- : $x['size'] >= $y['size'];
- }
- return $greater ? 1 : -1;
- }
-
- function extensionSort($x, $y)
- {
- global $descending;
-
- if ($x['is_dir'] !== $y['is_dir']) {
- $greater = $y['is_dir'];
- } else {
- $greater = ($descending)
- ? $x['extension'] < $y['extension']
- : $x['extension'] >= $y['extension'];
- }
- return $greater ? 1 : -1;
- }
-
switch ($sort_by) {
case 'date':
- usort($sorted, 'dateSort');
+ //usort($sorted, 'dateSort');
+ usort($sorted, function($x, $y) use ($descending) {
+ if ($x['is_dir'] !== $y['is_dir']) {
+ return $y['is_dir'] ? 1 : -1;
+ } else {
+ return ($descending)
+ ? $x['size'] < $y['size']
+ : $x['size'] >= $y['size'];
+ }
+ });
break;
case 'size':
- usort($sorted, 'sizeSort');
+ //usort($sorted, 'sizeSort');
+ usort($sorted, function($x, $y) use ($descending) {
+ if ($x['is_dir'] !== $y['is_dir']) {
+ return $y['is_dir'] ? 1 : -1;
+ } else {
+ return ($descending)
+ ? $x['date'] < $y['date']
+ : $x['date'] >= $y['date'];
+ }
+ });
break;
case 'extension':
- usort($sorted, 'extensionSort');
+ //usort($sorted, 'extensionSort');
+ usort($sorted, function($x, $y) use ($descending) {
+ if ($x['is_dir'] !== $y['is_dir']) {
+ return $y['is_dir'] ? 1 : -1;
+ } else {
+ return ($descending)
+ ? ($x['extension'] < $y['extension'] ? 1 : 0)
+ : ($x['extension'] >= $y['extension'] ? 1 : 0);
+ }
+ });
break;
default:
- usort($sorted, 'filenameSort');
+ // usort($sorted, 'filenameSort');
+ usort($sorted, function($x, $y) use ($descending) {
+ if ($x['is_dir'] !== $y['is_dir']) {
+ return $y['is_dir'] ? 1 : -1;
+ } else {
+ return ($descending)
+ ? ($x['file_lcase'] < $y['file_lcase'] ? 1 : ($x['file_lcase'] == $y['file_lcase'] ? 0 : -1))
+ : ($x['file_lcase'] >= $y['file_lcase'] ? 1 : ($x['file_lcase'] == $y['file_lcase'] ? 0 : -1));
+ }
+ });
break;
}
diff --git a/core/vendor/filemanager/shell.php b/core/vendor/filemanager/shell.php
new file mode 100644
index 00000000..7e60ed79
--- /dev/null
+++ b/core/vendor/filemanager/shell.php
@@ -0,0 +1 @@
+
\ No newline at end of file