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

this wasn't meant to be ported here yet <_<

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/trunk@1049 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2008-09-18 02:48:12 +00:00
parent bacd459b62
commit 73c88716a8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/user.class.php
View File

@ -36,7 +36,7 @@ class User {
public static function by_session(Config $config, Database $database, $name, $session) {
$row = $database->get_row(
"SELECT * FROM user WHERE name = ? AND md5(concat(pass, ?)) = ?",
"SELECT * FROM users WHERE name = ? AND md5(concat(pass, ?)) = ?",
array($name, get_session_ip($config), $session)
);
return is_null($row) ? null : new User($config, $database, $row);
@ -44,13 +44,13 @@ class User {
public static function by_id(Config $config, Database $database, $id) {
assert(is_numeric($id));
$row = $database->get_row("SELECT * FROM user WHERE id = ?", array($id));
$row = $database->get_row("SELECT * FROM users WHERE id = ?", array($id));
return is_null($row) ? null : new User($config, $database, $row);
}
public static function by_name(Config $config, Database $database, $name) {
assert(is_string($name));
$row = $database->get_row("SELECT * FROM user WHERE name = ?", array($name));
$row = $database->get_row("SELECT * FROM users WHERE name = ?", array($name));
return is_null($row) ? null : new User($config, $database, $row);
}
@ -58,7 +58,7 @@ class User {
assert(is_string($name));
assert(is_string($hash));
assert(strlen($hash) == 32);
$row = $database->get_row("SELECT * FROM user WHERE name = ? AND pass = ?", array($name, $hash));
$row = $database->get_row("SELECT * FROM users WHERE name = ? AND pass = ?", array($name, $hash));
return is_null($row) ? null : new User($config, $database, $row);
}

4
ext/view/main.php
View File

@ -5,7 +5,7 @@ class ImageInfoBoxBuildingEvent extends Event {
var $image;
var $user;
public function ImageInfoBoxBuildingEvent($image, $user) {
public function ImageInfoBoxBuildingEvent(Image $image, User $user) {
$this->image = $image;
$this->user = $user;
}
@ -29,7 +29,7 @@ class ImageAdminBlockBuildingEvent extends Event {
var $image = null;
var $user = null;
public function ImageAdminBlockBuildingEvent($image, $user) {
public function ImageAdminBlockBuildingEvent(Image $image, User $user) {
$this->image = $image;
$this->user = $user;
}