Security line in all includes changed

[mailer.git] / inc / modules / guest / what-confirm.php

diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php
index 9ac317ea977061053716923edef33648b0fb355a..7d554b5f3daf2a1c0549981e6799791138ff5bb7 100644 (file)
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.php
@@ -32,15 +32,14 @@
  ************************************************************************/
 
 // Some security stuff...
  ************************************************************************/
 
 // Some security stuff...

-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {

        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }

+

 // Add description as navigation point
 ADD_DESCR("guest", basename(__FILE__));
 
 // Add description as navigation point
 ADD_DESCR("guest", basename(__FILE__));
 

-OPEN_TABLE("100%", "guest_content_align", "");

 if (!empty($_GET['hash']))
 {
        // Initialize the user ID
 if (!empty($_GET['hash']))
 {
        // Initialize the user ID


@@ -57,9 +56,9 @@ if (!empty($_GET['hash']))
                // Unlock his account (but only when it is on UNCONFIRMED!)
                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET status='CONFIRMED', ref_payout='%s' WHERE user_hash='%s' AND status='UNCONFIRMED' LIMIT 1",
                 array($_CONFIG['ref_payout'], $_GET['hash']), __FILE__, __LINE__);
                // Unlock his account (but only when it is on UNCONFIRMED!)
                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET status='CONFIRMED', ref_payout='%s' WHERE user_hash='%s' AND status='UNCONFIRMED' LIMIT 1",
                 array($_CONFIG['ref_payout'], $_GET['hash']), __FILE__, __LINE__);

-               if (SQL_AFFECTEDROWS($link, __FILE__, __LINE__) == 1)
+               if (SQL_AFFECTEDROWS() == 1)

                {
                {

-                       $msg = LOAD_EMAIL_TEMPLATE("confirm-member", "", bigintval($uid));
+                       $msg = LOAD_EMAIL_TEMPLATE("confirm-member", array('points' => $_CONFIG['points_register']), bigintval($uid));

 
                        // And send him right away the confirmation mail
                        SEND_EMAIL($email, GUEST_THANX_CONFIRM, $msg);
 
                        // And send him right away the confirmation mail
                        SEND_EMAIL($email, GUEST_THANX_CONFIRM, $msg);


@@ -155,7 +154,7 @@ if (!empty($_GET['hash']))
                switch ($DATA[1])
                {
                case "UNCONFIRMED": // Account not confirmed
                switch ($DATA[1])
                {
                case "UNCONFIRMED": // Account not confirmed

-                       $msg = LOAD_EMAIL_TEMPLATE("guest_request_confirm", "", $DATA[0]);
+                       $msg = LOAD_EMAIL_TEMPLATE("guest_request_confirm", array('hash' => $DATA[2]), $DATA[0]);

                        SEND_EMAIL($_POST['email'], REQUEST_CONFIRM_LINK_SUBJ, $msg);
                        $content = CONFIRM_LINK_SENT;
                        break;
                        SEND_EMAIL($_POST['email'], REQUEST_CONFIRM_LINK_SUBJ, $msg);
                        $content = CONFIRM_LINK_SENT;
                        break;


@@ -183,6 +182,6 @@ if (!empty($_GET['hash']))
        // No hash found, the guest may want to enter his email address to re-get his confirmation link?
        LOAD_TEMPLATE("guest_confirm_link");
 }
        // No hash found, the guest may want to enter his email address to re-get his confirmation link?
        LOAD_TEMPLATE("guest_confirm_link");
 }

-CLOSE_TABLE();
+

 //
 ?>
 //
 ?>