X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-register.php;h=08bc75286c7bea7fb1735b74d705f09136f3f679;hp=e240aaaf07680cfa1f5019d7b0fdbdae148b3213;hb=e01fcf1ca8ddeb72af76465df3ef72301a1cdae7;hpb=6c763653e88b9d10627e651ca59c7201d4b7d62b diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php index e240aaaf07..08bc75286c 100644 --- a/inc/modules/guest/what-register.php +++ b/inc/modules/guest/what-register.php @@ -10,7 +10,12 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Anmeldeformular * * -------------------------------------------------------------------- * - * * + * $Revision:: 856 $ * + * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009) $ * + * $Tag:: 0.2.1-FINAL $ * + * $Author:: stelzi $ * + * 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 * @@ -36,100 +41,98 @@ if (!defined('__SECURITY')) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } elseif ((!EXT_IS_ACTIVE("register"))) { - if (IS_ADMIN()) { - ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "register")); - } else { - ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "register"); - } + addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "register"); return; } // Add description as navigation point ADD_DESCR("guest", __FILE__); -global $_CONFIG, $DATA; +global $DATA; // Initialize variables $FAILED = false; $SHORT_PASS = false; $cats = 0; $IP_TIMEOUT = false; -if (!isset($_POST['ok'])) unset($_POST['ok']); -if (empty($_POST['agree'])) $_POST['agree'] = ""; -if (empty($_POST['addy'])) $_POST['addy'] = ""; -if (empty($_POST['surname'])) $_POST['surname'] = ""; -if (empty($_POST['family_name'])) $_POST['family_name'] = ""; -if (empty($_POST['pass1'])) $_POST['pass1'] = ""; -if (empty($_POST['pass2'])) $_POST['pass2'] = ""; -if (empty($_POST['day'])) $_POST['day'] = ""; -if (empty($_POST['month'])) $_POST['month'] = ""; -if (empty($_POST['year'])) $_POST['year'] = ""; -if (empty($_POST['max_mails'])) $_POST['max_mails'] = ""; -if (empty($_POST['street_nr'])) $_POST['street_nr'] = ""; -if (empty($_POST['zip'])) $_POST['zip'] = ""; -if (empty($_POST['city'])) $_POST['city'] = ""; -if (empty($_POST['cntry'])) $_POST['cntry'] = ""; -if (empty($_POST['country_code'])) $_POST['country_code'] = "1"; + +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(('country_code'))) REQUEST_SET_POST('country_code', "1"); // Default refid is zero -$_POST['refid'] = 0; +REQUEST_SET_POST('refid', 0); if ($GLOBALS['refid'] > 0) { // Test if the refid is valid - $result = SQL_QUERY_ESC("SELECT userid FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1", + $result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__); // Userid found? //* DEBUG: */ die("refid={$GLOBALS['refid']}/numRows=".SQL_NUMROWS($result).""); if (SQL_NUMROWS($result) == 0) { // Not found so we set your refid! - $_POST['refid'] = $_CONFIG['def_refid']; - set_session('refid', $_CONFIG['def_refid']); + REQUEST_SET_POST('refid', getConfig('def_refid')); + set_session('refid', getConfig('def_refid')); } else { // Use the refid here - $_POST['refid'] = $GLOBALS['refid']; + REQUEST_SET_POST('refid', $GLOBALS['refid']); } } // END - if -if (isset($_POST['ok'])) { +if (IS_FORM_SENT()) { // First we only check the submitted data then we continue... :) // // Did he agree to our Terms Of Usage? - if ($_POST['agree'] != "Y") { - $_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 ((empty($_POST['addy'])) || (!VALIDATE_EMAIL($_POST['addy']))) { - $_POST['addy'] = "!"; + if ((!REQUEST_ISSET_POST(('addy'))) || (!VALIDATE_EMAIL(REQUEST_POST('addy')))) { + REQUEST_SET_POST('addy', "!"); $FAILED = true; } // END - if // And what about surname and family's name? - if (empty($_POST['surname'])) { - $_POST['surname'] = "!"; + if (!REQUEST_ISSET_POST(('surname'))) { + REQUEST_SET_POST('surname', "!"); $FAILED = true; } // END - if - if (empty($_POST['family_name'])) { - $_POST['family_name'] = "!"; + if (!REQUEST_ISSET_POST(('family'))) { + REQUEST_SET_POST('family', "!"); $FAILED = true; } // END - if // Check for required fields - if (!$FAILED) $FAILED = REGISTER_CHECK_REQUIRED_FIELDS($_POST); + if (!$FAILED) $FAILED = REGISTER_CHECK_REQUIRED_FIELDS(REQUEST_POST_ARRAY()); // Did he enter his password twice? - if (((empty($_POST['pass1'])) || (empty($_POST['pass2']))) || (($_POST['pass1'] != $_POST['pass2']) && (!empty($_POST['pass1'])) && (!empty($_POST['pass2'])))) { - if (($_POST['pass1'] != $_POST['pass2']) && (!empty($_POST['pass1'])) && (!empty($_POST['pass2']))) { - $_POST['pass1'] = "!"; - $_POST['pass2'] = "!"; + 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', "!"); } else { - if (empty($_POST['pass1'])) { $_POST['pass1'] = "!"; } else { $_POST['pass1'] = ""; } - if (empty($_POST['pass2'])) { $_POST['pass2'] = "!"; } else { $_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 // Is the password long enouth? - if ((strlen($_POST['pass1']) < $_CONFIG['pass_len']) && (!$FAILED)) { + if ((strlen(REQUEST_POST('pass1')) < getConfig('pass_len')) && (!$FAILED)) { $SHORT_PASS = true; $FAILED = true; } // END - if @@ -137,27 +140,27 @@ if (isset($_POST['ok'])) { // No admin? Admins can always register! if (!IS_ADMIN()) { // Do this check only when no admin is logged in - foreach ($_POST['cat'] as $id => $answer) { + foreach (REQUEST_POST('cat') as $id => $answer) { if ($answer == "Y") $cats++; } // END - foreach - if ($cats < $_CONFIG['least_cats']) { + if ($cats < getConfig('least_cats')) { // ... nope! $FAILED = true; } // END - if } // END - if - if (($_POST['addy'] != "!") && ($_CONFIG['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($_POST['addy']); - if ($CHK) { $_POST['addy'] = "?"; $FAILED = true; } + $CHK = SEARCH_EMAIL_USERTAB(REQUEST_POST('addy')); + if ($CHK) { REQUEST_SET_POST('addy', "?"); $FAILED = true; } } // END - if // Check for IP timeout? - if ($_CONFIG['ip_timeout'] > 0) { + 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(), $_CONFIG['ip_timeout'], $_CONFIG['ip_timeout']), __FILE__, __LINE__); + $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__); 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,10 +173,10 @@ if (isset($_POST['ok'])) { SQL_FREERESULT($result); } -if ((isset($_POST['ok'])) && ((!$FAILED) || (IS_ADMIN()))) { +if ((IS_FORM_SENT()) && ((!$FAILED) || (IS_ADMIN()))) { // Prepapre month and day of birth - if (strlen($_POST['day']) == 1) $_POST['day'] = "0".$_POST['day']; - if (strlen($_POST['month']) == 1) $_POST['month'] = "0".$_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, ... @@ -184,7 +187,7 @@ if ((isset($_POST['ok'])) && ((!$FAILED) || (IS_ADMIN()))) { $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.":".$_POST['month']."-".$_POST['day']."-".$_POST['year'].":".getenv('SERVER_NAME').":".GET_REMOTE_ADDR().":".GET_USER_AGENT()."/".SITE_KEY."/".DATE_KEY."/".RAND_NUMBER)); + $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'))); // Add design when extension sql_patches is v0.2.7 or greater $ADD1 = ""; $ADD2 = ""; @@ -195,11 +198,12 @@ if ((isset($_POST['ok'])) && ((!$FAILED) || (IS_ADMIN()))) { } // 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") { // Okay, shall I disable now? - if ($_CONFIG['beg_new_mem_notify'] == "N") { + if (getConfig('beg_new_mem_notify') != "Y") { $ADD1 .= ", beg_ral_notify, beg_ral_en_notify"; $ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()"; } // END - if @@ -208,7 +212,7 @@ if ((isset($_POST['ok'])) && ((!$FAILED) || (IS_ADMIN()))) { // Second: active rallye if (GET_EXT_VERSION("bonus") >= "0.7.7") { // Okay, shall I disable now? - if ($_CONFIG['bonus_new_mem_notify'] == "N") { + if (getConfig('bonus_new_mem_notify') != "Y") { $ADD1 .= ", bonus_ral_notify, bonus_ral_en_notify"; $ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()"; } // END - if @@ -218,36 +222,36 @@ if ((isset($_POST['ok'])) && ((!$FAILED) || (IS_ADMIN()))) { if (EXT_IS_ACTIVE("country")) { // Save with new selectable country code $countryRow = "country_code"; - $countryData = bigintval($_POST['country_code']); + $countryData = bigintval(REQUEST_POST('country_code')); } else { // Old way with enterable two-char-code $countryRow = "country"; - $countryData = substr($_POST['cntry'], 0, 2); + $countryData = substr(REQUEST_POST('cntry'), 0, 2); } ////////////////////////////// // Create user's account... // ////////////////////////////// // - $result = SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_user_data` (gender, surname, family, street_nr,%s, zip, city, email, birth_day, birth_month, birth_year, password, max_mails, receive_mails, refid, status, user_hash, REMOTE_ADDR, joined, last_update".$ADD1.") + SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_data` (gender, surname, family, street_nr,%s, zip, city, email, birth_day, birth_month, birth_year, password, max_mails, receive_mails, refid, status, user_hash, REMOTE_ADDR, joined, last_update".$ADD1.") VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$ADD2.")", array( $countryRow, - substr($_POST['gender'], 0, 1), - $_POST['surname'], - $_POST['family_name'], - $_POST['street_nr'], + substr(REQUEST_POST('gender'), 0, 1), + REQUEST_POST('surname'), + REQUEST_POST('family'), + REQUEST_POST('street_nr'), $countryData, - bigintval($_POST['zip']), - $_POST['city'], - $_POST['addy'], - bigintval($_POST['day']), - bigintval($_POST['month']), - bigintval($_POST['year']), - generateHash($_POST['pass1']), - bigintval($_POST['max_mails']), - bigintval($_POST['max_mails']), - bigintval($_POST['refid']), + bigintval(REQUEST_POST('zip')), + REQUEST_POST('city'), + REQUEST_POST('addy'), + bigintval(REQUEST_POST('day')), + bigintval(REQUEST_POST('month')), + bigintval(REQUEST_POST('year')), + generateHash(REQUEST_POST('pass1')), + bigintval(REQUEST_POST('max_mails')), + bigintval(REQUEST_POST('max_mails')), + bigintval(REQUEST_POST('refid')), $hash, GET_REMOTE_ADDR(), ), __FILE__, __LINE__); @@ -258,7 +262,7 @@ 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, USER_NOT_REGISTERED); + LOAD_TEMPLATE("admin_settings_saved", false, getMessage('USER_NOT_REGISTERED')); return; } // END - if @@ -269,56 +273,56 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF } // 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", + $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"; - if ($_CONFIG['ref_payout'] > 0) $locked = "locked_points"; // Pay him later. First he has to confirm some mails! - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_points (userid, ref_depth, ".$locked.") VALUES (%s,0,'%s')", - array(bigintval($userid), $_CONFIG['points_register']), __FILE__, __LINE__); + if (getConfig('ref_payout') > 0) $locked = "locked_points"; // Pay him later. First he has to confirm some mails! + SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_points` (userid, ref_depth, ".$locked.") VALUES (%s,0,'%s')", + array(bigintval($userid), getConfig('points_register')), __FILE__, __LINE__); // Update mediadata as well if ((GET_EXT_VERSION("mediadata") >= "0.0.4") && ($locked == "points")) { // Update database - MEDIA_UPDATE_ENTRY(array("total_points"), "add", $_CONFIG['points_register']); + MEDIA_UPDATE_ENTRY(array("total_points"), "add", getConfig('points_register')); } // END - if } // END - if // Write catgories - if ((is_array($_POST['cat'])) && (count($_POST['cat']))) { - foreach ($_POST['cat'] as $cat => $joined) { + if ((is_array(REQUEST_POST('cat'))) && (count(REQUEST_POST('cat')))) { + foreach (REQUEST_POST('cat') as $cat => $joined) { if ($joined == "Y") { // Insert category entry - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_cats (userid, cat_id) VALUES (%s, %s)", + SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_cats` (userid, cat_id) VALUES (%s, %s)", array(bigintval($userid), bigintval($cat)), __FILE__, __LINE__); } // END - if } // END - foreach } // END - if // Rewrite gender - $gender = TRANSLATE_GENDER($_POST['gender']); + $gender = TRANSLATE_GENDER(REQUEST_POST('gender')); // ... rewrite a zero referal ID to the main title - if ($_POST['refid'] == "0") $_POST['refid'] = MAIN_TITLE; + if (REQUEST_POST('refid') == "0") REQUEST_SET_POST('refid', constant('MAIN_TITLE')); // Is ZIP code set? - if (!empty($_POST['zip'])) { + if (REQUEST_ISSET_POST(('zip'))) { // Prepare data array for the email template // Start with the gender... $DATA = array( 'hash' => $hash, 'uid' => $userid, 'gender' => $gender, - 'surname' => SQL_ESCAPE($_POST['surname']), - 'family' => SQL_ESCAPE($_POST['family_name']), - 'email' => SQL_ESCAPE($_POST['addy']), - 'street' => SQL_ESCAPE($_POST['street_nr']), - 'city' => SQL_ESCAPE($_POST['city']), - 'zip' => bigintval($_POST['zip']), + 'surname' => SQL_ESCAPE(REQUEST_POST('surname')), + 'family' => SQL_ESCAPE(REQUEST_POST('family')), + 'email' => SQL_ESCAPE(REQUEST_POST('addy')), + 'street' => SQL_ESCAPE(REQUEST_POST('street_nr')), + 'city' => SQL_ESCAPE(REQUEST_POST('city')), + 'zip' => bigintval(REQUEST_POST('zip')), 'country' => $countryData, - 'refid' => SQL_ESCAPE($_POST['refid']), - 'pass' => SQL_ESCAPE($_POST['pass1']), + 'refid' => SQL_ESCAPE(REQUEST_POST('refid')), + 'pass' => SQL_ESCAPE(REQUEST_POST('pass1')), ); } else { // No ZIP code entered @@ -326,15 +330,15 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF 'hash' => $hash, 'uid' => $userid, 'gender' => $gender, - 'surname' => SQL_ESCAPE($_POST['surname']), - 'family' => SQL_ESCAPE($_POST['family_name']), - 'email' => SQL_ESCAPE($_POST['addy']), - 'street' => SQL_ESCAPE($_POST['street_nr']), - 'city' => SQL_ESCAPE($_POST['city']), + 'surname' => SQL_ESCAPE(REQUEST_POST('surname')), + 'family' => SQL_ESCAPE(REQUEST_POST('family')), + 'email' => SQL_ESCAPE(REQUEST_POST('addy')), + 'street' => SQL_ESCAPE(REQUEST_POST('street_nr')), + 'city' => SQL_ESCAPE(REQUEST_POST('city')), 'zip' => "", 'country' => $countryData, - 'refid' => SQL_ESCAPE($_POST['refid']), - 'pass' => SQL_ESCAPE($_POST['pass1']), + 'refid' => SQL_ESCAPE(REQUEST_POST('refid')), + 'pass' => SQL_ESCAPE(REQUEST_POST('pass1')), ); } @@ -342,11 +346,11 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF switch (GET_LANGUAGE()) { case "de": - $DATA['birthday'] = bigintval($_POST['day']).".".bigintval($_POST['month']).".".bigintval($_POST['year']); + $DATA['birthday'] = bigintval(REQUEST_POST('day')).".".bigintval(REQUEST_POST('month')).".".bigintval(REQUEST_POST('year')); break; default: - $DATA['birthday'] = bigintval($_POST['month'])."/".bigintval($_POST['day'])."/".bigintval($_POST['year']); + $DATA['birthday'] = bigintval(REQUEST_POST('month'))."/".bigintval(REQUEST_POST('day'))."/".bigintval(REQUEST_POST('year')); break; } @@ -355,66 +359,66 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF // Send mail to user (confirmation link!) $EMAIL = $DATA['email']; - SEND_EMAIL ($DATA['email'], GUEST_CONFIRM_LINK, $msg_guest); + SEND_EMAIL ($DATA['email'], getMessage('GUEST_CONFIRM_LINK'), $msg_guest); $DATA['email'] = $EMAIL; // Send mail to admin - SEND_ADMIN_NOTIFICATION(ADMIN_NEW_ACCOUNT, "register-admin", $DATA, $userid); + SEND_ADMIN_NOTIFICATION(getMessage('ADMIN_NEW_ACCOUNT'), "register-admin", $DATA, $userid); // Output success registration - LOAD_TEMPLATE("admin_settings_saved", false, REGISTRATION_DONE); + LOAD_TEMPLATE("admin_settings_saved", false, getMessage('REGISTRATION_DONE')); } else { - if ($_POST['agree'] == "!") { - OUTPUT_HTML("".HAVE_TO_AGREE."

"); + if (REQUEST_POST('agree') == "!") { + OUTPUT_HTML("
{--HAVE_TO_AGREE--}
"); } // END - if - if ($_POST['addy'] == "!") { - OUTPUT_HTML("".ENTER_EMAIL."

"); - $_POST['addy'] = ""; - } elseif ($_POST['addy'] == "?") { - OUTPUT_HTML("".EMAIL_ALREADY_DB."

"); - $_POST['addy'] = ""; + 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 ($_POST['surname'] == "!") { - OUTPUT_HTML("".ENTER_SURNAME."

"); - $_POST['surname'] = ""; + if (REQUEST_POST('surname') == "!") { + OUTPUT_HTML("
{--ENTER_SURNAME--}
"); + REQUEST_SET_POST('surname', ""); } // END - if - if ($_POST['family_name'] == "!") { - OUTPUT_HTML("".ENTER_FAMILY."

"); - $_POST['family_name'] = ""; + if (REQUEST_POST('family') == "!") { + OUTPUT_HTML("
{--ENTER_FAMILY--}
"); + REQUEST_SET_POST('family', ""); } // END - if - if (($_POST['pass1'] == "!") && ($_POST['pass2'] == "!")) { - OUTPUT_HTML("".ENTER_BOTH_PASSWORDS."

"); - } elseif ($_POST['pass1'] == "!") { - OUTPUT_HTML("".ENTER_PASS1."

"); - } elseif ($_POST['pass2'] == "!") { - OUTPUT_HTML("".ENTER_PASS2."

"); + 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 ($SHORT_PASS) { - OUTPUT_HTML("".SHORT_PASS.": ".$_CONFIG['pass_len']."

"); + if ($SHORT_PASS === true) { + OUTPUT_HTML("
{--SHORT_PASS--}: ".getConfig('pass_len')."
"); } // END - if - if ($IP_TIMEOUT) { - OUTPUT_HTML("".REMOTE_ADDR_TIMEOUT."

"); + if ($IP_TIMEOUT === true) { + OUTPUT_HTML("
{--REMOTE_ADDR_TIMEOUT--}
"); } // END - if - if ((!empty($cats)) && ($cats < $_CONFIG['least_cats'])) { - OUTPUT_HTML("".CATS_LEAST.": ".$_CONFIG['least_cats']."

"); + if ((!empty($cats)) && ($cats < getConfig('least_cats'))) { + OUTPUT_HTML("
".sprintf(getMessage('CATS_LEAST'), getConfig('least_cats'))."
"); } // END - if // Generate birthday selection switch (GET_LANGUAGE()) { case "de": // German date format - define('BIRTHDAY_SELECTION', ADD_SELECTION("day", $_POST['day']).ADD_SELECTION("month", $_POST['month']).ADD_SELECTION("year", $_POST['year'])); + 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", $_POST['month']).ADD_SELECTION("day", $_POST['day']).ADD_SELECTION("year", $_POST['year'])); + define('BIRTHDAY_SELECTION', ADD_SELECTION("month", REQUEST_POST('month')).ADD_SELECTION("day", REQUEST_POST('day')).ADD_SELECTION("year", REQUEST_POST('year'))); break; } @@ -425,7 +429,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF define('MAX_RECEIVE_LIST', ADD_MAX_RECEIVE_LIST("guest", "", true)); // Shall I display the refid or shall I make it editable? - if ($_CONFIG['display_refid'] == "Y") { + if (getConfig('display_refid') == "Y") { // Load "hide" form template define('REFID_CONTENT', LOAD_TEMPLATE("guest_register_refid_hide", true, $GLOBALS['refid'])); } else { @@ -437,33 +441,33 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF define('REGISTER_HEADER_CONTENT', LOAD_TEMPLATE("register_header", true)); // Please select at least x categories - define('LEAST_CATS_VALUE', $_CONFIG['least_cats']); + define('LEAST_CATS_VALUE', getConfig('least_cats')); // Other values - define('__SURNAME', SQL_ESCAPE($_POST['surname'])); - define('__FAMILY', SQL_ESCAPE($_POST['family_name'])); - define('__STREET', SQL_ESCAPE($_POST['street_nr'])); - define('__COUNTRY', SQL_ESCAPE($_POST['cntry'])); - if (!empty($_POST['zip'])) { - define('__ZIP', bigintval($_POST['zip'])); + define('__SURNAME', SQL_ESCAPE(REQUEST_POST('surname'))); + 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'))) { + define('__ZIP', bigintval(REQUEST_POST('zip'))); } else { define('__ZIP', ""); } - define('__CITY', SQL_ESCAPE($_POST['city'])); - define('__ADDY', SQL_ESCAPE($_POST['addy'])); + 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")) { // New variant, good! - $OUT = "\n"; $whereStatement = "WHERE is_active='Y'"; if (IS_ADMIN()) $whereStatement = ""; - $OUT .= ADD_OPTION_LINES("countries", "id", "descr", $_POST['country_code'], "code", $whereStatement); - $OUT .= ""; + $OUT .= ADD_OPTION_LINES("countries", "id", "descr", REQUEST_POST('country_code'), "code", $whereStatement); + $OUT .= ""; define('__COUNTRY_CONTENT', $OUT); } else { // Old out-dated variant - define('__COUNTRY_CONTENT', ""); + define('__COUNTRY_CONTENT', ""); } // Set MUST_??? constants