X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-register.php;h=e20fb8e30f4df91c971c10adef8efc378c84852b;hb=508228c85fba8448d00865b1639cb8cd7a69e457;hp=9b5d88cd0450f0523cd4f9628d789b9cd9692a9c;hpb=80e2def8ef2125fd4d7d1312ee3993ab613f0846;p=mailer.git
diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 9b5d88cd04..e20fb8e30f 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Anmeldeformular *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: 856 $ *
+ * $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 *
@@ -32,296 +37,320 @@
************************************************************************/
// Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+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", basename(__FILE__));
+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 (isset($_POST['ok']))
-{
+
+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
+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",
+ 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!
+ REQUEST_SET_POST('refid', getConfig('def_refid'));
+ set_session('refid', getConfig('def_refid'));
+ } else {
+ // Use the refid here
+ REQUEST_SET_POST('refid', $GLOBALS['refid']);
+ }
+} // END - if
+
+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;
- }
- if (empty($_POST['family_name']))
- {
- $_POST['family_name'] = "!";
+ } // END - if
+ 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'] = "!";
- }
- 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_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 (!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) && (!IS_ADMIN()))
- {
+ if ((strlen(REQUEST_POST('pass1')) < getConfig('pass_len')) && (!$FAILED)) {
$SHORT_PASS = true;
$FAILED = true;
- }
- // Did he select enougth categories?
- if (!IS_ADMIN())
- {
+ } // END - if
+
+ // 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++;
- }
- if ($cats < $_CONFIG['least_cats'])
- {
+ } // END - foreach
+
+ if ($cats < getConfig('least_cats')) {
// ... nope!
$FAILED = true;
- }
- }
- if (($_POST['addy'] != "!") && ($_CONFIG['check_double_email'] == "Y") && (!IS_ADMIN()))
- {
- // Does the email address already exists in our database?
- $CHK = SEARCH_EMAIL_USERTAB($_POST['addy']);
- if ($CHK) { $_POST['addy'] = "?"; $FAILED = true; }
- }
+ } // END - if
+ } // END - if
- // Check his IP number
- $to = bigintval(time() - $_CONFIG['ip_timeout']);
- $result = SQL_QUERY_ESC("SELECT joined, last_update FROM "._MYSQL_PREFIX."_user_data WHERE REMOTE_ADDR='%s' AND (joined > %s OR last_update > %s) LIMIT 1",
- array(getenv('REMOTE_ADDR'), $to, $to), __FILE__, __LINE__);
- if ((SQL_NUMROWS($result) == 1) && (!IS_ADMIN()))
- {
- // Same IP in timeout range and different email address entered... Eat this, faker! ;-)
- // But admins are allowed to fake their own exchange service.
- $IP_TIMEOUT = true;
- $FAILED = true;
- }
-
- // Test the refid (because some strange hackers... :-P)
- $result = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
- array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
- if (SQL_NUMROWS($result) == 0)
- {
- // Not found so we set your refid!
- $_POST['refid'] = $_CONFIG['def_refid'];
- set_session("refid", $_CONFIG['def_refid']);
- }
+ 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; }
+ } // 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__);
+ 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.
+ $IP_TIMEOUT = true;
+ $FAILED = true;
+ } // END - if
+ } // END - if
// Free memory
SQL_FREERESULT($result);
}
-if ((isset($_POST['ok'])) && (!$FAILED))
-{
- // Save the registration
- if (strlen($_POST['day']) == 1) $_POST['day'] = "0".$_POST['day'];
- if (strlen($_POST['month']) == 1) $_POST['month'] = "0".$_POST['month'];
+if ((IS_FORM_SENT()) && ((!$FAILED) || (IS_ADMIN()))) {
+ // Prepapre month and day of birth
+ 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);
+ // ... unconfirmed ...
+ $unconfirmedUsers = GET_TOTAL_DATA("UNCONFIRMED", "user_data", "userid", "status", true);
+ // ... and locked users!
+ $lockedUsers = GET_TOTAL_DATA("LOCKED", "user_data", "userid", "status", true);
- // Hash = MM-DD-YYYY:IP:USER_AGENT:TIMEMARK
- $hash = generateHash($_POST['month']."-".$_POST['day']."-".$_POST['year'].":".getenv('SERVER_NAME').":".getenv('REMOTE_ADDR').":".getenv('HTTP_USER_AGENT').":".time());
+ // 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')));
// Add design when extension sql_patches is v0.2.7 or greater
$ADD1 = ""; $ADD2 = "";
- if (GET_EXT_VERSION("sql_patches") >= "0.2.7")
- {
+ if (GET_EXT_VERSION("sql_patches") >= "0.2.7") {
// Okay, add design here
$ADD1 = ", curr_theme";
$ADD2 = ", '".GET_CURR_THEME()."'";
- }
+ } // 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 ($_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
+ } // 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 ($_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
+ } // 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";
- $countryData = bigintval($_POST['country_code']);
- }
- else
- {
+ $countryData = bigintval(REQUEST_POST('country_code'));
+ } else {
// Old way with enterable two-char-code
$countryRow = "country";
- $countryData = addslashes(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 (sex, 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,
- SQL_ESCAPE(substr($_POST['sex'], 0, 1)),
- SQL_ESCAPE($_POST['surname']),
- SQL_ESCAPE($_POST['family_name']),
- SQL_ESCAPE($_POST['street_nr']),
- $countryData,
- bigintval($_POST['zip']),
- SQL_ESCAPE($_POST['city']),
- SQL_ESCAPE($_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']),
- $hash,
- getenv('REMOTE_ADDR'),
-), __FILE__, __LINE__);
+ 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(REQUEST_POST('gender'), 0, 1),
+ REQUEST_POST('surname'),
+ REQUEST_POST('family'),
+ REQUEST_POST('street_nr'),
+ $countryData,
+ 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__);
// Get his userid
- $result = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE user_hash='%s' LIMIT 1",
- array($hash), __FILE__, __LINE__);
- list($userid) = SQL_FETCHROW($result);
+ $userid = SQL_INSERTID();
+
+ // Did this work?
+ if ($userid == 0) {
+ // Something bad happened!
+ LOAD_TEMPLATE("admin_settings_saved", false, getMessage('USER_NOT_REGISTERED'));
+ return;
+ } // END - if
- // Secure userid (we have a little paranoia ;-) )
- $userid = bigintval($userid);
+ // Is the refback extension there?
+ if (EXT_IS_ACTIVE("refback")) {
+ // Update refback table
+ UPDATE_REFBACK_TABLE($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",
+ $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)
- {
+ 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(REQUEST_POST('gender'));
+
+ // ... rewrite a zero referal ID to the main title
+ if (REQUEST_POST('refid') == "0") REQUEST_SET_POST('refid', constant('MAIN_TITLE'));
+
+ // Is ZIP code set?
+ 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(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(REQUEST_POST('refid')),
+ 'pass' => SQL_ESCAPE(REQUEST_POST('pass1')),
+ );
+ } else {
+ // No ZIP code entered
+ $DATA = array(
+ 'hash' => $hash,
+ 'uid' => $userid,
+ 'gender' => $gender,
+ '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(REQUEST_POST('refid')),
+ 'pass' => SQL_ESCAPE(REQUEST_POST('pass1')),
+ );
}
- // Rewrite sex
- $sex = TRANSLATE_SEX($_POST['sex']);
-
- // ... rewrite a zero referral ID to the main title
- if ($_POST['refid'] == "0") $_POST['refid'] = MAIN_TITLE;
-
- // Prepare data array for the email template
- // Start with the salutation...
- $DATA = array(
- 'hash' => $hash,
- 'uid' => $userid,
- 'salut' => $sex,
- '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']),
- 'country' => $countryData,
- 'refid' => SQL_ESCAPE($_POST['refid']),
- 'pass' => SQL_ESCAPE($_POST['pass1']),
- );
-
// Continue with birthday...
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;
}
@@ -330,74 +359,66 @@ array(
// 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);
-}
- else
-{
- if ($_POST['agree'] == "!")
- {
- OUTPUT_HTML("".HAVE_TO_AGREE."
");
- }
- if ($_POST['addy'] == "!")
- {
- OUTPUT_HTML("".ENTER_EMAIL."
");
- $_POST['addy'] = "";
- }
- elseif ($_POST['addy'] == "?")
- {
- OUTPUT_HTML("".EMAIL_ALREADY_DB."
");
- $_POST['addy'] = "";
- }
- if ($_POST['surname'] == "!")
- {
- OUTPUT_HTML("".ENTER_SURNAME."
");
- $_POST['surname'] = "";
- }
- if ($_POST['family_name'] == "!")
- {
- OUTPUT_HTML("".ENTER_FAMILY."
");
- $_POST['family_name'] = "";
- }
- 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 ($SHORT_PASS)
- {
- OUTPUT_HTML("".SHORT_PASS.": ".$_CONFIG['pass_len']."
");
- }
- if ($IP_TIMEOUT)
- {
- OUTPUT_HTML("".REMOTE_ADDR_TIMEOUT."
");
- }
- if ((!empty($cats)) && ($cats < $_CONFIG['least_cats']))
- {
- OUTPUT_HTML("".CATS_LEAST.": ".$_CONFIG['least_cats']."
");
- }
+ LOAD_TEMPLATE("admin_settings_saved", false, getMessage('REGISTRATION_DONE'));
+} else {
+ if (REQUEST_POST('agree') == "!") {
+ OUTPUT_HTML("