gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-11 00:15:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix sending notification when attributes have been changed

Browse Source
This commit is contained in:
Uwe Steinmann 2018-03-19 11:31:09 +01:00
parent 9b525b10a2
commit e9c9b48140
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
op/op.EditDocument.php
View File

@ -109,7 +109,13 @@ $oldcomment = $document->getComment();
$oldcategories = $document->getCategories(); $oldcategories = $document->getCategories();
$oldkeywords = $document->getKeywords(); $oldkeywords = $document->getKeywords();
$oldexpires = $document->getExpires(); $oldexpires = $document->getExpires();
$oldattributes = $document->getAttributes(); /* Make a real copy of each attribute because setting a new attribute value
* will just update the old attribute object in array attributes[] and hence
* also update the old value
*/
foreach($document->getAttributes() as $ai=>$aa)
$oldattributes[$ai] = clone $aa;
//$oldattributes = $document->getAttributes();
$controller->setParam('document', $document); $controller->setParam('document', $document);
$controller->setParam('name', $name); $controller->setParam('name', $name);
@ -212,10 +218,10 @@ if ($expires != $oldexpires) {
if ($oldkeywords != $keywords) { if ($oldkeywords != $keywords) {
} }
/* First check for changed attributes or old attributes that have been deleted */ $newattributes = $document->getAttributes();
if($oldattributes) { if($oldattributes) {
foreach($oldattributes as $attrdefid=>$attribute) { foreach($oldattributes as $attrdefid=>$attribute) {
if(!isset($attributes[$attrdefid]) || $attributes[$attrdefid] != $oldattributes[$attrdefid]->getValue()) { if(!isset($newattributes[$attrdefid]) || $newattributes[$attrdefid]->getValueAsArray() !== $oldattributes[$attrdefid]->getValueAsArray()) {
if($notifier) { if($notifier) {
$notifyList = $document->getNotifyList(); $notifyList = $document->getNotifyList();
$subject = "attribute_changed_email_subject"; $subject = "attribute_changed_email_subject";
@ -224,8 +230,8 @@ if($oldattributes) {
$params['name'] = $document->getName(); $params['name'] = $document->getName();
$params['version'] = ''; $params['version'] = '';
$params['attribute_name'] = $attribute->getAttributeDefinition()->getName(); $params['attribute_name'] = $attribute->getAttributeDefinition()->getName();
$params['attribute_old_value'] = $attribute->get->getValueAsString(); $params['attribute_old_value'] = $oldattributes[$attrdefid]->getValue();
$params['attribute_new_value'] = $attributes[$attrdefid]; $params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValue() : '';
$params['folder_path'] = $folder->getFolderPathPlain(); $params['folder_path'] = $folder->getFolderPathPlain();
$params['username'] = $user->getFullName(); $params['username'] = $user->getFullName();
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
@ -241,9 +247,9 @@ if($oldattributes) {
} }
} }
/* Check for new attributes which didn't have a value before */ /* Check for new attributes which didn't have a value before */
if($attributes) { if($newattributes) {
foreach($attributes as $attrdefid=>$attribute) { foreach($newattributes as $attrdefid=>$attribute) {
if(!$oldattributes[$attrdefid]) { if(!isset($oldattributes[$attrdefid]) && $attribute) {
if($notifier) { if($notifier) {
$notifyList = $document->getNotifyList(); $notifyList = $document->getNotifyList();
$subject = "attribute_changed_email_subject"; $subject = "attribute_changed_email_subject";
@ -253,7 +259,7 @@ if($attributes) {
$params['version'] = ''; $params['version'] = '';
$params['attribute_name'] = $dms->getAttributeDefinition($attrdefid)->getName(); $params['attribute_name'] = $dms->getAttributeDefinition($attrdefid)->getName();
$params['attribute_old_value'] = ''; $params['attribute_old_value'] = '';
$params['attribute_new_value'] = $attribute; $params['attribute_new_value'] = $attribute->getValue();
$params['folder_path'] = $folder->getFolderPathPlain(); $params['folder_path'] = $folder->getFolderPathPlain();
$params['username'] = $user->getFullName(); $params['username'] = $user->getFullName();
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();