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

fix: install sql pb

parent 56f2dd2a
No related branches found
No related tags found
No related merge requests found
......@@ -184,7 +184,7 @@ class Install extends functions
public function isIniErrorRepportingRequirements()
{
if (version_compare(PHP_VERSION, '5.4') < 0) {
if (version_compare(PHP_VERSION, '5.4') >= 0) {
if (ini_get('error_reporting') <> 22519) {
return false;
} else {
......@@ -388,7 +388,7 @@ class Install extends functions
$fileContent = fread(fopen($filePath, 'r'), filesize($filePath));
$db = new dbquery();
$db->connect();
$execute = $db->query($fileContent, false, true);
$execute = $db->query($fileContent, true, true);
if (!$execute) {
return false;
......
......@@ -79,6 +79,9 @@ if (!defined('_IMAP')) {
if (!defined('_MBSTRING')) {
define('_MBSTRING', "mbstring library");
}
if (!defined('_XSL')) {
define('_XSL', "xsl library");
}
if (!defined('_PEAR')) {
define('_PEAR', "PEAR");
}
......@@ -89,7 +92,8 @@ if (!defined('_CLITOOLS')) {
define('_CLITOOLS', "CLITools");
}
if (!defined('_ERROR_REPORTING')) {
define('_ERROR_REPORTING', "error_reporting (E_ALL & ~E_NOTICE & ~E_DEPRECATED)");
define('_ERROR_REPORTING', "error_reporting if php version < 5.4 so E_ALL & ~E_NOTICE & ~E_DEPRECATED"
. " else E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT");
}
if (!defined('_DISPLAY_ERRORS')) {
define('_DISPLAY_ERRORS', "display_errors (On)");
......@@ -186,7 +190,7 @@ if (!defined('_BAD_INFORMATIONS_FOR_CONNECTION')) {
define('_BAD_INFORMATIONS_FOR_CONNECTION', "Bad informations");
}
if (!defined('_UNABLE_TO_CREATE_DATABASE')) {
define('_UNABLE_TO_CREATE_DATABASE', "Unable to create database, try another name");
define('_UNABLE_TO_CREATE_DATABASE', "Unable to create database, try another name or check the script structure.sql");
}
if (!defined('_UNABLE_TO_LOAD_DATAS')) {
define('_UNABLE_TO_LOAD_DATAS', "Unable to load dataset");
......
......@@ -77,6 +77,9 @@ if (!defined('_IMAP')) {
if (!defined('_MBSTRING')) {
define('_MBSTRING', "librairie mbstring");
}
if (!defined('_XSL')) {
define('_XSL', "librairie xsl");
}
if (!defined('_PEAR')) {
define('_PEAR', "PEAR");
}
......@@ -87,7 +90,8 @@ if (!defined('_CLITOOLS')) {
define('_CLITOOLS', "CLITools");
}
if (!defined('_ERROR_REPORTING')) {
define('_ERROR_REPORTING', "error_reporting (E_ALL & ~E_NOTICE & ~E_DEPRECATED)");
define('_ERROR_REPORTING', "error_reporting si php version < 5.4 alors E_ALL & ~E_NOTICE & ~E_DEPRECATED "
. "sinon E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT");
}
if (!defined('_DISPLAY_ERRORS')) {
define('_DISPLAY_ERRORS', "display_errors (On)");
......@@ -184,7 +188,7 @@ if (!defined('_BAD_INFORMATIONS_FOR_CONNECTION')) {
define('_BAD_INFORMATIONS_FOR_CONNECTION', "Les informations de connexion sont invalides");
}
if (!defined('_UNABLE_TO_CREATE_DATABASE')) {
define('_UNABLE_TO_CREATE_DATABASE', "Impossible de créer la base de données, essayer un autre nom");
define('_UNABLE_TO_CREATE_DATABASE', "Impossible de créer la base de données, essayer un autre nom ou v&eacute;rifier le script structure.sql");
}
if (!defined('_UNABLE_TO_LOAD_DATAS')) {
define('_UNABLE_TO_LOAD_DATAS', "Impossible d'importer les datas");
......
......@@ -59,7 +59,7 @@
); ?>
</td>
<td>
<?php echo _PHP_VERSION; ?>
<?php echo _PHP_VERSION . ' -> ' . PHP_VERSION; ?>
</td>
</tr>
<tr>
......@@ -149,6 +149,18 @@
<?php echo _MBSTRING; ?>
</td>
</tr>
<tr>
<td class="voyantPrerequisites">
<?php echo $Class_Install->checkPrerequisites(
$Class_Install->isPhpRequirements(
'xsl'
)
); ?>
</td>
<td>
<?php echo _XSL; ?>
</td>
</tr>
<tr>
<td>&nbsp;
</td>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment