A lot eval() commands rewritten to constant() function

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

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index e9c14d7f09013221211a45c00fa59e1a8618c78d..a5f121de430da6cc51c1aaca062c30f444b71af1 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -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;
 }