Merge pull request #4243 from MrPetovan/task/switch-to-array-new-style

[friendica.git] / src / Util / ExAuth.php

diff --git a/src/Util/ExAuth.php b/src/Util/ExAuth.php
index 054b87aad4d6dafb66447f8c01053d2b35733156..847059d6d7e9c2882ab8b3381025d76f502323bc 100644 (file)
--- a/src/Util/ExAuth.php
+++ b/src/Util/ExAuth.php
@@ -140,7 +140,7 @@ class ExAuth
                $this->setHost($aCommand[2]);
 
                // Now we check if the given user is valid
-               $sUser = str_replace(array('%20', '(a)'), array(' ', '@'), $aCommand[1]);
+               $sUser = str_replace(['%20', '(a)'], [' ', '@'], $aCommand[1]);
 
                // Does the hostname match? So we try directly
                if ($a->get_hostname() == $aCommand[2]) {
@@ -220,16 +220,17 @@ class ExAuth
                $this->setHost($aCommand[2]);
 
                // We now check if the password match
-               $sUser = str_replace(array('%20', '(a)'), array(' ', '@'), $aCommand[1]);
+               $sUser = str_replace(['%20', '(a)'], [' ', '@'], $aCommand[1]);
 
                // Does the hostname match? So we try directly
                if ($a->get_hostname() == $aCommand[2]) {
                        $this->writeLog(LOG_INFO, 'internal auth for ' . $sUser . '@' . $aCommand[2]);
 
-                       $aUser = dba::select('user', ['uid', 'password'], ['nickname' => $sUser], ['limit' => 1]);
+                       $aUser = dba::selectFirst('user', ['uid', 'password'], ['nickname' => $sUser]);
                        if (DBM::is_result($aUser)) {
-                               $uid = User::authenticate($aUser, $aCommand[3]);
-                               $Error = $uid === false;
+                               $uid = $aUser['uid'];
+                               $success = User::authenticate($aUser, $aCommand[3]);
+                               $Error = $success === false;
                        } else {
                                $this->writeLog(LOG_WARNING, 'user not found: ' . $sUser);
                                $Error = true;
@@ -310,6 +311,7 @@ class ExAuth
 
                $lockpath = Config::get('jabber', 'lockpath');
                if (is_null($lockpath)) {
+                       $this->writeLog(LOG_INFO, 'No lockpath defined.');
                        return;
                }
 
@@ -325,6 +327,9 @@ class ExAuth
 
                // Now it is safe to create the pid file
                PidFile::create($file);
+               if (!file_exists($file)) {
+                       $this->writeLog(LOG_WARNING, 'Logfile ' . $file . " couldn't be created.");
+               }
        }
 
        /**