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

Merge pull request #446 from shish/simplify_uceu

Browse Source 
simplify user_can_edit_user -- many nested if/else's to one if
This commit is contained in:
Daku 2014-08-26 15:19:27 +01:00
commit 0744b50a71
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ext/user/main.php
View File

@ -494,29 +494,22 @@ class UserPage extends Extension {
private function user_can_edit_user(User $a, User $b) { private function user_can_edit_user(User $a, User $b) {
if($a->is_anonymous()) { if($a->is_anonymous()) {
$this->theme->display_error(401, "Error", "You aren't logged in"); $this->theme->display_error(401, "Error", "You aren't logged in");
}
if($a->name == $b->name) {
return true;
}
if($b->can("protected")) {
if($a->class->name == "admin") {
return true;
}
else {
$this->theme->display_error(401, "Error", "You need to be an admin to change other people's details");
}
}
else {
if($a->can("edit_user_info")) {
return true;
}
else {
$this->theme->display_error(401, "Error", "You need to be an admin to change other people's details");
}
}
return false; return false;
} }
if(
($a->name == $b->name) ||
($b->can("protected") && $a->class->name == "admin") ||
(!$b->can("protected") && $a->can("edit_user_info"))
) {
return true;
}
else {
$this->theme->display_error(401, "Error", "You need to be an admin to change other people's details");
return false;
}
}
private function redirect_to_user(User $duser) { private function redirect_to_user(User $duser) {
global $page, $user; global $page, $user;