Fixed some badly broken stuff in installation phase.

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/inc/ajax/ajax_installer.php b/inc/ajax/ajax_installer.php
index eea4629ee956909843db01033d9a79a452daf530..e0fd4e8c6049df81d8d50b22a6e9e595d1fbc27e 100644 (file)
--- a/inc/ajax/ajax_installer.php
+++ b/inc/ajax/ajax_installer.php
@@ -668,9 +668,17 @@ function doAjaxInstallerStepInstallExtensions () {
 
        // "Walk" through all extensions
        foreach ($extensions as $key => $ext_name) {
+               // Debug message
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',ext_name=' . $ext_name);
+
                // Is ext-sql_patches not at key=0?
-               if (($key == 0) && ($ext_name == 'sql_patches')) {
+               if (($ext_name == 'sql_patches') && ($key > 0)) {
                        // Then skip this entry
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Skipping sql_changes at key=' . $key);
+                       continue;
+               } elseif (isExtensionInstalled($ext_name)) {
+                       // Skip already installed extensions
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Skipping extension ' . $ext_name . ' at key=' . $key . ': Already installed.');
                        continue;
                } elseif ((!loadExtension($ext_name, 'test', '0.0.0', TRUE)) || (!registerExtension($ext_name, NULL))) {
                        // Didn't work

diff --git a/inc/extensions/ext-html_mail.php b/inc/extensions/ext-html_mail.php
index 88481d29682d95f2182454ecae2861c873f8a78b..4904f6b8bd31e0a0a21bd4b51ef93a95a7ca6687 100644 (file)
--- a/inc/extensions/ext-html_mail.php
+++ b/inc/extensions/ext-html_mail.php
@@ -50,7 +50,6 @@ switch (getExtensionMode()) {
        case 'setup': // Do stuff when installation is running
                // SQL commands to run
                addExtensionAddTableColumnSql('user_data', 'html', "ENUM('Y','N') NOT NULL DEFAULT 'Y'");
-               addExtensionAddTableColumnSql('bonus', 'html_msg', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
                addExtensionAddTableColumnSql('pool', 'html_msg', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
                addMemberMenuSql('account', 'html_mail', 'HTML-Empfang', 3);
 

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index 62f9ca3db75f6e71a84e7c07cb6f36810018373f..84ad914215bc8cb3626dcadca65e83418b9deaff 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
-setThisExtensionVersion('1.0.1');
+setThisExtensionVersion('1.0.2');
 
 // Version history array (add more with , '0.0.1' and so on)
-setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6', '0.8.7', '0.8.8', '0.8.9', '0.9.0', '0.9.1', '0.9.2', '0.9.3', '0.9.4', '0.9.5', '0.9.6', '0.9.7', '0.9.8', '0.9.9', '1.0.0', '1.0.1'));
+setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6', '0.8.7', '0.8.8', '0.8.9', '0.9.0', '0.9.1', '0.9.2', '0.9.3', '0.9.4', '0.9.5', '0.9.6', '0.9.7', '0.9.8', '0.9.9', '1.0.0', '1.0.1', '1.0.2'));
 
 // Keep this extension always active!
 setExtensionAlwaysActive('Y');

diff --git a/inc/extensions/sql_patches/mode-update.php b/inc/extensions/sql_patches/mode-update.php
index c09e9b7c0344806f985c43729d2be95a484653bc..f421f9c8c6700cd5252c42bb28e2e2ab4059c20b 100644 (file)
--- a/inc/extensions/sql_patches/mode-update.php
+++ b/inc/extensions/sql_patches/mode-update.php
@@ -748,10 +748,6 @@ UNIQUE KEY (`subject`)",
                                addExtensionChangeTableColumnSql('points_data', 'ext_name', 'subject', "VARCHAR(255) NOT NULL DEFAULT ''");
                                addExtensionAddTableColumnSql('points_data', 'notify_recipient', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
 
-                               // Register points data
-                               registerExtensionPointsData('pool_payback', 'points', 'LOCKED', 'DIRECT');
-                               registerExtensionPointsData('mail_deleted', 'points', 'LOCKED', 'DIRECT');
-
                                // Remove deprecated configuration entry
                                addConfigDropSql('reg_points_mode');
 
@@ -945,6 +941,16 @@ PRIMARY KEY (`server_name_id`)
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("AJAX-Modul hinzugefügt.");
                                break;
+
+                       case '1.0.2': // SQL queries for v1.0.2
+                               // Register points data
+                               registerExtensionPointsData('pool_payback', 'points', 'LOCKED', 'DIRECT');
+                               registerExtensionPointsData('mail_deleted', 'points', 'LOCKED', 'DIRECT');
+
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("registerExtensionPointsData() klappt bei der ersten Installation nicht, da die Spalte <em>account_provider</em> fehlt.");
+                               break;
+
                } // END - switch
 
 // [EOF]

diff --git a/inc/language/install_de.php b/inc/language/install_de.php
index bc81deab9f75161401a838fa52ca6f02d5f3912e..a2659fe0cc4690d734c8cf82adb566cc8dc7f15f 100644 (file)
--- a/inc/language/install_de.php
+++ b/inc/language/install_de.php
@@ -297,7 +297,7 @@ addMessages(array(
        'INSTALLER_FIELD_FAILED_ADMIN_PASSWORD2' => "Die Wiederholung des Passwortes f&uuml;r den ersten Administratoraccount ist zu schwach. Mindestens: <strong>{OPEN_TEMPLATE}config,translatePasswordStrength=min_password_score{CLOSE_TEMPLATE}</strong>",
 
        // Other notices
-       'INSTALLER_EXTENSIONS_NOTICE' => "Sie wollten mindestens <strong>ext-sql_patches</strong> und zur besseren &Uuml;bersicht im Adminbereich <strong>ext-task</strong> installieren. Sie k&ouml;nnen nach der Installation jederzeit weitere Erweiterungen hinzuinstallieren und brauchen dazu nicht das gesamte Script neu aufsetzen.",
+       'INSTALLER_EXTENSIONS_NOTICE' => "Sie sollten mindestens <strong>ext-sql_patches</strong> und zur besseren &Uuml;bersicht im Adminbereich <strong>ext-task</strong> installieren. Sie k&ouml;nnen nach der Installation jederzeit weitere Erweiterungen hinzuinstallieren und brauchen dazu nicht das gesamte Script neu aufsetzen.",
 ));
 
 // [EOF]

diff --git a/js/install-common.js b/js/install-common.js
index dbc3a735efd0de04cf4f4f9c7ddb6c8d5532ed60..16a323ea807981dbc90545300b19384e429a28a5 100644 (file)
--- a/js/install-common.js
+++ b/js/install-common.js
@@ -62,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