X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fchk_login.php;h=3dc66760420cf8085ae033e5a7c3c0ac4aa192bb;hb=0dd42320430efb55daf522aec91d312b6d2fbc80;hp=88f9d5281a1d808e79fc07786b712a236e439123;hpb=f9a9c09e1ae257449bfd98f8854e321efba1dc3c;p=mailer.git
diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index 88f9d5281a..3dc6676042 100644
--- a/inc/modules/chk_login.php
+++ b/inc/modules/chk_login.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Pruefen ob die Login-Cookies gesetzt sind *
* -------------------------------------------------------------------- *
- * *
+ * $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 *
@@ -37,22 +42,21 @@ if (!defined('__SECURITY')) {
require($INC);
}
-// @TODO Replace with own template!
-OPEN_TABLE("500", "guest_login_header dashed", "center");
-OUTPUT_HTML("
".VALIDATING_LOGIN."
");
+// Initial message part
+$message = "{--VALIDATING_LOGIN--}";
-if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash')) && (isSessionVariableSet('lifetime'))) {
- // Login failtures are supported since 0.4.7
+if (isUserIdSet() && (isSessionVariableSet('u_hash'))) {
+ // Login failures are supported since 0.4.7
// Do we have 0.4.7 of sql_patches or later?
- $ADD = "";
- if (GET_EXT_VERSION("sql_patches") >= "0.4.7") {
+ $add = "";
+ if (GET_EXT_VERSION("sql_patches") >= "0.6.1") {
// Load them here
- $ADD = ", login_failtures, UNIX_TIMESTAMP(last_failture) AS last_failture";
+ $add = ", login_failures, UNIX_TIMESTAMP(last_failure) AS last_failure";
} // END - if
// Get theme from profile
- $result = SQL_QUERY_ESC("SELECT curr_theme".$ADD." FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
- array($GLOBALS['userid']), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT curr_theme".$add." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+ array(getUserId()), __FILE__, __LINE__);
// Load data
$data = SQL_FETCHARRAY($result);
@@ -61,59 +65,57 @@ if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash')) && (isSession
SQL_FREERESULT($result);
// Change to new theme
- set_session("mxchange_theme", $data['curr_theme']);
+ set_session('mxchange_theme', $data['curr_theme']);
- // Remmeber login failtures if available
- if (GET_EXT_VERSION("sql_patches") >= "0.4.7") {
- // Reset login failtures
- SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
-SET login_failtures=0, last_failture='0000-00-00 00:00:00'
+ // Remmeber login failures if available
+ if (GET_EXT_VERSION("sql_patches") >= "0.6.1") {
+ // Reset login failures
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
+SET login_failures=0, last_failure='0000-00-00 00:00:00'
WHERE userid=%s
LIMIT 1",
- array($GLOBALS['userid']), __FILE__, __LINE__);
+ array(getUserId()), __FILE__, __LINE__);
// Store it in session
- set_session('mxchange_member_failtures', $data['login_failtures']);
- set_session('mxchange_member_last_fail', $data['last_failture']);
+ set_session('mxchange_member_failures', $data['login_failures']);
+ set_session('mxchange_member_last_fail', $data['last_failure']);
} // END - if
// Bonus is not given by default ;-)
$bonus = false;
if ((GET_EXT_VERSION("sql_patches") >= "0.2.8") && (GET_EXT_VERSION("bonus") >= "0.2.1") && (getConfig('bonus_login_yn') == "Y")) {
// Update last login if far enougth away
- $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
SET last_login=UNIX_TIMESTAMP()
WHERE userid=%s AND last_login < (UNIX_TIMESTAMP() - %s)
LIMIT 1",
array(
- $GLOBALS['userid'],
+ getUserId(),
getConfig('login_timeout')
), __FILE__, __LINE__
);
if (SQL_AFFECTEDROWS() == 1) $bonus = true;
} // END - if
- if (($bonus) && ($_GET['mode'] == "bonus") && (EXT_IS_ACTIVE("bonus"))) {
+ if (($bonus) && (REQUEST_GET('mode') == "bonus") && (EXT_IS_ACTIVE("bonus"))) {
// Output message with added points
- OUTPUT_HTML("
- ".BONUS_LOGIN_BONUS_ADDED_1."
- ".TRANSLATE_COMMA(getConfig('login_bonus'))." ".POINTS."
- ".BONUS_LOGIN_BONUS_ADDED_2."
-");
+ $message .= "