From 8d6002fa6a6c13228b00ed54b07359aa83b90da3 Mon Sep 17 00:00:00 2001 From: Jerome Jutteau Date: Fri, 9 Feb 2018 23:35:52 +0100 Subject: [PATCH] [BUGFIX] run session_start before outputing any html And avoid some warnings when a user password is configured. Signed-off-by: Jerome Jutteau --- admin.php | 5 +---- index.php | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/admin.php b/admin.php index 17189da..bee8e1f 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'); @@ -52,9 +52,6 @@ if (php_sapi_name() == "cli") { exit; } - /* Check session. */ - session_start(); - /* Unlog if asked. */ if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { $_SESSION['admin_auth'] = false; diff --git a/index.php b/index.php index 795c804..eec0fa3 100644 --- a/index.php +++ b/index.php @@ -18,6 +18,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'); @@ -38,8 +39,6 @@ require(JIRAFEAU_ROOT . 'lib/template/header.php'); if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) { // Is an upload password required? if (jirafeau_has_upload_password($cfg)) { - session_start(); - // Logout action if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { session_unset(); -- 2.34.1