X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/9a9c9a8bf83241c193c5bef6361d41893e72dfd3..2a04a560f1c105b082acd42dd8a61dfdec3da6d2:/admin.php diff --git a/admin.php b/admin.php index 230c512..4a3d25f 100644 --- a/admin.php +++ b/admin.php @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ - +session_start(); define('JIRAFEAU_ROOT', dirname(__FILE__) . '/'); require(JIRAFEAU_ROOT . 'lib/settings.php'); @@ -46,82 +46,65 @@ if (php_sapi_name() == "cli") { if (empty($cfg['admin_password']) && empty($cfg['admin_http_auth_user'])) { require(JIRAFEAU_ROOT . 'lib/template/header.php'); echo '

'. - t('Sorry, the admin interface is not enabled.') . + t('NO_ADMIN') . '

'; require(JIRAFEAU_ROOT.'lib/template/footer.php'); exit; } - /* Check session. */ - session_start(); - /* Unlog if asked. */ - if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { - $_SESSION['admin_auth'] = false; + if (jirafeau_admin_session_logged() && isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { + jirafeau_admin_session_end(); } - /* Check classic admin password authentification. */ - if (isset($_POST['admin_password']) && empty($cfg['admin_http_auth_user'])) { - if ($cfg['admin_password'] === $_POST['admin_password'] || - $cfg['admin_password'] === hash('sha256', $_POST['admin_password'])) { - $_SESSION['admin_auth'] = true; - } else { - $_SESSION['admin_auth'] = false; - require(JIRAFEAU_ROOT . 'lib/template/header.php'); - echo '

'. - t('Wrong password.') . '

'; + if (!jirafeau_admin_session_logged()) { + /* Test HTTP authentification. */ + 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'] === 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'); ?> +
+
+ + + + + + + + + + +
+
+
+
+
+ -
-
- - - - - - - - - -
- -
-
-
-

'. - t('Sorry, you are not authenticated on admin interface.') . - '

'; - require(JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; - } /* Operations may take a long time. * Be sure PHP's safe mode is off. @@ -132,97 +115,103 @@ 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'); ?>

(version )

-
+
+ + + + + +
- + - +
- + - +
- + - +
- + - +
- + - +
- + - +
- + +
' . NL; echo '

'; - echo t('Number of cleaned files') . ' : ' . $total; + echo t('CLEANED_FILES_CNT') . ' : ' . $total; echo '

'; } elseif (strcmp($_POST['action'], 'clean_async') == 0) { $total = jirafeau_admin_clean_async(); echo '
' . NL; echo '

'; - echo t('Number of cleaned files') . ' : ' . $total; + echo t('CLEANED_FILES_CNT') . ' : ' . $total; echo '

'; } elseif (strcmp($_POST['action'], 'list') == 0) { jirafeau_admin_list("", "", ""); @@ -250,11 +239,11 @@ if (php_sapi_name() == "cli") { } elseif (strcmp($_POST['action'], 'delete_link') == 0) { jirafeau_delete_link($_POST['link']); echo '
' . NL; - echo '

' . t('Link deleted') . '

'; + echo '

' . t('LINK_DELETED') . '

'; } elseif (strcmp($_POST['action'], 'delete_file') == 0) { $count = jirafeau_delete_file($_POST['md5']); echo '
' . NL; - echo '

' . t('Deleted links') . ' : ' . $count . '

'; + echo '

' . t('DELETED_LINKS') . ' : ' . $count . '

'; } elseif (strcmp($_POST['action'], 'download') == 0) { $l = jirafeau_get_link($_POST['link']); if (!count($l)) { @@ -266,7 +255,12 @@ if (php_sapi_name() == "cli") { header('Content-Disposition: attachment; filename="' . $l['file_name'] . '"'); if (file_exists(VAR_FILES . $p . $l['md5'])) { - readfile(VAR_FILES . $p . $l['md5']); + $r = fopen(VAR_FILES . $p . $l['md5'], 'r'); + while (!feof($r)) { + print fread($r, 1024); + ob_flush(); + } + fclose($r); } exit; }