X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/dddcc255110ee8219bfb41943c6e4430a02139aa..08ac1ab0d0b904bb65c6333264201ab07b195dbf:/admin.php diff --git a/admin.php b/admin.php index ed55d2f..0f8967f 100644 --- a/admin.php +++ b/admin.php @@ -33,18 +33,19 @@ if (file_exists(JIRAFEAU_ROOT . 'install.php') /* If called from CLI, no password or graphical interface */ if (php_sapi_name() == "cli") { if ($cfg['installation_done'] == false) { - die("installation not completed yet\n"); + die("Installation not completed yet.\n"); } if ((count($argv)>1) && $argv[1]=="clean_expired") { $total = jirafeau_admin_clean(); - echo "$total expired files deleted."; + echo "$total expired files deleted.\n"; } elseif ((count($argv)>1) && $argv[1]=="clean_async") { $total = jirafeau_admin_clean_async(); - echo "$total old unfinished transfers deleted."; + echo "$total old unfinished transfers deleted.\n"; } else { - die("No command found. Should be admin.php <clean_expired|clean_async>."); + die("No command found. Should be admin.php <clean_expired|clean_async>.\n"); } -} else { +// Second check: Challenge by IP +} elseif (true === jirafeau_challenge_admin_ip($cfg, get_ip_address($cfg))) { /* Disable admin interface if we have a empty admin password. */ if (empty($cfg['admin_password']) && empty($cfg['admin_http_auth_user'])) { require(JIRAFEAU_ROOT . 'lib/template/header.php'); @@ -55,18 +56,18 @@ if (php_sapi_name() == "cli") { exit; } - /* Unlog if asked. */ + /* Logout if requested. */ if (jirafeau_admin_session_logged() && isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { - jirafeau_admin_session_end(); + jirafeau_session_end(); } if (!jirafeau_admin_session_logged()) { - /* Test HTTP authentification. */ + /* Test HTTP authentication. */ if (!empty($cfg['admin_http_auth_user']) && $cfg['admin_http_auth_user'] == $_SERVER['PHP_AUTH_USER']) { jirafeau_admin_session_start(); } - /* Test web password authentification. */ + /* Test web password authentication. */ elseif (!empty($cfg['admin_password']) && isset($_POST['admin_password'])) { if ($cfg['admin_password'] === hash('sha256', $_POST['admin_password'])) { jirafeau_admin_session_start(); @@ -91,7 +92,7 @@ if (php_sapi_name() == "cli") { <tr> <td class = "field"><input type = "password" name = "admin_password" id = "admin_password" - size = "40" /> + size = "40" autocomplete = "current-password" /> </td> </tr> <tr class = "nav"> @@ -117,9 +118,13 @@ if (php_sapi_name() == "cli") { /* Show admin interface if not downloading a file. */ if (!(isset($_POST['action']) && strcmp($_POST['action'], 'download') == 0)) { require(JIRAFEAU_ROOT . 'lib/template/header.php'); ?><h2><?php echo t('ADMIN_INTERFACE'); ?></h2><?php - ?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php + ?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php + + if ($cfg['enable_crypt'] && !(extension_loaded('sodium'))) { + echo '<div class="error"><p>'.t('SODIUM_UNAVAILABLE').'</p></div>'; + } - ?><div id = "admin"> + ?><div id = "admin"> <fieldset><legend><?php echo t('ACTIONS'); ?></legend> <table> <form method="post"> @@ -219,6 +224,19 @@ if (php_sapi_name() == "cli") { </td> </tr> </form> + <form method="post"> + <tr> + <input type = "hidden" name = "action" value = "bug_report_info"/> + <?php echo jirafeau_admin_csrf_field() ?> + <td class = "info"> + <?php echo t('REPORTING_AN_ISSUE'); ?> + </td> + <td></td> + <td> + <input type = "submit" value = "<?php echo t('INFO'); ?>" /> + </td> + </tr> + </form> </table> <form method="post"> <input type = "hidden" name = "action" value = "logout" /> @@ -282,9 +300,14 @@ if (php_sapi_name() == "cli") { fclose($r); } exit; + } elseif (strcmp($_POST['action'], 'bug_report_info') == 0) { + echo jirafeau_admin_bug_report($cfg); } } require(JIRAFEAU_ROOT.'lib/template/footer.php'); +} else { + require(JIRAFEAU_ROOT . 'lib/template/header.php'); + jirafeau_fatal_error(t('ACCESS_KO'), $cfg); } ?>