From 2a043490ef72d89d305c45a72ef4b5de170c039d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Nana?= <sebastien.nana@maarch.org>
Date: Tue, 12 May 2015 16:14:58 +0000
Subject: [PATCH] FEAT #2362 Adding new prerequisities
---
core/trunk/install/class/Class_Install.php | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/core/trunk/install/class/Class_Install.php b/core/trunk/install/class/Class_Install.php
index e4cf25b7213..2c538abd76d 100755
--- a/core/trunk/install/class/Class_Install.php
+++ b/core/trunk/install/class/Class_Install.php
@@ -130,6 +130,12 @@ class Install extends functions
if (!$this->isPhpRequirements('gd')) {
return false;
}
+ if (!$this->isPhpRequirements('imagick')) {
+ return false;
+ }
+ /*if (!$this->isPhpRequirements('ghostscript')) {
+ return false;
+ }*/
if (!$this->isPearRequirements('System.php')) {
return false;
}
@@ -295,6 +301,7 @@ class Install extends functions
$databasename
)
{
+
$connect = 'host='.$_SESSION['config']['databaseserver'] . ' ';
$connect .= 'port='.$_SESSION['config']['databaseserverport'] . ' ';
$connect .= 'user='.$_SESSION['config']['databaseuser'] . ' ';
@@ -326,21 +333,21 @@ class Install extends functions
return false;
exit;
}
-
+
if (!$this->executeSQLScript('sql/structure.sql')) {
return false;
exit;
}
- if (!$this->setConfigXml()) {
+ if (!$this->setConfigXml()) {
return false;
exit;
}
- if (!$this->setDatasourcesXsd()) {
+ /*if (!$this->setDatasourcesXsd()) {
return false;
exit;
- }
+ }*/
return true;
}
@@ -348,6 +355,7 @@ class Install extends functions
private function setConfigXml()
{
$xmlconfig = simplexml_load_file('apps/maarch_entreprise/xml/config.xml.default');
+ //$xmlconfig = 'apps/maarch_entreprise/xml/config.xml.default';
$CONFIG = $xmlconfig->CONFIG;
$CONFIG->databaseserver = $_SESSION['config']['databaseserver'];
--
GitLab