Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/user_sql.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib/Query
diff options
context:
space:
mode:
authorMarcin Łojewski <marcin.lojewski@mlojewski.me>2018-06-30 14:19:04 +0300
committerMarcin Łojewski <marcin.lojewski@mlojewski.me>2018-06-30 14:19:04 +0300
commita2b65f144c51be46335d34d12f3310e3533e4329 (patch)
treec316360929c6f6496f0bb6b8b20411d6acb5a83a /lib/Query
parent434e2777c39ee0c0ff12f3c1e8c172fc47b7207b (diff)
Adding SALT from DB and new Algorithm to be connected with HumHub
https://github.com/nextcloud/user_sql/pull/42
Diffstat (limited to 'lib/Query')
-rw-r--r--lib/Query/QueryProvider.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Query/QueryProvider.php b/lib/Query/QueryProvider.php
index 742e784..49f2ac9 100644
--- a/lib/Query/QueryProvider.php
+++ b/lib/Query/QueryProvider.php
@@ -71,6 +71,7 @@ class QueryProvider implements \ArrayAccess
$uHome = $this->properties[DB::USER_HOME_COLUMN];
$uName = $this->properties[DB::USER_NAME_COLUMN];
$uPassword = $this->properties[DB::USER_PASSWORD_COLUMN];
+ $uSalt = $this->properties[DB::USER_SALT_COLUMN];
$uUID = $this->properties[DB::USER_UID_COLUMN];
$ugGID = $this->properties[DB::USER_GROUP_GID_COLUMN];
@@ -92,7 +93,8 @@ class QueryProvider implements \ArrayAccess
(empty($uEmail) ? "null" : $uEmail) . " AS email, " .
(empty($uHome) ? "null" : $uHome) . " AS home, " .
(empty($uActive) ? "true" : $uActive) . " AS active, " .
- (empty($uAvatar) ? "false" : $uAvatar) . " AS avatar";
+ (empty($uAvatar) ? "false" : $uAvatar) . " AS avatar, " .
+ (empty($uSalt) ? "null" : $uSalt) . " AS salt";
$this->queries = [
Query::BELONGS_TO_ADMIN =>