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)) {