From 7b4e86395fc2125caae18e42d32b985ba459e130 Mon Sep 17 00:00:00 2001 From: fujia Date: Tue, 14 Sep 2010 03:16:08 +0000 Subject: [PATCH] + add loghistory of deleted files. --- module/action/lang/en.php | 40 +++++++++++++++++++----------------- module/action/lang/ja.php | 40 +++++++++++++++++++----------------- module/action/lang/ko.php | 40 +++++++++++++++++++----------------- module/action/lang/zh-cn.php | 40 +++++++++++++++++++----------------- module/action/lang/zh-tw.php | 40 +++++++++++++++++++----------------- module/file/control.php | 3 +++ 6 files changed, 108 insertions(+), 95 deletions(-) diff --git a/module/action/lang/en.php b/module/action/lang/en.php index c00088228d..579c85d539 100644 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -46,25 +46,26 @@ $lang->action->objectTypes['doc'] = 'DOC'; $lang->action->objectTypes['doclib'] = 'DocLib'; /* 用来描述操作历史记录.*/ -$lang->action->desc->common = '$date, $action by $actor'; -$lang->action->desc->extra = '$date, $action as $extra by $actor'; -$lang->action->desc->opened = '$date, Opened by $actor.'; -$lang->action->desc->created = '$date, Created by $actor.'; -$lang->action->desc->changed = '$date, Changed by $actor.'; -$lang->action->desc->edited = '$date, Edited by $actor.'; -$lang->action->desc->closed = '$date, Closed by $actor.'; -$lang->action->desc->deleted = '$date, Deleted by $actor.'; -$lang->action->desc->erased = '$date, Erased by $actor.'; -$lang->action->desc->undeleted = '$date, Restored by $actor.'; -$lang->action->desc->commented = '$date, Commented by $actor.'; -$lang->action->desc->activated = '$date, Activated by $actor.'; -$lang->action->desc->moved = '$date, Moved by $actor, previouse is "$extra"'; -$lang->action->desc->confirmed = '$date, Confirmed by $actor, version is#$extra'; -$lang->action->desc->started = '$date, Started by $actor.'; -$lang->action->desc->canceled = '$date, Canceled by $actor.'; -$lang->action->desc->finished = '$date, Finished by $actor.'; -$lang->action->desc->diff1 = 'Changed %s, old is "%s", new is "%s".
'; -$lang->action->desc->diff2 = 'Changed %s, the diff is：
%s
'; +$lang->action->desc->common = '$date, $action by $actor'; +$lang->action->desc->extra = '$date, $action as $extra by $actor'; +$lang->action->desc->opened = '$date, Opened by $actor.'; +$lang->action->desc->created = '$date, Created by $actor.'; +$lang->action->desc->changed = '$date, Changed by $actor.'; +$lang->action->desc->edited = '$date, Edited by $actor.'; +$lang->action->desc->closed = '$date, Closed by $actor.'; +$lang->action->desc->deleted = '$date, Deleted by $actor.'; +$lang->action->desc->deletedfile = '$date, Deleted file by $actor, the file is $extra'; +$lang->action->desc->erased = '$date, Erased by $actor.'; +$lang->action->desc->undeleted = '$date, Restored by $actor.'; +$lang->action->desc->commented = '$date, Commented by $actor.'; +$lang->action->desc->activated = '$date, Activated by $actor.'; +$lang->action->desc->moved = '$date, Moved by $actor, previouse is "$extra"'; +$lang->action->desc->confirmed = '$date, Confirmed by $actor, version is#$extra'; +$lang->action->desc->started = '$date, Started by $actor.'; +$lang->action->desc->canceled = '$date, Canceled by $actor.'; +$lang->action->desc->finished = '$date, Finished by $actor.'; +$lang->action->desc->diff1 = 'Changed %s, old is "%s", new is "%s".
'; +$lang->action->desc->diff2 = 'Changed %s, the diff is：
%s
'; /* 用来显示动态信息.*/ $lang->action->label->created = 'created'; @@ -73,6 +74,7 @@ $lang->action->label->changed = 'changed'; $lang->action->label->edited = 'edited'; $lang->action->label->closed = 'closed'; $lang->action->label->deleted = 'deleted'; +$lang->action->label->deletedfile = 'deleted file'; $lang->action->label->erased = 'deleted'; $lang->action->label->undeleted = 'restore'; $lang->action->label->commented = 'commented'; diff --git a/module/action/lang/ja.php b/module/action/lang/ja.php index 10267a6f20..125720ea86 100644 --- a/module/action/lang/ja.php +++ b/module/action/lang/ja.php @@ -46,25 +46,26 @@ $lang->action->objectTypes['doc'] = 'ドキュメント'; $lang->action->objectTypes['doclib'] = 'DocLib'; /* 用来描述操作历史记录.*/ -$lang->action->desc->common = '$date, $action by $actor'; -$lang->action->desc->extra = '$date, $action as $extra by $actor'; -$lang->action->desc->opened = '$date, Opened by $actor.'; -$lang->action->desc->created = '$date, Created by $actor.'; -$lang->action->desc->changed = '$date, Changed by $actor.'; -$lang->action->desc->edited = '$date, Edited by $actor.'; -$lang->action->desc->closed = '$date, Closed by $actor.'; -$lang->action->desc->deleted = '$date, Deleted by $actor.'; -$lang->action->desc->erased = '$date, Erased by $actor.'; -$lang->action->desc->undeleted = '$date, Restored by $actor.'; -$lang->action->desc->commented = '$date, Commented by $actor.'; -$lang->action->desc->activated = '$date, Activated by $actor.'; -$lang->action->desc->moved = '$date, Moved by $actor, previouse is "$extra"'; -$lang->action->desc->confirmed = '$date, Confirmed by $actor, version is#$extra'; -$lang->action->desc->started = '$date, Started by $actor.'; -$lang->action->desc->canceled = '$date, Canceled by $actor.'; -$lang->action->desc->finished = '$date, Finished by $actor.'; -$lang->action->desc->diff1 = 'Changed %s, old is "%s", new is "%s".
'; -$lang->action->desc->diff2 = 'Changed %s, the diff is：
%s
'; +$lang->action->desc->common = '$date, $action by $actor'; +$lang->action->desc->extra = '$date, $action as $extra by $actor'; +$lang->action->desc->opened = '$date, Opened by $actor.'; +$lang->action->desc->created = '$date, Created by $actor.'; +$lang->action->desc->changed = '$date, Changed by $actor.'; +$lang->action->desc->edited = '$date, Edited by $actor.'; +$lang->action->desc->closed = '$date, Closed by $actor.'; +$lang->action->desc->deleted = '$date, Deleted by $actor.'; +$lang->action->desc->deletedfile = '$date, Deleted file by $actor, the file is $extra'; +$lang->action->desc->erased = '$date, Erased by $actor.'; +$lang->action->desc->undeleted = '$date, Restored by $actor.'; +$lang->action->desc->commented = '$date, Commented by $actor.'; +$lang->action->desc->activated = '$date, Activated by $actor.'; +$lang->action->desc->moved = '$date, Moved by $actor, previouse is "$extra"'; +$lang->action->desc->confirmed = '$date, Confirmed by $actor, version is#$extra'; +$lang->action->desc->started = '$date, Started by $actor.'; +$lang->action->desc->canceled = '$date, Canceled by $actor.'; +$lang->action->desc->finished = '$date, Finished by $actor.'; +$lang->action->desc->diff1 = 'Changed %s, old is "%s", new is "%s".
'; +$lang->action->desc->diff2 = 'Changed %s, the diff is：
%s
'; /* 用来显示动态信息.*/ $lang->action->label->created = '作成'; @@ -73,6 +74,7 @@ $lang->action->label->changed = '変更'; $lang->action->label->edited = '編集'; $lang->action->label->closed = '閉じた'; $lang->action->label->deleted = '削除された'; +$lang->action->label->deletedfile = 'ファイルを削除'; $lang->action->label->erased = '削除された'; $lang->action->label->undeleted = '復元する'; $lang->action->label->commented = 'コメント'; diff --git a/module/action/lang/ko.php b/module/action/lang/ko.php index d3dc067b35..255d905044 100644 --- a/module/action/lang/ko.php +++ b/module/action/lang/ko.php @@ -46,25 +46,26 @@ $lang->action->objectTypes['doc'] = '덕'; $lang->action->objectTypes['doclib'] = 'DocLib'; /* 用来描述操作历史记录.*/ -$lang->action->desc->common = '$date, $action by $actor'; -$lang->action->desc->extra = '$date, $action as $extra by $actor'; -$lang->action->desc->opened = '$date, Opened by $actor.'; -$lang->action->desc->created = '$date, Created by $actor.'; -$lang->action->desc->changed = '$date, Changed by $actor.'; -$lang->action->desc->edited = '$date, Edited by $actor.'; -$lang->action->desc->closed = '$date, Closed by $actor.'; -$lang->action->desc->deleted = '$date, Deleted by $actor.'; -$lang->action->desc->erased = '$date, Erased by $actor.'; -$lang->action->desc->undeleted = '$date, Restored by $actor.'; -$lang->action->desc->commented = '$date, Commented by $actor.'; -$lang->action->desc->activated = '$date, Activated by $actor.'; -$lang->action->desc->moved = '$date, Moved by $actor, previouse is "$extra"'; -$lang->action->desc->confirmed = '$date, Confirmed by $actor, version is#$extra'; -$lang->action->desc->started = '$date, Started by $actor.'; -$lang->action->desc->canceled = '$date, Canceled by $actor.'; -$lang->action->desc->finished = '$date, Finished by $actor.'; -$lang->action->desc->diff1 = 'Changed %s, old is "%s", new is "%s".
'; -$lang->action->desc->diff2 = 'Changed %s, the diff is：
%s
'; +$lang->action->desc->common = '$date, $action by $actor'; +$lang->action->desc->extra = '$date, $action as $extra by $actor'; +$lang->action->desc->opened = '$date, Opened by $actor.'; +$lang->action->desc->created = '$date, Created by $actor.'; +$lang->action->desc->changed = '$date, Changed by $actor.'; +$lang->action->desc->edited = '$date, Edited by $actor.'; +$lang->action->desc->closed = '$date, Closed by $actor.'; +$lang->action->desc->deleted = '$date, Deleted by $actor.'; +$lang->action->desc->deletedfile = '$date, Deleted file by $actor, the file is $extra'; +$lang->action->desc->erased = '$date, Erased by $actor.'; +$lang->action->desc->undeleted = '$date, Restored by $actor.'; +$lang->action->desc->commented = '$date, Commented by $actor.'; +$lang->action->desc->activated = '$date, Activated by $actor.'; +$lang->action->desc->moved = '$date, Moved by $actor, previouse is "$extra"'; +$lang->action->desc->confirmed = '$date, Confirmed by $actor, version is#$extra'; +$lang->action->desc->started = '$date, Started by $actor.'; +$lang->action->desc->canceled = '$date, Canceled by $actor.'; +$lang->action->desc->finished = '$date, Finished by $actor.'; +$lang->action->desc->diff1 = 'Changed %s, old is "%s", new is "%s".
'; +$lang->action->desc->diff2 = 'Changed %s, the diff is：
%s
'; /* 用来显示动态信息.*/ $lang->action->label->created = '생성'; @@ -73,6 +74,7 @@ $lang->action->label->changed = '변경됨'; $lang->action->label->edited = '편집'; $lang->action->label->closed = '폐쇄'; $lang->action->label->deleted = '삭제'; +$lang->action->label->deletedfile = '파일을 삭제'; $lang->action->label->erased = '삭제'; $lang->action->label->undeleted = '복원'; $lang->action->label->commented = '논평'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index ebb8af1da7..bec15e75be 100644 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -46,25 +46,26 @@ $lang->action->objectTypes['doc'] = '文档'; $lang->action->objectTypes['doclib'] = '文档库'; /* 用来描述操作历史记录。*/ -$lang->action->desc->common = '$date, $action by $actor'; -$lang->action->desc->extra = '$date, $action as $extra by $actor'; -$lang->action->desc->opened = '$date, 由 $actor 创建。'; -$lang->action->desc->created = '$date, 由 $actor 创建。'; -$lang->action->desc->changed = '$date, 由 $actor 变更。'; -$lang->action->desc->edited = '$date, 由 $actor 编辑。'; -$lang->action->desc->closed = '$date, 由 $actor 关闭。'; -$lang->action->desc->deleted = '$date, 由 $actor 删除。'; -$lang->action->desc->erased = '$date, 由 $actor 删除。'; -$lang->action->desc->undeleted = '$date, 由 $actor 还原。'; -$lang->action->desc->commented = '$date, 由 $actor 发表评论。'; -$lang->action->desc->activated = '$date, 由 $actor 激活。'; -$lang->action->desc->moved = '$date, 由 $actor 移动，之前为 "$extra"'; -$lang->action->desc->confirmed = '$date, 由 $actor 确认需求变动，最新版本为#$extra'; -$lang->action->desc->started = '$date, 由 $actor 启动。'; -$lang->action->desc->canceled = '$date, 由 $actor 取消。'; -$lang->action->desc->finished = '$date, 由 $actor 完成。'; -$lang->action->desc->diff1 = '修改了 %s，旧值为 "%s"，新值为 "%s"。
'; -$lang->action->desc->diff2 = '修改了 %s，区别为：
%s
'; +$lang->action->desc->common = '$date, $action by $actor'; +$lang->action->desc->extra = '$date, $action as $extra by $actor'; +$lang->action->desc->opened = '$date, 由 $actor 创建。'; +$lang->action->desc->created = '$date, 由 $actor 创建。'; +$lang->action->desc->changed = '$date, 由 $actor 变更。'; +$lang->action->desc->edited = '$date, 由 $actor 编辑。'; +$lang->action->desc->closed = '$date, 由 $actor 关闭。'; +$lang->action->desc->deleted = '$date, 由 $actor 删除。'; +$lang->action->desc->deletedfile = '$date, 由 $actor 删除了附件：$extra'; +$lang->action->desc->erased = '$date, 由 $actor 删除。'; +$lang->action->desc->undeleted = '$date, 由 $actor 还原。'; +$lang->action->desc->commented = '$date, 由 $actor 发表评论。'; +$lang->action->desc->activated = '$date, 由 $actor 激活。'; +$lang->action->desc->moved = '$date, 由 $actor 移动，之前为 "$extra"'; +$lang->action->desc->confirmed = '$date, 由 $actor 确认需求变动，最新版本为#$extra'; +$lang->action->desc->started = '$date, 由 $actor 启动。'; +$lang->action->desc->canceled = '$date, 由 $actor 取消。'; +$lang->action->desc->finished = '$date, 由 $actor 完成。'; +$lang->action->desc->diff1 = '修改了 %s，旧值为 "%s"，新值为 "%s"。
'; +$lang->action->desc->diff2 = '修改了 %s，区别为：
%s
'; /* 用来显示动态信息。*/ $lang->action->label->created = '创建了'; @@ -73,6 +74,7 @@ $lang->action->label->changed = '变更了'; $lang->action->label->edited = '编辑了'; $lang->action->label->closed = '关闭了'; $lang->action->label->deleted = '删除了'; +$lang->action->label->deletedfile = '删除附件'; $lang->action->label->erased = '删除了'; $lang->action->label->undeleted = '还原了'; $lang->action->label->commented = '评论了'; diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php index 4a421ee358..e81c22fd0f 100644 --- a/module/action/lang/zh-tw.php +++ b/module/action/lang/zh-tw.php @@ -46,25 +46,26 @@ $lang->action->objectTypes['doc'] = '文檔'; $lang->action->objectTypes['doclib'] = '文檔庫'; /* 用來描述操作歷史記錄。*/ -$lang->action->desc->common = '$date, $action by $actor'; -$lang->action->desc->extra = '$date, $action as $extra by $actor'; -$lang->action->desc->opened = '$date, 由 $actor 創建。'; -$lang->action->desc->created = '$date, 由 $actor 創建。'; -$lang->action->desc->changed = '$date, 由 $actor 變更。'; -$lang->action->desc->edited = '$date, 由 $actor 編輯。'; -$lang->action->desc->closed = '$date, 由 $actor 關閉。'; -$lang->action->desc->deleted = '$date, 由 $actor 刪除。'; -$lang->action->desc->erased = '$date, 由 $actor 刪除。'; -$lang->action->desc->undeleted = '$date, 由 $actor 還原。'; -$lang->action->desc->commented = '$date, 由 $actor 發表評論。'; -$lang->action->desc->activated = '$date, 由 $actor 激活。'; -$lang->action->desc->moved = '$date, 由 $actor 移動，之前為 "$extra"'; -$lang->action->desc->confirmed = '$date, 由 $actor 確認需求變動，最新版本為#$extra'; -$lang->action->desc->started = '$date, 由 $actor 啟動。'; -$lang->action->desc->canceled = '$date, 由 $actor 取消。'; -$lang->action->desc->finished = '$date, 由 $actor 完成。'; -$lang->action->desc->diff1 = '修改了 %s，舊值為 "%s"，新值為 "%s"。
'; -$lang->action->desc->diff2 = '修改了 %s，區別為：
%s
'; +$lang->action->desc->common = '$date, $action by $actor'; +$lang->action->desc->extra = '$date, $action as $extra by $actor'; +$lang->action->desc->opened = '$date, 由 $actor 創建。'; +$lang->action->desc->created = '$date, 由 $actor 創建。'; +$lang->action->desc->changed = '$date, 由 $actor 變更。'; +$lang->action->desc->edited = '$date, 由 $actor 編輯。'; +$lang->action->desc->closed = '$date, 由 $actor 關閉。'; +$lang->action->desc->deleted = '$date, 由 $actor 刪除。'; +$lang->action->desc->deletedfile = '$date, 由 $actor 刪除了附件：$extra'; +$lang->action->desc->erased = '$date, 由 $actor 刪除。'; +$lang->action->desc->undeleted = '$date, 由 $actor 還原。'; +$lang->action->desc->commented = '$date, 由 $actor 發表評論。'; +$lang->action->desc->activated = '$date, 由 $actor 激活。'; +$lang->action->desc->moved = '$date, 由 $actor 移動，之前為 "$extra"'; +$lang->action->desc->confirmed = '$date, 由 $actor 確認需求變動，最新版本為#$extra'; +$lang->action->desc->started = '$date, 由 $actor 啟動。'; +$lang->action->desc->canceled = '$date, 由 $actor 取消。'; +$lang->action->desc->finished = '$date, 由 $actor 完成。'; +$lang->action->desc->diff1 = '修改了 %s，舊值為 "%s"，新值為 "%s"。
'; +$lang->action->desc->diff2 = '修改了 %s，區別為：
%s
'; /* 用來顯示動態信息。*/ $lang->action->label->created = '創建了'; @@ -73,6 +74,7 @@ $lang->action->label->changed = '變更了'; $lang->action->label->edited = '編輯了'; $lang->action->label->closed = '關閉了'; $lang->action->label->deleted = '刪除了'; +$lang->action->label->deletedfile = '刪除附件'; $lang->action->label->erased = '刪除了'; $lang->action->label->undeleted = '還原了'; $lang->action->label->commented = '評論了'; diff --git a/module/file/control.php b/module/file/control.php index e3da46106d..2923b79621 100644 --- a/module/file/control.php +++ b/module/file/control.php @@ -114,7 +114,10 @@ class file extends control } else { + $file = $this->file->getById($fileID); $this->dao->delete()->from(TABLE_FILE)->where('id')->eq($fileID)->exec(); + $this->loadModel('action')->create($file->objectType, $file->objectID, 'deletedFile', '', $extra=$file->title); + @unlink($file->realPath); die(js::reload('parent')); } }