From 87894319c9cfaa3d1a2093a056dde73c6ce03a80 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 26 Feb 2015 11:47:02 +0100 Subject: [PATCH 01/24] do not use empty() on return value of function --- inc/inc.ClassSettings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 32eadef32..452f55cd2 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -506,7 +506,7 @@ class Settings { /* {{{ */ $this->_converters = array(); foreach($converters as $converter) { $tab = $converter->attributes(); - if(empty(trim(strval($tab['target'])))) + if(!trim(strval($tab['target']))) $this->_converters['fulltext'][trim(strval($tab['mimeType']))] = trim(strval($converter)); else $this->_converters[trim(strval($tab['target']))][trim(strval($tab['mimeType']))] = trim(strval($converter)); From 46d7ecf80de589b47c269c802f53ed88a082185a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 26 Feb 2015 11:47:28 +0100 Subject: [PATCH 02/24] do not even check for guest user, if disabled --- op/op.Login.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/op/op.Login.php b/op/op.Login.php index 8d5bb8c39..4287b64b9 100644 --- a/op/op.Login.php +++ b/op/op.Login.php @@ -58,10 +58,12 @@ if(isset($_POST['pwd'])) { } } -$guestUser = $dms->getUser($settings->_guestID); -if ((!isset($pwd) || strlen($pwd)==0) && ($login != $guestUser->getLogin())) { - _printMessage(getMLText("login_error_title"), getMLText("login_error_text")."\n"); - exit; +if($settings->_enableGuestLogin && (int) $settings->_guestID) { + $guestUser = $dms->getUser((int) $settings->_guestID); + if ((!isset($pwd) || strlen($pwd)==0) && ($login != $guestUser->getLogin())) { + _printMessage(getMLText("login_error_title"), getMLText("login_error_text")."\n"); + exit; + } } // From c79d650915d2055637a8a4bb28c2d0bc8fd3ec29 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 27 Feb 2015 17:11:00 +0100 Subject: [PATCH 03/24] add new phrase for mail body/subject when changing approval/review --- languages/ar_EG/lang.inc | 6 ++++++ languages/ca_ES/lang.inc | 17 ++++++++++++++--- languages/cs_CZ/lang.inc | 6 ++++++ languages/de_DE/lang.inc | 39 ++++++++++++++++++++++++++++++--------- languages/en_GB/lang.inc | 25 +++++++++++++++++++++++-- languages/es_ES/lang.inc | 12 +++++++++--- languages/fr_FR/lang.inc | 10 ++++++++-- languages/hu_HU/lang.inc | 6 ++++++ languages/it_IT/lang.inc | 10 ++++++++-- languages/nl_NL/lang.inc | 6 ++++++ languages/pl_PL/lang.inc | 6 ++++++ languages/pt_BR/lang.inc | 6 ++++++ languages/ro_RO/lang.inc | 6 ++++++ languages/ru_RU/lang.inc | 10 ++++++++-- languages/sk_SK/lang.inc | 6 ++++++ languages/sv_SE/lang.inc | 6 ++++++ languages/tr_TR/lang.inc | 6 ++++++ languages/zh_CN/lang.inc | 6 ++++++ languages/zh_TW/lang.inc | 6 ++++++ 19 files changed, 172 insertions(+), 23 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 3236de731..c1655dd6d 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -75,6 +75,8 @@ URL: [url]', 'and' => 'و', 'apply' => 'تطبيق', 'approval_deletion_email' => 'طلب الموافقة تم الغاؤه', +'approval_deletion_email_body' => '', +'approval_deletion_email_subject' => '', 'approval_group' => 'مجموعة الموافقة', 'approval_log' => 'ﺲﺠﻟ ﺎﻠﻣﻭﺎﻔﻗﺓ', 'approval_request_email' => 'طلب الموافقة', @@ -684,9 +686,13 @@ URL: [url]', 'reviewer_already_assigned' => 'بالفعل تم تخصيصة كمراجع', 'reviewer_already_removed' => 'بالفعل تم ازالته من عملية المراجعة او تم تقديمه للمراجعة', 'review_deletion_email' => 'طلب المراجعة تم مسحه', +'review_deletion_email_body' => '', +'review_deletion_email_subject' => '', 'review_group' => 'مجموعة المراجعة', 'review_log' => 'ﺲﺠﻟ ﺎﻠﻣﺭﺎﺠﻋﺓ', 'review_request_email' => 'طلب مراجعة', +'review_request_email_body' => '', +'review_request_email_subject' => '', 'review_status' => 'حالة المراجعة:', 'review_submit_email' => 'تم تقديم المراجعة', 'review_submit_email_body' => 'تم تقديم المراجعة diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 581558395..3c07a1fb4 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (647) +// Translators: Admin (649) $text = array( 'accept' => 'Acceptar', @@ -71,11 +71,18 @@ $text = array( 'and' => 'i', 'apply' => 'Apply', 'approval_deletion_email' => 'Demanda d\'aprovació esborrada', +'approval_deletion_email_body' => '', +'approval_deletion_email_subject' => '', 'approval_group' => 'Grup aprovador', 'approval_log' => '', 'approval_request_email' => 'Petició d\'aprovació', -'approval_request_email_body' => '', -'approval_request_email_subject' => '', +'approval_request_email_body' => 'Petició d\'aprovació +Dokument: [name] +Version: [version] +Elternordner: [folder_path] +Benutzer: [username] +URL: [url]', +'approval_request_email_subject' => '[sitename]: [name] - Petició d\'aprovació', 'approval_status' => 'Estat d\'aprovació', 'approval_submit_email_body' => '', 'approval_submit_email_subject' => 'Aprovació enviada', @@ -569,9 +576,13 @@ $text = array( 'reviewer_already_assigned' => 'Ja està asignat com revisor', 'reviewer_already_removed' => 'Ja ha estat eliminat del procés de revisió o ja ha enviat una revisió', 'review_deletion_email' => 'Petició de revisió eliminada', +'review_deletion_email_body' => '', +'review_deletion_email_subject' => '', 'review_group' => 'Grup de revisió', 'review_log' => '', 'review_request_email' => 'Petició de revisió', +'review_request_email_body' => '', +'review_request_email_subject' => '', 'review_status' => 'Estat de revisió', 'review_submit_email' => 'Revisió enviada', 'review_submit_email_body' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index b340dafde..2d22bee9b 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -75,6 +75,8 @@ URL: [url]', 'and' => 'a', 'apply' => 'Použít', 'approval_deletion_email' => 'Zrušení schválení požadavku', +'approval_deletion_email_body' => '', +'approval_deletion_email_subject' => '', 'approval_group' => 'Skupina schválení', 'approval_log' => 'Log schvalování', 'approval_request_email' => 'Schválení požadavku', @@ -694,9 +696,13 @@ URL: [url]', 'reviewer_already_assigned' => 'je už pověřen jako kontrolor', 'reviewer_already_removed' => 'už byl odstraněn z procesu kontroly nebo poslal kontrolu', 'review_deletion_email' => 'Žádost na revizi odstraněn', +'review_deletion_email_body' => '', +'review_deletion_email_subject' => '', 'review_group' => 'Skupina kontroly', 'review_log' => 'Přezkum logu', 'review_request_email' => 'Požadavek na kontrolu', +'review_request_email_body' => '', +'review_request_email_subject' => '', 'review_status' => 'Stav kontroly', 'review_submit_email' => 'Předložit ke kontrole', 'review_submit_email_body' => 'Odeslán přezkoumaný dokument: [name] diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 728b74c69..b385f5f3b 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1925), dgrutsch (12) +// Translators: Admin (1932), dgrutsch (18) $text = array( 'accept' => 'Übernehmen', @@ -75,6 +75,13 @@ URL: [url]', 'and' => 'und', 'apply' => 'Anwenden', 'approval_deletion_email' => 'Genehmigungsaufforderung gelöscht', +'approval_deletion_email_body' => 'Genehmigungsaufforderung gelöscht +Dokument: [name] +Version: [version] +Elternordner: [folder_path] +Benutzer: [username] +URL: [url]', +'approval_deletion_email_subject' => '[sitename]: [name] - Genehmigungsaufforderung gelöscht', 'approval_group' => 'Berechtigungsgruppe', 'approval_log' => 'Freigabeprotokoll', 'approval_request_email' => 'Aufforderung zur Genehmigung', @@ -365,14 +372,14 @@ URL: [url]', 'folders' => 'Verzeichnisse', 'folders_and_documents_statistic' => 'Ordner- und Dokumentenübersicht', 'folder_comment_changed_email' => 'Kommentar geändert', -'folder_comment_changed_email_body' => 'Comment changed +'folder_comment_changed_email_body' => 'Kommentar geändert Ordner: [name] -Old comment: [old_comment] -Comment: [new_comment] +Vorheriger Kommentar: [old_comment] +Kommentar: [new_comment] Elternordner: [folder_path] Benutzer: [username] URL: [url]', -'folder_comment_changed_email_subject' => '[sitename]: [name] - Comment changed', +'folder_comment_changed_email_subject' => '[sitename]: [name] - Kommentar geändert', 'folder_contents' => 'Ordner enthält', 'folder_deleted_email' => 'Ordner gelöscht', 'folder_deleted_email_body' => 'Ordner gelöscht @@ -642,8 +649,8 @@ Dies kann durch den folgenden Link erfolgen: Sollen Sie danach immer noch Problem bei der Anmeldung haben, dann kontaktieren Sie bitte Ihren Adminstrator', 'password_forgotten_email_subject' => 'Passwort vergessen', -'password_forgotten_send_hash' => 'Instructions on how to proceed has been send to the user\'s email address', -'password_forgotten_text' => 'Fill out the form below and follow the instructions in the email, which will be sent to you.', +'password_forgotten_send_hash' => 'Anweisungen zum weiteren Vorgehen wurden an die E-Mail Adresse des Benutzers versandt', +'password_forgotten_text' => 'Füllen Sie bitte untenstehendes Formular aus. Weitere Anweisungen erhalten Sie dann in einer E-Mail die an Sie gesandt wird', 'password_forgotten_title' => 'Passwort gesendet', 'password_repeat' => 'Passwort wiederholen', 'password_send' => 'Passwort verschickt', @@ -698,9 +705,23 @@ URL: [url]', 'reviewer_already_assigned' => 'Prüfer bereits zugewiesen', 'reviewer_already_removed' => 'Prüfer wurde bereits aus dem Prüfvorgang entfernt oder hat die Prüfung bereits abgeschlossen', 'review_deletion_email' => 'Prüfungsaufforderung gelöscht', +'review_deletion_email_body' => 'Prüfungsaufforderung gelöscht +Dokument: [name] +Version: [version] +Elternordner: [folder_path] +Benutzer: [username] +URL: [url]', +'review_deletion_email_subject' => '[sitename]: [name] - Prüfungsaufforderung gelöscht', 'review_group' => 'Gruppe: prüfen', 'review_log' => 'Prüfungsprotokoll', 'review_request_email' => 'Aufforderung zur Prüfung', +'review_request_email_body' => 'Aufforderung zur Prüfung +Dokument: [name] +Version: [version] +Elternordner: [folder_path] +Benutzer: [username] +URL: [url]', +'review_request_email_subject' => '[sitename]: [name] - Aufforderung zur Prüfung', 'review_status' => 'Status:', 'review_submit_email' => 'Prüfung ausgeführt', 'review_submit_email_body' => 'Prüfung ausgeführt @@ -1059,7 +1080,7 @@ URL: [url]', 'splash_settings_saved' => 'Einstellungen gesichert', 'splash_substituted_user' => 'Benutzer gewechselt', 'splash_switched_back_user' => 'Zum ursprünglichen Benutzer zurückgekehrt', -'splash_toogle_group_manager' => 'Group manager toogled', +'splash_toogle_group_manager' => 'Gruppenverwalter gewechselt', 'state_and_next_state' => 'Status/Nächster Status', 'statistic' => 'Statistik', 'status' => 'Status', @@ -1179,7 +1200,7 @@ URL: [url]', 'week_view' => 'Wochenansicht', 'workflow' => 'Workflow', 'workflow_actions_management' => 'Workflow-Aktions-Management', -'workflow_action_in_use' => 'This action is currently used by workflows.', +'workflow_action_in_use' => 'Diese Aktion wird zur Zeit von Workflows benutzt', 'workflow_action_name' => 'Name', 'workflow_editor' => 'Workflow Editor', 'workflow_group_summary' => 'Gruppenübersicht', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index a9b9cbf8f..59282044a 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1065), dgrutsch (2), netixw (14) +// Translators: Admin (1072), dgrutsch (3), netixw (14) $text = array( 'accept' => 'Accept', @@ -75,6 +75,13 @@ URL: [url]', 'and' => 'and', 'apply' => 'Apply', 'approval_deletion_email' => 'Approval request deleted', +'approval_deletion_email_body' => 'Approval request deleted +Dokument: [name] +Version: [version] +Elternordner: [folder_path] +Benutzer: [username] +URL: [url]', +'approval_deletion_email_subject' => '[sitename]: [name] - Approval request deleted', 'approval_group' => 'Approval Group', 'approval_log' => 'Approval Log', 'approval_request_email' => 'Approval request', @@ -698,9 +705,23 @@ URL: [url]', 'reviewer_already_assigned' => 'is already assigned as a reviewer', 'reviewer_already_removed' => 'has already been removed from review process or has already submitted a review', 'review_deletion_email' => 'Review request deleted', +'review_deletion_email_body' => 'Review request deleted +Dokument: [name] +Version: [version] +Elternordner: [folder_path] +Benutzer: [username] +URL: [url]', +'review_deletion_email_subject' => '[sitename]: [name] - Review request deleted', 'review_group' => 'Review group', 'review_log' => 'Review log', 'review_request_email' => 'Review request', +'review_request_email_body' => 'Review request +Document: [name] +Version: [version] +Parent folder: [folder_path] +User: [username] +URL: [url]', +'review_request_email_subject' => '[sitename]: [name] - Review request', 'review_status' => 'Review status:', 'review_submit_email' => 'Submitted review', 'review_submit_email_body' => 'Submitted review @@ -956,7 +977,7 @@ URL: [url]', 'settings_printDisclaimer' => 'Print Disclaimer', 'settings_printDisclaimer_desc' => 'If enabled, the disclaimer message will be printed on the bottom of every page', 'settings_quota' => 'User\'s quota', -'settings_quota_desc' => 'The maximum number of bytes a user may use on disk. Set this to 0 for unlimited disk space. This value can be overridden for each uses in his profile.', +'settings_quota_desc' => 'The maximum number of bytes a user may use on disk. Set this to 0 for unlimited disk space. This value can be overridden for each user in his profile.', 'settings_restricted' => 'Restricted access', 'settings_restricted_desc' => 'Only allow users to log in if they have an entry in the local database (irrespective of successful authentication with LDAP)', 'settings_rootDir' => 'Root directory', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index f9bf731eb..dfeaeb4fc 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (930), angel (123), francisco (2), jaimem (14) +// Translators: Admin (932), angel (123), francisco (2), jaimem (14) $text = array( 'accept' => 'Aceptar', @@ -75,6 +75,8 @@ URL: [url]', 'and' => 'y', 'apply' => 'Aplicar', 'approval_deletion_email' => 'Petición de aprobación eliminada', +'approval_deletion_email_body' => '', +'approval_deletion_email_subject' => '', 'approval_group' => 'Grupo aprobador', 'approval_log' => 'Traza de aprovación', 'approval_request_email' => 'Petición de aprobación', @@ -699,9 +701,13 @@ nURL: [url]', 'reviewer_already_assigned' => 'Ya está asignado como revisor', 'reviewer_already_removed' => 'Ya ha sido eliminado del proceso de revisión o ya ha enviado una revisión', 'review_deletion_email' => 'Petición de revisión eliminada', +'review_deletion_email_body' => '', +'review_deletion_email_subject' => '', 'review_group' => 'Grupo de revisión', 'review_log' => 'Traza de revisión', 'review_request_email' => 'Petición de revisión', +'review_request_email_body' => '', +'review_request_email_subject' => '', 'review_status' => 'Estado de revisión', 'review_submit_email' => 'Revisión enviada', 'review_submit_email_body' => 'Revisión enviada @@ -743,7 +749,7 @@ URL: [url]', 'role_admin' => 'Administrador', 'role_guest' => 'Invitado', 'role_user' => 'Usuario', -'ro_RO' => '', +'ro_RO' => 'Rumano', 'run_subworkflow' => 'Ejecutar sub flujo de trabajo', 'run_subworkflow_email_body' => 'Subflujo de trabajo iniciado Documento: [name] @@ -1110,7 +1116,7 @@ Usuario: [username] URL: [url]', 'transition_triggered_email_subject' => '[sitename]: [name] - Workflow transition triggered', 'trigger_workflow' => 'Flujo de Trabajo', -'tr_TR' => '', +'tr_TR' => 'Turco', 'tuesday' => 'Martes', 'tuesday_abbr' => 'M', 'type_to_search' => 'Tipo de búsqueda', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 2951735cc..c0b51c1e1 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (960), jeromerobert (50), lonnnew (9) +// Translators: Admin (961), jeromerobert (50), lonnnew (9) $text = array( 'accept' => 'Accepter', @@ -75,6 +75,8 @@ URL: [url]', 'and' => 'et', 'apply' => 'Appliquer', 'approval_deletion_email' => 'Demande d\'approbation supprimée', +'approval_deletion_email_body' => '', +'approval_deletion_email_subject' => '', 'approval_group' => 'Groupe d\'approbation', 'approval_log' => 'Journal des approbations', 'approval_request_email' => 'Demande d\'approbation', @@ -688,9 +690,13 @@ URL: [url]', 'reviewer_already_assigned' => 'est déjà déclaré en tant que correcteur', 'reviewer_already_removed' => 'a déjà été retiré du processus de correction ou a déjà soumis une correction', 'review_deletion_email' => 'Demande de correction supprimée', +'review_deletion_email_body' => '', +'review_deletion_email_subject' => '', 'review_group' => 'Groupe de correction', 'review_log' => '', 'review_request_email' => 'Demande de correction', +'review_request_email_body' => '', +'review_request_email_subject' => '', 'review_status' => 'Statut de correction', 'review_submit_email' => 'Correction soumise', 'review_submit_email_body' => 'Correction soumise @@ -726,7 +732,7 @@ URL: [url]', 'role_admin' => 'Administrateur', 'role_guest' => 'Invité', 'role_user' => 'Utilisateur', -'ro_RO' => '', +'ro_RO' => 'Roumain', 'run_subworkflow' => 'Lancer le sous-workflow', 'run_subworkflow_email_body' => '', 'run_subworkflow_email_subject' => '[sitename]: [name] - Sous-workflow initialisé', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 40e6f8e1e..ad808b706 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -75,6 +75,8 @@ URL: [url]', 'and' => '-', 'apply' => 'Elfogad', 'approval_deletion_email' => 'Jóváhagyási kérelem törölve', +'approval_deletion_email_body' => '', +'approval_deletion_email_subject' => '', 'approval_group' => 'Jóváhagyó csoport', 'approval_log' => 'Jóváhagyási napló', 'approval_request_email' => 'Jóváhagyási kérelem', @@ -699,9 +701,13 @@ URL: [url]', 'reviewer_already_assigned' => 'már hozzá lett rendelve felülvizsgálóként', 'reviewer_already_removed' => 'már el lett távolítva a felülvizsgálati folyamatból vagy már el lett küldve egy felülvizsgálat', 'review_deletion_email' => 'Felülvizsgálat kérés törölve', +'review_deletion_email_body' => '', +'review_deletion_email_subject' => '', 'review_group' => 'Felülvizsgáló csoport', 'review_log' => 'Felülvizsgálati napló', 'review_request_email' => 'Felülvizsgálat kérés', +'review_request_email_body' => '', +'review_request_email_subject' => '', 'review_status' => 'Felülvizsgálat állapot', 'review_submit_email' => 'Beküldött felülvizsgálat', 'review_submit_email_body' => 'Beküldött felülvizsgálat diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 25d8d501d..c168a4377 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1356) +// Translators: Admin (1357) $text = array( 'accept' => 'Accetta', @@ -75,6 +75,8 @@ URL: [url]', 'and' => 'e', 'apply' => 'Applica', 'approval_deletion_email' => 'Cancellata la richiesta di approvazione', +'approval_deletion_email_body' => '', +'approval_deletion_email_subject' => '', 'approval_group' => 'Gruppo di approvazione', 'approval_log' => 'Registro delle approvazioni', 'approval_request_email' => 'Richiesta di approvazione', @@ -699,9 +701,13 @@ URL: [url]', 'reviewer_already_assigned' => 'è già assegnato come revisore', 'reviewer_already_removed' => 'è già stato rimosso dal processo di revisione oppure ha già inserito una revisione.', 'review_deletion_email' => 'Richiesta di revisione cancellata', +'review_deletion_email_body' => '', +'review_deletion_email_subject' => '', 'review_group' => 'Gruppo revisori', 'review_log' => 'Rivedi log', 'review_request_email' => 'Richiesta di revisione', +'review_request_email_body' => '', +'review_request_email_subject' => '', 'review_status' => 'Stato revisioni:', 'review_submit_email' => 'Sottoposta revisione', 'review_submit_email_body' => 'Sottoposta revisione @@ -743,7 +749,7 @@ URL: [url]', 'role_admin' => 'Amministratore', 'role_guest' => 'Ospite', 'role_user' => 'Utente', -'ro_RO' => '', +'ro_RO' => 'Rumeno', 'run_subworkflow' => 'Inizia un sotto-flusso di lavoro', 'run_subworkflow_email_body' => 'Sotto-flusso di lavoro iniziato Documento: [name] diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index d05eb3cd4..f1fa2579a 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -75,6 +75,8 @@ URL: [url]', 'and' => 'en', 'apply' => 'Toepassen', 'approval_deletion_email' => 'Goedkeuring verzoek verwijderd', +'approval_deletion_email_body' => '', +'approval_deletion_email_subject' => '', 'approval_group' => 'Goedkeuring Groep', 'approval_log' => 'Goedkeuring overzicht', 'approval_request_email' => 'Goedkeuring verzoek', @@ -691,9 +693,13 @@ URL: [url]', 'reviewer_already_assigned' => 'is reeds aangewezen als [Controleur]', 'reviewer_already_removed' => 'is reeds verwijderd uit het [Controle] process of heeft reeds [Controle] uitgevoerd', 'review_deletion_email' => 'Controle verzoek gewijzigd', +'review_deletion_email_body' => '', +'review_deletion_email_subject' => '', 'review_group' => '[Controle] Groep', 'review_log' => 'Reviseer overzicht', 'review_request_email' => 'Controle verzoek', +'review_request_email_body' => '', +'review_request_email_subject' => '', 'review_status' => '[Controle] Status', 'review_submit_email' => 'Uitgevoerde [Controle]', 'review_submit_email_body' => 'Beoordeeld document ingediend: [name] diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 156a7b602..38ab88d86 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -75,6 +75,8 @@ URL: [url]', 'and' => 'i', 'apply' => 'Zastosuj', 'approval_deletion_email' => 'Prośba o akceptację została usunięta', +'approval_deletion_email_body' => '', +'approval_deletion_email_subject' => '', 'approval_group' => 'Grupa akceptująca', 'approval_log' => '', 'approval_request_email' => 'Prośba o akceptację', @@ -685,9 +687,13 @@ URL: [url]', 'reviewer_already_assigned' => 'jest już przypisany jako recenzent', 'reviewer_already_removed' => 'został już usunięty z procesu opiniowania lub już wydał swoją opinię', 'review_deletion_email' => 'Prośba o recenzję usunięta', +'review_deletion_email_body' => '', +'review_deletion_email_subject' => '', 'review_group' => 'Grupa recenzentów', 'review_log' => '', 'review_request_email' => 'Prośba i recenzję', +'review_request_email_body' => '', +'review_request_email_subject' => '', 'review_status' => 'Status recensji', 'review_submit_email' => 'Zgłoszony do recenzji', 'review_submit_email_body' => 'Zgłoszony do recenzji Dokument: [name] Wersja: [version] Status: [status] Komentarz: [comment] Folder nadrzędny: [folder_path] Użytkownik: [username] URL: [url]', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 5ae752cc6..b7c428455 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -75,6 +75,8 @@ URL: [url]', 'and' => 'e', 'apply' => 'Aplicar', 'approval_deletion_email' => 'Solicitação de Aprovação eliminada', +'approval_deletion_email_body' => '', +'approval_deletion_email_subject' => '', 'approval_group' => 'Approval Group', 'approval_log' => 'Log de Aprovação', 'approval_request_email' => 'Solicitação de aprovação', @@ -697,9 +699,13 @@ URL: [url]', 'reviewer_already_assigned' => 'is already assigned as a reviewer', 'reviewer_already_removed' => 'has already been removed from review proceá or has already submitted a review', 'review_deletion_email' => 'Pedido de revisão eliminado', +'review_deletion_email_body' => '', +'review_deletion_email_subject' => '', 'review_group' => 'Review Group', 'review_log' => 'Log de Revisão', 'review_request_email' => 'Pedido de revisão', +'review_request_email_body' => '', +'review_request_email_subject' => '', 'review_status' => 'Review Status', 'review_submit_email' => 'Revisão submetida', 'review_submit_email_body' => 'Submitida revisão de documento: [name] diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index b335fcf1a..60a5b3a44 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -75,6 +75,8 @@ URL: [url]', 'and' => 'si', 'apply' => 'Aplică', 'approval_deletion_email' => 'Cerere de aprobare stearsă', +'approval_deletion_email_body' => '', +'approval_deletion_email_subject' => '', 'approval_group' => 'Grup aprobare', 'approval_log' => 'Log aprobare', 'approval_request_email' => 'Cerere aprobare', @@ -699,9 +701,13 @@ URL: [url]', 'reviewer_already_assigned' => 'este deja alocat ca un revizuitor', 'reviewer_already_removed' => 'a fost deja eliminat din procesul de revizuire sau a postat deja o revizuire', 'review_deletion_email' => 'Cerere de revizuire eliminată', +'review_deletion_email_body' => '', +'review_deletion_email_subject' => '', 'review_group' => 'Grup revizuire', 'review_log' => 'Log revizuire', 'review_request_email' => 'Cerere de revizuire', +'review_request_email_body' => '', +'review_request_email_subject' => '', 'review_status' => 'Status revizuire:', 'review_submit_email' => 'Revizuire trimisă', 'review_submit_email_body' => 'Revizuire trimisă diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 537872bb7..694cede0c 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1240) +// Translators: Admin (1241) $text = array( 'accept' => 'Принять', @@ -75,6 +75,8 @@ URL: [url]', 'and' => 'и', 'apply' => 'Применить', 'approval_deletion_email' => 'Запрос на утверждение удалён', +'approval_deletion_email_body' => '', +'approval_deletion_email_subject' => '', 'approval_group' => 'Утверждающая группа', 'approval_log' => '', 'approval_request_email' => 'Запрос на утверждение', @@ -689,9 +691,13 @@ URL: [url]', 'reviewer_already_assigned' => 'уже назначен на рецензирование', 'reviewer_already_removed' => 'уже удалён из списка рецензирующих или уже оставил рецензию', 'review_deletion_email' => 'Запрос на рецензию удалён', +'review_deletion_email_body' => '', +'review_deletion_email_subject' => '', 'review_group' => 'Рецензирующая группа', 'review_log' => '', 'review_request_email' => 'Запрос на рецензию', +'review_request_email_body' => '', +'review_request_email_subject' => '', 'review_status' => 'Статус рецензии', 'review_submit_email' => 'Отправленная рецензия', 'review_submit_email_body' => 'Отправлена рецензия @@ -830,7 +836,7 @@ URL: [url]', 'settings_enableClipboard_desc' => 'Включить/отключить буфер обмена.', 'settings_enableConverting' => 'Включить преобразование', 'settings_enableConverting_desc' => 'Включить/отключить преобразование файлов.', -'settings_enableDropUpload' => '', +'settings_enableDropUpload' => 'Включить быструю загрузку', 'settings_enableDropUpload_desc' => '', 'settings_enableDuplicateDocNames' => 'Разрешить документы
с одинаковым названием', 'settings_enableDuplicateDocNames_desc' => 'Разрешить документы с одинаковым названием в каталоге.', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 73b2173a5..f14d64bff 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -71,6 +71,8 @@ $text = array( 'and' => 'a', 'apply' => '', 'approval_deletion_email' => 'Poziadavka na schvalenie zmazana', +'approval_deletion_email_body' => '', +'approval_deletion_email_subject' => '', 'approval_group' => 'Skupina schválenia', 'approval_log' => '', 'approval_request_email' => 'Poziadavka na schvalenie', @@ -569,9 +571,13 @@ $text = array( 'reviewer_already_assigned' => 'je už poverený ako kontrolór', 'reviewer_already_removed' => 'už bol odstránený z procesu kontroly alebo poslal kontrolu', 'review_deletion_email' => 'Poziadavka na recenziu zmazana', +'review_deletion_email_body' => '', +'review_deletion_email_subject' => '', 'review_group' => 'Skupina kontroly', 'review_log' => '', 'review_request_email' => 'Poziadavka na recenziu', +'review_request_email_body' => '', +'review_request_email_subject' => '', 'review_status' => 'Stav kontroly', 'review_submit_email' => 'Poslana recenzia', 'review_submit_email_body' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 25cac90cd..7169464f4 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -75,6 +75,8 @@ URL: [url]', 'and' => 'och', 'apply' => 'Använd', 'approval_deletion_email' => 'Begäran om godkännande har raderats', +'approval_deletion_email_body' => '', +'approval_deletion_email_subject' => '', 'approval_group' => 'Grupp av personer som godkänner', 'approval_log' => '', 'approval_request_email' => 'Begäran om godkännande', @@ -684,9 +686,13 @@ URL: [url]', 'reviewer_already_assigned' => 'ska redan granska dokumentet', 'reviewer_already_removed' => 'har redan tagits bort från granskningen eller har redan skickat en granskning', 'review_deletion_email' => 'Förfrågan om granskning borttagen', +'review_deletion_email_body' => '', +'review_deletion_email_subject' => '', 'review_group' => 'Grupp som granskar', 'review_log' => '', 'review_request_email' => 'Förfrågan om granskning', +'review_request_email_body' => '', +'review_request_email_subject' => '', 'review_status' => 'Status för granskningen', 'review_submit_email' => 'Skickat granskning', 'review_submit_email_body' => 'Skickat granskning diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 86c9fa00b..68b67de92 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -74,6 +74,8 @@ URL: [url]', 'and' => 've', 'apply' => 'Uygula', 'approval_deletion_email' => 'Onay talebi silindi', +'approval_deletion_email_body' => '', +'approval_deletion_email_subject' => '', 'approval_group' => 'Onay Grubu', 'approval_log' => 'Onay Kayıtları', 'approval_request_email' => 'Onay talebi', @@ -700,9 +702,13 @@ URL: [url]', 'reviewer_already_assigned' => 'zaten kontrol eden olarak tanımlı', 'reviewer_already_removed' => 'kontrol sürecinden silindi veya zaten kontrolü gönderdi', 'review_deletion_email' => 'Kontrol talebi silindi', +'review_deletion_email_body' => '', +'review_deletion_email_subject' => '', 'review_group' => 'Kontrol grubu', 'review_log' => 'Kontrol kayıtları', 'review_request_email' => 'Kontrol talebi', +'review_request_email_body' => '', +'review_request_email_subject' => '', 'review_status' => 'Kontrol durumu:', 'review_submit_email' => 'Kontrol gönderildi', 'review_submit_email_body' => 'Kontrol gönderildi diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 5c38076f0..08fbda954 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -75,6 +75,8 @@ URL: [url]', 'and' => 'and', 'apply' => '', 'approval_deletion_email' => '审核请求已被删除', +'approval_deletion_email_body' => '', +'approval_deletion_email_subject' => '', 'approval_group' => '审核组', 'approval_log' => '审批记录', 'approval_request_email' => '审核请求', @@ -575,9 +577,13 @@ URL: [url]', 'reviewer_already_assigned' => '已经被指派为校对人', 'reviewer_already_removed' => '已经从校对队列中删除或者已经提交校对', 'review_deletion_email' => '校对请求被删除', +'review_deletion_email_body' => '', +'review_deletion_email_subject' => '', 'review_group' => '校对组', 'review_log' => '', 'review_request_email' => '校对请求', +'review_request_email_body' => '', +'review_request_email_subject' => '', 'review_status' => '校对状态', 'review_submit_email' => '提交校对', 'review_submit_email_body' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 2c5d0773d..fe0f11cbb 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -75,6 +75,8 @@ URL: [url]', 'and' => '和', 'apply' => '接受', 'approval_deletion_email' => '審核請求已被刪除', +'approval_deletion_email_body' => '', +'approval_deletion_email_subject' => '', 'approval_group' => '審核組', 'approval_log' => '審批記錄', 'approval_request_email' => '審核請求', @@ -573,9 +575,13 @@ URL: [url]', 'reviewer_already_assigned' => '已經被指派為校對人', 'reviewer_already_removed' => '已經從校對佇列中刪除或者已經提交校對', 'review_deletion_email' => '校對請求被刪除', +'review_deletion_email_body' => '', +'review_deletion_email_subject' => '', 'review_group' => '校對組', 'review_log' => '', 'review_request_email' => '校對請求', +'review_request_email_body' => '', +'review_request_email_subject' => '', 'review_status' => '校對狀態', 'review_submit_email' => '提交校對', 'review_submit_email_body' => '', From 083dad60e85f561a0988a8c4c037f51f5879fe0e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 27 Feb 2015 17:11:50 +0100 Subject: [PATCH 04/24] remove old code for email creation --- op/op.SetReviewersApprovers.php | 171 ++++++++++++++++++-------------- 1 file changed, 97 insertions(+), 74 deletions(-) diff --git a/op/op.SetReviewersApprovers.php b/op/op.SetReviewersApprovers.php index 5db45f3dd..4a68f7c94 100644 --- a/op/op.SetReviewersApprovers.php +++ b/op/op.SetReviewersApprovers.php @@ -59,6 +59,8 @@ if ($overallStatus["status"]==S_REJECTED || $overallStatus["status"]==S_OBSOLETE UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("cannot_assign_invalid_state")); } +$folder = $document->getFolder(); + // Retrieve a list of all users and groups that have review / approve // privileges. $docAccess = $document->getReadAccessList(); @@ -118,16 +120,19 @@ foreach ($pIndRev as $p) { // Send an email notification to the new reviewer. if($settings->_enableNotificationAppRev) { if ($notifier) { - $subject = "###SITENAME###: ".$document->getName().", v.".$content->_version." - ".getMLText("review_request_email"); - $message = getMLText("review_request_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("version").": ".$content->_version."\r\n". - getMLText("comment").": ".$content->getComment()."\r\n". - getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n"; + $subject = "review_request_email_subject"; + $message = "review_request_email_body"; + $params = array(); + $params['name'] = $document->getName(); + $params['folder_path'] = $folder->getFolderPathPlain(); + $params['version'] = $content->_version; + $params['comment'] = $content->getComment(); + $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, $docAccess["users"][$accessIndex["i"][$p]], $subject, $message); + $notifier->toIndividual($user, $docAccess["users"][$accessIndex["i"][$p]], $subject, $message, $params); } } break; @@ -174,16 +179,19 @@ if (count($reviewIndex["i"]) > 0) { // Send an email notification to the reviewer. if($settings->_enableNotificationAppRev) { if ($notifier) { - $subject = "###SITENAME###: ".$document->getName().", v.".$content->_version." - ".getMLText("review_deletion_email"); - $message = getMLText("review_deletion_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("version").": ".$content->_version."\r\n". - getMLText("comment").": ".$content->getComment()."\r\n". - getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; + $subject = "review_deletion_email_subject"; + $message = "review_deletion_email_body"; + $params = array(); + $params['name'] = $document->getName(); + $params['folder_path'] = $folder->getFolderPathPlain(); + $params['version'] = $content->_version; + $params['comment'] = $content->getComment(); + $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, $docAccess["users"][$accessIndex["i"][$rx]], $subject, $message); + $notifier->toIndividual($user, $docAccess["users"][$accessIndex["i"][$rx]], $subject, $message, $params); } } break; @@ -218,16 +226,19 @@ foreach ($pGrpRev as $p) { // Send an email notification to the new reviewer. if($settings->_enableNotificationAppRev) { if ($notifier) { - $subject = "###SITENAME###: ".$document->getName().", v.".$content->_version." - ".getMLText("review_request_email"); - $message = getMLText("review_request_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("version").": ".$content->_version."\r\n". - getMLText("comment").": ".$content->getComment()."\r\n". - getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n"; + $subject = "review_request_email_subject"; + $message = "review_request_email_body"; + $params = array(); + $params['name'] = $document->getName(); + $params['folder_path'] = $folder->getFolderPathPlain(); + $params['version'] = $content->_version; + $params['comment'] = $content->getComment(); + $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, $docAccess["groups"][$accessIndex["g"][$p]], $subject, $message); + $notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$p]], $subject, $message, $params); } } break; @@ -271,17 +282,19 @@ if (count($reviewIndex["g"]) > 0) { // Send an email notification to the review group. if($settings->_enableNotificationAppRev) { if ($notifier) { + $subject = "review_deletion_email_subject"; + $message = "review_deletion_email_body"; + $params = array(); + $params['name'] = $document->getName(); + $params['folder_path'] = $folder->getFolderPathPlain(); + $params['version'] = $content->_version; + $params['comment'] = $content->getComment(); + $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; - $subject = "###SITENAME###: ".$document->getName().", v.".$content->_version." - ".getMLText("review_deletion_email"); - $message = getMLText("review_deletion_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("version").": ".$content->_version."\r\n". - getMLText("comment").": ".$content->getComment()."\r\n". - getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$rx]], $subject, $message); + $notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$rx]], $subject, $message, $params); } } break; @@ -321,16 +334,19 @@ foreach ($pIndApp as $p) { // Send an email notification to the new approver. if($settings->_enableNotificationAppRev) { if ($overallStatus["status"]!=0 && $notifier) { - $subject = "###SITENAME###: ".$document->getName().", v.".$content->_version." - ".getMLText("approval_request_email"); - $message = getMLText("approval_request_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("version").": ".$content->_version."\r\n". - getMLText("comment").": ".$content->getComment()."\r\n". - getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n"; + $subject = "approval_request_email_subject"; + $message = "approval_request_email_body"; + $params = array(); + $params['name'] = $document->getName(); + $params['folder_path'] = $folder->getFolderPathPlain(); + $params['version'] = $content->_version; + $params['comment'] = $content->getComment(); + $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, $docAccess["users"][$accessIndex["i"][$p]], $subject, $message); + $notifier->toIndividual($user, $docAccess["users"][$accessIndex["i"][$p]], $subject, $message, $params); } } break; @@ -375,16 +391,19 @@ if (count($approvalIndex["i"]) > 0) { // Send an email notification to the approver. if($settings->_enableNotificationAppRev) { if ($notifier) { - $subject = "###SITENAME###: ".$document->getName().", v.".$content->_version." - ".getMLText("approval_deletion_email"); - $message = getMLText("approval_deletion_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("version").": ".$content->_version."\r\n". - getMLText("comment").": ".$content->getComment()."\r\n". - getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; + $subject = "approval_deletion_email_subject"; + $message = "approval_deletion_email_body"; + $params = array(); + $params['name'] = $document->getName(); + $params['folder_path'] = $folder->getFolderPathPlain(); + $params['version'] = $content->_version; + $params['comment'] = $content->getComment(); + $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, $docAccess["users"][$accessIndex["i"][$rx]], $subject, $message); + $notifier->toIndividual($user, $docAccess["users"][$accessIndex["i"][$rx]], $subject, $message, $params); } } break; @@ -419,16 +438,18 @@ foreach ($pGrpApp as $p) { // Send an email notification to the new approver. if($settings->_enableNotificationAppRev) { if ($overallStatus["status"]!=0 && $notifier) { - $subject = "###SITENAME###: ".$document->getName().", v.".$content->_version." - ".getMLText("approval_request_email"); - $message = getMLText("approval_request_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("version").": ".$content->_version."\r\n". - getMLText("comment").": ".$content->getComment()."\r\n". - getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n"; + $subject = "approval_request_email_subject"; + $message = "approval_request_email_body"; + $params = array(); + $params['name'] = $document->getName(); + $params['folder_path'] = $folder->getFolderPathPlain(); + $params['version'] = $content->_version; + $params['comment'] = $content->getComment(); + $params['username'] = $user->getFullName(); + $params['sitename'] = $settings->_siteName; + $params['http_root'] = $settings->_httpRoot; - $notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$p]], $subject, $message); + $notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$p]], $subject, $message, $params); } } break; @@ -473,17 +494,19 @@ if (count($approvalIndex["g"]) > 0) { // Send an email notification to the approval group. if($settings->_enableNotificationAppRev) { if ($notifier) { + $subject = "approval_deletion_email_subject"; + $message = "approval_deletion_email_body"; + $params = array(); + $params['name'] = $document->getName(); + $params['folder_path'] = $folder->getFolderPathPlain(); + $params['version'] = $content->_version; + $params['comment'] = $content->getComment(); + $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; - $subject = "###SITENAME###: ".$document->getName().", v.".$content->_version." - ".getMLText("approval_deletion_email"); - $message = getMLText("approval_deletion_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("version").": ".$content->_version."\r\n". - getMLText("comment").": ".$content->getComment()."\r\n". - getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$rx]], $subject, $message); + $notifier->toGroup($user, $docAccess["groups"][$accessIndex["g"][$rx]], $subject, $message, $params); } } break; From 1f2041fd4c6944676e4897fdd6cc22492a7952d0 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 9 Mar 2015 10:00:45 +0100 Subject: [PATCH 05/24] add note for closing Bug #189, #204 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index a066df004..591af7ae9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ -------------------------------------------------------------------------------- Changes in version 4.3.15 -------------------------------------------------------------------------------- +- propperly escape quotes in strings to confirm deletion when clicking + on the delete icon in the folder/document list (Bug #189, #204) - new language turkish - SeedDMS_Core_DMS::getAllUsers() returns now previously missing language and theme of user From e5c1f0fe092997da15a597f709fbb3feeb2f42cb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 10 Mar 2015 21:23:33 +0100 Subject: [PATCH 06/24] getConfigDir() also works on MS Windows --- inc/inc.ClassSettings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 452f55cd2..44de26b94 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -804,7 +804,7 @@ class Settings { /* {{{ */ */ function getConfigDir() { /* {{{ */ $_tmp = dirname($_SERVER['SCRIPT_FILENAME']); - $_arr = preg_split('/\//', $_tmp); + $_arr = preg_split('/\//', rtrim(str_replace('\\', '/', $_tmp))); $configDir = null; if(file_exists(implode('/', $_arr)."/conf/")) $configDir = implode('/', $_arr)."/conf/"; From 3206e2fbc21a2fa0974410cec482e552e6764b7b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 10 Mar 2015 21:53:34 +0100 Subject: [PATCH 07/24] add note about fixed installation issue on windows --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 591af7ae9..b1e9eb1af 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ -------------------------------------------------------------------------------- Changes in version 4.3.15 -------------------------------------------------------------------------------- +- fix installation issue on MS Windows - propperly escape quotes in strings to confirm deletion when clicking on the delete icon in the folder/document list (Bug #189, #204) - new language turkish From 6d0a7d4f820fd4537a13e1f4d52fe25e10d7844b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 11 Mar 2015 17:48:10 +0100 Subject: [PATCH 08/24] set tab last seen after submit new configuration --- views/bootstrap/class.Settings.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index f5cb7968a..9951ca1e7 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -44,8 +44,16 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style { ?> +
+ _configFilePath)) { print "
"; @@ -55,9 +63,9 @@ if(!is_writeable($settings->_configFilePath)) { ?>
From c3b80c1b5ddb587d3bd74ec2c6e4d67f752076be Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 11 Mar 2015 18:11:41 +0100 Subject: [PATCH 09/24] add new option enableNotificationWorkflow turns on/off is mail is set to users/groups in next step of workflow --- inc/inc.ClassSettings.php | 7 +++++++ op/op.Settings.php | 1 + views/bootstrap/class.Settings.php | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 44de26b94..9bf39b7f8 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -123,6 +123,11 @@ class Settings { /* {{{ */ var $_enableDuplicateDocNames = true; // enable/disable notification when added as a reviewer/approver var $_enableNotificationAppRev = true; + // enable/disable notification of users/group who need to take action for + // next transition. This is not like enableNotificationAppRev where a + // notification is added to the document. If this is turned on, the + // notification will be send in any case. + var $_enableNotificationWorkflow = false; // preset expiration date var $_presetExpirationDate = ""; // the name of the versioning info file created by the backup tool @@ -485,6 +490,7 @@ class Settings { /* {{{ */ $tab = $node[0]->attributes(); $this->_enableNotificationAppRev = Settings::boolval($tab["enableNotificationAppRev"]); $this->_enableOwnerNotification = Settings::boolval($tab["enableOwnerNotification"]); + $this->_enableNotificationWorkflow = Settings::boolval($tab["enableNotificationWorkflow"]); } // XML Path: /configuration/advanced/server @@ -738,6 +744,7 @@ class Settings { /* {{{ */ $node = $this->getXMLNode($xml, '/configuration/advanced', 'notification'); $this->setXMLAttributValue($node, "enableNotificationAppRev", $this->_enableNotificationAppRev); $this->setXMLAttributValue($node, "enableOwnerNotification", $this->_enableOwnerNotification); + $this->setXMLAttributValue($node, "enableNotificationWorkflow", $this->_enableNotificationWorkflow); // XML Path: /configuration/advanced/server $node = $this->getXMLNode($xml, '/configuration/advanced', 'server'); diff --git a/op/op.Settings.php b/op/op.Settings.php index e40c55033..512dd5edb 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -152,6 +152,7 @@ if ($action == "saveSettings") // SETTINGS - ADVANCED - NOTIFICATION $settings->_enableOwnerNotification = getBoolValue("enableOwnerNotification"); $settings->_enableNotificationAppRev = getBoolValue("enableNotificationAppRev"); + $settings->_enableNotificationWorkflow = getBoolValue("enableNotificationWorkflow"); // SETTINGS - ADVANCED - SERVER $settings->_coreDir = $_POST["coreDir"]; diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 9951ca1e7..c7141306a 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -517,6 +517,10 @@ if(!is_writeable($settings->_configFilePath)) { : _enableNotificationAppRev) echo "checked" ?> /> + "> + : + _enableNotificationWorkflow) echo "checked" ?> /> +