reworked notification system

The notifaction will now be send in the language as specified in the
user's profile

inc/inc.ClassEmail.php

@@ -31,9 +31,9 @@ require_once("inc.ClassNotify.php");
  */
 class SeedDMS_Email extends SeedDMS_Notify {
 
-	function toIndividual($sender, $recipient, $subject, $message) { /* {{{ */
+	function toIndividual($sender, $recipient, $subject, $message, $params=array()) { /* {{{ */
-	
 		global $settings;
+
 		if ($settings->_enableEmail==FALSE) return 0;
 		
 		if ($recipient->getEmail()=="") return 0;
@@ -49,13 +49,16 @@ class SeedDMS_Email extends SeedDMS_Notify {
 		$headers[] = "From: ". $sender->getFullName() ." <". $sender->getEmail() .">";
 		$headers[] = "Reply-To: ". $sender->getFullName() ." <". $sender->getEmail() .">";
 
-		$message = getMLText("email_header")."\r\n\r\n".$message;
+		$lang = $recipient->getLanguage();
-		$message .= "\r\n\r\n".getMLText("email_footer");
+		$message = getMLText("email_header", array(), "", $lang)."\r\n\r\n".getMLText($message, $params, "", $lang);
+		$message .= "\r\n\r\n".getMLText("email_footer", array(), "", $lang);
 
-		return (mail($recipient->getEmail(), $this->replaceMarker($subject), $this->replaceMarker($message), implode("\r\n", $headers)) ? 0 : -1);
+		mail($recipient->getEmail(), getMLText($subject, $params, "", $lang), $message, implode("\r\n", $headers));
+
+		return true;
 	} /* }}} */
 
-	function toGroup($sender, $groupRecipient, $subject, $message) { /* {{{ */
+	function toGroup($sender, $groupRecipient, $subject, $message, $params=array()) { /* {{{ */
 	
 		global $settings;
 		if (!$settings->_enableEmail) return 0;
@@ -65,29 +68,16 @@ class SeedDMS_Email extends SeedDMS_Notify {
 			return -1;
 		}
 
-		$header = "From: ". $sender->getFullName() ." <". $sender->getEmail() .">\r\n" .
-			"Reply-To: ". $sender->getFullName() ." <". $sender->getEmail() .">\r\n";
-
-		$toList = "";
 		foreach ($groupRecipient->getUsers() as $recipient) {
-		
+			$this->toIndividual($sender, $recipient, $subject, $message, $params);
-			if ($recipient->getEmail()!="")
-				$toList .= (strlen($toList)==0 ? "" : ", ") . $recipient->getEmail();
 		}
 
-		if (strlen($toList)==0) {
+		return true;
-			return -1;
-		}
-		
-		$message = getMLText("email_header")."\r\n\r\n".$message;
-		$message .= "\r\n\r\n".getMLText("email_footer");
-
-		return (mail($toList, parent::replaceMarker($subject), parent::replaceMarker($message), $header) ? 0 : -1);
 	} /* }}} */
 
-	function toList($sender, $recipients, $subject, $message) { /* {{{ */
+	function toList($sender, $recipients, $subject, $message, $params) { /* {{{ */
-	
 		global $settings;
+	
 		if (!$settings->_enableEmail) return 0;
 
 		if ((!is_object($sender) && strcasecmp(get_class($sender), "SeedDMS_Core_User")) ||
@@ -95,35 +85,23 @@ class SeedDMS_Email extends SeedDMS_Notify {
 			return -1;
 		}
 
-		$header = "From: ". $sender->getFullName() ." <". $sender->getEmail() .">\r\n" .
-			"Reply-To: ". $sender->getFullName() ." <". $sender->getEmail() .">\r\n";
-
-		$toList = "";
 		foreach ($recipients as $recipient) {
-			if (is_object($recipient) && !strcasecmp(get_class($recipient), "SeedDMS_Core_User")) {
+			$this->toIndividual($sender, $recipient, $subject, $message, $params);
-			
-				if ($recipient->getEmail()!="")
-					$toList .= (strlen($toList)==0 ? "" : ", ") . $recipient->getEmail();
-			}
 		}
 
-		if (strlen($toList)==0) {
+		return true;
-			return -1;
-		}
-
-		$message = getMLText("email_header")."\r\n\r\n".$message;
-		$message .= "\r\n\r\n".getMLText("email_footer");
-
-		return (mail($toList, $this->replaceMarker($subject), $this->replaceMarker($message), $header) ? 0 : -1);
 	} /* }}} */
 
-	function sendPassword($sender, $recipient, $subject, $message) {
+	function sendPassword($sender, $recipient, $subject, $message) { /* {{{ */
 		global $settings;
 
-		$header = "From: " . $settings->_smtpSendFrom . "\r\n" .
+		$headers   = array();
-"Reply-To: " . $settings->_smtpSendFrom . "\r\n";
+		$headers[] = "MIME-Version: 1.0";
+		$headers[] = "Content-type: text/plain; charset=utf-8";
+		$headers[] = "From: ". $settings->_smtpSendFrom();
+		$headers[] = "Reply-To: ". $settings->_smtpSendFrom();
 
-		return (mail($recipient->getEmail(), $this->replaceMarker($subject), $this->replaceMarker($message), $header) ? 0 : -1);
+		return (mail($recipient->getEmail(), $this->replaceMarker($subject), $this->replaceMarker($message), implode("\r\n", $header)) ? 0 : -1);
-	}
+	} /* }}} */
 }
 ?>

inc/inc.ClassNotify.php

@@ -31,9 +31,9 @@ abstract class SeedDMS_Notify {
 	 */
 	protected $sender;
 
-	abstract function toIndividual($sender, $recipient, $subject, $message);
+	abstract function toIndividual($sender, $recipient, $subject, $message, $params);
-	abstract function toGroup($sender, $groupRecipient, $subject, $message);
+	abstract function toGroup($sender, $groupRecipient, $subject, $message, $params);
-	abstract function toList($sender, $recipients, $subject, $message);
+	abstract function toList($sender, $recipients, $subject, $message, $params);
 
 	function replaceMarker($text) {
 		global $settings;

languages/de_DE/lang.inc

@@ -29,6 +29,8 @@ $text = array(
 'access_mode_read' => "Lesen",
 'access_mode_readwrite' => "Lesen+Schreiben",
 'access_permission_changed_email' => "Zugriffsrechte geändert",
+'access_permission_changed_email_subject' => "[sitename]: [name] - Zugriffsrechte geändert",
+'access_permission_changed_email_body' => "Zugriffsrechte geändert\r\nDokument: [name]\r\nElternordner: [folder_path]\r\nBenutzer: [username]\r\nURL: [url]",
 'according_settings' => "Gemäß Einstellungen",
 'action' => "Aktivität",
 'action_approve' => "Freigeben",
@@ -69,6 +71,8 @@ $text = array(
 'approval_deletion_email' => "Genehmigungsaufforderung gelöscht",
 'approval_group' => "Berechtigungsgruppe",
 'approval_request_email' => "Aufforderung zur Genehmigung",
+'approval_request_email_subject' => "[sitename]: [name] - Aufforderung zur Genehmigung",
+'approval_request_email_body' => "Aufforderung zur Genehmigung\r\nDokument: [name]\r\nVersion: [version]\r\nElternordner: [folder_path]\r\nBenutzer: [username]\r\nURL: [url]",
 'approval_status' => "Freigabestatus",
 'approval_submit_email' => "Genehmigung erteilen",
 'approval_summary' => "Übersicht Freigaben",
@@ -131,7 +135,6 @@ $text = array(
 'choose_workflow_state' => "Workflow-Status wählen",
 'choose_workflow_action' => "Workflow-Aktion wählen",
 'close' => "Schließen",
-'comment_changed_email' => "Kommentar geändert",
 'comment' => "Kommentar",
 'comment_for_current_version' => "Kommentar zur<br>aktuellen Version",
 'confirm_create_fulltext_index' => "Ja, Ich möchte den Volltextindex neu erzeugen!.",
@@ -171,8 +174,13 @@ $text = array(
 'do_object_setchecksum' => "Setze Check-Summe",
 'do_object_unlink' => "Lösche Dokumentenversion",
 'document_already_locked' => "Dieses Dokument ist bereits gesperrt",
+'document_comment_changed_email' => "Kommentar geändert",
+'document_comment_changed_email_subject' => "[sitename]: [name] - Comment changed",
+'document_comment_changed_email_body' => "Comment changed\r\nDokument: [name]\r\nOld comment: [old_comment]\r\nComment: [new_comment]\r\nElternordner: [folder_path]\r\nBenutzer: [username]\r\nURL: [url]",
 'document_deleted' => "Dokument gelöscht",
 'document_deleted_email' => "Dokument gelöscht",
+'document_deleted_email_subject' => "[sitename]: [name] - Dokument gelöscht",
+'document_deleted_email_body' => "Dokument gelöscht\r\nDokument: [name]\r\nElternordner: [folder_path]\r\nBenutzer: [username]",
 'document_duplicate_name' => "Doppelter Dokumentenname",
 'document' => "Dokument",
 'document_has_no_workflow' => "Dokument hat keinen Workflow",
@@ -181,17 +189,25 @@ $text = array(
 'document_link_by' => "Verweis erstellt von",
 'document_link_public' => "Für alle sichtbar",
 'document_moved_email' => "Dokument verschoben",
+'document_moved_email_subject' => "[sitename]: [name] - Dokument verschoben",
+'document_moved_email_body' => "Dokument verschoben\r\nDokument: [name]\r\nAlter Ordner: [old_folder_path]\r\nNeuer Ordner: [new_folder_path]\r\nBenutzer: [username]\r\nURL: [url]",
 'document_renamed_email' => "Dokument umbenannt",
+'document_renamed_email_subject' => "[sitename]: [name] - Dokument umbenannt",
+'document_renamed_email_body' => "Dokument umbenannt\r\nDokument: [name]\r\nElternordner: [folder_path]\r\nOld name: [old_name]\r\nBenutzer: [username]\r\nURL: [url]",
 'documents' => "Dokumente",
 'documents_in_process' => "Dokumente in Bearbeitung",
 'documents_locked_by_you' => "Von mir gesperrte Dokumente",
 'documents_only' => "Nur Dokumente",
 'document_status_changed_email' => "Dokumentenstatus geändert",
+'document_status_changed_email_subject' => "[sitename]: [name] - Dokumentenstatus geändert",
+'document_status_changed_email_body' => "Dokumentenstatus geändert\r\nDokument: [name]\r\nStatus: [status]\r\nElternordner: [folder_path]\r\nBenutzer: [username]\r\nURL: [url]",
 'documents_to_approve' => "Freigabe erforderlich",
 'documents_to_review' => "Prüfung erforderlich",
 'documents_user_requiring_attention' => "Diese Dokumente sollte ich mal nachsehen",
 'document_title' => "Dokument '[documentname]'",
 'document_updated_email' => "Dokument aktualisiert",
+'document_updated_email_subject' => "[sitename]: [name] - Dokument aktualisiert",
+'document_updated_email_body' => "Dokument aktualisiert\r\nDokument: [name]\r\nElternordner: [folder_path]\r\nBenutzer: [username]\r\nURL: [url]",
 'does_not_expire' => "Kein Ablaufdatum",
 'does_not_inherit_access_msg' => "Berechtigungen wieder erben",
 'download' => "Download",
@@ -235,18 +251,29 @@ $text = array(
 'expired' => "abgelaufen",
 'expires' => "Ablaufdatum",
 'expiry_changed_email' => "Ablaufdatum geändert",
+'expiry_changed_email_subject' => "[sitename]: [name] - Expiry date changed",
+'expiry_changed_email_body' => "Expiry date changed\r\nDokument: [name]\r\nElternordner: [folder_path]\r\nBenutzer: [username]\r\nURL: [url]",
 'february' => "Februar",
 'file' => "Datei",
 'files_deletion' => "Dateien löschen",
 'files_deletion_warning' => "Durch diese Operation können Sie Dokumente des DMS löschen. Die Versions-Information bleibt erhalten.",
 'files' => "Dateien",
 'file_size' => "Dateigröße",
+'folder_comment_changed_email' => "Kommentar geändert",
+'folder_comment_changed_email_subject' => "[sitename]: [folder] - Comment changed",
+'folder_comment_changed_email_body' => "Comment changed\r\nOrdner: [name]\r\nVersion: [version]\r\nOld comment: [old_comment]\r\nComment: [new_comment]\r\nElternordner: [folder_path]\r\nBenutzer: [username]\r\nURL: [url]",
 'folder_contents' => "Ordner enthält",
 'folder_deleted_email' => "Ordner gelöscht",
+'folder_deleted_email_subject' => "[sitename]: [name] - Ordner gelöscht",
+'folder_deleted_email_body' => "Ordner gelöscht\r\nOrdner: [name]\r\nElternordner: [folder_path]\r\nBenutzer: [username]\r\nURL: [url]",
 'folder' => "Ordner",
 'folder_infos' => "Informationen",
 'folder_moved_email' => "Ordner verschoben",
+'folder_moved_email_subject' => "[sitename]: [name] - Ordner verschoben",
+'folder_moved_email_body' => "Ordner verschoben\r\nOrdner: [name]\r\nOld folder: [old_folder_path]\r\nNeuer Ordner: [new_folder_path]\r\nBenutzer: [username]\r\nURL: [url]",
 'folder_renamed_email' => "Ordner umbenannt",
+'folder_renamed_email_subject' => "[sitename]: [name] - Ordner umbenannt",
+'folder_renamed_email_body' => "Ordner umbenannt\r\nOrdner: [name]\r\nElternordner: [folder_path]\r\nOld name: [old_name]\r\nBenutzer: [username]\r\nURL: [url]",
 'folders_and_documents_statistic' => "Ordner- und Dokumentenübersicht",
 'folders' => "Verzeichnisse",
 'folder_title' => "SeedDMS - Ordner: [foldername]",
@@ -375,13 +402,17 @@ $text = array(
 'new_default_keywords' => "Neue Vorlage",
 'new_document_category' => "Neue Kategorie",
 'new_document_email' => "Neues Dokument",
-'new_document_email_subject' => "[sitename]: [folder_name] - Neues Document",
+'new_document_email_subject' => "[sitename]: [folder_name] - Neues Dokument",
 'new_document_email_body' => "Neues Dokument\r\nName: [name]\r\nOrdner: [folder_path]\r\nKommentar: [comment]\r\nKommentar der Version: [version_comment]\r\nURL: [url]",
 'new_file_email' => "Neuer Anhang",
+'new_file_email_subject' => "[sitename]: [document] - Neuer Anhang",
+'new_file_email_body' => "Neuer Anhang\r\nName: [name]\r\nDokument: [document]\r\nComment: [comment]\r\nBenutzer: [username]\r\nURL: [url]",
 'new_folder' => "Neuer Ordner",
 'new_password' => "Neues Passwort",
 'new' => "Neu",
 'new_subfolder_email' => "Neuer Ordner",
+'new_subfolder_email_subject' => "[sitename]: [folder_name] - New folder",
+'new_subfolder_email_body' => "New folder\r\nName: [name]\r\nElternordner: [folder_path]\r\nComment: [comment]\r\nBenutzer: [username]\r\nURL: [url]",
 'new_user_image' => "Neues Bild",
 'next_state' => "Neuer Status",
 'no_action' => "Keine Aktion erforderlich.",
@@ -400,7 +431,11 @@ $text = array(
 'no_previous_versions' => "Keine anderen Versionen gefunden",
 'no_review_needed' => "Keine offenen Prüfungen.",
 'notify_added_email' => "Benachrichtigung per Mail wurde eingerichtet",
+'notify_added_email_subject' => "[sitename]: [name] - Added to notification list",
+'notify_added_email_body' => "Added to notification list\r\nName: [name]\r\nElternordner: [folder_path]\r\nBenutzer: [username]\r\nURL: [url]",
 'notify_deleted_email' => "Sie wurden von der Liste der Benachrichtigungen entfernt.",
+'notify_deleted_email_subject' => "[sitename]: [name] - Removed from notification list",
+'notify_deleted_email_body' => "Removed from notification list\r\nName: [name]\r\nElternordner: [folder_path]\r\nBenutzer: [username]\r\nURL: [url]",
 'no_update_cause_locked' => "Sie können daher im Moment diese Datei nicht aktualisieren. Wenden Sie sich an den Benutzer, der die Sperrung eingerichtet hat",
 'no_user_image' => "Kein Bild vorhanden",
 'november' => "November",
@@ -413,6 +448,8 @@ $text = array(
 'original_filename' => "Original filename",
 'owner' => "Besitzer",
 'ownership_changed_email' => "Besitzer geändert",
+'ownership_changed_email_subject' => "[sitename]: [name] - Besitzer geändert",
+'ownership_changed_email_body' => "Besitzer geändert\r\nDokument: [name]\r\nElternordner: [folder_path]\r\nOld owner: [old_owner]\r\nNew owner: [new_owner]\r\nBenutzer: [username]\r\nURL: [url]",
 'password' => "Passwort",
 'password_already_used' => "Passwort schon einmal verwendet",
 'password_repeat' => "Passwort wiederholen",
@@ -438,6 +475,8 @@ $text = array(
 'released' => "freigegeben",
 'removed_approver' => "ist von der Freigeber-Liste entfernt worden.",
 'removed_file_email' => "Anhang gelöscht",
+'removed_file_email_subject' => "[sitename]: [document] - Anhang gelöscht",
+'removed_file_email_body' => "Anhang gelöscht\r\nDokument: [document]\r\nBenutzer: [username]\r\nURL: [url]",
 'removed_reviewer' => "ist von der Prüfer-Liste entfernt worden.",
 'repairing_objects' => "Repariere Dokumente und Ordner.",
 'results_page' => "Ergebnis-Seite",
@@ -449,6 +488,8 @@ $text = array(
 'review_request_email' => "Aufforderung zur Prüfung",
 'review_status' => "Status:",
 'review_submit_email' => "Prüfung ausgeführt",
+'review_submit_email_subject' => "[sitename]: [name] - Prüfung ausgeführt",
+'review_submit_email_body' => "Prüfung ausgeführt\r\nDokument: [name]\r\nVersion: [version]\r\nStatus: [status]\r\nKommentar: [comment]\r\nElternordner: [folder_path]\r\nBenutzer: [username]\r\nURL: [url]",
 'review_summary' => "Übersicht Prüfungen",
 'review_update_failed' => "Störung bei Aktualisierung des Prüfstatus. Aktualisierung gescheitert.",
 'rewind_workflow' => "Zurück zum Anfangszustand",
@@ -582,6 +623,10 @@ $text = array(
 'settings_enableDuplicateDocNames' => "Erlaube doppelte Dokumentennamen",
 'settings_enableNotificationAppRev_desc' => "Setzen Sie diese Option, wenn die Prüfer und Freigeber eines Dokuments beim Hochladen einer neuen Version benachrichtigt werden sollen.",
 'settings_enableNotificationAppRev' => "Prűfer/Freigeber benachrichtigen",
+'settings_enableOwnerRevApp_desc' => "Enable this if you want the owner of a document to be listed as reviewers/approvers and for workflow transitions.",
+'settings_enableOwnerRevApp' => "Allow review/approval for owner",
+'settings_enableSelfRevApp_desc' => "Enable this if you want the currently logged in user to be listed as reviewers/approvers and for workflow transitions.",
+'settings_enableSelfRevApp' => "Allow review/approval for logged in user",
 'settings_enableVersionModification_desc' => "Setzen Sie diese Option, wenn Versionen eines Dokuments nach dem Hochladen noch durch reguläre Benutzer verändert werden dürfen. Administratoren dürfen dies immer.",
 'settings_enableVersionModification' => "Erlaube Modifikation von Versionen",
 'settings_enableVersionDeletion_desc' => "Setzen Sie diese Option, wenn frühere Versionen eines Dokuments durch reguläre Benutzer gelöscht werden können. Administratoren dürfen dies immer.",
@@ -777,6 +822,8 @@ $text = array(
 'users' => "Benutzer",
 'user' => "Benutzer",
 'version_deleted_email' => "Version gelöscht",
+'version_deleted_email_subject' => "[sitename]: [name] - Version gelöscht",
+'version_deleted_email_body' => "Version gelöscht\r\nDokument: [name]\r\nVersion: [version]\r\nElternordner: [folder_path]\r\nBenutzer: [username]\r\nURL: [url]",
 'version_info' => "Versionsinformation",
 'versioning_file_creation' => "Datei-Versionierung",
 'versioning_file_creation_warning' => "Sie erzeugen eine Datei die sämtliche Versions-Informationen eines DMS-Verzeichnisses enthält. Nach Erstellung wird jede Datei im Dokumentenverzeichnis gespeichert.",

languages/en_GB/lang.inc

@@ -29,6 +29,8 @@ $text = array(
 'access_mode_read' => "Read permissions",
 'access_mode_readwrite' => "Read-Write permissions",
 'access_permission_changed_email' => "Permission changed",
+'access_permission_changed_email_subject' => "[sitename]: [name] - Permission changed",
+'access_permission_changed_email_body' => "Permission changed\r\nDocument: [name]\r\nParent folder: [folder_path]\r\nUser: [username]\r\nURL: [url]",
 'according_settings' => "according settings",
 'action' => "Action",
 'action_approve' => "Approve",
@@ -69,6 +71,8 @@ $text = array(
 'approval_deletion_email' => "Approval request deleted",
 'approval_group' => "Approval Group",
 'approval_request_email' => "Approval request",
+'approval_request_email_subject' => "[sitename]: [name] - Approval request",
+'approval_request_email_body' => "Approval request\r\nDocument: [name]\r\nVersion: [version]\r\nParent folder: [folder_path]\r\nUser: [username]\r\nURL: [url]",
 'approval_status' => "Approval Status",
 'approval_submit_email' => "Submitted approval",
 'approval_summary' => "Approval Summary",
@@ -131,7 +135,6 @@ $text = array(
 'choose_workflow_state' => "Choose workflow state",
 'choose_workflow_action' => "Choose workflow action",
 'close' => "Close",
-'comment_changed_email' => "Comment changed",
 'comment' => "Comment",
 'comment_for_current_version' => "Version comment",
 'confirm_create_fulltext_index' => "Yes, I would like to recreate the fulltext index!",
@@ -171,8 +174,13 @@ $text = array(
 'do_object_setchecksum' => "Set checksum",
 'do_object_unlink' => "Delete document version",
 'document_already_locked' => "This document is aleady locked",
+'document_comment_changed_email' => "Comment changed",
+'document_comment_changed_email_subject' => "[sitename]: [name] - Comment changed",
+'document_comment_changed_email_body' => "Comment changed\r\nDocument: [name]\r\nOld comment: [old_comment]\r\nComment: [new_comment]\r\nParent folder: [folder_path]\r\nUser: [username]\r\nURL: [url]",
 'document_deleted' => "Document deleted",
 'document_deleted_email' => "Document deleted",
+'document_deleted_email_subject' => "[sitename]: [name] - Document deleted",
+'document_deleted_email_body' => "Document deleted\r\nDocument: [name]\r\nParent folder: [folder_path]\r\nUser: [username]",
 'document_duplicate_name' => "Duplicate document name",
 'document' => "Document",
 'document_has_no_workflow' => "Document has no workflow",
@@ -181,17 +189,25 @@ $text = array(
 'document_link_by' => "Linked by",
 'document_link_public' => "Public",
 'document_moved_email' => "Document moved",
+'document_moved_email_subject' => "[sitename]: [name] - Document moved",
+'document_moved_email_body' => "Document move\r\nDocument: [name]\r\nOld folder: [old_folder_path]\r\nNew folder: [new_folder_path]\r\nUser: [username]\r\nURL: [url]",
 'document_renamed_email' => "Document renamed",
+'document_renamed_email_subject' => "[sitename]: [name] - Document renamed",
+'document_renamed_email_body' => "Document renamed\r\nDocument: [name]\r\nParent folder: [folder_path]\r\nOld name: [old_name]\r\nUser: [username]\r\nURL: [url]",
 'documents' => "Documents",
 'documents_in_process' => "Documents In Process",
 'documents_locked_by_you' => "Documents locked by you",
 'documents_only' => "Documents only",
 'document_status_changed_email' => "Document status changed",
+'document_status_changed_email_subject' => "[sitename]: [name] - Document status changed",
+'document_status_changed_email_body' => "Document status changed\r\nDocument: [name]\r\nStatus: [status]\r\nParent folder: [folder_path]\r\nUser: [username]\r\nURL: [url]",
 'documents_to_approve' => "Documents awaiting your approval",
 'documents_to_review' => "Documents awaiting your review",
 'documents_user_requiring_attention' => "Documents owned by you that require attention",
 'document_title' => "Document '[documentname]'",
 'document_updated_email' => "Document updated",
+'document_updated_email_subject' => "[sitename]: [name] - Document updated",
+'document_updated_email_body' => "Document updated\r\nDocument: [name]\r\nParent folder: [folder_path]\r\nUser: [username]\r\nURL: [url]",
 'does_not_expire' => "Does not expire",
 'does_not_inherit_access_msg' => "Inherit access",
 'download' => "Download",
@@ -235,18 +251,29 @@ $text = array(
 'expired' => "Expired",
 'expires' => "Expires",
 'expiry_changed_email' => "Expiry date changed",
+'expiry_changed_email_subject' => "[sitename]: [name] - Expiry date changed",
+'expiry_changed_email_body' => "Expiry date changed\r\nDocument: [name]\r\nParent folder: [folder_path]\r\nUser: [username]\r\nURL: [url]",
 'february' => "February",
 'file' => "File",
 'files_deletion' => "Files deletion",
 'files_deletion_warning' => "With this option you can delete all files of entire DMS folders. The versioning information will remain visible.",
 'files' => "Files",
 'file_size' => "Filesize",
+'folder_comment_changed_email' => "Comment changed",
+'folder_comment_changed_email_subject' => "[sitename]: [folder] - Comment changed",
+'folder_comment_changed_email_body' => "Comment changed\r\nFolder: [name]\r\nVersion: [version]\r\nOld comment: [old_comment]\r\nComment: [new_comment]\r\nParent folder: [folder_path]\r\nUser: [username]\r\nURL: [url]",
 'folder_contents' => "Folder Contents",
 'folder_deleted_email' => "Folder deleted",
+'folder_deleted_email_subject' => "[sitename]: [name] - Folder deleted",
+'folder_deleted_email_body' => "Folder deleted\r\nFolder: [name]\r\nParent folder: [folder_path]\r\nUser: [username]\r\nURL: [url]",
 'folder' => "Folder",
 'folder_infos' => "Folder Information",
 'folder_moved_email' => "Folder moved",
+'folder_moved_email_subject' => "[sitename]: [name] - Folder moved",
+'folder_moved_email_body' => "Folder move\r\nFolder: [name]\r\nOld folder: [old_folder_path]\r\nNew folder: [new_folder_path]\r\nUser: [username]\r\nURL: [url]",
 'folder_renamed_email' => "Folder renamed",
+'folder_renamed_email_subject' => "[sitename]: [name] - Folder renamed",
+'folder_renamed_email_body' => "Folder renamed\r\nFolder: [name]\r\nParent folder: [folder_path]\r\nOld name: [old_name]\r\nUser: [username]\r\nURL: [url]",
 'folders_and_documents_statistic' => "Contents overview",
 'folders' => "Folders",
 'folder_title' => "Folder '[foldername]'",
@@ -376,12 +403,16 @@ $text = array(
 'new_document_category' => "Add category",
 'new_document_email' => "New document",
 'new_document_email_subject' => "[sitename]: [folder_name] - New document",
-'new_document_email_body' => "New document\r\nName: [name]\r\nFolder: [folder_path]\r\nComment: [comment]\r\nVersion comment: [version_comment]\r\nURL: [url]",
+'new_document_email_body' => "New document\r\nName: [name]\r\nParent folder: [folder_path]\r\nComment: [comment]\r\nVersion comment: [version_comment]\r\nUser: [username]\r\nURL: [url]",
 'new_file_email' => "New attachment",
+'new_file_email_subject' => "[sitename]: [document] - New attachment",
+'new_file_email_body' => "New attachment\r\nName: [name]\r\nDocument: [document]\r\nComment: [comment]\r\nUser: [username]\r\nURL: [url]",
 'new_folder' => "New folder",
 'new_password' => "New password",
 'new' => "New",
 'new_subfolder_email' => "New folder",
+'new_subfolder_email_subject' => "[sitename]: [name] - New folder",
+'new_subfolder_email_body' => "New folder\r\nName: [name]\r\nParent folder: [folder_path]\r\nComment: [comment]\r\nUser: [username]\r\nURL: [url]",
 'new_user_image' => "New image",
 'next_state' => "New state",
 'no_action' => "No action required",
@@ -400,7 +431,11 @@ $text = array(
 'no_previous_versions' => "No other versions found",
 'no_review_needed' => "No review pending.",
 'notify_added_email' => "You've been added to notify list",
+'notify_added_email_subject' => "[sitename]: [name] - Added to notification list",
+'notify_added_email_body' => "Added to notification list\r\nName: [name]\r\nParent folder: [folder_path]\r\nUser: [username]\r\nURL: [url]",
 'notify_deleted_email' => "You've been removed from notify list",
+'notify_deleted_email_subject' => "[sitename]: [name] - Removed from notification list",
+'notify_deleted_email_body' => "Removed from notification list\r\nName: [name]\r\nParent folder: [folder_path]\r\nUser: [username]\r\nURL: [url]",
 'no_update_cause_locked' => "You can therefore not update this document. Please contanct the locking user.",
 'no_user_image' => "No image found",
 'november' => "November",
@@ -413,6 +448,8 @@ $text = array(
 'original_filename' => "Original filename",
 'owner' => "Owner",
 'ownership_changed_email' => "Owner changed",
+'ownership_changed_email_subject' => "[sitename]: [name] - Owner changed",
+'ownership_changed_email_body' => "Owner changed\r\nDocument: [name]\r\nParent folder: [folder_path]\r\nOld owner: [old_owner]\r\nNew owner: [new_owner]\r\nUser: [username]\r\nURL: [url]",
 'password' => "Password",
 'password_already_used' => "Password already used",
 'password_repeat' => "Repeat password",
@@ -438,6 +475,8 @@ $text = array(
 'released' => "Released",
 'removed_approver' => "has been removed from the list of approvers.",
 'removed_file_email' => "Removed attachment",
+'removed_file_email_subject' => "[sitename]: [document] - Removed attachment",
+'removed_file_email_body' => "Removed attachment\r\nDocument: [document]\r\nUser: [username]\r\nURL: [url]",
 'removed_reviewer' => "has been removed from the list of reviewers.",
 'repairing_objects' => "Reparing documents and folders.",
 'results_page' => "Results Page",
@@ -449,6 +488,8 @@ $text = array(
 'review_request_email' => "Review request",
 'review_status' => "Review status:",
 'review_submit_email' => "Submitted review",
+'review_submit_email_subject' => "[sitename]: [name] - Submitted review",
+'review_submit_email_body' => "Submitted review\r\nDocument: [name]\r\nVersion: [version]\r\nStatus: [status]\r\nComment: [comment]\r\nParent folder: [folder_path]\r\nUser: [username]\r\nURL: [url]",
 'review_summary' => "Review Summary",
 'review_update_failed' => "Error updating review status. Update failed.",
 'rewind_workflow' => "Rewind workflow",
@@ -781,6 +822,8 @@ $text = array(
 'users' => "Users",
 'user' => "User",
 'version_deleted_email' => "Version deleted",
+'version_deleted_email_subject' => "[sitename]: [name] - Version deleted",
+'version_deleted_email_body' => "Version deleted\r\nDocument: [name]\r\nVersion: [version]\r\nParent folder: [folder_path]\r\nUser: [username]\r\nURL: [url]",
 'version_info' => "Version Information",
 'versioning_file_creation' => "Versioning file creation",
 'versioning_file_creation_warning' => "With this operation you can create a file containing the versioning information of an entire DMS folder. After the creation every file will be saved inside the document folder.",

op/op.AddDocument.php

@@ -260,6 +260,7 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 					$notifyList['groups'][] = $dms->getGroup($approvergrpid);
 				}
 			}
+/*
 			$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("new_document_email");
 			$message = getMLText("new_document_email")."\r\n";
 			$message .= 
@@ -274,6 +275,25 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 			foreach ($notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message);
 			}
+*/
+
+			$subject = "new_document_email_subject";
+			$message = "new_document_email_body";
+			$params = array();
+			$params['name'] = $name;
+			$params['folder_name'] = $folder->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['username'] = $user->getFullName();
+			$params['comment'] = $comment;
+			$params['version_comment'] = $version_comment;
+			$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['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+
 		}
 	}
 	

op/op.AddFile.php

@@ -69,9 +69,11 @@ $res = $document->addDocumentFile($name, $comment, $user, $userfiletmp,
 if (is_bool($res) && !$res) {
 	UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));
 } else {
-	$document->getNotifyList();
 	// Send notification to subscribers.
 	if($notifier) {
+		$notifyList = $document->getNotifyList();
+
+/*
 		$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("new_file_email");
 		$message = getMLText("new_file_email")."\r\n";
 		$message .= 
@@ -87,6 +89,22 @@ if (is_bool($res) && !$res) {
 		foreach ($document->_notifyList["groups"] as $grp) {
 			$notifier->toGroup($user, $grp, $subject, $message);
 		}
+*/
+
+		$subject = "new_file_email_subject";
+		$message = "new_file_email_body";
+		$params = array();
+		$params['name'] = $name;
+		$params['document'] = $document->getName();
+		$params['username'] = $user->getFullName();
+		$params['comment'] = $comment;
+		$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['sitename'] = $settings->_siteName;
+		$params['http_root'] = $settings->_httpRoot;
+		$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+		foreach ($notifyList["groups"] as $grp) {
+			$notifier->toGroup($user, $grp, $subject, $message, $params);
+		}
 	}
 }
 

op/op.AddFile2.php

@@ -77,9 +77,11 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 		if (is_bool($res) && !$res) {
 			UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));
 		} else {
-			$document->getNotifyList();
-			// Send notification to subscribers.
 			if($notifier) {
+				$notifyList = $document->getNotifyList();
+				// Send notification to subscribers.
+
+/*
 				$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("new_file_email");
 				$message = getMLText("new_file_email")."\r\n";
 				$message .= 
@@ -88,13 +90,26 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 					getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".	
 					"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
 
-				$subject=$subject;
-				$message=$message;
-				
 				$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
 				foreach ($document->_notifyList["groups"] as $grp) {
 					$notifier->toGroup($user, $grp, $subject, $message);
 				}
+*/
+
+				$subject = "new_file_email_subject";
+				$message = "new_file_email_body";
+				$params = array();
+				$params['name'] = $name;
+				$params['document'] = $document->getName();
+				$params['username'] = $user->getFullName();
+				$params['comment'] = $comment;
+				$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['sitename'] = $settings->_siteName;
+				$params['http_root'] = $settings->_httpRoot;
+				$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+				foreach ($notifyList["groups"] as $grp) {
+					$notifier->toGroup($user, $grp, $subject, $message, $params);
+				}
 			}
 		}
 		add_log_line("?name=".$name."&documentid=".$documentid);

op/op.AddMultiDocument.php

@@ -194,7 +194,9 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 			}
 			// Send notification to subscribers.
 			if($notifier) {
-				$folder->getNotifyList();
+				$notifyList = $folder->getNotifyList();
+
+/*
 				$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("new_document_email");
 				$message = getMLText("new_document_email")."\r\n";
 				$message .= 
@@ -211,6 +213,24 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 				foreach ($folder->_notifyList["groups"] as $grp) {
 					$notifier->toGroup($user, $grp, $subject, $message);
 				}
+*/
+
+				$subject = "new_document_email_subject";
+				$message = "new_document_email_body";
+				$params = array();
+				$params['name'] = $name;
+				$params['folder_name'] = $folder->getName();
+				$params['folder_path'] = $folder->getFolderPathPlain();
+				$params['username'] = $user->getFullName();
+				$params['comment'] = $comment;
+				$params['version_comment'] = $version_comment;
+				$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['sitename'] = $settings->_siteName;
+				$params['http_root'] = $settings->_httpRoot;
+				$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+				foreach ($notifyList["groups"] as $grp) {
+					$notifier->toGroup($user, $grp, $subject, $message, $params);
+				}
 			}
 		}
 

op/op.AddSubFolder.php

@@ -65,7 +65,9 @@ $subFolder = $folder->addSubFolder($name, $comment, $user, $sequence, $attribute
 if (is_object($subFolder)) {
 	// Send notification to subscribers.
 	if($notifier) {
-		$folder->getNotifyList();
+		$notifyList = $folder->getNotifyList();
+
+/*
 		$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("new_subfolder_email");
 		$message = getMLText("new_subfolder_email")."\r\n";
 		$message .= 
@@ -75,13 +77,26 @@ if (is_object($subFolder)) {
 			getMLText("user").": ".$user->getFullName()."\r\n".
 			"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$subFolder->getID()."\r\n";
 
-//		$subject=mydmsDecodeString($subject);
-//		$message=mydmsDecodeString($message);
-		
 		$notifier->toList($user, $folder->_notifyList["users"], $subject, $message);
 		foreach ($folder->_notifyList["groups"] as $grp) {
 			$notifier->toGroup($user, $grp, $subject, $message);
 		}
+*/
+
+		$subject = "new_subfolder_email_subject";
+		$message = "new_subfolder_email_body";
+		$params = array();
+		$params['name'] = $subFolder->getName();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['comment'] = $comment;
+		$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$subFolder->getID();
+		$params['sitename'] = $settings->_siteName;
+		$params['http_root'] = $settings->_httpRoot;
+		$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+		foreach ($notifyList["groups"] as $grp) {
+			$notifier->toGroup($user, $grp, $subject, $message, $params);
+		}
 	}
 
 } else {

op/op.DocumentAccess.php

@@ -107,7 +107,7 @@ if (isset($_GET["groupid"])) {
 	}
 }
 
-//Ändern des Besitzers ----------------------------------------------------------------------------
+// Change owner -----------------------------------------------------------
 if ($action == "setowner") {
 	if (!$user->isAdmin()) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
@@ -150,7 +150,7 @@ if ($action == "setowner") {
 			$subject = "ownership_changed_email_subject";
 			$message = "ownership_changed_email_body";
 			$params = array();
-			$params['document'] = $document->getName();
+			$params['name'] = $document->getName();
 			$params['folder_path'] = $folder->getFolderPathPlain();
 			$params['username'] = $user->getFullName();
 			$params['old_owner'] = $oldOwner->getFullName();
@@ -158,10 +158,11 @@ if ($action == "setowner") {
 			$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['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList2($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup2($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
 			}
+			$notifier->toIndividual($user, $oldOwner, $subject, $message, $params);
 
 		}
 	}
@@ -193,15 +194,15 @@ else if ($action == "notinherit") {
 			$subject = "access_permission_changed_email_subject";
 			$message = "access_permission_changed_email_body";
 			$params = array();
-			$params['document'] = $document->getName();
+			$params['name'] = $document->getName();
 			$params['folder_path'] = $folder->getFolderPathPlain();
 			$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['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList2($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup2($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
 			}
 
 		}
@@ -231,15 +232,15 @@ else if ($action == "notinherit") {
 			$subject = "access_permission_changed_email_subject";
 			$message = "access_permission_changed_email_body";
 			$params = array();
-			$params['document'] = $document->getName();
+			$params['name'] = $document->getName();
 			$params['folder_path'] = $folder->getFolderPathPlain();
 			$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['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList2($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup2($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
 			}
 
 		}
@@ -285,15 +286,15 @@ else if ($action == "setdefault") {
 			$subject = "access_permission_changed_email_subject";
 			$message = "access_permission_changed_email_body";
 			$params = array();
-			$params['document'] = $document->getName();
+			$params['name'] = $document->getName();
 			$params['folder_path'] = $folder->getFolderPathPlain();
 			$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['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList2($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup2($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
 			}
 
 		}

op/op.DocumentNotify.php

@@ -72,14 +72,11 @@ if ($document->getAccessMode($user) < M_READ) {
 // delete notification
 if ($action == "delnotify"){
 	if (isset($userid)) {
-		if($res = $document->removeNotify($userid, true)) {
 		$obj = $dms->getUser($userid);
-		}
+		$res = $document->removeNotify($userid, true);
-	}
+	} elseif (isset($groupid)) {
-	else if (isset($groupid)) {
-		if($res = $document->removeNotify($groupid, false)) {
 		$obj = $dms->getGroup($groupid);
-		}
+		$res = $document->removeNotify($groupid, false);
 	}
 	switch ($res) {
 		case -1:
@@ -97,14 +94,7 @@ if ($action == "delnotify"){
 		case 0:
 			// Email user / group, informing them of subscription change.
 			if($notifier) {
-				$path="";
+/*
-				$folder = $document->getFolder();
-				$folderPath = $folder->getPath();
-				for ($i = 0; $i  < count($folderPath); $i++) {
-					$path .= $folderPath[$i]->getName();
-					if ($i +1 < count($folderPath))
-						$path .= " / ";
-				}
 				$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("notify_deleted_email");
 				$message = getMLText("notify_deleted_email")."\r\n";
 				$message .= 
@@ -113,17 +103,29 @@ if ($action == "delnotify"){
 					getMLText("comment").": ".$document->getComment()."\r\n".
 					"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
 
-//				$subject=mydmsDecodeString($subject);
-//				$message=mydmsDecodeString($message);
-		
 				if (isset($userid)) {
-					$obj = $dms->getUser($userid);
 					$notifier->toIndividual($user, $obj, $subject, $message);
 				}
 				else if (isset($groupid)) {
-					$obj = $dms->getGroup($groupid);
 					$notifier->toGroup($user, $obj, $subject, $message);
 				}
+*/
+				$subject = "notify_deleted_email_subject";
+				$message = "notify_deleted_email_body";
+				$params = array();
+				$params['name'] = $document->getName();
+				$params['folder_path'] = $folder->getFolderPathPlain();
+				$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['sitename'] = $settings->_siteName;
+				$params['http_root'] = $settings->_httpRoot;
+
+				if ($userid > 0) {
+					$notifier->toIndividual($user, $obj, $subject, $message, $params);
+				}
+				else {
+					$notifier->toGroup($user, $obj, $subject, $message, $params);
+				}
 			}
 			break;
 	}
@@ -150,6 +152,8 @@ else if ($action == "addnotify") {
 			case 0:
 				// Email user / group, informing them of subscription.
 				if ($notifier){
+					$obj = $dms->getUser($userid);
+/*
 					$path="";
 					$folder = $document->getFolder();
 					$folderPath = $folder->getPath();
@@ -158,7 +162,6 @@ else if ($action == "addnotify") {
 						if ($i +1 < count($folderPath))
 							$path .= " / ";
 					}
-					$obj = $dms->getUser($userid);
 					$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("notify_added_email");
 					$message = getMLText("notify_added_email")."\r\n";
 					$message .= 
@@ -167,10 +170,19 @@ else if ($action == "addnotify") {
 						getMLText("comment").": ".$document->getComment()."\r\n".
 						"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
 
-//					$subject=mydmsDecodeString($subject);
-//					$message=mydmsDecodeString($message);
-					
 					$notifier->toIndividual($user, $obj, $subject, $message);
+*/
+					$subject = "notify_added_email_subject";
+					$message = "notify_added_email_body";
+					$params = array();
+					$params['name'] = $document->getName();
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$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['sitename'] = $settings->_siteName;
+					$params['http_root'] = $settings->_httpRoot;
+
+					$notifier->toIndividual($user, $obj, $subject, $message, $params);
 				}
 
 				break;
@@ -193,6 +205,8 @@ else if ($action == "addnotify") {
 				break;
 			case 0:
 				if ($notifier){
+					$obj = $dms->getGroup($groupid);
+/*
 					$path="";
 					$folder = $document->getFolder();
 					$folderPath = $folder->getPath();
@@ -201,7 +215,6 @@ else if ($action == "addnotify") {
 						if ($i +1 < count($folderPath))
 							$path .= " / ";
 					}
-					$obj = $dms->getGroup($groupid);
 					$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("notify_added_email");
 					$message = getMLText("notify_added_email")."\r\n";
 					$message .= 
@@ -210,10 +223,19 @@ else if ($action == "addnotify") {
 						getMLText("comment").": ".$document->getComment()."\r\n".
 						"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
 
-//					$subject=mydmsDecodeString($subject);
-//					$message=mydmsDecodeString($message);
-					
 					$notifier->toGroup($user, $obj, $subject, $message);
+*/
+					$subject = "notify_added_email_subject";
+					$message = "notify_added_email_body";
+					$params = array();
+					$params['name'] = $document->getName();
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$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['sitename'] = $settings->_siteName;
+					$params['http_root'] = $settings->_httpRoot;
+
+					$notifier->toGroup($user, $obj, $subject, $message, $params);
 				}
 				break;
 		}

op/op.EditComment.php

@@ -61,10 +61,12 @@ $comment =  $_POST["comment"];
 
 if (($oldcomment = $version->getComment()) != $comment) {
 	if($version->setComment($comment)) {
-		$document->getNotifyList();
 		if($notifier) {
-			$subject = "###SITENAME###: ".$document->getName().", v.".$version->_version." - ".getMLText("comment_changed_email");
+			$notifyList = $document->getNotifyList();
-			$message = getMLText("comment_changed_email")."\r\n";
+
+/*
+			$subject = "###SITENAME###: ".$document->getName().", v.".$version->_version." - ".getMLText("document_comment_changed_email");
+			$message = getMLText("document_comment_changed_email")."\r\n";
 			$message .= 
 				getMLText("document").": ".$document->getName()."\r\n".
 				getMLText("version").": ".$version->_version."\r\n".
@@ -72,9 +74,6 @@ if (($oldcomment = $version->getComment()) != $comment) {
 				getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
 				"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$version->_version."\r\n";
 
-//			$subject=mydmsDecodeString($subject);
-//			$message=mydmsDecodeString($message);
-
 			if(isset($document->_notifyList["users"])) {
 				$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
 			}
@@ -83,6 +82,25 @@ if (($oldcomment = $version->getComment()) != $comment) {
 					$notifier->toGroup($user, $grp, $subject, $message);
 				}
 			}
+*/
+
+			$subject = "document_comment_changed_email_subject";
+			$message = "document_comment_changed_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['version'] = $version->getVersion();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['username'] = $user->getFullName();
+			$params['new_comment'] = $comment;
+			$params['old_comment'] = $oldcomment;
+			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$version->getVersion();
+			$params['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+
 		}
 	}
 	else {

op/op.EditDocument.php

@@ -63,9 +63,10 @@ $attributes = $_POST["attributes"];
 if (($oldname = $document->getName()) != $name) {
 	if($document->setName($name)) {
 		// Send notification to subscribers.
-		$document->getNotifyList();
 		if($notifier) {
+			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
+/*
 			$subject = "###SITENAME###: ".$oldname." - ".getMLText("document_renamed_email");
 			$message = getMLText("document_renamed_email")."\r\n";
 			$message .= 
@@ -75,9 +76,6 @@ if (($oldname = $document->getName()) != $name) {
 				getMLText("comment").": ".$document->getComment()."\r\n".
 				"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
 
-//			$subject=mydmsDecodeString($subject);
-//			$message=mydmsDecodeString($message);
-
 			$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
 			foreach ($document->_notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message);
@@ -86,6 +84,24 @@ if (($oldname = $document->getName()) != $name) {
 			// if user is not owner send notification to owner
 			if ($user->getID() != $document->getOwner()->getID()) 
 				$notifier->toIndividual($user, $document->getOwner(), $subject, $message);		
+*/
+			$subject = "document_renamed_email_subject";
+			$message = "document_renamed_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['old_name'] = $oldname;
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$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['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+			// if user is not owner send notification to owner
+			if ($user->getID() != $document->getOwner()->getID()) 
+				$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
 		}
 
 	}
@@ -97,20 +113,19 @@ if (($oldname = $document->getName()) != $name) {
 if (($oldcomment = $document->getComment()) != $comment) {
 	if($document->setComment($comment)) {
 		// Send notification to subscribers.
-		$document->getNotifyList();
 		if($notifier) {
+			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
+
+/*
 			$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("comment_changed_email");
-			$message = getMLText("comment_changed_email")."\r\n";
+			$message = getMLText("document_comment_changed_email")."\r\n";
 			$message .= 
 				getMLText("document").": ".$document->getName()."\r\n".
 				getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
 				getMLText("comment").": ".$comment."\r\n".
 				"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
 
-//			$subject=mydmsDecodeString($subject);
-//			$message=mydmsDecodeString($message);
-			
 			$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
 			foreach ($document->_notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message);
@@ -119,6 +134,26 @@ if (($oldcomment = $document->getComment()) != $comment) {
 			// if user is not owner send notification to owner
 			if ($user->getID() != $document->getOwner()) 
 				$notifier->toIndividual($user, $document->getOwner(), $subject, $message);		
+*/
+			$subject = "document_comment_changed_email_subject";
+			$message = "document_comment_changed_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['old_comment'] = $oldcomment;
+			$params['new_comment'] = $comment;
+			$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['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+			// if user is not owner send notification to owner
+			if ($user->getID() != $document->getOwner()->getID()) 
+				$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
+
 		}
 	}
 	else {

op/op.EditFolder.php

@@ -63,7 +63,8 @@ if(($oldname = $folder->getName()) != $name) {
 	if($folder->setName($name)) {
 		// Send notification to subscribers.
 		if($notifier) {
-			$folder->getNotifyList();
+			$notifyList = $folder->getNotifyList();
+/*
 			$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("folder_renamed_email");
 			$message = getMLText("folder_renamed_email")."\r\n";
 			$message .= 
@@ -80,6 +81,25 @@ if(($oldname = $folder->getName()) != $name) {
 			foreach ($folder->_notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message);
 			}
+*/
+
+			$subject = "folder_renamed_email_subject";
+			$message = "folder_renamed_email_body";
+			$params = array();
+			$params['name'] = $folder->getName();
+			$params['old_name'] = $oldname;
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$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['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+			// if user is not owner send notification to owner
+			if ($user->getID() != $folder->getOwner()->getID()) 
+				$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params);
 		}
 	} else {
 		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));	
@@ -89,9 +109,10 @@ if(($oldcomment = $folder->getComment()) != $comment) {
 	if($folder->setComment($comment)) {
 		// Send notification to subscribers.
 		if($notifier) {
-			$folder->getNotifyList();
+			$notifyList = $folder->getNotifyList();
+/*
 			$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("comment_changed_email");
-			$message = getMLText("comment_changed_email")."\r\n";
+			$message = getMLText("folder_comment_changed_email")."\r\n";
 			$message .= 
 				getMLText("name").": ".$folder->getName()."\r\n".
 				getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
@@ -105,6 +126,27 @@ if(($oldcomment = $folder->getComment()) != $comment) {
 			foreach ($folder->_notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message);
 			}
+*/
+
+			$subject = "folder_comment_changed_email_subject";
+			$message = "folder_comment_changed_email_body";
+			$params = array();
+			$params['name'] = $folder->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['old_comment'] = $oldcomment;
+			$params['comment'] = $dcomment;
+			$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['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+			// if user is not owner send notification to owner
+			if ($user->getID() != $folder->getOwner()->getID()) 
+				$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params);
+
 		}
 	} else {
 		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));	

op/op.FolderAccess.php

@@ -123,7 +123,8 @@ if ($action == "setowner") {
 	if($folder->setOwner($newOwner)) {
 		if($notifier) {
 			// Send notification to subscribers.
-			$folder->getNotifyList();
+			$notifyList = $folder->getNotifyList();
+/*
 			$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("ownership_changed_email");
 			$message = getMLText("ownership_changed_email")."\r\n";
 			$message .= 
@@ -138,6 +139,25 @@ if ($action == "setowner") {
 			foreach ($folder->_notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message);
 			}
+*/
+
+			$subject = "ownership_changed_email_subject";
+			$message = "ownership_changed_email_body";
+			$params = array();
+			$params['name'] = $folder->getName();
+			$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
+			$params['username'] = $user->getFullName();
+			$params['old_owner'] = $oldOwner->getFullName();
+			$params['new_owner'] = $newOwner->getFullName();
+			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+			$params['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+			$notifier->toIndividual($user, $oldOwner, $subject, $message, $params);
+
 		}
 	} else {
 		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("set_owner_error"));
@@ -151,7 +171,8 @@ else if ($action == "notinherit") {
 	if($folder->setInheritAccess(false)) {
 		if($notifier) {
 			// Send notification to subscribers.
-			$folder->getNotifyList();
+			$notifyList = $folder->getNotifyList();
+/*
 			$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("access_permission_changed_email");
 			$message = getMLText("access_permission_changed_email")."\r\n";
 			$message .= 
@@ -163,12 +184,28 @@ else if ($action == "notinherit") {
 			foreach ($folder->_notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message);
 			}
+*/
+			$subject = "access_permission_changed_email_subject";
+			$message = "access_permission_changed_email_body";
+			$params = array();
+			$params['name'] = $folder->getName();
+			$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
+			$params['username'] = $user->getFullName();
+			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+			$params['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+
 		}
 	}
 	if($folder->setDefaultAccess($defAccess)) {
 		if($notifier) {
 			// Send notification to subscribers.
-			$folder->getNotifyList();
+			$notifyList = $folder->getNotifyList();
+/*
 			$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("access_permission_changed_email");
 			$message = getMLText("access_permission_changed_email")."\r\n";
 			$message .= 
@@ -180,6 +217,21 @@ else if ($action == "notinherit") {
 			foreach ($folder->_notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message);
 			}
+*/
+			$subject = "access_permission_changed_email_subject";
+			$message = "access_permission_changed_email_body";
+			$params = array();
+			$params['name'] = $folder->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['username'] = $user->getFullName();
+			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+			$params['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+
 		}
 	}
 	if ($mode == "copy") {
@@ -201,7 +253,9 @@ else if ($action == "inherit") {
 	if($folder->setInheritAccess(true)) {
 		if($notifier) {
 			// Send notification to subscribers.
-			$folder->getNotifyList();
+			$notifyList = $folder->getNotifyList();
+
+/*
 			$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("access_permission_changed_email");
 			$message = getMLText("access_permission_changed_email")."\r\n";
 			$message .= 
@@ -209,13 +263,26 @@ else if ($action == "inherit") {
 				getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
 				"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n";
 
-//			$subject=mydmsDecodeString($subject);
-//			$message=mydmsDecodeString($message);
-			
 			$notifier->toList($user, $folder->_notifyList["users"], $subject, $message);
 			foreach ($folder->_notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message);
 			}
+*/
+
+			$subject = "access_permission_changed_email_subject";
+			$message = "access_permission_changed_email_body";
+			$params = array();
+			$params['name'] = $folder->getName();
+			$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
+			$params['username'] = $user->getFullName();
+			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+			$params['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+
 		}
 	}
 }
@@ -225,7 +292,8 @@ else if ($action == "setdefault") {
 	if($folder->setDefaultAccess($mode)) {
 		if($notifier) {
 			// Send notification to subscribers.
-			$folder->getNotifyList();
+			$notifyList = $folder->getNotifyList();
+/*
 			$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("access_permission_changed_email");
 			$message = getMLText("access_permission_changed_email")."\r\n";
 			$message .= 
@@ -233,13 +301,26 @@ else if ($action == "setdefault") {
 				getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
 				"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n";
 
-//			$subject=mydmsDecodeString($subject);
-//			$message=mydmsDecodeString($message);
-			
 			$notifier->toList($user, $folder->_notifyList["users"], $subject, $message);
 			foreach ($folder->_notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message);
 			}
+*/
+
+			$subject = "access_permission_changed_email_subject";
+			$message = "access_permission_changed_email_body";
+			$params = array();
+			$params['name'] = $folder->getName();
+			$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
+			$params['username'] = $user->getFullName();
+			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+			$params['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+
 		}
 	}
 }

op/op.FolderNotify.php

@@ -48,12 +48,12 @@ $action = $_POST["action"];
 if (isset($_POST["userid"]) && (!is_numeric($_POST["userid"]) || $_POST["userid"]<-1)) {
 	UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("unknown_user"));
 }
-$userid = $_POST["userid"];
+$userid = isset($_POST["userid"]) ? $_POST["userid"] : -1;
 
 if (isset($_POST["groupid"]) && (!is_numeric($_POST["groupid"]) || $_POST["groupid"]<-1)) {
 	UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("unknown_group"));
 }
-$groupid = $_POST["groupid"];
+$groupid = isset($_POST["groupid"]) ? $_POST["groupid"] : -1;
 
 if (isset($_POST["groupid"])&&$_POST["groupid"]!=-1){
 	$group=$dms->getGroup($groupid);
@@ -94,14 +94,7 @@ if ($action == "delnotify") {
 		case 0:
 			if($notifier) {
 				// Email user / group, informing them of subscription.
-				$path="";
+/*
-				$folderPath = $folder->getPath();
-				for ($i = 0; $i  < count($folderPath); $i++) {
-					$path .= $folderPath[$i]->getName();
-					if ($i +1 < count($folderPath))
-						$path .= " / ";
-				}
-
 				$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("notify_deleted_email");
 				$message = getMLText("notify_deleted_email")."\r\n";
 				$message .= 
@@ -116,6 +109,23 @@ if ($action == "delnotify") {
 				else {
 					$notifier->toGroup($user, $obj, $subject, $message);
 				}
+*/
+				$subject = "notify_deleted_email_subject";
+				$message = "notify_deleted_email_body";
+				$params = array();
+				$params['name'] = $folder->getName();
+				$params['folder_path'] = $folder->getFolderPathPlain();
+				$params['username'] = $user->getFullName();
+				$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+				$params['sitename'] = $settings->_siteName;
+				$params['http_root'] = $settings->_httpRoot;
+
+				if ($userid > 0) {
+					$notifier->toIndividual($user, $obj, $subject, $message, $params);
+				}
+				else {
+					$notifier->toGroup($user, $obj, $subject, $message, $params);
+				}
 			}
 			break;
 	}
@@ -140,8 +150,10 @@ else if ($action == "addnotify") {
 				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("internal_error"));
 				break;
 			case 0:
+				if($notifier) {
 					$obj = $dms->getUser($userid);
 					// Email user / group, informing them of subscription.
+/*
 					$path="";
 					$folderPath = $folder->getPath();
 					for ($i = 0; $i  < count($folderPath); $i++) {
@@ -149,7 +161,6 @@ else if ($action == "addnotify") {
 						if ($i +1 < count($folderPath))
 							$path .= " / ";
 					}
-				if($notifier) {
 					$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("notify_added_email");
 					$message = getMLText("notify_added_email")."\r\n";
 					$message .= 
@@ -159,6 +170,18 @@ else if ($action == "addnotify") {
 						"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n";
 
 					$notifier->toIndividual($user, $obj, $subject, $message);
+*/
+					$subject = "notify_added_email_subject";
+					$message = "notify_added_email_body";
+					$params = array();
+					$params['name'] = $folder->getName();
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$params['username'] = $user->getFullName();
+					$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+					$params['sitename'] = $settings->_siteName;
+					$params['http_root'] = $settings->_httpRoot;
+
+					$notifier->toIndividual($user, $obj, $subject, $message, $params);
 				}
 
 				break;
@@ -180,8 +203,10 @@ else if ($action == "addnotify") {
 				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("internal_error"));
 				break;
 			case 0:
+				if($notifier) {
 					$obj = $dms->getGroup($groupid);
 					// Email user / group, informing them of subscription.
+/*
 					$path="";
 					$folderPath = $folder->getPath();
 					for ($i = 0; $i  < count($folderPath); $i++) {
@@ -189,7 +214,6 @@ else if ($action == "addnotify") {
 						if ($i +1 < count($folderPath))
 							$path .= " / ";
 					}
-				if($notifier) {
 					$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("notify_added_email");
 					$message = getMLText("notify_added_email")."\r\n";
 					$message .= 
@@ -199,6 +223,18 @@ else if ($action == "addnotify") {
 						"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n";
 
 					$notifier->toGroup($user, $obj, $subject, $message);
+*/
+					$subject = "notify_added_email_subject";
+					$message = "notify_added_email_body";
+					$params = array();
+					$params['name'] = $folder->getName();
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$params['username'] = $user->getFullName();
+					$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+					$params['sitename'] = $settings->_siteName;
+					$params['http_root'] = $settings->_httpRoot;
+
+					$notifier->toGroup($user, $obj, $subject, $message, $params);
 				}
 				break;
 		}

op/op.ManageNotify.php

@@ -63,8 +63,8 @@ $userid=$user->getID();
 if ($_GET["type"]=="document"){
 
 	if ($_GET["action"]=="add"){
-		if (!isset($_POST["docidform2"])) UI::exitError(getMLText("my_account"),getMLText("error_occured"));
+		if (!isset($_POST["docidform1"])) UI::exitError(getMLText("my_account"),getMLText("error_occured"));
-		$documentid = $_POST["docidform2"];
+		$documentid = $_POST["docidform1"];
 	}else if ($_GET["action"]=="del"){
 		if (!isset($_GET["id"])) UI::exitError(getMLText("my_account"),getMLText("error_occured"));
 		$documentid = $_GET["id"];
@@ -107,10 +107,11 @@ if ($_GET["type"]=="document"){
 		add_folder_notify($folder,$userid,$recursefolder,$recursedoc);
 		
 	} elseif ($_GET["action"]=="del") {
-		if($folder->removeNotify($userid, true)) {
+		if(0 == $folder->removeNotify($userid, true)) {
-			$obj = $dms->getUser($userid);
 			if($notifier) {
+				$obj = $dms->getUser($userid);
 				// Email user / group, informing them of subscription.
+/*
 				$path="";
 				$folderPath = $folder->getPath();
 				for ($i = 0; $i  < count($folderPath); $i++) {
@@ -128,6 +129,18 @@ if ($_GET["type"]=="document"){
 					"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$folder->getID()."\r\n";
 
 				$notifier->toIndividual($user, $obj, $subject, $message);
+*/
+				$subject = "notify_deleted_email_subject";
+				$message = "notify_deleted_email_body";
+				$params = array();
+				$params['name'] = $folder->getName();
+				$params['folder_path'] = $folder->getFolderPathPlain();
+				$params['username'] = $user->getFullName();
+				$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+				$params['sitename'] = $settings->_siteName;
+				$params['http_root'] = $settings->_httpRoot;
+
+				$notifier->toIndividual($user, $obj, $subject, $message, $params);
 			}
 		}
 	}

op/op.MoveDocument.php

@@ -55,9 +55,10 @@ if (($document->getAccessMode($user) < M_READWRITE) || ($targetFolder->getAccess
 
 if ($targetid != $oldFolder->getID()) {
 	if ($document->setFolder($targetFolder)) {
-		$document->getNotifyList();
 		// Send notification to subscribers.
 		if($notifier) {
+			$notifyList = $document->getNotifyList();
+/*
 			$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_moved_email");
 			$message = getMLText("document_moved_email")."\r\n";
 			$message .= 
@@ -66,9 +67,6 @@ if ($targetid != $oldFolder->getID()) {
 				getMLText("new_folder").": ".$targetFolder->getFolderPathPlain()."\r\n".
 				"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
 
-//			$subject=mydmsDecodeString($subject);
-//			$message=mydmsDecodeString($message);
-			
 			$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
 			foreach ($document->_notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message);
@@ -77,6 +75,24 @@ if ($targetid != $oldFolder->getID()) {
 			// if user is not owner send notification to owner
 			if ($user->getID()!= $document->getOwner()) 
 				$notifier->toIndividual($user, $document->getOwner(), $subject, $message);		
+*/
+			$subject = "document_moved_email_subject";
+			$message = "document_moved_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['old_folder_path'] = $oldFolder->getFolderPathPlain();
+			$params['new_folder_path'] = $targetFolder->getFolderPathPlain();
+			$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['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+			// if user is not owner send notification to owner
+			if ($user->getID() != $document->getOwner()->getID()) 
+				$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
 		}
 
 	} else {

op/op.MoveFolder.php

@@ -54,10 +54,12 @@ if ($folder->getAccessMode($user) < M_READWRITE || $targetFolder->getAccessMode(
 	UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("access_denied"));
 }
 
+$oldFolder = $folder->getParent();
 if ($folder->setParent($targetFolder)) {
 	// Send notification to subscribers.
 	if($notifier) {
-		$folder->getNotifyList();
+		$notifyList = $folder->getNotifyList();
+/*
 		$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("folder_moved_email");
 		$message = getMLText("folder_moved_email")."\r\n";
 		$message .= 
@@ -70,6 +72,25 @@ if ($folder->setParent($targetFolder)) {
 		foreach ($folder->_notifyList["groups"] as $grp) {
 			$notifier->toGroup($user, $grp, $subject, $message);
 		}
+*/
+		$subject = "folder_moved_email_subject";
+		$message = "folder_moved_email_body";
+		$params = array();
+		$params['name'] = $folder->getName();
+		$params['old_folder_path'] = $oldFolder->getFolderPathPlain();
+		$params['new_folder_path'] = $targetFolder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
+		$params['sitename'] = $settings->_siteName;
+		$params['http_root'] = $settings->_httpRoot;
+		$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+		foreach ($notifyList["groups"] as $grp) {
+			$notifier->toGroup($user, $grp, $subject, $message, $params);
+		}
+		// if user is not owner send notification to owner
+		if ($user->getID() != $folder->getOwner()->getID()) 
+			$notifier->toIndividual($user, $folder->getOwner(), $subject, $message, $params);
+
 	}
 } else {
 	UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));

op/op.OverrideContentStatus.php

@@ -73,10 +73,11 @@ if ($overrideStatus != $overallStatus["status"]) {
 	if (!$content->setStatus($overrideStatus, $comment, $user)) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 	} else {
-		$nl=$document->getNotifyList();
 		// Send notification to subscribers.
 		if($notifier) {
+			$nl = $document->getNotifyList();
 			$folder = $document->getFolder();
+/*
 			$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email");
 			$message = getMLText("document_status_changed_email")."\r\n";
 			$message .= 
@@ -86,16 +87,28 @@ if ($overrideStatus != $overallStatus["status"]) {
 				getMLText("comment").": ".$document->getComment()."\r\n".
 				"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n";
 
-//			$subject=mydmsDecodeString($subject);
-//			$message=mydmsDecodeString($message);
-			
 			$notifier->toList($user, $nl["users"], $subject, $message);
 			foreach ($nl["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message);
 			}
+*/
+			$subject = "document_status_changed_email_subject";
+			$message = "document_status_changed_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['status'] = getOverallStatusText($overrideStatus);
+			$params['username'] = $user->getFullName();
+			$params['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+			$notifier->toList($user, $nl["users"], $subject, $message, $params);
+			foreach ($nl["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
 			}
 
-		// TODO: if user os not owner send notification to owner
+			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
+		}
 	}
 }
 add_log_line("?documentid=".$documentid);

op/op.RemoveDocument.php

@@ -48,6 +48,7 @@ $folder = $document->getFolder();
 
 /* Get the notify list before removing the document */
 $nl =	$document->getNotifyList();
+$docname = $document->getName();
 if (!$document->remove()) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("error_occured"));
 } else {
@@ -68,6 +69,7 @@ if (!$document->remove()) {
 	}
 
 	if ($notifier){
+/*
 		$path = "";
 		$folderPath = $folder->getPath();
 		for ($i = 0; $i  < count($folderPath); $i++) {
@@ -89,6 +91,19 @@ if (!$document->remove()) {
 		foreach ($nl["groups"] as $grp) {
 			$notifier->toGroup($user, $grp, $subject, $message);
 		}
+*/
+		$subject = "document_deleted_email_subject";
+		$message = "document_deleted_email_body";
+		$params = array();
+		$params['name'] = $docname;
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['sitename'] = $settings->_siteName;
+		$params['http_root'] = $settings->_httpRoot;
+		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		foreach ($nl["groups"] as $grp) {
+			$notifier->toGroup($user, $grp, $subject, $message, $params);
+		}
 	}
 }
 

op/op.RemoveDocumentFile.php

@@ -60,8 +60,9 @@ if (!$document->removeDocumentFile($fileid)) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 } else {
 	// Send notification to subscribers.
-	$document->getNotifyList();
 	if($notifier) {
+		$notifyList = $document->getNotifyList();
+/*
 		$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("removed_file_email");
 		$message = getMLText("removed_file_email")."\r\n";
 		$message .= 
@@ -74,6 +75,19 @@ if (!$document->removeDocumentFile($fileid)) {
 		foreach ($document->_notifyList["groups"] as $grp) {
 			$notifier->toGroup($user, $grp, $subject, $message);
 		}
+*/
+		$subject = "removed_file_email_subject";
+		$message = "removed_file_email_body";
+		$params = array();
+		$params['document'] = $document->getName();
+		$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['sitename'] = $settings->_siteName;
+		$params['http_root'] = $settings->_httpRoot;
+		$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+		foreach ($notifyList["groups"] as $grp) {
+			$notifier->toGroup($user, $grp, $subject, $message, $params);
+		}
 	}
 }
 

op/op.RemoveFolder.php

@@ -72,10 +72,12 @@ if($settings->_enableFullSearch) {
 	$dms->setCallback('onPreRemoveDocument', 'removeFromIndex', $index);
 }
 
+$nl =	$folder->getNotifyList();
+$foldername = $folder->getName();
 if ($folder->remove()) {
 	// Send notification to subscribers.
 	if ($notifier) {
-		$folder->getNotifyList();
+/*
 		$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("folder_deleted_email");
 		$message = getMLText("folder_deleted_email")."\r\n";
 		$message .= 
@@ -88,6 +90,19 @@ if ($folder->remove()) {
 		foreach ($folder->_notifyList["groups"] as $grp) {
 			$notifier->toGroup($user, $grp, $subject, $message);
 		}
+*/
+		$subject = "folder_deleted_email_subject";
+		$message = "folder_deleted_email_body";
+		$params = array();
+		$params['name'] = $foldername;
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['username'] = $user->getFullName();
+		$params['sitename'] = $settings->_siteName;
+		$params['http_root'] = $settings->_httpRoot;
+		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		foreach ($nl["groups"] as $grp) {
+			$notifier->toGroup($user, $grp, $subject, $message, $params);
+		}
 	}
 } else {
 	UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));

op/op.RemoveVersion.php

@@ -60,11 +60,13 @@ if (!is_object($version)) {
 }
 
 if (count($document->getContent())==1) {
+	$nl = $document->getNotifyList();
+	$docname = $document->getName();
 	if (!$document->remove()) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 	} else {
-		$document->getNotifyList();
 		if ($notifier){
+/*
 			$path = "";
 			$folder = $document->getFolder();
 			$folderPath = $folder->getPath();
@@ -82,14 +84,24 @@ if (count($document->getContent())==1) {
 				getMLText("comment").": ".$document->getComment()."\r\n".
 				getMLText("user").": ".$user->getFullName()." <". $user->getEmail() ."> ";
 
-//			$subject=mydmsDecodeString($subject);
-//			$message=mydmsDecodeString($message);
-			
 			// Send notification to subscribers.
 			$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
 			foreach ($document->_notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message);
 			}
+*/
+			$subject = "document_deleted_email_subject";
+			$message = "document_deleted_email_body";
+			$params = array();
+			$params['name'] = $docname;
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['username'] = $user->getFullName();
+			$params['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $nl["users"], $subject, $message, $params);
+			foreach ($nl["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
 		}
 	}
 }
@@ -117,12 +129,13 @@ else {
 	} else {
 		// Notify affected users.
 		if ($notifier){
-		
+			$nl=$document->getNotifyList();
 			$recipients = array();
 			foreach ($emailList as $eID) {
 				$eU = $version->_document->_dms->getUser($eID);
 				$recipients[] = $eU;
 			}
+/*
 			$subject = "###SITENAME###: ".$document->getName().", v.".$version->_version." - ".getMLText("version_deleted_email");
 			$message = getMLText("version_deleted_email")."\r\n";
 			$message .= 
@@ -131,17 +144,29 @@ else {
 				getMLText("comment").": ".$version->getComment()."\r\n".
 				getMLText("user").": ".$user->getFullName()." <". $user->getEmail() ."> ";
 
-//			$subject=mydmsDecodeString($subject);
-//			$message=mydmsDecodeString($message);
-			
 			$notifier->toList($user, $recipients, $subject, $message);
 			
 			// Send notification to subscribers.
-			$nl=$document->getNotifyList();
 			$notifier->toList($user, $nl["users"], $subject, $message);
 			foreach ($nl["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message);
 			}
+*/
+
+			$subject = "version_deleted_email_subject";
+			$message = "version_deleted_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['version'] = $version->getVersion();
+			$params['folder_path'] = $document->getFolder()->getFolderPathPlain();
+			$params['username'] = $user->getFullName();
+			$params['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $recipients, $subject, $message, $params);
+			$notifier->toList($user, $nl["users"], $subject, $message, $params);
+			foreach ($nl["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
 		}
 	}
 }

op/op.ReviewDocument.php

@@ -83,6 +83,9 @@ if ($_POST["reviewType"] == "ind") {
 	else {
 		// Send an email notification to the document updater.
 		if($notifier) {
+			$nl=$document->getNotifyList();
+			$folder = $document->getFolder();
+/*
 			$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email");
 			$message = getMLText("review_submit_email")."\r\n";
 			$message .= 
@@ -93,17 +96,31 @@ if ($_POST["reviewType"] == "ind") {
 				getMLText("comment").": ".$comment."\r\n".
 				"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
 
-//			$subject=mydmsDecodeString($subject);
-//			$message=mydmsDecodeString($message);
-			
 			$notifier->toIndividual($user, $content->getUser(), $subject, $message);
 
 			// Send notification to subscribers.
-			$nl=$document->getNotifyList();
 			$notifier->toList($user, $nl["users"], $subject, $message);
 			foreach ($nl["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message);
 			}
+*/
+
+			$subject = "review_submit_email_subject";
+			$message = "review_submit_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['version'] = $version;
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['status'] = getReviewStatusText($_POST["reviewStatus"]);
+			$params['comment'] = $comment;
+			$params['username'] = $user->getFullName();
+			$params['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $nl["users"], $subject, $message, $params);
+			foreach ($nl["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
 		}
 	}
 }
@@ -117,6 +134,9 @@ else if ($_POST["reviewType"] == "grp") {
 	else {
 		// Send an email notification to the document updater.
 		if($notifier) {
+			$nl=$document->getNotifyList();
+			$folder = $document->getFolder();
+/*
 			$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email");
 			$message = getMLText("review_submit_email")."\r\n";
 			$message .= 
@@ -127,17 +147,30 @@ else if ($_POST["reviewType"] == "grp") {
 				getMLText("comment").": ".$comment."\r\n".
 				"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
 
-//			$subject=mydmsDecodeString($subject);
-//			$message=mydmsDecodeString($message);
-			
 			$notifier->toIndividual($user, $content->getUser(), $subject, $message);
 
 			// Send notification to subscribers.
-			$nl=$document->getNotifyList();
 			$notifier->toList($user, $nl["users"], $subject, $message);
 			foreach ($nl["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message);
 			}
+*/
+			$subject = "review_submit_email_subject";
+			$message = "review_submit_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['version'] = $version;
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['status'] = getReviewStatusText($_POST["reviewStatus"]);
+			$params['comment'] = $comment;
+			$params['username'] = $user->getFullName();
+			$params['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $nl["users"], $subject, $message, $params);
+			foreach ($nl["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
 		}
 	}
 }
@@ -150,10 +183,11 @@ else if ($_POST["reviewType"] == "grp") {
 if ($_POST["reviewStatus"]==-1){
 
 	if($content->setStatus(S_REJECTED,$comment,$user)) {
-		$nl=$document->getNotifyList();
 		// Send notification to subscribers.
 		if($notifier) {
+			$nl=$document->getNotifyList();
 			$folder = $document->getFolder();
+/*
 			$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email");
 			$message = getMLText("document_status_changed_email")."\r\n";
 			$message .= 
@@ -163,16 +197,26 @@ if ($_POST["reviewStatus"]==-1){
 				getMLText("comment").": ".$document->getComment()."\r\n".
 				"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n";
 
-//			$subject=mydmsDecodeString($subject);
-//			$message=mydmsDecodeString($message);
-			
 			$notifier->toList($user, $nl["users"], $subject, $message);
 			foreach ($nl["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message);
 			}
+*/
+			$subject = "document_status_changed_email_subject";
+			$message = "document_status_changed_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['status'] = getReviewStatusText(S_REJECTED);
+			$params['username'] = $user->getFullName();
+			$params['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $nl["users"], $subject, $message, $params);
+			foreach ($nl["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
 		}
-		
-		// TODO: if user os not owner send notification to owner
 	}
 
 }else{
@@ -219,16 +263,16 @@ if ($_POST["reviewStatus"]==-1){
 		}
 		if ($content->setStatus($newStatus, getMLText("automatic_status_update"), $user)) {
 			// Send notification to subscribers.
-			$nl=$document->getNotifyList();
 			if($notifier) {
+				$nl=$document->getNotifyList();
 				$folder = $document->getFolder();
+/*
 				$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email");
 				$message = getMLText("document_status_changed_email")."\r\n";
 				$message .= 
 					getMLText("document").": ".$document->getName()."\r\n".
 					getMLText("status").": ".getOverallStatusText($newStatus)."\r\n".
 					getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
-					getMLText("comment").": ".$document->getComment()."\r\n".
 					"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n";
 
 //				$subject=mydmsDecodeString($subject);
@@ -238,6 +282,20 @@ if ($_POST["reviewStatus"]==-1){
 				foreach ($nl["groups"] as $grp) {
 					$notifier->toGroup($user, $grp, $subject, $message);
 				}
+*/
+				$subject = "document_status_changed_email_subject";
+				$message = "document_status_changed_email_body";
+				$params = array();
+				$params['name'] = $document->getName();
+				$params['folder_path'] = $folder->getFolderPathPlain();
+				$params['status'] = getReviewStatusText($newStatus);
+				$params['username'] = $user->getFullName();
+				$params['sitename'] = $settings->_siteName;
+				$params['http_root'] = $settings->_httpRoot;
+				$notifier->toList($user, $nl["users"], $subject, $message, $params);
+				foreach ($nl["groups"] as $grp) {
+					$notifier->toGroup($user, $grp, $subject, $message, $params);
+				}
 			}
 			
 			// TODO: if user os not owner send notification to owner
@@ -247,6 +305,7 @@ if ($_POST["reviewStatus"]==-1){
 				$requestUser = $document->getOwner();
 
 				if($notifier) {
+/*
 					$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_request_email");
 					$message = getMLText("approval_request_email")."\r\n";
 					$message .= 
@@ -254,22 +313,27 @@ if ($_POST["reviewStatus"]==-1){
 						getMLText("version").": ".$version."\r\n".
 						getMLText("comment").": ".$content->getComment()."\r\n".
 						"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."&version=".$version."\r\n";
-
+*/
-//					$subject=mydmsDecodeString($subject);
+					$subject = "approval_request_email_subject";
-//					$message=mydmsDecodeString($message);
+					$message = "approval_request_email_body";
-					
+					$params = array();
+					$params['name'] = $document->getName();
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$params['version'] = $version;
+					$params['username'] = $user->getFullName();
+					$params['sitename'] = $settings->_siteName;
+					$params['http_root'] = $settings->_httpRoot;
 					foreach ($docApprovalStatus as $dastat) {
 					
 						if ($dastat["status"] == 0) {
 							if ($dastat["type"] == 0) {
 	
 								$approver = $dms->getUser($dastat["required"]);
-								$notifier->toIndividual($document->getOwner(), $approver, $subject, $message);
+								$notifier->toIndividual($document->getOwner(), $approver, $subject, $message, $params);
-							}
+							} elseif ($dastat["type"] == 1) {
-							else if ($dastat["type"] == 1) {
 							
 								$group = $dms->getGroup($dastat["required"]);
-								$notifier->toGroup($document->getOwner(), $group, $subject, $message);
+								$notifier->toGroup($document->getOwner(), $group, $subject, $message, $params);
 							}
 						}
 					}

op/op.UpdateDocument.php

@@ -173,9 +173,10 @@ if ($_FILES['userfile']['error'] == 0) {
 	}
 	else {
 		// Send notification to subscribers.
-		$document->getNotifyList();
 		if ($notifier){
+			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
+/*
 			$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_updated_email");
 			$message = getMLText("document_updated_email")."\r\n";
 			$message .= 
@@ -184,8 +185,6 @@ if ($_FILES['userfile']['error'] == 0) {
 				getMLText("comment").": ".$document->getComment()."\r\n".
 				"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
 
-//			$subject=mydmsDecodeString($subject);
-//			$message=mydmsDecodeString($message);
 
 			$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
 			foreach ($document->_notifyList["groups"] as $grp) {
@@ -195,6 +194,24 @@ if ($_FILES['userfile']['error'] == 0) {
 			// if user is not owner send notification to owner
 			if ($user->getID()!= $document->getOwner()->getID())
 				$notifier->toIndividual($user, $document->getOwner(), $subject, $message);
+*/
+			$subject = "document_updated_email_subject";
+			$message = "document_updated_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$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['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+			// if user is not owner send notification to owner
+			if ($user->getID() != $document->getOwner()->getID()) 
+				$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
+
 		}
 
 		$expires = false;
@@ -209,10 +226,11 @@ if ($_FILES['userfile']['error'] == 0) {
 
 		if ($expires) {
 			if($document->setExpires($expires)) {
-				$document->getNotifyList();
 				if($notifier) {
+					$notifyList = $document->getNotifyList();
 					$folder = $document->getFolder();
 					// Send notification to subscribers.
+/*
 					$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("expiry_changed_email");
 					$message = getMLText("expiry_changed_email")."\r\n";
 					$message .= 
@@ -221,13 +239,24 @@ if ($_FILES['userfile']['error'] == 0) {
 						getMLText("comment").": ".$document->getComment()."\r\n".
 						"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
 
-	//				$subject=mydmsDecodeString($subject);
-	//				$message=mydmsDecodeString($message);
-
 					$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
 					foreach ($document->_notifyList["groups"] as $grp) {
 						$notifier->toGroup($user, $grp, $subject, $message);
 					}
+*/
+					$subject = "expiry_changed_email_subject";
+					$message = "expiry_changed_email_body";
+					$params = array();
+					$params['name'] = $document->getName();
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$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['sitename'] = $settings->_siteName;
+					$params['http_root'] = $settings->_httpRoot;
+					$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+					foreach ($notifyList["groups"] as $grp) {
+						$notifier->toGroup($user, $grp, $subject, $message, $params);
+					}
 				}
 			} else {
 				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));

op/op.UpdateDocument2.php

@@ -155,9 +155,10 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 			echo getMLText("error_occured");
 		} else {
 			// Send notification to subscribers.
-			$document->getNotifyList();
 			if ($notifier){
+				$notifyList = $document->getNotifyList();
 				$folder = $document->getFolder();
+/*
 				$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_updated_email");
 				$message = getMLText("document_updated_email")."\r\n";
 				$message .= 
@@ -166,9 +167,6 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 					getMLText("comment").": ".$document->getComment()."\r\n".
 					"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
 
-//				$subject=mydmsDecodeString($subject);
-//				$message=mydmsDecodeString($message);
-
 				$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
 				foreach ($document->_notifyList["groups"] as $grp) {
 					$notifier->toGroup($user, $grp, $subject, $message);
@@ -177,15 +175,33 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 				// if user is not owner send notification to owner
 				if ($user->getID()!= $document->getOwner()->getID())
 					$notifier->toIndividual($user, $document->getOwner(), $subject, $message);
+*/
+				$subject = "document_updated_email_subject";
+				$message = "document_updated_email_body";
+				$params = array();
+				$params['name'] = $document->getName();
+				$params['folder_path'] = $folder->getFolderPathPlain();
+				$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['sitename'] = $settings->_siteName;
+				$params['http_root'] = $settings->_httpRoot;
+				$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+				foreach ($notifyList["groups"] as $grp) {
+					$notifier->toGroup($user, $grp, $subject, $message, $params);
+				}
+				// if user is not owner send notification to owner
+				if ($user->getID() != $document->getOwner()->getID()) 
+					$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
 			}
 
 			$expires = ($_POST["expires"] == "true") ? mktime(0,0,0, $_POST["expmonth"], $_POST["expday"], $_POST["expyear"]) : false;
 
 			if ($document->setExpires($expires)) {
-				$document->getNotifyList();
 				if($notifier) {
+					$notifyList = $document->getNotifyList();
 					$folder = $document->getFolder();
 					// Send notification to subscribers.
+/*
 					$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("expiry_changed_email");
 					$message = getMLText("expiry_changed_email")."\r\n";
 					$message .= 
@@ -194,13 +210,24 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 						getMLText("comment").": ".$document->getComment()."\r\n".
 						"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
 
-//					$subject=mydmsDecodeString($subject);
-//					$message=mydmsDecodeString($message);
-
 					$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
 					foreach ($document->_notifyList["groups"] as $grp) {
 						$notifier->toGroup($user, $grp, $subject, $message);
 					}
+*/
+					$subject = "expiry_changed_email_subject";
+					$message = "expiry_changed_email_body";
+					$params = array();
+					$params['name'] = $document->getName();
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$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['sitename'] = $settings->_siteName;
+					$params['http_root'] = $settings->_httpRoot;
+					$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+					foreach ($notifyList["groups"] as $grp) {
+						$notifier->toGroup($user, $grp, $subject, $message, $params);
+					}
 				}
 			} else {
 				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));