New upstream version 0.6.27

This commit is contained in:
geos_one
2025-08-06 18:11:51 +02:00
parent a6b4158f1f
commit 56a986c0ba
563 changed files with 45811 additions and 35282 deletions

View File

@@ -1,4 +1,12 @@
<?php defined('SYSPATH') OR die('No direct access allowed.');
<?php
// phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
// phpcs:disable PSR1.Files.SideEffects
defined('SYSPATH') or die('No direct access allowed.');
// phpcs:enable PSR1.Files.SideEffects
// phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps
/**
* Session cache driver.
*
@@ -17,89 +25,85 @@
* @copyright (c) 2007-2008 Kohana Team
* @license http://kohanaphp.com/license.html
*/
class Session_Cache_Driver implements Session_Driver {
class Session_Cache_Driver implements Session_Driver
{
protected $cache;
protected $encrypt;
protected $cache;
protected $encrypt;
public function __construct()
{
// Load Encrypt library
if (Kohana::config('session.encryption')) {
$this->encrypt = new Encrypt();
}
public function __construct()
{
// Load Encrypt library
if (Kohana::config('session.encryption'))
{
$this->encrypt = new Encrypt;
}
Kohana::log('debug', 'Session Cache Driver Initialized');
}
Kohana::log('debug', 'Session Cache Driver Initialized');
}
public function open($path, $name)
{
$config = Kohana::config('session.storage');
public function open($path, $name)
{
$config = Kohana::config('session.storage');
if (empty($config)) {
// Load the default group
$config = Kohana::config('cache.default');
} elseif (is_string($config)) {
$name = $config;
if (empty($config))
{
// Load the default group
$config = Kohana::config('cache.default');
}
elseif (is_string($config))
{
$name = $config;
// Test the config group name
if (($config = Kohana::config('cache.' . $config)) === null) {
throw new Kohana_Exception('cache.undefined_group', $name);
}
}
// Test the config group name
if (($config = Kohana::config('cache.'.$config)) === NULL)
throw new Kohana_Exception('cache.undefined_group', $name);
}
$config['lifetime'] = (Kohana::config('session.expiration') == 0) ? 86400 : Kohana::config('session.expiration');
$this->cache = new Cache($config);
$config['lifetime'] = (Kohana::config('session.expiration') == 0) ? 86400 : Kohana::config('session.expiration');
$this->cache = new Cache($config);
return is_object($this->cache);
}
return is_object($this->cache);
}
public function close()
{
return true;
}
public function close()
{
return TRUE;
}
public function read($id)
{
$id = 'session_' . $id;
if ($data = $this->cache->get($id)) {
return Kohana::config('session.encryption') ? $this->encrypt->decode($data) : $data;
}
public function read($id)
{
$id = 'session_'.$id;
if ($data = $this->cache->get($id))
{
return Kohana::config('session.encryption') ? $this->encrypt->decode($data) : $data;
}
// Return value must be string, NOT a boolean
return '';
}
// Return value must be string, NOT a boolean
return '';
}
public function write($id, $data)
{
$id = 'session_' . $id;
$data = Kohana::config('session.encryption') ? $this->encrypt->encode($data) : $data;
public function write($id, $data)
{
$id = 'session_'.$id;
$data = Kohana::config('session.encryption') ? $this->encrypt->encode($data) : $data;
return $this->cache->set($id, $data);
}
return $this->cache->set($id, $data);
}
public function destroy($id)
{
$id = 'session_' . $id;
return $this->cache->delete($id);
}
public function destroy($id)
{
$id = 'session_'.$id;
return $this->cache->delete($id);
}
public function regenerate()
{
session_regenerate_id(true);
public function regenerate()
{
session_regenerate_id(TRUE);
// Return new session id
return session_id();
}
// Return new session id
return session_id();
}
public function gc($maxlifetime)
{
// Just return, caches are automatically cleaned up
return TRUE;
}
} // End Session Cache Driver
public function gc($maxlifetime)
{
// Just return, caches are automatically cleaned up
return true;
}
}
// End Session Cache Driver

View File

@@ -1,4 +1,12 @@
<?php defined('SYSPATH') OR die('No direct access allowed.');
<?php
// phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
// phpcs:disable PSR1.Files.SideEffects
defined('SYSPATH') or die('No direct access allowed.');
// phpcs:enable PSR1.Files.SideEffects
// phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps
/**
* Session cookie driver.
*
@@ -9,72 +17,71 @@
* @copyright (c) 2007-2008 Kohana Team
* @license http://kohanaphp.com/license.html
*/
class Session_Cookie_Driver implements Session_Driver {
class Session_Cookie_Driver implements Session_Driver
{
protected $cookie_name;
protected $encrypt; // Library
protected $cookie_name;
protected $encrypt; // Library
public function __construct()
{
$this->cookie_name = Kohana::config('session.name') . '_data';
public function __construct()
{
$this->cookie_name = Kohana::config('session.name').'_data';
if (Kohana::config('session.encryption')) {
$this->encrypt = Encrypt::instance();
}
if (Kohana::config('session.encryption'))
{
$this->encrypt = Encrypt::instance();
}
Kohana::log('debug', 'Session Cookie Driver Initialized');
}
Kohana::log('debug', 'Session Cookie Driver Initialized');
}
public function open($path, $name)
{
return true;
}
public function open($path, $name)
{
return TRUE;
}
public function close()
{
return true;
}
public function close()
{
return TRUE;
}
public function read($id)
{
$data = (string) cookie::get($this->cookie_name);
public function read($id)
{
$data = (string) cookie::get($this->cookie_name);
if ($data == '') {
return $data;
}
if ($data == '')
return $data;
return empty($this->encrypt) ? base64_decode($data) : $this->encrypt->decode($data);
}
return empty($this->encrypt) ? base64_decode($data) : $this->encrypt->decode($data);
}
public function write($id, $data)
{
$data = empty($this->encrypt) ? base64_encode($data) : $this->encrypt->encode($data);
public function write($id, $data)
{
$data = empty($this->encrypt) ? base64_encode($data) : $this->encrypt->encode($data);
if (strlen($data) > 4048) {
Kohana::log('error', 'Session (' . $id . ') data exceeds the 4KB limit, ignoring write.');
return false;
}
if (strlen($data) > 4048)
{
Kohana::log('error', 'Session ('.$id.') data exceeds the 4KB limit, ignoring write.');
return FALSE;
}
return cookie::set($this->cookie_name, $data, Kohana::config('session.expiration'));
}
return cookie::set($this->cookie_name, $data, Kohana::config('session.expiration'));
}
public function destroy($id)
{
return cookie::delete($this->cookie_name);
}
public function destroy($id)
{
return cookie::delete($this->cookie_name);
}
public function regenerate()
{
session_regenerate_id(true);
public function regenerate()
{
session_regenerate_id(TRUE);
// Return new id
return session_id();
}
// Return new id
return session_id();
}
public function gc($maxlifetime)
{
return TRUE;
}
} // End Session Cookie Driver Class
public function gc($maxlifetime)
{
return true;
}
}
// End Session Cookie Driver Class

View File

@@ -1,4 +1,12 @@
<?php defined('SYSPATH') OR die('No direct access allowed.');
<?php
// phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
// phpcs:disable PSR1.Files.SideEffects
defined('SYSPATH') or die('No direct access allowed.');
// phpcs:enable PSR1.Files.SideEffects
// phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps
/**
* Session database driver.
*
@@ -9,155 +17,145 @@
* @copyright (c) 2007-2008 Kohana Team
* @license http://kohanaphp.com/license.html
*/
class Session_Database_Driver implements Session_Driver {
class Session_Database_Driver implements Session_Driver
{
/*
CREATE TABLE sessions
(
session_id VARCHAR(127) NOT NULL,
last_activity INT(10) UNSIGNED NOT NULL,
data TEXT NOT NULL,
PRIMARY KEY (session_id)
);
*/
/*
CREATE TABLE sessions
(
session_id VARCHAR(127) NOT NULL,
last_activity INT(10) UNSIGNED NOT NULL,
data TEXT NOT NULL,
PRIMARY KEY (session_id)
);
*/
// Database settings
protected $db = 'default';
protected $table = 'sessions';
// Database settings
protected $db = 'default';
protected $table = 'sessions';
// Encryption
protected $encrypt;
// Encryption
protected $encrypt;
// Session settings
protected $session_id;
protected $written = false;
// Session settings
protected $session_id;
protected $written = FALSE;
public function __construct()
{
// Load configuration
$config = Kohana::config('session');
public function __construct()
{
// Load configuration
$config = Kohana::config('session');
if (! empty($config['encryption'])) {
// Load encryption
$this->encrypt = Encrypt::instance();
}
if ( ! empty($config['encryption']))
{
// Load encryption
$this->encrypt = Encrypt::instance();
}
if (is_array($config['storage'])) {
if (! empty($config['storage']['group'])) {
// Set the group name
$this->db = $config['storage']['group'];
}
if (is_array($config['storage']))
{
if ( ! empty($config['storage']['group']))
{
// Set the group name
$this->db = $config['storage']['group'];
}
if (! empty($config['storage']['table'])) {
// Set the table name
$this->table = $config['storage']['table'];
}
}
if ( ! empty($config['storage']['table']))
{
// Set the table name
$this->table = $config['storage']['table'];
}
}
// Load database
$this->db = Database::instance($this->db);
// Load database
$this->db = Database::instance($this->db);
Kohana::log('debug', 'Session Database Driver Initialized');
}
Kohana::log('debug', 'Session Database Driver Initialized');
}
public function open($path, $name)
{
return true;
}
public function open($path, $name)
{
return TRUE;
}
public function close()
{
return true;
}
public function close()
{
return TRUE;
}
public function read($id)
{
// Load the session
$query = $this->db->from($this->table)->where('session_id', $id)->limit(1)->get()->result(true);
public function read($id)
{
// Load the session
$query = $this->db->from($this->table)->where('session_id', $id)->limit(1)->get()->result(TRUE);
if ($query->count() === 0) {
// No current session
$this->session_id = null;
if ($query->count() === 0)
{
// No current session
$this->session_id = NULL;
return '';
}
return '';
}
// Set the current session id
$this->session_id = $id;
// Set the current session id
$this->session_id = $id;
// Load the data
$data = $query->current()->data;
// Load the data
$data = $query->current()->data;
return ($this->encrypt === null) ? base64_decode($data) : $this->encrypt->decode($data);
}
return ($this->encrypt === NULL) ? base64_decode($data) : $this->encrypt->decode($data);
}
public function write($id, $data)
{
$data = array
(
'session_id' => $id,
'last_activity' => time(),
'data' => ($this->encrypt === null) ? base64_encode($data) : $this->encrypt->encode($data)
);
public function write($id, $data)
{
$data = array
(
'session_id' => $id,
'last_activity' => time(),
'data' => ($this->encrypt === NULL) ? base64_encode($data) : $this->encrypt->encode($data)
);
if ($this->session_id === null) {
// Insert a new session
$query = $this->db->insert($this->table, $data);
} elseif ($id === $this->session_id) {
// Do not update the session_id
unset($data['session_id']);
if ($this->session_id === NULL)
{
// Insert a new session
$query = $this->db->insert($this->table, $data);
}
elseif ($id === $this->session_id)
{
// Do not update the session_id
unset($data['session_id']);
// Update the existing session
$query = $this->db->update($this->table, $data, array('session_id' => $id));
} else {
// Update the session and id
$query = $this->db->update($this->table, $data, array('session_id' => $this->session_id));
// Update the existing session
$query = $this->db->update($this->table, $data, array('session_id' => $id));
}
else
{
// Update the session and id
$query = $this->db->update($this->table, $data, array('session_id' => $this->session_id));
// Set the new session id
$this->session_id = $id;
}
// Set the new session id
$this->session_id = $id;
}
return (bool) $query->count();
}
return (bool) $query->count();
}
public function destroy($id)
{
// Delete the requested session
$this->db->delete($this->table, array('session_id' => $id));
public function destroy($id)
{
// Delete the requested session
$this->db->delete($this->table, array('session_id' => $id));
// Session id is no longer valid
$this->session_id = null;
// Session id is no longer valid
$this->session_id = NULL;
return true;
}
return TRUE;
}
public function regenerate()
{
// Generate a new session id
session_regenerate_id();
public function regenerate()
{
// Generate a new session id
session_regenerate_id();
// Return new session id
return session_id();
}
// Return new session id
return session_id();
}
public function gc($maxlifetime)
{
// Delete all expired sessions
$query = $this->db->delete($this->table, array('last_activity <' => time() - $maxlifetime));
public function gc($maxlifetime)
{
// Delete all expired sessions
$query = $this->db->delete($this->table, array('last_activity <' => time() - $maxlifetime));
Kohana::log('debug', 'Session garbage collected: ' . $query->count() . ' row(s) deleted.');
Kohana::log('debug', 'Session garbage collected: '.$query->count().' row(s) deleted.');
return TRUE;
}
} // End Session Database Driver
return true;
}
}
// End Session Database Driver