kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[fix] adding dependency to php-curl, fixing _sha512cr issues

This commit is contained in:
Benjamin Sonntag 2018-07-04 17:19:20 +02:00
parent a1ed5a4ad6
commit a5bf37786c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bureau/class/functions.php
View File

@ -139,7 +139,7 @@ function get_remote_ip() {
/** /**
* Check that $url is a correct url (http:// or https:// or ftp://) * Check that $url is a correct url (http:// or https:// or ftp://)
* *
* @param type $url 1 * @param type $url
* @return boolean * @return boolean
*/ */
function checkurl($url) { function checkurl($url) {
@ -1221,11 +1221,11 @@ function _sha512cr($password, $salt = NULL) {
else if (function_exists('mcrypt_create_iv')) { else if (function_exists('mcrypt_create_iv')) {
$salt = base64_encode(mcrypt_create_iv(12, MCRYPT_DEV_URANDOM)); $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)); $salt = base64_encode(openssl_random_pseudo_bytes(12));
} }
if (!$salt) { if (!$salt) {
throw Error('Unable to generate salt'); throw Exception('Unable to generate salt');
} }
} }
$salt = '$6$rounds=20000$' . $salt; $salt = '$6$rounds=20000$' . $salt;

2
debian/control vendored
View File

@ -19,6 +19,7 @@ Depends: debianutils (>= 1.13.1)
, apache2-mpm-itk | libapache2-mpm-itk , apache2-mpm-itk | libapache2-mpm-itk
, libapache2-mod-php5 | libapache2-mod-php7.0 , libapache2-mod-php5 | libapache2-mod-php7.0
, php5-mysql | php7.0-mysql , php5-mysql | php7.0-mysql
, php-curl | php5-curl | php7.0-curl
, phpmyadmin , phpmyadmin
, ssl-cert , ssl-cert
, libjs-prettify , libjs-prettify
@ -107,6 +108,7 @@ Depends: debianutils (>= 1.13.1)
, apache2-mpm-itk | libapache2-mpm-itk , apache2-mpm-itk | libapache2-mpm-itk
, libapache2-mod-php5 | libapache2-mod-php7.0 , libapache2-mod-php5 | libapache2-mod-php7.0
, php5-mysql | php7.0-mysql , php5-mysql | php7.0-mysql
, php-curl | php5-curl | php7.0-curl
, phpmyadmin , phpmyadmin
, ssl-cert , ssl-cert
, libjs-prettify , libjs-prettify