YGGverse/YGGtracker
1
0
Fork 0
mirror of https://github.com/YGGverse/YGGtracker.git synced 2025-01-11 07:27:58 +00:00
Code Issues Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
ghost 2023-09-12 01:18:00 +03:00
parent 1f22cb57e9
commit 18f0c5d14e
5 changed files with 105 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
src/library/database.php
View File

@ -494,6 +494,15 @@ class Database {
return $query->fetch();
}
public function getUsers() {
$this->_debug->query->select->total++;
$query = $this->_db->query('SELECT * FROM `user`');
return $query->fetchAll();
}
public function getUsersTotal() : int {
$this->_debug->query->select->total++;
@ -639,7 +648,18 @@ class Database {
return $query->fetch()->result;
}
public function getMagnetsTotalByUserId(int $userId) : int {
public function findMagnetsByUserId(int $userId) {
$this->_debug->query->select->total++;
$query = $this->_db->prepare('SELECT * FROM `magnet` WHERE `userId` = ?');
$query->execute([$userId]);
return $query->fetchAll();
}
public function findMagnetsTotalByUserId(int $userId) : int {
$this->_debug->query->select->total++;
@ -1237,42 +1257,44 @@ class Database {
return $query->rowCount();
}
public function getMagnetCommentsTotal(mixed $magnetId = null) : int {
public function getMagnetCommentsTotal() : int {
$this->_debug->query->select->total++;
if ($magnetId)
{
$query = $this->_db->prepare('SELECT COUNT(*) AS `result` FROM `magnetComment` WHERE `magnetId` = ?');
$query->execute([$magnetId]);
}
else
{
$query = $this->_db->prepare('SELECT COUNT(*) AS `result` FROM `magnetComment`');
$query->execute();
}
$query = $this->_db->query('SELECT COUNT(*) AS `result` FROM `magnetComment`');
return $query->fetch()->result;
}
public function getMagnetCommentsTotalByUserId(int $userId, mixed $magnetId = null) : int {
public function findMagnetCommentsTotalByMagnetId(int $magnetId) : int {
$this->_debug->query->select->total++;
if ($magnetId)
{
$query = $this->_db->prepare('SELECT COUNT(*) AS `result` FROM `magnetComment` WHERE `userId` = ? AND `magnetId` = ?');
$query = $this->_db->prepare('SELECT COUNT(DISTINCT `userId`) AS `result` FROM `magnetComment` WHERE `magnetId` = ?');
$query->execute([$userId, $magnetId]);
}
else
{
$query = $this->_db->prepare('SELECT COUNT(*) AS `result` FROM `magnetComment` WHERE `userId` = ?');
$query->execute([$magnetId]);
$query->execute([$userId]);
}
return $query->fetch()->result;
}
public function findMagnetCommentsTotalByUserId(int $userId) : int {
$this->_debug->query->select->total++;
$query = $this->_db->prepare('SELECT COUNT(DISTINCT `magnetId`) AS `result` FROM `magnetComment` WHERE `userId` = ?');
$query->execute([$userId]);
return $query->fetch()->result;
}
public function findMagnetCommentsTotal(int $userId, int $magnetId) : int {
$this->_debug->query->select->total++;
$query = $this->_db->prepare('SELECT COUNT(*) AS `result` FROM `magnetComment` WHERE `userId` = ? AND `magnetId` = ?');
$query->execute([$userId, $magnetId]);
return $query->fetch()->result;
}
@ -1310,17 +1332,6 @@ class Database {
return $query->fetchAll();
}
public function findMagnetCommentsTotalByUserId(int $magnetId, int $userId) : int {
$this->_debug->query->select->total++;
$query = $this->_db->prepare('SELECT COUNT(*) AS `result` FROM `magnetComment` WHERE `magnetId` = ? AND `userId` = ?');
$query->execute([$magnetId, $userId]);
return $query->fetch()->result;
}
public function getMagnetComment(int $magnetCommentId) {
$this->_debug->query->select->total++;
@ -1355,18 +1366,29 @@ class Database {
return $query->rowCount();
}
public function getMagnetStarsTotal(int $magnetId) : int {
public function findMagnetStarsTotalByMagnetId(int $magnetId) : int {
$this->_debug->query->select->total++;
$query = $this->_db->prepare('SELECT COUNT(*) AS `result` FROM `magnetStar` WHERE `magnetId` = ?');
$query = $this->_db->prepare('SELECT COUNT(DISTINCT `userId`) AS `result` FROM `magnetStar` WHERE `magnetId` = ?');
$query->execute([$magnetId]);
return $query->fetch()->result;
}
public function findMagnetStarsTotalByUserId(int $magnetId, int $userId) : int {
public function findMagnetStarsTotalByUserId(int $userId) : int {
$this->_debug->query->select->total++;
$query = $this->_db->prepare('SELECT COUNT(DISTINCT `magnetId`) AS `result` FROM `magnetStar` WHERE `userId` = ?');
$query->execute([$userId]);
return $query->fetch()->result;
}
public function findMagnetStarsTotal(int $magnetId, int $userId) : int {
$this->_debug->query->select->total++;
@ -1377,6 +1399,17 @@ class Database {
return $query->fetch()->result;
}
public function findMagnetStarByUserId(int $magnetId, int $userId) : int {
$this->_debug->query->select->total++;
$query = $this->_db->prepare('SELECT * FROM `magnetStar` WHERE `magnetId` = ? AND `userId` = ?');
$query->execute([$magnetId, $userId]);
return $query->fetch();
}
// Magnet download
public function addMagnetDownload(int $magnetId, int $userId, int $timeAdded) : int {
@ -1389,7 +1422,18 @@ class Database {
return $this->_db->lastInsertId();
}
public function getMagnetDownloadsTotalByUserId(int $magnetId) : int {
public function findMagnetDownloadsTotal(int $magnetId, int $userId) : int {
$this->_debug->query->select->total++;
$query = $this->_db->prepare('SELECT COUNT(*) AS `result` FROM `magnetDownload` WHERE `magnetId` = ? AND `userId` = ?');
$query->execute([$magnetId, $userId]);
return $query->fetch()->result;
}
public function findMagnetDownloadsTotalByMagnetId(int $magnetId) : int {
$this->_debug->query->select->total++;
@ -1400,13 +1444,13 @@ class Database {
return $query->fetch()->result;
}
public function findMagnetDownloadsTotalByUserId(int $magnetId, int $userId) : int {
public function findMagnetDownloadsTotalByUserId(int $userId) : int {
$this->_debug->query->select->total++;
$query = $this->_db->prepare('SELECT COUNT(*) AS `result` FROM `magnetDownload` WHERE `magnetId` = ? AND `userId` = ?');
$query = $this->_db->prepare('SELECT COUNT(DISTINCT `magnetId`) AS `result` FROM `magnetDownload` WHERE `userId` = ?');
$query->execute([$magnetId, $userId]);
$query->execute([$userId]);
return $query->fetch()->result;
}
@ -1434,13 +1478,13 @@ class Database {
return $query->fetch()->result;
}
public function findMagnetViewsTotalByUserId(int $magnetId, int $userId) : int {
public function findMagnetViewsTotalByUserId(int $userId) : int {
$this->_debug->query->select->total++;
$query = $this->_db->prepare('SELECT COUNT(*) AS `result` FROM `magnetView` WHERE `magnetId` = ? AND `userId` = ?');
$query = $this->_db->prepare('SELECT COUNT(*) AS `result` FROM `magnetView` WHERE `userId` = ?');
$query->execute([$magnetId, $userId]);
$query->execute([$userId]);
return $query->fetch()->result;
}

2
src/public/action.php
View File

@ -421,7 +421,7 @@ switch (isset($_GET['target']) ? urldecode($_GET['target']) : false)
else
{
// Star exists, trigger delete
if ($db->findMagnetStarsTotalByUserId($magnet->magnetId, $userId))
if ($db->findMagnetStarsTotal($magnet->magnetId, $userId))
{
$db->deleteMagnetStarByUserId($magnet->magnetId, $userId);
}

18
src/public/index.php
View File

@ -107,12 +107,6 @@ else
$accessRead = ($user->address == $db->getUser($magnet->userId)->address || in_array($user->address, MODERATOR_IP_LIST) || ($magnet->public && $magnet->approved));
$accessEdit = ($user->address == $db->getUser($magnet->userId)->address || in_array($user->address, MODERATOR_IP_LIST));
// Update magnet viewed
if ($accessRead)
{
$db->addMagnetView($magnet->magnetId, $userId, time());
}
// Keywords
$keywords = [];
@ -139,18 +133,18 @@ else
'keywords' => $keywords,
'comment' => (object)
[
'total' => $db->getMagnetCommentsTotal($magnet->magnetId),
'status' => $db->findMagnetCommentsTotalByUserId($magnet->magnetId, $userId),
'total' => $db->findMagnetCommentsTotalByMagnetId($magnet->magnetId),
'status' => $db->findMagnetCommentsTotal($magnet->magnetId, $userId),
],
'download' => (object)
[
'total' => $db->getMagnetDownloadsTotalByUserId($magnet->magnetId),
'status' => $db->findMagnetDownloadsTotalByUserId($magnet->magnetId, $userId),
'total' => $db->findMagnetDownloadsTotalByMagnetId($magnet->magnetId),
'status' => $db->findMagnetDownloadsTotal($magnet->magnetId, $userId),
],
'star' => (object)
[
'total' => $db->getMagnetStarsTotal($magnet->magnetId),
'status' => $db->findMagnetStarsTotalByUserId($magnet->magnetId, $userId),
'total' => $db->findMagnetStarsTotalByMagnetId($magnet->magnetId),
'status' => $db->findMagnetStarsTotal($magnet->magnetId, $userId),
],
'access' => (object)
[

12
src/public/magnet.php
View File

@ -121,18 +121,18 @@ else
'keywords' => $keywords,
'comment' => (object)
[
'total' => $db->getMagnetCommentsTotal($magnet->magnetId),
'status' => $db->findMagnetCommentsTotalByUserId($magnet->magnetId, $userId),
'total' => $db->findMagnetCommentsTotalByMagnetId($magnet->magnetId),
'status' => $db->findMagnetCommentsTotal($magnet->magnetId, $userId),
],
'download' => (object)
[
'total' => $db->getMagnetDownloadsTotalByUserId($magnet->magnetId),
'status' => $db->findMagnetDownloadsTotalByUserId($magnet->magnetId, $userId),
'total' => $db->findMagnetDownloadsTotalByMagnetId($magnet->magnetId),
'status' => $db->findMagnetDownloadsTotal($magnet->magnetId, $userId),
],
'star' => (object)
[
'total' => $db->getMagnetStarsTotal($magnet->magnetId),
'status' => $db->findMagnetStarsTotalByUserId($magnet->magnetId, $userId),
'total' => $db->findMagnetStarsTotalByMagnetId($magnet->magnetId),
'status' => $db->findMagnetStarsTotal($magnet->magnetId, $userId),
],
'access' => (object)
[

4
src/public/node.php
View File

@ -121,13 +121,13 @@ else if (is_null($user->public))
<tr>
<td><?php echo _('Magnets') ?></td>
<td>
<?php echo $db->getMagnetsTotalByUserId($user->userId) ?>
<?php echo $db->findMagnetsTotalByUserId($user->userId) ?>
</td>
</tr>
<tr>
<td><?php echo _('Comments') ?></td>
<td>
<?php echo $db->getMagnetCommentsTotalByUserId($user->userId) ?>
<?php echo $db->findMagnetCommentsTotalByUserId($user->userId) ?>
</td>
</tr>
-->