X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js%2Finstall-common.js;h=cfe7e32494389963706769b8198fe321946d9d37;hb=refs%2Fheads%2Fserver-0.2.1-FINAL%2Fwernis-schleuder-de;hp=f2cc0b7be89fad854b447d6865a66bee0cce0ec1;hpb=cd7d344ea7007cfa20413acd3e03e50f0ab86d86;p=mailer.git diff --git a/js/install-common.js b/js/install-common.js index f2cc0b7be8..cfe7e32494 100644 --- a/js/install-common.js +++ b/js/install-common.js @@ -1,13 +1,8 @@ /** * JavaScript for common installer functions * -------------------------------------------------------------------- - * $Revision:: $ - * $Date:: $ - * $Tag:: 0.2.1-FINAL $ - * $Author:: $ - * -------------------------------------------------------------------- * Copyright (c) 2003 - 2009 by Roland Haeder - * Copyright (c) 2009 - 2013 by Mailer Developer Team + * Copyright (c) 2009 - 2016 by Mailer Developer Team * For more information visit: http://mxchange.org * * This program is free software; you can redistribute it and/or modify @@ -36,6 +31,7 @@ var failedStep = ''; installationSteps[0] = 'import_tables_sql'; installationSteps[1] = 'import_menu_sql'; installationSteps[2] = 'install_extensions'; +installationSteps[3] = 'register_first_admin'; // Always keep as last step installationSteps[installationSteps.length] = 'write_local_config'; @@ -66,6 +62,9 @@ function doFinishInstallation () { // Does the "installation loop" function doInstallationLoop () { + // Reset counter + counterSuccess = 0; + // For-loop for all installation steps for (var i = 0; i < installationSteps.length; i++) { // Output message @@ -91,7 +90,10 @@ function doInstallationLoop () { if (counterSuccess != installationSteps.length) { // Display error message displayErrorWindow('install', getAjaxContent() + ':' + counterSuccess + '/' + installationSteps.length + ':' + failedStep); - } // END - if + } else { + // Redirect to admin.php + document.location.href = 'admin.php'; + } } // Sends an "installation step" request out