diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index e3d2ea766..6d62c4a2f 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -107,6 +107,10 @@ class Settings { /* {{{ */ var $_enableUsersView = true; // enable/disable listing administrator as reviewer/approver var $_enableAdminRevApp = false; + // enable/disable listing owner as reviewer/approver + var $_enableOwnerRevApp = false; + // enable/disable listing logged in user as reviewer/approver + var $_enableSelfRevApp = false; // enable/disable default notification for owner var $_enableOwnerNotification = false; // enable/disable deleting of versions for regular users @@ -426,6 +430,8 @@ class Settings { /* {{{ */ $node = $xml->xpath('/configuration/advanced/edition'); $tab = $node[0]->attributes(); $this->_enableAdminRevApp = Settings::boolval($tab["enableAdminRevApp"]); + $this->_enableOwnerRevApp = Settings::boolval($tab["enableOwnerRevApp"]); + $this->_enableSelfRevApp = Settings::boolval($tab["enableSelfRevApp"]); $this->_versioningFileName = strval($tab["versioningFileName"]); $this->_workflowMode = strval($tab["workflowMode"]); $this->_enableVersionDeletion = Settings::boolval($tab["enableVersionDeletion"]); @@ -664,6 +670,8 @@ class Settings { /* {{{ */ // XML Path: /configuration/advanced/edition $node = $this->getXMLNode($xml, '/configuration/advanced', 'edition'); $this->setXMLAttributValue($node, "enableAdminRevApp", $this->_enableAdminRevApp); + $this->setXMLAttributValue($node, "enableOwnerRevApp", $this->_enableOwnerRevApp); + $this->setXMLAttributValue($node, "enableSelfRevApp", $this->_enableSelfRevApp); $this->setXMLAttributValue($node, "versioningFileName", $this->_versioningFileName); $this->setXMLAttributValue($node, "workflowMode", $this->_workflowMode); $this->setXMLAttributValue($node, "enableVersionDeletion", $this->_enableVersionDeletion); diff --git a/op/op.Settings.php b/op/op.Settings.php index 837247b5b..d19b62b53 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -132,6 +132,8 @@ if ($action == "saveSettings") $settings->_versioningFileName = $_POST["versioningFileName"]; $settings->_workflowMode = $_POST["workflowMode"]; $settings->_enableAdminRevApp = getBoolValue("enableAdminRevApp"); + $settings->_enableOwnerRevApp = getBoolValue("enableOwnerRevApp"); + $settings->_enableSelfRevApp = getBoolValue("enableSelfRevApp"); $settings->_enableVersionDeletion = getBoolValue("enableVersionDeletion"); $settings->_enableVersionModification = getBoolValue("enableVersionModification"); $settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames"); diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 68cd6d520..6832bdded 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -427,6 +427,14 @@ if(!is_writeable($settings->_configFilePath)) {