maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix some more checkstyle issues

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-24 13:21:35 +01:00
parent 35c631946d
commit 30f5902b88
16 changed files with 74 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Froxlor/System/Cronjob.php
View File

@@ -346,4 +346,4 @@ class Cronjob
die($message);
}
}
}

7
lib/Froxlor/System/Crypt.php
View File

@@ -215,11 +215,8 @@ class Crypt
$pwd_check = crypt($password, $pwd_salt);
// check whether the hash needs to be updated
$hash_type_chk = substr($pwd_hash, 0, 3);
if (($systype == 1 && $hash_type_chk != '$1$') || // MD5
($systype == 2 && $hash_type_chk != '$2$') || // BLOWFISH
($systype == 3 && $hash_type_chk != '$5$') || // SHA256
($systype == 4 && $hash_type_chk != '$6$')) // SHA512
{
// MD5 || BLOWFISH || SHA256 || SHA512
if (($systype == 1 && $hash_type_chk != '$1$') || ($systype == 2 && $hash_type_chk != '$2$') || ($systype == 3 && $hash_type_chk != '$5$') || ($systype == 4 && $hash_type_chk != '$6$')) {
$update_hash = true;
}
}