diff --git a/lib/classes/Session/Logger.php b/lib/classes/Session/Logger.php index 8f6aeac25b..8676b6de1c 100644 --- a/lib/classes/Session/Logger.php +++ b/lib/classes/Session/Logger.php @@ -32,7 +32,6 @@ class Session_Logger const EVENT_EXPORTDOWNLOAD = 'download'; const EVENT_EXPORTFTP = 'ftp'; const EVENT_EXPORTMAIL = 'mail'; - const EVENT_MOVE_FROM = 'collection_from'; const EVENT_MOVE = 'collection'; const EVENT_PRINT = 'print'; const EVENT_PUSH = 'push'; @@ -64,17 +63,18 @@ class Session_Logger return $this->id; } - public function log(record_adapter $record, $action, $final, $comment) + public function log(record_adapter $record, $action, $final, $comment, $coll_id_from=null) { $sql = 'INSERT INTO log_docs - (id, log_id, date, record_id, coll_id, action, final, comment) - VALUES (null, :log_id, NOW(), :record_id, :coll_id, :action, :final, :comm)'; + (id, log_id, date, record_id, coll_id_from, coll_id, action, final, comment) + VALUES (null, :log_id, NOW(), :record_id, :coll_id_from, :coll_id, :action, :final, :comm)'; $stmt = $this->databox->get_connection()->prepare($sql); $params = [ ':log_id' => $this->get_id(), ':record_id' => $record->getRecordId(), + ':coll_id_from' => $coll_id_from, ':coll_id' => $record->getCollectionId(), ':action' => $action, ':final' => $final, diff --git a/lib/classes/record/adapter.php b/lib/classes/record/adapter.php index 3b1dd053d8..e49904424a 100644 --- a/lib/classes/record/adapter.php +++ b/lib/classes/record/adapter.php @@ -529,8 +529,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface return $this; } - $this->app['phraseanet.logger']($this->getDatabox()) - ->log($this, Session_Logger::EVENT_MOVE_FROM, $this->getCollectionId(), ''); + $coll_id_from = $this->getCollectionId(); $sql = "UPDATE record SET moddate = NOW(), coll_id = :coll_id WHERE record_id =:record_id"; @@ -546,7 +545,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface $this->base_id = $collection->get_base_id(); $this->app['phraseanet.logger']($this->getDatabox()) - ->log($this, Session_Logger::EVENT_MOVE, $collection->get_coll_id(), ''); + ->log($this, Session_Logger::EVENT_MOVE, $collection->get_coll_id(), '', $coll_id_from); $this->delete_data_from_cache();