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

Fix issue with DI container

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-10-23 18:02:31 +02:00
parent 52eb3ed48d
commit 8ed80f89c3
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/classes/set/export.class.php
View File

@@ -696,7 +696,7 @@ class set_export extends set_abstract
* @param string $zipFile * @param string $zipFile
* @return string * @return string
*/ */
public static function build_zip(Filesystem $filesystem, $token, Array $list, $zipFile) public static function build_zip(Application $app, $token, Array $list, $zipFile)
{ {
$zip = new ZipArchiveImproved(); $zip = new ZipArchiveImproved();
@@ -711,7 +711,7 @@ class set_export extends set_abstract
$list['complete'] = false; $list['complete'] = false;
random::updateToken($this->app, $token, serialize($list)); random::updateToken($app, $token, serialize($list));
$unicode = new \unicode(); $unicode = new \unicode();
@@ -747,10 +747,10 @@ class set_export extends set_abstract
$list['complete'] = true; $list['complete'] = true;
$unicode = null; $unicode = null;
random::updateToken($this->app, $token, serialize($list)); random::updateToken($app, $token, serialize($list));
$filesystem->remove($toRemove); $app['filesystem']->remove($toRemove);
$filesystem->chmod($zipFile, 0760); $app['filesystem']->chmod($zipFile, 0760);
return $zipFile; return $zipFile;
} }
@@ -856,7 +856,7 @@ class set_export extends set_abstract
* @param boolean $anonymous * @param boolean $anonymous
* @return Void * @return Void
*/ */
public static function log_download(Array $list, $type, $anonymous = false, $comment = '') public static function log_download(Application $app, Array $list, $type, $anonymous = false, $comment = '')
{ {
$tmplog = array(); $tmplog = array();
$files = $list['files']; $files = $list['files'];
@@ -870,11 +870,11 @@ class set_export extends set_abstract
foreach ($files as $record) { foreach ($files as $record) {
foreach ($record["subdefs"] as $o => $obj) { foreach ($record["subdefs"] as $o => $obj) {
$sbas_id = phrasea::sbasFromBas($this->app, $record['base_id']); $sbas_id = phrasea::sbasFromBas($app, $record['base_id']);
$record_object = new record_adapter($this->app, $sbas_id, $record['record_id']); $record_object = new record_adapter($app, $sbas_id, $record['record_id']);
$this->app['phraseanet.logger']($record_object->get_databox()) $app['phraseanet.logger']($record_object->get_databox())
->log($record_object, $event_name, $o, $comment); ->log($record_object, $event_name, $o, $comment);
if ($o != "caption") { if ($o != "caption") {
@@ -884,7 +884,7 @@ class set_export extends set_abstract
$log["shortXml"] = $record_object->get_caption()->serialize(caption_record::SERIALIZE_XML); $log["shortXml"] = $record_object->get_caption()->serialize(caption_record::SERIALIZE_XML);
$tmplog[$record_object->get_base_id()][] = $log; $tmplog[$record_object->get_base_id()][] = $log;
if (!$anonymous && $o == 'document') { if (!$anonymous && $o == 'document') {
$this->app['phraseanet.user']->ACL()->remove_remaining($record_object->get_base_id()); $app['phraseanet.user']->ACL()->remove_remaining($record_object->get_base_id());
} }
} }
@@ -905,14 +905,14 @@ class set_export extends set_abstract
SET remain_dwnld = :remain_dl SET remain_dwnld = :remain_dl
WHERE base_id = :base_id AND usr_id = :usr_id"; WHERE base_id = :base_id AND usr_id = :usr_id";
$stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); $stmt = $app['phraseanet.appbox']->get_connection()->prepare($sql);
foreach ($list_base as $base_id) { foreach ($list_base as $base_id) {
if ($this->app['phraseanet.user']->ACL()->is_restricted_download($base_id)) { if ($app['phraseanet.user']->ACL()->is_restricted_download($base_id)) {
$params = array( $params = array(
':remain_dl' => $this->app['phraseanet.user']->ACL()->remaining_download($base_id) ':remain_dl' => $app['phraseanet.user']->ACL()->remaining_download($base_id)
, ':base_id' => $base_id , ':base_id' => $base_id
, ':usr_id' => $this->app['phraseanet.user']->get_id() , ':usr_id' => $app['phraseanet.user']->get_id()
); );
$stmt->execute($params); $stmt->execute($params);