X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fregister_functions.php;h=cc4ecaeb8c36f1cc19b63b16f75ea6fb4d98dd9b;hb=4fb64ee12fc856499810421c13c55893e7a00bdf;hp=105749117bf03c942791fc0e2ba32f883fe46c73;hpb=66b91ce490ab549425619c95fc12086e126d541b;p=mailer.git diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index 105749117b..cc4ecaeb8c 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -17,7 +17,7 @@ * Needs to be in all Files and every File needs "svn propset * * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * - * Copyright (c) 2003 - 2008 by Roland Haeder * + * Copyright (c) 2003 - 2009 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -38,32 +38,7 @@ // Some security stuff... if (!defined('__SECURITY')) { - $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php'; - require($INC); -} - -// -function registerMustFillout () { - $result = SQL_QUERY("SELECT `field_name`, `field_required` FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id` ASC", - __FUNCTION__, __LINE__); - - while ($content = SQL_FETCHARRAY($result)) { - $value = ''; - if ($content['field_required'] == 'Y') $value = " (*)"; - // @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', " (*)"); + die(); } // @@ -72,14 +47,14 @@ function ifRequiredRegisterFieldsAreSet (&$array) { $ret = true; foreach ($array as $key => $value) { // 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", + $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) { // 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)) && (!$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 = false; @@ -94,25 +69,6 @@ function ifRequiredRegisterFieldsAreSet (&$array) { return $ret; } -// @TODO This function is no longer used??? -function REGISTER_OUTPUT_REQUIRE_CHECK (&$array) { - // Get all fields for output - $result = SQL_QUERY("SELECT `field_name`, `field_required` FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id`", __FUNCTION__, __LINE__); - - // Loop through them - while ($content = SQL_FETCHARRAY($result)) { - if (($array[$content['field_name']] == '!') && ($content['field_required'] == 'Y')) { - // Empty entry found - $array[$content['field_name']] = ''; - $OUT = getMessage('REGISTER_'.strtoupper($content['field_name']).'_REQUIRED'); - registerOutputFailedMessage('', $OUT); - } // END - if - } // END - while - - // Free memory - SQL_FREERESULT($result); -} - // Generates a 'category table' for the registration form function registerGenerateCategoryTable ($mode, $return=false) { $OUT = ''; @@ -122,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) { @@ -134,9 +90,9 @@ function registerGenerateCategoryTable ($mode, $return=false) { $OUT .= "