Fixes for 'Can't use function return value in write context in /foo/bar.php'

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

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index a80cddd54c168508b66cd4f8661657b28f0bbeff..93623b45eab5876e9b559c2125fd7b0b2c54e3c5 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -41,13 +41,12 @@ if (!defined('__SECURITY')) {
 function REGISTER_FILL_MUST_CONSTANTS()
 {
        $result = SQL_QUERY("SELECT field_name, field_required FROM "._MYSQL_PREFIX."_must_register ORDER BY id", __FILE__, __LINE__);
-       while(list($name, $required) = SQL_FETCHROW($result))
-       {
+       while(list($name, $required) = SQL_FETCHROW($result)) {
                $value = "";
                if ($required == "Y") $value = "<FONT class=\\\"guest_failed\\\">&nbsp;(*)</FONT>";
                $eval = "define('MUST_".strtoupper($name)."', \"".$value."\");";
                eval($eval);
-       }
+       } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
@@ -91,12 +90,10 @@ function REGISTER_OUTPUT_REQUIRE_CHECK(&$array)
        $result = SQL_QUERY("SELECT field_name, field_required FROM "._MYSQL_PREFIX."_must_register ORDER BY id", __FILE__, __LINE__);
        while(list($name, $required) = SQL_FETCHROW($result))
        {
-               if (($array[$name] == "!") && ($required == "Y"))
-               {
+               if (($array[$name] == "!") && ($required == "Y")) {
                        // Empty entry found
                        $array[$name] = "";
-                       $eval = "\$OUT = REGISTER_".strtoupper($name)."_REQUIRED;";
-                       eval($eval);
+                       $OUT = constant('REGISTER_'.strtoupper($name).'_REQUIRED');
                        OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".$OUT."</SPAN></STRONG><br /><br />");
                }
        }
@@ -113,6 +110,7 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false)
        // Guests are mostly not interested in how many members has
        // choosen an individual category
        $AND = "WHERE visible='Y' ";
+
        // Admins are allowed to see every category...
        if (IS_ADMIN()) $AND = "";
        $result = SQL_QUERY("SELECT id, cat, visible FROM "._MYSQL_PREFIX."_cats ".$AND." ORDER BY sort", __FILE__, __LINE__);
@@ -133,13 +131,10 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false)
                                'id'    => $id,
                        );
 
-                       if (($_POST['cat'][$id] == "Y") || (($_CONFIG['register_default'] == "Y") && (empty($_POST['cat'][$id]))))
-                       {
-                               $content['def_y'] = " checked";
-                       }
-                        else
-                       {
-                               $content['def_n'] = " checked";
+                       if (($_POST['cat'][$id] == "Y") || ((getConfig('register_default') == "Y") && (empty($_POST['cat'][$id])))) {
+                               $content['def_y'] = " checked=\"checked\"";
+                       } else {
+                               $content['def_n'] = " checked=\"checked\"";
                        }
 
                        // Load template and switch color