X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-register.php;h=2c4368b4a92f3d7d3485bf7d0c889d293d261930;hp=f211e88c6a9d3809bb1ee17f3d760140fc0beef8;hb=7b0f17cd637e388049d2167811e4332cec1e979b;hpb=d32a5a6c4e9287611853e7187a5d6d1b05794bdb diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php index f211e88c6a..2c4368b4a9 100644 --- a/inc/modules/guest/what-register.php +++ b/inc/modules/guest/what-register.php @@ -10,7 +10,12 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Anmeldeformular * * -------------------------------------------------------------------- * - * * + * $Revision:: $ * + * $Date:: $ * + * $Tag:: 0.2.1-FINAL $ * + * $Author:: $ * + * 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 * * For more information visit: http://www.mxchange.org * @@ -33,15 +38,15 @@ // Some security stuff... if (!defined('__SECURITY')) { - $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; + $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php'; require($INC); -} elseif ((!EXT_IS_ACTIVE("register"))) { - addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "register"); +} elseif ((!EXT_IS_ACTIVE('register'))) { + addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'register')); return; } // Add description as navigation point -ADD_DESCR("guest", __FILE__); +ADD_DESCR('guest', __FILE__); global $DATA; @@ -50,20 +55,20 @@ $FAILED = false; $SHORT_PASS = false; $cats = 0; $IP_TIMEOUT = false; if (!IS_FORM_SENT()) REQUEST_UNSET_POST('ok'); -if (!REQUEST_ISSET_POST(('agree'))) REQUEST_SET_POST('agree' , ""); -if (!REQUEST_ISSET_POST(('addy'))) REQUEST_SET_POST('addy' , ""); -if (!REQUEST_ISSET_POST(('surname'))) REQUEST_SET_POST('surname' , ""); -if (!REQUEST_ISSET_POST(('family'))) REQUEST_SET_POST('family' , ""); -if (!REQUEST_ISSET_POST(('pass1'))) REQUEST_SET_POST('pass1' , ""); -if (!REQUEST_ISSET_POST(('pass2'))) REQUEST_SET_POST('pass2' , ""); -if (!REQUEST_ISSET_POST(('day'))) REQUEST_SET_POST('day' , ""); -if (!REQUEST_ISSET_POST(('month'))) REQUEST_SET_POST('month' , ""); -if (!REQUEST_ISSET_POST(('year'))) REQUEST_SET_POST('year' , ""); -if (!REQUEST_ISSET_POST(('max_mails'))) REQUEST_SET_POST('max_mails' , ""); -if (!REQUEST_ISSET_POST(('street_nr'))) REQUEST_SET_POST('street_nr' , ""); -if (!REQUEST_ISSET_POST(('zip'))) REQUEST_SET_POST('zip' , ""); -if (!REQUEST_ISSET_POST(('city'))) REQUEST_SET_POST('city' , ""); -if (!REQUEST_ISSET_POST(('cntry'))) REQUEST_SET_POST('cntry' , ""); +if (!REQUEST_ISSET_POST(('agree'))) REQUEST_SET_POST('agree' , ''); +if (!REQUEST_ISSET_POST(('addy'))) REQUEST_SET_POST('addy' , ''); +if (!REQUEST_ISSET_POST(('surname'))) REQUEST_SET_POST('surname' , ''); +if (!REQUEST_ISSET_POST(('family'))) REQUEST_SET_POST('family' , ''); +if (!REQUEST_ISSET_POST(('pass1'))) REQUEST_SET_POST('pass1' , ''); +if (!REQUEST_ISSET_POST(('pass2'))) REQUEST_SET_POST('pass2' , ''); +if (!REQUEST_ISSET_POST(('day'))) REQUEST_SET_POST('day' , ''); +if (!REQUEST_ISSET_POST(('month'))) REQUEST_SET_POST('month' , ''); +if (!REQUEST_ISSET_POST(('year'))) REQUEST_SET_POST('year' , ''); +if (!REQUEST_ISSET_POST(('max_mails'))) REQUEST_SET_POST('max_mails' , ''); +if (!REQUEST_ISSET_POST(('street_nr'))) REQUEST_SET_POST('street_nr' , ''); +if (!REQUEST_ISSET_POST('zip')) REQUEST_SET_POST('zip' , ''); +if (!REQUEST_ISSET_POST(('city'))) REQUEST_SET_POST('city' , ''); +if (!REQUEST_ISSET_POST(('cntry'))) REQUEST_SET_POST('cntry' , ''); if (!REQUEST_ISSET_POST(('country_code'))) REQUEST_SET_POST('country_code', "1"); // Default refid is zero @@ -78,7 +83,7 @@ if ($GLOBALS['refid'] > 0) { if (SQL_NUMROWS($result) == 0) { // Not found so we set your refid! REQUEST_SET_POST('refid', getConfig('def_refid')); - set_session('refid', getConfig('def_refid')); + setSession('refid', getConfig('def_refid')); } else { // Use the refid here REQUEST_SET_POST('refid', $GLOBALS['refid']); @@ -89,25 +94,25 @@ if (IS_FORM_SENT()) { // First we only check the submitted data then we continue... :) // // Did he agree to our Terms Of Usage? - if (REQUEST_POST('agree') != "Y") { - REQUEST_SET_POST('agree', "!"); + if (REQUEST_POST('agree') != 'Y') { + REQUEST_SET_POST('agree', '!'); $FAILED = true; } // END - if // Did he enter a valid email address? (we really don't care about // that, he has to click on a confirmation link :P ) if ((!REQUEST_ISSET_POST(('addy'))) || (!VALIDATE_EMAIL(REQUEST_POST('addy')))) { - REQUEST_SET_POST('addy', "!"); + REQUEST_SET_POST('addy', '!'); $FAILED = true; } // END - if // And what about surname and family's name? if (!REQUEST_ISSET_POST(('surname'))) { - REQUEST_SET_POST('surname', "!"); + REQUEST_SET_POST('surname', '!'); $FAILED = true; } // END - if if (!REQUEST_ISSET_POST(('family'))) { - REQUEST_SET_POST('family', "!"); + REQUEST_SET_POST('family', '!'); $FAILED = true; } // END - if @@ -117,11 +122,11 @@ if (IS_FORM_SENT()) { // Did he enter his password twice? if (((!REQUEST_ISSET_POST(('pass1'))) || (!REQUEST_ISSET_POST(('pass2')))) || ((REQUEST_POST('pass1') != REQUEST_POST('pass2')) && (REQUEST_ISSET_POST(('pass1'))) && (REQUEST_ISSET_POST(('pass2'))))) { if ((REQUEST_POST('pass1') != REQUEST_POST('pass2')) && (REQUEST_ISSET_POST(('pass1'))) && (REQUEST_ISSET_POST(('pass2')))) { - REQUEST_SET_POST('pass1', "!"); - REQUEST_SET_POST('pass2', "!"); + REQUEST_SET_POST('pass1', '!'); + REQUEST_SET_POST('pass2', '!'); } else { - if (!REQUEST_ISSET_POST(('pass1'))) { REQUEST_SET_POST('pass1', "!"); } else { REQUEST_SET_POST('pass1', ""); } - if (!REQUEST_ISSET_POST(('pass2'))) { REQUEST_SET_POST('pass2', "!"); } else { REQUEST_SET_POST('pass2', ""); } + if (!REQUEST_ISSET_POST(('pass1'))) { REQUEST_SET_POST('pass1', '!'); } else { REQUEST_SET_POST('pass1', ''); } + if (!REQUEST_ISSET_POST(('pass2'))) { REQUEST_SET_POST('pass2', '!'); } else { REQUEST_SET_POST('pass2', ''); } } $FAILED = true; } // END - if @@ -136,7 +141,7 @@ if (IS_FORM_SENT()) { if (!IS_ADMIN()) { // Do this check only when no admin is logged in foreach (REQUEST_POST('cat') as $id => $answer) { - if ($answer == "Y") $cats++; + if ($answer == 'Y') $cats++; } // END - foreach if ($cats < getConfig('least_cats')) { @@ -145,17 +150,20 @@ if (IS_FORM_SENT()) { } // END - if } // END - if - if ((REQUEST_POST('addy') != "!") && (getConfig('check_double_email') == "Y")) { + if ((REQUEST_POST('addy') != '!') && (getConfig('check_double_email') == 'Y')) { // Does the email address already exists in our database? - $CHK = SEARCH_EMAIL_USERTAB(REQUEST_POST('addy')); - if ($CHK) { REQUEST_SET_POST('addy', "?"); $FAILED = true; } + $CHK = isEmailTaken(REQUEST_POST('addy')); + if ($CHK === true) { + REQUEST_SET_POST('addy', '?'); + $FAILED = true; + } // END - if } // END - if // Check for IP timeout? if (getConfig('ip_timeout') > 0) { // Check his IP number $result = SQL_QUERY_ESC("SELECT joined, last_update FROM `{!_MYSQL_PREFIX!}_user_data` WHERE REMOTE_ADDR='%s' AND (joined > (UNIX_TIMESTAMP() - %s) OR last_update > (UNIX_TIMESTAMP() - %s)) LIMIT 1", - array(GET_REMOTE_ADDR(), getConfig('ip_timeout'), getConfig('ip_timeout')), __FILE__, __LINE__); + array(detectRemoteAddr(), getConfig('ip_timeout'), getConfig('ip_timeout')), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Same IP in timeout range and different email address entered... Eat this, faker! ;-) // But admins are allowed to fake their own exchange service. @@ -170,57 +178,57 @@ if (IS_FORM_SENT()) { if ((IS_FORM_SENT()) && ((!$FAILED) || (IS_ADMIN()))) { // Prepapre month and day of birth - if (strlen(REQUEST_POST('day')) == 1) REQUEST_POST('day') = "0".REQUEST_POST('day'); - if (strlen(REQUEST_POST('month')) == 1) REQUEST_SET_POST('month', "0".REQUEST_POST('month')); + if (strlen(REQUEST_POST('day')) == 1) REQUEST_SET_POST('day' , '0'.REQUEST_POST('day')); + if (strlen(REQUEST_POST('month')) == 1) REQUEST_SET_POST('month', '0'.REQUEST_POST('month')); // Get total ... // ... confirmed, ... - $confirmedUsers = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true); + $confirmedUsers = GET_TOTAL_DATA('CONFIRMED', 'user_data', 'userid', 'status', true); // ... unconfirmed ... - $unconfirmedUsers = GET_TOTAL_DATA("UNCONFIRMED", "user_data", "userid", "status", true); + $unconfirmedUsers = GET_TOTAL_DATA('UNCONFIRMED', 'user_data', 'userid', 'status', true); // ... and locked users! - $lockedUsers = GET_TOTAL_DATA("LOCKED", "user_data", "userid", "status", true); + $lockedUsers = GET_TOTAL_DATA('LOCKED', 'user_data', 'userid', 'status', true); // Generate hash which will be inserted into confirmation mail - $hash = generateHash(sha1($confirmedUsers.":".$unconfirmedUsers.":".$lockedUsers.":".REQUEST_POST('month')."-".REQUEST_POST('day')."-".REQUEST_POST('year').":".getenv('SERVER_NAME').":".GET_REMOTE_ADDR().":".GET_USER_AGENT()."/".constant('SITE_KEY')."/".constant('DATE_KEY')."/".constant('RAND_NUMBER'))); + $hash = generateHash(sha1($confirmedUsers.constant('ENCRYPT_SEPERATOR').$unconfirmedUsers.constant('ENCRYPT_SEPERATOR').$lockedUsers.constant('ENCRYPT_SEPERATOR').REQUEST_POST('month').'-'.REQUEST_POST('day').'-'.REQUEST_POST('year').constant('ENCRYPT_SEPERATOR').getenv('SERVER_NAME').constant('ENCRYPT_SEPERATOR').detectRemoteAddr().constant('ENCRYPT_SEPERATOR').detectUserAgent().'/'.constant('SITE_KEY').'/'.constant('DATE_KEY').'/'.constant('RAND_NUMBER'))); // Add design when extension sql_patches is v0.2.7 or greater - $ADD1 = ""; $ADD2 = ""; - if (GET_EXT_VERSION("sql_patches") >= "0.2.7") { + // @TODO Rewrite these all to a single filter + $ADD1 = ''; $ADD2 = ''; + if (GET_EXT_VERSION('sql_patches') >= '0.2.7') { // Okay, add design here - $ADD1 = ", curr_theme"; - $ADD2 = ", '".GET_CURR_THEME()."'"; + $ADD1 = ", `curr_theme`"; + $ADD2 = ", '".getCurrentTheme()."'"; } // END - if // Check if I shall disable sending mail to newly registered members out about active/begging rallye - // @TODO Rewrite this to a single filter // // First comes first: begging rallye - if (GET_EXT_VERSION("beg") >= "0.1.7") { + if (GET_EXT_VERSION('beg') >= '0.1.7') { // Okay, shall I disable now? - if (getConfig('beg_new_mem_notify') != "Y") { - $ADD1 .= ", beg_ral_notify, beg_ral_en_notify"; + if (getConfig('beg_new_mem_notify') != 'Y') { + $ADD1 .= ", `beg_ral_notify`, `beg_ral_en_notify`"; $ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()"; } // END - if } // END - if // Second: active rallye - if (GET_EXT_VERSION("bonus") >= "0.7.7") { + if (GET_EXT_VERSION('bonus') >= '0.7.7') { // Okay, shall I disable now? - if (getConfig('bonus_new_mem_notify') != "Y") { - $ADD1 .= ", bonus_ral_notify, bonus_ral_en_notify"; + if (getConfig('bonus_new_mem_notify') != 'Y') { + $ADD1 .= ", `bonus_ral_notify`, `bonus_ral_en_notify`"; $ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()"; } // END - if } // END - if // Write user data to table - if (EXT_IS_ACTIVE("country")) { + if (EXT_IS_ACTIVE('country')) { // Save with new selectable country code - $countryRow = "country_code"; + $countryRow = "`country_code`"; $countryData = bigintval(REQUEST_POST('country_code')); } else { // Old way with enterable two-char-code - $countryRow = "country"; + $countryRow = "`country`"; $countryData = substr(REQUEST_POST('cntry'), 0, 2); } @@ -248,7 +256,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF bigintval(REQUEST_POST('max_mails')), bigintval(REQUEST_POST('refid')), $hash, - GET_REMOTE_ADDR(), + detectRemoteAddr(), ), __FILE__, __LINE__); // Get his userid @@ -257,19 +265,20 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF // Did this work? if ($userid == 0) { // Something bad happened! - LOAD_TEMPLATE("admin_settings_saved", false, getMessage('USER_NOT_REGISTERED')); + LOAD_TEMPLATE('admin_settings_saved', false, getMessage('USER_NOT_REGISTERED')); return; } // END - if // Is the refback extension there? - if (EXT_IS_ACTIVE("refback")) { + // @TODO Rewrite this to a filter + if (EXT_IS_ACTIVE('refback')) { // Update refback table - UPDATE_REFBACK_TABLE($userid); + updateRefbackTable($userid); } // END - if // Write his welcome-points - $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_points` WHERE userid=%s AND ref_depth=0 LIMIT 1", - array(bigintval($userid)), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_user_points` WHERE userid=%s AND ref_depth=0 LIMIT 1", + array(bigintval($userid)), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 0) { // Add only when the line was not found (maybe some more secure?) $locked = "points"; @@ -278,16 +287,16 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF array(bigintval($userid), getConfig('points_register')), __FILE__, __LINE__); // Update mediadata as well - if ((GET_EXT_VERSION("mediadata") >= "0.0.4") && ($locked == "points")) { + if ((GET_EXT_VERSION('mediadata') >= '0.0.4') && ($locked == "points")) { // Update database - MEDIA_UPDATE_ENTRY(array("total_points"), "add", getConfig('points_register')); + MEDIA_UPDATE_ENTRY(array('total_points'), 'add', getConfig('points_register')); } // END - if } // END - if // Write catgories if ((is_array(REQUEST_POST('cat'))) && (count(REQUEST_POST('cat')))) { foreach (REQUEST_POST('cat') as $cat => $joined) { - if ($joined == "Y") { + if ($joined == 'Y') { // Insert category entry SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_cats` (userid, cat_id) VALUES (%s, %s)", array(bigintval($userid), bigintval($cat)), __FILE__, __LINE__); @@ -296,13 +305,13 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF } // END - if // Rewrite gender - $gender = TRANSLATE_GENDER(REQUEST_POST('gender')); + $gender = translateGender(REQUEST_POST('gender')); // ... rewrite a zero referal ID to the main title - if (REQUEST_POST('refid') == "0") REQUEST_SET_POST('refid', constant('MAIN_TITLE')); + if (REQUEST_POST('refid') == '0') REQUEST_SET_POST('refid', constant('MAIN_TITLE')); // Is ZIP code set? - if (REQUEST_ISSET_POST(('zip'))) { + if (REQUEST_ISSET_POST('zip')) { // Prepare data array for the email template // Start with the gender... $DATA = array( @@ -338,102 +347,102 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF } // Continue with birthday... - switch (GET_LANGUAGE()) + switch (getLanguage()) { - case "de": - $DATA['birthday'] = bigintval(REQUEST_POST('day')).".".bigintval(REQUEST_POST('month')).".".bigintval(REQUEST_POST('year')); + case 'de': + $DATA['birthday'] = bigintval(REQUEST_POST('day')).'.'.bigintval(REQUEST_POST('month')).'.'.bigintval(REQUEST_POST('year')); break; default: - $DATA['birthday'] = bigintval(REQUEST_POST('month'))."/".bigintval(REQUEST_POST('day'))."/".bigintval(REQUEST_POST('year')); + $DATA['birthday'] = bigintval(REQUEST_POST('month')).'/'.bigintval(REQUEST_POST('day')).'/'.bigintval(REQUEST_POST('year')); break; } // Display information to the user that he got mail and send it away - $msg_guest = LOAD_EMAIL_TEMPLATE("register-member", $DATA, $userid); + $msg_guest = LOAD_EMAIL_TEMPLATE('register-member', $DATA, $userid); // Send mail to user (confirmation link!) $EMAIL = $DATA['email']; - SEND_EMAIL ($DATA['email'], getMessage('GUEST_CONFIRM_LINK'), $msg_guest); + sendEmail ($DATA['email'], getMessage('GUEST_CONFIRM_LINK'), $msg_guest); $DATA['email'] = $EMAIL; // Send mail to admin - SEND_ADMIN_NOTIFICATION(getMessage('ADMIN_NEW_ACCOUNT'), "register-admin", $DATA, $userid); + sendAdminNotification(getMessage('ADMIN_NEW_ACCOUNT'), 'register-admin', $DATA, $userid); // Output success registration - LOAD_TEMPLATE("admin_settings_saved", false, getMessage('REGISTRATION_DONE')); + LOAD_TEMPLATE('admin_settings_saved', false, getMessage('REGISTRATION_DONE')); } else { - if (REQUEST_POST('agree') == "!") { - OUTPUT_HTML("
{--HAVE_TO_AGREE--}
"); + if (REQUEST_POST('agree') == '!') { + registerOutputFailedMessage('HAVE_TO_AGREE'); } // END - if - if (REQUEST_POST('addy') == "!") { - OUTPUT_HTML("
{--ENTER_EMAIL--}
"); - REQUEST_SET_POST('addy', ""); - } elseif (REQUEST_POST('addy') == "?") { - OUTPUT_HTML("
{--EMAIL_ALREADY_DB--}
"); - REQUEST_SET_POST('addy', ""); + if (REQUEST_POST('addy') == '!') { + registerOutputFailedMessage('ENTER_EMAIL'); + REQUEST_SET_POST('addy', ''); + } elseif (REQUEST_POST('addy') == '?') { + registerOutputFailedMessage('EMAIL_ALREADY_DB'); + REQUEST_SET_POST('addy', ''); } - if (REQUEST_POST('surname') == "!") { - OUTPUT_HTML("
{--ENTER_SURNAME--}
"); - REQUEST_SET_POST('surname', ""); + if (REQUEST_POST('surname') == '!') { + registerOutputFailedMessage('ENTER_SURNAME'); + REQUEST_SET_POST('surname', ''); } // END - if - if (REQUEST_POST('family') == "!") { - OUTPUT_HTML("
{--ENTER_FAMILY--}
"); - REQUEST_SET_POST('family', ""); + if (REQUEST_POST('family') == '!') { + registerOutputFailedMessage('ENTER_FAMILY'); + REQUEST_SET_POST('family', ''); } // END - if - if ((REQUEST_POST('pass1') == "!") && (REQUEST_POST('pass2') == "!")) { - OUTPUT_HTML("
{--ENTER_BOTH_PASSWORDS--}
"); - } elseif (REQUEST_POST('pass1') == "!") { - OUTPUT_HTML("
{--ENTER_PASS1--}
"); - } elseif (REQUEST_POST('pass2') == "!") { - OUTPUT_HTML("
{--ENTER_PASS2--}
"); + if ((REQUEST_POST('pass1') == '!') && (REQUEST_POST('pass2') == '!')) { + registerOutputFailedMessage('ENTER_BOTH_PASSWORDS'); + } elseif (REQUEST_POST('pass1') == '!') { + registerOutputFailedMessage('ENTER_PASS1'); + } elseif (REQUEST_POST('pass2') == '!') { + registerOutputFailedMessage('ENTER_PASS2'); } if ($SHORT_PASS === true) { - OUTPUT_HTML("
{--SHORT_PASS--}: ".getConfig('pass_len')."
"); + registerOutputFailedMessage('SHORT_PASS', ": ".getConfig('pass_len')); } // END - if if ($IP_TIMEOUT === true) { - OUTPUT_HTML("
{--REMOTE_ADDR_TIMEOUT--}
"); + registerOutputFailedMessage('REMOTE_ADDR_TIMEOUT'); } // END - if if ((!empty($cats)) && ($cats < getConfig('least_cats'))) { - OUTPUT_HTML("
{--CATS_LEAST--}: ".getConfig('least_cats')."
"); + registerOutputFailedMessage(sprintf(getMessage('CATS_LEAST'), getConfig('least_cats'))); } // END - if // Generate birthday selection - switch (GET_LANGUAGE()) + switch (getLanguage()) { - case "de": // German date format - define('BIRTHDAY_SELECTION', ADD_SELECTION("day", REQUEST_POST('day')).ADD_SELECTION("month", REQUEST_POST('month')).ADD_SELECTION("year", REQUEST_POST('year'))); + case 'de': // German date format + define('BIRTHDAY_SELECTION', ADD_SELECTION('day', REQUEST_POST('day')).ADD_SELECTION('month', REQUEST_POST('month')).ADD_SELECTION('year', REQUEST_POST('year'))); break; default: // Default is the US date format... :) - define('BIRTHDAY_SELECTION', ADD_SELECTION("month", REQUEST_POST('month')).ADD_SELECTION("day", REQUEST_POST('day')).ADD_SELECTION("year", REQUEST_POST('year'))); + define('BIRTHDAY_SELECTION', ADD_SELECTION('month', REQUEST_POST('month')).ADD_SELECTION('day', REQUEST_POST('day')).ADD_SELECTION('year', REQUEST_POST('year'))); break; } // Adds a table for the guests with all visible categories - define('CATEGORY_SELECTION', REGISTER_ADD_CATEGORY_TABLE("guest", true)); + define('CATEGORY_SELECTION', registerGenerateCategoryTable('guest', true)); // Adds maximum receiveable mails list... :) - define('MAX_RECEIVE_LIST', ADD_MAX_RECEIVE_LIST("guest", "", true)); + define('MAX_RECEIVE_LIST', addMaxReceiveList('guest', '', true)); // Shall I display the refid or shall I make it editable? - if (getConfig('display_refid') == "Y") { + if (getConfig('display_refid') == 'Y') { // Load "hide" form template - define('REFID_CONTENT', LOAD_TEMPLATE("guest_register_refid_hide", true, $GLOBALS['refid'])); + define('REFID_CONTENT', LOAD_TEMPLATE('guest_register_refid_hide', true, $GLOBALS['refid'])); } else { // Load template to enter it - define('REFID_CONTENT', LOAD_TEMPLATE("guest_register_refid", true, $GLOBALS['refid'])); + define('REFID_CONTENT', LOAD_TEMPLATE('guest_register_refid', true, $GLOBALS['refid'])); } // You may want to modify the register_header.tpl.xx file and not this script when you add your scripts etc. :-) - define('REGISTER_HEADER_CONTENT', LOAD_TEMPLATE("register_header", true)); + define('REGISTER_HEADER_CONTENT', LOAD_TEMPLATE('register_header', true)); // Please select at least x categories define('LEAST_CATS_VALUE', getConfig('least_cats')); @@ -443,21 +452,21 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF define('__FAMILY', SQL_ESCAPE(REQUEST_POST('family'))); define('__STREET', SQL_ESCAPE(REQUEST_POST('street_nr'))); define('__COUNTRY', SQL_ESCAPE(REQUEST_POST('cntry'))); - if (REQUEST_ISSET_POST(('zip'))) { + if (REQUEST_ISSET_POST('zip')) { define('__ZIP', bigintval(REQUEST_POST('zip'))); } else { - define('__ZIP', ""); + define('__ZIP', ''); } define('__CITY', SQL_ESCAPE(REQUEST_POST('city'))); define('__ADDY', SQL_ESCAPE(REQUEST_POST('addy'))); // Shall I add a counrty selection box or the old input box? - if (EXT_IS_ACTIVE("country")) { + if (EXT_IS_ACTIVE('country')) { // New variant, good! $OUT = ""; define('__COUNTRY_CONTENT', $OUT); } else { @@ -466,10 +475,10 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF } // Set MUST_??? constants - if ((EXT_IS_ACTIVE("register")) && (GET_EXT_VERSION("register") > "0.0")) REGISTER_FILL_MUST_CONSTANTS(); + if ((EXT_IS_ACTIVE('register')) && (GET_EXT_VERSION('register') > '0.0')) registerMustFillout(); // Display registration form - LOAD_TEMPLATE("guest_register"); + LOAD_TEMPLATE('guest_register'); } //