james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove ambiguous database->get_user(...)

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/trunk@263 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2007-07-12 07:37:32 +00:00
parent 3e0d983102
commit c6b7c9bb83
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/database.class.php
View File

@ -306,15 +306,6 @@ class Database {
// users {{{ // users {{{
var $SELECT_USER = "SELECT *,(unix_timestamp(now()) - unix_timestamp(joindate))/(60*60*24) AS days_old FROM users "; var $SELECT_USER = "SELECT *,(unix_timestamp(now()) - unix_timestamp(joindate))/(60*60*24) AS days_old FROM users ";
public function get_user($a=false, $b=false) {
if($b == false) {
return $this->get_user_by_id($a);
}
else {
return $this->get_user_by_name_and_hash($a, $b);
}
}
public function get_user_session($name, $session) { public function get_user_session($name, $session) {
$row = $this->db->GetRow("{$this->SELECT_USER} WHERE name LIKE ? AND md5(concat(pass, ?)) = ?", $row = $this->db->GetRow("{$this->SELECT_USER} WHERE name LIKE ? AND md5(concat(pass, ?)) = ?",
array($name, $_SERVER['REMOTE_ADDR'], $session)); array($name, $_SERVER['REMOTE_ADDR'], $session));

2
core/image.class.php
View File

@ -70,7 +70,7 @@ class Image {
public function get_owner() { public function get_owner() {
global $database; global $database;
return $database->get_user($this->owner_id); return $database->get_user_by_id($this->owner_id);
} }
public function get_tag_array() { public function get_tag_array() {

2
core/util.inc.php
View File

@ -389,7 +389,7 @@ function _get_user() {
} }
if(is_null($user)) { if(is_null($user)) {
$user = $database->get_user($config->get_int("anon_id", 0)); $user = $database->get_user_by_id($config->get_int("anon_id", 0));
} }
assert(!is_null($user)); assert(!is_null($user));
return $user; return $user;

2
ext/user/main.php
View File

@ -97,7 +97,7 @@ class UserPage extends Extension {
$addr = $_SERVER['REMOTE_ADDR']; $addr = $_SERVER['REMOTE_ADDR'];
$hash = md5( strtolower($name) . $pass ); $hash = md5( strtolower($name) . $pass );
$duser = $database->get_user($name, $hash); $duser = $database->get_user_by_name_and_hash($name, $hash);
if(!is_null($duser)) { if(!is_null($duser)) {
$user = $duser; $user = $duser;