Merge pull-request #140 (several small fixes)
This commit is contained in:
@@ -1,10 +1,13 @@
|
||||
<?php
|
||||
|
||||
namespace Core;
|
||||
use RuntimeException;
|
||||
|
||||
/**
|
||||
* The registry class is a dependency injection container
|
||||
*
|
||||
* @property mixed db
|
||||
* @property mixed event
|
||||
* @package core
|
||||
* @author Frederic Guillot
|
||||
*/
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
|
||||
namespace Core;
|
||||
|
||||
use Core\Security;
|
||||
|
||||
/**
|
||||
* Request class
|
||||
*
|
||||
|
||||
@@ -30,7 +30,7 @@ class Router
|
||||
* Registry instance
|
||||
*
|
||||
* @access private
|
||||
* @var Core\Registry
|
||||
* @var \Core\Registry
|
||||
*/
|
||||
private $registry;
|
||||
|
||||
@@ -53,8 +53,9 @@ class Router
|
||||
* Check controller and action parameter
|
||||
*
|
||||
* @access public
|
||||
* @param string $value Controller or action name
|
||||
* @param string $default_value Default value if validation fail
|
||||
* @param string $value Controller or action name
|
||||
* @param string $default_value Default value if validation fail
|
||||
* @return string
|
||||
*/
|
||||
public function sanitize($value, $default_value)
|
||||
{
|
||||
@@ -65,9 +66,10 @@ class Router
|
||||
* Load a controller and execute the action
|
||||
*
|
||||
* @access public
|
||||
* @param string $filename Controller filename
|
||||
* @param string $class Class name
|
||||
* @param string $method Method name
|
||||
* @param string $filename Controller filename
|
||||
* @param string $class Class name
|
||||
* @param string $method Method name
|
||||
* @return bool
|
||||
*/
|
||||
public function load($filename, $class, $method)
|
||||
{
|
||||
|
||||
@@ -47,6 +47,12 @@ class Session
|
||||
ini_set('session.entropy_length', '32');
|
||||
ini_set('session.hash_bits_per_character', 6);
|
||||
|
||||
// If session was autostarted with session.auto_start = 1 in php.ini destroy it, otherwise we cannot login
|
||||
if (isset($_SESSION))
|
||||
{
|
||||
session_destroy();
|
||||
}
|
||||
|
||||
// Custom session name
|
||||
session_name('__S');
|
||||
|
||||
|
||||
@@ -32,6 +32,7 @@ class Translator
|
||||
* $translator->translate('I have %d kids', 5);
|
||||
*
|
||||
* @access public
|
||||
* @param $identifier
|
||||
* @return string
|
||||
*/
|
||||
public function translate($identifier)
|
||||
|
||||
Reference in New Issue
Block a user