Notification mails rewritten

[mailer.git] / inc / libs / surfbar_functions.php

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index f83d4fac911e1d363d1393252870b7b25474ece2..37d3c94306e72550f59343640a9d9ea5a6cf3903 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -56,7 +56,7 @@ function SURFBAR_ADMIN_ADD_URL ($url, $limit) {
        } elseif (!SURFBAR_IF_USER_BOOK_MORE_URLS()) {
                // No more allowed!
                return false;
-       } elseif ("".bigintval($limit)."" != "".$limit."") {
+       } elseif ("".($limit + 0)."" != "".$limit."") {
                // Invalid amount entered
                return false;
        }
@@ -158,7 +158,7 @@ function SURFBAR_MEMBER_ADD_URL ($url, $limit) {
        } elseif (!SURFBAR_IF_USER_BOOK_MORE_URLS($GLOBALS['userid'])) {
                // No more allowed!
                return false;
-       } elseif ("".bigintval($limit)."" != "".$limit."") {
+       } elseif ("".($limit + 0)."" != "".$limit."") {
                // Invalid amount entered
                return false;
        }
@@ -466,7 +466,7 @@ function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) {
        if (empty($uid)) $uid = 0;
 
        // Just run the insert query for now
-       SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_urls (userid,url,status,views_max,views_allowed) VALUES(%s,'%s','%s','%s','%s')",
+       SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_urls (userid,url,status,views_max,views_allowed) VALUES (%s,'%s','%s','%s','%s')",
                array(
                        $uid,
                        $urlData['url'],
@@ -488,10 +488,9 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) {
        $subject = ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT;
 
        // Prepare subject
-       $eval = sprintf("\$subject = ADMIN_SURFBAR_NOTIFY_%s_SUBJECT;",
+       $subject = constant(sprintf("ADMIN_SURFBAR_NOTIFY_%s_SUBJECT",
                strtoupper($messageType)
-       );
-       @eval($eval);
+       ));
 
        // Send the notification out
        return SEND_ADMIN_NOTIFICATION($subject, $templateName, $content, $content['uid']);
@@ -510,10 +509,9 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) {
        $subject = MEMBER_SURFBAR_NOTIFY_DEFAULT_SUBJECT;
 
        // Prepare subject
-       $eval = sprintf("\$subject = MEMBER_SURFBAR_NOTIFY_%s_SUBJECT;",
+       $subject = constant(sprintf("MEMBER_SURFBAR_NOTIFY_%s_SUBJECT",
                strtoupper($messageType)
-       );
-       @eval($eval);
+       ));
 
        // Load template
        $mailText = LOAD_EMAIL_TEMPLATE($templateName, $content, $content['uid']);
@@ -783,6 +781,8 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt="") {
 
        // Finally encrypt it PGP-like and return it
        $valHashedCode = generatePassString($hashedCode);
+
+       // Return hashed value
        //DEBUG_LOG(__FUNCTION__.":finalValCode={$valHashedCode}");
        return $valHashedCode;
 }
@@ -806,7 +806,7 @@ function SURFBAR_LOCKDOWN_ID ($urlId) {
        //* //DEBUG: */ print "LOCK!");
        ///* //DEBUG: */ return;
        // Just add it to the database
-       SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_locks (userid, url_id) VALUES(%s, %s)",
+       SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_locks (userid, url_id) VALUES (%s, %s)",
                array($GLOBALS['userid'], bigintval($urlId)), __FILE__, __LINE__);
 
        // Remove the salt from database
@@ -852,7 +852,7 @@ function SURFBAR_UPDATE_INSERT_STATS_RECORD () {
        // Was that update okay?
        if (SQL_AFFECTEDROWS() < 1) {
                // No, then insert entry
-               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_stats (userid,url_id,count) VALUES(%s,%s,1)",
+               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_stats (userid,url_id,count) VALUES (%s,%s,1)",
                        array($GLOBALS['userid'], SURFBAR_GET_ID()), __FILE__, __LINE__);
        } // END - if
 
@@ -880,7 +880,7 @@ function SURFBAR_UPDATE_SALT_STATS () {
        // Was that okay?
        if (SQL_AFFECTEDROWS() < 1) {
                // Insert missing entry!
-               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_salts (url_id,userid,last_salt) VALUES(%s, %s, '%s')",
+               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_salts (url_id,userid,last_salt) VALUES (%s, %s, '%s')",
                        array(SURFBAR_GET_ID(), $GLOBALS['userid'], SURFBAR_GET_SALT()), __FILE__, __LINE__);
        } // END - if
 
@@ -915,7 +915,11 @@ LIMIT 1",
 // Determine which user hash no more points left
 function SURFBAR_DETERMINE_DEPLETED_USERIDS ($limit=0) {
        // Init array
-       $UIDs = array();
+       $UIDs = array(
+               'uid'      => array(),
+               'points'   => array(),
+               'notified' => array(),
+       );
 
        // Do we have a current user id?
        if ((IS_MEMBER()) && ($limit == 0)) {