A lot fixes to templates and missing functions added, more rewrites

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

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 5f82f17270d6a2f6d7502fff95c20887e477a1ab..f3af140f191ebcc2fe2716560f745df065fb66cd 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -40,7 +40,7 @@ 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__);
+       $result = SQL_QUERY("SELECT field_name, field_required FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id`", __FUNCTION__, __LINE__);
        while (list($name, $required) = SQL_FETCHROW($result)) {
                $value = "";
                if ($required == "Y") $value = "<div class=\\\"guest_failed\\\">&nbsp;(*)</div>";
@@ -63,7 +63,7 @@ function REGISTER_CHECK_REQUIRED_FIELDS(&$array)
        $ret = false;
        foreach ($array as $key => $value)
        {
-               $result = SQL_QUERY("SELECT field_required FROM `{!_MYSQL_PREFIX!}_must_register` WHERE field_name='".$key."' LIMIT 1", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT field_required FROM `{!_MYSQL_PREFIX!}_must_register` WHERE field_name='".$key."' LIMIT 1", __FUNCTION__, __LINE__);
                if (SQL_NUMROWS($result) == 1)
                {
                        // "Must-line" found
@@ -87,7 +87,7 @@ function REGISTER_CHECK_REQUIRED_FIELDS(&$array)
 //
 function REGISTER_OUTPUT_REQUIRE_CHECK(&$array)
 {
-       $result = SQL_QUERY("SELECT field_name, field_required FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id`", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT field_name, field_required FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id`", __FUNCTION__, __LINE__);
        while (list($name, $required) = SQL_FETCHROW($result))
        {
                if (($array[$name] == "!") && ($required == "Y")) {
@@ -111,13 +111,18 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false) {
 
        // 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__);
+       $result = SQL_QUERY("SELECT id, cat, visible FROM `{!_MYSQL_PREFIX!}_cats` ".$AND." ORDER BY `sort`", __FUNCTION__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // List alle visible modules (or all to the admin)
                $SW = 2;
                $OUT .= "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">\n";
                while (list($id, $cat, $visible) = SQL_FETCHROW($result)) {
-                       if (!REQUEST_ISSET_POST(('cat', $id))) REQUEST_POST('cat', $id) = "";
+                       // Is the array element not set?
+                       if (!REQUEST_ISSET_POST('cat', $id)) {
+                               // Then set it
+                               REQUEST_SET_POST(array('cat', $id), "");
+                       } // END - if
+
                        // Prepare array for the template
                        $content = array(
                                'sw'    => $SW,
@@ -127,7 +132,7 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false) {
                                'id'    => $id,
                        );
 
-                       if ((REQUEST_POST('cat', $id) == "Y") || ((getConfig('register_default') == "Y") && (!REQUEST_ISSET_POST(('cat', $id))))) {
+                       if ((REQUEST_POST('cat', $id) == "Y") || ((getConfig('register_default') == "Y") && (!REQUEST_ISSET_POST('cat', $id)))) {
                                $content['def_y'] = " checked=\"checked\"";
                        } else {
                                $content['def_n'] = " checked=\"checked\"";