More misc fixes and rewrites (sorry, lame description)

[mailer.git] / lead-confirm.php

diff --git a/lead-confirm.php b/lead-confirm.php
index d3d804eb39cd71b6d1229ff11c1f519cd1c924a3..9e4d790b94fdc5dd372663dd8b9a99c0d705be6c 100644 (file)
--- a/lead-confirm.php
+++ b/lead-confirm.php
@@ -39,10 +39,8 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
+// Init start time
 $GLOBALS['startTime'] = microtime(true);
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
 
 // Set module
 $GLOBALS['module'] = 'lead-confirm';
@@ -54,51 +52,51 @@ $GLOBALS['output_mode'] = '0';
 require('inc/config-global.php');
 
 // Is the script installed?
-if (isInstalled()) {
-       // Header
-       loadIncludeOnce('inc/header.php');
+if (!isInstalled()) {
+       // You have to install first!
+       redirectToUrl('install.php');
+} // END - if
 
-       // Initialize the array for the template
-       $content = array(
-               'lead_uid'   => -1,
-               'lead_email' => 'INVALID@EMAIL'
-               );
+// Is the extension active?
+redirectOnUninstalledExtension('lead');
 
-               // Is the cookie set?
-               if (isSessionVariableSet('lead_uid')) {
-                       // Is the user-account unlocked and valid?
-                       $result = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
-                       array(bigintval(getSession('lead_uid'))), __FILE__, __LINE__);
-                       if (SQL_NUMROWS($result) == 1) {
-                               // Secure the ID number
-                               $content['lead_uid'] = bigintval(getSession('lead_uid'));
+// Header
+loadIncludeOnce('inc/header.php');
 
-                               // Load the email address
-                               list($email) = SQL_FETCHROW($result);
+// Initialize the array for the template
+$content = array(
+       'lead_uid'   => -1,
+       'lead_email' => 'INVALID@EMAIL'
+);
 
-                               // Compile email
-                               $content['lead_email'] = COMPILE_CODE($email);
-                       } else {
-                               // Not found!
-                               $content['lead_uid'] = 0;
-                       }
-               } else {
-                       // Maybe spider?
-                       $content['lead_email'] = constant('WEBMASTER');
-               }
+// Is the cookie set?
+if (isSessionVariableSet('lead_uid')) {
+       // Is the user-account unlocked and valid?
+       $result = SQL_QUERY_ESC("SELECT `email` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
+               array(bigintval(getSession('lead_uid'))), __FILE__, __LINE__);
+       if (SQL_NUMROWS($result) == 1) {
+               // Secure the ID number
+               $content['lead_uid'] = bigintval(getSession('lead_uid'));
 
-               // Load the lead template
-               LOAD_TEMPLATE('lead_code', false, $content);
+               // Load the email address
+               list($email) = SQL_FETCHROW($result);
 
-               // Footer
-               loadIncludeOnce('inc/footer.php');
+               // Compile email
+               $content['lead_email'] = COMPILE_CODE($email);
+       } else {
+               // Not found!
+               $content['lead_uid'] = 0;
+       }
 } else {
-       // You have to install first!
-       redirectToUrl('install.php');
+       // Maybe spider?
+       $content['lead_email'] = constant('WEBMASTER');
 }
 
-// All done here...
-shutdown();
+// Load the lead template
+LOAD_TEMPLATE('lead_code', false, $content);
+
+// Footer
+loadIncludeOnce('inc/footer.php');
 
-//
+// [EOF]
 ?>