Birthday link fixed

diff --git a/birthday_confirm.php b/birthday_confirm.php
index 8dd674554a8111d1efff54c441dc3362d5819a25..3dd8dedf4b8b74e8ec0bdbe80029103ad21003fb 100644 (file)
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -50,23 +50,20 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
        $uid = strip_tags(bigintval($_GET['uid']));
 
        // Only allow numbers here...
-       $chk = strip_tags(bigintval($_GET['check']));
-
-       // .. only first 32 numbers
-       $chk = substr($chk, 0, 32);
+       $chk = strip_tags(bigintval($_GET['check'], false));
 
        // Check if link is not clicked so far
        $result = SQL_QUERY_ESC("SELECT DISTINCT b.points, d.sex, d.surname, d.family, d.status
 FROM "._MYSQL_PREFIX."_user_birthday AS b
 LEFT JOIN "._MYSQL_PREFIX."_user_data AS d
 ON b.userid=d.userid
-WHERE b.userid=%d AND b.chk_value='%s' LIMIT 1",
+WHERE b.userid=%d AND b.chk_value=%d LIMIT 1",
  array($uid, $chk), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result) == 1)
        {
                // Ok, congratulation again! Here's your gift from us...
-               list($GIFT, $salut, $sname, $fname, $status) = SQL_FETCHROW($result);
+               list($gift, $salut, $sname, $fname, $status) = SQL_FETCHROW($result);
                if ($status == "CONFIRMED")
                {
                        // Set mode depending on how many mails the member has to confirm
@@ -75,7 +72,7 @@ WHERE b.userid=%d AND b.chk_value='%s' LIMIT 1",
 
                        // Add points to account
                        $DEPTH = 0;
-                       ADD_POINTS_REFSYSTEM($uid, $GIFT, false, "0", $locked, strtolower($_CONFIG['birthday_mode']));
+                       ADD_POINTS_REFSYSTEM($uid, $gift, false, "0", $locked, strtolower($_CONFIG['birthday_mode']));
 
                        // Remove entry from table
                        $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_birthday WHERE userid=%d LIMIT 1",
@@ -85,14 +82,14 @@ WHERE b.userid=%d AND b.chk_value='%s' LIMIT 1",
                        if (GET_EXT_VERSION("mediadata") >= "0.0.4")
                        {
                                // Update database
-                               MEDIA_UPDATE_ENTRY(array("total_points"), "add", $GIFT);
+                               MEDIA_UPDATE_ENTRY(array("total_points"), "add", $gift);
                        }
 
                        // Transfer data to constants for the template
                        define('__SALUT', TRANSLATE_SEX($salut));
                        define('__SNAME', $sname);
                        define('__FNAME', $fname);
-                       define('__GIFT' , $GIFT);
+                       define('__GIFT' , $gift);
 
                        // Load message from template
                        define('__MSG', LOAD_TEMPLATE("birthday_msg", true));

diff --git a/inc/functions.php b/inc/functions.php
index 005fea7a724446b0860a599b029a8dd6b5e7272b..e24be85a2de601d7eb0a4784f70a6b90418b9051 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1216,9 +1216,15 @@ function GEN_RANDOM_CODE($length, $code, $uid, $DATA="")
        return $return;
 }
 // Does only allow numbers
-function bigintval($num)
+function bigintval($num, $castValue = true)
 {
-       $ret = (int) preg_replace("/[^0123456789]/", "", $num);
+       // Filter all numbers out
+       $ret = preg_replace("/[^0123456789]/", "", $num);
+
+       // Cast the value?
+       if ($castValue) $ret = (int) $ret;
+
+       // Return result
        return $ret;
 }
 // Insert the code in $img_code into jpeg or PNG image