From bd88baf54e116a1b16659341d26c383a6709f556 Mon Sep 17 00:00:00 2001
From: Laurent Giovannoni <laurent.giovannoni@maarch.org>
Date: Thu, 18 Jun 2015 06:51:25 +0000
Subject: [PATCH] FIX #2510 coreurl deletion

---
 core/trunk/core/class/class_core_tools.php | 6 ++----
 core/trunk/core/class/class_security.php   | 5 ++---
 core/trunk/index.php                       | 3 ---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/core/trunk/core/class/class_core_tools.php b/core/trunk/core/class/class_core_tools.php
index d3a6c73cd1a..fc333ac5ac8 100644
--- a/core/trunk/core/class/class_core_tools.php
+++ b/core/trunk/core/class/class_core_tools.php
@@ -504,8 +504,7 @@ class core_tools extends functions
         if ($logout) {
         echo '<li onmouseover="this.className=\'on\';" onmouseout="this.className=\'\';">
         <a href="'.$_SESSION['config']['businessappurl']
-            . 'index.php?display=true&amp;page=logout&amp;coreurl='
-            . $_SESSION['config']['coreurl'].'&amp;logout=true"><span><span style="width:30px;height:30px;display:inline-block;text-align:center;"><i class="fa fa-power-off fa-2x"></i></span><span>'._LOGOUT.'</span></span></a></li>';
+            . 'index.php?display=true&amp;page=logout&amp;logout=true"><span><span style="width:30px;height:30px;display:inline-block;text-align:center;"><i class="fa fa-power-off fa-2x"></i></span><span>'._LOGOUT.'</span></span></a></li>';
         }
     }
 
@@ -715,8 +714,7 @@ class core_tools extends functions
         echo '</a>';
 
         echo '<a style="display: inline-block;width: 45%;float: left;" href="' . $_SESSION['config']['businessappurl']
-            . 'index.php?display=true&amp;page=logout&amp;coreurl='
-            . $_SESSION['config']['coreurl'].'&amp;logout=true">';
+            . 'index.php?display=true&amp;page=logout&amp;logout=true">';
         echo '<span>';
         echo '<span style="width:30px;height:30px;display:inline-block;text-align:center;">'
             .'<i class="fa fa-power-off fa-2x mCdarkGrey"></i></span>';
diff --git a/core/trunk/core/class/class_security.php b/core/trunk/core/class/class_security.php
index ba7a3ee3b6a..cc8bfe9b702 100644
--- a/core/trunk/core/class/class_security.php
+++ b/core/trunk/core/class/class_security.php
@@ -315,8 +315,7 @@ class security extends dbquery
             return array(
                 'user'  => $array,
                 'error' => $error,
-                'url'   => 'index.php?display=true&page=login&coreurl='
-                                   . $_SESSION['config']['coreurl']
+                'url'   => 'index.php?display=true&page=login'
             );
         }
     }
@@ -439,7 +438,7 @@ class security extends dbquery
         else
         {
             $_SESSION['error'] = _ERROR;
-            header("location: ".$_SESSION['config']['businessappurl']."index.php?display=true&page=login&coreurl=".$_SESSION['config']['coreurl']);
+            header("location: ".$_SESSION['config']['businessappurl']."index.php?display=true&page=login");
             exit();
         }
     }
diff --git a/core/trunk/index.php b/core/trunk/index.php
index fc99ca6cc1e..99fb92f1e1f 100644
--- a/core/trunk/index.php
+++ b/core/trunk/index.php
@@ -44,9 +44,6 @@ if (isset($_GET['origin']) && $_GET['origin'] == 'scan') {
     header('location: apps/'.$_SESSION['businessapps'][0]['appid'].'/reopen.php');
 } else {
     $_SESSION['config']['app_id'] = $_SESSION['businessapps'][0]['appid'];
-    /*header('location: apps/'.$_SESSION['config']['app_id']
-        . '/index.php?display=true&page=login&coreurl='
-        . $_SESSION['config']['coreurl']);*/
     header('location: apps/'.$_SESSION['config']['app_id']
         . '/index.php?display=true&page=login');
 }
-- 
GitLab