badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[core] remove is_logged_in

Browse source 
This was only used in a couple of places, and user classes are more useful
This commit is contained in:
Shish 2024-05-04 15:43:29 +01:00 committed by Shish
parent 9453fda166
commit 5cbbe5e1b3
5 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/user.php
View file

@ -171,12 +171,6 @@ class User
return ($this->id === $config->get_int('anon_id'));
}
public function is_logged_in(): bool
{
global $config;
return ($this->id !== $config->get_int('anon_id'));
}
public function set_class(string $class): void
{
global $database;

20
ext/bulk_actions/main.php
View file

@ -68,20 +68,18 @@ class BulkActions extends Extension
{
global $page, $user;
if ($user->is_logged_in()) {
$babbe = new BulkActionBlockBuildingEvent();
$babbe->search_terms = $event->search_terms;
$babbe = new BulkActionBlockBuildingEvent();
$babbe->search_terms = $event->search_terms;
send_event($babbe);
send_event($babbe);
if (sizeof($babbe->actions) == 0) {
return;
}
usort($babbe->actions, [$this, "sort_blocks"]);
$this->theme->display_selector($page, $babbe->actions, Tag::implode($event->search_terms));
if (sizeof($babbe->actions) == 0) {
return;
}
usort($babbe->actions, [$this, "sort_blocks"]);
$this->theme->display_selector($page, $babbe->actions, Tag::implode($event->search_terms));
}
public function onBulkActionBlockBuilding(BulkActionBlockBuildingEvent $event): void

12
ext/pools/main.php
View file

@ -551,13 +551,15 @@ class Pools extends Extension
public function onBulkActionBlockBuilding(BulkActionBlockBuildingEvent $event): void
{
global $database;
global $database, $user;
$options = $database->get_pairs("SELECT id,title FROM pools ORDER BY title");
if(!$user->can(Permissions::POOLS_UPDATE)) {
$options = $database->get_pairs("SELECT id,title FROM pools ORDER BY title");
// TODO: Don't cast into strings, make BABBE accept HTMLElement instead.
$event->add_action("bulk_pool_add_existing", "Add To (P)ool", "p", "", (string) $this->theme->get_bulk_pool_selector($options));
$event->add_action("bulk_pool_add_new", "Create Pool", "", "", (string) $this->theme->get_bulk_pool_input($event->search_terms));
// TODO: Don't cast into strings, make BABBE accept HTMLElement instead.
$event->add_action("bulk_pool_add_existing", "Add To (P)ool", "p", "", (string) $this->theme->get_bulk_pool_selector($options));
$event->add_action("bulk_pool_add_new", "Create Pool", "", "", (string) $this->theme->get_bulk_pool_input($event->search_terms));
}
}
public function onBulkAction(BulkActionEvent $event): void

3
ext/transcode/main.php
View file

@ -260,9 +260,8 @@ class TranscodeImage extends Extension
{
global $user, $config;
$engine = $config->get_string(TranscodeConfig::ENGINE);
if ($user->can(Permissions::EDIT_FILES)) {
$engine = $config->get_string(TranscodeConfig::ENGINE);
$event->add_action(self::ACTION_BULK_TRANSCODE, "Transcode Image", null, "", $this->theme->get_transcode_picker_html($this->get_supported_output_mimes($engine)));
}
}

5
ext/user/main.php
View file

@ -393,7 +393,10 @@ class UserPage extends Extension
$this->theme->display_user_links($page, $user, $ubbe->get_parts());
}
if (
($user->can(Permissions::VIEW_IP) || ($user->is_logged_in() && $user->id == $event->display_user->id)) && # admin or self-user
(
$user->can(Permissions::VIEW_IP) || # user can view all IPS
($user->id == $event->display_user->id) # or user is viewing themselves
) &&
($event->display_user->id != $config->get_int('anon_id')) # don't show anon's IP list, it is le huge
) {
$this->theme->display_ip_list(