use Friendica\Core\Config;\r
use Friendica\Core\PConfig;\r
use Friendica\Database\DBM;\r
+use Friendica\Model\User;\r
+use dba;\r
\r
require_once 'include/dba.php';\r
\r
\r
$aUser = dba::select('user', ['uid', 'password'], ['nickname' => $sUser], ['limit' => 1]);\r
if (DBM::is_result($aUser)) {\r
- $uid = $aUser['uid'];\r
- $Error = $aUser['password'] != hash('whirlpool', $aCommand[3]);\r
+ $uid = User::authenticate($aUser, $aCommand[3]);\r
+ $Error = $uid === false;\r
} else {\r
$this->writeLog(LOG_WARNING, 'user not found: ' . $sUser);\r
$Error = true;\r
}\r
if ($Error) {\r
$this->writeLog(LOG_INFO, 'check against alternate password for ' . $sUser . '@' . $aCommand[2]);\r
- $sPassword = PConfig::get($uid, 'xmpp', 'password');\r
+ $sPassword = PConfig::get($uid, 'xmpp', 'password', null, true);\r
$Error = ($aCommand[3] != $sPassword);\r
}\r
} else {\r