Fix for 'extension sql_patches has empty version' message

[mailer.git] / lead-confirm.php

diff --git a/lead-confirm.php b/lead-confirm.php
index fc693eea44b6b9ae96ddb0b5561657439874d5c4..6f2b0ef79d55ce252b547cc943234fc4062a2c95 100644 (file)
--- a/lead-confirm.php
+++ b/lead-confirm.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -51,11 +51,8 @@ $GLOBALS['output_mode'] = '0';
 // Load config.php
 require('inc/config-global.php');
 
-// Is the script installed?
-if (!isInstalled()) {
-       // You have to install first!
-       redirectToUrl('install.php');
-} // END - if
+// Set content type
+setContentType('text/html');
 
 // Is the extension active?
 redirectOnUninstalledExtension('lead');
@@ -65,35 +62,32 @@ loadIncludeOnce('inc/header.php');
 
 // Initialize the array for the template
 $content = array(
-       'lead_uid'   => -1,
+       'lead_userid'   => -1,
        'lead_email' => 'INVALID@EMAIL'
 );
 
 // Is the cookie set?
-if (isSessionVariableSet('lead_uid')) {
+if (isSessionVariableSet('lead_userid')) {
        // 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__);
+       $result = SQL_QUERY_ESC("SELECT `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
+               array(bigintval(getSession('lead_userid'))), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Secure the ID number
-               $content['lead_uid'] = bigintval(getSession('lead_uid'));
+               $content['lead_userid'] = bigintval(getSession('lead_userid'));
 
                // Load the email address
                list($email) = SQL_FETCHROW($result);
-
-               // Compile email
-               $content['lead_email'] = COMPILE_CODE($email);
        } else {
                // Not found!
-               $content['lead_uid'] = 0;
+               $content['lead_userid'] = 0;
        }
 } else {
        // Maybe spider?
-       $content['lead_email'] = constant('WEBMASTER');
+       $content['lead_email'] = getConfig('WEBMASTER');
 }
 
 // Load the lead template
-LOAD_TEMPLATE('lead_code', false, $content);
+loadTemplate('lead_code', false, $content);
 
 // Footer
 loadIncludeOnce('inc/footer.php');