X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fregister_functions.php;h=efc9e4b2efd22617d60547a6505b5b68abe0accb;hb=05c5310de0991ba52c441670a315b89ee4f9db12;hp=91cd13f633bf84d9fcccb1ad0e6c92a44e84b17d;hpb=75062a410999a290b18fe181370139b37a160eb5;p=mailer.git diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index 91cd13f633..efc9e4b2ef 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -1,7 +1,7 @@ (*)"; - // @TODO Rewrite these constants - $eval = "define('MUST_".strtoupper($content['field_name'])."', \"".$value."\");"; - eval($eval); - } // END - while - - // Free memory - SQL_FREERESULT($result); - - // Also fill other constants - // @TODO Rewrite these constants, too - define('MUST_GENDER', " (*)"); - define('MUST_ADDY' , " (*)"); - define('MUST_BIRTH' , " (*)"); - define('MUST_MARKER', " (*)"); -} - -// -function REGISTER_CHECK_REQUIRED_FIELDS (&$array) { - $ret = false; +function ifRequiredRegisterFieldsAreSet (&$array) { + // By default all is fine + $ret = true; foreach ($array as $key => $value) { - $result = SQL_QUERY("SELECT field_required FROM `{!_MYSQL_PREFIX!}_must_register` WHERE field_name='".$key."' LIMIT 1", - __FUNCTION__, __LINE__); + // Check all fields that must register + $result = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_must_register` WHERE `field_name`='".$key."' AND `field_required`='Y' LIMIT 1", + __FUNCTION__, __LINE__); if (SQL_NUMROWS($result) == 1) { - // "Must-line" found - list($chk) = SQL_FETCHROW($result); - // 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 = ((!isExtensionActive('country')) || ((isExtensionActive('country')) && (((empty($value)) && ($key == 'cntry')) || (($key == 'country_code') && (!empty($value)))) && (!empty($array['country_code'])))); + if ((empty($value)) && ($country === false)) { // Required field not set $array[$key] = '!'; - $ret = true; - } - } + $ret = false; + } // END - if + } // END - if // Free result SQL_FREERESULT($result); - } - return $ret; -} + } // END - foreach -// -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')) { - // Empty entry found - $array[$content['field_name']] = ''; - $OUT = constant('REGISTER_'.strtoupper($content['field_name']).'_REQUIRED'); - registerOutputFailedMessage('', $OUT); - } // END - if - } // END - while - - // Free memory - SQL_FREERESULT($result); + // Return result + return $ret; } // Generates a 'category table' for the registration form @@ -119,10 +78,10 @@ function registerGenerateCategoryTable ($mode, $return=false) { $AND = "WHERE `visible`='Y' "; // Admins are allowed to see every category... - if (IS_ADMIN()) $AND = ''; + if (isAdmin()) $AND = ''; // Look for categories - $result = SQL_QUERY("SELECT `id`, `cat`, `visible` FROM `{!_MYSQL_PREFIX!}_cats` ".$AND." ORDER BY `sort` ASC", + $result = SQL_QUERY("SELECT `id`, `cat`, `visible` FROM `{?_MYSQL_PREFIX?}_cats` ".$AND." ORDER BY `sort` ASC", __FUNCTION__, __LINE__); if (SQL_NUMROWS($result) > 0) { @@ -130,12 +89,6 @@ function registerGenerateCategoryTable ($mode, $return=false) { $SW = 2; $OUT .= "