Merge pull request #829 from Patriboom/master

Install able to rebuilt the BDD
pixeline · Sep 8, 2022 · 4d8d9a9 · 4d8d9a9
2 parents 5e602ff + e432065
commit 4d8d9a9
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/app/application/config/tinyissue.php b/app/application/config/tinyissue.php
@@ -2,5 +2,5 @@
 return array(
 	'release_date' => '08-09-2022',
 	'version' => '1.9',
-	'release' => '1e'
+	'release' => '1f'
 );
diff --git a/install/config-setup.php b/install/config-setup.php
@@ -353,14 +353,11 @@ function ChgLng(Lng = 'en') { document.location.href = 'index.php?Lng=' + Lng; }
 						$timezones = timezone_identifiers_list();
 
 						echo 'select name="timezone" size="10">' . "\n";
-
-						foreach($timezones as $timezone)
-						{
+						foreach($timezones as $timezone) {
 						  echo '<option';
 						  echo $timezone == date("e") ? ' selected' : '';
 						  echo '>' . $timezone . '</option>' . "\n";
 						}
-
 						echo '</select>' . "\n";
 						?>
 					</select>

diff --git a/install/index.php b/install/index.php
@@ -37,18 +37,39 @@
 $install->db = mysqli_connect($config['database']['host'], $config['database']['username'], $config['database']['password'], $config['database']['database']); 
 $database_check = $install->check_connect();
 if ($database_check) {
+	if (!$install->check_tables("users")) {
+		$install->Requis("CREATE TABLE IF NOT EXISTS `users` (
+			  `id` bigint(20) unsigned NOT NULL auto_increment,
+			  `role_id` bigint(20) unsigned NOT NULL default '1',
+			  `email` varchar(255) default NULL,
+			  `password` varchar(255) default NULL,
+			  `firstname` varchar(255) default NULL,
+			  `lastname` varchar(255) default NULL,
+			  `language` varchar(5) default 'en',
+			  `preferences` text,
+			  `created_at` datetime default NULL,
+			  `updated_at` datetime default NULL,
+			  `deleted` int(1) NOT NULL default '0',
+			  PRIMARY KEY  (`id`)) 
+			  ENGINE=MyISAM DEFAULT CHARSET=utf8;
+		");
+	}
 	$resuUSER = $install->Requis("SELECT * FROM users");
 	//Puisque la base de données est déjà installée, procédons à l'ouverture d'une session d'usager.
 	if ($resuUSER) { 
-		if ($install->Combien($resuUSER) == 0 && isset($_POST["first_name"]) && isset($_POST["last_name"]) && isset($_POST["language"]) && isset($_POST["email"]) && isset($_POST["password"])) {
+		if (isset($_POST["first_name"]) && isset($_POST["last_name"]) && isset($_POST["language"]) && isset($_POST["email"]) && isset($_POST["password"])) {
 			$install->create_adminUser();
-			unlink ('config-setup.php');
 			if (!isset($_SESSION)) { session_start(); }
 			$_SESSION["usr"] = $_POST["email"];
 			$_SESSION["psw"] = $_POST["password"];
 			$_SESSION["automatiquement"] = 'oui';
 			echo '<script>document.location.href = "../login/";</script>';
+			unlink ('config-setup.php');
 		} else {
+			if (isset($_SESSION)) { session_start(); }
+			unset($_POST["first_name"], $_POST["last_name"], $_POST["language"], $_POST["email"], $_POST["password"]);
+			unset($_SESSION["usr"], $_SESSION["psw"], $_SESSION["automatiquement"]);
+//			unlink("../config.app.php");
 			echo '<script>document.location.href = "../";</script>';
 			die();
 		}