diff --git a/install/class/Class_Install.php b/install/class/Class_Install.php index 94ae567a7abcb0dc5104f5edbe460e6d800f3ea1..797ea05ebdf90b2657ccaa066c7ee62a4b6c1fe1 100755 --- a/install/class/Class_Install.php +++ b/install/class/Class_Install.php @@ -806,16 +806,17 @@ class Install extends functions $chemin = $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->MaarchUrl = $maarchUrl; + $CONFIG->customID = 'cs_'.$_SESSION['config']['databasename']; + $CONFIG->MaarchApps = 'maarch_entreprise'; $CONFIG->TmpDirectory = realpath('.').'/modules/notifications/batch/tmp/'; $CONFIG_BASE = $xmlconfig->CONFIG_BASE; - $CONFIG_BASE->databaseserver = $_SESSION['config']['databaseserver']; + $CONFIG_BASE->databaseserver = $_SESSION['config']['databaseserver']; $CONFIG_BASE->databaseserverport = $_SESSION['config']['databaseserverport']; - $CONFIG_BASE->databasename = $_SESSION['config']['databasename']; - $CONFIG_BASE->databaseuser = $_SESSION['config']['databaseuser']; - $CONFIG_BASE->databasepassword = $_SESSION['config']['databasepassword']; + $CONFIG_BASE->databasename = $_SESSION['config']['databasename']; + $CONFIG_BASE->databaseuser = $_SESSION['config']['databaseuser']; + $CONFIG_BASE->databasepassword = $_SESSION['config']['databasepassword']; $LOG4PHP = $xmlconfig->LOG4PHP; $LOG4PHP->Log4PhpConfigPath = realpath('.').'/custom/cs_'.$_SESSION['config']['databasename'].'/apps/maarch_entreprise/xml/log4php.xml'; diff --git a/src/app/action/controllers/PreProcessActionController.php b/src/app/action/controllers/PreProcessActionController.php index e270179c12140c4fc49d4adeb9b7cc19ea16a0f4..8ee86b27e710acb83c206ad218d5ddf98d4fecb8 100755 --- a/src/app/action/controllers/PreProcessActionController.php +++ b/src/app/action/controllers/PreProcessActionController.php @@ -429,7 +429,7 @@ class PreProcessActionController 'select' => ['destination'], 'resId' => $data['resources'][0] ]); - $destination = EntityModel::getByEntityId(['entity_id' => $resDestination['destination'], 'select' => ['id']]); + $destination = EntityModel::getByEntityId(['entityId' => $resDestination['destination'], 'select' => ['id']]); $additionalsInfos['destinationId'] = $destination['id']; } else {