From 5e850171e2f323e0ac13df5f8e1c1d5046959a52 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Sun, 1 Jan 2017 15:43:20 +0100 Subject: [PATCH] Fixed "Constant already defined" notice --- config/config.default.php | 6 +++--- includes/engelsystem_provider.php | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/config.default.php b/config/config.default.php index 64c43cfa..49530608 100644 --- a/config/config.default.php +++ b/config/config.default.php @@ -25,9 +25,9 @@ $LETZTES_AUSTRAGEN = 3; // define('CRYPT_ALG', '$1'); // MD5 // define('CRYPT_ALG', '$2y$13'); // Blowfish // define('CRYPT_ALG', '$5$rounds=5000'); // SHA-256 -define('CRYPT_ALG', '$6$rounds=5000'); // SHA-512 +// define('CRYPT_ALG', '$6$rounds=5000'); // SHA-512 -define('MIN_PASSWORD_LENGTH', 8); +// define('MIN_PASSWORD_LENGTH', 8); // Wenn Engel beim Registrieren oder in ihrem Profil eine T-Shirt Größe angeben sollen, auf true setzen: $enable_tshirt_size = true; @@ -64,6 +64,6 @@ $config = [ 'host' => "localhost", 'user' => "root", 'pw' => "", - 'db' => "engelsystem" + 'db' => "engelsystem" ]; ?> diff --git a/includes/engelsystem_provider.php b/includes/engelsystem_provider.php index 595af9f9..ef9cee15 100644 --- a/includes/engelsystem_provider.php +++ b/includes/engelsystem_provider.php @@ -68,6 +68,9 @@ if (file_exists(realpath(__DIR__ . '/../config/config.php'))) { require_once realpath(__DIR__ . '/../config/config.php'); } +defined('CRYPT_ALG') || define('CRYPT_ALG', '$6$rounds=5000'); // SHA-512 +defined('MIN_PASSWORD_LENGTH') || define('MIN_PASSWORD_LENGTH', 8); + if ($maintenance_mode) { echo file_get_contents(__DIR__ . '/../public/maintenance.html'); die();