From a3d6776c7880958b3b2a528a7ccc89c51fb0a126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Tue, 30 Aug 2016 14:51:40 +0200
Subject: [PATCH] Small PHP fixes
---
include/class_msg_dialog.inc | 6 +-----
.../class_password-methods-crypt.inc | 6 +-----
.../class_password-methods-md5.inc | 10 +++-------
.../class_password-methods-smd5.inc | 16 ++++++----------
4 files changed, 11 insertions(+), 27 deletions(-)
diff --git a/include/class_msg_dialog.inc b/include/class_msg_dialog.inc
index a719d16f3..870d55813 100644
--- a/include/class_msg_dialog.inc
+++ b/include/class_msg_dialog.inc
@@ -193,11 +193,7 @@ class msg_dialog
*/
public function is_confirmed()
{
- if (isset($_POST['MSG_OK'.$this->i_ID])) {
- return TRUE;
- } else {
- return FALSE;
- }
+ return isset($_POST['MSG_OK'.$this->i_ID]);
}
/*!
diff --git a/include/password-methods/class_password-methods-crypt.inc b/include/password-methods/class_password-methods-crypt.inc
index 7c99e7b94..7d68348d1 100644
--- a/include/password-methods/class_password-methods-crypt.inc
+++ b/include/password-methods/class_password-methods-crypt.inc
@@ -46,11 +46,7 @@ class passwordMethodCrypt extends passwordMethod
*/
function is_available()
{
- if (function_exists("crypt")) {
- return TRUE;
- } else {
- return FALSE;
- }
+ return function_exists('crypt');
}
/*!
diff --git a/include/password-methods/class_password-methods-md5.inc b/include/password-methods/class_password-methods-md5.inc
index 2cfb254ce..127a5178c 100644
--- a/include/password-methods/class_password-methods-md5.inc
+++ b/include/password-methods/class_password-methods-md5.inc
@@ -46,11 +46,7 @@ class passwordMethodMd5 extends passwordMethod
*/
function is_available()
{
- if (function_exists('md5')) {
- return TRUE;
- } else {
- return FALSE;
- }
+ return function_exists('md5');
}
/*!
@@ -60,7 +56,7 @@ class passwordMethodMd5 extends passwordMethod
*/
function generate_hash($pwd)
{
- return "{MD5}".base64_encode( pack('H*', md5($pwd)));
+ return '{MD5}'.base64_encode( pack('H*', md5($pwd)));
}
/*!
@@ -68,7 +64,7 @@ class passwordMethodMd5 extends passwordMethod
*/
static function get_hash_name()
{
- return "md5";
+ return 'md5';
}
}
?>
diff --git a/include/password-methods/class_password-methods-smd5.inc b/include/password-methods/class_password-methods-smd5.inc
index 64e2612bf..96d56b3b6 100644
--- a/include/password-methods/class_password-methods-smd5.inc
+++ b/include/password-methods/class_password-methods-smd5.inc
@@ -45,11 +45,7 @@ class passwordMethodsmd5 extends passwordMethod
*/
function is_available()
{
- if ((!function_exists('md5'))) {
- return FALSE;
- } else {
- return TRUE;
- }
+ return function_exists('md5');
}
/*!
@@ -60,9 +56,9 @@ class passwordMethodsmd5 extends passwordMethod
function generate_hash($pwd)
{
mt_srand(microtime() * 10000000);
- $salt0 = substr(pack("h*", md5(mt_rand())), 0, 8);
- $salt = substr(pack("H*", md5($salt0 . $pwd)), 0, 4);
- $hash = "{SMD5}".base64_encode(pack("H*", md5($pwd . $salt)) . $salt);
+ $salt0 = substr(pack('h*', md5(mt_rand())), 0, 8);
+ $salt = substr(pack('H*', md5($salt0 . $pwd)), 0, 4);
+ $hash = '{SMD5}'.base64_encode(pack('H*', md5($pwd . $salt)) . $salt);
return $hash;
}
@@ -71,7 +67,7 @@ class passwordMethodsmd5 extends passwordMethod
$hash = base64_decode(substr($hash, 6));
$salt = substr($hash, 16);
$hash = substr($hash, 0, 16);
- $nhash = pack("H*", md5($pwd . $salt));
+ $nhash = pack('H*', md5($pwd . $salt));
return ($nhash == $hash);
}
@@ -80,7 +76,7 @@ class passwordMethodsmd5 extends passwordMethod
*/
static function get_hash_name()
{
- return "smd5";
+ return 'smd5';
}
}
?>
--
GitLab