Skip to content
Snippets Groups Projects
Commit 2de97215 authored by Giovannoni Laurent's avatar Giovannoni Laurent
Browse files

evo : url

parent 8a03d75b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
core/trunk/core/init.php
+ 9
− 0
View file @ 2de97215
<?php <?php
session_name('maarch_entreprise_trunk'); session_name('maarch_entreprise_trunk');
session_start(); session_start();
if (!isset($_SESSION['config'])) {
require_once('class' . DIRECTORY_SEPARATOR . 'class_portal.php');
$portal = new portal();
$portal->unset_session();
$portal->build_config();
}
if (isset($_SESSION['config']['default_timezone']) if (isset($_SESSION['config']['default_timezone'])
&& ! empty($_SESSION['config']['default_timezone']) && ! empty($_SESSION['config']['default_timezone'])
) { ) {
......
core/trunk/index.php
+ 13
− 7
View file @ 2de97215
...@@ -11,13 +11,14 @@ ...@@ -11,13 +11,14 @@
* @author Laurent Giovannoni <dev@maarch.org> * @author Laurent Giovannoni <dev@maarch.org>
*/ */
include_once('core'.DIRECTORY_SEPARATOR.'init.php');
require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_functions.php"); require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_functions.php");
include_once('core'.DIRECTORY_SEPARATOR.'init.php');
require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_portal.php"); require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_portal.php");
require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_core_tools.php"); require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_core_tools.php");
$portal = new portal(); if (!isset($portal)) {
$portal->unset_session(); $portal = new portal();
$portal->build_config(); }
#$portal->build_config();
$func = new functions(); $func = new functions();
$core = new core_tools(); $core = new core_tools();
$_SESSION['custom_override_id'] = $core->get_custom_id(); $_SESSION['custom_override_id'] = $core->get_custom_id();
...@@ -25,20 +26,24 @@ $_SESSION['custom_override_id'] = $core->get_custom_id(); ...@@ -25,20 +26,24 @@ $_SESSION['custom_override_id'] = $core->get_custom_id();
/**** retrieve HTTP_REQUEST FROM SSO ****/ /**** retrieve HTTP_REQUEST FROM SSO ****/
$_SESSION['HTTP_REQUEST'] = $_REQUEST; $_SESSION['HTTP_REQUEST'] = $_REQUEST;
/*
if(isset($_SESSION['config']['defaultlang']) && !empty($_SESSION['config']['defaultlang'])) if(isset($_SESSION['config']['defaultlang']) && !empty($_SESSION['config']['defaultlang']))
{ {
include("portal".DIRECTORY_SEPARATOR.$_SESSION['config']['defaultlang'].'.php'); include("portal".DIRECTORY_SEPARATOR.$_SESSION['config']['defaultlang'].'.php');
} }
*/
if(isset($_GET['origin']) && $_GET['origin'] == "scan") if(isset($_GET['origin']) && $_GET['origin'] == "scan")
{ {
header("location: apps/".$_SESSION['businessapps'][0]['appid']."/reopen.php"); header("location: apps/".$_SESSION['businessapps'][0]['appid']."/reopen.php");
} }
elseif(count($_SESSION['businessapps'])== 1) elseif(count($_SESSION['businessapps'])== 1)
{ {
header("location: portal/launch_maarch.php?app=".$_SESSION['businessapps'][0]['appid']); #header("location: portal/launch_maarch.php?app=".$_SESSION['businessapps'][0]['appid']);
$_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']);
} }
else /*else
{ {
?> ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
...@@ -79,3 +84,4 @@ else ...@@ -79,3 +84,4 @@ else
<?php <?php
} }
?> ?>
*/
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment