Many rewrites to get rid of dublicate modreg inserts while ext-cache is registered

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

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 8ed526a227bdc66e81344fd1b042fa6d70ae22c1..91cd13f633bf84d9fcccb1ad0e6c92a44e84b17d 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -45,11 +45,11 @@ if (!defined('__SECURITY')) {
 //
 function registerMustFillout () {
        $result = SQL_QUERY("SELECT field_name, field_required FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id`",
-               __FUNCTION__, __LINE__);
+       __FUNCTION__, __LINE__);
 
        while ($content = SQL_FETCHARRAY($result)) {
                $value = '';
-               if ($content['field_required'] == 'Y') $value = "<div class=\\\"guest_failed\\\">&nbsp;(*)</div>";
+               if ($content['field_required'] == 'Y') $value = "<span class=\\\"guest_failed\\\">&nbsp;(*)</span>";
                // @TODO Rewrite these constants
                $eval = "define('MUST_".strtoupper($content['field_name'])."', \"".$value."\");";
                eval($eval);
@@ -60,10 +60,10 @@ function registerMustFillout () {
 
        // Also fill other constants
        // @TODO Rewrite these constants, too
-       define('MUST_GENDER', "<div class=\"guest_failed\">&nbsp;(*)</div>");
-       define('MUST_ADDY'  , "<div class=\"guest_failed\">&nbsp;(*)</div>");
-       define('MUST_BIRTH' , "<div class=\"guest_failed\">&nbsp;(*)</div>");
-       define('MUST_MARKER', "<div class=\"guest_failed\">&nbsp;(*)</div>");
+       define('MUST_GENDER', "<span class=\"guest_failed\">&nbsp;(*)</span>");
+       define('MUST_ADDY'  , "<span class=\"guest_failed\">&nbsp;(*)</span>");
+       define('MUST_BIRTH' , "<span class=\"guest_failed\">&nbsp;(*)</span>");
+       define('MUST_MARKER', "<span class=\"guest_failed\">&nbsp;(*)</span>");
 }
 
 //
@@ -71,7 +71,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",
-                       __FUNCTION__, __LINE__);
+               __FUNCTION__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // "Must-line" found
                        list($chk) = SQL_FETCHROW($result);
@@ -133,7 +133,7 @@ function registerGenerateCategoryTable ($mode, $return=false) {
                        // Is the array element not set?
                        if (!REQUEST_ISSET_POST('cat', $content['id'])) {
                                // Then set it
-                               REQUEST_SET_POST(array('cat', $content['id']), '');
+                               REQUEST_SET_POST('cat', array($content['id'] => ''));
                        } // END - if
 
                        // Prepare array for the template
@@ -146,9 +146,9 @@ function registerGenerateCategoryTable ($mode, $return=false) {
                        );
 
                        if ((REQUEST_POST('cat', $content['id']) == 'Y') || ((getConfig('register_default') == 'Y') && (!REQUEST_ISSET_POST('cat', $content['id'])))) {
-                               $content['def_y'] = ' chkecked="checked"';
+                               $content['def_y'] = ' checked="checked"';
                        } else {
-                               $content['def_n'] = ' chkecked="checked"';
+                               $content['def_n'] = ' checked="checked"';
                        }
 
                        // Load template and switch color