Merge branch '5788-some-permissions-checks-in-webservice-not-working' into '1.3-dev'

Resolve "Some Permissions checks in webservice not working" See merge request fusiondirectory/fd-plugins!165

Merge branch '5788-some-permissions-checks-in-webservice-not-working' into '1.3-dev'
Resolve "Some Permissions checks in webservice not working" See merge request fusiondirectory/fd-plugins!165
b68b9fbc · Côme Chilliet · 5fa8a2f8 · d3eee7a7 · b68b9fbc
Commit b68b9fbc authored 7 years ago by Côme Chilliet
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 3 deletions
+3 -3
--- a/webservice/html/jsonrpc.php
+++ b/webservice/html/jsonrpc.php
@@ -610,7 +610,7 @@ class fdRPCService
    }

    foreach ($dns as $dn) {
-      if (!preg_match('/w/', $ui->get_permissions($dn, 'user/password'))) {
+      if (!preg_match('/w/', $ui->get_permissions($dn, 'user/user', 'userLock'))) {
        $disallowed[] = $dn;
      }
    }
@@ -679,7 +679,7 @@ class fdRPCService
    }

    foreach ($dns as $dn) {
-      if (!preg_match('/r/', $ui->get_permissions($dn, 'user/password'))) {
+      if (!preg_match('/r/', $ui->get_permissions($dn, 'user/user', 'userLock'))) {
        $disallowed[] = $dn;
      }
    }
@@ -729,7 +729,7 @@ class fdRPCService
    $pwRecovery->email_address = $email;
    $dn = $pwRecovery->step2();
    if ($pwRecovery->step == 2) { /* No errors */
-      if (!preg_match('/w/', $ui->get_permissions($dn, 'user/password'))) {
+      if (!preg_match('/w/', $ui->get_permissions($dn, 'user/user', 'userPassword'))) {
        return array('errors' => array(msgPool::permModify($dn)));
      }
      $token = $pwRecovery->generateAndStoreToken();