Fixes for installation mode

[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 1a1a632f656b6947646d426d13e6f3b0b2b51173..7d554b5f3daf2a1c0549981e6799791138ff5bb7 100644 (file)
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.php
@@ -32,11 +32,11 @@
  ************************************************************************/
 
 // 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);
 }
+
 // Add description as navigation point
 ADD_DESCR("guest", basename(__FILE__));
 
@@ -58,7 +58,7 @@ if (!empty($_GET['hash']))
                 array($_CONFIG['ref_payout'], $_GET['hash']), __FILE__, __LINE__);
                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);
@@ -154,7 +154,7 @@ if (!empty($_GET['hash']))
                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;