Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-03 07:04:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [ADD] Added PDF files displaying

Browse Source 
* [FIX] Minor bugfixes
* [MOD] Code refactoring

Signed-off-by: nuxsmin <nuxsmin@syspass.org>
This commit is contained in:
nuxsmin
2018-10-24 01:59:58 +02:00
parent e49526e594
commit a37b49d506
18 changed files with 947 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
lib/SP/Repositories/Notification/NotificationRepository.php
View File

@@ -28,6 +28,7 @@ use SP\Core\Exceptions\ConstraintException;
use SP\Core\Exceptions\QueryException;
use SP\DataModel\ItemSearchData;
use SP\DataModel\NotificationData;
use SP\Mvc\Model\QueryCondition;
use SP\Repositories\Repository;
use SP\Repositories\RepositoryItemInterface;
use SP\Repositories\RepositoryItemTrait;
@@ -386,19 +387,67 @@ final class NotificationRepository extends Repository implements RepositoryItemI
$queryData->setFrom('Notification');
$queryData->setOrder('`date` DESC');
$filterUser = '(userId = ? OR (userId = NULL AND onlyAdmin = 0) OR sticky = 1)';
$queryCondition = new QueryCondition();
$queryCondition->addFilter('userId = ?', [$userId]);
$queryCondition->addFilter('(userId IS NULL AND onlyAdmin = 0)');
$queryCondition->addFilter('sticky = 1');
if ($itemSearchData->getSeachString() !== '') {
$queryData->setWhere('(type LIKE ? OR component LIKE ? OR description LIKE ?) AND ' . $filterUser);
$queryData->setWhere(
'(type LIKE ? OR component LIKE ? OR description LIKE ?) AND '
. $queryCondition->getFilters(QueryCondition::CONDITION_OR)
);
$search = '%' . $itemSearchData->getSeachString() . '%';
$queryData->addParam($search);
$queryData->addParam($search);
$queryData->addParam($search);
$queryData->addParam($userId);
$queryData->setParams(array_merge([$search, $search, $search], $queryCondition->getParams()));
} else {
$queryData->setWhere($filterUser);
$queryData->addParam($userId);
$queryData->setWhere($queryCondition->getFilters(QueryCondition::CONDITION_OR));
$queryData->setParams($queryCondition->getParams());
}
$queryData->setLimit(
'?,?',
[$itemSearchData->getLimitStart(), $itemSearchData->getLimitCount()]
);
return $this->db->doSelect($queryData, true);
}
/**
* Searches for items by a given filter
*
* @param ItemSearchData $itemSearchData
* @param int $userId
*
* @return QueryResult
* @throws ConstraintException
* @throws QueryException
*/
public function searchForAdmin(ItemSearchData $itemSearchData, $userId)
{
$queryData = new QueryData();
$queryData->setMapClassName(NotificationData::class);
$queryData->setSelect('id, type, component, description, `date`, checked, userId, sticky, onlyAdmin');
$queryData->setFrom('Notification');
$queryData->setOrder('`date` DESC');
$queryCondition = new QueryCondition();
$queryCondition->addFilter('userId = ?', [$userId]);
$queryCondition->addFilter('onlyAdmin = 1');
$queryCondition->addFilter('sticky = 1');
if ($itemSearchData->getSeachString() !== '') {
$queryData->setWhere(
'(type LIKE ? OR component LIKE ? OR description LIKE ?) AND '
. $queryCondition->getFilters(QueryCondition::CONDITION_OR)
);
$search = '%' . $itemSearchData->getSeachString() . '%';
$queryData->setParams(array_merge([$search, $search, $search], $queryCondition->getParams()));
} else {
$queryData->setWhere($queryCondition->getFilters(QueryCondition::CONDITION_OR));
$queryData->setParams($queryCondition->getParams());
}
$queryData->setLimit(
@@ -534,4 +583,37 @@ final class NotificationRepository extends Repository implements RepositoryItemI
return $this->db->doSelect($queryData);
}
/**
* @param $id
*
* @return QueryResult
* @throws ConstraintException
* @throws QueryException
*/
public function getAllActiveForAdmin($id)
{
$query = /** @lang SQL */
'SELECT id,
type,
component,
description,
`date`,
userId,
checked,
sticky,
onlyAdmin
FROM Notification
WHERE (userId = ? OR sticky = 1 OR userId IS NULL)
AND checked = 0
ORDER BY `date` DESC ';
$queryData = new QueryData();
$queryData->setMapClassName(NotificationData::class);
$queryData->setQuery($query);
$queryData->addParam($id);
$queryData->setOnErrorMessage(__u('Error al obtener las notificaciones'));
return $this->db->doSelect($queryData);
}
}