diff options
| author | Marcin Łojewski <marcin.lojewski@mlojewski.me> | 2018-12-22 21:25:55 +0300 |
|---|---|---|
| committer | Marcin Łojewski <marcin.lojewski@mlojewski.me> | 2018-12-22 21:25:55 +0300 |
| commit | 55797f0d568f908c5a70c0800428fe221e3f45cf (patch) | |
| tree | a83f809367b1fb5ad6925f6c05175c032949c804 /lib/Query | |
| parent | ae87b833cfb1e55e9388e5b0c031ed33066aad33 (diff) | |
| parent | ed53272ad94e7c0c208f3228729dbd475540f6e3 (diff) | |
merge feature into develop
Diffstat (limited to 'lib/Query')
| -rw-r--r-- | lib/Query/QueryProvider.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/Query/QueryProvider.php b/lib/Query/QueryProvider.php index 0a1bf76..15092cb 100644 --- a/lib/Query/QueryProvider.php +++ b/lib/Query/QueryProvider.php @@ -22,6 +22,7 @@ namespace OCA\UserSQL\Query; use OCA\UserSQL\Constant\DB; +use OCA\UserSQL\Constant\Opt; use OCA\UserSQL\Constant\Query; use OCA\UserSQL\Properties; @@ -86,6 +87,8 @@ class QueryProvider implements \ArrayAccess $searchParam = Query::SEARCH_PARAM; $uidParam = Query::UID_PARAM; + $reverseActiveOpt = $this->properties[Opt::REVERSE_ACTIVE]; + $groupColumns = "g.$gGID AS gid, " . (empty($gName) ? "g." . $gGID : "g." . $gName) . " AS name, " . @@ -96,7 +99,7 @@ class QueryProvider implements \ArrayAccess (empty($uEmail) ? "null" : "u." . $uEmail) . " AS email, " . (empty($uQuota) ? "null" : "u." . $uQuota) . " AS quota, " . (empty($uHome) ? "null" : "u." . $uHome) . " AS home, " . - (empty($uActive) ? "true" : "u." . $uActive) . " AS active, " . + (empty($uActive) ? "true" : (empty($reverseActiveOpt) ? "" : "NOT ") . "u." . $uActive) . " AS active, " . (empty($uAvatar) ? "false" : "u." . $uAvatar) . " AS avatar, " . (empty($uSalt) ? "null" : "u." . $uSalt) . " AS salt"; |