mirror/php-ifm
1
0
Fork 0
mirror of https://github.com/misterunknown/ifm.git synced 2025-08-09 17:46:31 +02:00
Code Issues Releases Wiki Activity

Fixed auth error view, rewrite modals

Browse Source
This commit is contained in:
Anton Baranov
2020-07-10 05:34:00 +03:00
parent ac0708ce01
commit 538e249aec
20 changed files with 364 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.gitattributes vendored
View File

@@ -1,9 +0,0 @@
dist/ifm.php -diff
dist/ifm.min.php -diff
dist/* -diff
src/includes/ace.js -diff
src export-ignore
compiler.php export-ignore
.gitignore export-ignore
.gitattributes export-ignore

2
compiler.php
View File

@@ -10,7 +10,7 @@ chdir( realpath( dirname( __FILE__ ) ) );
// output files and common attrs // output files and common attrs
define( "IFM_CDN", false ); define( "IFM_CDN", false );
define( "IFM_VERSION", "<a href='https://github.com/misterunknown/ifm/tree/v2.6.1' target=_blank>v2.6.1</a>" ); define( "IFM_VERSION", "v2.6.2" );
define( "IFM_RELEASE_DIR", "dist/"); define( "IFM_RELEASE_DIR", "dist/");
define( "IFM_STANDALONE", "ifm.php" ); define( "IFM_STANDALONE", "ifm.php" );
define( "IFM_STANDALONE_GZ", "ifm.min.php" ); define( "IFM_STANDALONE_GZ", "ifm.min.php" );

2
src/i18n/ru.json
View File

@@ -101,7 +101,7 @@
"toggle_nav": "Переключить вид", "toggle_nav": "Переключить вид",
"upload": "Загрузить", "upload": "Загрузить",
"upload_drop": "Перетащите файлы для загрузки", "upload_drop": "Перетащите файлы для загрузки",
"upload_file": "Загрузить файла", "upload_file": "Загрузить файл",
"upload_remote": "Удаленная загрузка", "upload_remote": "Удаленная загрузка",
"upload_remote_url": "Удаленная загрузка по URL", "upload_remote_url": "Удаленная загрузка по URL",
"username": "Имя пользователя", "username": "Имя пользователя",

2
src/ifm.js
View File

@@ -1394,9 +1394,11 @@ function IFM(params) {
if( newFooter.style.maxHeight == '80%' ) { if( newFooter.style.maxHeight == '80%' ) {
newFooter.style.maxHeight = '6em'; newFooter.style.maxHeight = '6em';
newFooter.style.overflow = 'hidden'; newFooter.style.overflow = 'hidden';
newFooter.hidden = true;
} else { } else {
newFooter.style.maxHeight = '80%'; newFooter.style.maxHeight = '80%';
newFooter.style.overflow = 'scroll'; newFooter.style.overflow = 'scroll';
newFooter.hidden = false;
} }
} }
}); });

7
src/ifmarchive.php
View File

@@ -32,15 +32,14 @@ class IFMArchive {
if ($f != '.' && $f != '..') { if ($f != '.' && $f != '..') {
$filePath = $folder . '/' . $f; $filePath = $folder . '/' . $f;
if (file_exists($filePath) && is_readable($filePath)) if (file_exists($filePath) && is_readable($filePath))
if (is_file($filePath)) { if (is_file($filePath))
if (!is_callable($exclude_callback) || $exclude_callback($f)) if (!is_callable($exclude_callback) || $exclude_callback($f))
$archive->addFile( $filePath, substr( $filePath, $offset ) ); $archive->addFile( $filePath, substr( $filePath, $offset ) );
} elseif (is_dir($filePath)) { elseif (is_dir($filePath))
if (is_callable($exclude_callback)) if (is_callable($exclude_callback))
self::addFolder($archive, $filePath, $offset, $exclude_callback); self::addFolder($archive, $filePath, $offset, $exclude_callback);
else else
self::addFolder($archive, $filePath, $offset); self::addFolder($archive, $filePath, $offset);
}
} }
} }
closedir($handle); closedir($handle);
@@ -56,7 +55,7 @@ class IFMArchive {
if (!is_array($src)) if (!is_array($src))
$src = array($src); $src = array($src);
//file_put_contents("debug.ifm.log", var_export(is_callable($exclude_callback), true)."\n"); file_put_contents("debug.ifm.log", var_export(is_callable($exclude_callback), true)."\n");
foreach ($src as $s) foreach ($src as $s)
if (is_dir($s)) if (is_dir($s))

48
src/main.php
View File

@@ -62,7 +62,7 @@ class IFM {
private $config = array(); private $config = array();
private $templates = array(); private $templates = array();
private $i18n = array(); private $i18n = array();
public $mode = ""; public $mode = "standalone";
public function __construct( $config=array() ) { public function __construct( $config=array() ) {
@@ -218,7 +218,7 @@ IFM_ASSETS
<title>IFM - improved file manager</title> <title>IFM - improved file manager</title>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">'; <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">';
$this->getCSS(); $this->getCSS();
print '</head><body>'; print '</head><body>';
} }
@@ -994,13 +994,16 @@ IFM_ASSETS
if( ! isset( $_SESSION['ifmauth'] ) || $_SESSION['ifmauth'] !== true ) { if( ! isset( $_SESSION['ifmauth'] ) || $_SESSION['ifmauth'] !== true ) {
$login_failed = false; $login_failed = false;
$login_message = "";
if( isset( $_POST["inputLogin"] ) && isset( $_POST["inputPassword"] ) ) { if( isset( $_POST["inputLogin"] ) && isset( $_POST["inputPassword"] ) ) {
if( $this->checkCredentials( $_POST["inputLogin"], $_POST["inputPassword"] ) ) { $state = $this->checkCredentials( $_POST["inputLogin"], $_POST["inputPassword"] );
if($state['status']) {
$_SESSION['ifmauth'] = true; $_SESSION['ifmauth'] = true;
} }
else { else {
$_SESSION['ifmauth'] = false; $_SESSION['ifmauth'] = false;
$login_failed = true; $login_failed = true;
$login_message = $state['message'];
} }
} }
@@ -1013,7 +1016,7 @@ IFM_ASSETS
else else
$this->jsonResponse( array( "status"=>"ERROR", "message"=>"not authenticated" ) ); $this->jsonResponse( array( "status"=>"ERROR", "message"=>"not authenticated" ) );
} else { } else {
$this->loginForm($login_failed); $this->loginForm($login_failed, $login_message);
} }
return false; return false;
} }
@@ -1023,6 +1026,7 @@ IFM_ASSETS
} }
private function checkCredentials( $user, $pass ) { private function checkCredentials( $user, $pass ) {
$authenticated = array("status" => false, "message" => "");
list( $src, $srcopt ) = explode( ";", $this->config['auth_source'], 2 ); list( $src, $srcopt ) = explode( ";", $this->config['auth_source'], 2 );
switch( $src ) { switch( $src ) {
case "inline": case "inline":
@@ -1035,12 +1039,11 @@ IFM_ASSETS
$htpasswd = new Htpasswd( $srcopt ); $htpasswd = new Htpasswd( $srcopt );
return $htpasswd->verify( $user, $pass ); return $htpasswd->verify( $user, $pass );
} else { } else {
trigger_error( "IFM: Fatal: Credential file does not exist or is not readable" ); // trigger_error( "IFM: Fatal: Credential file does not exist or is not readable" );
return false; return $authenticated;
} }
break; break;
case "ldap": case "ldap":
$authenticated = false;
$ldapopts = explode( ";", $srcopt ); $ldapopts = explode( ";", $srcopt );
if( count( $ldapopts ) === 3 ) { if( count( $ldapopts ) === 3 ) {
list( $ldap_server, $rootdn, $ufilter ) = explode( ";", $srcopt ); list( $ldap_server, $rootdn, $ufilter ) = explode( ";", $srcopt );
@@ -1050,8 +1053,8 @@ IFM_ASSETS
} }
$u = "uid=" . $user . "," . $rootdn; $u = "uid=" . $user . "," . $rootdn;
if( ! $ds = ldap_connect( $ldap_server ) ) { if( ! $ds = ldap_connect( $ldap_server ) ) {
trigger_error( "Could not reach the ldap server.", E_USER_ERROR ); $authenticated['status'] = false;
return false; $authenticated['message'] = "Could not reach the ldap server.";
} }
ldap_set_option( $ds, LDAP_OPT_PROTOCOL_VERSION, 3 ); ldap_set_option( $ds, LDAP_OPT_PROTOCOL_VERSION, 3 );
if( $ds ) { if( $ds ) {
@@ -1059,31 +1062,32 @@ IFM_ASSETS
if( $ldbind ) { if( $ldbind ) {
if( $ufilter ) { if( $ufilter ) {
if( ldap_count_entries( $ds, ldap_search( $ds, $rootdn, $ufilter ) ) > 0 ){ if( ldap_count_entries( $ds, ldap_search( $ds, $rootdn, $ufilter ) ) > 0 ){
$authenticated = true; $authenticated['status'] = true;
} else { } else {
trigger_error( "User not allowed.", E_USER_ERROR ); $authenticated['status'] = false;
$authenticated = false; $authenticated['message'] = "User not allowed.";
} }
} else { } else {
$authenticated = true; $authenticated['status'] = true;
} }
} else { } else {
trigger_error( ldap_error( $ds ), E_USER_ERROR ); $authenticated['status'] = false;
$authenticated = false; $authenticated['message'] = ldap_error( $ds );
} }
ldap_unbind( $ds ); ldap_unbind( $ds );
} else } else {
$authenticated = false; $authenticated['status'] = false;
}
return $authenticated; return $authenticated;
break; break;
} }
return false; return $authenticated;
} }
private function loginForm($loginFailed=false) { private function loginForm($loginFailed=false, $loginMessage) {
$err = ""; $err = "";
if( $loginFailed ) if( $loginFailed )
$err = '<div class="alert alert-primary" role="alert">'.$this->l['login_failed'].'</div>'; $err = '<div class="alert alert-danger" role="alert">'.$loginMessage.'</div>';
$this->getHTMLHeader(); $this->getHTMLHeader();
$html = str_replace( "{{error}}", $err, $this->templates['login'] ); $html = str_replace( "{{error}}", $err, $this->templates['login'] );
$html = str_replace( "{{i18n.username}}", $this->l['username'], $html ); $html = str_replace( "{{i18n.username}}", $this->l['username'], $html );
@@ -1177,7 +1181,7 @@ IFM_ASSETS
private function getTypeIcon( $type ) { private function getTypeIcon( $type ) {
$type = strtolower($type); $type = strtolower($type);
switch( $type ) { switch( $type ) {
case "aac": case "aiff": case "mid": case "mp3": case "wav": return 'icon icon-file-audio'; break; case "aac": case "aiff": case "mid": case "mp3": case "wav": return 'icon icon-file-audio'; break;
case "ai": case "bmp": case "eps": case "tiff": case "gif": case "jpg": case "jpeg": case "png": case "psd": case "svg": return 'icon icon-file-image'; break; case "ai": case "bmp": case "eps": case "tiff": case "gif": case "jpg": case "jpeg": case "png": case "psd": case "svg": return 'icon icon-file-image'; break;
case "avi": case "flv": case "mp4": case "mpg": case "mkv": case "mpeg": case "webm": case "wmv": case "mov": return 'icon icon-file-video'; break; case "avi": case "flv": case "mp4": case "mpg": case "mkv": case "mpeg": case "webm": case "wmv": case "mov": return 'icon icon-file-video'; break;
case "c": case "cpp": case "css": case "dat": case "h": case "html": case "java": case "js": case "php": case "py": case "sql": case "xml": case "yml": case "json": return 'icon icon-file-code'; break; case "c": case "cpp": case "css": case "dat": case "h": case "html": case "java": case "js": case "php": case "py": case "sql": case "xml": case "yml": case "json": return 'icon icon-file-code'; break;
@@ -1186,7 +1190,7 @@ IFM_ASSETS
case "ods": case "xls": case "xlsx": return 'icon icon-file-excel'; break; case "ods": case "xls": case "xlsx": return 'icon icon-file-excel'; break;
case "odp": case "ppt": case "pptx": return 'icon icon-file-powerpoint'; break; case "odp": case "ppt": case "pptx": return 'icon icon-file-powerpoint'; break;
case "pdf": return 'icon icon-file-pdf'; break; case "pdf": return 'icon icon-file-pdf'; break;
case "tgz": case "zip": case "tar": case "tgz": case "tar.gz": case "tar.xz": case "tar.bz2": case "7z": case "rar": return 'icon icon-file-archive'; case "tgz": case "zip": case "tar": case "tgz": case "tar.gz": case "tar.xz": case "tar.bz2": case "7z": case "rar": return 'icon icon-file-archive';
default: return 'icon icon-doc'; default: return 'icon icon-doc';
} }
} }

152
src/style.css
View File

@@ -1,63 +1,63 @@
body { body {
padding-top: 70px; padding-top: 70px;
overflow-y: scroll !important; overflow-y: scroll !important;
} }
a { cursor: pointer !important; } a { cursor: pointer !important; }
a.ifmitem:focus { outline: 0 } a.ifmitem:focus { outline: 0 }
img.imgpreview { img.imgpreview {
max-width: 100%; max-width: 100%;
background-repeat: repeat repeat; background-repeat: repeat repeat;
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAAAAACoWZBhAAABI2lDQ1BJQ0MgcHJvZmlsZQAAKJGdkLFKw1AUhr9UsaXYSXEQhwyuBRHM5FIVgqAQYwWrU5qkWExiSFKKb+Cb6MN0EASfwCdQcPa/0cHBLF44/B+Hc/7/3gstOwnTcnkH0qwqXH8wuhxd2e032nTosksvCMt84HknNJ7PVyyjL33j1Tz351mJ4jKULlRZmBcVWPtiZ17lhlWs3w79Q/GD2I7SLBI/ibejNDJsdv00mYU/nuY2q3F2cW76qi1cjjnFw2bMjCkJFX1pps4RDntSl4KAe0pCaUKs3lwzFTeiUk4uB6KhSLdpyNus8zyljOUxlZdJuCOVp8nD/O/32sdZvWltLPKgCOrWkqo1mcD7I/RGsPYM3euGrM7vtzXMOPXMP9/4BdaxUFxWskm6AAAAAmJLR0QAy6Y7OAoAAAAJcEhZcwAALiMAAC4jAXilP3YAAAAiSURBVAjXY/zPwMDAcIaBgYGBiQEOCDJZzjAwMDCYkKoNAPmXAuEuYku0AAAAAElFTkSuQmCC"); background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAAAAACoWZBhAAABI2lDQ1BJQ0MgcHJvZmlsZQAAKJGdkLFKw1AUhr9UsaXYSXEQhwyuBRHM5FIVgqAQYwWrU5qkWExiSFKKb+Cb6MN0EASfwCdQcPa/0cHBLF44/B+Hc/7/3gstOwnTcnkH0qwqXH8wuhxd2e032nTosksvCMt84HknNJ7PVyyjL33j1Tz351mJ4jKULlRZmBcVWPtiZ17lhlWs3w79Q/GD2I7SLBI/ibejNDJsdv00mYU/nuY2q3F2cW76qi1cjjnFw2bMjCkJFX1pps4RDntSl4KAe0pCaUKs3lwzFTeiUk4uB6KhSLdpyNus8zyljOUxlZdJuCOVp8nD/O/32sdZvWltLPKgCOrWkqo1mcD7I/RGsPYM3euGrM7vtzXMOPXMP9/4BdaxUFxWskm6AAAAAmJLR0QAy6Y7OAoAAAAJcEhZcwAALiMAAC4jAXilP3YAAAAiSURBVAjXY/zPwMDAcIaBgYGBiQEOCDJZzjAwMDCYkKoNAPmXAuEuYku0AAAAAElFTkSuQmCC");
} }
div#content { width: 100%; height: 350px; } /* is for the ACE editor */ div#content { width: 100%; height: 350px; } /* is for the ACE editor */
label { label {
display: inline-block; display: inline-block;
margin-bottom: .5rem; margin-bottom: .5rem;
font-weight: 700; font-weight: 700;
} }
/* Make tables more compact (overwrites bootstrap default of 0.75rem) */ /* Make tables more compact (overwrites bootstrap default of 0.75rem) */
.table td, .table th { .table td, .table th {
padding: 0.25rem; padding: 0.25rem;
} }
/* narrow navbar */ /* narrow navbar */
.navbar { .navbar {
padding: 0.3rem; padding: 0.3rem;
} }
/* /*
* Icon size * Icon size
*/ */
.icon { .icon {
font-size: 14pt; font-size: 14pt;
} }
@media (max-width: 768px) { @media (max-width: 768px) {
.icon { font-size: 12pt; } .icon { font-size: 12pt; }
#filetable tr th.buttons { min-width: 85px !important; } #filetable tr th.buttons { min-width: 85px !important; }
} }
/* /*
* Filetable related settings * Filetable related settings
*/ */
#filetable th { #filetable th {
border-top: 0; border-top: 0;
} }
#filetable td:nth-child(5), #filetable th:nth-child(5) { #filetable td:nth-child(5), #filetable th:nth-child(5) {
text-align: center; text-align: center;
} }
#filetable td:nth-child(6), #filetable th:nth-child(6) { #filetable td:nth-child(6), #filetable th:nth-child(6) {
text-align: center; text-align: center;
} }
#filetable tr td:last-child { #filetable tr td:last-child {
text-align: right; text-align: right;
} }
#filetable td:last-child a:hover { #filetable td:last-child a:hover {
text-decoration: none; text-decoration: none;
} }
.td-permissions { width: 1px; } .td-permissions { width: 1px; }
@@ -80,53 +80,53 @@ div.ifminfo div.panel div.panel-body { padding: 0px !important; text-align: cen
* Footer / Task-Queue settings * Footer / Task-Queue settings
*/ */
footer { footer {
position: fixed; position: fixed;
padding-top: 1em; padding-top: 1em;
border-top: 1px; border-top: 1px;
background-color: #EEE; background-color: #EEE;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
max-height: 6em; max-height: 6em;
overflow: hidden; overflow: hidden;
} }
#waitqueue .progress { #waitqueue .progress {
position: relative; position: relative;
margin-bottom: 0; margin-bottom: 0;
} }
#waitqueue .progbarlabel { #waitqueue .progbarlabel {
position:absolute; position:absolute;
top: 0; top: 0;
left: 10px; left: 10px;
font-weight: bold; font-weight: bold;
} }
/* /*
* File drop overlay * File drop overlay
*/ */
#filedropoverlay { #filedropoverlay {
display: none; display: none;
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
text-align: center; text-align: center;
color: #FFF; color: #FFF;
background-color: lightblue; background-color: lightblue;
filter: alpha(opacity=70); filter: alpha(opacity=70);
-moz-opacity: 0.7; -moz-opacity: 0.7;
opacity: 0.7; opacity: 0.7;
z-index: 1000; z-index: 1000;
} }
#filedropoverlay h1 { #filedropoverlay h1 {
border-radius: 5px; border-radius: 5px;
color: #000; color: #000;
position:relative; position:relative;
top:50%; top:50%;
font-size: 6em; font-size: 6em;
pointer-events: none; pointer-events: none;
} }
@@ -134,8 +134,8 @@ footer {
* Datatables related settings * Datatables related settings
*/ */
table.dataTable thead th { table.dataTable thead th {
position: relative; position: relative;
background-image: none !important; background-image: none !important;
} }
/* remove original sort icons */ /* remove original sort icons */
@@ -144,50 +144,50 @@ table.dataTable thead .sorting_asc:before,
table.dataTable thead .sorting_desc:before, table.dataTable thead .sorting_desc:before,
table.dataTable thead .sorting_asc_disabled:before, table.dataTable thead .sorting_asc_disabled:before,
table.dataTable thead .sorting_desc_disabled:before { table.dataTable thead .sorting_desc_disabled:before {
right: 0 !important; right: 0 !important;
content: "" !important; content: "" !important;
} }
/* custom sort icons */ /* custom sort icons */
table.dataTable thead th.sorting:after, table.dataTable thead th.sorting:after,
table.dataTable thead th.sorting_asc:after, table.dataTable thead th.sorting_asc:after,
table.dataTable thead th.sorting_desc:after { table.dataTable thead th.sorting_desc:after {
position: absolute; position: absolute;
top: 6px; top: 6px;
right: 8px; right: 8px;
display: block; display: block;
font-family: fontello; font-family: fontello;
font-size: 0.8em; font-size: 0.8em;
opacity: 1; opacity: 1;
color: #000; color: #000;
} }
table.dataTable thead th.sorting:after { table.dataTable thead th.sorting:after {
content: "\F0DC"; content: "\F0DC";
color: #ddd; color: #ddd;
} }
table.dataTable thead th.sorting_asc:after { table.dataTable thead th.sorting_asc:after {
content: "\f0de"; content: "\f0de";
} }
table.dataTable thead th.sorting_desc:after { table.dataTable thead th.sorting_desc:after {
content: "\f0dd"; content: "\f0dd";
} }
/* /*
* Modal related settings * Modal related settings
*/ */
#copyMoveTree { #copyMoveTree {
max-height: 80vh; max-height: 80vh;
overflow: auto; overflow: auto;
} }
@media (min-width: 576px) { @media (min-width: 576px) {
.modal-dialog { .modal-dialog {
max-width: 600px; max-width: 600px;
margin: 1.75rem auto; margin: 1.75rem auto;
} }
} }
@media (min-width: 992px) { @media (min-width: 992px) {
.modal-lg, .modal-xl { .modal-lg, .modal-xl {
max-width: 800px; max-width: 800px;
} }
} }

204
src/templates/app.html
View File

@@ -1,108 +1,108 @@
<nav class="navbar navbar-expand-lg navbar-dark <nav class="navbar navbar-expand-lg navbar-dark
{{^config.inline}} {{^config.inline}}
fixed-top fixed-top
{{/config.inline}} bg-dark"> {{/config.inline}} bg-dark">
<div class="container"> <div class="container">
<a class="navbar-brand" href="#">IFM</a> <a class="navbar-brand" href="#">IFM</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="true" aria-label="{{i18n.toggle_nav}}"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="true" aria-label="{{i18n.toggle_nav}}">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="navbarCollapse"> <div class="collapse navbar-collapse" id="navbarCollapse">
<div class="navbar-nav mr-auto"> <div class="navbar-nav mr-auto">
<form class="form-inline mt-2 mt-md-0"> <form class="form-inline mt-2 mt-md-0">
<div class="input-group"> <div class="input-group">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text" id="currentDirLabel">{{i18n.path_content}} {{showpath}}</span> <span class="input-group-text" id="currentDirLabel">{{i18n.path_content}} {{showpath}}</span>
</div> </div>
<input class="form-control" id="currentDir" aria-describedby="currentDirLabel" type="text"> <input class="form-control" id="currentDir" aria-describedby="currentDirLabel" type="text">
</div> </div>
</form> </form>
</div> </div>
<ul class="navbar-nav"> <ul class="navbar-nav">
{{#config.showrefresh}} {{#config.showrefresh}}
<li class="nav-item"> <li class="nav-item">
<a id="refresh" class="nav-link"><span title="{{i18n.refresh}}" class="icon icon-arrows-cw" href="#"></span> <span class="d-inline d-sm-none">{{i18n.refresh}}</span></a> <a id="refresh" class="nav-link"><span title="{{i18n.refresh}}" class="icon icon-arrows-cw" href="#"></span> <span class="d-inline d-sm-none">{{i18n.refresh}}</span></a>
</li> </li>
{{/config.showrefresh}} {{/config.showrefresh}}
{{#config.search}} {{#config.search}}
<li class="nav-item"> <li class="nav-item">
<a id="search" class="nav-link"><span title="{{i18n.search}}" class="icon icon-search" href="#"></span> <span class="d-inline d-sm-none">{{i18n.search}}</span></a> <a id="search" class="nav-link"><span title="{{i18n.search}}" class="icon icon-search" href="#"></span> <span class="d-inline d-sm-none">{{i18n.search}}</span></a>
</li> </li>
{{/config.search}} {{/config.search}}
{{#config.upload}} {{#config.upload}}
<li class="nav-item"> <li class="nav-item">
<a id="upload" class="nav-link"><span title="{{i18n.upload}}" class="icon icon-upload" href="#"></span> <span class="d-inline d-sm-none">{{i18n.upload}}</span></a> <a id="upload" class="nav-link"><span title="{{i18n.upload}}" class="icon icon-upload" href="#"></span> <span class="d-inline d-sm-none">{{i18n.upload}}</span></a>
</li> </li>
{{/config.upload}} {{/config.upload}}
{{#config.createfile}} {{#config.createfile}}
<li class="nav-item"> <li class="nav-item">
<a id="createFile" class="nav-link"><span title="{{i18n.file_new}}" class="icon icon-doc-inv" href="#"></span> <span class="d-inline d-sm-none">{{i18n.file_new}}</span></a> <a id="createFile" class="nav-link"><span title="{{i18n.file_new}}" class="icon icon-doc-inv" href="#"></span> <span class="d-inline d-sm-none">{{i18n.file_new}}</span></a>
</li> </li>
{{/config.createfile}} {{/config.createfile}}
{{#config.createdir}} {{#config.createdir}}
<li class="nav-item"> <li class="nav-item">
<a id="createDir" class="nav-link"><span title="{{i18n.folder_new}}" class="icon icon-folder" href="#"></span> <span class="d-inline d-sm-none">{{i18n.folder_new}}</span></a> <a id="createDir" class="nav-link"><span title="{{i18n.folder_new}}" class="icon icon-folder" href="#"></span> <span class="d-inline d-sm-none">{{i18n.folder_new}}</span></a>
</li> </li>
{{/config.createdir}} {{/config.createdir}}
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></a> <a class="nav-link dropdown-toggle" href="#" id="menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></a>
<div class="dropdown-menu" aria-labelledby="menu"> <div class="dropdown-menu" aria-labelledby="menu">
{{#config.remoteupload}} {{#config.remoteupload}}
<a class="dropdown-item" href="#" id="buttonRemoteUpload"><span class="icon icon-upload-cloud"></span> {{i18n.upload_remote}}</a> <a class="dropdown-item" href="#" id="buttonRemoteUpload"><span class="icon icon-upload-cloud"></span> {{i18n.upload_remote}}</a>
{{/config.remoteupload}} {{/config.remoteupload}}
{{#config.ajaxrequest}} {{#config.ajaxrequest}}
<a class="dropdown-item" href="#" id="buttonAjaxRequest"><span class="icon icon-link-ext"></span> {{i18n.ajax_request}}</a> <a class="dropdown-item" href="#" id="buttonAjaxRequest"><span class="icon icon-link-ext"></span> {{i18n.ajax_request}}</a>
{{/config.ajaxrequest}} {{/config.ajaxrequest}}
{{#config.auth}} {{#config.auth}}
<a class="dropdown-item" href="?api=logout" id="buttonLogout"><span class="icon icon-logout"></span> {{i18n.logout}}</a> <a class="dropdown-item" href="?api=logout" id="buttonLogout"><span class="icon icon-logout"></span> {{i18n.logout}}</a>
{{/config.auth}} {{/config.auth}}
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
</nav> </nav>
<div id="filedropoverlay"> <div id="filedropoverlay">
<h1>{{i18n.upload_drop}}</h1> <h1>{{i18n.upload_drop}}</h1>
</div> </div>
<main role="main"> <main role="main">
<div class="container"> <div class="container">
<table id="filetable" class="table"> <table id="filetable" class="table">
<thead> <thead>
<tr> <tr>
<th class="th-meta hidden" data-visible="false"></th> <th class="th-meta hidden" data-visible="false"></th>
<th class="th-filename">{{i18n.filename}}</th> <th class="th-filename">{{i18n.filename}}</th>
{{#config.download}} {{#config.download}}
<th class="th-download"></th> <th class="th-download"></th>
{{/config.download}} {{/config.download}}
{{#config.showlastmodified}} {{#config.showlastmodified}}
<th class="th-lastmod">{{i18n.last_modified}}</th> <th class="th-lastmod">{{i18n.last_modified}}</th>
{{/config.showlastmodified}} {{/config.showlastmodified}}
{{#config.showfilesize}} {{#config.showfilesize}}
<th class="th-size">{{i18n.size}}</th> <th class="th-size">{{i18n.size}}</th>
{{/config.showfilesize}} {{/config.showfilesize}}
{{#config.showpermissions}} {{#config.showpermissions}}
<th class="th-permissions d-none d-md-table-cell">{{i18n.permissions}}</th> <th class="th-permissions d-none d-md-table-cell">{{i18n.permissions}}</th>
{{/config.showpermissions}} {{/config.showpermissions}}
{{#config.showowner}} {{#config.showowner}}
<th class="th-owner d-none d-lg-table-cell">{{i18n.owner}}</th> <th class="th-owner d-none d-lg-table-cell">{{i18n.owner}}</th>
{{/config.showowner}} {{/config.showowner}}
{{#config.showgroup}} {{#config.showgroup}}
<th class="th-group d-none d-xl-table-cell">{{i18n.group}}</th> <th class="th-group d-none d-xl-table-cell">{{i18n.group}}</th>
{{/config.showgroup}} {{/config.showgroup}}
<th class="th-buttons buttons"></th> <th class="th-buttons buttons"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="container"> <div class="container">
<div class="card ifminfo"> <div class="card ifminfo">
<div class="card-body p-2"> <div class="card-body p-2">
<div style="float:left; padding-left: 10px;">{{i18n.footer}} IFM_VERSION</div> <div style="float:left; padding-left: 10px;">{{i18n.footer}} <a href='https://github.com/misterunknown/ifm/tree/IFM_VERSION' target=_blank>IFM_VERSION</a></div>
<a style="float:right; padding-right: 10px;" href="http://github.com/misterunknown/ifm">{{i18n.github}}</a> <a style="float:right; padding-right: 10px;" href="http://github.com/misterunknown/ifm" target="_blank">{{i18n.github}}</a>
</div> </div>
</div> </div>
</div> </div>
</main> </main>

3
src/templates/login.html
View File

@@ -107,6 +107,7 @@ body {
<div class="text-center mb-4"> <div class="text-center mb-4">
<h1 class="h3 mb-3 font-weight-normal">IFM {{i18n.login}}</h1> <h1 class="h3 mb-3 font-weight-normal">IFM {{i18n.login}}</h1>
</div> </div>
{{error}}
<div class="form-label-group"> <div class="form-label-group">
<input type="text" name="inputLogin" id="inputLogin" class="form-control" placeholder="{{i18n.username}}" required="" autofocus=""> <input type="text" name="inputLogin" id="inputLogin" class="form-control" placeholder="{{i18n.username}}" required="" autofocus="">
<label for="inputLogin">{{i18n.username}}</label> <label for="inputLogin">{{i18n.username}}</label>
@@ -115,6 +116,8 @@ body {
<input type="password" name="inputPassword" id="inputPassword" class="form-control" placeholder="{{i18n.password}}" required=""> <input type="password" name="inputPassword" id="inputPassword" class="form-control" placeholder="{{i18n.password}}" required="">
<label for="inputPassword">{{i18n.password}}</label> <label for="inputPassword">{{i18n.password}}</label>
</div> </div>
<div class="alert alert-danger d-none" role="alert"></div>
<button class="btn btn-lg btn-primary btn-block" type="submit">{{i18n.login}}</button> <button class="btn btn-lg btn-primary btn-block" type="submit">{{i18n.login}}</button>
</form> </form>

35
src/templates/modal.ajaxrequest.html
View File

@@ -1,16 +1,31 @@
<form id="formAjaxRequest"> <form id="formAjaxRequest">
<div class="modal-body"> <div class="modal-body">
<fieldset> <fieldset>
<label>URL</label><br> <div class="form-group">
<input class="form-control" type="text" id="ajaxurl" required><br> <label for="ajaxurl">URL</label>
<label>{{i18n.data}}</label><br> <input class="form-control" type="url" id="ajaxurl" required>
<textarea class="form-control" id="ajaxdata"></textarea><br> </div>
<label>{{i18n.method}}</label><br> <div class="form-group">
<input type="radio" name="arMethod" value="GET">GET</input><input type="radio" name="arMethod" value="POST" checked="checked">POST</input><br> <label for="ajaxdata">{{i18n.data}}</label>
<textarea class="form-control" id="ajaxdata"></textarea>
</div>
<div class="form-group">
<legend>{{i18n.method}}</legend>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" id="radioget" name="arMethod" value="GET">
<label class="form-check-label" for="radioget">GET</label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" id="radiopost" name="arMethod" value="POST" checked="checked">
<label class="form-check-label" for="radiopost">POST</label>
</div>
</div>
<button type="button" class="btn btn-success" id="buttonRequest">{{i18n.request}}</button> <button type="button" class="btn btn-success" id="buttonRequest">{{i18n.request}}</button>
<button type="button" class="btn btn-secondary" id="buttonClose">{{i18n.cancel}}</button><br> <button type="button" class="btn btn-danger" id="buttonClose">{{i18n.cancel}}</button>
<label>{{i18n.response}}</label><br> <div class="form-group">
<textarea class="form-control" id="ajaxresponse"></textarea> <label for="ajaxresponse">{{i18n.response}}</label>
<textarea class="form-control" id="ajaxresponse"></textarea>
</div>
</fieldset> </fieldset>
</form>
</div> </div>
</form>

8
src/templates/modal.copymove.html
View File

@@ -1,13 +1,15 @@
<form id="formCopyMove"> <form id="formCopyMove">
<fieldset> <fieldset>
<div class="modal-body"> <div class="modal-body">
<label>{{i18n.select_destination}}:</label> <div class="form-group">
<div id="copyMoveTree"><div class="text-center"><span class="icon icon-spin5 animate-spin"></span></div></div> <label for="copyMoveTree">{{i18n.select_destination}}:</label>
<div id="copyMoveTree"><div class="text-center"><span class="icon icon-spin5 animate-spin"></span></div></div>
</div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" id="copyButton">{{i18n.copy}}</button> <button type="button" class="btn btn-secondary" id="copyButton">{{i18n.copy}}</button>
<button type="button" class="btn btn-secondary" id="moveButton">{{i18n.move}}</button> <button type="button" class="btn btn-secondary" id="moveButton">{{i18n.move}}</button>
<button type="button" class="btn btn-secondary" id="cancelButton">{{i18n.cancel}}</button> <button type="button" class="btn btn-danger" id="cancelButton">{{i18n.cancel}}</button>
</div> </div>
</fieldset> </fieldset>
</form> </form>

10
src/templates/modal.createarchive.html
View File

@@ -1,12 +1,14 @@
<form id="formCreateArchive"> <form id="formCreateArchive">
<div class="modal-body"> <div class="modal-body">
<fieldset> <fieldset>
<label>{{i18n.archivename}}:</label> <div class="form-group">
<input class="form-control" type="text" name="archivename" value="" /> <label for="archivename">{{i18n.archivename}}:</label>
<input id="archivename" class="form-control" type="text" name="archivename" value="" />
</div>
</fieldset> </fieldset>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" id="buttonSave">{{i18n.save}}</button> <button type="button" class="btn btn-success" id="buttonSave">{{i18n.save}}</button>
<button type="button" class="btn btn-secondary" id="buttonCancel">{{i18n.cancel}}</button> <button type="button" class="btn btn-danger" id="buttonCancel">{{i18n.cancel}}</button>
</div> </div>
</form> </form>

10
src/templates/modal.createdir.html
View File

@@ -1,12 +1,14 @@
<form id="formCreateDir"> <form id="formCreateDir">
<div class="modal-body"> <div class="modal-body">
<fieldset> <fieldset>
<label>{{i18n.directoryname}}:</label> <div class="form-group">
<input class="form-control" type="text" name="dirname" value="" /> <label for="dirname">{{i18n.directoryname}}:</label>
<input class="form-control" id="dirname" type="text" name="dirname" value="" />
</div>
</fieldset> </fieldset>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" id="buttonSave">{{i18n.save}}</button> <button type="button" class="btn btn-success" id="buttonSave">{{i18n.save}}</button>
<button type="button" class="btn btn-secondary" id="buttonCancel">{{i18n.cancel}}</button> <button type="button" class="btn btn-danger" id="buttonCancel">{{i18n.cancel}}</button>
</div> </div>
</form> </form>

42
src/templates/modal.extractfile.html
View File

@@ -1,29 +1,37 @@
<form id="formExtractFile"> <form id="formExtractFile">
<div class="modal-body"> <div class="modal-body">
<fieldset> <fieldset>
<label>{{i18n.extract_filename}} {{filename}}:</label> <div class="form-group">
<div class="input-group"> <label>{{i18n.extract_filename}} {{filename}}:</label>
<div class="input-group-prepend"> <div class="input-group">
<span class="input-group-text"><input type="radio" name="extractTargetLocation" value="./" checked="checked"></span> <div class="input-group-prepend">
<div class="input-group-text">
<input type="radio" name="extractTargetLocation" value="./" checked="checked">
</div>
</div>
<input class="form-control" type="text" placeholder="./" readonly>
</div> </div>
<span class="form-control">./</span> <div class="input-group">
</div> <div class="input-group-prepend">
<div class="input-group"> <div class="input-group-text">
<div class="input-group-prepend"> <input type="radio" name="extractTargetLocation" value="./{{destination}}">
<span class="input-group-text"><input type="radio" name="extractTargetLocation" value="./{{destination}}"></span> </div>
</div>
<input class="form-control" type="text" placeholder="./{{destination}}" readonly>
</div> </div>
<span class="form-control">./{{destination}}</span> <div class="input-group">
</div> <div class="input-group-prepend">
<div class="input-group"> <div class="input-group-text">
<div class="input-group-prepend"> <input type="radio" name="extractTargetLocation" value="custom">
<span class="input-group-text"><input type="radio" name="extractTargetLocation" value="custom"></span> </div>
</div>
<input id="extractCustomLocation" type="text" class="form-control" placeholder="custom location" value="">
</div> </div>
<input id="extractCustomLocation" type="text" class="form-control" placeholder="custom location" value="">
</div> </div>
</fieldset> </fieldset>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" id="buttonExtract">{{i18n.extract}}</button> <button type="button" class="btn btn-primary" id="buttonExtract">{{i18n.extract}}</button>
<button type="button" class="btn btn-secondary" id="buttonCancel">{{i18n.cancel}}</button> <button type="button" class="btn btn-danger" id="buttonCancel">{{i18n.cancel}}</button>
</div> </div>
</form> </form>

14
src/templates/modal.file.html
View File

@@ -1,15 +1,17 @@
<form id="formFile"> <form id="formFile">
<div class="modal-body"> <div class="modal-body">
<fieldset> <fieldset>
<label>{{i18n.filename}}:</label> <div class="form-group">
<input type="text" class="form-control" name="filename" value="{{filename}}"><br> <label for="filename">{{i18n.filename}}:</label>
<div id="content" name="content"></div><br> <input type="text" class="form-control" name="filename" id="filename" value="{{filename}}">
</div>
<div class="form-group" id="content" name="content"></div>
<button type="button" class="btn btn-secondary" id="editoroptions">{{i18n.editor_options}}</button> <button type="button" class="btn btn-secondary" id="editoroptions">{{i18n.editor_options}}</button>
</fieldset> </fieldset>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" id="buttonSave" class="btn btn-secondary">{{i18n.save}}</button> <button type="button" id="buttonSave" class="btn btn-primary">{{i18n.save}}</button>
<button type="button" id="buttonSaveNotClose" class="btn btn-secondary">{{i18n.save_wo_close}}</button> <button type="button" id="buttonSaveNotClose" class="btn btn-success">{{i18n.save_wo_close}}</button>
<button type="button" id="buttonClose" class="btn btn-secondary">{{i18n.close}}</button> <button type="button" id="buttonClose" class="btn btn-danger">{{i18n.close}}</button>
</div> </div>
</form> </form>

60
src/templates/modal.file_editoroptions.html
View File

@@ -1,27 +1,33 @@
<div> <form>
<div class="form-check p-0"> <div class="form-group">
<input type="checkbox" id="editor-wordwrap" <div class="form-check">
{{#wordwrap}} <input class="form-check-input" type="checkbox" id="editor-wordwrap"
checked="checked" {{#wordwrap}}
{{/wordwrap}} checked="checked"
> {{/wordwrap}}
<label class="form-check-label" for="editor-wordwrap">{{i18n.word_wrap}}</label> >
</div> <label class="form-check-label" for="editor-wordwrap">{{i18n.word_wrap}}</label>
<div class="form-check"> </div>
<input class="form-check-input" type="checkbox" id="editor-softtabs" <div class="form-check">
{{#softtabs}} <input class="form-check-input" type="checkbox" id="editor-softtabs"
checked="checked" {{#softtabs}}
{{/softtabs}} checked="checked"
> {{/softtabs}}
<label class="form-check-label" for="editor-softtabs">{{i18n.soft_tabs}}</label> >
</div> <label class="form-check-label" for="editor-softtabs">{{i18n.soft_tabs}}</label>
<div class="input-group"> </div>
<div class="input-group-prepend"><span class="input-group-text">{{i18n.tab_size}}</span></div><input class="form-control" type="text" size="2" id="editor-tabsize" title="{{i18n.tab_size}}" value="{{tabsize}}"></div> </div>
{{#ace_includes}} <div class="input-group">
<select class="form-control selectpicker" data-toggle="dropdown" data-live-search="true" data-size="15" id="editor-syntax"> <div class="input-group-prepend">
{{#modes}} <span class="input-group-text" id="editor-tabsize-label">{{i18n.tab_size}}</span>
<option value="ace/mode/{{.}}" {{{ace_mode_selected}}}>{{.}}</option> </div>
{{/modes}} <input class="form-control" type="number" min="1" max="9" maxlength="1" id="editor-tabsize" title="{{i18n.tab_size}}" value="{{tabsize}}" aria-describedby="editor-tabsize-label">
</select> </div>
{{/ace_includes}} {{#ace_includes}}
</div> <select class="form-control selectpicker" data-toggle="dropdown" data-live-search="true" data-size="15" id="editor-syntax">
{{#modes}}
<option value="ace/mode/{{.}}" {{{ace_mode_selected}}}>{{.}}</option>
{{/modes}}
</select>
{{/ace_includes}}
</form>

29
src/templates/modal.remoteupload.html
View File

@@ -1,16 +1,29 @@
<form id="formRemoteUpload"> <form id="formRemoteUpload">
<div class="modal-body"> <div class="modal-body">
<fieldset> <fieldset>
<label>{{i18n.upload_remote_url}}</label><br> <div class="form-group">
<input class="form-control" type="text" id="url" name="url" required><br> <label for="url">{{i18n.upload_remote_url}}</label>
<label>{{i18n.filename}}</label> <input class="form-control" type="url" id="url" name="url" required>
<input class="form-control" type="text" id="filename" name="filename" required><br> </div>
<label>{{i18n.method}}</label> <div class="form-group">
<input type="radio" name="method" value="curl" checked="checked">cURL<input type="radio" name="method" value="file">file</input><br> <label for="filename">{{i18n.filename}}</label>
<input class="form-control" type="text" id="filename" name="filename" required>
</div>
<div class="form-group">
<legend>{{i18n.method}}</legend>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" id="radiocurl" name="method" value="curl" checked="checked">
<label class="form-check-label" for="radiocurl">cURL</label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" id="radiofile" name="method" value="file">
<label class="form-check-label" for="radiofile">file</label>
</div>
</div>
</fieldset> </fieldset>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" id="buttonUpload">{{i18n.upload}}</button> <button type="button" class="btn btn-primary" id="buttonUpload">{{i18n.upload}}</button>
<button type="button" class="btn btn-secondary" id="buttonCancel">{{i18n.cancel}}</button> <button type="button" class="btn btn-danger" id="buttonCancel">{{i18n.cancel}}</button>
</div> </div>
</form> </form>

8
src/templates/modal.renamefile.html
View File

@@ -1,12 +1,14 @@
<form id="formRenameFile"> <form id="formRenameFile">
<div class="modal-body"> <div class="modal-body">
<fieldset> <fieldset>
<label>{{i18n.rename_filename}} {{filename}}:</label> <div class="form-group">
<input class="form-control" type="text" name="newname" value="" /><br> <label for="newname">{{i18n.rename_filename}} {{filename}}:</label>
<input id="newname" class="form-control" type="text" name="newname" value="" />
</div>
</fieldset> </fieldset>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" id="buttonRename">{{i18n.file_rename}}</button> <button type="button" class="btn btn-secondary" id="buttonRename">{{i18n.file_rename}}</button>
<button type="button" class="btn btn-secondary" id="buttonCancel">{{i18n.cancel}} </button> <button type="button" class="btn btn-danger" id="buttonCancel">{{i18n.cancel}} </button>
</div> </div>
</form> </form>

6
src/templates/modal.search.html
View File

@@ -1,8 +1,10 @@
<form id="searchForm"> <form id="searchForm">
<div class="modal-body"> <div class="modal-body">
<fieldset> <fieldset>
<label>{{i18n.search_pattern}}:</label> <div class="form-group">
<input type="text" class="form-control" id="searchPattern" name="pattern" autocomplete="off" value="{{lastSearch}}"><br> <label for="searchPattern">{{i18n.search_pattern}}:</label>
<input type="search" class="form-control" id="searchPattern" name="pattern" autocomplete="off" value="{{lastSearch}}">
</div>
<table id="searchResults" class="table"> <table id="searchResults" class="table">
</table> </table>
</fieldset> </fieldset>

18
src/templates/modal.uploadfile.html
View File

@@ -1,14 +1,20 @@
<form id="formUploadFile"> <form id="formUploadFile">
<div class="modal-body"> <div class="modal-body">
<fieldset> <fieldset>
<label>{{i18n.upload_file}}</label><br> <div class="form-group">
<input class="form-control-file" type="file" name="files" multiple><br> <div class="custom-file">
<label>{{i18n.filename_new}}</label> <label class="custom-file-label" for="fileselect">{{i18n.upload_file}}</label>
<input class="form-control" type="text" name="newfilename"><br> <input class="custom-file-input" type="file" name="files" id="fileselect" multiple>
</div>
</div>
<div class="form-group">
<label for="filename">{{i18n.filename_new}}</label>
<input class="form-control" type="text" name="newfilename" id="filename">
</div>
</fieldset> </fieldset>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-secondary" id="buttonUpload">{{i18n.upload}}</button> <button class="btn btn-primary" id="buttonUpload">{{i18n.upload}}</button>
<button class="btn btn-secondary" id="buttonCancel">{{i18n.cancel}}</button> <button class="btn btn-danger" id="buttonCancel">{{i18n.cancel}}</button>
</div> </div>
</form> </form>