tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

#10138 change system error in step 4

Browse Source
This commit is contained in:
Daniel Cebrian 2023-01-18 17:39:12 +01:00
parent d24fe065fb
commit 5ae1a28277
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pandora_console/install.php
View File

@ -333,9 +333,10 @@ function parse_mysqli_dump($connection, $url)
$query .= $sql_line; $query .= $sql_line;
if (preg_match("/;[\040]*\$/", $sql_line)) { if (preg_match("/;[\040]*\$/", $sql_line)) {
if (!$result = mysqli_query($connection, $query)) { if (!$result = mysqli_query($connection, $query)) {
echo mysqli_error($connection); if (mysqli_error($connection)) {
// Uncomment for debug return mysqli_error($connection).'<i><br>'.$query.'<br></i>';
echo "<i><br>$query<br></i>"; }
return 0; return 0;
} }
@ -888,7 +889,7 @@ function install_step4()
$step5 = 0; $step5 = 0;
$step6 = 0; $step6 = 0;
$step7 = 0; $step7 = 0;
$errors = [];
echo " echo "
<div id='install_container'> <div id='install_container'>
<div id='wizard'> <div id='wizard'>
@ -1036,13 +1037,21 @@ function install_step4()
if ($step1 == 1) { if ($step1 == 1) {
$step2 = mysqli_select_db($connection, $dbname); $step2 = mysqli_select_db($connection, $dbname);
check_generic($step2, "Opening database '$dbname'"); check_generic($step2, "Opening database '$dbname'");
echo '<div class="err-sql">';
$step3 = parse_mysqli_dump($connection, 'pandoradb.sql'); $step3 = parse_mysqli_dump($connection, 'pandoradb.sql');
echo '</div>';
if ($step3 !== 0) {
$errors[] = $step3;
}
check_generic($step3, 'Creating schema'); check_generic($step3, 'Creating schema');
echo '<div class="err-sql">';
$step4 = parse_mysqli_dump($connection, 'pandoradb_data.sql'); $step4 = parse_mysqli_dump($connection, 'pandoradb_data.sql');
echo '</div>';
if ($step4 !== 0) {
$errors[] = $step4;
}
check_generic($step4, 'Populating database'); check_generic($step4, 'Populating database');
if (PHP_OS == 'FreeBSD') { if (PHP_OS == 'FreeBSD') {
$step_freebsd = adjust_paths_for_freebsd($engine, $connection); $step_freebsd = adjust_paths_for_freebsd($engine, $connection);