0ct0pu5/XBackBone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplified class

Browse source
This commit is contained in:
Sergio Brighenti 2020-04-03 16:36:39 +02:00
parent b992d03c2c
commit f558af93bc
2 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Controllers/ProfileController.php
View file

@ -75,6 +75,7 @@ class ProfileController extends Controller
]);
}
$this->session->set('copy_raw', param($request, 'copy_raw') !== null ? 1 : 0);
$this->session->alert(lang('profile_updated'), 'success');
$this->logger->info('User '.$this->session->get('username')." updated profile of $user->id.");

36
app/Database/Queries/MediaQuery.php
View file

@ -130,33 +130,25 @@ class MediaQuery
public function runWithDbSort(int $page)
{
$params = [];
if ($this->isAdmin) {
[$queryMedia, $queryPages] = $this->buildAdminQueries();
$params = [];
if ($this->text !== null) {
$params[] = '%'.htmlentities($this->text).'%';
}
$queryMedia .= $this->buildOrderBy().' LIMIT ? OFFSET ?';
$this->media = $this->db->query($queryMedia, array_merge($params, [self::PER_PAGE_ADMIN, $page * self::PER_PAGE_ADMIN]))->fetchAll();
$this->pages = $this->db->query($queryPages, $params)->fetch()->count / self::PER_PAGE_ADMIN;
$constPage = self::PER_PAGE_ADMIN;
} else {
[$queryMedia, $queryPages] = $this->buildUserQueries();
if ($this->text !== null) {
$params = [$this->userId, '%'.htmlentities($this->text).'%'];
} else {
$params = [$this->userId];
}
$queryMedia .= $this->buildOrderBy().' LIMIT ? OFFSET ?';
$this->media = $this->db->query($queryMedia, array_merge($params, [self::PER_PAGE, $page * self::PER_PAGE]))->fetchAll();
$this->pages = $this->db->query($queryPages, array_merge($params))->fetch()->count / self::PER_PAGE;
$params[] = $this->userId;
$constPage = self::PER_PAGE;
}
if ($this->text !== null) {
$params[] = '%'.htmlentities($this->text).'%';
}
$queryMedia .= $this->buildOrderBy().' LIMIT ? OFFSET ?';
$this->media = $this->db->query($queryMedia, array_merge($params, [$constPage, $page * $constPage]))->fetchAll();
$this->pages = $this->db->query($queryPages, $params)->fetch()->count / $constPage;
$tags = $this->getTags(array_column($this->media, 'id'));
foreach ($this->media as $media) {
@ -205,7 +197,7 @@ class MediaQuery
[$queryMedia,] = $this->buildAdminQueries();
} else {
[$queryMedia,] = $this->buildUserQueries();
$params = [$this->userId];
$params[] = $this->userId;
}
$params[] = '%'.htmlentities($this->text).'%';