Fixes for extension problems while installing/removing (still double-registration...

[mailer.git] / ref.php

diff --git a/ref.php b/ref.php
index 55e8ef358572ea0789e365c1852683d22153b563..4a2129716d065158336bda6c623067d5abfadca2 100644 (file)
--- a/ref.php
+++ b/ref.php
@@ -39,10 +39,6 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
-
 // Set module
 $GLOBALS['module'] = 'ref';
 $GLOBALS['output_mode'] = -1;
@@ -51,10 +47,13 @@ $GLOBALS['output_mode'] = -1;
 require('inc/config-global.php');
 
 // Redirect only to registration page when this script is installed
-if (isInstalled()) {
-       // Base URL for redirection
-       switch (getConfig('refid_target'))
-       {
+if (!isInstalled()) {
+       // You have to install first!
+       redirectToUrl('install.php');
+} // END - if
+
+// Base URL for redirection
+switch (getConfig('refid_target')) {
        case 'register':
                $URL = 'modules.php?module=index&what=register&refid=';
                break;
@@ -62,60 +61,53 @@ if (isInstalled()) {
        case 'index':
                $URL = 'index.php?refid=';
                break;
-       }
-
-       // Get referal ID from ref or refid variable
-       if (REQUEST_ISSET_GET(('ref')))        $ref = REQUEST_GET('ref');
-        elseif (REQUEST_ISSET_GET(('refid'))) $ref = REQUEST_GET('refid');
-
-       if (!empty($ref)) {
-               // Test if nickname or numeric id
-               if ($ref != ''.($ref + 0).'') {
-                       if (EXT_IS_ACTIVE('nickname')) {
-                               // Nickname in URL, so load the ID
-                               $result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' LIMIT 1",
-                                       array($ref), __FILE__, __LINE__);
-
-                               // Load userid
-                               list($ref) = SQL_FETCHROW($result);
-
-                               // Free result
-                               SQL_FREERESULT($result);
-                       } else {
-                               // Invalid request!
-                               $ref = 0;
-                       }
-               } // END - if
-
-               // Also edit this 0 !
-               if (empty($ref)) $ref = 0;
-
-               // Update session
-               setSession('refid', $ref);
-
-               // We have an refid here. So we simply add it
-               $URL .= bigintval($ref);
-
-               // Is the refid valid?
-               if ($ref > 0) {
-                       // Update ref counter
-                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET ref_clicks=ref_clicks+1 WHERE userid=%s LIMIT 1",
-                               array(bigintval($ref)), __FILE__, __LINE__);
-               } // END - if
-       } else {
-               // No refid and we add our refid (don't forget to set $def_refid!)
-               $URL = 'index.php';
-       }
-
-       // Load the URL
-       redirectToUrl($URL);
+}
+
+// Get referal ID from ref or refid variable
+if (REQUEST_ISSET_GET(('ref')))        $ref = REQUEST_GET('ref');
+elseif (REQUEST_ISSET_GET(('refid'))) $ref = REQUEST_GET('refid');
+
+if (!empty($ref)) {
+       // Test if nickname or numeric id
+       if ($ref != ''.($ref + 0).'') {
+               if (EXT_IS_ACTIVE('nickname')) {
+                       // Nickname in URL, so load the ID
+                       $result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' LIMIT 1",
+                       array($ref), __FILE__, __LINE__);
+
+                       // Load userid
+                       list($ref) = SQL_FETCHROW($result);
+
+                       // Free result
+                       SQL_FREERESULT($result);
+               } else {
+                       // Invalid request!
+                       $ref = 0;
+               }
+       } // END - if
+
+       // Also edit this 0 !
+       if (empty($ref)) $ref = 0;
+
+       // Update session
+       setSession('refid', $ref);
+
+       // We have an refid here. So we simply add it
+       $URL .= bigintval($ref);
+
+       // Is the refid valid?
+       if ($ref > 0) {
+               // Update ref counter
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET ref_clicks=ref_clicks+1 WHERE userid=%s LIMIT 1",
+               array(bigintval($ref)), __FILE__, __LINE__);
+       } // END - if
 } else {
-       // You have to install first!
-       redirectToUrl('install.php');
+       // No refid and we add our refid (don't forget to set $def_refid!)
+       $URL = 'index.php';
 }
 
-// Really all done here... ;-)
-shutdown();
+// Load the URL
+redirectToUrl($URL);
 
-//
+// [EOF]
 ?>