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

Merge with master

Browse Source
This commit is contained in:
Romain Neutron
2012-01-10 10:25:02 +01:00
parent 465ded9c9f 0b27c161c5
commit ccf08e05eb
8 changed files with 174 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,7 @@ class set_export extends set_abstract
{
$record = new record_adapter($basrec[0], $basrec[1]);
}
catch(Exception_Record_AdapterNotFound $e)
catch (Exception_Record_AdapterNotFound $e)
{
continue;
}
@@ -411,7 +411,7 @@ class set_export extends set_abstract
* @param boolean $rename_title
* @return Array
*/
public function prepare_export(Array $subdefs, $rename_title=false)
public function prepare_export(Array $subdefs, $rename_title = false)
{
if (!is_array($subdefs))
{
@@ -434,6 +434,7 @@ class set_export extends set_abstract
foreach ($this->elements as $download_element)
{
echo "eleme";
$id = count($files);
$files[$id] = array(
@@ -481,7 +482,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;
@@ -490,10 +491,6 @@ class set_export extends set_abstract
{
continue;
}
if (!isset($sd[$name]))
{
continue;
}
set_time_limit(100);
$subdef_export = $subdef_alive = false;
@@ -689,7 +686,9 @@ class set_export extends set_abstract
system_file::mkdir($caption_dir);
$desc = self::get_caption(
$download_element->get_base_id(), $download_element->get_record_id(), $session->get_ses_id()
$download_element->get_base_id()
, $download_element->get_record_id()
, $session->get_ses_id()
);
$file = $files[$id]["export_name"]
@@ -717,7 +716,11 @@ class set_export extends set_abstract
$desc = self::get_caption(
$download_element->get_base_id(), $download_element->get_record_id(), $session->get_ses_id(), true, 'yaml'
$download_element->get_base_id()
, $download_element->get_record_id()
, $session->get_ses_id()
, true
, 'yaml'
);
$file = $files[$id]["export_name"]
@@ -736,6 +739,7 @@ class set_export extends set_abstract
}
}
}
$this->list = array(
'files' => $files,
'names' => $file_names,
@@ -743,6 +747,7 @@ class set_export extends set_abstract
'count' => $n_files
);
return $this->list;
}
@@ -762,7 +767,6 @@ class set_export extends set_abstract
return false;
}
if (isset($list['complete']) && $list['complete'] === true)
return;
@@ -839,7 +843,7 @@ class set_export extends set_abstract
* @param boolean $check_rights
* @return string
*/
public static function get_caption($bas, $rec, $check_rights=true, $format = 'xml')
public static function get_caption($bas, $rec, $check_rights = true, $format = 'xml')
{
$dom = new DOMDocument();
$dom->formatOutput = true;
@@ -954,7 +958,7 @@ class set_export extends set_abstract
* @return Void
*/
public static function stream_file(
$file, $exportname, $mime, $disposition='attachment')
$file, $exportname, $mime, $disposition = 'attachment')
{
require_once __DIR__ . "/../../../lib/vendor/Silex/autoload.php";
$registry = registry::get_instance();
@@ -1003,11 +1007,11 @@ class set_export extends set_abstract
* @todo : merge this shitty fix with Response object.
*
*/
if(!headers_sent())
if (!headers_sent())
{
header("Pragma: public");
}
$response->headers->set('Content-Type', $mime);
$response->headers->set('Content-Name', $exportname);
$response->headers->set('Content-Disposition', $disposition . "; filename=" . $exportname . ";");
@@ -1028,7 +1032,7 @@ class set_export extends set_abstract
* @param String $disposition
* @return Void
*/
public static function stream_data($data, $exportname, $mime, $disposition='attachment')
public static function stream_data($data, $exportname, $mime, $disposition = 'attachment')
{
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
@@ -1063,7 +1067,7 @@ class set_export extends set_abstract
$user = false;
if ($anonymous)
{
}
else
{