Skip to content

Commit

Permalink
Merge pull request #6 from alextselegidis/develop
Browse files Browse the repository at this point in the history
Suppress session warnings
  • Loading branch information
tm8544 committed May 9, 2024
2 parents dd595c9 + 338f9de commit 42663f2
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
24 changes: 12 additions & 12 deletions system/libraries/Session/Session.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public function __construct(array $params = array())
$class = new $class($this->_config);
if ($class instanceof SessionHandlerInterface)
{
session_set_save_handler($class, TRUE);
@session_set_save_handler($class, TRUE);
}
else
{
Expand Down Expand Up @@ -260,14 +260,14 @@ protected function _configure(&$params)
}
else
{
ini_set('session.name', $params['cookie_name']);
@ini_set('session.name', $params['cookie_name']);
}

isset($params['cookie_path']) OR $params['cookie_path'] = config_item('cookie_path');
isset($params['cookie_domain']) OR $params['cookie_domain'] = config_item('cookie_domain');
isset($params['cookie_secure']) OR $params['cookie_secure'] = (bool) config_item('cookie_secure');

session_set_cookie_params(
@session_set_cookie_params(
$params['cookie_lifetime'],
$params['cookie_path'],
$params['cookie_domain'],
Expand All @@ -282,7 +282,7 @@ protected function _configure(&$params)
else
{
$params['expiration'] = (int) $expiration;
ini_set('session.gc_maxlifetime', $expiration);
@ini_set('session.gc_maxlifetime', $expiration);
}

$params['match_ip'] = (bool) (isset($params['match_ip']) ? $params['match_ip'] : config_item('sess_match_ip'));
Expand All @@ -292,10 +292,10 @@ protected function _configure(&$params)
$this->_config = $params;

// Security is king
ini_set('session.use_trans_sid', 0);
ini_set('session.use_strict_mode', 1);
ini_set('session.use_cookies', 1);
ini_set('session.use_only_cookies', 1);
@ini_set('session.use_trans_sid', 0);
@ini_set('session.use_strict_mode', 1);
@ini_set('session.use_cookies', 1);
@ini_set('session.use_only_cookies', 1);

$this->_configure_sid_length();
}
Expand Down Expand Up @@ -326,19 +326,19 @@ protected function _configure_sid_length()
{
if ($hash_function !== '1')
{
ini_set('session.hash_function', 1);
@ini_set('session.hash_function', 1);
}

$bits = 160;
}
elseif ( ! in_array($hash_function, hash_algos(), TRUE))
{
ini_set('session.hash_function', 1);
@ini_set('session.hash_function', 1);
$bits = 160;
}
elseif (($bits = strlen(hash($hash_function, 'dummy', false)) * 4) < 160)
{
ini_set('session.hash_function', 1);
@ini_set('session.hash_function', 1);
$bits = 160;
}

Expand All @@ -353,7 +353,7 @@ protected function _configure_sid_length()
{
// Add as many more characters as necessary to reach at least 160 bits
$sid_length += (int) ceil((160 % $bits) / $bits_per_character);
ini_set('session.sid_length', $sid_length);
@ini_set('session.sid_length', $sid_length);
}
}

Expand Down
2 changes: 1 addition & 1 deletion system/libraries/Session/drivers/Session_files_driver.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public function __construct(&$params)
if (isset($this->_config['save_path']))
{
$this->_config['save_path'] = rtrim($this->_config['save_path'], '/\\');
ini_set('session.save_path', $this->_config['save_path']);
@ini_set('session.save_path', $this->_config['save_path']);
}
else
{
Expand Down

0 comments on commit 42663f2

Please sign in to comment.