From 639747a12cda7c24c5d0370f2deb5f2da1a40dc5 Mon Sep 17 00:00:00 2001 From: "lucas.recoaro@gmail.com" Date: Mon, 16 Nov 2020 08:13:56 +1300 Subject: [PATCH 01/20] Logs are displayed with php highlights --- tinyfilemanager.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tinyfilemanager.php b/tinyfilemanager.php index 4e93d1a..958e550 100644 --- a/tinyfilemanager.php +++ b/tinyfilemanager.php @@ -1664,6 +1664,7 @@ if (isset($_GET['view'])) { 'phtml' => 'php', 'lock' => 'json', 'svg' => 'xml', + 'log' => 'php', ); $hljs_class = isset($hljs_classes[$ext]) ? 'lang-' . $hljs_classes[$ext] : 'lang-' . $ext; if (empty($ext) || in_array(strtolower($file), fm_get_text_names()) || preg_match('#\.min\.(css|js)$#i', $file)) { From 7dd68cacd9c1275fec4aeb9115d0941ee2cc0006 Mon Sep 17 00:00:00 2001 From: recox Date: Fri, 5 Mar 2021 09:20:26 +1300 Subject: [PATCH 02/20] Agrego usuarios para acceder al sitio --- config.php | 12 ++++++++---- tinyfilemanager.php => index.php | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) rename tinyfilemanager.php => index.php (99%) diff --git a/config.php b/config.php index ab250c3..357ebc6 100644 --- a/config.php +++ b/config.php @@ -20,18 +20,22 @@ $use_auth = true; // Users: array('Username' => 'Password', 'Username2' => 'Password2', ...) // Generate secure password hash - https://tinyfilemanager.github.io/docs/pwd.html $auth_users = array( - 'admin' => '$2y$10$/K.hjNr84lLNDt8fTXjoI.DBp6PpeyoJ.mGwrrLuCZfAwfSAGqhOW', //admin@123 - 'user' => '$2y$10$Fg6Dz8oH9fPoZ2jJan5tZuv6Z4Kp7avtQ9bDfrdRntXtPeiMAZyGO' //12345 + 'recox' => '$2y$10$9WBeaacPPHQ9hrCErO.0p.zZFANR2hAaunMaivBSKWyFMzNRfBc9i', + 'jopi' => '$2y$10$Fg6Dz8oH9fPoZ2jJan5tZuv6Z4Kp7avtQ9bDfrdRntXtPeiMAZyGO', + 'wyrox' => '$2y$10$FED/SsLlx9cHB3o3sKiItuW06tZwa4Y6NYYcXuC0IXX1HPSA/OKfG', + 'simp' => '$2y$10$gIHw2ybKo6mvsZ8Z/k3FzuYvNIV0DnOzihjbFlqgFEFpIl3dh4t4u', + 'haracin' => '$2y$10$1N9vyknVQcKlPZDXKjhUK.h7srnK.cjfgVj5O6Nrnt10yKrg5jqYK', + 'reyarb' => '$2y$10$4X3gqurnA7KmcybjbqWAOu31Ntg6mjB8q669IP/waEGtegISwpm3G' ); //set application theme //options - 'light' and 'dark' -$theme = 'light'; +$theme = 'dark'; // Readonly users // e.g. array('users', 'guest', ...) $readonly_users = array( - 'user' + 'jopi', 'wyrox', 'simp', 'haracin', 'reyarb' ); // Enable highlight.js (https://highlightjs.org/) on view's page diff --git a/tinyfilemanager.php b/index.php similarity index 99% rename from tinyfilemanager.php rename to index.php index 958e550..d2e967e 100644 --- a/tinyfilemanager.php +++ b/index.php @@ -12,7 +12,7 @@ $CONFIG = '{"lang":"en","error_reporting":false,"show_hidden":false,"hide_Cols": define('VERSION', '2.4.3'); //Application Title -define('APP_TITLE', 'Tiny File Manager'); +define('APP_TITLE', 'AO20 LOGS'); // --- EDIT BELOW CONFIGURATION CAREFULLY --- From 616c3d35c2c07245fc4cfbb1cbc6bf62a6e54051 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sat, 6 Mar 2021 12:40:42 +1300 Subject: [PATCH 03/20] Update config.php --- config.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config.php b/config.php index 357ebc6..da8f1e8 100644 --- a/config.php +++ b/config.php @@ -25,6 +25,8 @@ $auth_users = array( 'wyrox' => '$2y$10$FED/SsLlx9cHB3o3sKiItuW06tZwa4Y6NYYcXuC0IXX1HPSA/OKfG', 'simp' => '$2y$10$gIHw2ybKo6mvsZ8Z/k3FzuYvNIV0DnOzihjbFlqgFEFpIl3dh4t4u', 'haracin' => '$2y$10$1N9vyknVQcKlPZDXKjhUK.h7srnK.cjfgVj5O6Nrnt10yKrg5jqYK', + 'vancleff' => '$2y$10$tqS6TvFHcoHqFhf6WiZoRO.wcgZlfyTDoiKo0ddrL9n5bPihSL4mC', + 'emancu' => '$2y$10$zvyW4i.058EtyqQXVOLRROu3f1sEfyi1/G8F71sSQu8paMkgaI5GS', 'reyarb' => '$2y$10$4X3gqurnA7KmcybjbqWAOu31Ntg6mjB8q669IP/waEGtegISwpm3G' ); @@ -35,7 +37,7 @@ $theme = 'dark'; // Readonly users // e.g. array('users', 'guest', ...) $readonly_users = array( - 'jopi', 'wyrox', 'simp', 'haracin', 'reyarb' + 'vancleff', 'emancu', 'jopi', 'wyrox', 'simp', 'haracin', 'reyarb' ); // Enable highlight.js (https://highlightjs.org/) on view's page From bc03adb9672c0107eb0df07b5d4c16beabd3915f Mon Sep 17 00:00:00 2001 From: Lucas Date: Sat, 6 Mar 2021 12:42:01 +1300 Subject: [PATCH 04/20] Update config.php --- config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.php b/config.php index da8f1e8..f801225 100644 --- a/config.php +++ b/config.php @@ -25,7 +25,7 @@ $auth_users = array( 'wyrox' => '$2y$10$FED/SsLlx9cHB3o3sKiItuW06tZwa4Y6NYYcXuC0IXX1HPSA/OKfG', 'simp' => '$2y$10$gIHw2ybKo6mvsZ8Z/k3FzuYvNIV0DnOzihjbFlqgFEFpIl3dh4t4u', 'haracin' => '$2y$10$1N9vyknVQcKlPZDXKjhUK.h7srnK.cjfgVj5O6Nrnt10yKrg5jqYK', - 'vancleff' => '$2y$10$tqS6TvFHcoHqFhf6WiZoRO.wcgZlfyTDoiKo0ddrL9n5bPihSL4mC', + 'vancleff' => '$2y$10$pNkLwl4FWEeOmw2s5AwVKe7CpB3mfZTXM5TxMF6tJx8xGEEKbCEWi', 'emancu' => '$2y$10$zvyW4i.058EtyqQXVOLRROu3f1sEfyi1/G8F71sSQu8paMkgaI5GS', 'reyarb' => '$2y$10$4X3gqurnA7KmcybjbqWAOu31Ntg6mjB8q669IP/waEGtegISwpm3G' ); From 5565ecb5491a059bca2df4edda2a3c62d6ee6610 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sat, 6 Mar 2021 12:51:07 +1300 Subject: [PATCH 05/20] Update config.php --- config.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/config.php b/config.php index f801225..09f1a15 100644 --- a/config.php +++ b/config.php @@ -22,12 +22,14 @@ $use_auth = true; $auth_users = array( 'recox' => '$2y$10$9WBeaacPPHQ9hrCErO.0p.zZFANR2hAaunMaivBSKWyFMzNRfBc9i', 'jopi' => '$2y$10$Fg6Dz8oH9fPoZ2jJan5tZuv6Z4Kp7avtQ9bDfrdRntXtPeiMAZyGO', - 'wyrox' => '$2y$10$FED/SsLlx9cHB3o3sKiItuW06tZwa4Y6NYYcXuC0IXX1HPSA/OKfG', + 'wyrox' => '$2y$10$hGwYApvN9TO8DHCnqM5rXeXeEJDMm5MD5Xa9l9T4SA47anEobs0By', 'simp' => '$2y$10$gIHw2ybKo6mvsZ8Z/k3FzuYvNIV0DnOzihjbFlqgFEFpIl3dh4t4u', 'haracin' => '$2y$10$1N9vyknVQcKlPZDXKjhUK.h7srnK.cjfgVj5O6Nrnt10yKrg5jqYK', 'vancleff' => '$2y$10$pNkLwl4FWEeOmw2s5AwVKe7CpB3mfZTXM5TxMF6tJx8xGEEKbCEWi', 'emancu' => '$2y$10$zvyW4i.058EtyqQXVOLRROu3f1sEfyi1/G8F71sSQu8paMkgaI5GS', - 'reyarb' => '$2y$10$4X3gqurnA7KmcybjbqWAOu31Ntg6mjB8q669IP/waEGtegISwpm3G' + 'ronin' => '$2y$10$zvyW4i.058EtyqQXVOLRROu3f1sEfyi1/G8F71sSQu8paMkgaI5GS', + 'reyarb' => '$2y$10$4X3gqurnA7KmcybjbqWAOu31Ntg6mjB8q669IP/waEGtegISwpm3G', + 'ronin' => '$2y$10$C0JNU8RK8GDp1OLOyFWuLOLa4B7/nqcYIhVf0rNyGcnGD7uQNE1SC' ); //set application theme @@ -37,7 +39,7 @@ $theme = 'dark'; // Readonly users // e.g. array('users', 'guest', ...) $readonly_users = array( - 'vancleff', 'emancu', 'jopi', 'wyrox', 'simp', 'haracin', 'reyarb' + 'ronin', 'vancleff', 'emancu', 'jopi', 'wyrox', 'simp', 'haracin', 'reyarb' ); // Enable highlight.js (https://highlightjs.org/) on view's page From 8c7a3499fcdbf7984953b3b654379f26004323ee Mon Sep 17 00:00:00 2001 From: Lucas Date: Tue, 9 Mar 2021 16:18:36 +1300 Subject: [PATCH 06/20] Agrego usuario para MartinTrionfetti --- config.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.php b/config.php index 09f1a15..154e013 100644 --- a/config.php +++ b/config.php @@ -29,6 +29,7 @@ $auth_users = array( 'emancu' => '$2y$10$zvyW4i.058EtyqQXVOLRROu3f1sEfyi1/G8F71sSQu8paMkgaI5GS', 'ronin' => '$2y$10$zvyW4i.058EtyqQXVOLRROu3f1sEfyi1/G8F71sSQu8paMkgaI5GS', 'reyarb' => '$2y$10$4X3gqurnA7KmcybjbqWAOu31Ntg6mjB8q669IP/waEGtegISwpm3G', + 'MartinTrionfetti' => '$2y$10$GeoDYYo43edC9FmN2ZmygePg2J2l7YLYOGl9JBZztxdI/W5ROpPKu', 'ronin' => '$2y$10$C0JNU8RK8GDp1OLOyFWuLOLa4B7/nqcYIhVf0rNyGcnGD7uQNE1SC' ); @@ -39,7 +40,7 @@ $theme = 'dark'; // Readonly users // e.g. array('users', 'guest', ...) $readonly_users = array( - 'ronin', 'vancleff', 'emancu', 'jopi', 'wyrox', 'simp', 'haracin', 'reyarb' + 'MartinTrionfetti', 'ronin', 'vancleff', 'emancu', 'jopi', 'wyrox', 'simp', 'haracin', 'reyarb' ); // Enable highlight.js (https://highlightjs.org/) on view's page From a222362768529d04f16034e086643f8867e498b5 Mon Sep 17 00:00:00 2001 From: Lucas Date: Wed, 31 Mar 2021 12:30:39 +1300 Subject: [PATCH 07/20] Update config.php --- config.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config.php b/config.php index 154e013..31155c0 100644 --- a/config.php +++ b/config.php @@ -30,7 +30,8 @@ $auth_users = array( 'ronin' => '$2y$10$zvyW4i.058EtyqQXVOLRROu3f1sEfyi1/G8F71sSQu8paMkgaI5GS', 'reyarb' => '$2y$10$4X3gqurnA7KmcybjbqWAOu31Ntg6mjB8q669IP/waEGtegISwpm3G', 'MartinTrionfetti' => '$2y$10$GeoDYYo43edC9FmN2ZmygePg2J2l7YLYOGl9JBZztxdI/W5ROpPKu', - 'ronin' => '$2y$10$C0JNU8RK8GDp1OLOyFWuLOLa4B7/nqcYIhVf0rNyGcnGD7uQNE1SC' + 'ronin' => '$2y$10$C0JNU8RK8GDp1OLOyFWuLOLa4B7/nqcYIhVf0rNyGcnGD7uQNE1SC', + 'emancu' => '$2y$10$uLge8lUyQ1WPk/oBQPeq6ekRrw3W.NoTCLXhU/R/gDR/5Oeu/hAT2' ); //set application theme @@ -40,7 +41,7 @@ $theme = 'dark'; // Readonly users // e.g. array('users', 'guest', ...) $readonly_users = array( - 'MartinTrionfetti', 'ronin', 'vancleff', 'emancu', 'jopi', 'wyrox', 'simp', 'haracin', 'reyarb' + 'MartinTrionfetti', 'ronin', 'vancleff', 'emancu', 'jopi', 'wyrox', 'simp', 'haracin', 'reyarb', 'emancu' ); // Enable highlight.js (https://highlightjs.org/) on view's page From 18c09156ce0a3b9b30ae238d82fa6d1871cd120e Mon Sep 17 00:00:00 2001 From: Lucas Date: Wed, 31 Mar 2021 12:32:55 +1300 Subject: [PATCH 08/20] Update config.php --- config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.php b/config.php index 31155c0..64c3378 100644 --- a/config.php +++ b/config.php @@ -31,7 +31,7 @@ $auth_users = array( 'reyarb' => '$2y$10$4X3gqurnA7KmcybjbqWAOu31Ntg6mjB8q669IP/waEGtegISwpm3G', 'MartinTrionfetti' => '$2y$10$GeoDYYo43edC9FmN2ZmygePg2J2l7YLYOGl9JBZztxdI/W5ROpPKu', 'ronin' => '$2y$10$C0JNU8RK8GDp1OLOyFWuLOLa4B7/nqcYIhVf0rNyGcnGD7uQNE1SC', - 'emancu' => '$2y$10$uLge8lUyQ1WPk/oBQPeq6ekRrw3W.NoTCLXhU/R/gDR/5Oeu/hAT2' + 'emancu' => '$2y$10$YVgOfXhD3BfJT1LeCKqYMOl7.DWJXMJz2OK3.z6AW5meFO3jzGgMW' ); //set application theme From 300d3a9f67a18e735c05d3505daf466c7b47a80c Mon Sep 17 00:00:00 2001 From: Emiliano Mancuso Date: Sat, 10 Apr 2021 00:34:40 +0100 Subject: [PATCH 09/20] Update password for emancu --- config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.php b/config.php index 64c3378..bbcf26e 100644 --- a/config.php +++ b/config.php @@ -26,7 +26,7 @@ $auth_users = array( 'simp' => '$2y$10$gIHw2ybKo6mvsZ8Z/k3FzuYvNIV0DnOzihjbFlqgFEFpIl3dh4t4u', 'haracin' => '$2y$10$1N9vyknVQcKlPZDXKjhUK.h7srnK.cjfgVj5O6Nrnt10yKrg5jqYK', 'vancleff' => '$2y$10$pNkLwl4FWEeOmw2s5AwVKe7CpB3mfZTXM5TxMF6tJx8xGEEKbCEWi', - 'emancu' => '$2y$10$zvyW4i.058EtyqQXVOLRROu3f1sEfyi1/G8F71sSQu8paMkgaI5GS', + 'emancu' => '$2y$10$DZcuVNB.klAFWo4N0AbJe.xtphdrI2hp1PJYOywcMC.oBSDcnoL.6', 'ronin' => '$2y$10$zvyW4i.058EtyqQXVOLRROu3f1sEfyi1/G8F71sSQu8paMkgaI5GS', 'reyarb' => '$2y$10$4X3gqurnA7KmcybjbqWAOu31Ntg6mjB8q669IP/waEGtegISwpm3G', 'MartinTrionfetti' => '$2y$10$GeoDYYo43edC9FmN2ZmygePg2J2l7YLYOGl9JBZztxdI/W5ROpPKu', From e7612986805f11e39efdc54aef95da743b636a09 Mon Sep 17 00:00:00 2001 From: Emiliano Mancuso Date: Wed, 28 Apr 2021 11:06:59 +0100 Subject: [PATCH 10/20] Update config.php Remove duplicated entry for emancu --- config.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config.php b/config.php index bbcf26e..dc6c42c 100644 --- a/config.php +++ b/config.php @@ -30,8 +30,7 @@ $auth_users = array( 'ronin' => '$2y$10$zvyW4i.058EtyqQXVOLRROu3f1sEfyi1/G8F71sSQu8paMkgaI5GS', 'reyarb' => '$2y$10$4X3gqurnA7KmcybjbqWAOu31Ntg6mjB8q669IP/waEGtegISwpm3G', 'MartinTrionfetti' => '$2y$10$GeoDYYo43edC9FmN2ZmygePg2J2l7YLYOGl9JBZztxdI/W5ROpPKu', - 'ronin' => '$2y$10$C0JNU8RK8GDp1OLOyFWuLOLa4B7/nqcYIhVf0rNyGcnGD7uQNE1SC', - 'emancu' => '$2y$10$YVgOfXhD3BfJT1LeCKqYMOl7.DWJXMJz2OK3.z6AW5meFO3jzGgMW' + 'ronin' => '$2y$10$C0JNU8RK8GDp1OLOyFWuLOLa4B7/nqcYIhVf0rNyGcnGD7uQNE1SC' ); //set application theme From 9e1c222074f2b3fcadf15586278982414ea51610 Mon Sep 17 00:00:00 2001 From: "lucas.recoaro@gmail.com" Date: Wed, 9 Jun 2021 11:04:41 +1200 Subject: [PATCH 11/20] updated --- config-sample.php | 136 ---------------------------------------------- 1 file changed, 136 deletions(-) delete mode 100644 config-sample.php diff --git a/config-sample.php b/config-sample.php deleted file mode 100644 index abbdf8d..0000000 --- a/config-sample.php +++ /dev/null @@ -1,136 +0,0 @@ - 'Password', 'Username2' => 'Password2', ...) -// Generate secure password hash - https://tinyfilemanager.github.io/docs/pwd.html -$auth_users = array( - 'recox' => '$2y$10$9WBeaacPPHQ9hrCErO.0p.zZFANR2hAaunMaivBSKWyFMzNRfBc9i', - 'jopi' => '$2y$10$Fg6Dz8oH9fPoZ2jJan5tZuv6Z4Kp7avtQ9bDfrdRntXtPeiMAZyGO', - 'wyrox' => '$2y$10$hGwYApvN9TO8DHCnqM5rXeXeEJDMm5MD5Xa9l9T4SA47anEobs0By', - 'simp' => '$2y$10$gIHw2ybKo6mvsZ8Z/k3FzuYvNIV0DnOzihjbFlqgFEFpIl3dh4t4u', - 'haracin' => '$2y$10$1N9vyknVQcKlPZDXKjhUK.h7srnK.cjfgVj5O6Nrnt10yKrg5jqYK', - 'vancleff' => '$2y$10$pNkLwl4FWEeOmw2s5AwVKe7CpB3mfZTXM5TxMF6tJx8xGEEKbCEWi', - 'emancu' => '$2y$10$DZcuVNB.klAFWo4N0AbJe.xtphdrI2hp1PJYOywcMC.oBSDcnoL.6', - 'ronin' => '$2y$10$zvyW4i.058EtyqQXVOLRROu3f1sEfyi1/G8F71sSQu8paMkgaI5GS', - 'reyarb' => '$2y$10$4X3gqurnA7KmcybjbqWAOu31Ntg6mjB8q669IP/waEGtegISwpm3G', - 'MartinTrionfetti' => '$2y$10$GeoDYYo43edC9FmN2ZmygePg2J2l7YLYOGl9JBZztxdI/W5ROpPKu', - 'ronin' => '$2y$10$C0JNU8RK8GDp1OLOyFWuLOLa4B7/nqcYIhVf0rNyGcnGD7uQNE1SC' -); - -//set application theme -//options - 'light' and 'dark' -$theme = 'dark'; - -// Readonly users -// e.g. array('users', 'guest', ...) -$readonly_users = array( - 'MartinTrionfetti', 'ronin', 'vancleff', 'emancu', 'jopi', 'wyrox', 'simp', 'haracin', 'reyarb', 'emancu' -); - -// Enable highlight.js (https://highlightjs.org/) on view's page -$use_highlightjs = true; - -// highlight.js style -// for dark theme use 'ir-black' -$highlightjs_style = 'vs'; - -// Enable ace.js (https://ace.c9.io/) on view's page -$edit_files = true; - -// Default timezone for date() and time() -// Doc - http://php.net/manual/en/timezones.php -$default_timezone = 'Etc/UTC'; // UTC - -// Root path for file manager -// use absolute path of directory i.e: '/var/www/folder' or $_SERVER['DOCUMENT_ROOT'].'/folder' -$root_path = $_SERVER['DOCUMENT_ROOT']; - -// Root url for links in file manager.Relative to $http_host. Variants: '', 'path/to/subfolder' -// Will not working if $root_path will be outside of server document root -$root_url = ''; - -// Server hostname. Can set manually if wrong -$http_host = $_SERVER['HTTP_HOST']; - -// user specific directories -// array('Username' => 'Directory path', 'Username2' => 'Directory path', ...) -$directories_users = array(); - -// input encoding for iconv -$iconv_input_encoding = 'UTF-8'; - -// date() format for file modification date -// Doc - https://www.php.net/manual/en/datetime.format.php -$datetime_format = 'd.m.y H:i:s'; - -// Allowed file extensions for create and rename files -// e.g. 'txt,html,css,js' -$allowed_file_extensions = ''; - -// Allowed file extensions for upload files -// e.g. 'gif,png,jpg,html,txt' -$allowed_upload_extensions = ''; - -// Favicon path. This can be either a full url to an .PNG image, or a path based on the document root. -// full path, e.g http://example.com/favicon.png -// local path, e.g images/icons/favicon.png -$favicon_path = ''; - -// Files and folders to excluded from listing -// e.g. array('myfile.html', 'personal-folder', '*.php', ...) -$exclude_items = array(''); - -// Online office Docs Viewer -// Availabe rules are 'google', 'microsoft' or false -// google => View documents using Google Docs Viewer -// microsoft => View documents using Microsoft Web Apps Viewer -// false => disable online doc viewer -$online_viewer = 'google'; - -// Sticky Nav bar -// true => enable sticky header -// false => disable sticky header -$sticky_navbar = true; - - -// max upload file size -$max_upload_size_bytes = 5000; - -// Possible rules are 'OFF', 'AND' or 'OR' -// OFF => Don't check connection IP, defaults to OFF -// AND => Connection must be on the whitelist, and not on the blacklist -// OR => Connection must be on the whitelist, or not on the blacklist -$ip_ruleset = 'OFF'; - -// Should users be notified of their block? -$ip_silent = true; - -// IP-addresses, both ipv4 and ipv6 -$ip_whitelist = array( - '127.0.0.1', // local ipv4 - '::1' // local ipv6 -); - -// IP-addresses, both ipv4 and ipv6 -$ip_blacklist = array( - '0.0.0.0', // non-routable meta ipv4 - '::' // non-routable meta ipv6 -); - -?> From 6894504123738ec4607b48414a782f20d12386a6 Mon Sep 17 00:00:00 2001 From: "lucas.recoaro@gmail.com" Date: Wed, 9 Jun 2021 11:17:38 +1200 Subject: [PATCH 12/20] Agrego boton para actualizar logs --- config.php | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++++ index.php | 9 ++++ 2 files changed, 145 insertions(+) create mode 100644 config.php diff --git a/config.php b/config.php new file mode 100644 index 0000000..abbdf8d --- /dev/null +++ b/config.php @@ -0,0 +1,136 @@ + 'Password', 'Username2' => 'Password2', ...) +// Generate secure password hash - https://tinyfilemanager.github.io/docs/pwd.html +$auth_users = array( + 'recox' => '$2y$10$9WBeaacPPHQ9hrCErO.0p.zZFANR2hAaunMaivBSKWyFMzNRfBc9i', + 'jopi' => '$2y$10$Fg6Dz8oH9fPoZ2jJan5tZuv6Z4Kp7avtQ9bDfrdRntXtPeiMAZyGO', + 'wyrox' => '$2y$10$hGwYApvN9TO8DHCnqM5rXeXeEJDMm5MD5Xa9l9T4SA47anEobs0By', + 'simp' => '$2y$10$gIHw2ybKo6mvsZ8Z/k3FzuYvNIV0DnOzihjbFlqgFEFpIl3dh4t4u', + 'haracin' => '$2y$10$1N9vyknVQcKlPZDXKjhUK.h7srnK.cjfgVj5O6Nrnt10yKrg5jqYK', + 'vancleff' => '$2y$10$pNkLwl4FWEeOmw2s5AwVKe7CpB3mfZTXM5TxMF6tJx8xGEEKbCEWi', + 'emancu' => '$2y$10$DZcuVNB.klAFWo4N0AbJe.xtphdrI2hp1PJYOywcMC.oBSDcnoL.6', + 'ronin' => '$2y$10$zvyW4i.058EtyqQXVOLRROu3f1sEfyi1/G8F71sSQu8paMkgaI5GS', + 'reyarb' => '$2y$10$4X3gqurnA7KmcybjbqWAOu31Ntg6mjB8q669IP/waEGtegISwpm3G', + 'MartinTrionfetti' => '$2y$10$GeoDYYo43edC9FmN2ZmygePg2J2l7YLYOGl9JBZztxdI/W5ROpPKu', + 'ronin' => '$2y$10$C0JNU8RK8GDp1OLOyFWuLOLa4B7/nqcYIhVf0rNyGcnGD7uQNE1SC' +); + +//set application theme +//options - 'light' and 'dark' +$theme = 'dark'; + +// Readonly users +// e.g. array('users', 'guest', ...) +$readonly_users = array( + 'MartinTrionfetti', 'ronin', 'vancleff', 'emancu', 'jopi', 'wyrox', 'simp', 'haracin', 'reyarb', 'emancu' +); + +// Enable highlight.js (https://highlightjs.org/) on view's page +$use_highlightjs = true; + +// highlight.js style +// for dark theme use 'ir-black' +$highlightjs_style = 'vs'; + +// Enable ace.js (https://ace.c9.io/) on view's page +$edit_files = true; + +// Default timezone for date() and time() +// Doc - http://php.net/manual/en/timezones.php +$default_timezone = 'Etc/UTC'; // UTC + +// Root path for file manager +// use absolute path of directory i.e: '/var/www/folder' or $_SERVER['DOCUMENT_ROOT'].'/folder' +$root_path = $_SERVER['DOCUMENT_ROOT']; + +// Root url for links in file manager.Relative to $http_host. Variants: '', 'path/to/subfolder' +// Will not working if $root_path will be outside of server document root +$root_url = ''; + +// Server hostname. Can set manually if wrong +$http_host = $_SERVER['HTTP_HOST']; + +// user specific directories +// array('Username' => 'Directory path', 'Username2' => 'Directory path', ...) +$directories_users = array(); + +// input encoding for iconv +$iconv_input_encoding = 'UTF-8'; + +// date() format for file modification date +// Doc - https://www.php.net/manual/en/datetime.format.php +$datetime_format = 'd.m.y H:i:s'; + +// Allowed file extensions for create and rename files +// e.g. 'txt,html,css,js' +$allowed_file_extensions = ''; + +// Allowed file extensions for upload files +// e.g. 'gif,png,jpg,html,txt' +$allowed_upload_extensions = ''; + +// Favicon path. This can be either a full url to an .PNG image, or a path based on the document root. +// full path, e.g http://example.com/favicon.png +// local path, e.g images/icons/favicon.png +$favicon_path = ''; + +// Files and folders to excluded from listing +// e.g. array('myfile.html', 'personal-folder', '*.php', ...) +$exclude_items = array(''); + +// Online office Docs Viewer +// Availabe rules are 'google', 'microsoft' or false +// google => View documents using Google Docs Viewer +// microsoft => View documents using Microsoft Web Apps Viewer +// false => disable online doc viewer +$online_viewer = 'google'; + +// Sticky Nav bar +// true => enable sticky header +// false => disable sticky header +$sticky_navbar = true; + + +// max upload file size +$max_upload_size_bytes = 5000; + +// Possible rules are 'OFF', 'AND' or 'OR' +// OFF => Don't check connection IP, defaults to OFF +// AND => Connection must be on the whitelist, and not on the blacklist +// OR => Connection must be on the whitelist, or not on the blacklist +$ip_ruleset = 'OFF'; + +// Should users be notified of their block? +$ip_silent = true; + +// IP-addresses, both ipv4 and ipv6 +$ip_whitelist = array( + '127.0.0.1', // local ipv4 + '::1' // local ipv6 +); + +// IP-addresses, both ipv4 and ipv6 +$ip_blacklist = array( + '0.0.0.0', // non-routable meta ipv4 + '::' // non-routable meta ipv6 +); + +?> diff --git a/index.php b/index.php index 55a3b33..91990c4 100644 --- a/index.php +++ b/index.php @@ -2087,6 +2087,8 @@ $tableTheme = (FM_THEME == "dark") ? "text-white bg-dark table-dark" : "bg-white
+
  • Actualizar Logs
    • +
      @@ -3789,6 +3791,13 @@ $isStickyNavBar = $sticky_navbar ? 'navbar-fixed' : 'navbar-normal'; function rename(e, t) {var n = prompt("New name", t);null !== n && "" !== n && n != t && (window.location.search = "p=" + encodeURIComponent(e) + "&ren=" + encodeURIComponent(t) + "&to=" + encodeURIComponent(n))} function change_checkboxes(e, t) { for (var n = e.length - 1; n >= 0; n--) e[n].checked = "boolean" == typeof t ? t : !e[n].checked } function get_checkboxes() { for (var e = document.getElementsByName("file[]"), t = [], n = e.length - 1; n >= 0; n--) (e[n].type = "checkbox") && t.push(e[n]); return t } + + function update_logs() { + window.open('http://ao20-test.duckdns.org:9090/job/re20-server-produccion-upload-logs-to-ftp/build?token=actualizarlogsparavererrores'); + window.open('http://ao20-test.duckdns.org:9090/job/re20-server-test-upload-logs-to-ftp/build?token=actualizarlogsparavererrores'); + alert("Se estan actualizando los logs de produccion y test. Por favor espera unos minutos para que se terminen de subir. Podes ver el proceso desde Jenkins o desde el chat de discord en #dev-logs"); + } + function select_all() { change_checkboxes(get_checkboxes(), !0) } function unselect_all() { change_checkboxes(get_checkboxes(), !1) } function invert_all() { change_checkboxes(get_checkboxes()) } From da5b414603fa2eebd072b0925a71d8b6b9aeb6ff Mon Sep 17 00:00:00 2001 From: "lucas.recoaro@gmail.com" Date: Wed, 9 Jun 2021 11:27:21 +1200 Subject: [PATCH 13/20] Ahora abro las 2 ventanas en segundo plano --- index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index 91990c4..18db940 100644 --- a/index.php +++ b/index.php @@ -3793,8 +3793,8 @@ $isStickyNavBar = $sticky_navbar ? 'navbar-fixed' : 'navbar-normal'; function get_checkboxes() { for (var e = document.getElementsByName("file[]"), t = [], n = e.length - 1; n >= 0; n--) (e[n].type = "checkbox") && t.push(e[n]); return t } function update_logs() { - window.open('http://ao20-test.duckdns.org:9090/job/re20-server-produccion-upload-logs-to-ftp/build?token=actualizarlogsparavererrores'); - window.open('http://ao20-test.duckdns.org:9090/job/re20-server-test-upload-logs-to-ftp/build?token=actualizarlogsparavererrores'); + window.open('http://ao20-test.duckdns.org:9090/job/re20-server-produccion-upload-logs-to-ftp/build?token=actualizarlogsparavererrores', '_blank'); + window.open('http://ao20-test.duckdns.org:9090/job/re20-server-test-upload-logs-to-ftp/build?token=actualizarlogsparavererrores', '_blank'); alert("Se estan actualizando los logs de produccion y test. Por favor espera unos minutos para que se terminen de subir. Podes ver el proceso desde Jenkins o desde el chat de discord en #dev-logs"); } From 477c9820ed062c7f2f22781d475fa3e2e5d09d6e Mon Sep 17 00:00:00 2001 From: "lucas.recoaro@gmail.com" Date: Wed, 9 Jun 2021 11:35:35 +1200 Subject: [PATCH 14/20] Ahora se usa fetch para actualizar log logs. --- index.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index 18db940..8981715 100644 --- a/index.php +++ b/index.php @@ -2087,7 +2087,7 @@ $tableTheme = (FM_THEME == "dark") ? "text-white bg-dark table-dark" : "bg-white
    -
  • Actualizar Logs
    • + Actualizar Logs
    @@ -3793,8 +3793,16 @@ $isStickyNavBar = $sticky_navbar ? 'navbar-fixed' : 'navbar-normal'; function get_checkboxes() { for (var e = document.getElementsByName("file[]"), t = [], n = e.length - 1; n >= 0; n--) (e[n].type = "checkbox") && t.push(e[n]); return t } function update_logs() { - window.open('http://ao20-test.duckdns.org:9090/job/re20-server-produccion-upload-logs-to-ftp/build?token=actualizarlogsparavererrores', '_blank'); - window.open('http://ao20-test.duckdns.org:9090/job/re20-server-test-upload-logs-to-ftp/build?token=actualizarlogsparavererrores', '_blank'); + fetch("http://ao20-test.duckdnsorg:9090/job/re20-server-produccion-upload-logs-to-ftp/build?token=actualizarlogsparavererrores") + .catch(function (error) { + alert("No se pudo actualizar log de Produccion Error: " + error); + }); + + fetch("http://ao20-test.duckdnsorg:9090/job/re20-server-test-upload-logs-to-ftp/build?token=actualizarlogsparavererrores") + .catch(function (error) { + alert("No se pudo actualizar log de Test Error: " + error); + }); + alert("Se estan actualizando los logs de produccion y test. Por favor espera unos minutos para que se terminen de subir. Podes ver el proceso desde Jenkins o desde el chat de discord en #dev-logs"); } From 905b10f2ea3ac39ab40e4ea142f8f74d6ebef455 Mon Sep 17 00:00:00 2001 From: "lucas.recoaro@gmail.com" Date: Wed, 9 Jun 2021 11:53:23 +1200 Subject: [PATCH 15/20] Probamos haciendo el request con httpGet para ver si ahora anda bien la actualizacion de logs --- index.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/index.php b/index.php index 8981715..3201b08 100644 --- a/index.php +++ b/index.php @@ -3793,15 +3793,15 @@ $isStickyNavBar = $sticky_navbar ? 'navbar-fixed' : 'navbar-normal'; function get_checkboxes() { for (var e = document.getElementsByName("file[]"), t = [], n = e.length - 1; n >= 0; n--) (e[n].type = "checkbox") && t.push(e[n]); return t } function update_logs() { - fetch("http://ao20-test.duckdnsorg:9090/job/re20-server-produccion-upload-logs-to-ftp/build?token=actualizarlogsparavererrores") - .catch(function (error) { - alert("No se pudo actualizar log de Produccion Error: " + error); - }); - - fetch("http://ao20-test.duckdnsorg:9090/job/re20-server-test-upload-logs-to-ftp/build?token=actualizarlogsparavererrores") - .catch(function (error) { - alert("No se pudo actualizar log de Test Error: " + error); - }); + function httpGet(theUrl) { + var xmlHttp = new XMLHttpRequest(); + xmlHttp.open("GET", theUrl, false); // false for synchronous request + xmlHttp.send(null); + return xmlHttp.responseText; + } + + httpGet("http://ao20-test.duckdnsorg:9090/job/re20-server-produccion-upload-logs-to-ftp/build?token=actualizarlogsparavererrores"); + httpGet("http://ao20-test.duckdnsorg:9090/job/re20-server-test-upload-logs-to-ftp/build?token=actualizarlogsparavererrores"); alert("Se estan actualizando los logs de produccion y test. Por favor espera unos minutos para que se terminen de subir. Podes ver el proceso desde Jenkins o desde el chat de discord en #dev-logs"); } From 5b8e3c7c31bfb74064b82ead6da798d5c562cc71 Mon Sep 17 00:00:00 2001 From: "lucas.recoaro@gmail.com" Date: Wed, 9 Jun 2021 11:58:33 +1200 Subject: [PATCH 16/20] Ahora pruebo hacer la actualizacion de otra forma con window.open --- index.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/index.php b/index.php index 3201b08..8ffca5c 100644 --- a/index.php +++ b/index.php @@ -3793,17 +3793,17 @@ $isStickyNavBar = $sticky_navbar ? 'navbar-fixed' : 'navbar-normal'; function get_checkboxes() { for (var e = document.getElementsByName("file[]"), t = [], n = e.length - 1; n >= 0; n--) (e[n].type = "checkbox") && t.push(e[n]); return t } function update_logs() { - function httpGet(theUrl) { - var xmlHttp = new XMLHttpRequest(); - xmlHttp.open("GET", theUrl, false); // false for synchronous request - xmlHttp.send(null); - return xmlHttp.responseText; + var actualizarProduccion = confirm("Queres actualizar los logs de Produccion?"); + if (actualizarProduccion) { + window.open("http://ao20-test.duckdnsorg:9090/job/re20-server-produccion-upload-logs-to-ftp/build?token=actualizarlogsparavererrores"); } - - httpGet("http://ao20-test.duckdnsorg:9090/job/re20-server-produccion-upload-logs-to-ftp/build?token=actualizarlogsparavererrores"); - httpGet("http://ao20-test.duckdnsorg:9090/job/re20-server-test-upload-logs-to-ftp/build?token=actualizarlogsparavererrores"); - alert("Se estan actualizando los logs de produccion y test. Por favor espera unos minutos para que se terminen de subir. Podes ver el proceso desde Jenkins o desde el chat de discord en #dev-logs"); + var actualizarTest = confirm("Queres actualizar los logs de Test?"); + if (actualizarTest) { + window.open("http://ao20-test.duckdnsorg:9090/job/re20-server-test-upload-logs-to-ftp/build?token=actualizarlogsparavererrores"); + } + + alert("Por favor espera unos minutos para que se terminen de subir los logs correspondientes. Podes ver el proceso desde Jenkins o desde el chat de discord en #dev-logs"); } function select_all() { change_checkboxes(get_checkboxes(), !0) } From 6b3207413d71b7f00133a02e989617bf4d3aadb6 Mon Sep 17 00:00:00 2001 From: "lucas.recoaro@gmail.com" Date: Wed, 9 Jun 2021 12:02:32 +1200 Subject: [PATCH 17/20] Vuelo al fetch, por que habia puesto mal la URL, ahora se actualizan los logs mediante fetch --- index.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/index.php b/index.php index 8ffca5c..4146491 100644 --- a/index.php +++ b/index.php @@ -3793,17 +3793,17 @@ $isStickyNavBar = $sticky_navbar ? 'navbar-fixed' : 'navbar-normal'; function get_checkboxes() { for (var e = document.getElementsByName("file[]"), t = [], n = e.length - 1; n >= 0; n--) (e[n].type = "checkbox") && t.push(e[n]); return t } function update_logs() { - var actualizarProduccion = confirm("Queres actualizar los logs de Produccion?"); - if (actualizarProduccion) { - window.open("http://ao20-test.duckdnsorg:9090/job/re20-server-produccion-upload-logs-to-ftp/build?token=actualizarlogsparavererrores"); - } + fetch("http://ao20-test.duckdns.org:9090/job/re20-server-produccion-upload-logs-to-ftp/build?token=actualizarlogsparavererrores") + .catch(function (error) { + alert("No se pudo actualizar log de Produccion Error: " + error); + }); - var actualizarTest = confirm("Queres actualizar los logs de Test?"); - if (actualizarTest) { - window.open("http://ao20-test.duckdnsorg:9090/job/re20-server-test-upload-logs-to-ftp/build?token=actualizarlogsparavererrores"); - } + fetch("http://ao20-test.duckdns.org:9090/job/re20-server-test-upload-logs-to-ftp/build?token=actualizarlogsparavererrores") + .catch(function (error) { + alert("No se pudo actualizar log de Test Error: " + error); + }); - alert("Por favor espera unos minutos para que se terminen de subir los logs correspondientes. Podes ver el proceso desde Jenkins o desde el chat de discord en #dev-logs"); + alert("Se estan actualizando los logs de produccion y test. Por favor espera unos minutos para que se terminen de subir. Podes ver el proceso desde Jenkins o desde el chat de discord en #dev-logs"); } function select_all() { change_checkboxes(get_checkboxes(), !0) } From 12c53af37f6ee6f2d76690e61a9c10e1cc017003 Mon Sep 17 00:00:00 2001 From: "lucas.recoaro@gmail.com" Date: Wed, 9 Jun 2021 15:46:00 +1200 Subject: [PATCH 18/20] Volvemos a hacer un request con window.open para actualizar logs --- index.php | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/index.php b/index.php index 4146491..70aed3a 100644 --- a/index.php +++ b/index.php @@ -3793,18 +3793,21 @@ $isStickyNavBar = $sticky_navbar ? 'navbar-fixed' : 'navbar-normal'; function get_checkboxes() { for (var e = document.getElementsByName("file[]"), t = [], n = e.length - 1; n >= 0; n--) (e[n].type = "checkbox") && t.push(e[n]); return t } function update_logs() { - fetch("http://ao20-test.duckdns.org:9090/job/re20-server-produccion-upload-logs-to-ftp/build?token=actualizarlogsparavererrores") - .catch(function (error) { - alert("No se pudo actualizar log de Produccion Error: " + error); - }); - - fetch("http://ao20-test.duckdns.org:9090/job/re20-server-test-upload-logs-to-ftp/build?token=actualizarlogsparavererrores") - .catch(function (error) { - alert("No se pudo actualizar log de Test Error: " + error); - }); + window.open("http://ao20-test.duckdns.org:9090/job/re20-server-produccion-upload-logs-to-ftp/build?token=actualizarlogsparavererrores&cause=Iniciado+Por+" + , "_blank"); + setTimeout(function(){ console.log("Un timeout para que pueda abrir las 2 paginas correctamente."); }, 2000); + window.open("http://ao20-test.duckdns.org:9090/job/re20-server-test-upload-logs-to-ftp/build?token=actualizarlogsparavererrores&cause=Iniciado+Por+" + , "_blank"); alert("Se estan actualizando los logs de produccion y test. Por favor espera unos minutos para que se terminen de subir. Podes ver el proceso desde Jenkins o desde el chat de discord en #dev-logs"); } + // function update_logs() { + // window.open("http://ao20-test.duckdns.org:9090/job/re20-server-produccion-upload-logs-to-ftp/build?token=actualizarlogsparavererrores&cause=Iniciado+Por+PUTO", "PRODUCCION"); + // setTimeout(function(){ console.log("Un timeout para que pueda abrir las 2 paginas correctamente."); }, 2000); + + // window.open("http://ao20-test.duckdns.org:9090/job/re20-server-test-upload-logs-to-ftp/build?token=actualizarlogsparavererrores&cause=Iniciado+Por+PUTO", "TEST"); + + // alert("Se estan actualizando los logs de produccion y test. Por favor espera unos minutos para que se terminen de subir. Podes ver el proceso desde Jenkins o desde el chat de discord en #dev-logs"); + // } + function select_all() { change_checkboxes(get_checkboxes(), !0) } function unselect_all() { change_checkboxes(get_checkboxes(), !1) } From 442b61226fd987fc6ffc709df0700583bcffac76 Mon Sep 17 00:00:00 2001 From: "lucas.recoaro@gmail.com" Date: Wed, 9 Jun 2021 16:11:45 +1200 Subject: [PATCH 19/20] Creo 2 botones diferentes para poder actualizar los logs de produccion y test desde el panel de logs --- index.php | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/index.php b/index.php index 70aed3a..d6d9409 100644 --- a/index.php +++ b/index.php @@ -2087,8 +2087,6 @@ $tableTheme = (FM_THEME == "dark") ? "text-white bg-dark table-dark" : "bg-white
    - Actualizar Logs -
      @@ -3348,6 +3346,10 @@ function fm_show_nav_path($path) + + Actualizar Logs Test + Actualizar Logs Prod +