Update create_db.php

src/server/cyberhex-code/install/create_db.php

@@ -21,177 +21,169 @@
                 </div>
             </div>
         </div>
-    </div>
+		<?php
-</div>
+		$success=1;
-</body>
+		include "../config.php";
-</html>
 
+		// Create connection
+		$conn = new mysqli($DB_SERVERNAME, $DB_USERNAME, $DB_PASSWORD);
 
-
+		// Check connection
-
+		if ($conn->connect_error) {
-
-
-<?php
-$success=1;
-include "../config.php";
-
-// Create connection
-$conn = new mysqli($DB_SERVERNAME, $DB_USERNAME, $DB_PASSWORD);
-
-// Check connection
-if ($conn->connect_error) {
 			$success=0;
 			die("Connection failed: " . $conn->connect_error);
-}
+		}
 
-// Create database
+		// Create database
-$sql = "CREATE DATABASE IF NOT EXISTS $DB_DATABASE";
+		$sql = "CREATE DATABASE IF NOT EXISTS $DB_DATABASE";
-if ($conn->query($sql) === TRUE) {
+		if ($conn->query($sql) === TRUE) {
 			echo '<br><div class="alert alert-success" role="alert">
 				Database created successfully!
 				</div>';
-} else {
+		} else {
 			$success=0;
 			echo '<br><div class="alert alert-danger" role="alert">
 					Error creating database: ' . $conn->error .'
 			</div>';
-}
+		}
 
-$conn->close();
+		$conn->close();
 
-// Connect to the new database
+		// Connect to the new database
-$conn = new mysqli($DB_SERVERNAME, $DB_USERNAME, $DB_PASSWORD,$DB_DATABASE);
+		$conn = new mysqli($DB_SERVERNAME, $DB_USERNAME, $DB_PASSWORD,$DB_DATABASE);
 
-// Check connection
+		// Check connection
-if ($conn->connect_error) {
+		if ($conn->connect_error) {
 			$success=0;
 			die("Connection failed: " . $conn->connect_error);
-}
+		}
 
-// Create user table
+		// Create user table
-$sql = "CREATE TABLE IF NOT EXISTS users (
+		$sql = "CREATE TABLE IF NOT EXISTS users (
 			id INT AUTO_INCREMENT PRIMARY KEY,
 			username VARCHAR(255) NOT NULL,
 			email VARCHAR(255) NOT NULL,
 			perms VARCHAR(255),
 			password VARCHAR(255),
 			2fa VARCHAR(255)
-)";
+		)";
 
-if ($conn->query($sql) === TRUE) {
+		if ($conn->query($sql) === TRUE) {
 			echo '<br><div class="alert alert-success" role="alert">
 					Table users created successfully!
 			</div>';
-} else {
+		} else {
 			$success=0;
 			echo '<br><div class="alert alert-danger" role="alert">
 					Error creating table users: ' . $conn->error .'
 			</div>';
-}
+		}
 
-// Create log table
+		// Create log table
-$sql = "CREATE TABLE IF NOT EXISTS log (
+		$sql = "CREATE TABLE IF NOT EXISTS log (
 			id INT AUTO_INCREMENT PRIMARY KEY,
 			logtext VARCHAR(255) NOT NULL,
 			loglevel VARCHAR(255) NOT NULL,
 			machine_id VARCHAR(255)
-)";
+		)";
 
-if ($conn->query($sql) === TRUE) {
+		if ($conn->query($sql) === TRUE) {
 				echo '<br><div class="alert alert-success" role="alert">
 					Table log created successfully!
 			</div>';
-} else {
+		} else {
 			$success=0;
 				echo '<br><div class="alert alert-danger" role="alert">
 					Error creating table log: ' . $conn->error .'
 			</div>';
-}
+		}
 
-// Create settings table
+		// Create settings table
-$sql = "CREATE TABLE IF NOT EXISTS settings (
+		$sql = "CREATE TABLE IF NOT EXISTS settings (
 			id INT AUTO_INCREMENT PRIMARY KEY,
 			name VARCHAR(255) NOT NULL,
 			value VARCHAR(255) NOT NULL
-)";
+		)";
 
-if ($conn->query($sql) === TRUE) {
+		if ($conn->query($sql) === TRUE) {
 				echo '<br><div class="alert alert-success" role="alert">
 					Table settings created successfully!
 			</div>';
-} else {
+		} else {
 			$success=0;
 				echo '<br><div class="alert alert-danger" role="alert">
 					Error creating table settings: ' . $conn->error .'
 			</div>';
-}
+		}
 
-// Create api table
+		// Create api table
-$sql = "CREATE TABLE IF NOT EXISTS api (
+		$sql = "CREATE TABLE IF NOT EXISTS api (
 			id INT AUTO_INCREMENT PRIMARY KEY,
 			apikey VARCHAR(255) NOT NULL,
 			machine_id VARCHAR(255) NOT NULL
-)";
+		)";
 
-if ($conn->query($sql) === TRUE) {
+		if ($conn->query($sql) === TRUE) {
 				echo '<br><div class="alert alert-success" role="alert">
 					Table api created successfully!
 			</div>';
-} else {
+		} else {
 			$success=0;
 				echo '<br><div class="alert alert-danger" role="alert">
 					Error creating table api: ' . $conn->error .'
 			</div>';
-}
+		}
 
-// Create secrets table
+		// Create secrets table
-$sql = "CREATE TABLE IF NOT EXISTS secrets (
+		$sql = "CREATE TABLE IF NOT EXISTS secrets (
 			id INT AUTO_INCREMENT PRIMARY KEY,
 			cert VARCHAR(255) NOT NULL,
 			machine_id VARCHAR(255) NOT NULL
-)";
+		)";
 
-if ($conn->query($sql) === TRUE) {
+		if ($conn->query($sql) === TRUE) {
 				echo '<br><div class="alert alert-success" role="alert">
 					Table secrets created successfully!
 			</div>';
-} else {
+		} else {
 			$success=0;
 				echo '<br><div class="alert alert-danger" role="alert">
 					Error creating table secrets: ' . $conn->error .'
 			</div>';
-}
+		}
 
-// Create machine table
+		// Create machine table
-$sql = "CREATE TABLE IF NOT EXISTS machines (
+		$sql = "CREATE TABLE IF NOT EXISTS machines (
 			id INT AUTO_INCREMENT PRIMARY KEY,
 			machine_name VARCHAR(255) NOT NULL,
 			machine_location VARCHAR(255) NOT NULL,
 			machine_ip VARCHAR(255) NOT NULL
-)";
+		)";
 
-if ($conn->query($sql) === TRUE) {
+		if ($conn->query($sql) === TRUE) {
 				echo '<br><div class="alert alert-success" role="alert">
 					Table machines created successfully!
 			</div>';
-} else {
+		} else {
 			$success=0;
 				echo '<br><div class="alert alert-danger" role="alert">
 					Error creating table machines: ' . $conn->error .'
 			</div>';
-}
+		}
 
-if($success!==1){
+		if($success!==1){
 			echo '<br><div class="alert alert-danger" role="alert">
 					There was an error creating the databases. Please try again or contact support at: <a href="mailto:info.jakach@gmail.com">info.jakach@gmail.com</a>
 			</div>';
-}else{
+		}else{
 			echo '<br><div class="alert alert-success" role="alert">
 					Database created successfully! <a href="create_admin.php">Continue installation</a>
 			</div>';
-}
+		}
 
-$conn->close();
+		$conn->close();
-?>
+		?>
+    </div>
+</div>
 </body>
 </html>