X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-register.php;h=144b1e1833271e49c992af614daca1a62d0cb340;hp=979b7813a7a9e5bb796ca09c237a4fc85c5be219;hb=d3c4fdd9bfab35389e1a5ff48f3952d527c7b4bb;hpb=5deec33be1baf2135eefc2bbb0d1b63c6cbd2f9a
diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 979b7813a7..144b1e1833 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -10,9 +10,14 @@
* -------------------------------------------------------------------- *
* 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 *
+ * 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 *
@@ -33,222 +38,228 @@
// Some security stuff...
if (!defined('__SECURITY')) {
- $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");
- return;
-}
+ die();
+} // END - if
// Add description as navigation point
-ADD_DESCR("guest", __FILE__);
+addMenuDescription('guest', __FILE__);
-global $DATA;
+if (!isExtensionActive('register')) {
+ loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('register'));
+ return;
+} elseif (!isExtensionActive('country')) {
+ loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('country'));
+ return;
+}
// Initialize variables
-$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(('country_code'))) REQUEST_SET_POST('country_code', "1");
+$isOkay = true;
+$shortPass = false;
+$cats = 0;
+$ipTimedOut = false;
// Default refid is zero
-REQUEST_SET_POST('refid', 0);
-if ($GLOBALS['refid'] > 0) {
+setRequestPostElement('refid', 0);
+if (determineReferalId() > 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__);
+ $result = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
+ array(determineReferalId()), __FILE__, __LINE__);
// Userid found?
- //* DEBUG: */ die("refid={$GLOBALS['refid']}/numRows=".SQL_NUMROWS($result)."");
+ //* DEBUG: */ die("refid={determineReferalId()}/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'));
+ setRequestPostElement('refid', getConfig('def_refid'));
+ setSession('refid', getConfig('def_refid'));
} else {
// Use the refid here
- REQUEST_SET_POST('refid', $GLOBALS['refid']);
+ setRequestPostElement('refid', determineReferalId());
}
} // END - if
-if (IS_FORM_SENT()) {
+if (isFormSent()) {
// 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', "!");
- $FAILED = true;
+ if (postRequestElement('agree') != 'Y') {
+ setRequestPostElement('agree', '!');
+ $isOkay = false;
} // 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', "!");
- $FAILED = true;
+ if ((!isPostRequestElementSet('email')) || (!isEmailValid(postRequestElement('email')))) {
+ setRequestPostElement('email', '!');
+ $isOkay = false;
} // END - if
// And what about surname and family's name?
- if (!REQUEST_ISSET_POST(('surname'))) {
- REQUEST_SET_POST('surname', "!");
- $FAILED = true;
+ if (!isPostRequestElementSet('surname')) {
+ setRequestPostElement('surname', '!');
+ $isOkay = false;
} // END - if
- if (!REQUEST_ISSET_POST(('family'))) {
- REQUEST_SET_POST('family', "!");
- $FAILED = true;
+ if (!isPostRequestElementSet('family')) {
+ setRequestPostElement('family', '!');
+ $isOkay = false;
} // END - if
+ // Get temporary array for modification
+ $postArray = postRequestArray();
+
// Check for required fields
- if (!$FAILED) $FAILED = REGISTER_CHECK_REQUIRED_FIELDS(REQUEST_POST_ARRAY());
+ if ($isOkay === true) $isOkay = ifRequiredRegisterFieldsAreSet($postArray);
+
+ // Set it back in request
+ setPostRequestArray($postArray);
// 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', "!");
+ if (((!isPostRequestElementSet('pass1')) || (!isPostRequestElementSet('pass2'))) || ((postRequestElement('pass1') != postRequestElement('pass2')) && (isPostRequestElementSet('pass1')) && (isPostRequestElementSet('pass2')))) {
+ if ((postRequestElement('pass1') != postRequestElement('pass2')) && (isPostRequestElementSet('pass1')) && (isPostRequestElementSet('pass2'))) {
+ setRequestPostElement('pass1', '!');
+ setRequestPostElement('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 (!isPostRequestElementSet('pass1')) { setRequestPostElement('pass1', '!'); } else { setRequestPostElement('pass1', ''); }
+ if (!isPostRequestElementSet('pass2')) { setRequestPostElement('pass2', '!'); } else { setRequestPostElement('pass2', ''); }
}
- $FAILED = true;
+ $isOkay = false;
} // END - if
// Is the password long enouth?
- if ((strlen(REQUEST_POST('pass1')) < getConfig('pass_len')) && (!$FAILED)) {
- $SHORT_PASS = true;
- $FAILED = true;
+ if ((strlen(postRequestElement('pass1')) < getConfig('pass_len')) && ($isOkay === true)) {
+ $shortPass = true;
+ $isOkay = false;
} // END - if
// No admin? Admins can always register!
- if (!IS_ADMIN()) {
+ if (!isAdmin()) {
// Do this check only when no admin is logged in
- foreach (REQUEST_POST('cat') as $id => $answer) {
- if ($answer == "Y") $cats++;
+ foreach (postRequestElement('cat') as $id => $answer) {
+ if ($answer == 'Y') $cats++;
} // END - foreach
if ($cats < getConfig('least_cats')) {
// ... nope!
- $FAILED = true;
+ $isOkay = false;
} // END - if
} // END - if
- if ((REQUEST_POST('addy') != "!") && (getConfig('check_double_email') == "Y")) {
+ if ((postRequestElement('email') != '!') && (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(postRequestElement('email'));
+ if ($CHK === true) {
+ setRequestPostElement('email', '?');
+ $isOkay = false;
+ } // 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__);
+ $result = SQL_QUERY_ESC("SELECT
+ `userid`
+FROM
+ `{?_MYSQL_PREFIX?}_user_data`
+WHERE
+ `REMOTE_ADDR`='%s' AND
+ (`joined` > (UNIX_TIMESTAMP() - {?ip_timeout?}) OR `last_update` > (UNIX_TIMESTAMP() - {?ip_timeout?}))
+LIMIT 1",
+ array(detectRemoteAddr()), __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;
+ $ipTimedOut = true;
+ $isOkay = false;
} // END - if
- } // END - if
- // Free memory
- SQL_FREERESULT($result);
-}
+ // Free memory
+ SQL_FREERESULT($result);
+ } // END - if
+} // END - if
-if ((IS_FORM_SENT()) && ((!$FAILED) || (IS_ADMIN()))) {
+// Is the form sent and all went fine or admin logged in?
+//* DEBUG: */ print intval(isFormSent()).'/'.intval($isOkay).'/'.intval(isAdmin()).'
';
+if ((isFormSent()) && (($isOkay === true) || (isAdmin()))) {
// 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(postRequestElement('day')) == 1) setRequestPostElement('day' , 0 . postRequestElement('day'));
+ if (strlen(postRequestElement('month')) == 1) setRequestPostElement('month', 0 . postRequestElement('month'));
// Get total ...
// ... confirmed, ...
- $confirmedUsers = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true);
+ $confirmedUsers = countSumTotalData('CONFIRMED' , 'user_data', 'userid', 'status', true);
// ... unconfirmed ...
- $unconfirmedUsers = GET_TOTAL_DATA("UNCONFIRMED", "user_data", "userid", "status", true);
+ $unconfirmedUsers = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true);
// ... and locked users!
- $lockedUsers = GET_TOTAL_DATA("LOCKED", "user_data", "userid", "status", true);
+ $lockedUsers = countSumTotalData('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.getConfig('ENCRYPT_SEPERATOR').$unconfirmedUsers.getConfig('ENCRYPT_SEPERATOR').$lockedUsers.getConfig('ENCRYPT_SEPERATOR').postRequestElement('month') . '-'.postRequestElement('day') . '-'.postRequestElement('year').getConfig('ENCRYPT_SEPERATOR').getenv('SERVER_NAME').getConfig('ENCRYPT_SEPERATOR').detectRemoteAddr().getConfig('ENCRYPT_SEPERATOR').detectUserAgent() . '/' . getConfig('SITE_KEY') . '/' . getConfig('DATE_KEY') . '/'. getConfig('CACHE_BUSTER')));
// 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 (isExtensionInstalledAndNewer('theme', '0.0.8')) {
// 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 (isExtensionInstalledAndNewer('beg', '0.1.7')) {
// Okay, shall I disable now?
- if (getConfig('beg_new_mem_notify') != "Y") {
- $ADD1 .= ", beg_ral_notify, beg_ral_en_notify";
- $ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()";
+ 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 (isExtensionInstalledAndNewer('bonus', '0.7.7')) {
// Okay, shall I disable now?
- if (getConfig('bonus_new_mem_notify') != "Y") {
- $ADD1 .= ", bonus_ral_notify, bonus_ral_en_notify";
- $ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()";
+ 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 (isExtensionActive('country')) {
// Save with new selectable country code
- $countryRow = "country_code";
- $countryData = bigintval(REQUEST_POST('country_code'));
+ $countryRow = '`country_code`';
+ $countryData = bigintval(postRequestElement('country_code'));
} else {
// Old way with enterable two-char-code
- $countryRow = "country";
- $countryData = substr(REQUEST_POST('cntry'), 0, 2);
+ $countryRow = '`country`';
+ $countryData = substr(postRequestElement('cntry'), 0, 2);
}
//////////////////////////////
// Create user's account... //
//////////////////////////////
//
- 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(REQUEST_POST('gender'), 0, 1),
- REQUEST_POST('surname'),
- REQUEST_POST('family'),
- REQUEST_POST('street_nr'),
+ substr(postRequestElement('gender'), 0, 1),
+ postRequestElement('surname'),
+ postRequestElement('family'),
+ postRequestElement('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')),
+ bigintval(postRequestElement('zip')),
+ postRequestElement('city'),
+ postRequestElement('email'),
+ bigintval(postRequestElement('day')),
+ bigintval(postRequestElement('month')),
+ bigintval(postRequestElement('year')),
+ generateHash(postRequestElement('pass1')),
+ bigintval(postRequestElement('max_mails')),
+ bigintval(postRequestElement('max_mails')),
+ bigintval(postRequestElement('refid')),
$hash,
- GET_REMOTE_ADDR(),
+ detectRemoteAddr(),
), __FILE__, __LINE__);
// Get his userid
@@ -257,220 +268,209 @@ 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'));
+ loadTemplate('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 (isExtensionActive('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";
- 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__);
+ $locked = 'points';
+
+ // Pay him later. First he has to confirm some mails!
+ if (getConfig('ref_payout') > 0) $locked = 'locked_points';
+
+ // @TODO Rewrite this to addPointsDirectly()
+ SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`, `ref_depth`, `".$locked."`) VALUES (%s,0,'{?points_register?}')",
+ array(bigintval($userid)), __FILE__, __LINE__);
// Update mediadata as well
- if ((GET_EXT_VERSION("mediadata") >= "0.0.4") && ($locked == "points")) {
+ if ((isExtensionInstalledAndNewer('mediadata', '0.0.4')) && ($locked == 'points')) {
// Update database
- MEDIA_UPDATE_ENTRY(array("total_points"), "add", getConfig('points_register'));
+ updateMediadataEntry(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 ((is_array(postRequestElement('cat'))) && (count(postRequestElement('cat')))) {
+ foreach (postRequestElement('cat') as $cat => $joined) {
+ 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__);
+ 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'));
+ $gender = translateGender(postRequestElement('gender'));
- // ... rewrite a zero referal ID to the main title
- if (REQUEST_POST('refid') == "0") REQUEST_SET_POST('refid', constant('MAIN_TITLE'));
+ // ... rewrite a zero referal id to the main title
+ if (postRequestElement('refid') == 0) setRequestPostElement('refid', getConfig('MAIN_TITLE'));
// Is ZIP code set?
- if (REQUEST_ISSET_POST(('zip'))) {
+ if (isPostRequestElementSet('zip')) {
// Prepare data array for the email template
// Start with the gender...
- $DATA = array(
+ $content = array(
'hash' => $hash,
- 'uid' => $userid,
+ 'userid' => $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')),
+ 'surname' => SQL_ESCAPE(postRequestElement('surname')),
+ 'family' => SQL_ESCAPE(postRequestElement('family')),
+ 'email' => SQL_ESCAPE(postRequestElement('email')),
+ 'street' => SQL_ESCAPE(postRequestElement('street_nr')),
+ 'city' => SQL_ESCAPE(postRequestElement('city')),
+ 'zip' => bigintval(postRequestElement('zip')),
'country' => $countryData,
- 'refid' => SQL_ESCAPE(REQUEST_POST('refid')),
- 'pass' => SQL_ESCAPE(REQUEST_POST('pass1')),
+ 'refid' => SQL_ESCAPE(postRequestElement('refid')),
+ 'pass' => SQL_ESCAPE(postRequestElement('pass1')),
);
} else {
// No ZIP code entered
- $DATA = array(
+ $content = array(
'hash' => $hash,
- 'uid' => $userid,
+ 'userid' => $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' => "",
+ 'surname' => SQL_ESCAPE(postRequestElement('surname')),
+ 'family' => SQL_ESCAPE(postRequestElement('family')),
+ 'email' => SQL_ESCAPE(postRequestElement('email')),
+ 'street' => SQL_ESCAPE(postRequestElement('street_nr')),
+ 'city' => SQL_ESCAPE(postRequestElement('city')),
+ 'zip' => '',
'country' => $countryData,
- 'refid' => SQL_ESCAPE(REQUEST_POST('refid')),
- 'pass' => SQL_ESCAPE(REQUEST_POST('pass1')),
+ 'refid' => SQL_ESCAPE(postRequestElement('refid')),
+ 'pass' => SQL_ESCAPE(postRequestElement('pass1')),
);
}
// Continue with birthday...
- switch (GET_LANGUAGE())
- {
- 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'));
- break;
- }
+ switch (getLanguage()) {
+ case 'de':
+ $content['birthday'] = bigintval(postRequestElement('day')) . '.' . bigintval(postRequestElement('month')) . '.' . bigintval(postRequestElement('year'));
+ break;
+
+ default:
+ $content['birthday'] = bigintval(postRequestElement('month')) . '/' . bigintval(postRequestElement('day')) . '/' . bigintval(postRequestElement('year'));
+ break;
+ } // END - switch
// Display information to the user that he got mail and send it away
- $msg_guest = LOAD_EMAIL_TEMPLATE("register-member", $DATA, $userid);
+ $messageGuest = loadEmailTemplate('register-member', $content, $userid);
// Send mail to user (confirmation link!)
- $EMAIL = $DATA['email'];
- SEND_EMAIL ($DATA['email'], getMessage('GUEST_CONFIRM_LINK'), $msg_guest);
- $DATA['email'] = $EMAIL;
+ $email = $content['email'];
+ sendEmail($content['email'], getMessage('GUEST_SUBJECT_CONFIRM_LINK'), $messageGuest);
+ $content['email'] = $email;
// Send mail to admin
- SEND_ADMIN_NOTIFICATION(getMessage('ADMIN_NEW_ACCOUNT'), "register-admin", $DATA, $userid);
+ sendAdminNotification(getMessage('ADMIN_SUBJECT_NEW_ACCOUNT'), 'register-admin', $content, $userid);
// Output success registration
- LOAD_TEMPLATE("admin_settings_saved", false, getMessage('REGISTRATION_DONE'));
+ loadTemplate('admin_settings_saved', false, getMessage('REGISTRATION_DONE'));
} else {
- if (REQUEST_POST('agree') == "!") {
- OUTPUT_HTML("{--HAVE_TO_AGREE--}
");
+ if (postRequestElement('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 (postRequestElement('email') == '!') {
+ registerOutputFailedMessage('ENTER_EMAIL');
+ setRequestPostElement('email', '');
+ } elseif (postRequestElement('email') == '?') {
+ registerOutputFailedMessage('EMAIL_ALREADY_DB');
+ setRequestPostElement('email', '');
}
- if (REQUEST_POST('surname') == "!") {
- OUTPUT_HTML("{--ENTER_SURNAME--}
");
- REQUEST_SET_POST('surname', "");
+ if (postRequestElement('surname') == '!') {
+ registerOutputFailedMessage('ENTER_SURNAME');
+ setRequestPostElement('surname', '');
} // END - if
- if (REQUEST_POST('family') == "!") {
- OUTPUT_HTML("{--ENTER_FAMILY--}
");
- REQUEST_SET_POST('family', "");
+ if (postRequestElement('family') == '!') {
+ registerOutputFailedMessage('ENTER_FAMILY');
+ setRequestPostElement('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 ((postRequestElement('pass1') == '!') && (postRequestElement('pass2') == '!')) {
+ registerOutputFailedMessage('ENTER_BOTH_PASSWORDS');
+ } elseif (postRequestElement('pass1') == '!') {
+ registerOutputFailedMessage('ENTER_PASS1');
+ } elseif (postRequestElement('pass2') == '!') {
+ registerOutputFailedMessage('ENTER_PASS2');
}
- if ($SHORT_PASS === true) {
- OUTPUT_HTML("{--SHORT_PASS--}: ".getConfig('pass_len')."
");
+ if ($shortPass === true) {
+ registerOutputFailedMessage('SHORT_PASS', ": ".getConfig('pass_len'));
} // END - if
- if ($IP_TIMEOUT === true) {
- OUTPUT_HTML("{--REMOTE_ADDR_TIMEOUT--}
");
+ if ($ipTimedOut === true) {
+ 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())
- {
- 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')));
- break;
+ switch (getLanguage()) {
+ case 'de': // German date format
+ $content['birthday_selection'] = addSelectionBox('day', postRequestElement('day')).addSelectionBox('month', postRequestElement('month')).addSelectionBox('year', postRequestElement('year'));
+ break;
+
+ default: // Default is the US date format... :)
+ $content['birthday_selection'] = addSelectionBox('month', postRequestElement('month')).addSelectionBox('day', postRequestElement('day')).addSelectionBox('year', postRequestElement('year'));
+ break;
}
// Adds a table for the guests with all visible categories
- define('CATEGORY_SELECTION', REGISTER_ADD_CATEGORY_TABLE("guest", true));
+ $content['category_selection'] = registerGenerateCategoryTable('guest', true);
// Adds maximum receiveable mails list... :)
- define('MAX_RECEIVE_LIST', ADD_MAX_RECEIVE_LIST("guest", "", true));
+ $content['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']));
+ $content['refid_content'] = loadTemplate('guest_register_refid_hide', true, determineReferalId());
} else {
// Load template to enter it
- define('REFID_CONTENT', LOAD_TEMPLATE("guest_register_refid", true, $GLOBALS['refid']));
+ $content['refid_content'] = loadTemplate('guest_register_refid', true, determineReferalId());
}
// 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));
-
- // Please select at least x categories
- define('LEAST_CATS_VALUE', getConfig('least_cats'));
+ $content['header_content'] = loadTemplate('register_header', true);
// Other values
- 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(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 = "";
- define('__COUNTRY_CONTENT', $OUT);
- } else {
- // Old out-dated variant
- define('__COUNTRY_CONTENT', "");
- }
-
- // Set MUST_??? constants
- if ((EXT_IS_ACTIVE("register")) && (GET_EXT_VERSION("register") > "0.0")) REGISTER_FILL_MUST_CONSTANTS();
+ $content['surname'] = SQL_ESCAPE(postRequestElement('surname'));
+ $content['family'] = SQL_ESCAPE(postRequestElement('family'));
+ $content['street_nr'] = SQL_ESCAPE(postRequestElement('street_nr'));
+ $content['zip'] = bigintval(postRequestElement('zip'));
+ $content['city'] = SQL_ESCAPE(postRequestElement('city'));
+ $content['email'] = SQL_ESCAPE(postRequestElement('email'));
+
+ // Prepare country selection box
+ $OUT = "";
+ $content['country'] = $OUT;
+
+ // Set must-fillout fields
+ $content = runFilterChain('register_must_fillout', $content);
// Display registration form
- LOAD_TEMPLATE("guest_register");
+ loadTemplate('guest_register', false, $content);
}
-//
+// [EOF]
?>