mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-17 23:13:15 +00:00
Fix coding standards
This commit is contained in:
@@ -37,13 +37,13 @@ class set_export extends set_abstract
|
||||
public function __construct($lst, $sstid)
|
||||
{
|
||||
$Core = bootstrap::getCore();
|
||||
|
||||
|
||||
$appbox = appbox::get_instance();
|
||||
$session = $appbox->get_session();
|
||||
$registry = $appbox->get_registry();
|
||||
|
||||
$user = $Core->getAuthenticatedUser();
|
||||
|
||||
|
||||
$download_list = array();
|
||||
|
||||
$remain_hd = array();
|
||||
@@ -52,7 +52,7 @@ class set_export extends set_abstract
|
||||
{
|
||||
$em = $Core->getEntityManager();
|
||||
$repository = $em->getRepository('\Entities\Basket');
|
||||
|
||||
|
||||
/* @var $repository \Repositories\BasketRepository */
|
||||
$Basket = $repository->findUserBasket($sstid, $user);
|
||||
|
||||
@@ -479,7 +479,7 @@ class set_export extends set_abstract
|
||||
$sd = $download_element->get_subdefs();
|
||||
|
||||
foreach ($download_element->get_downloadable() as $name => $properties)
|
||||
{
|
||||
{
|
||||
if ($properties === false || !in_array($name, $subdefs))
|
||||
{
|
||||
continue;
|
||||
@@ -762,6 +762,7 @@ class set_export extends set_abstract
|
||||
return false;
|
||||
}
|
||||
if (isset($list['complete']) && $list['complete'] === true)
|
||||
|
||||
return;
|
||||
|
||||
|
||||
@@ -993,13 +994,13 @@ class set_export extends set_abstract
|
||||
else
|
||||
{
|
||||
/**
|
||||
*
|
||||
*
|
||||
* Header "Pragma: public" SHOULD be present.
|
||||
* In case it is not present, download on IE 8 and previous over HTTPS
|
||||
* will fail.
|
||||
*
|
||||
*
|
||||
* @todo : merge this shitty fix with Response object.
|
||||
*
|
||||
*
|
||||
*/
|
||||
if (!headers_sent())
|
||||
{
|
||||
@@ -1011,6 +1012,7 @@ class set_export extends set_abstract
|
||||
$response->headers->set('Content-Disposition', $disposition . "; filename=" . $exportname . ";");
|
||||
$response->headers->set('Content-Length', filesize($file));
|
||||
$response->setContent(file_get_contents($file));
|
||||
|
||||
return $response;
|
||||
}
|
||||
}
|
||||
@@ -1061,7 +1063,7 @@ class set_export extends set_abstract
|
||||
$user = false;
|
||||
if ($anonymous)
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@@ -28,7 +28,7 @@ class set_exportorder extends set_export
|
||||
public function order_available_elements($from_usr_id, $usage, $deadline)
|
||||
{
|
||||
$Core = bootstrap::getCore();
|
||||
|
||||
|
||||
$lst = $this->get_orderable_lst();
|
||||
|
||||
$conn = connection::getPDOConnection();
|
||||
|
@@ -220,25 +220,25 @@ class set_order extends set_abstract
|
||||
}
|
||||
|
||||
$core = \bootstrap::getCore();
|
||||
|
||||
|
||||
$em = $core->getEntityManager();
|
||||
$repository = $em->getRepository('\Entities\Basket');
|
||||
|
||||
|
||||
/* @var $repository \Repositories\BasketRepository */
|
||||
$Basket = $repository->findUserBasket($this->ssel_id, $core->getAuthenticatedUser());
|
||||
|
||||
|
||||
if(!$Basket)
|
||||
{
|
||||
$Basket = new Basket();
|
||||
$Basket->setName(sprintf(_('Commande du %s'), $this->created_on->format('Y-m-d')));
|
||||
$Basket->setOwner($this->user);
|
||||
$Basket->setPusher($core->getAuthenticatedUser());
|
||||
|
||||
|
||||
$em->persist($Basket);
|
||||
$em->flush();
|
||||
|
||||
|
||||
$this->ssel_id = $Basket->getId();
|
||||
|
||||
|
||||
$sql = 'UPDATE `order` SET ssel_id = :ssel_id WHERE id = :order_id';
|
||||
$stmt = $conn->prepare($sql);
|
||||
$stmt->execute(array(':ssel_id' => $Basket->getId(), ':order_id' => $this->id));
|
||||
@@ -264,17 +264,17 @@ class set_order extends set_abstract
|
||||
{
|
||||
$sbas_id = phrasea::sbasFromBas($basrec['base_id']);
|
||||
$record = new record_adapter($sbas_id, $basrec['record_id']);
|
||||
|
||||
|
||||
$BasketElement = new BasketElement();
|
||||
$BasketElement->setRecord($record);
|
||||
$BasketElement->setBasket($Basket);
|
||||
|
||||
|
||||
$Basket->addBasketElement($BasketElement);
|
||||
|
||||
|
||||
$em->persist($BasketElement);
|
||||
|
||||
|
||||
$em->merge($Basket);
|
||||
|
||||
|
||||
$params = array(
|
||||
':usr_id' => $session->get_usr_id()
|
||||
, ':order_id' => $this->id
|
||||
@@ -285,7 +285,7 @@ class set_order extends set_abstract
|
||||
|
||||
$n++;
|
||||
$this->user->ACL()->grant_hd_on($record, $pusher, 'order');
|
||||
|
||||
|
||||
unset($record);
|
||||
}
|
||||
catch (Exception $e)
|
||||
@@ -293,7 +293,7 @@ class set_order extends set_abstract
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$em->flush();
|
||||
$stmt->closeCursor();
|
||||
|
||||
|
Reference in New Issue
Block a user