X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/9cb2631b8ac5fd7c0de6df67d259209eece25305..3882c28c0dbf26dbd7be4b4abe2695084d67ecc5:/admin.php diff --git a/admin.php b/admin.php index d3a069c..0f8967f 100644 --- a/admin.php +++ b/admin.php @@ -1,7 +1,7 @@ + * Copyright (C) 2015 Jerome Jutteau * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -32,52 +32,55 @@ 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"); + } 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 ."); + die("No command found. Should be admin.php .\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'); - echo '

'. + if (empty($cfg['admin_password']) && empty($cfg['admin_http_auth_user'])) { + require(JIRAFEAU_ROOT . 'lib/template/header.php'); + echo '

'. t('NO_ADMIN') . '

'; - require(JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; - } + require(JIRAFEAU_ROOT.'lib/template/footer.php'); + exit; + } - /* Unlog if asked. */ - if (jirafeau_admin_session_logged() && isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { - jirafeau_admin_session_end(); - } + /* Logout if requested. */ + if (jirafeau_admin_session_logged() && isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { + jirafeau_session_end(); + } - if (!jirafeau_admin_session_logged()) { - /* Test HTTP authentification. */ - if (!empty($cfg['admin_http_auth_user']) && + if (!jirafeau_admin_session_logged()) { + /* 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. */ - else if (!empty($cfg['admin_password']) && isset($_POST['admin_password'])) { - if ($cfg['admin_password'] === $_POST['admin_password'] || - $cfg['admin_password'] === hash('sha256', $_POST['admin_password'])) { - jirafeau_admin_session_start(); - } else { - require(JIRAFEAU_ROOT . 'lib/template/header.php'); - echo '

'. t('BAD_PSW') . '

'; - require(JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; - } - } - /* Admin password prompt form. */ - else { - require(JIRAFEAU_ROOT . 'lib/template/header.php'); ?> + jirafeau_admin_session_start(); + } + /* 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(); + } else { + require(JIRAFEAU_ROOT . 'lib/template/header.php'); + echo '

'. t('BAD_PSW') . '

'; + require(JIRAFEAU_ROOT.'lib/template/footer.php'); + exit; + } + } + /* Admin password prompt form. */ + else { + require(JIRAFEAU_ROOT . 'lib/template/header.php'); ?>