diff --git a/web/css/styles.min.css b/web/css/styles.min.css index 2b126f6db..4f3346397 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -2250,7 +2250,7 @@ div.l-content > div.l-separator:nth-of-type(4) { height: 16px; overflow: hidden; padding-top: 6px; - width: 620px; + width: 593px; } .vst-ok { diff --git a/web/edit/file/index.php b/web/edit/file/index.php index a09563ae0..58158eac8 100644 --- a/web/edit/file/index.php +++ b/web/edit/file/index.php @@ -15,6 +15,9 @@ if (empty($panel)) { $panel = json_decode(implode('', $output), true); } */ + + + /* // Check user session if ((!isset($_SESSION['user'])) && (!defined('NO_AUTH_REQUIRED'))) { @@ -24,6 +27,14 @@ if ((!isset($_SESSION['user'])) && (!defined('NO_AUTH_REQUIRED'))) { } */ +// Check module activation +if (!$_SESSION['FILEMANAGER_KEY']) { + $_SESSION['request_uri'] = $_SERVER['REQUEST_URI']; + header("Location: /login/"); + exit; +} + + ?> Edit file <?= htmlspecialchars($_REQUEST['path']) ?> diff --git a/web/templates/file_manager/main.php b/web/templates/file_manager/main.php index 7fed618e5..3ab5b1dc0 100644 --- a/web/templates/file_manager/main.php +++ b/web/templates/file_manager/main.php @@ -267,10 +267,13 @@ var src = $(item).find('.source').val(); src = $.parseJSON(src); var tab = FM.getTabLetter(FM.CURRENT_TAB); + if (FM.itemIsArchieve(src)) { - $('.menu-'+tab+' .extract-btn').show(); - } - else { + if($('.menu-'+tab+' .archive.button').first().is(':visible')) + $('.menu-'+tab+' .extract-btn').first().show(); + else + $('.menu-'+tab+' .extract-btn.small').show(); + } else { $('.menu-'+tab+' .extract-btn').hide(); } }