hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 14:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-2651_event-to-message_4.1

Browse Source 
fix for php7.1
!!! WIP !!!
This commit is contained in:
Jean-Yves Gaulier
2019-07-22 15:24:48 +02:00
parent b0c0f65764
commit 5585893f05
2 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Alchemy/Phrasea/Controller/Prod/UploadController.php
View File

@@ -367,15 +367,17 @@ class UploadController extends Controller
$postMaxSize = PHP_INT_MAX; $postMaxSize = PHP_INT_MAX;
} }
$r = 0;
switch (strtolower(substr($postMaxSize, -1))) { switch (strtolower(substr($postMaxSize, -1))) {
/** @noinspection PhpMissingBreakStatementInspection */ /** @noinspection PhpMissingBreakStatementInspection */
case 'g': case 'g':
$postMaxSize *= 1024; $r += 10;
/** @noinspection PhpMissingBreakStatementInspection */ /** @noinspection PhpMissingBreakStatementInspection */
case 'm': case 'm':
$postMaxSize *= 1024; $r += 10;
case 'k': case 'k':
$postMaxSize *= 1024; $r += 10;
$postMaxSize = ((int)($postMaxSize))<<$r;
} }
return min(UploadedFile::getMaxFilesize(), (int) $postMaxSize); return min(UploadedFile::getMaxFilesize(), (int) $postMaxSize);

44
lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
View File

@@ -120,23 +120,23 @@ class BasketRepository extends EntityRepository
*/ */
public function findActiveValidationByUser(User $user, $sort = null) public function findActiveValidationByUser(User $user, $sort = null)
{ {
$dql = 'SELECT b $dql = "SELECT b\n"
FROM Phraseanet:Basket b . "FROM Phraseanet:Basket b\n"
JOIN b.elements e . " JOIN b.validation s\n"
JOIN e.validation_datas v . " JOIN s.participants p\n"
JOIN b.validation s . "WHERE b.user != ?1 AND p.user = ?2\n"
JOIN s.participants p . " AND (s.expires IS NULL OR s.expires > CURRENT_TIMESTAMP())";
WHERE b.user != ?1 AND p.user = ?2
AND (s.expires IS NULL OR s.expires > CURRENT_TIMESTAMP()) ';
if ($sort == 'date') { if ($sort == 'date') {
$dql .= ' ORDER BY b.created DESC'; $dql .= "\nORDER BY b.created DESC";
} elseif ($sort == 'name') { } elseif ($sort == 'name') {
$dql .= ' ORDER BY b.name ASC'; $dql .= "\nORDER BY b.name ASC";
} }
$query = $this->_em->createQuery($dql); $query = $this->_em->createQuery($dql);
$query->setParameters([1 => $user->getId(), 2 => $user->getId()]); $query->setParameters([1 => $user->getId(), 2 => $user->getId()]);
$sql = $query->getSQL();
file_put_contents("/tmp/phraseanet-log.txt", sprintf("%s (%d) %s\n", __FILE__, __LINE__, var_export($sql, true)), FILE_APPEND);
return $query->getResult(); return $query->getResult();
} }
@@ -210,30 +210,27 @@ class BasketRepository extends EntityRepository
{ {
switch ($type) { switch ($type) {
case self::RECEIVED: case self::RECEIVED:
$dql = 'SELECT b $dql = "SELECT b\n"
FROM Phraseanet:Basket b . "FROM Phraseanet:Basket b\n"
JOIN b.elements e . "WHERE b.user = :usr_id AND b.pusher_id IS NOT NULL";
WHERE b.user = :usr_id AND b.pusher_id IS NOT NULL';
$params = [ $params = [
'usr_id' => $user->getId() 'usr_id' => $user->getId()
]; ];
break; break;
case self::VALIDATION_DONE: case self::VALIDATION_DONE:
$dql = 'SELECT b $dql = "SELECT b\n"
FROM Phraseanet:Basket b . "FROM Phraseanet:Basket b\n"
JOIN b.elements e . " JOIN b.validation s\n"
JOIN b.validation s . " JOIN s.participants p\n"
JOIN s.participants p . "WHERE b.user != ?1 AND p.user = ?2";
WHERE b.user != ?1 AND p.user = ?2';
$params = [ $params = [
1 => $user->getId() 1 => $user->getId(),
, 2 => $user->getId() 2 => $user->getId()
]; ];
break; break;
case self::VALIDATION_SENT: case self::VALIDATION_SENT:
$dql = 'SELECT b $dql = 'SELECT b
FROM Phraseanet:Basket b FROM Phraseanet:Basket b
JOIN b.elements e
JOIN b.validation v JOIN b.validation v
WHERE b.user = :usr_id'; WHERE b.user = :usr_id';
$params = [ $params = [
@@ -243,7 +240,6 @@ class BasketRepository extends EntityRepository
case self::MYBASKETS: case self::MYBASKETS:
$dql = 'SELECT b $dql = 'SELECT b
FROM Phraseanet:Basket b FROM Phraseanet:Basket b
LEFT JOIN b.elements e
LEFT JOIN b.validation s LEFT JOIN b.validation s
LEFT JOIN s.participants p LEFT JOIN s.participants p
WHERE (b.user = :usr_id)'; WHERE (b.user = :usr_id)';