diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php index 37aca2f9d0..92a45c8fee 100644 --- a/filemanager/inc/class.filemanager_ui.inc.php +++ b/filemanager/inc/class.filemanager_ui.inc.php @@ -1046,6 +1046,12 @@ class filemanager_ui if($lock = Vfs::checkLock($path)) { $row['locked'] = 'lock'; + $row['locked_status'] = lang( + "LOCK from %1, created %2", + // Not sure why sometimes the lock is owned by a user ID, sometimes mailto:user@email + is_numeric($lock['owner']) ? $GLOBALS['egw']->accounts->username($lock['owner']) : str_replace('mailto:', '', $lock['owner']), + Api\DateTime::to(APi\DateTime::server2user($lock['created']), '') + ); if($GLOBALS['egw_info']['user']['apps']['admin'] || Vfs::$is_admin || Vfs::$is_root || $lock['owner'] == $GLOBALS['egw_info']['user']['account_id'] || $lock['owner'] == 'mailto:' . $GLOBALS['egw_info']['user']['account_email'] diff --git a/filemanager/templates/default/index.xet b/filemanager/templates/default/index.xet index 569dc7b55d..0facea909f 100644 --- a/filemanager/templates/default/index.xet +++ b/filemanager/templates/default/index.xet @@ -33,7 +33,7 @@ - + diff --git a/pixelegg/images/unlock.svg b/pixelegg/images/unlock.svg new file mode 100644 index 0000000000..1b3b8b7fc6 --- /dev/null +++ b/pixelegg/images/unlock.svg @@ -0,0 +1,53 @@ + + + + + + + + + +