Fixes for sql_patches removal vs. password reset of admin

diff --git a/.gitattributes b/.gitattributes
index 30914c6957ce0d03974691d3e1808fb254cd6612..1a02466916680cb5164309dca41ac9b6edbebc3e 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -922,7 +922,8 @@ templates/de/html/admin/admin_login_form.tpl -text
 templates/de/html/admin/admin_login_msg.tpl -text
 templates/de/html/admin/admin_logout.tpl -text
 templates/de/html/admin/admin_logout_form.tpl -text
-templates/de/html/admin/admin_logout_sql_patches.tpl -text
+templates/de/html/admin/admin_logout_sql_patches_install.tpl -text
+templates/de/html/admin/admin_logout_sql_patches_remove.tpl -text
 templates/de/html/admin/admin_main_footer.tpl -text
 templates/de/html/admin/admin_main_header.tpl -text
 templates/de/html/admin/admin_maintenance_form.tpl -text

diff --git a/inc/extensions.php b/inc/extensions.php
index cf3ba20d5924d4d63dadcbf681419612f37bb84d..145fb1b9406506d2453898b7149ba548d4d9f05c 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -52,7 +52,7 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
        if (EXT_IS_ACTIVE($ext_name)) return false;
 
        // Generate file name
-       $file = sprintf(PATH."inc/extensions/ext-%s.php", $ext_name);
+       $file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
 
        // Does this extension exists?
        if (file_exists($file) && is_readable($file))
@@ -92,10 +92,10 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
                        $SQLs2 = $SQLs;  $SQLs = array(); $test = false;
 
                        // Backup language as well
-                       $LANG_BCK = $EXT_LANG_PREFIX;
+                       $LANG_BCK = $EXT_LANG_PREFIX; $EXT_ALWAYS_ACTIVE = "N";
 
                        // Load required extension also in update mode
-                       $file = sprintf(PATH."inc/extensions/ext-%s.php", $EXT_UPDATE_DEPENDS);
+                       $file = sprintf("%sinc/extensions/ext-%s.php", PATH, $EXT_UPDATE_DEPENDS);
 
                        // Check for required file
                        if (file_exists($file) && is_readable($file))
@@ -181,8 +181,8 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
                                }
 
                                // Register extension
-                               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_extensions (ext_name, ext_lang_file, ext_active, ext_version) VALUES ('%s', '%s', 'N', '%s')",
-                                array($ext_name, $EXT_LANG_PREFIX, $EXT_VERSION), __FILE__, __LINE__);
+                               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_extensions (ext_name, ext_lang_file, ext_active, ext_version) VALUES ('%s', '%s', '%s', '%s')",
+                                array($ext_name, $EXT_LANG_PREFIX, $EXT_ALWAYS_ACTIVE, $EXT_VERSION), __FILE__, __LINE__);
 
                                // Update task management
                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET status='SOLVED' WHERE id=%d LIMIT 1",
@@ -223,24 +223,22 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
        return $ret;
 }
 //
-function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE)
-{
+function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
        global $cacheInstance;
+       $SQLs = array();
+
        // This shall never do a non-admin user!
        if (!IS_ADMIN()) return false;
 
        // Get extension's name
-       $result = SQL_QUERY_ESC("SELECT ext_name FROM "._MYSQL_PREFIX."_extensions WHERE id=%d LIMIT 1",
-        array(bigintval($id)), __FILE__, __LINE__);
-       list($ext_name) = SQL_FETCHROW($result);
-       SQL_FREERESULT($result);
+       $ext_name = GET_EXT_NAME($id);
        if (empty($ext_name)) return false;
 
        // Load extension in detected mode
-       $file = sprintf(PATH."inc/extensions/ext-%s.php", $ext_name); $SQLs = array();
+       $file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
        if (file_exists($file) && is_readable($file)) require($file);
-       if ((is_array($SQLs) && (sizeof($SQLs) > 0)))
-       {
+
+       if ((is_array($SQLs) && (sizeof($SQLs) > 0))) {
                // Run SQL commands...
                foreach ($SQLs as $sql) {
                        // Trim spaces away which we don't need
@@ -250,21 +248,26 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE)
                        if (!empty($sql)) {
                                // Run SQL command
                                $result = SQL_QUERY($sql, __FILE__, __LINE__, false);
-                       }
-               }
+                       } // END - if
+               } // END - foreach
 
                // Remove cache file(s) if extension is active
-               if (EXT_IS_ACTIVE("cache")) {
-                       // Remove cache filer
+               if ((EXT_IS_ACTIVE("cache")) || (GET_EXT_VERSION("cache") != "")) {
+                       // Remove cache files
                        if ($cacheInstance->cache_file("extensions", true)) $cacheInstance->cache_destroy();
                        if ($cacheInstance->cache_file("mod_reg", true))    $cacheInstance->cache_destroy();
                        if ($cacheInstance->cache_file("config", true))     $cacheInstance->cache_destroy();
-               }
-       }
+               } // END - if
+
+               // Is this the sql_patches?
+               if ($ext_name == "sql_patches") {
+                       // Then redirect to logout
+                       LOAD_URL("modules.php?module=admin&logout=1&remove=sql_patches");
+               } // END - if
+       } // END - if
 }
 //
-function EXT_IS_ACTIVE ($ext_name, $ignore_admin=false, $ignore_cache=false)
-{
+function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = false) {
        global $cacheArray, $_CONFIG;
 
        // Extensions are all inactive during installation
@@ -303,7 +306,7 @@ function EXT_IS_ACTIVE ($ext_name, $ignore_admin=false, $ignore_cache=false)
        }
 
        // Is this extension activated? (For admins we always have active extensions...)
-       $inc = sprintf(PATH."inc/extensions/ext-%s.php", $ext_name);
+       $inc = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
        // Shorter way
        return (
                (

diff --git a/inc/language.php b/inc/language.php
index f39d09b5679ba104f66a2dcab5a0b0cefe417118..cd180277835b814b2d8fecd1f2ce7707383b2851 100644 (file)
--- a/inc/language.php
+++ b/inc/language.php
@@ -42,12 +42,12 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 if (empty($mx_lang)) $mx_lang = DEFAULT_LANG;
 
 // Look for file
-$file = sprintf(PATH."inc/language/%s.php", $mx_lang);
+$file = sprintf("%sinc/language/%s.php", PATH, $mx_lang);
 if ((!file_exists($file)) || (!is_readable($file))) {
        // Switch to default (DO NOT CHANGE!!!)
        set_session("mx_lang", "de");
        $mx_lang = "de";
-       $file = sprintf(PATH."inc/language/%s.php", $mx_lang);
+       $file = sprintf("%sinc/language/%s.php", PATH, $mx_lang);
 }
 
 // Load language file

diff --git a/inc/language/de.php b/inc/language/de.php
index 2d6e5433f5b259e2ef337bcee2b0d420916eb201..43a36e32c5541ece8d8181d8f9c9cb2835442f9e 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -1105,6 +1105,7 @@ define('ADMIN_CONFIG_MAILID_REDIRECT_REJECT', "Auf Ablehnungsseite umleiten.");
 define('REASON_DIRECT_PAYMENT', "Direkte Gutschrift (siehe evtl. vorangegangene Mail)");
 define('SUBJECT_DIRECT_PAYMENT', "Direkte {!POINTS!}-Gutschrift durch das System");
 define('ADMIN_LOGOUT_SQL_PATCHES_DONE', "Sie wurden automatisch ausgeloggt, da Sie die Erweiterung <strong>sql_patches</strong> installiert haben und dabei das Passort-Hashing ge&auml;ndert/verbessert wurde. Bitte erneut einloggen!");
+define('ADMIN_LOGOUT_SQL_PATCHES_REMOVE', "Sie wurden automatisch ausgeloggt, da Sie die Erweiterun <strong>sql_patches</strong> entfernt haben. Bitte klicken Sie weiter, um jetzt das Passwort neu zu setzen.");
 define('ADMIN_POINTS_REPAYED', "Es wurden dem Mitglied <u>%s</u> {!POINTS!} zur&uuml;ckgeschrieben.");
 define('ADMIN_POINTS_TO_JACKPOT', "Es wurden <u>%s</u> {!POINTS!} in den Jackpot gelegt.");
 define('ADMIN_NO_POINTS_REPAYED', "Die Mailbuchung hatte keine {!POINTS!} zum zur&uuml;ckbuchen!");
@@ -1147,6 +1148,7 @@ define('ADMIN_SHOW_LOGIN', "Ihr Administratorlogin:");
 define('ADMIN_CHANGE_LOGIN', "Anderes Adminlogin");
 define('ADMIN_PASSWORD_RESET_DONE', "Ihr Administratorkennwort wurde neu gesetzt. Sie k&ouml;nnen sich jetzt mit Ihren neuen Zugangsdaten im Adminbereich einloggen.");
 define('ADMIN_CONTINUE_LOGIN', "Weiter zum Administratorlogin");
+define('ADMIN_RESET_PASS_LINK', "Jetzt Ihr Administratorkennwort zur&uuml;cksetzen (n&ouml;tiger Schritt!)");
 
 //
 ?>

diff --git a/inc/libs/cache_functions.php b/inc/libs/cache_functions.php
index cfb4cd4cae6e0e23812ef2a5cb2287ddbdadc609..9e5202d55878008d3336176e4a93091e0261af52 100644 (file)
--- a/inc/libs/cache_functions.php
+++ b/inc/libs/cache_functions.php
@@ -262,13 +262,13 @@ class mxchange_cache
                                                foreach($v as $k2=>$v2)
                                                {
                                                        // Put every array element in a row...
-                                                       $LINE .= "\$cacheInstance['".$k."'][] = \"".$v2."\";\n";
+                                                       $LINE .= "\$data['".$k."'][] = \"".$v2."\";\n";
                                                }
                                        }
                                        else
                                        {
                                                // Single line found
-                                               $LINE = "\$cacheInstance['".$k."'] = \"".$v."\";\n";
+                                               $LINE = "\$data['".$k."'] = \"".$v."\";\n";
                                        }
 
                                        // Write line(s)
@@ -325,13 +325,13 @@ class mxchange_cache
                                                        foreach($v as $k2=>$v2)
                                                        {
                                                                // Put every array element in a row...
-                                                               $LINE .= "\$cacheInstance['".$k."'][] = \"".$v2."\";\n";
+                                                               $LINE .= "\$data['".$k."'][] = \"".$v2."\";\n";
                                                        }
                                                }
                                                else
                                                {
                                                        // Single line found
-                                                       $LINE = "\$cacheInstance['".$k."'] = \"".$v."\";\n";
+                                                       $LINE = "\$data['".$k."'] = \"".$v."\";\n";
                                                }
 
                                                // Write line(s)

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index ed0a69b5e1b6345c69ad9fab1f03fb838f2bc3bb..1ca104512ee2326f03f31527a14b6ebdad63f7d1 100644 (file)
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -93,7 +93,7 @@ if ($cacheMode == "load") {
 
                // Load Language file
                if ($EXT_DUMMY['ext_lang'][$k] == "Y") {
-                       $INC = sprintf(PATH."inc/language/%s_%s.php", $name, GET_LANGUAGE());
+                       $INC = sprintf("%sinc/language/%s_%s.php", PATH, $name, GET_LANGUAGE());
                        if (file_exists($INC)) require_once($INC);
                }
 
@@ -184,7 +184,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($cacheMode == "init") || ($cacheMode ==
                $file2 = $file1; $EXT_CSS = "N"; $EXT_ALWAYS_ACTIVE = "N";
 
                // Special functions file
-               $file3 = sprintf(PATH."inc/libs/%s_functions.php", $name);
+               $file3 = sprintf("%sinc/libs/%s_functions.php", PATH, $name);
 
                // Does the extension file exists?
                if (file_exists($file1) && is_readable($file1))

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index ed6f004ddf4a0686d74f1f198e6699be1270491d..5219de274b1d2cf4119e17aceca4bb63da30c592 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -299,18 +299,27 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
        // Only try to remove cookies
        if (set_session("admin_login", "") && set_session("admin_md5", "") && set_session("admin_last", "") && set_session("admin_to", "")) {
                // Also remove array elements
-               set_session('admin_login'       , "");
-               set_session('admin_md5'         , "");
-               set_session('admin_last'        , "");
-               set_session('admin_to'          , "");
+               set_session('admin_login', "");
+               set_session('admin_md5'  , "");
+               set_session('admin_last' , "");
+               set_session('admin_to'   , "");
 
                // Destroy session
                @session_destroy();
 
                // Load logout template
-               if (isset($_GET['sql_patches'])) {
-                       // Special logout redirect for sql_patchrs
-                       LOAD_TEMPLATE("admin_logout_sql_patches");
+               if (isset($_GET['install'])) {
+                       // Secure input
+                       $install = secureString(SQL_ESCAPE($_GET['install']));
+
+                       // Special logout redirect for installation of given extension
+                       LOAD_TEMPLATE(sprintf("admin_logout_%s_install", $install));
+               } elseif (isset($_GET['remove'])) {
+                       // Secure input
+                       $remove = secureString(SQL_ESCAPE($_GET['remove']));
+
+                       // Special logout redirect for removal of given extension
+                       LOAD_TEMPLATE(sprintf("admin_logout_%s_remove", $remove));
                } else {
                        // Logged out normally
                        LOAD_TEMPLATE("admin_logout");

diff --git a/inc/modules/admin/action-admins.php b/inc/modules/admin/action-admins.php
index a0beb1b828f352e810dc7048d90f89b2d603717b..a4a1d738dda34ae5c66a0c4209d0bc74999d6979 100644 (file)
--- a/inc/modules/admin/action-admins.php
+++ b/inc/modules/admin/action-admins.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/action-country.php b/inc/modules/admin/action-country.php
index 90455e7a8e78c6f3b5b33a9ba825077587c3972f..342f2b0fe11e5b65f106bb50e91b164dc0a93420 100644 (file)
--- a/inc/modules/admin/action-country.php
+++ b/inc/modules/admin/action-country.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/action-doubler.php b/inc/modules/admin/action-doubler.php
index 6982a4083c025e25b7d946f70b20e2d8a393e696..6f553f0a32d96f666fac03c09e077d023763ddda 100644 (file)
--- a/inc/modules/admin/action-doubler.php
+++ b/inc/modules/admin/action-doubler.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf(."%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/action-email.php b/inc/modules/admin/action-email.php
index 787081af627cdda807df10fd6420a19ec9f7652c..a2a221c90f03a1c68a67fae1e5517f2c139d4c73 100644 (file)
--- a/inc/modules/admin/action-email.php
+++ b/inc/modules/admin/action-email.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/action-holiday.php b/inc/modules/admin/action-holiday.php
index ca00de5b717919e32a0061b59bdfd7b5da300f40..a9ee8cbb061d9451ecb2341617d7bf355b0a8cf9 100644 (file)
--- a/inc/modules/admin/action-holiday.php
+++ b/inc/modules/admin/action-holiday.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/action-login.php b/inc/modules/admin/action-login.php
index a66a1be3b4cdd29329f65b97daa4e8f431398fa0..17a0d0d3159cfbd213b9799fb7bb6c691be8f8d5 100644 (file)
--- a/inc/modules/admin/action-login.php
+++ b/inc/modules/admin/action-login.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/action-menu.php b/inc/modules/admin/action-menu.php
index ddaf08a59b90f066b001e11ffccdb41d727b72dd..e1245595d9952a9a08fe1f8e70a9e83cf0bc5476 100644 (file)
--- a/inc/modules/admin/action-menu.php
+++ b/inc/modules/admin/action-menu.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/action-misc.php b/inc/modules/admin/action-misc.php
index 41cdcc67e5345b7873bfa3c9f56d5eb6a541d08f..95d0b1e5890acfbf8d6a58d563070b5b4875275b 100644 (file)
--- a/inc/modules/admin/action-misc.php
+++ b/inc/modules/admin/action-misc.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/action-mods.php b/inc/modules/admin/action-mods.php
index 4f05fccc13b2e9497370fcfc6f3214a73998603f..20c846844a3f4b0142919a60798a113a4a431b74 100644 (file)
--- a/inc/modules/admin/action-mods.php
+++ b/inc/modules/admin/action-mods.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/action-newsletter.php b/inc/modules/admin/action-newsletter.php
index 49c3361e4c9b4f9b98cbf08ad01227456460166d..da9c090b6167f4ee430d691998156db9decf91b9 100644 (file)
--- a/inc/modules/admin/action-newsletter.php
+++ b/inc/modules/admin/action-newsletter.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/action-payouts.php b/inc/modules/admin/action-payouts.php
index 2882feb8b91c7a600cf0ee10dab45d3797092566..8871db900d75b8d6ad2c8c50914cbd8d993256e1 100644 (file)
--- a/inc/modules/admin/action-payouts.php
+++ b/inc/modules/admin/action-payouts.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/action-rallye.php b/inc/modules/admin/action-rallye.php
index 221889a6bda8ce4c2db4890ef3a29ae671b99205..243c179b4fee29688443cea496adfdbf6b8e6faf 100644 (file)
--- a/inc/modules/admin/action-rallye.php
+++ b/inc/modules/admin/action-rallye.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/action-repair.php b/inc/modules/admin/action-repair.php
index 1f54b7e2c7a6bfe2566aa3ebd0866cc05d560b84..09eba7ec2e458667e24731dfe3860bbbb67993f0 100644 (file)
--- a/inc/modules/admin/action-repair.php
+++ b/inc/modules/admin/action-repair.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/action-setup.php b/inc/modules/admin/action-setup.php
index 2e62585b9539a7674e064f26babd3f4e4bfeb0d3..b9e372ccad2e072b719dc5c2be5b8f2b86d6bfbd 100644 (file)
--- a/inc/modules/admin/action-setup.php
+++ b/inc/modules/admin/action-setup.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-sponsor.php b/inc/modules/admin/action-sponsor.php
index b4cbba35c9187ff151e9bd89a39ed68a06d291ce..a841ef6d326eb50e156db27d2023dea8732a270f 100644 (file)
--- a/inc/modules/admin/action-sponsor.php
+++ b/inc/modules/admin/action-sponsor.php
@@ -41,7 +41,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-stats.php b/inc/modules/admin/action-stats.php
index 2db7b93dd3df04025d6a45d0fb791a16c4245c82..3cd387404bff342d4864d923fdf7d88cb87d024d 100644 (file)
--- a/inc/modules/admin/action-stats.php
+++ b/inc/modules/admin/action-stats.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/action-task.php b/inc/modules/admin/action-task.php
index 692d4f0d3617bf7831a0ecb88f4f0d2d7cda9c30..4c7691cd5c899a26e3e010deddf27d10b5f809ba 100644 (file)
--- a/inc/modules/admin/action-task.php
+++ b/inc/modules/admin/action-task.php
@@ -44,7 +44,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) {
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/action-theme.php b/inc/modules/admin/action-theme.php
index 651d82ad4b1aa9cb450debd242a82189d4763d74..8b702b0aef2034eaac32eaf1dc6c07475cc7d4d7 100644 (file)
--- a/inc/modules/admin/action-theme.php
+++ b/inc/modules/admin/action-theme.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/action-transfer.php b/inc/modules/admin/action-transfer.php
index 3ea5af90feb4cf95a0b36c5654fa9e15c46aa078..1eae1b12c25b2ab50769a22c6293062611d64a8b 100644 (file)
--- a/inc/modules/admin/action-transfer.php
+++ b/inc/modules/admin/action-transfer.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/action-user.php b/inc/modules/admin/action-user.php
index 20254c254dfd38119445985ae0c6190fd8ebc033..1d53df9a1367701b74c1b3a4691519d4f39eb71d 100644 (file)
--- a/inc/modules/admin/action-user.php
+++ b/inc/modules/admin/action-user.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/action-wernis.php b/inc/modules/admin/action-wernis.php
index 25b4ff15e1b503f49dff6206e0e353d28c7e2c96..5b912516790ce758570fb96b13f08b6e11c30e41 100644 (file)
--- a/inc/modules/admin/action-wernis.php
+++ b/inc/modules/admin/action-wernis.php
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the admin action module

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index d0aef8c0f099a3754997e8bcd12b223a876501ea..6c7c2416eddd4486f86c7f0a7a9524f5d4c03f8e 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -308,7 +308,7 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
                SQL_FREERESULT($result);
 
                // Is valid but does the inlcude file exists?
-               $INC = sprintf(PATH."inc/modules/admin/action-%s.php", $act);
+               $INC = sprintf("%sinc/modules/admin/action-%s.php", PATH, $act);
                if ((file_exists($INC)) && (is_readable($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true))
                {
                        // Ok, we finally load the admin action module
@@ -406,7 +406,7 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
                                                while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what))
                                        {
                                                // Filename
-                                               $INC = sprintf(PATH."inc/modules/admin/what-%s.php", $wht_sub);
+                                               $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $wht_sub);
                                                if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2"))
                                                {
                                                        $ACL = ADMINS_CHECK_ACL("", $wht_sub);

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index bf5e18247042312dcef8e0ab19679a1275b6df6a..eb6079c2e06c4ed2dd22f4c96a89cd39d3ff6996 100644 (file)
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -143,7 +143,7 @@ if (!empty($_GET['reg_ext'])) {
                                $OUT .= LOAD_TEMPLATE("admin_extensions_edit_row", true, $content);
                                $SW = 3 - $SW;
                        }
-               }
+               } // END - foreach
                define('__EXTENSIONS_ROWS', $OUT);
 
                // Load template
@@ -154,11 +154,15 @@ if (!empty($_GET['reg_ext'])) {
        // List extensions and when verbose is enabled SQL statements which will be executed
        $SW = 2; $OUT = "";
        foreach ($_POST['sel'] as $id=>$sel) {
+               // Init variables
                $VERBOSE_OUT = ""; $SQLs = array();
-               // Load extension's data
-               $result = SQL_QUERY_ESC("SELECT ext_name, ext_version FROM "._MYSQL_PREFIX."_extensions WHERE id=%d LIMIT 1",
-                array(bigintval($id)), __FILE__, __LINE__);
-               list($ext_name, $ext_ver) = SQL_FETCHROW($result);
+
+               // Secure id number
+               $id = bigintval($id);
+
+               // Get extension name
+               $ext_name = GET_EXT_NAME($id);
+               $ext_ver = GET_EXT_VERSION($ext_name);
 
                // Free the result
                SQL_FREERESULT($result);
@@ -166,12 +170,12 @@ if (!empty($_GET['reg_ext'])) {
                if ($_CONFIG['verbose_sql']) {
                        // Load SQL commands in remove mode
                        $EXT_LOAD_MODE = "remove";
-                       $file = sprintf(PATH."inc/extensions/ext-%s.php", $ext_name);
+                       $file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
                        include($file);
 
                        // Generate extra table with loaded SQL commands
                        $VERBOSE_OUT = EXTENSION_VERBOSE_TABLE($SQLs);
-               }
+               } // END - if
 
                // Prepare data for the row template
                $content = array(
@@ -185,7 +189,7 @@ if (!empty($_GET['reg_ext'])) {
                // Load row template and switch color
                $OUT .= LOAD_TEMPLATE("admin_extensions_delete_row", true, $content);
                $SW = 3 - $SW;
-       }
+       } // END - foreach
        define('__EXTENSIONS_ROWS', $OUT);
 
        // Load template
@@ -205,9 +209,9 @@ if (!empty($_GET['reg_ext'])) {
 
                        // Delete this extension (remember to remove it from your server *before* you click on welcome!
                        $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_extensions WHERE id=%d LIMIT 1",
-                        array(bigintval($id)), __FILE__, __LINE__);
-               }
-       }
+                        array($id), __FILE__, __LINE__);
+               } // END - if
+       } // END - foreach
 } elseif (!empty($_GET['do']) && (!IS_DEMO())) {
        // Other things to do
        $do = SQL_ESCAPE(strip_tags($_GET['do']));
@@ -220,7 +224,7 @@ if (!empty($_GET['reg_ext'])) {
 $where = "";
 if (!empty($_GET['active'])) {
        $where = sprintf("WHERE ext_active = '%s'", SQL_ESCAPE(strip_tags($_GET['active'])));
-}
+} // END - if
 
 // Case selection
 switch ($do) {
@@ -308,7 +312,7 @@ case "register": // Register new extension
                                // Is this sql_patches? Then we need to auto-logout!
                                if ($ext_name == "sql_patches") {
                                        // Auto-logout here
-                                       LOAD_URL("modules.php?module=admin&logout=1&sql_patches=1");
+                                       LOAD_URL("modules.php?module=admin&logout=1&install=sql_patches");
                                }
 
                                // Extension was found and successfully registered
@@ -362,7 +366,7 @@ case "search": // Search for new extensions on our server
                        if ((substr($value, 0, 4) == "ext-") && (substr($value, -4) == ".zip"))
                        {
                                $name = substr($value, 4, -4);
-                               $file = sprintf(PATH."inc/extensions/ext-%s.php", $name);
+                               $file = sprintf("%sinc/extensions/ext-%s.php", PATH, $name);
                                $ver = trim(substr($response[$id + 3], 4));
 
                                // Load current extension's version

diff --git a/inc/modules/guest/action-admin.php b/inc/modules/guest/action-admin.php
index 7eaf1cdc794349ecbe2871a0440881fdd59ea6ae..fce845e27a91c876aad076d7484bbe42b628d54a 100644 (file)
--- a/inc/modules/guest/action-admin.php
+++ b/inc/modules/guest/action-admin.php
@@ -41,7 +41,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 if (GET_ACTION("guest", $GLOBALS['what']) == "admin")
 {
        // Only when one admin link is clicked...
-       $INC = sprintf(PATH."inc/modules/guest/what-%s.php", $GLOBALS['what']);
+       $INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, $GLOBALS['what']);
        if (file_exists($INC))
        {
             // Ok, we finally load the guest action module

diff --git a/inc/modules/guest/action-main.php b/inc/modules/guest/action-main.php
index 8894d8a648cb1b78aebd9d8a964ecbaaec5e9e04..0647588b143cc90a8e5acb0b8d246e2f683c9ad5 100644 (file)
--- a/inc/modules/guest/action-main.php
+++ b/inc/modules/guest/action-main.php
@@ -42,7 +42,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 ADD_DESCR("guest", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/guest/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, $GLOBALS['what']);
 $IS_VALID = WHAT_IS_VALID(GET_ACTION("guest", $GLOBALS['what']), $GLOBALS['what'], "guest");
 
 if ((file_exists($INC)) && (is_readable($INC)) && ($IS_VALID))

diff --git a/inc/modules/guest/action-members.php b/inc/modules/guest/action-members.php
index 911c408d0ba1e314b263637e723afc97623ee0d5..1b2c0460a231a2e5700537edb0e44bcb1f6e4188 100644 (file)
--- a/inc/modules/guest/action-members.php
+++ b/inc/modules/guest/action-members.php
@@ -42,7 +42,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 ADD_DESCR("guest", basename(__FILE__));
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/guest/what-%s.php", $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC))
 {
        // Ok, we finally load the guest action module

diff --git a/inc/modules/index.php b/inc/modules/index.php
index 006eca162a94429e04b7da28e106089324c4d41e..e5019640be8c23f2fcc7cc2f82c26aa3443ab687 100644 (file)
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -96,7 +96,7 @@ if (($_CONFIG['guest_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true)))
 // TDs between menu and content
 LOAD_TEMPLATE("guest_menu_content");
 
-$INC_ACTION = sprintf(PATH."inc/modules/guest/action-%s.php", $act);
+$INC_ACTION = sprintf("%sinc/modules/guest/action-%s.php", PATH, $act);
 if ((file_exists($INC_ACTION)) && (is_readable($INC_ACTION)) && (VALIDATE_MENU_ACTION("guest", $act, $GLOBALS['what'])))
 {
        // Requested module is available so we load it

diff --git a/inc/modules/member/action-account.php b/inc/modules/member/action-account.php
index 03de3d9d033727fccd52283bcdc2dd9036ee7174..e7391a9cf037d0ade21b545e72bec908f8ceaa61 100644 (file)
--- a/inc/modules/member/action-account.php
+++ b/inc/modules/member/action-account.php
@@ -51,7 +51,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 ADD_DESCR("member", basename(__FILE__));
 
 // Load the include file
-$INC_WHAT = sprintf(PATH."inc/modules/member/what-%s.php", $GLOBALS['what']);
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC_WHAT))
 {
        // Ok, we finally load the member action module

diff --git a/inc/modules/member/action-bank.php b/inc/modules/member/action-bank.php
index 71f304155e778a6adf8c2477c5b647d6378ff38d..4b01b03a09248676b948a5ed73e1267c1c1b273a 100644 (file)
--- a/inc/modules/member/action-bank.php
+++ b/inc/modules/member/action-bank.php
@@ -51,7 +51,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 ADD_DESCR("member", basename(__FILE__));
 
 // Load the include file
-$INC_WHAT = sprintf(PATH."inc/modules/member/what-%s.php", $GLOBALS['what']);
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC_WHAT))
 {
        // Ok, we finally load the member action module

diff --git a/inc/modules/member/action-extras.php b/inc/modules/member/action-extras.php
index 2feb671d598ea476199f84b86f94dc46170e93ae..7cd95faabd5c686285da3c2481aa0e15cdc3f6ae 100644 (file)
--- a/inc/modules/member/action-extras.php
+++ b/inc/modules/member/action-extras.php
@@ -51,7 +51,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 ADD_DESCR("member", basename(__FILE__));
 
 // Load the include file
-$INC_WHAT = sprintf(PATH."inc/modules/member/what-%s.php", $GLOBALS['what']);
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC_WHAT))
 {
        // Ok, we finally load the member action module

diff --git a/inc/modules/member/action-logout.php b/inc/modules/member/action-logout.php
index 440503f750ae0daadbeb733bace6a0cd225bdd03..1a35520733d02f9759a1e9ae09e7fa6e7e7fc2bd 100644 (file)
--- a/inc/modules/member/action-logout.php
+++ b/inc/modules/member/action-logout.php
@@ -51,7 +51,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 ADD_DESCR("member", basename(__FILE__));
 
 // Load the include file
-$INC_WHAT = sprintf(PATH."inc/modules/member/what-%s.php", $GLOBALS['what']);
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC_WHAT))
 {
        // Ok, we finally load the member action module

diff --git a/inc/modules/member/action-main.php b/inc/modules/member/action-main.php
index fa47565ce446d8fa9cf4b21d837808fc03ff431a..d3c82ec007650b0d8c30019a3f415c62c5c00403 100644 (file)
--- a/inc/modules/member/action-main.php
+++ b/inc/modules/member/action-main.php
@@ -51,7 +51,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 ADD_DESCR("member", basename(__FILE__));
 
 // Load the include file
-$INC_WHAT = sprintf(PATH."inc/modules/member/what-%s.php", $GLOBALS['what']);
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC_WHAT))
 {
        // Ok, we finally load the member action module

diff --git a/inc/modules/member/action-order.php b/inc/modules/member/action-order.php
index 171e581eb0cfa9f811e6bab4b54f876688f45ef5..6c3cbfcb9b7ed07927494b42e4bb7df9d6bb26a2 100644 (file)
--- a/inc/modules/member/action-order.php
+++ b/inc/modules/member/action-order.php
@@ -51,7 +51,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 ADD_DESCR("member", basename(__FILE__));
 
 // Load the include file
-$INC_WHAT = sprintf(PATH."inc/modules/member/what-%s.php", $GLOBALS['what']);
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC_WHAT))
 {
        // Ok, we finally load the member action module

diff --git a/inc/modules/member/action-rals.php b/inc/modules/member/action-rals.php
index a9fb0e72f89763eaab639fddba51ddf8bf32c13d..4733d9c3265f8ca02931b06af967b54111d0593b 100644 (file)
--- a/inc/modules/member/action-rals.php
+++ b/inc/modules/member/action-rals.php
@@ -51,7 +51,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 ADD_DESCR("member", basename(__FILE__));
 
 // Load the include file
-$INC_WHAT = sprintf(PATH."inc/modules/member/what-%s.php", $GLOBALS['what']);
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC_WHAT))
 {
        // Ok, we finally load the member action module

diff --git a/inc/modules/member/action-stats.php b/inc/modules/member/action-stats.php
index e556417d096d7f5c1d98af09289812493713bd94..ac10d889d0525403f542b119554bc48e34d3a7b1 100644 (file)
--- a/inc/modules/member/action-stats.php
+++ b/inc/modules/member/action-stats.php
@@ -51,7 +51,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 ADD_DESCR("member", basename(__FILE__));
 
 // Load the include file
-$INC_WHAT = sprintf(PATH."inc/modules/member/what-%s.php", $GLOBALS['what']);
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
 if (file_exists($INC_WHAT))
 {
        // Ok, we finally load the member action module

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index ef2e46d8c7e44e07211b050dd9bb6571f67213df..50ca9f790a502dc2491f47e5889d70c99755ecb0 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -364,7 +364,7 @@ function ADD_MENU($MODE, $act, $wht) {
                        } else {
                                // This is a menu block... ;-)
                                $BLOCK_MODE = true;
-                               $INC_BLOCK = sprintf(PATH."inc/modules/%s/action-%s.php", $MODE, $main_action);
+                               $INC_BLOCK = sprintf("%sinc/modules/%s/action-%s.php", PATH, $MODE, $main_action);
                                if ((file_exists($INC_BLOCK)) && (is_readable($INC_BLOCK))) {
                                        // Load include file
                                        if ((!EXT_IS_ACTIVE($main_action)) || ($main_action == "online")) OUTPUT_HTML("<TR>

diff --git a/modules.php b/modules.php
index f8fbe88fb7616f5c9e4bc5ae0d07c857426929ee..41b049938a9696da4f5f66f0e3fe7206129a7881 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -109,7 +109,7 @@ if ((!empty($_CONFIG['maintenance'])) && ($_CONFIG['maintenance'] == "Y") && (!I
        case "mem_only":
        case "done":
                // Construct module name
-               define('__MODULE', sprintf(PATH."inc/modules/%s.php", $GLOBALS['module']));
+               define('__MODULE', sprintf("%sinc/modules/%s.php", PATH, $GLOBALS['module']));
 
                // Does the module exists on local file system?
                if (((file_exists(__MODULE)) || (!empty($URL))) && (sizeof($FATAL) == 0))

diff --git a/ref.php b/ref.php
index 456fc3b9691169625ca332d91624ff6ab7c7f977..05321030896f7026537c2529a0af1a355580b907 100644 (file)
--- a/ref.php
+++ b/ref.php
@@ -60,7 +60,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
        }
 
        // Get referral ID from ref or refid variable
-       if (!empty($_GET['ref']))        $ref = strip_tags(htmlentities($_GET['ref']));
+       if (!empty($_GET['ref']))        $ref = secureString($_GET['ref']);
         elseif (!empty($_GET['refid'])) $ref = bigintval($_GET['refid']);
 
        if (!empty($ref))
@@ -74,6 +74,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
                        list($ref) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                }
+
                // Also edit this 0 !
                if (empty($ref)) $ref = "0";
 

diff --git a/templates/de/html/admin/admin_logout_sql_patches.tpl b/templates/de/html/admin/admin_logout_sql_patches.tpl
deleted file mode 100644 (file)
index 1c4c067..0000000
--- a/templates/de/html/admin/admin_logout_sql_patches.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<DIV align="center">
-<TABLE border="0" cellspacing="0" cellpadding="0" width="500" class="admin dashed">
-       <TR>
-               <TD height="5" class="seperator">&nbsp;</TD>
-       </TR>
-       <TR>
-               <TD align="center" class="admin_content"><STRONG>{--ADMIN_LOGOUT_SQL_PATCHES_DONE--}</STRONG><BR />
-               <BR />
-               <A class="admin_content" href="{!URL!}/modules.php?module=admin&amp;action=login">{--ADMIN_RELOGIN_LINK--}</A><BR />
-               <BR />
-               <A class="admin_content" href="{!URL!}/modules.php?module=index">{--ADMIN_BACK_TO_GUEST_MENU--}</A><BR />
-               </TD>
-       </TR>
-       <TR>
-               <TD height="5" class="seperator">&nbsp;</TD>
-       </TR>
-</TABLE>
-</DIV>

diff --git a/templates/de/html/admin/admin_logout_sql_patches_install.tpl b/templates/de/html/admin/admin_logout_sql_patches_install.tpl
new file mode 100644 (file)
index 0000000..1c4c067
--- /dev/null
+++ b/templates/de/html/admin/admin_logout_sql_patches_install.tpl
@@ -0,0 +1,18 @@
+<DIV align="center">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="500" class="admin dashed">
+       <TR>
+               <TD height="5" class="seperator">&nbsp;</TD>
+       </TR>
+       <TR>
+               <TD align="center" class="admin_content"><STRONG>{--ADMIN_LOGOUT_SQL_PATCHES_DONE--}</STRONG><BR />
+               <BR />
+               <A class="admin_content" href="{!URL!}/modules.php?module=admin&amp;action=login">{--ADMIN_RELOGIN_LINK--}</A><BR />
+               <BR />
+               <A class="admin_content" href="{!URL!}/modules.php?module=index">{--ADMIN_BACK_TO_GUEST_MENU--}</A><BR />
+               </TD>
+       </TR>
+       <TR>
+               <TD height="5" class="seperator">&nbsp;</TD>
+       </TR>
+</TABLE>
+</DIV>

diff --git a/templates/de/html/admin/admin_logout_sql_patches_remove.tpl b/templates/de/html/admin/admin_logout_sql_patches_remove.tpl
new file mode 100644 (file)
index 0000000..a4de412
--- /dev/null
+++ b/templates/de/html/admin/admin_logout_sql_patches_remove.tpl
@@ -0,0 +1,17 @@
+<DIV align="center">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="500" class="admin dashed">
+       <TR>
+               <TD height="5" class="seperator">&nbsp;</TD>
+       </TR>
+       <TR>
+               <TD align="center" class="admin_content">
+                       <STRONG>{--ADMIN_LOGOUT_SQL_PATCHES_REMOVE--}</STRONG><BR />
+                       <BR />
+                       <A class="admin_content" href="{!URL!}/modules.php?module=admin&amp;action=login">{--ADMIN_RESET_PASS_LINK--}</A>
+               </TD>
+       </TR>
+       <TR>
+               <TD height="5" class="seperator">&nbsp;</TD>
+       </TR>
+</TABLE>
+</DIV>

diff --git a/templates/de/html/admin/admin_reset_pass_done.tpl b/templates/de/html/admin/admin_reset_pass_done.tpl
index 289a8f1c6037cb0d613922bcfb414d31b577d99d..ea485616927001a812d9aa16a532d6acf0fb6a92 100644 (file)
--- a/templates/de/html/admin/admin_reset_pass_done.tpl
+++ b/templates/de/html/admin/admin_reset_pass_done.tpl
@@ -12,7 +12,7 @@
 </TR>
 <TR>
        <TD class="admin_footer">
-               <A href="{!URL!}/modules.php?module=admin">{--ADMIN_CONTINUE_LOGIN--}</A>
+               --&gt;&nbsp;<STRONG><A href="{!URL!}/modules.php?module=admin">{--ADMIN_CONTINUE_LOGIN--}</A></STRONG>
        </TD>
 </TR>
 </TABLE>