From acb4d08c2e01fc469138cebe58154d4259ec16d2 Mon Sep 17 00:00:00 2001
From: Henri Queneau <henri.queneau@maarch.org>
Date: Mon, 12 Sep 2016 10:46:50 +0000
Subject: [PATCH] FIX #4573 change maarchUrl with good ip and custom
---
core/trunk/install/class/Class_Install.php | 7 ++++++-
core/trunk/install/scripts/config.php | 3 ++-
core/trunk/install/scripts/testSmtp.php | 4 +++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/core/trunk/install/class/Class_Install.php b/core/trunk/install/class/Class_Install.php
index 30159b3a5e4..e323c06b163 100755
--- a/core/trunk/install/class/Class_Install.php
+++ b/core/trunk/install/class/Class_Install.php
@@ -1298,8 +1298,13 @@ class Install extends functions
$CONFIG = $xmlconfig->CONFIG;
$CONFIG->MaarchDirectory = realpath('.')."/";
- $chemin = $_SERVER['SERVER_NAME'] . dirname($_SERVER['PHP_SELF']);
+ //$path = "ifconfig eth2 | grep 'inet addr' | cut -f2 -d: | awk '{print $1}'";
+ //$ipconfig = shell_exec($path);
+ //$ipconfig = trim($ipconfig);
+ //$chemin = $ipconfig . dirname($_SERVER['PHP_SELF'] .'cs_'.$_SESSION['config']['databasename']);
+ $chemin = $_SERVER['SERVER_ADDR'] . dirname($_SERVER['PHP_SELF'] .'cs_'.$_SESSION['config']['databasename']);
$maarchUrl = rtrim($chemin, "install");
+ $maarchUrl = $maarchUrl.'cs_'.$_SESSION['config']['databasename'].'/';
$CONFIG->MaarchUrl = $maarchUrl;
$CONFIG->MaarchApps = 'maarch_entreprise';
$CONFIG->TmpDirectory = realpath('.').'/modules/notifications/batch/tmp/';
diff --git a/core/trunk/install/scripts/config.php b/core/trunk/install/scripts/config.php
index 7a85b9f51ab..e6cb429c3e2 100755
--- a/core/trunk/install/scripts/config.php
+++ b/core/trunk/install/scripts/config.php
@@ -8,8 +8,9 @@
$xmlconfig = simplexml_load_file(realpath('.').'/custom/maarch_courrier/modules/notifications/batch/config/config.xml');
$CONFIG = $xmlconfig->CONFIG;
$CONFIG->MaarchDirectory = realpath('.')."/";
- $chemin = $_SERVER['SERVER_NAME'] . dirname($_SERVER['PHP_SELF']);
+ $chemin = $_SERVER['SERVER_ADDR'] . dirname($_SERVER['PHP_SELF']);
$maarchUrl = rtrim($chemin, "install");
+ $maarchUrl = $maarchUrl . 'cs_'.$_SESSION['config']['databasename'].'/';
$CONFIG->MaarchUrl = $maarchUrl;
$CONFIG->MaarchApps = 'maarch_entreprise';
$CONFIG->TmpDirectory = realpath('.').'/modules/notifications/batch/tmp/';
diff --git a/core/trunk/install/scripts/testSmtp.php b/core/trunk/install/scripts/testSmtp.php
index 3fcd2cda7f5..e0df8c950d6 100755
--- a/core/trunk/install/scripts/testSmtp.php
+++ b/core/trunk/install/scripts/testSmtp.php
@@ -8,8 +8,9 @@
$CONFIG = $xmlconfig->CONFIG;
$CONFIG->MaarchDirectory = realpath('.')."/";
- $chemin = $_SERVER['SERVER_NAME'] . dirname($_SERVER['PHP_SELF']);
+ $chemin = $_SERVER['SERVER_ADDR'] . dirname($_SERVER['PHP_SELF']);
$maarchUrl = rtrim($chemin, "install");
+ $maarchUrl = $maarchUrl . 'cs_'.$_SESSION['config']['databasename'].'/';
$CONFIG->MaarchUrl = $maarchUrl;
$CONFIG->MaarchApps = 'maarch_entreprise';
$CONFIG->TmpDirectory = realpath('.').'/modules/sendmail/batch/tmp/';
@@ -57,6 +58,7 @@
$CONFIG->MaarchDirectory = realpath('.')."/";
$chemin = $_SERVER['SERVER_NAME'] . dirname($_SERVER['PHP_SELF']);
$maarchUrl = rtrim($chemin, "install");
+ $maarchUrl = $maarchUrl . 'cs_'.$_SESSION['config']['databasename'].'/';
$CONFIG->MaarchUrl = $maarchUrl;
$CONFIG->MaarchApps = 'maarch_entreprise';
$CONFIG->TmpDirectory = realpath('.').'/modules/notifications/batch/tmp/';
--
GitLab