Fix PHRAS-45 'mail' action is not logged anymore

This commit is contained in:
Nicolas Le Goff
2014-06-13 12:56:06 +02:00
parent 2253badd8e
commit 0345e0ee8e
6 changed files with 68 additions and 22 deletions

View File

@@ -773,12 +773,7 @@ class set_export extends set_abstract
$tmplog = array();
$files = $list['files'];
$event_names = array(
'mail-export' => Session_Logger::EVENT_EXPORTMAIL,
'download' => Session_Logger::EVENT_EXPORTDOWNLOAD
);
$event_name = isset($event_names[$type]) ? $event_names[$type] : Session_Logger::EVENT_EXPORTDOWNLOAD;
$event_name = in_array($type, array(Session_Logger::EVENT_EXPORTMAIL,Session_Logger::EVENT_EXPORTDOWNLOAD)) ? $type : Session_Logger::EVENT_EXPORTDOWNLOAD;
foreach ($files as $record) {
foreach ($record["subdefs"] as $o => $obj) {
@@ -786,8 +781,7 @@ class set_export extends set_abstract
$record_object = new record_adapter($app, $sbas_id, $record['record_id']);
$app['phraseanet.logger']($record_object->get_databox())
->log($record_object, $event_name, $o, $comment);
$app['phraseanet.logger']($record_object->get_databox())->log($record_object, $event_name, $o, $comment);
if ($o != "caption") {
$log["rid"] = $record_object->get_record_id();
@@ -804,12 +798,6 @@ class set_export extends set_abstract
}
}
$export_types = array(
'download' => 0,
'mail-export' => 2,
'ftp' => 4
);
$list_base = array_unique(array_keys($tmplog));
if (!$anonymous) {