tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from Icinga/bugfix/warnings-for-php-7-1-3208 

PhpSession: conform to PHP 7.1
This commit is contained in:
lippserd 2017-12-15 09:22:22 +01:00 committed by GitHub
parent a71037cd5a 788272fad7
commit 89da30f05f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 17 deletions
library/Icinga/Web/Session
PhpSession.php

34
library/Icinga/Web/Session/PhpSession.php
View File

@ -33,20 +33,6 @@ class PhpSession extends Session
*/
protected $sessionName = 'Icingaweb2';
/**
* Configuration for cookie options
*
* @var array
*/
protected static $defaultCookieOptions = array(
'use_trans_sid' => false,
'use_cookies' => true,
'cookie_httponly' => true,
'use_only_cookies' => true,
'hash_function' => true,
'hash_bits_per_character' => 5,
);
/**
* Create a new PHPSession object using the provided options (if any)
*
@ -57,10 +43,24 @@ class PhpSession extends Session
*/
public function __construct(array $options = null)
{
if ($options !== null) {
$options = array_merge(self::$defaultCookieOptions, $options);
$defaultCookieOptions = array(
'use_trans_sid' => false,
'use_cookies' => true,
'cookie_httponly' => true,
'use_only_cookies' => true
);
if (version_compare(PHP_VERSION, '7.1.0') < 0) {
$defaultCookieOptions['hash_function'] = true;
$defaultCookieOptions['hash_bits_per_character'] = 5;
} else {
$options = self::$defaultCookieOptions;
$defaultCookieOptions['sid_bits_per_character'] = 5;
}
if ($options !== null) {
$options = array_merge($defaultCookieOptions, $options);
} else {
$options = $defaultCookieOptions;
}
if (array_key_exists('test_session_name', $options)) {