valentin_le_moign/figureslibres.cc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

maj grav

Browse Source
This commit is contained in:
kevin
2019-09-27 00:29:18 +02:00
parent 40af43681e
commit b857814072
470 changed files with 37562 additions and 10060 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/src/Grav/Framework/Session/Exceptions/SessionException.php
+14
View File
@@ -0,0 +1,14 @@
<?php
/**
* @package Grav\Framework\Session
*
* @copyright Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
* @license MIT License; see LICENSE file for details.
*/
namespace Grav\Framework\Session\Exceptions;
class SessionException extends \RuntimeException
{
}
system/src/Grav/Framework/Session/Session.php
+33 -26
View File
@@ -1,13 +1,16 @@
<?php
/**
* @package Grav\Framework\Session
*
* @copyright Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
* @copyright Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
* @license MIT License; see LICENSE file for details.
*/
namespace Grav\Framework\Session;
use Grav\Framework\Session\Exceptions\SessionException;
/**
* Class Session
* @package Grav\Framework\Session
@@ -38,9 +41,6 @@ class Session implements SessionInterface
return self::$instance;
}
/**
* @inheritdoc
*/
public function __construct(array $options = [])
{
// Session is a singleton.
@@ -61,13 +61,13 @@ class Session implements SessionInterface
}
// Set default options.
$options += array(
$options += [
'cache_limiter' => 'nocache',
'use_trans_sid' => 0,
'use_cookies' => 1,
'lazy_write' => 1,
'use_strict_mode' => 1
);
];
$this->setOptions($options);
@@ -141,35 +141,30 @@ class Session implements SessionInterface
'cache_limiter' => true,
'cache_expire' => true,
'use_trans_sid' => true,
'trans_sid_tags' => true, // PHP 7.1
'trans_sid_hosts' => true, // PHP 7.1
'sid_length' => true, // PHP 7.1
'sid_bits_per_character' => true, // PHP 7.1
'trans_sid_tags' => true,
'trans_sid_hosts' => true,
'sid_length' => true,
'sid_bits_per_character' => true,
'upload_progress.enabled' => true,
'upload_progress.cleanup' => true,
'upload_progress.prefix' => true,
'upload_progress.name' => true,
'upload_progress.freq' => true,
'upload_progress.min-freq' => true,
'lazy_write' => true,
'url_rewriter.tags' => true, // Not used in PHP 7.1
'hash_function' => true, // Not used in PHP 7.1
'hash_bits_per_character' => true, // Not used in PHP 7.1
'entropy_file' => true, // Not used in PHP 7.1
'entropy_length' => true, // Not used in PHP 7.1
'lazy_write' => true
];
foreach ($options as $key => $value) {
if (is_array($value)) {
if (\is_array($value)) {
// Allow nested options.
foreach ($value as $key2 => $value2) {
$ckey = "{$key}.{$key2}";
if (isset($value2, $allowedOptions[$ckey])) {
$this->ini_set("session.{$ckey}", $value2);
$this->setOption($ckey, $value2);
}
}
} elseif (isset($value, $allowedOptions[$key])) {
$this->ini_set("session.{$key}", $value);
$this->setOption($key, $value);
}
}
}
@@ -179,6 +174,10 @@ class Session implements SessionInterface
*/
public function start($readonly = false)
{
if (\PHP_SAPI === 'cli') {
return $this;
}
// Protection against invalid session cookie names throwing exception: http://php.net/manual/en/function.session-id.php#116836
if (isset($_COOKIE[session_name()]) && !preg_match('/^[-,a-zA-Z0-9]{1,128}$/', $_COOKIE[session_name()])) {
unset($_COOKIE[session_name()]);
@@ -190,10 +189,17 @@ class Session implements SessionInterface
}
$success = @session_start($options);
$user = $success ? $this->__get('user') : null;
if (!$success) {
$last = error_get_last();
$error = $last ? $last['message'] : 'Unknown error';
throw new \RuntimeException('Failed to start session: ' . $error, 500);
throw new SessionException('Failed to start session: ' . $error, 500);
}
if ($user && !$user->isValid()) {
$this->clear();
throw new SessionException('User Invalid', 500);
}
$params = session_get_cookie_params();
@@ -300,7 +306,7 @@ class Session implements SessionInterface
*/
public function __get($name)
{
return isset($_SESSION[$name]) ? $_SESSION[$name] : null;
return $_SESSION[$name] ?? null;
}
/**
@@ -333,16 +339,17 @@ class Session implements SessionInterface
* @param string $key
* @param mixed $value
*/
protected function ini_set($key, $value)
protected function setOption($key, $value)
{
if (!is_string($value)) {
if (is_bool($value)) {
if (!\is_string($value)) {
if (\is_bool($value)) {
$value = $value ? '1' : '0';
} else {
$value = (string)$value;
}
$value = (string)$value;
}
$this->options[$key] = $value;
ini_set($key, $value);
ini_set("session.{$key}", $value);
}
}
system/src/Grav/Framework/Session/SessionInterface.php
+3 -2
View File
@@ -1,8 +1,9 @@
<?php
/**
* @package Grav\Framework\Session
*
* @copyright Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
* @copyright Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
* @license MIT License; see LICENSE file for details.
*/
@@ -110,7 +111,7 @@ interface SessionInterface extends \IteratorAggregate
/**
* Checks if the session was started.
*
* @return Boolean
* @return bool
*/
public function isStarted();