Explorar o código

Fix wizard not auto logging in.

causefx %!s(int64=8) %!d(string=hai) anos
pai
achega
dcd0847cd6
Modificáronse 2 ficheiros con 9 adicións e 2 borrados
  1. 2 0
      api/functions/organizr-functions.php
  2. 7 2
      api/pages/wizard.php

+ 2 - 0
api/functions/organizr-functions.php

@@ -48,6 +48,8 @@ function wizardConfig($array)
 		'registrationPassword' => $registrationPassword,
 	);
 	// Create Config
+	$GLOBALS['dbLocation'] = $location;
+	$GLOBALS['dbName'] = $dbName;
 	if (createConfig($configArray)) {
 		// Call DB Create
 		if (createDB($location, $dbName)) {

+ 7 - 2
api/pages/wizard.php

@@ -129,15 +129,20 @@ $pageWizard = '
                     if(html.data == true){
                         location.reload();
                     }else if(html.data == \'token\'){
-						location.reload();
+                        message("",window.lang.translate(\'Could not create Token\'),"bottom-right","#FFF","error","3500");
+						console.error(\'Organizr Function: Could not create Token\');
 					}else if(html.data == \'db\'){
+						message("",window.lang.translate(\'Could not create DB - check permissions\'),"bottom-right","#FFF","error","3500");
 						console.error(\'Organizr Function: Could not create DB - check permissions\');
 					}else if(html.data == \'admin\'){
+						message("",window.lang.translate(\'Could not create admin acct\'),"bottom-right","#FFF","error","3500");
 						console.error(\'Organizr Function: Could not create admin acct\');
 					}else if(html.data == \'config\'){
+						message("",window.lang.translate(\'Could not create config files - check permissions\'),"bottom-right","#FFF","error","3500");
 						console.error(\'Organizr Function: Could not create config files - check permissions\');
 					}else{
-                        console.error(\'Organizr Function: Signup Error Occured\');
+						message("",window.lang.translate(\'Sign-up Error Occurred\'),"bottom-right","#FFF","error","3500");
+                        console.error(\'Organizr Function: Sign-up Error Occurred\');
                     }
             	}).fail(function(xhr) {
             		console.error("Organizr Function: Connection Failed");