- Merge with edhelas

VERSION

@@ -1 +1 @@
-0.8alpha13
+0.8alpha14

app/controllers/DisconnectController.php

@@ -8,6 +8,6 @@ class DisconnectController extends BaseController {
     function dispatch() {        
         $user = new User();
         $user->desauth();
-        $this->name = 'login';
+        $this->redirect('login');
     }
 }

app/widgets/Login/Login.php

@@ -289,7 +289,9 @@ class Login extends WidgetBase
     {
         $s = new moxl\StorageGet();
         $s->setXmlns('movim:prefs')
-          ->request();        $evt = new \Event();
+          ->request();
+
+        $evt = new \Event();
         $evt->runEvent('nostream');
     }
 }

system/Route.php

@@ -68,9 +68,9 @@ class Route extends \BaseController {
         $routes = $r->_routes;
         
         if(isset($routes[$page])) {        
-            if($params != false && count($routes[$page]) != count($params)) 
-                \system\Logs\Logger::log(__('error.route', $page));
-            else {
+            if($params != false && count($routes[$page]) != count($params)) {
+                throw new Exception(__('error.route', $page));
+            } else {
                 if($tab != false)
                     $tab = '#'.$tab;
                 //We construct a classic URL if the rewriting is disabled
@@ -98,7 +98,8 @@ class Route extends \BaseController {
                 }
                 return $uri.$tab;
             }
-        } else
-            \system\Logs\Logger::log(t('Route not set for the page %s', $page));
+        } else {
+            throw new Exception(__('Route not set for the page %s', $page));
+        }
     }
 }

system/Sessionx.php

@@ -107,7 +107,7 @@ class Sessionx {
         $this->_ressource   = 'moxl'.\generateKey(6);
         $this->_start       = date(DATE_ISO8601);
         
-        $this->_rid = 0;
+        $this->_rid = rand(1, 2048);
         $this->_id  = 0;
         
         $sd = new modl\SessionxDAO();

system/controllers/BaseController.php

@@ -84,6 +84,11 @@ class BaseController {
         }
     }
 
+    function redirect($page) {
+        $url = Route::urlize($page, array($this->fetchGet('err')));
+        header('Location: '. $url);
+    }
+
     function display() {
         if($this->session_only) {
             $user = new User();