From e5e355d06890b324df2ded707ca491f9539dd171 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Wed, 25 Jun 2014 10:07:06 -0300
Subject: Merge pull-request #140 (several small fixes)

---
 app/Core/Registry.php   |  3 +++
 app/Core/Request.php    |  2 --
 app/Core/Router.php     | 14 ++++++++------
 app/Core/Session.php    |  6 ++++++
 app/Core/Translator.php |  1 +
 5 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'app/Core')

diff --git a/app/Core/Registry.php b/app/Core/Registry.php
index f11d427c..0311dc62 100644
--- a/app/Core/Registry.php
+++ b/app/Core/Registry.php
@@ -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
  */
diff --git a/app/Core/Request.php b/app/Core/Request.php
index 6bc738be..a1513459 100644
--- a/app/Core/Request.php
+++ b/app/Core/Request.php
@@ -2,8 +2,6 @@
 
 namespace Core;
 
-use Core\Security;
-
 /**
  * Request class
  *
diff --git a/app/Core/Router.php b/app/Core/Router.php
index 40610996..c9af6e2c 100644
--- a/app/Core/Router.php
+++ b/app/Core/Router.php
@@ -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)
     {
diff --git a/app/Core/Session.php b/app/Core/Session.php
index af7a9123..f072350d 100644
--- a/app/Core/Session.php
+++ b/app/Core/Session.php
@@ -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');
 
diff --git a/app/Core/Translator.php b/app/Core/Translator.php
index d9386d3a..7cd3cc4f 100644
--- a/app/Core/Translator.php
+++ b/app/Core/Translator.php
@@ -32,6 +32,7 @@ class Translator
      * $translator->translate('I have %d kids', 5);
      *
      * @access public
+     * @param $identifier
      * @return string
      */
     public function translate($identifier)
-- 
cgit v1.2.3