diff --git a/inc/inc.ClassEmailUtils.php b/inc/inc.ClassEmailUtils.php index 28d32cc9c..c9498a9f8 100644 --- a/inc/inc.ClassEmailUtils.php +++ b/inc/inc.ClassEmailUtils.php @@ -42,7 +42,7 @@ class SeedDMS_EmailUtils { return(str_replace( array('###SITENAME###', '###HTTP_ROOT###', '###URL_PREFIX###'), - array($settings->_siteName, $settings->_httpRoot, getBaseUrl().$settings->_httpRoot), + array($settings->_siteName, $settings->_httpRoot, $settings->getBaseUrl().$settings->_httpRoot), $text)); } /* }}} */ diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php index c9454e10a..00d128dbb 100644 --- a/inc/inc.ClassNotificationService.php +++ b/inc/inc.ClassNotificationService.php @@ -186,7 +186,7 @@ class SeedDMS_NotificationService { $params['version'] = $content->getVersion(); $params['comment'] = $document->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -208,7 +208,7 @@ class SeedDMS_NotificationService { $params['version'] = $content->getVersion(); $params['comment'] = $document->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -243,7 +243,7 @@ class SeedDMS_NotificationService { $params['version'] = $content->getVersion(); $params['comment'] = $document->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."¤ttab=revapp"; + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID()."¤ttab=revapp"; $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -285,7 +285,7 @@ class SeedDMS_NotificationService { $params['version'] = $content->getVersion(); $params['comment'] = $document->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."¤ttab=revapp"; + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID()."¤ttab=revapp"; $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -329,7 +329,7 @@ class SeedDMS_NotificationService { $params['username'] = $user->getFullName(); $params['comment'] = $document->getComment(); $params['version_comment'] = $lc->getComment(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; $this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -361,7 +361,7 @@ class SeedDMS_NotificationService { $params['comment'] = $document->getComment(); $params['version'] = $lc->getVersion(); $params['version_comment'] = $lc->getComment(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; $this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -402,7 +402,7 @@ class SeedDMS_NotificationService { $params['username'] = $user->getFullName(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewFolder.php?folderid=".$folder->getID(); $this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); foreach ($nl["groups"] as $grp) { $this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -432,7 +432,7 @@ class SeedDMS_NotificationService { $params['username'] = $user->getFullName(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); foreach ($nl["groups"] as $grp) { $this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -472,7 +472,7 @@ class SeedDMS_NotificationService { $params['folder_path'] = $parent->getFolderPathPlain(); $params['username'] = $user->getFullName(); $params['comment'] = $folder->getComment(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; $this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -504,7 +504,7 @@ class SeedDMS_NotificationService { $params['username'] = $user->getFullName(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$parent->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewFolder.php?folderid=".$parent->getID(); $this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); foreach ($nl["groups"] as $grp) { $this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -529,7 +529,7 @@ class SeedDMS_NotificationService { $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); $params['comment'] = $file->getComment(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; // if user is not owner and owner not already in list of notifiers, then @@ -563,7 +563,7 @@ class SeedDMS_NotificationService { $params['comment'] = $document->getComment(); $params['version'] = $content->getVersion(); $params['version_comment'] = $content->getComment(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; $this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -599,7 +599,7 @@ class SeedDMS_NotificationService { $params['document'] = $document->getName(); $params['document_id'] = $document->getId(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; $this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -621,7 +621,7 @@ class SeedDMS_NotificationService { $params['document_id'] = $document->getId(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; // if user is not owner and owner not already in list of notifiers, then @@ -656,7 +656,7 @@ class SeedDMS_NotificationService { $params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValue() : ''; $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -680,7 +680,7 @@ class SeedDMS_NotificationService { $params['attribute_value'] = $attribute->getValueAsString(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -713,7 +713,7 @@ class SeedDMS_NotificationService { $params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValue() : ''; $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -738,7 +738,7 @@ class SeedDMS_NotificationService { $params['attribute_new_value'] = $attribute->getValue(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -769,7 +769,7 @@ class SeedDMS_NotificationService { $params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValueAsString() : ''; $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -793,7 +793,7 @@ class SeedDMS_NotificationService { $params['attribute_value'] = $attribute->getValueAsString(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -819,7 +819,7 @@ class SeedDMS_NotificationService { $params['old_comment'] = $oldcomment; $params['new_comment'] = $document->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -848,7 +848,7 @@ class SeedDMS_NotificationService { $params['old_comment'] = $oldcomment; $params['new_comment'] = $folder->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; $this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -879,7 +879,7 @@ class SeedDMS_NotificationService { $params['old_comment'] = $oldcomment; $params['new_comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -907,7 +907,7 @@ class SeedDMS_NotificationService { $params['old_name'] = $oldname; $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -935,7 +935,7 @@ class SeedDMS_NotificationService { $params['old_name'] = $oldname; $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; $this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -970,7 +970,7 @@ class SeedDMS_NotificationService { $params['old_folder_path'] = $oldfolder->getFolderPathPlain(); $params['new_folder_path'] = $targetfolder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; $this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -1005,7 +1005,7 @@ class SeedDMS_NotificationService { $params['old_folder_path'] = $oldfolder->getFolderPathPlain(); $params['new_folder_path'] = $targetfolder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; $this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -1033,7 +1033,7 @@ class SeedDMS_NotificationService { $params['username'] = $user->getFullName(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); foreach ($nl["groups"] as $grp) { $this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -1064,7 +1064,7 @@ class SeedDMS_NotificationService { $params['username'] = $user->getFullName(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); foreach ($nl["groups"] as $grp) { $this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -1098,7 +1098,7 @@ class SeedDMS_NotificationService { $params['document_id'] = $document->getId(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -1121,7 +1121,7 @@ class SeedDMS_NotificationService { $params['folder_id'] = $folder->getId(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -1140,7 +1140,7 @@ class SeedDMS_NotificationService { $params['document_id'] = $document->getId(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -1158,7 +1158,7 @@ class SeedDMS_NotificationService { $params['folder_id'] = $folder->getId(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -1182,7 +1182,7 @@ class SeedDMS_NotificationService { $params['status'] = getReviewStatusText($reviewlog["status"]); $params['comment'] = $reviewlog['comment']; $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; $this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -1221,7 +1221,7 @@ class SeedDMS_NotificationService { $params['username'] = $user->getFullName(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."¤ttab=revapp"; + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID()."¤ttab=revapp"; $this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); foreach ($nl["groups"] as $grp) @@ -1257,7 +1257,7 @@ class SeedDMS_NotificationService { $params['username'] = $user->getFullName(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); if($approver->isType('user')) $this->toIndividual($user, $approver, $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER); @@ -1279,7 +1279,7 @@ class SeedDMS_NotificationService { $params['username'] = $user->getFullName(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); if($reviewer->isType('user')) $this->toIndividual($user, $reviewer, $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER); @@ -1308,7 +1308,7 @@ class SeedDMS_NotificationService { $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -1339,7 +1339,7 @@ class SeedDMS_NotificationService { $params['version'] = $content->getVersion(); $params['comment'] = $content->getComment(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; @@ -1362,7 +1362,7 @@ class SeedDMS_NotificationService { $params['username'] = $user->getFullName(); $params['old_owner'] = $oldowner->getFullName(); $params['new_owner'] = $document->getOwner()->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; $this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -1392,7 +1392,7 @@ class SeedDMS_NotificationService { $params['username'] = $user->getFullName(); $params['old_owner'] = $oldowner->getFullName(); $params['new_owner'] = $folder->getOwner()->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; $this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -1417,7 +1417,7 @@ class SeedDMS_NotificationService { $params['document_id'] = $document->getId(); $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; $this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -1438,7 +1438,7 @@ class SeedDMS_NotificationService { else $params['folder_path'] = $folder->getFolderPathPlain(); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; $this->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -1468,7 +1468,7 @@ class SeedDMS_NotificationService { $params['username'] = $user->getFullName(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); // Send notification to subscribers. $this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -1510,7 +1510,7 @@ class SeedDMS_NotificationService { $params['username'] = $user->getFullName(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID(); $usersinformed = array(); $groupsinformed = array(); @@ -1553,7 +1553,7 @@ class SeedDMS_NotificationService { $params['username'] = $user->getFullName(); $params['sitename'] = $this->settings->_siteName; $params['http_root'] = $this->settings->_httpRoot; - $params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."¤ttab=workflow"; + $params['url'] = $this->settings->getBaseUrlWithRoot()."out/out.ViewDocument.php?documentid=".$document->getID()."¤ttab=workflow"; // Send notification to subscribers. $this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); foreach ($nl["groups"] as $grp) {