From 567ec1efd077b192edb37a987f5de9af4c5cdc7a Mon Sep 17 00:00:00 2001
From: xevidos <xevidos@gmail.com>
Date: Mon, 24 Feb 2020 22:59:26 -0500
Subject: [PATCH] Added fix for blank return, Added sql conversions to removal
 list, Fixed missing username in update process

---
 README.md                    | 1 +
 components/install/view.php  | 2 +-
 components/sql/class.sql.php | 2 +-
 components/update/update.php | 4 +++-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 7ec6f42..ca48880 100755
--- a/README.md
+++ b/README.md
@@ -60,6 +60,7 @@ Task List:
 * Create standards for php ( For example a lot of projects are using API like standards for their backends maybe create something like those? )
 * Fix broken themes
 * Re Add the custom language recognition system after recode
+* Reformat install processes
 * Remove all old and unneeded dependencies
 * Seperate Upload filemanager instance from main filemanager instance
 * Update all current components to use more current standards 
diff --git a/components/install/view.php b/components/install/view.php
index 63168d9..aca5452 100755
--- a/components/install/view.php
+++ b/components/install/view.php
@@ -444,7 +444,7 @@ $.post('components/install/install.php',$('#install').serialize(),function( data
 
 console.log( data );
 
-if( data === "success" ){
+if( data === "success" || data == "" ){
 window.location.reload();
 } else {
 alert( "An Error Occurred.  Please check the console for more information.\n" );
diff --git a/components/sql/class.sql.php b/components/sql/class.sql.php
index 63b4219..5bff817 100755
--- a/components/sql/class.sql.php
+++ b/components/sql/class.sql.php
@@ -156,7 +156,7 @@ class sql {
 				
 				$update_query = "";
 				$projects = $this->query( "SELECT id, path FROM projects", array(), array(), "fetchAll", "exception" );
-				$result = $this->query( "SELECT project FROM users", array(), array(), "fetchAll", "exception" );
+				$result = $this->query( "SELECT username,project FROM users", array(), array(), "fetchAll", "exception" );
 				$convert = false;
 				$delete = Permissions::LEVELS["delete"];
 				
diff --git a/components/update/update.php b/components/update/update.php
index 553ebc1..86c8e05 100755
--- a/components/update/update.php
+++ b/components/update/update.php
@@ -533,7 +533,9 @@ class updater {
 				$this->path . "/{$update_folder}/.gitignore",
 				
 				$this->path . "/.gitlab-ci.yml",
-				$this->path . "/{$update_folder}/.gitlab-ci.yml"
+				$this->path . "/{$update_folder}/.gitlab-ci.yml",
+				
+				$this->path . "/components/sql/class.sql.conversions.php",
 			);
 			
 			foreach( $file_conflictions as $file ) {