Merge pull request #160 from marsante/fix-redirect-install.php

fix: blank first page when cli or file installation
MedShake · Aug 12, 2024 · 302bf6c · 302bf6c
2 parents d6980ef + 34579e6
commit 302bf6c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/public_html/index.php b/public_html/index.php
@@ -25,6 +25,7 @@
  *
  * @author Bertrand Boutillier <[email protected]>
  * @contrib fr33z00 <https://www.github.com/fr33z00>
+ * @contrib Michaël Val
  */
 
 ini_set('display_errors', 0);
@@ -68,7 +69,20 @@
 $p['homepath'] = $homepath;
 
 /////////// SQL connexion
-$pdo = msSQL::sqlConnect();
+try {
+    $pdo = msSQL::sqlConnect();
+} catch (Exception $e) {
+    msTools::redirection('/install.php');
+}
+
+// Vérifier si la base de données existe et s'il y a des tables
+$sql = "SHOW TABLES";
+$stmt = $pdo->prepare($sql);
+$stmt->execute();
+$tables = $stmt->fetchAll(PDO::FETCH_COLUMN);
+if (empty($tables)) {
+    msTools::redirection('/install.php');
+}
 
 /////////// État système
 $p['config']['systemState'] = msSystem::getSystemState();

diff --git a/upgrade/base/sqlInstall.sql b/upgrade/base/sqlInstall.sql
@@ -1270,7 +1270,7 @@ INSERT IGNORE INTO `prescriptions` (`cat`, `label`, `description`, `fromID`, `to
 
 -- system
 INSERT IGNORE INTO `system` (`name`, `groupe`, `value`) VALUES
-('base', 'module', 'v8.1.1'),
+('base', 'module', 'v8.1.2'),
 ('state', 'system', 'normal');
 
 -- univtags_type

diff --git a/upgrade/base/sqlUpgrade_v8.1.1_v8.1.2.sql b/upgrade/base/sqlUpgrade_v8.1.1_v8.1.2.sql
@@ -0,0 +1,2 @@
+-- Mise à jour n° de version
+UPDATE `system` SET `value`='v8.1.2' WHERE `name`='base' and `groupe`='module';
diff --git a/versionMedShakeEHR-base.txt b/versionMedShakeEHR-base.txt
@@ -1 +1 @@
-v8.1.1
+v8.1.2
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- Mise à jour n° de version
		UPDATE `system` SET `value`='v8.1.2' WHERE `name`='base' and `groupe`='module';