diff --git a/CHANGELOG b/CHANGELOG index a066df004..91b9fcad5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,13 @@ -------------------------------------------------------------------------------- Changes in version 4.3.15 -------------------------------------------------------------------------------- +- ѕend notification to users if they are required to take action + in the next workflow transition +- escape quotes in workflow graph (javascript threw an error if usernames + contains quotes) +- 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 - SeedDMS_Core_DMS::getAllUsers() returns now previously missing language and theme of user @@ -9,6 +16,10 @@ - reviewers and approvers can be taken over from the previous version - disabling clipboard will disable all clipboard functions not just the clipboard area on the ViewFolder page +- if a user substitution was done, it will be done in the restapi too +- doSearch() in restapi applies the limit after filtering the hits + by access rights. This slows down search, but at least returns a + result set in cases where the user has access to very few documents only. -------------------------------------------------------------------------------- Changes in version 4.3.14 diff --git a/Makefile b/Makefile index bbc9f7eb4..80bfc7473 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=4.3.14 +VERSION=4.3.15 SRC=CHANGELOG inc conf utils index.php languages views op out README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi # webapp diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index dc1540ca7..a85d64c8e 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,7 +12,7 @@ uwe@steinmann.cx yes - 2015-02-05 + 2015-02-12 4.3.15 diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 32eadef32..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 @@ -506,7 +512,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)); @@ -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'); @@ -804,7 +811,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/"; diff --git a/inc/inc.Version.php b/inc/inc.Version.php index ec0e3fa95..3c8fd8268 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { - public $_number = "4.3.14"; + public $_number = "4.3.15"; private $_string = "SeedDMS"; function SeedDMS_Version() { diff --git a/install/install.php b/install/install.php index 2316e14e0..6431e539b 100644 --- a/install/install.php +++ b/install/install.php @@ -119,7 +119,7 @@ function fileExistsInIncludePath($file) { /* {{{ */ * Load default settings + set */ define("SEEDDMS_INSTALL", "on"); -define("SEEDDMS_VERSION", "4.3.14"); +define("SEEDDMS_VERSION", "4.3.15"); require_once('../inc/inc.ClassSettings.php'); diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 3236de731..ba58d2348 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' => 'طلب الموافقة', @@ -668,6 +670,8 @@ URL: [url]', 'remove_marked_files' => 'ازالة الملفات المختارة', 'repaired' => 'تم اصلاحه', 'repairing_objects' => 'تحضير المستندات والمجلدات.', +'request_workflow_action_email_body' => '', +'request_workflow_action_email_subject' => '', 'results_page' => 'صفحة النتائج', 'return_from_subworkflow' => 'العودة من مسار العمل الفرعي', 'return_from_subworkflow_email_body' => 'عودة من مسار عمل فرعي @@ -684,9 +688,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' => 'تم تقديم المراجعة @@ -843,6 +851,8 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => '', 'settings_enableNotificationAppRev' => '', 'settings_enableNotificationAppRev_desc' => '', +'settings_enableNotificationWorkflow' => '', +'settings_enableNotificationWorkflow_desc' => '', 'settings_enableOwnerNotification' => '', 'settings_enableOwnerNotification_desc' => '', 'settings_enableOwnerRevApp' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 581558395..4d9aff91b 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', @@ -560,6 +567,8 @@ $text = array( 'remove_marked_files' => '', 'repaired' => '', 'repairing_objects' => '', +'request_workflow_action_email_body' => '', +'request_workflow_action_email_subject' => '', 'results_page' => 'Pàgina de resultats', 'return_from_subworkflow' => '', 'return_from_subworkflow_email_body' => '', @@ -569,9 +578,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' => '', @@ -708,6 +721,8 @@ $text = array( 'settings_enableLargeFileUpload_desc' => '', 'settings_enableNotificationAppRev' => '', 'settings_enableNotificationAppRev_desc' => '', +'settings_enableNotificationWorkflow' => '', +'settings_enableNotificationWorkflow_desc' => '', 'settings_enableOwnerNotification' => '', 'settings_enableOwnerNotification_desc' => '', 'settings_enableOwnerRevApp' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index b340dafde..2e75204f1 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', @@ -678,6 +680,8 @@ URL: [url]', 'remove_marked_files' => 'Odstranit označené soubory', 'repaired' => 'opraveno', 'repairing_objects' => 'Opravuji dokumenty a složky.', +'request_workflow_action_email_body' => '', +'request_workflow_action_email_subject' => '', 'results_page' => 'Stránka s výsledky', 'return_from_subworkflow' => 'Návrat z vedlejšího pracovního postupu', 'return_from_subworkflow_email_body' => 'Návrat z vedlejšího pracovního postupu @@ -694,9 +698,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] @@ -852,6 +860,8 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => 'If set, file upload is also available through a java applet called jumploader without a file size limit set by the browser. It also allows to upload several files in one step.', 'settings_enableNotificationAppRev' => 'Povolit oznámení posuzovateli/schvalovateli', 'settings_enableNotificationAppRev_desc' => 'Označit pro oznamování posuzovateli/schvalovateli, pokud je přidána nová verze dokumentu.', +'settings_enableNotificationWorkflow' => '', +'settings_enableNotificationWorkflow_desc' => '', 'settings_enableOwnerNotification' => 'Povolit oznámení vlastníka standardně', 'settings_enableOwnerNotification_desc' => 'Označit pro přidání oznámení pro vlastníka v případě, kdy dokument je přidán.', 'settings_enableOwnerRevApp' => 'Povolit posouzení/schválení pro majitele', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 728b74c69..a3c9e4e41 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 (1935), 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 @@ -536,7 +543,7 @@ URL: [url]', 'my_account' => 'Mein Profil', 'my_documents' => 'Meine Dokumente', 'name' => 'Name', -'needs_workflow_action' => 'Diese Dokument erfordert eine Aktion. Bitte schauen Sie auf den Workflow-Reiter.', +'needs_workflow_action' => 'Dieses Dokument erfordert eine Aktion. Bitte schauen Sie auf den Workflow-Reiter.', 'never' => 'nie', 'new' => 'Neu', 'new_attrdef' => 'Neue Attributdefinition', @@ -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', @@ -682,6 +689,8 @@ URL: [url]', 'remove_marked_files' => 'Markierte Dateien löschen', 'repaired' => 'repariert', 'repairing_objects' => 'Repariere Dokumente und Ordner.', +'request_workflow_action_email_body' => '', +'request_workflow_action_email_subject' => '', 'results_page' => 'Ergebnis-Seite', 'return_from_subworkflow' => 'Rückkehr aus Sub-Workflow', 'return_from_subworkflow_email_body' => 'Rückkehr vom Subworkflow @@ -698,9 +707,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 @@ -857,6 +880,8 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => 'Wenn dies gesetzt ist, dann ist ebenfalls der Upload von Dokumenten durch ein java applet mit Namen \'jumploader\' ohne Begrenzung der maximalen Dateigröße möglich. Auch das Hochladen mehrerer Dokumente in einem Schritt wird dadurch ermöglicht. Das Einschalten bewirkt, dass keine http only Cookies mehr gesetzt werden.', 'settings_enableNotificationAppRev' => 'Prűfer/Freigeber benachrichtigen', 'settings_enableNotificationAppRev_desc' => 'Setzen Sie diese Option, wenn die Prüfer und Freigeber eines Dokuments beim Hochladen einer neuen Version benachrichtigt werden sollen.', +'settings_enableNotificationWorkflow' => 'Sende Benachrichtigung an Benutzer im nächsten Workflow-Schritt', +'settings_enableNotificationWorkflow_desc' => 'Wenn diese Option eingeschaltet ist, werden die Benutzer und Gruppen, die im nächsten Workflow-Schritt aktiv werden müssen, informiert. Selbst dann, wenn Sie für das Dokument keine Benachrichtigung eingetragen haben.', 'settings_enableOwnerNotification' => 'Besitzer als Beobachter eintragen', 'settings_enableOwnerNotification_desc' => 'Setzen Sie diese Option, wenn der Besitzer eines Dokuments nach dem Hochladen in die Liste der Beobachter eingetragen werden soll.', 'settings_enableOwnerRevApp' => 'Erlaube Prüfung/Freigabe durch Besitzer', @@ -1059,7 +1084,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 +1204,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..eaf84e75a 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 (1077), 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', @@ -682,6 +689,15 @@ URL: [url]', 'remove_marked_files' => 'Remove marked files', 'repaired' => 'repaired', 'repairing_objects' => 'Repairing documents and folders.', +'request_workflow_action_email_body' => 'The workflow has reached a state which requires your action. +Document: [name] +Version: [version] +Workflow: [workflow] +Current state: [current_state] +Parent folder: [folder_path] +User: [username] +URL: [url]', +'request_workflow_action_email_subject' => 'Workflow action required', 'results_page' => 'Results Page', 'return_from_subworkflow' => 'Return from sub workflow', 'return_from_subworkflow_email_body' => 'Return from subworkflow @@ -698,9 +714,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 @@ -857,6 +887,8 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => 'If set, file upload is also available through a java applet called jumploader without a file size limit set by the browser. It also allows to upload several files in one step. Turning this on will turn off http only cookies.', 'settings_enableNotificationAppRev' => 'Enable reviewer/approver notification', 'settings_enableNotificationAppRev_desc' => 'Check to send a notification to the reviewer/approver when a new document version is added', +'settings_enableNotificationWorkflow' => 'Send notification to users in next workflow transition', +'settings_enableNotificationWorkflow_desc' => 'If this option is enabled, the users and groups which need to take action in the next workflow transiton will be notified. Even if they have not added a notification for the document.', 'settings_enableOwnerNotification' => 'Enable owner notification by default', 'settings_enableOwnerNotification_desc' => 'Check for adding a notification for the owner if a document when it is added.', 'settings_enableOwnerRevApp' => 'Allow review/approval for owner', @@ -956,7 +988,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..5527b6dce 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', @@ -683,6 +685,8 @@ nURL: [url]', 'remove_marked_files' => 'Eliminar ficheros marcados', 'repaired' => 'Reparado', 'repairing_objects' => 'Reparando documentos y carpetas.', +'request_workflow_action_email_body' => '', +'request_workflow_action_email_subject' => '', 'results_page' => 'Página de resultados', 'return_from_subworkflow' => 'Regreso a sub Flujo de trabajo', 'return_from_subworkflow_email_body' => 'Retorno del subflujo de trabajo @@ -699,9 +703,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 +751,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] @@ -858,6 +866,8 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => 'Si se habilita, la carga de ficheros también estará disponible a través de un applet java llamado jumploader, sin límite de tamaño de fichero fijado por el navegador. También permite la carga de múltiples ficheros de una sola vez.', 'settings_enableNotificationAppRev' => 'Habilitar notificación a revisor/aprobador', 'settings_enableNotificationAppRev_desc' => 'Habilitar para enviar notificación a revisor/aprobador cuando se añade una nueva versión de documento', +'settings_enableNotificationWorkflow' => '', +'settings_enableNotificationWorkflow_desc' => '', 'settings_enableOwnerNotification' => 'Habilitar notificación al propietario por defecto', 'settings_enableOwnerNotification_desc' => 'Marcar para añadir una notificación al propietario del documento cuando es añadido.', 'settings_enableOwnerRevApp' => 'Permitir al propietario revisar/aprobar', @@ -1110,7 +1120,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..08ec10b0e 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', @@ -679,6 +681,8 @@ URL: [url]', 'remove_marked_files' => 'Supprimer les fichiers sélectionnés', 'repaired' => 'réparé', 'repairing_objects' => 'Réparation des documents et des dossiers.', +'request_workflow_action_email_body' => '', +'request_workflow_action_email_subject' => '', 'results_page' => 'Page de résultats', 'return_from_subworkflow' => 'Revenir du sous-workflow', 'return_from_subworkflow_email_body' => '', @@ -688,9 +692,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 +734,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é', @@ -834,6 +842,8 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => 'Si défini, le téléchargement de fichier est également disponible via un applet java appelé jumploader sans limite de taille définie par le navigateur. Il permet également de télécharger plusieurs fichiers en une seule fois.', 'settings_enableNotificationAppRev' => 'Notification correcteur/approbateur', 'settings_enableNotificationAppRev_desc' => 'Cochez pour envoyer une notification au correcteur/approbateur quand une nouvelle version du document est ajoutée', +'settings_enableNotificationWorkflow' => '', +'settings_enableNotificationWorkflow_desc' => '', 'settings_enableOwnerNotification' => 'ctiver la notification par défaut du propriétaire', 'settings_enableOwnerNotification_desc' => 'Cocher pour ajouter une notification pour le propriétaire si un document quand il est ajouté.', 'settings_enableOwnerRevApp' => 'Autoriser correction/approbbation pour le propriétaire', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 40e6f8e1e..d4d17108b 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', @@ -683,6 +685,8 @@ URL: [url]', 'remove_marked_files' => 'Megjelölt állományok eltávolítása', 'repaired' => 'javított', 'repairing_objects' => 'Dokumentumok és mappák helyreállítása', +'request_workflow_action_email_body' => '', +'request_workflow_action_email_subject' => '', 'results_page' => 'Találati oldal', 'return_from_subworkflow' => 'Visszatérés a segéd munkafolyamatból', 'return_from_subworkflow_email_body' => 'Visszatérés segéd munkafolyamatból @@ -699,9 +703,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 @@ -857,6 +865,8 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => 'Ha beállítja az állományok feltöltése elérhető lesz egy jumploadernek hívott java appleten keresztül a böngészőprogram állomány méret korlátja nélkül. Ez engedélyezi több állomány feltöltését egy lépésben.', 'settings_enableNotificationAppRev' => 'A felülvizsgáló/jóváhagyó értesítés engedélyezése', 'settings_enableNotificationAppRev_desc' => 'Ellenőrzi az értesítés küldését a felülvizsgálónak/jóváhagyónak új dokumentum változat hozzáadásakor', +'settings_enableNotificationWorkflow' => '', +'settings_enableNotificationWorkflow_desc' => '', 'settings_enableOwnerNotification' => 'Engedélyezi a tulajdonos értesítését alapesetben', 'settings_enableOwnerNotification_desc' => 'Ellenőrzi az értesítés hozzáadását a tulajdonosnak ha egy dokumentum hozzáadásra kerül.', 'settings_enableOwnerRevApp' => 'Engedélyezi a felülvizsgálatot/jóváhagyást a tulajdonosnak', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 25d8d501d..d747fabe5 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', @@ -683,6 +685,8 @@ URL: [url]', 'remove_marked_files' => 'Rimuovi i files contrassegnati', 'repaired' => 'riparato', 'repairing_objects' => 'Riparazione documenti e cartelle in corso...', +'request_workflow_action_email_body' => '', +'request_workflow_action_email_subject' => '', 'results_page' => 'Pagina dei risultati', 'return_from_subworkflow' => 'Ritorno dal sotto-flusso di lavoro', 'return_from_subworkflow_email_body' => 'Ritorno dal sotto-flusso di lavoro @@ -699,9 +703,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 +751,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] @@ -858,6 +866,8 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => 'Se selezionato, il caricamento (upload) dei files può essere effettuato anche attraverso un\'applet Java chiamata Jumploader evitando il limite di dimensioni file imposto dal browser; Jumploader permette anche il caricamento di diversi files contemporaneamente.', 'settings_enableNotificationAppRev' => 'Abilita/disabilita notifica a revisore/approvatore', 'settings_enableNotificationAppRev_desc' => 'Spuntare per inviare una notifica al revisore/approvatore nel momento in cui viene aggiunta una nuova versione del documento.', +'settings_enableNotificationWorkflow' => '', +'settings_enableNotificationWorkflow_desc' => '', 'settings_enableOwnerNotification' => 'Abilita/disabilita notifica al proprietario', 'settings_enableOwnerNotification_desc' => 'Spuntare per inviare una notifica al proprietario del documento nel momento in cui questo viene aggiunto.', 'settings_enableOwnerRevApp' => 'Permetti la revisione/approvazione per il proprietario', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index d05eb3cd4..7aeee54d7 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', @@ -675,6 +677,8 @@ URL: [url]', 'remove_marked_files' => 'Geselecteerde bestanden zijn verwijderd', 'repaired' => 'Gerepareerd', 'repairing_objects' => 'Documenten en mappen repareren.', +'request_workflow_action_email_body' => '', +'request_workflow_action_email_subject' => '', 'results_page' => 'Resultaten pagina', 'return_from_subworkflow' => 'Ga terug naar sub workflow', 'return_from_subworkflow_email_body' => 'Terug van subworflow @@ -691,9 +695,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] @@ -849,6 +857,8 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => 'Indien ingeschakeld, is bestandsupload ook beschikbaar via een java applet jumploader genaamd zonder een bestandsgrootte limiet door de browser. Het staat ook toe om meerdere bestanden in een keer te versturen.', 'settings_enableNotificationAppRev' => 'Inschakelen controleur/beoordeler notificatie', 'settings_enableNotificationAppRev_desc' => 'Vink aan om een notificatie te versturen naar de controleur/beoordeler als een nieuw document versie is toegevoegd.', +'settings_enableNotificationWorkflow' => '', +'settings_enableNotificationWorkflow_desc' => '', 'settings_enableOwnerNotification' => 'Inschakelen eigenaarnotificatie standaard', 'settings_enableOwnerNotification_desc' => 'Inschakelen van notificatie naar de eigenaar als een document is toegevoegd.', 'settings_enableOwnerRevApp' => 'Beoordeling / goedkeuring voor eigenaar toestaan', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 156a7b602..cc7d2183f 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ę', @@ -676,6 +678,8 @@ URL: [url]', 'remove_marked_files' => 'Usuń zaznaczone pliki', 'repaired' => 'naprawiony', 'repairing_objects' => 'Naprawa dokumentów i katalogów.', +'request_workflow_action_email_body' => '', +'request_workflow_action_email_subject' => '', 'results_page' => 'Strona z wynikami', 'return_from_subworkflow' => 'Powróć z sub procesu', 'return_from_subworkflow_email_body' => 'Powrót z sub procesu dokumentu: [name] Wersja: [version] Proces: [workflow] Sub proces: [subworkflow] folderu nadrzędnego: [folder_path] Użytkownik: [username] URL: [url]', @@ -685,9 +689,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]', @@ -837,6 +845,8 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => 'Jeśli zaznaczone, wczytywanie plików będzie możliwe również przez aplet javy nazywany jumploader bez limitu rozmiaru plików. Aplet ten pozwala również na wczytywanie wielu plików jednocześnie.', 'settings_enableNotificationAppRev' => 'Włącz/Wyłącz powiadomienia dla zatwierdzających/recenzentów', 'settings_enableNotificationAppRev_desc' => 'Zaznacz aby wysyłać powiadomienia do zatwierdzających i recenzentów kiedy pojawi się nowa wersja dokumentu', +'settings_enableNotificationWorkflow' => '', +'settings_enableNotificationWorkflow_desc' => '', 'settings_enableOwnerNotification' => 'Włącz domyślne powiadamianie właściciela', 'settings_enableOwnerNotification_desc' => 'Zaznacz aby właściciel pliku był powiadamiany zmianach w pliku.', 'settings_enableOwnerRevApp' => 'Pozwól przeglądać/zatwierdzenia właściciela', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 5ae752cc6..398adb2eb 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', @@ -681,6 +683,8 @@ URL: [url]', 'remove_marked_files' => 'Remover arquivos marcados', 'repaired' => 'reparado', 'repairing_objects' => 'Reparando documentos e pastas', +'request_workflow_action_email_body' => '', +'request_workflow_action_email_subject' => '', 'results_page' => 'Results Page', 'return_from_subworkflow' => 'Retorno de sub fluxo de trabalho', 'return_from_subworkflow_email_body' => 'Retorno de sub fluxo de trabalho @@ -697,9 +701,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] @@ -855,6 +863,8 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => 'Se selecionado, o upload de arquivo também estará disponível através de um applet java chamado jumploader sem limite de tamanho de arquivo definido pelo navegador. Ele também permite fazer o upload de vários arquivos de uma só vez.', 'settings_enableNotificationAppRev' => 'Habilitar notificações revisor/aprovador', 'settings_enableNotificationAppRev_desc' => 'Verificar o envio de uma notificação para o revisor/aprovador quando uma nova versão do documento for adicionada', +'settings_enableNotificationWorkflow' => '', +'settings_enableNotificationWorkflow_desc' => '', 'settings_enableOwnerNotification' => 'Habilitar notificações ao proprietário por padrão', 'settings_enableOwnerNotification_desc' => 'Verifique se há adição de uma notificação para o proprietário, se um documento for adicionado.', 'settings_enableOwnerRevApp' => 'Permitir revisão/aprovação para o proprietário', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index b335fcf1a..a7d088ee4 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', @@ -683,6 +685,8 @@ URL: [url]', 'remove_marked_files' => 'Eliminați fișierele marcate', 'repaired' => 'reparat', 'repairing_objects' => 'Reparare documente și foldere.', +'request_workflow_action_email_body' => '', +'request_workflow_action_email_subject' => '', 'results_page' => 'Pagina rezultate', 'return_from_subworkflow' => 'Întoarcere din subworkflow', 'return_from_subworkflow_email_body' => 'Întoarcere din subworkflow @@ -699,9 +703,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ă @@ -858,6 +866,8 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => 'Dacă este setat, incărcarea este de asemenea disponibilă prin intermediul unui applet Java numit jumploader fără limită de dimensiune a fișierului stabilită de browser. De asemenea, permite încărcarea mai multor fișiere într-un singur pas. Activand aceasta optiune va dezactiva optiunea http only cookies.', 'settings_enableNotificationAppRev' => 'Activare notificari rezuitor/aprobator', 'settings_enableNotificationAppRev_desc' => 'Bifati pentru a trimite o notificare către revizuitor/aprobator când se adaugă o nouă versiune la document', +'settings_enableNotificationWorkflow' => '', +'settings_enableNotificationWorkflow_desc' => '', 'settings_enableOwnerNotification' => 'Activarea notificarii proprietarului, în mod implicit', 'settings_enableOwnerNotification_desc' => 'Bifati pentru a adăuga o notificare pentru proprietar în cazul în care un document este adăugat.', 'settings_enableOwnerRevApp' => 'Permite revizuirea/aprobarea de catre proprietar', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 537872bb7..80d6128aa 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' => 'Запрос на утверждение', @@ -673,6 +675,8 @@ URL: [url]', 'remove_marked_files' => 'Удалить выбранные файлы', 'repaired' => 'исправлено', 'repairing_objects' => 'Восстановление каталогов и документов', +'request_workflow_action_email_body' => '', +'request_workflow_action_email_subject' => '', 'results_page' => 'Страница результатов', 'return_from_subworkflow' => 'Выход из подпроцесса', 'return_from_subworkflow_email_body' => 'Выход из подпроцесса @@ -689,9 +693,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 +838,7 @@ URL: [url]', 'settings_enableClipboard_desc' => 'Включить/отключить буфер обмена.', 'settings_enableConverting' => 'Включить преобразование', 'settings_enableConverting_desc' => 'Включить/отключить преобразование файлов.', -'settings_enableDropUpload' => '', +'settings_enableDropUpload' => 'Включить быструю загрузку', 'settings_enableDropUpload_desc' => '', 'settings_enableDuplicateDocNames' => 'Разрешить документы
с одинаковым названием', 'settings_enableDuplicateDocNames_desc' => 'Разрешить документы с одинаковым названием в каталоге.', @@ -848,6 +856,8 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => 'Если включено, загрузка файлов доступна так же через Java-апплет, называемый jumploader, без ограничения размера файла. Это также позволит загружать несколько файлов за раз.', 'settings_enableNotificationAppRev' => 'Извещать рецензента или утверждающего', 'settings_enableNotificationAppRev_desc' => 'Включите для отправки извещения рецензенту или утверждающему при добавлении новой версии документа.', +'settings_enableNotificationWorkflow' => '', +'settings_enableNotificationWorkflow_desc' => '', 'settings_enableOwnerNotification' => 'Извещать владельца по умолчанию', 'settings_enableOwnerNotification_desc' => 'Включите для отправки извещения владельцу при добавлении документа.', 'settings_enableOwnerRevApp' => 'Разрешить рецензию/утверждение
владельцем', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 73b2173a5..d5d49bdc6 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', @@ -560,6 +562,8 @@ $text = array( 'remove_marked_files' => '', 'repaired' => '', 'repairing_objects' => '', +'request_workflow_action_email_body' => '', +'request_workflow_action_email_subject' => '', 'results_page' => 'Výsledky', 'return_from_subworkflow' => '', 'return_from_subworkflow_email_body' => '', @@ -569,9 +573,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' => '', @@ -708,6 +716,8 @@ $text = array( 'settings_enableLargeFileUpload_desc' => '', 'settings_enableNotificationAppRev' => '', 'settings_enableNotificationAppRev_desc' => '', +'settings_enableNotificationWorkflow' => '', +'settings_enableNotificationWorkflow_desc' => '', 'settings_enableOwnerNotification' => '', 'settings_enableOwnerNotification_desc' => '', 'settings_enableOwnerRevApp' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 25cac90cd..faec3780e 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', @@ -668,6 +670,8 @@ URL: [url]', 'remove_marked_files' => 'Ta bort markerade filer', 'repaired' => 'repaired', 'repairing_objects' => 'Förbereder dokument och kataloger.', +'request_workflow_action_email_body' => '', +'request_workflow_action_email_subject' => '', 'results_page' => 'Resultatsida', 'return_from_subworkflow' => 'Tillbaka från under-arbetsflöde', 'return_from_subworkflow_email_body' => 'Tillbaka från underliggande arbetsflöde @@ -684,9 +688,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 @@ -843,6 +851,8 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => 'Om aktiverad, kan filer laddas upp via javaapplet med namnet jumploader, utan begränsningar i filstorlek. Flera filer kan även laddas upp samtidigt i ett steg.', 'settings_enableNotificationAppRev' => 'Aktivera meddelande till personer som granskar/godkänner', 'settings_enableNotificationAppRev_desc' => 'Kryssa i, för att skicka ett meddelande till personer som granskar/godkänner när en ny version av dokumentet har lagts till', +'settings_enableNotificationWorkflow' => '', +'settings_enableNotificationWorkflow_desc' => '', 'settings_enableOwnerNotification' => 'Aktivera meddelande till dokumentägaren', 'settings_enableOwnerNotification_desc' => 'Kryssa i, för att skapa ett meddelande till ägaren av dokumentet, när en ny version av dokumentet har laddats upp.', 'settings_enableOwnerRevApp' => 'Tillåt granskning/godkänning av dokumentägare', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 86c9fa00b..48f25be30 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', @@ -684,6 +686,8 @@ URL: [url]', 'remove_marked_files' => 'İşaretli dosyaları sil', 'repaired' => 'onarıldı', 'repairing_objects' => 'Doküman ve klasörler onarılıyor.', +'request_workflow_action_email_body' => '', +'request_workflow_action_email_subject' => '', 'results_page' => 'Sonuç Sayfası', 'return_from_subworkflow' => 'Alt iş akış dönüşü', 'return_from_subworkflow_email_body' => 'Alt iş akış dönüşü @@ -700,9 +704,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 @@ -859,6 +867,8 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => 'Etkinleştirilirse, büyük dosyalar dosya limitine bakılmaksızın jumploader isimli java applet aracılığıyla yüklenebilir. Bu ayrıca bir seferde birden çok dosya yüklemeyi de sağlar. Bu açıldığında sadece http çerezleri kapanmış olur.', 'settings_enableNotificationAppRev' => 'Kontrol eden/onaylayan bildirimlerini etkinleştir', 'settings_enableNotificationAppRev_desc' => 'Dokümanın yeni versiyonu yüklendiğinde kontrol eden/onaylayana bildirim mesajı gitmesi için bunu etkinleştirin.', +'settings_enableNotificationWorkflow' => '', +'settings_enableNotificationWorkflow_desc' => '', 'settings_enableOwnerNotification' => 'Varsayılan olarak sahip bilgilendirmesi etkin.', 'settings_enableOwnerNotification_desc' => 'Yeni bir doküman eklendiğinde dokümanın sahibini bilgilendirmek için bunu etkinleştirin.', 'settings_enableOwnerRevApp' => 'Sahip için kontrol etme/onaylamayı etkinleştir.', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 5c38076f0..8c7cb9138 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' => '审核请求', @@ -566,6 +568,8 @@ URL: [url]', 'remove_marked_files' => '', 'repaired' => '', 'repairing_objects' => '', +'request_workflow_action_email_body' => '', +'request_workflow_action_email_subject' => '', 'results_page' => '结果页面', 'return_from_subworkflow' => '', 'return_from_subworkflow_email_body' => '', @@ -575,9 +579,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' => '', @@ -714,6 +722,8 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => '', 'settings_enableNotificationAppRev' => '', 'settings_enableNotificationAppRev_desc' => '', +'settings_enableNotificationWorkflow' => '', +'settings_enableNotificationWorkflow_desc' => '', 'settings_enableOwnerNotification' => '', 'settings_enableOwnerNotification_desc' => '', 'settings_enableOwnerRevApp' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 2c5d0773d..74f0b94a4 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' => '審核請求', @@ -564,6 +566,8 @@ URL: [url]', 'remove_marked_files' => '', 'repaired' => '', 'repairing_objects' => '', +'request_workflow_action_email_body' => '', +'request_workflow_action_email_subject' => '', 'results_page' => '結果頁面', 'return_from_subworkflow' => '', 'return_from_subworkflow_email_body' => '', @@ -573,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' => '', @@ -712,6 +720,8 @@ URL: [url]', 'settings_enableLargeFileUpload_desc' => '', 'settings_enableNotificationAppRev' => '', 'settings_enableNotificationAppRev_desc' => '', +'settings_enableNotificationWorkflow' => '', +'settings_enableNotificationWorkflow_desc' => '', 'settings_enableOwnerNotification' => '', 'settings_enableOwnerNotification_desc' => '', 'settings_enableOwnerRevApp' => '', 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; + } } // 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; diff --git a/op/op.SetWorkflow.php b/op/op.SetWorkflow.php index 54c1c5c9c..eb9d3be70 100644 --- a/op/op.SetWorkflow.php +++ b/op/op.SetWorkflow.php @@ -69,6 +69,35 @@ if (!$version->setWorkflow($workflow, $user)){ UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured")); } +if ($notifier) { + $nl = $document->getNotifyList(); + $folder = $document->getFolder(); + + if($settings->_enableNotificationWorkflow) { + $subject = "request_workflow_action_email_subject"; + $message = "request_workflow_action_email_body"; + $params = array(); + $params['name'] = $document->getName(); + $params['version'] = $version->getVersion(); + $params['workflow'] = $workflow->getName(); + $params['folder_path'] = $folder->getFolderPathPlain(); + $params['current_state'] = $workflow->getInitState()->getName(); + $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(); + + foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) { + foreach($ntransition->getUsers() as $tuser) { + $notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params); + } + foreach($ntransition->getGroups() as $tuser) { + $notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params); + } + } + } +} + add_log_line("?documentid=".$documentid); header("Location:../out/out.ViewDocument.php?documentid=".$documentid); diff --git a/op/op.Settings.php b/op/op.Settings.php index e40c55033..67c30331c 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"]; @@ -176,6 +177,6 @@ if ($action == "saveSettings") $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_settings_saved'))); -header("Location:../out/out.Settings.php"); +header("Location:../out/out.Settings.php?currenttab=".$_POST['currenttab']); ?> diff --git a/op/op.TriggerWorkflow.php b/op/op.TriggerWorkflow.php index 0ee73e3c5..10b6825e9 100644 --- a/op/op.TriggerWorkflow.php +++ b/op/op.TriggerWorkflow.php @@ -104,6 +104,30 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) { foreach ($nl["groups"] as $grp) { $notifier->toGroup($user, $grp, $subject, $message, $params); } + + if($settings->_enableNotificationWorkflow) { + $subject = "request_workflow_action_email_subject"; + $message = "request_workflow_action_email_body"; + $params = array(); + $params['name'] = $document->getName(); + $params['version'] = $version->getVersion(); + $params['workflow'] = $workflow->getName(); + $params['folder_path'] = $folder->getFolderPathPlain(); + $params['current_state'] = $transition->getNextState()->getName(); + $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(); + + foreach($workflow->getNextTransitions($transition->getNextState()) as $ntransition) { + foreach($ntransition->getUsers() as $tuser) { + $notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params); + } + foreach($ntransition->getGroups() as $tuser) { + $notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params); + } + } + } } } diff --git a/out/out.Settings.php b/out/out.Settings.php index e58058ec7..61357dd26 100644 --- a/out/out.Settings.php +++ b/out/out.Settings.php @@ -31,7 +31,7 @@ if(!trim($settings->_encryptionKey)) $settings->_encryptionKey = md5(uniqid()); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'settings'=>$settings)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'settings'=>$settings, 'currenttab'=>(isset($_GET['currenttab']) ? $_GET['currenttab'] : ''))); if($view) { $view->show(); exit; diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php index aee6f6281..cd0c2d3b3 100644 --- a/out/out.ViewFolder.php +++ b/out/out.ViewFolder.php @@ -57,7 +57,6 @@ if($view) { $view->setParam('folder', $folder); $view->setParam('orderby', $orderby); $view->setParam('enableFolderTree', $settings->_enableFolderTree); - $view->setParam('enableClipboard', $settings->_enableClipboard); $view->setParam('enableDropUpload', $settings->_enableDropUpload); $view->setParam('expandFolderTree', $settings->_expandFolderTree); $view->setParam('showtree', showtree()); diff --git a/restapi/index.php b/restapi/index.php index 8515aee8c..fe5f653db 100644 --- a/restapi/index.php +++ b/restapi/index.php @@ -42,6 +42,11 @@ if(USE_PHP_SESSION) { else exit; } + if($userobj->isAdmin()) { + if($resArr["su"]) { + $userobj = $dms->getUser($resArr["su"]); + } + } $dms->setUser($userobj); } } @@ -674,21 +679,29 @@ function doSearch() { /* {{{ */ $querystr = $app->request()->get('query'); $mode = $app->request()->get('mode'); if(!$limit = $app->request()->get('limit')) - $limit = 50; - $resArr = $dms->search($querystr, $limit); + $limit = 8; + $resArr = $dms->search($querystr); $entries = array(); + $count = 0; if($resArr['folders']) { foreach ($resArr['folders'] as $entry) { if ($entry->getAccessMode($userobj) >= M_READ) { $entries[] = $entry; + $count++; } + if($count >= $limit) + break; } } + $count = 0; if($resArr['docs']) { foreach ($resArr['docs'] as $entry) { if ($entry->getAccessMode($userobj) >= M_READ) { $entries[] = $entry; + $count++; } + if($count >= $limit) + break; } } diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 6f1df0375..169753515 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1424,7 +1424,7 @@ $('#delete-folder-btn-".$folderid."').popover({ $showtree = $this->params['showtree']; $workflowmode = $this->params['workflowmode']; $previewwidth = $this->params['previewWidthList']; - $enableClipboard = $this->params['enableClipboard']; + $enableClipboard = $this->params['enableclipboard']; $content = ''; @@ -1523,7 +1523,7 @@ $('#delete-folder-btn-".$folderid."').popover({ $showtree = $this->params['showtree']; $enableRecursiveCount = $this->params['enableRecursiveCount']; $maxRecursiveCount = $this->params['maxRecursiveCount']; - $enableClipboard = $this->params['enableClipboard']; + $enableClipboard = $this->params['enableclipboard']; $owner = $subFolder->getOwner(); $comment = $subFolder->getComment(); diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index 8899544c4..93ca7f720 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -59,6 +59,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { $mode = $this->params['mode']; $workflowmode = $this->params['workflowmode']; $enablefullsearch = $this->params['enablefullsearch']; + $enableclipboard = $this->params['enableclipboard']; $attributes = $this->params['attributes']; $categories = $this->params['categories']; $owner = $this->params['owner']; @@ -510,9 +511,11 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { getID(); ?>" msg="" _href="../op/op.AddToClipboard.php?documentid=getID(); ?>&type=document&id=getID(); ?>&refferer=params['refferer']); ?>" title=""> "; print ""; @@ -572,9 +575,11 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { getID(); ?>" msg="" _href="../op/op.AddToClipboard.php?folderid=getID(); ?>&type=folder&id=getID(); ?>&refferer=params['refferer']); ?>" title=""> "; print ""; print "\n"; diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index f5cb7968a..a40eef0d8 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -35,6 +35,7 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style { $dms = $this->params['dms']; $user = $this->params['user']; $settings = $this->params['settings']; + $currenttab = $this->params['currenttab']; $this->htmlStartPage(getMLText("admin_tools")); $this->globalNavigation(); @@ -44,8 +45,17 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style { ?> + +
+ _configFilePath)) { print "
"; @@ -55,9 +65,9 @@ if(!is_writeable($settings->_configFilePath)) { ?>
@@ -509,6 +519,10 @@ if(!is_writeable($settings->_configFilePath)) { : _enableNotificationAppRev) echo "checked" ?> /> + "> + : + _enableNotificationWorkflow) echo "checked" ?> /> +