Commit 6f11779e authored by Manfred Kutas's avatar Manfred Kutas

ZP-77 Update GetUserPolicyName() header in zarafa.php and backend.php to

match the interface. Change log entry from multiple lines to single one.

Released under the Affero GNU General Public License (AGPL) version 3.
parent 0a5d18f7
......@@ -1009,6 +1009,9 @@ class BackendZarafa implements IBackend, ISearchProvider {
/**
* Returns the policy name for the user.
* If the backend returns false, the 'default' policy is used.
* If the backend returns any other name than 'default' the policygroup with
* that name (defined in the policies.ini file) will be applied for this user.
*
* @access public
* @return string|boolean
......
......@@ -234,8 +234,7 @@ class DeviceManager {
(Request::WasPolicyKeySent() && $this->device->GetPolicyKey() == ASDevice::UNDEFINED) );
if (!$noDebug || $p)
ZLog::Write(LOGLEVEL_DEBUG, sprintf("DeviceManager->ProvisioningRequired('%s') saved device key '%s' : %s",
$policykey, $this->device->GetPolicyKey(), Utils::PrintAsString($p)));
ZLog::Write(LOGLEVEL_DEBUG, sprintf("DeviceManager->ProvisioningRequired('%s') saved device key '%s': %s", $policykey, $this->device->GetPolicyKey(), Utils::PrintAsString($p)));
if ($checkPolicies) {
$policyHash = SyncProvisioning::GetObjectWithPolicies($this->getProvisioningPolicies())->GetPolicyHash();
......
......@@ -354,6 +354,9 @@ abstract class Backend implements IBackend {
/**
* Returns the policy name for the user.
* If the backend returns false, the 'default' policy is used.
* If the backend returns any other name than 'default' the policygroup with
* that name (defined in the policies.ini file) will be applied for this user.
*
* @access public
* @return string|boolean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment