Fixes for broken installation routine

[mailer.git] / lead-confirm.php

diff --git a/lead-confirm.php b/lead-confirm.php
index 0f62cef8d79b88088c43a879977cb3383e25d572..d3d804eb39cd71b6d1229ff11c1f519cd1c924a3 100644 (file)
--- a/lead-confirm.php
+++ b/lead-confirm.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Alles um den Bestaetigungslink                   *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * 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                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -31,60 +36,69 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require_once("inc/libs/security_functions.php");
+// Load security stuff here
+require('inc/libs/security_functions.php');
 
 // Init "action" and "what"
-global $what, $action, $startTime;
 $GLOBALS['startTime'] = microtime(true);
-$GLOBALS['what'] = ""; $GLOBALS['action'] = "";
+$GLOBALS['what'] = '';
+$GLOBALS['action'] = '';
 
 // Set module
-$GLOBALS['module'] = "lead-confirm";
+$GLOBALS['module'] = 'lead-confirm';
+
+// Set "CSS-Mode"
+$GLOBALS['output_mode'] = '0';
 
 // Load config.php
-require ("inc/config.php");
+require('inc/config-global.php');
 
 // Is the script installed?
-if (isBooleanConstantAndTrue('mxchange_installed')) {
+if (isInstalled()) {
        // Header
-       require(PATH."inc/header.php");
+       loadIncludeOnce('inc/header.php');
 
        // Initialize the array for the template
        $content = array(
                'lead_uid'   => -1,
-               'lead_email' => "INVALID@EMAIL"
-       );
+               'lead_email' => 'INVALID@EMAIL'
+               );
 
-       // 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(get_session('lead_uid'))), __FILE__, __LINE__);
-               if (SQL_NUMROWS($result) == 1) {
-                       // Secure the ID number
-                       $content['lead_uid'] = bigintval(get_session('lead_uid'));
+               // 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 email address
-                       list($content['lead_email']) = COMPILE_CODE(SQL_FETCHROW($result));
+                               // Load the email address
+                               list($email) = SQL_FETCHROW($result);
+
+                               // Compile email
+                               $content['lead_email'] = COMPILE_CODE($email);
+                       } else {
+                               // Not found!
+                               $content['lead_uid'] = 0;
+                       }
                } else {
-                       // Not found!
-                       $content['lead_uid'] = 0;
+                       // Maybe spider?
+                       $content['lead_email'] = constant('WEBMASTER');
                }
-       } else {
-               // Maybe spider?
-               $content['lead_email'] = WEBMASTER;
-       }
 
-       // Load the lead template
-       LOAD_TEMPLATE("lead_code", false, $content);
+               // Load the lead template
+               LOAD_TEMPLATE('lead_code', false, $content);
 
-       // Footer
-       require(PATH."inc/footer.php");
+               // Footer
+               loadIncludeOnce('inc/footer.php');
 } else {
-       // You have to configure first!
-       LOAD_URL("install.php");
+       // You have to install first!
+       redirectToUrl('install.php');
 }
 
 // All done here...
+shutdown();
+
+//
 ?>