Redirects fixed

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 705aa959446ddbbf53287744ec2ec4e07d8a31be..0e69ce018b25b6d07fcab1c4e75e600ef94f979f 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -169,16 +169,14 @@
 ./inc/modules/member/what-unconfirmed.php:132: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/order.php:75:            // @TODO Unused: 2,4
 ./inc/monthly/monthly_bonus.php:70:    // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1000:                  // @TODO Commented out redirectToUrl('admin.php');
-./inc/mysql-manager.php:1600:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-./inc/mysql-manager.php:1808:                  // @TODO Rewrite this to $content = SQL_FETCHARRAY()
-./inc/mysql-manager.php:2124:          // @TODO This can be somehow rewritten
+./inc/mysql-manager.php:1599:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/mysql-manager.php:1807:                  // @TODO Rewrite this to $content = SQL_FETCHARRAY()
+./inc/mysql-manager.php:2123:          // @TODO This can be somehow rewritten
 ./inc/mysql-manager.php:220:                   // @TODO Nothing helped???
 ./inc/mysql-manager.php:255:                   // @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:576:   // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:605:                           // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:93:// @TODO Can we cache this?
-./inc/mysql-manager.php:999:                   // @TODO Why does this lead into an endless loop but we still need it???
 ./inc/reset/reset_birthday.php:91:                     // @TODO 4 is hard-coded here, should we move it out in config?
 ./inc/wrapper-functions.php:127:// @TODO Implement $compress
 ./inc/wrapper-functions.php:134:// @TODO Implement $decompress

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 401dfc75d03b69e1e2e56f00ccede303fd51dd6f..eda91788cfcc5ef8594aa4709a8739f6917d7994 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -101,7 +101,7 @@ if (!isAdminRegistered()) {
                                        changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
 
                                        // Load URL for login
-                                       redirectToUrl('modules.php?module=admin');
+                                       redirectToUrl('admin.php');
                                } // END - if
                                break;
                } // END - switch

diff --git a/inc/modules/admin/what-config_secure.php b/inc/modules/admin/what-config_secure.php
index f1406788423d863336fd61bdb7e7cfc6afaf9602..47623c479ef9f5158ec28df3ccabcc89edaa7fa1 100644 (file)
--- a/inc/modules/admin/what-config_secure.php
+++ b/inc/modules/admin/what-config_secure.php
@@ -54,7 +54,7 @@ if (isFormSent()) {
                unsetPostRequestElement(('salt_length'));
 
                // Redirect to logout link
-               redirectToUrl('modules.php?module=admin&logout=1');
+               redirectToUrl('modules.php?module=admin&logout=1');
        } // END - if
 
        // Save settings

diff --git a/inc/modules/guest/what-admin.php b/inc/modules/guest/what-admin.php
index 467a676f2f67357fd5f0c272f10aaaf13b716791..3a94cfe4be95137661ee7df07e728458adde66c7 100644 (file)
--- a/inc/modules/guest/what-admin.php
+++ b/inc/modules/guest/what-admin.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // A simple redirect...
-redirectToUrl('modules.php?module=admin');
+redirectToUrl('admin.php');
 
 // [EOF]
 ?>

diff --git a/inc/modules/index.php b/inc/modules/index.php
index 128dc6e3a77a7eec2b6fb3db9bc80d98a6f746b7..ab37b5baa2f4006a7a3f49dfee4df4eb0670bdc8 100644 (file)
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -39,10 +39,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif (!isExtensionActive('sql_patches')) {
-       // The extension 'sql_patches' *MUST* be activated or you have lot's of problems!
-       redirectToUrl('modules.php?module=admin&ext_missing=sql_patches');
-}
+} // END - if
 
 // Generate a tableset for the menu title and content
 loadTemplate('guest_header');

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 519d73c98abfb0717385ca8bd684ac55cefe06ff..958e54ac6bd4c43ff6cceb9538cbdf857a92bf31 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -995,9 +995,8 @@ function getModeAction ($mode, $what) {
        } elseif ((!isExtensionInstalled('sql_patches')) && ($mode != 'admin')) {
                // No sql_patches installed, but maybe we need to register an admin?
                if (isAdminRegistered()) {
-                       // Redirect
-                       // @TODO Why does this lead into an endless loop but we still need it???
-                       // @TODO Commented out redirectToUrl('admin.php');
+                       // Redirect to admin area
+                       redirectToUrl('admin.php');
                } // END - if
        }