don't crash if folder/document was deleted (Bug #186)

This commit is contained in:
Uwe Steinmann 2014-11-24 19:08:17 +01:00
parent 0d4f9ad49a
commit b39b92e0b0

View File

@ -43,6 +43,7 @@ if ($targetFolder->getAccessMode($user) < M_READWRITE) {
$clipboard = $session->getClipboard(); $clipboard = $session->getClipboard();
foreach($clipboard['docs'] as $documentid) { foreach($clipboard['docs'] as $documentid) {
$document = $dms->getDocument($documentid); $document = $dms->getDocument($documentid);
if($document) {
$oldFolder = $document->getFolder(); $oldFolder = $document->getFolder();
if ($document->getAccessMode($user) < M_READWRITE) { if ($document->getAccessMode($user) < M_READWRITE) {
@ -81,10 +82,11 @@ foreach($clipboard['docs'] as $documentid) {
$session->removeFromClipboard($document); $session->removeFromClipboard($document);
} }
} }
}
foreach($clipboard['folders'] as $folderid) { foreach($clipboard['folders'] as $folderid) {
$folder = $dms->getFolder($folderid); $folder = $dms->getFolder($folderid);
if($folder) {
if ($folder->getAccessMode($user) < M_READWRITE) { if ($folder->getAccessMode($user) < M_READWRITE) {
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("access_denied")); UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("access_denied"));
} }
@ -118,6 +120,7 @@ foreach($clipboard['folders'] as $folderid) {
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured")); UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));
} }
} }
}
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_moved_clipboard'))); $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_moved_clipboard')));