Merge pull request #24 from Stibila/master

Fix - preffer mail address to login
nextcloud · Jun 20, 2017 · f627aae · f627aae
2 parents 0cfcc94 + 75a9b72
commit f627aae
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/ajax/getSettings.php b/ajax/getSettings.php
@@ -68,7 +68,9 @@ function validateBoolean($val)
 }
 
 if (validateBoolean($config->getAppValue('ojsxc', 'timeLimitedToken'))) {
-   $data['xmpp']['username'] = $currentUID;
+   if($data['xmpp']['username'] == null) {
+       $data['xmpp']['username'] = $currentUID;
+   }
    $jid = $data['xmpp']['username'] . '@' . $data['xmpp']['domain'];
    $expiry = time() + 60*60;
    $secret = $config->getAppValue('ojsxc', 'apiSecret');