X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-register.php;h=422fbf778726b68e83569b4d65fc56a59f78bb9e;hb=deb4293fa309b70be72d66b394e7253c8ea7d351;hp=0d6e3f65e9532771aa6cd75090435f92efd9625c;hpb=43ef1d67a04c351e4432515b53c04fd70f8dc760;p=mailer.git
diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 0d6e3f65e9..422fbf7787 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -36,18 +36,14 @@ 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()) {
- addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "register"));
- } else {
- addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "register");
- }
+ addFatalMessage(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;
@@ -72,7 +68,7 @@ if (empty($_POST['country_code'])) $_POST['country_code'] = "1";
$_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?
@@ -156,7 +152,7 @@ if (isset($_POST['ok'])) {
// 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",
+ $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! ;-)
@@ -195,11 +191,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 (getConfig('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 +205,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 (getConfig('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
@@ -229,7 +226,7 @@ if ((isset($_POST['ok'])) && ((!$FAILED) || (IS_ADMIN()))) {
// 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,
@@ -258,7 +255,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,13 +266,13 @@ 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 (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')",
+ 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
@@ -290,7 +287,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
foreach ($_POST['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)",
+ 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
@@ -300,7 +297,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
$gender = TRANSLATE_GENDER($_POST['gender']);
// ... rewrite a zero referal ID to the main title
- if ($_POST['refid'] == "0") $_POST['refid'] = MAIN_TITLE;
+ if ($_POST['refid'] == "0") $_POST['refid'] = constant('MAIN_TITLE');
// Is ZIP code set?
if (!empty($_POST['zip'])) {
@@ -355,55 +352,55 @@ 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."
");
+ OUTPUT_HTML("{--HAVE_TO_AGREE--}
");
} // END - if
if ($_POST['addy'] == "!") {
- OUTPUT_HTML("".ENTER_EMAIL."
");
+ OUTPUT_HTML("{--ENTER_EMAIL--}
");
$_POST['addy'] = "";
} elseif ($_POST['addy'] == "?") {
- OUTPUT_HTML("".EMAIL_ALREADY_DB."
");
+ OUTPUT_HTML("{--EMAIL_ALREADY_DB--}
");
$_POST['addy'] = "";
}
if ($_POST['surname'] == "!") {
- OUTPUT_HTML("".ENTER_SURNAME."
");
+ OUTPUT_HTML("{--ENTER_SURNAME--}
");
$_POST['surname'] = "";
} // END - if
if ($_POST['family_name'] == "!") {
- OUTPUT_HTML("".ENTER_FAMILY."
");
+ OUTPUT_HTML("{--ENTER_FAMILY--}
");
$_POST['family_name'] = "";
} // END - if
if (($_POST['pass1'] == "!") && ($_POST['pass2'] == "!")) {
- OUTPUT_HTML("".ENTER_BOTH_PASSWORDS."
");
+ OUTPUT_HTML("{--ENTER_BOTH_PASSWORDS--}
");
} elseif ($_POST['pass1'] == "!") {
- OUTPUT_HTML("".ENTER_PASS1."
");
+ OUTPUT_HTML("{--ENTER_PASS1--}
");
} elseif ($_POST['pass2'] == "!") {
- OUTPUT_HTML("".ENTER_PASS2."
");
+ OUTPUT_HTML("{--ENTER_PASS2--}
");
}
- if ($SHORT_PASS) {
- OUTPUT_HTML("".SHORT_PASS.": ".getConfig('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 < getConfig('least_cats'))) {
- OUTPUT_HTML("".CATS_LEAST.": ".getConfig('least_cats')."
");
+ OUTPUT_HTML("{--CATS_LEAST--}: ".getConfig('least_cats')."
");
} // END - if
// Generate birthday selection
@@ -463,7 +460,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
define('__COUNTRY_CONTENT', $OUT);
} else {
// Old out-dated variant
- define('__COUNTRY_CONTENT', "");
+ define('__COUNTRY_CONTENT', "");
}
// Set MUST_??? constants