clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove SQL column legacy_password

Browse Source
This commit is contained in:
Alexandre Alapetite
2018-04-08 14:53:12 +02:00
parent cb26cd6d5d
commit 82f1f2f00e
5 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Database/DBStructure.php
-1
View File
@@ -1726,7 +1726,6 @@ class DBStructure
"guid" => ["type" => "varchar(64)", "not null" => "1", "default" => "", "comment" => ""],
"username" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
"password" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
"legacy_password" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Is the password hash double-hashed?"],
"nickname" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
"email" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
"openid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
src/Model/User.php
+2 -4
View File
@@ -170,13 +170,12 @@ class User
if (!isset($user['uid'])
|| !isset($user['password'])
|| !isset($user['legacy_password'])
) {
throw new Exception(L10n::t('Not enough information to authenticate'));
}
} elseif (is_int($user_info) || is_string($user_info)) {
if (is_int($user_info)) {
$user = dba::selectFirst('user', ['uid', 'password', 'legacy_password'],
$user = dba::selectFirst('user', ['uid', 'password'],
[
'uid' => $user_info,
'blocked' => 0,
@@ -186,7 +185,7 @@ class User
]
);
} else {
$user = dba::fetch_first('SELECT `uid`, `password`, `legacy_password`
$user = dba::fetch_first('SELECT `uid`, `password`
FROM `user`
WHERE (`email` = ? OR `username` = ? OR `nickname` = ?)
AND `blocked` = 0
@@ -277,7 +276,6 @@ class User
'password' => $pasword_hashed,
'pwdreset' => null,
'pwdreset_time' => null,
'legacy_password' => false
];
return dba::update('user', $fields, ['uid' => $uid]);
}
src/Util/ExAuth.php
+1 -1
View File
@@ -226,7 +226,7 @@ class ExAuth
if ($a->get_hostname() == $aCommand[2]) {
$this->writeLog(LOG_INFO, 'internal auth for ' . $sUser . '@' . $aCommand[2]);
$aUser = dba::selectFirst('user', ['uid', 'password', 'legacy_password'], ['nickname' => $sUser]);
$aUser = dba::selectFirst('user', ['uid', 'password'], ['nickname' => $sUser]);
if (DBM::is_result($aUser)) {
$uid = $aUser['uid'];
$success = User::authenticate($aUser, $aCommand[3]);