A lot rewrites from double-quote to single-quote, some fixes for extension handling...

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

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index aa0ea1baf50f15528a477b178c3964e9b959cfb1..7630933ab70f1f91c449a15f931e4db573fb3f21 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -48,8 +48,8 @@ function REGISTER_FILL_MUST_CONSTANTS () {
                __FUNCTION__, __LINE__);
 
        while ($content = SQL_FETCHARRAY($result)) {
                __FUNCTION__, __LINE__);
 
        while ($content = SQL_FETCHARRAY($result)) {

-               $value = "";
-               if ($content['field_required'] == "Y") $value = "<div class=\\\"guest_failed\\\">&nbsp;(*)</div>";
+               $value = '';
+               if ($content['field_required'] == 'Y') $value = "<div class=\\\"guest_failed\\\">&nbsp;(*)</div>";

                // @TODO Rewrite these constants
                $eval = "define('MUST_".strtoupper($content['field_name'])."', \"".$value."\");";
                eval($eval);
                // @TODO Rewrite these constants
                $eval = "define('MUST_".strtoupper($content['field_name'])."', \"".$value."\");";
                eval($eval);


@@ -78,8 +78,8 @@ function REGISTER_CHECK_REQUIRED_FIELDS (&$array) {
                        // Check if extension country is not found (you have to enter the 2-chars long country code) or
                        // if extensions is present check if country code was selected
                        //         01              2         21    12             3         32    234     5      54    4               43    34                      4    4      5      5432    2      3                      3210
                        // Check if extension country is not found (you have to enter the 2-chars long country code) or
                        // if extensions is present check if country code was selected
                        //         01              2         21    12             3         32    234     5      54    4               43    34                      4    4      5      5432    2      3                      3210

-                       $country = ((!EXT_IS_ACTIVE("country")) || ((EXT_IS_ACTIVE("country")) && (((empty($value)) && ($key == "cntry")) || (($key == "country_code") && (!empty($value)))) && (!empty($array['country_code']))));
-                       if ((empty($value)) && ($chk == "Y") && (!$country))
+                       $country = ((!EXT_IS_ACTIVE('country')) || ((EXT_IS_ACTIVE('country')) && (((empty($value)) && ($key == "cntry")) || (($key == "country_code") && (!empty($value)))) && (!empty($array['country_code']))));
+                       if ((empty($value)) && ($chk == 'Y') && (!$country))

                        {
                                // Required field not set
                                $array[$key] = "!";
                        {
                                // Required field not set
                                $array[$key] = "!";


@@ -97,9 +97,9 @@ 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`", __FUNCTION__, __LINE__);
        while ($content = SQL_FETCHARRAY($result)) {
 function REGISTER_OUTPUT_REQUIRE_CHECK (&$array) {
        $result = SQL_QUERY("SELECT field_name, field_required FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id`", __FUNCTION__, __LINE__);
        while ($content = SQL_FETCHARRAY($result)) {

-               if (($array[$content['field_name']] == "!") && ($content['field_required'] == "Y")) {
+               if (($array[$content['field_name']] == "!") && ($content['field_required'] == 'Y')) {

                        // Empty entry found
                        // Empty entry found

-                       $array[$content['field_name']] = "";
+                       $array[$content['field_name']] = '';

                        $OUT = constant('REGISTER_'.strtoupper($content['field_name']).'_REQUIRED');
                        OUTPUT_HTML("<div class=\"register_failed\">".$OUT."</div>");
                } // END - if
                        $OUT = constant('REGISTER_'.strtoupper($content['field_name']).'_REQUIRED');
                        OUTPUT_HTML("<div class=\"register_failed\">".$OUT."</div>");
                } // END - if


@@ -111,14 +111,14 @@ function REGISTER_OUTPUT_REQUIRE_CHECK (&$array) {
 
 //
 function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false) {
 
 //
 function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false) {

-       $OUT = "";
+       $OUT = '';

 
        // 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...
 
        // 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 = "";
+       if (IS_ADMIN()) $AND = '';

 
        // Look for categories
        $result = SQL_QUERY("SELECT id, cat, visible FROM `{!_MYSQL_PREFIX!}_cats` ".$AND." ORDER BY `sort`",
 
        // Look for categories
        $result = SQL_QUERY("SELECT id, cat, visible FROM `{!_MYSQL_PREFIX!}_cats` ".$AND." ORDER BY `sort`",


@@ -132,7 +132,7 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false) {
                        // Is the array element not set?
                        if (!REQUEST_ISSET_POST('cat', $content['id'])) {
                                // Then set it
                        // 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(array('cat', $content['id']), '');

                        } // END - if
 
                        // Prepare array for the template
                        } // END - if
 
                        // Prepare array for the template


@@ -144,10 +144,10 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false) {
                                'id'    => $content['id'],
                        );
 
                                'id'    => $content['id'],
                        );
 

-                       if ((REQUEST_POST('cat', $content['id']) == "Y") || ((getConfig('register_default') == "Y") && (!REQUEST_ISSET_POST('cat', $content['id'])))) {
-                               $content['def_y'] = " checked=\"checked\"";
+                       if ((REQUEST_POST('cat', $content['id']) == 'Y') || ((getConfig('register_default') == 'Y') && (!REQUEST_ISSET_POST('cat', $content['id'])))) {
+                               $content['def_y'] = ' chkecked="checked"';

                        } else {
                        } else {

-                               $content['def_n'] = " checked=\"checked\"";
+                               $content['def_n'] = ' chkecked="checked"';

                        }
 
                        // Load template and switch color
                        }
 
                        // Load template and switch color


@@ -160,7 +160,7 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false) {
                SQL_FREERESULT($result);
        } else {
                // No categories setted up so far...
                SQL_FREERESULT($result);
        } else {
                // No categories setted up so far...

-               $OUT .= LOAD_TEMPLATE("admin_settings_saved", true, getMessage('NO_CATEGORIES_VISIBLE'));
+               $OUT .= LOAD_TEMPLATE('admin_settings_saved', true, getMessage('NO_CATEGORIES_VISIBLE'));

        }
 
        if ($return === true) {
        }
 
        if ($return === true) {