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

remove unnecessary ternaries (#1027)

Browse Source 
* remove unnecessary ternaries

* fix: !($id <= 0);

* remove ternary
This commit is contained in:
Dennis Dudek
2022-04-14 09:02:10 +02:00
committed by GitHub
parent d90676a793
commit 25d9c52c58
44 changed files with 310 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,18 +62,18 @@ class Crypt
* @author Michal Wojcik <m.wojcik@sonet3.pl>
* @author Michael Kaufmann <mkaufmann@nutime.de>
* @author Froxlor team <team@froxlor.org> (2010-)
*
*
* 0 - default crypt (depends on system configuration)
* 1 - MD5 $1$
* 2 - BLOWFISH $2y$07$
* 3 - SHA-256 $5$ (default)
* 4 - SHA-512 $6$
*
*
* @param string $password
* Password to be encrypted
* @param bool $htpasswd
* optional whether to generate a SHA1 password for directory protection
*
*
* @return string encrypted password
*/
public static function makeCryptPassword($password, $htpasswd = false)
@@ -120,7 +120,7 @@ class Crypt
*
* @param string $password
* the password to validate
*
*
* @return string either the password or an errormessage+exit
*/
public static function validatePassword($password = null, $json_response = false)
@@ -165,7 +165,7 @@ class Crypt
* either panel_customers or panel_admins
* @param string $uid
* user-id-field in $table
*
*
* @return boolean
*/
public static function validatePasswordLogin($userinfo = null, $password = null, $table = 'panel_customers', $uid = 'customerid')
@@ -189,7 +189,7 @@ class Crypt
if ($pwd_hash == $pwd_check || password_verify($password, $pwd_hash)) {
// check for update of hash (only if our database is ready to handle the bigger string)
$is_ready = (\Froxlor\Froxlor::versionCompare2("0.9.33", \Froxlor\Froxlor::getVersion()) <= 0 ? true : false);
$is_ready = \Froxlor\Froxlor::versionCompare2("0.9.33", \Froxlor\Froxlor::getVersion()) <= 0 ;
if ((password_needs_rehash($pwd_hash, $algo) || $update_hash) && $is_ready) {
$upd_stmt = \Froxlor\Database\Database::prepare("
UPDATE " . $table . " SET `password` = :newpasswd WHERE `" . $uid . "` = :uid

4
lib/Froxlor/System/Mailer.php
View File

@@ -11,7 +11,7 @@ class Mailer extends \PHPMailer\PHPMailer\PHPMailer
*
* @param string $exceptions
* whether to throw exceptions or not
*
*
*/
public function __construct($exceptions = false)
{
@@ -21,7 +21,7 @@ class Mailer extends \PHPMailer\PHPMailer\PHPMailer
if (Settings::Get('system.mail_use_smtp')) {
$this->isSMTP();
$this->Host = Settings::Get('system.mail_smtp_host');
$this->SMTPAuth = Settings::Get('system.mail_smtp_auth') == '1' ? true : false;
$this->SMTPAuth = Settings::Get('system.mail_smtp_auth') == '1';
$this->Username = Settings::Get('system.mail_smtp_user');
$this->Password = Settings::Get('system.mail_smtp_passwd');
if (Settings::Get('system.mail_smtp_usetls')) {