Changeset 1359 for trunk/gui/admin

Timestamp:

09/24/08 12:04:49 (2 months ago)

Author:

scitech

Message:

Fixed #1544: Add SQL user has only one option -> useless. Fixed #1545: HTML bug with hint for updates. Fixed #1546: Tiny english typo

Files:

• trunk/gui/admin/database_update.php (modified) (1 diff)
• trunk/gui/admin/index.php (modified) (3 diffs)
• trunk/gui/admin/ispcp_updates.php (modified) (1 diff)

trunk/gui/admin/database_update.php

@@ -83 +83 @@
-if($execute) {
-        databaseUpdate::getInstance()->executeUpdates();
+        if( databaseUpdate::getInstance()->getErrorMessage() != "" )
+                system_message(databaseUpdate::getInstance()->getErrorMessage());
-        header('Location:' . $_SERVER['PHP_SELF']);
-}

trunk/gui/admin/index.php

@@ -76 +76 @@
-        if (criticalUpdate::getInstance()->checkUpdateExists()) {
-                criticalUpdate::getInstance()->executeUpdates();
+                if(criticalUpdate::getInstance()->getErrorMessage()!="")
+                        system_message(criticalUpdate::getInstance()->getErrorMessage());
-                $tpl->assign(array('CRITICAL_MESSAGE' => 'Critical update has been performed'));
-                $tpl->parse('CRITICAL_UPDATE_MESSAGE', 'critical_update_message');
@@ -84 +86 @@
-
-        if(databaseUpdate::getInstance()->checkUpdateExists()) {
-\"link\
+"link
-                $tpl->parse('DATABASE_UPDATE_MESSAGE', 'database_update_message');
-        } else {
@@ -97 +99 @@
-
-        if (versionUpdate::getInstance()->checkUpdateExists()) {
-\"link\
+"link
-                $tpl->parse('UPDATE_MESSAGE', 'update_message');
-        } else {
-
+
+
+
+
+
+
-        }
-}

trunk/gui/admin/ispcp_updates.php

@@ -67 +67 @@
-                $tpl->parse('UPDATE_INFOS', 'update_infos');
-        } else {
+                if( versionUpdate::getInstance()->getErrorMessage() != "" ) {
+                        $tpl->assign(array('TR_MESSAGE' => versionUpdate::getInstance()->getErrorMessage()));
+                }
-                $tpl->assign('UPDATE_INFOS', '');
-        }