diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/locale.inc | 2 | ||||
| -rw-r--r-- | includes/user.inc | 23 |
2 files changed, 14 insertions, 11 deletions
diff --git a/includes/locale.inc b/includes/locale.inc index ab0a49eb5..3e35bfd70 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -2,7 +2,7 @@ function t($string) { $result = db_query("SELECT id FROM locales WHERE english = '". addslashes($string) ."'"); - if (!db_fetch_object($result)) db_query("INSERT INTO locales (english) VALUES ('". addslashes($string) ."')"); + if (!db_fetch_object($result)) db_query("INSERT INTO locales (english, location) VALUES ('". addslashes($string) ."', '". check_input(getenv("REQUEST_URI")) ."')"); return $string; } diff --git a/includes/user.inc b/includes/user.inc index bdc62c3ce..9c4f38f66 100644 --- a/includes/user.inc +++ b/includes/user.inc @@ -1,17 +1,20 @@ <? class User { - function User($userid, $passwd) { - $result = db_query("SELECT * FROM users WHERE LOWER(userid) = LOWER('$userid') && passwd = PASSWORD('$passwd') && STATUS = 2"); - if (db_num_rows($result) == 1) { - foreach (db_fetch_row($result) as $key=>$value) { $field = mysql_field_name($result, $key); $this->$field = stripslashes($value); $this->field[] = $field; } - db_query("UPDATE users SET last_access = '". time() ."', last_host = '$GLOBALS[REMOTE_HOST]' WHERE id = $this->id"); + function User($userid, $passwd = 0) { + if ($passwd) { + $result = db_query("SELECT * FROM users WHERE LOWER(userid) = LOWER('$userid') && passwd = PASSWORD('$passwd') && STATUS = 2"); + if (db_num_rows($result) == 1) { + foreach (db_fetch_row($result) as $key=>$value) { $field = mysql_field_name($result, $key); $this->$field = stripslashes($value); $this->field[] = $field; } + db_query("UPDATE users SET last_access = '". time() ."', last_host = '$GLOBALS[REMOTE_HOST]' WHERE id = $this->id"); + } } - } - function User($userid) { - $result = db_query("SELECT * FROM users WHERE userid = '$userid' && STATUS = 2"); - if (db_num_rows($result) == 1) { - foreach (db_fetch_row($result) as $key=>$value) { $field = mysql_field_name($result, $key); $this->$field = stripslashes($value); $this->field[] = $field; } + else { + $result = db_query("SELECT * FROM users WHERE userid = '$userid' && STATUS = 2"); + if (db_num_rows($result) == 1) { + foreach (db_fetch_row($result) as $key=>$value) { $field = mysql_field_name($result, $key); $this->$field = stripslashes($value); $this->field[] = $field; } + db_query("UPDATE users SET last_access = '". time() ."', last_host = '$GLOBALS[REMOTE_HOST]' WHERE id = $this->id"); + } } } } |