merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing the issue #633

This commit is contained in:
Abdulhamid Alattar 2019-02-27 14:50:35 +04:00
parent 268ec5e425
commit 65a9e36473
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/installer/index.php
View File

@ -16,7 +16,7 @@
// converting env content to key/value pair
$data = explode(PHP_EOL,$str);
$databaseArray = ['DB_HOST', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD', 'DB_CONNECTION'];
$databaseArray = ['DB_HOST', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD', 'DB_CONNECTION','DB_PORT'];
$key = $value = [];
if ($data) {
@ -39,9 +39,10 @@
$password = $databaseData['DB_PASSWORD'];
$dbname = $databaseData['DB_DATABASE'];
$connection = $databaseData['DB_CONNECTION'];
$port = $databaseData['DB_PORT'];
if ($connection == 'mysql') {
@$conn = new mysqli($servername, $username, $password, $dbname);
@$conn = new mysqli($servername, $username, $password, $dbname, $port);
if (!$conn->connect_error) {
// retrieving admin entry
@ -98,4 +99,4 @@
// redirecting to 404 error page
header("Location: $url");
}
?>
?>

5
public/installer/install.php
View File

@ -15,7 +15,7 @@
// converting env content to key/value pair
$data = explode(PHP_EOL,$str);
$databaseArray = ['DB_HOST', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD', 'DB_CONNECTION'];
$databaseArray = ['DB_HOST', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD', 'DB_CONNECTION','DB_PORT'];
$key = $value = [];
if ($data) {
@ -38,9 +38,10 @@
$password = $databaseData['DB_PASSWORD'];
$dbname = $databaseData['DB_DATABASE'];
$connection = $databaseData['DB_CONNECTION'];
$port = $databaseData['DB_PORT'];
if ($connection == 'mysql') {
@$conn = new mysqli($servername, $username, $password, $dbname);
@$conn = new mysqli($servername, $username, $password, $dbname, $port);
if (!$conn->connect_error) {
// retrieving admin entry