t_a/cavepaintingsFork
1
Fork 0
forked from Cavemanon/cavepaintings
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move user stuff into the user class

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/trunk@1004 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish
2008-08-23 12:49:47 +00:00
parent 434fab2dc5
commit aee1af4e0e
5 changed files with 15 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/danbooru_api/main.php
View File

@@ -374,6 +374,7 @@ class DanbooruApi implements Extension
// or makes them anonymous. Does not set any cookies or anything permanent.
private function authenticate_user()
{
global $config;
global $database;
global $user;
@@ -384,12 +385,12 @@ class DanbooruApi implements Extension
$name = $_REQUEST['login'];
$pass = $_REQUEST['password'];
$hash = md5( strtolower($name) . $pass );
$duser = $database->get_user_by_name_and_hash($name, $hash);
$duser = User::by_name_and_hash($config, $database, $name, $hash);
if(!is_null($duser)) {
$user = $duser;
} else
{
$user = $database->get_user_by_id($config->get_int("anon_id", 0));
$user = User::by_id($config, $database, $config->get_int("anon_id", 0));
}
}
}