diff --git a/bureau/class/functions.php b/bureau/class/functions.php index fe873c13..b9c94817 100755 --- a/bureau/class/functions.php +++ b/bureau/class/functions.php @@ -139,7 +139,7 @@ function get_remote_ip() { /** * Check that $url is a correct url (http:// or https:// or ftp://) * - * @param type $url +1 * @param type $url * @return boolean */ function checkurl($url) { @@ -1221,11 +1221,11 @@ function _sha512cr($password, $salt = NULL) { else if (function_exists('mcrypt_create_iv')) { $salt = base64_encode(mcrypt_create_iv(12, MCRYPT_DEV_URANDOM)); } - else if (function_exists('')) { + else if (function_exists('openssl_random_pseudo_bytes')) { $salt = base64_encode(openssl_random_pseudo_bytes(12)); } if (!$salt) { - throw Error('Unable to generate salt'); + throw Exception('Unable to generate salt'); } } $salt = '$6$rounds=20000$' . $salt; diff --git a/debian/control b/debian/control index e6904d47..166cd069 100644 --- a/debian/control +++ b/debian/control @@ -19,6 +19,7 @@ Depends: debianutils (>= 1.13.1) , apache2-mpm-itk | libapache2-mpm-itk , libapache2-mod-php5 | libapache2-mod-php7.0 , php5-mysql | php7.0-mysql + , php-curl | php5-curl | php7.0-curl , phpmyadmin , ssl-cert , libjs-prettify @@ -107,6 +108,7 @@ Depends: debianutils (>= 1.13.1) , apache2-mpm-itk | libapache2-mpm-itk , libapache2-mod-php5 | libapache2-mod-php7.0 , php5-mysql | php7.0-mysql + , php-curl | php5-curl | php7.0-curl , phpmyadmin , ssl-cert , libjs-prettify