From 08c974557378b8cbc217b45568ee8fc050a19ab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Nana?= <sebastien.nana@maarch.org>
Date: Tue, 22 Dec 2009 17:43:43 +0000
Subject: [PATCH] Fix correction d'erreur e_notice
---
core/trunk/core/class/class_portal.php | 18 +++++++++---------
core/trunk/core/init.php | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/core/trunk/core/class/class_portal.php b/core/trunk/core/class/class_portal.php
index 60fe28c333f..45a13121ec4 100644
--- a/core/trunk/core/class/class_portal.php
+++ b/core/trunk/core/class/class_portal.php
@@ -59,7 +59,7 @@ class portal extends functions
{
$_SESSION['config']['default_timezone'] = 'Europe/Paris';
}
- if ($_SERVER['HTTPS'] == "on")
+ if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on")
$protocol = "https";
else
$protocol = "http";
@@ -76,14 +76,14 @@ class portal extends functions
{
$server_port = '';
}
- if($_SERVER['HTTP_X_FORWARDED_HOST'] <> "")
- {
- $host = $_SERVER['HTTP_X_FORWARDED_HOST'];
- }
- else
- {
- $host = $_SERVER['HTTP_HOST'];
- }
+ if(isset($_SERVER['HTTP_X_FORWARDED_HOST']) && $_SERVER['HTTP_X_FORWARDED_HOST'] <> "")
+ {
+ $host = $_SERVER['HTTP_X_FORWARDED_HOST'];
+ }
+ else
+ {
+ $host = $_SERVER['HTTP_HOST'];
+ }
$_SESSION['config']['coreurl'] = $protocol."://".$host.$server_port.str_replace('index.php','',$_SERVER['SCRIPT_NAME']);
}
$i=0;
diff --git a/core/trunk/core/init.php b/core/trunk/core/init.php
index 7cdee9fe670..80e0ae86d2b 100644
--- a/core/trunk/core/init.php
+++ b/core/trunk/core/init.php
@@ -15,7 +15,7 @@ if(isset($_SESSION['config']['corepath']) && !empty($_SESSION['config']['corepat
{
chdir($_SESSION['config']['corepath']);
}
-//ini_set('error_reporting', E_ALL);
+ini_set('error_reporting', E_ALL);
if (isset($_SESSION['custom_override_id']) && !empty($_SESSION['custom_override_id']) && isset($_SESSION['config']['corepath']) && !empty($_SESSION['config']['corepath']))
{
$path = $_SESSION['config']['corepath']."custom".DIRECTORY_SEPARATOR.$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR;
--
GitLab