get rid of is_admin, fixes #676

This commit is contained in:
Shish
2019-09-29 19:00:51 +01:00
parent 0f4a0275b5
commit a7bddb1dac
27 changed files with 99 additions and 64 deletions

View File

@@ -89,7 +89,7 @@ class Forum extends Extension
if ($event->page_matches("forum")) {
switch ($event->get_arg(0)) {
case "index":
$this->show_last_threads($page, $event, $user->is_admin());
$this->show_last_threads($page, $event, $user->can(Permissions::FORUM_ADMIN));
if (!$user->is_anonymous()) {
$this->theme->display_new_thread_composer($page);
}
@@ -104,8 +104,8 @@ class Forum extends Extension
break;
}
$this->show_posts($event, $user->is_admin());
if ($user->is_admin()) {
$this->show_posts($event, $user->can(Permissions::FORUM_ADMIN));
if ($user->can(Permissions::FORUM_ADMIN)) {
$this->theme->add_actions_block($page, $threadID);
}
if (!$user->is_anonymous()) {
@@ -139,7 +139,7 @@ class Forum extends Extension
$threadID = int_escape($event->get_arg(1));
$postID = int_escape($event->get_arg(2));
if ($user->is_admin()) {
if ($user->can(Permissions::FORUM_ADMIN)) {
$this->delete_post($postID);
}
@@ -149,7 +149,7 @@ class Forum extends Extension
case "nuke":
$threadID = int_escape($event->get_arg(1));
if ($user->is_admin()) {
if ($user->can(Permissions::FORUM_ADMIN)) {
$this->delete_thread($threadID);
}

View File

@@ -38,7 +38,7 @@ class ForumTheme extends Themelet
<tr><td>Title:</td><td><input type='text' name='title' value='$threadTitle'></td></tr>
<tr><td>Message:</td><td><textarea id='message' name='message' >$threadText</textarea></td></tr>
<tr><td></td><td><small>Max characters alowed: $max_characters.</small></td></tr>";
if ($user->is_admin()) {
if ($user->can(Permissions::FORUM_ADMIN)) {
$html .= "<tr><td colspan='2'><label for='sticky'>Sticky:</label><input name='sticky' id='sticky' type='checkbox' value='Y' /></td></tr>";
}
$html .= "<tr><td colspan='2'><input type='submit' value='Submit' /></td></tr>
@@ -121,7 +121,7 @@ class ForumTheme extends Themelet
$postID = $post['id'];
//if($user->is_admin()){
//if($user->can(Permissions::FORUM_ADMIN)){
//$delete_link = "<a href=".make_link("forum/delete/".$threadID."/".$postID).">Delete</a>";
//} else {
//$delete_link = "";