gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 21:21:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2022-04-14 17:01:34 +02:00
commit eca2701da1
5 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -232,6 +232,8 @@
- fix possible DoS in op/op.RemoveLog.php - fix possible DoS in op/op.RemoveLog.php
- show only calendar events of logged in user - show only calendar events of logged in user
- show expired documents in calendar - show expired documents in calendar
- call new hook 'cleanUpDocument' after uploading or updating a document
- pass 'add' or 'update' to hook 'addDocumentContentFile'
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.24 Changes in version 5.1.24

3
op/op.AddDocument.php
View File

@ -490,6 +490,9 @@ foreach($file_ary as $file) {
} }
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),$errmsg); UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),$errmsg);
} else { } else {
if($controller->hasHook('cleanUpDocument')) {
$controller->callHook('cleanUpDocument', $document, $file);
}
// Send notification to subscribers of folder. // Send notification to subscribers of folder.
if($notifier) { if($notifier) {
$notifier->sendNewDocumentMail($document, $user); $notifier->sendNewDocumentMail($document, $user);

3
op/op.UpdateDocument.php
View File

@ -383,6 +383,9 @@ default:
if(!$content = $controller->run()) { if(!$content = $controller->run()) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg())); UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
} else { } else {
if($controller->hasHook('cleanUpDocument')) {
$controller->callHook('cleanUpDocument', $document, $file);
}
// Send notification to subscribers. // Send notification to subscribers.
if($notifier) { if($notifier) {
$notifier->sendNewDocumentVersionMail($document, $user); $notifier->sendNewDocumentVersionMail($document, $user);

2
views/bootstrap/class.AddDocument.php
View File

@ -419,7 +419,7 @@ console.log(params);
$this->getDocumentChooserHtml("adddocform", M_READ, -1, null, 'librarydoc', $libraryfolder, 1) $this->getDocumentChooserHtml("adddocform", M_READ, -1, null, 'librarydoc', $libraryfolder, 1)
); );
} }
if($arr = $this->callHook('addDocumentContentFile')) { if($arr = $this->callHook('addDocumentContentFile', 'add')) {
foreach($arr as $ar) foreach($arr as $ar)
if(is_array($ar)) { if(is_array($ar)) {
$this->formField($ar[0], $ar[1], isset($ar[2]) ? $ar[2] : null); $this->formField($ar[0], $ar[1], isset($ar[2]) ? $ar[2] : null);

2
views/bootstrap/class.UpdateDocument.php
View File

@ -240,7 +240,7 @@ console.log(element);
$this->getDropFolderChooserHtml("form1") $this->getDropFolderChooserHtml("form1")
); );
} }
if($arr = $this->callHook('addDocumentContentFile')) { if($arr = $this->callHook('addDocumentContentFile', 'update')) {
foreach($arr as $ar) foreach($arr as $ar)
if(is_array($ar)) { if(is_array($ar)) {
$this->formField($ar[0], $ar[1], isset($ar[2]) ? $ar[2] : null); $this->formField($ar[0], $ar[1], isset($ar[2]) ? $ar[2] : null);