update finished?

api/functions/update-functions.php

@@ -10,7 +10,6 @@ function upgradeInstall($branch = 'v2-master', $stage) {
     $destination = dirname(__DIR__,2).DIRECTORY_SEPARATOR;
 	switch ($stage) {
 		case '1':
-			return 'stage1';
 			writeLog('success', 'Update Function -  Started Upgrade Process', $GLOBALS['organizrUser']['username']);
 			if(downloadFile($url, $file)){
 				writeLog('success', 'Update Function -  Downloaded Update File for Branch: '.$branch, $GLOBALS['organizrUser']['username']);
@@ -21,7 +20,6 @@ function upgradeInstall($branch = 'v2-master', $stage) {
 			}
 			break;
 		case '2':
-			return 'stage2';
 			if(unzipFile($file)){
 				writeLog('success', 'Update Function -  Unzipped Update File for Branch: '.$branch, $GLOBALS['organizrUser']['username']);
 				return true;
@@ -31,7 +29,6 @@ function upgradeInstall($branch = 'v2-master', $stage) {
 			}
 			break;
 		case '3':
-			return 'stage3';
 			if(rcopy($source, $destination)){
 				writeLog('success', 'Update Function -  Overwrited Files using Updated Files from Branch: '.$branch, $GLOBALS['organizrUser']['username']);
 				return true;
@@ -41,7 +38,6 @@ function upgradeInstall($branch = 'v2-master', $stage) {
 			}
 			break;
 		case '4':
-			return 'stage4';
 			if(rrmdir($cleanup)){
 				writeLog('success', 'Update Function -  Deleted Update Files from Branch: '.$branch, $GLOBALS['organizrUser']['username']);
 				writeLog('success', 'Update Function -  Update Completed', $GLOBALS['organizrUser']['username']);

js/functions.js

@@ -1113,41 +1113,41 @@ function updateNow(){
 	message('',window.lang.translate('Starting Update Process'),'bottom-right','#FFF','success','10000');
 	organizrAPI('POST','api/?v1/update', {branch:activeInfo.branch,stage:1}).success(function(data) {
 		var json = JSON.parse(data);
-		if(json.data == 'stage1'){
+		if(json.data == true){
 			message('',window.lang.translate('Update File Downloaded'),'bottom-right','#FFF','success','10000');
 			organizrAPI('POST','api/?v1/update', {branch:activeInfo.branch,stage:2}).success(function(data) {
 				var json = JSON.parse(data);
-				if(json.data == 'stage2'){
+				if(json.data == true){
 					message('',window.lang.translate('Update File Unzipped'),'bottom-right','#FFF','success','10000');
 					organizrAPI('POST','api/?v1/update', {branch:activeInfo.branch,stage:3}).success(function(data) {
 						var json = JSON.parse(data);
-						if(json.data == 'stage3'){
+						if(json.data == true){
 							message('',window.lang.translate('Update Files Copied'),'bottom-right','#FFF','success','10000');
 							organizrAPI('POST','api/?v1/update', {branch:activeInfo.branch,stage:4}).success(function(data) {
 								var json = JSON.parse(data);
-								if(json.data == 'stage4'){
+								if(json.data == true){
 									message('',window.lang.translate('Update Cleanup Finished'),'bottom-right','#FFF','success','10000');
 									location.reload();
 								}else{
-									message('',window.lang.translate('Update Cleanup Failed'),'bottom-right','#FFF','danger','10000');
+									message('',window.lang.translate('Update Cleanup Failed'),'bottom-right','#FFF','error','10000');
 								}
 							}).fail(function(xhr) {
 								console.error("Organizr Function: API Connection Failed");
 							});
 						}else{
-							message('',window.lang.translate('Update File Copy Failed'),'bottom-right','#FFF','danger','10000');
+							message('',window.lang.translate('Update File Copy Failed'),'bottom-right','#FFF','error','10000');
 						}
 					}).fail(function(xhr) {
 						console.error("Organizr Function: API Connection Failed");
 					});
 				}else{
-					message('',window.lang.translate('Update File Unzip Failed'),'bottom-right','#FFF','danger','10000');
+					message('',window.lang.translate('Update File Unzip Failed'),'bottom-right','#FFF','error','10000');
 				}
 			}).fail(function(xhr) {
 				console.error("Organizr Function: API Connection Failed");
 			});
 		}else{
-			message('',window.lang.translate('Update File Download Failed'),'bottom-right','#FFF','danger','10000');
+			message('',window.lang.translate('Update File Download Failed'),'bottom-right','#FFF','error','10000');
 		}
 	}).fail(function(xhr) {
 		console.error("Organizr Function: API Connection Failed");