[BUGFIX] run session_start before outputing any html

And avoid some warnings when a user password is configured.

Signed-off-by: Jerome Jutteau <j.jutteau@gmail.com>

diff --git a/admin.php b/admin.php
index 17189da6ab8f02f71a6a6837994049b8a2bc047a..bee8e1f822907939d40ab1ce74c19a9a553e1848 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */

-
+session_start();

 define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
 
 require(JIRAFEAU_ROOT . 'lib/settings.php');
 define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
 
 require(JIRAFEAU_ROOT . 'lib/settings.php');


@@ -52,9 +52,6 @@ if (php_sapi_name() == "cli") {
       exit;
   }
 
       exit;
   }
 

-  /* Check session. */
-  session_start();
-

   /* Unlog if asked. */
   if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
       $_SESSION['admin_auth'] = false;
   /* 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 795c804a0d754ef50af380e6844bda7480ba2870..eec0fa37b005ce3b415f8f7909a537c2edf3d29c 100644 (file)
--- 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 <https://www.gnu.org/licenses/>.
  */
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */

+session_start();

 define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
 
 require(JIRAFEAU_ROOT . 'lib/settings.php');
 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)) {
 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();
         // Logout action
         if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
             session_unset();