- Merge with edhelas

app/controllers/DisconnectController.php

@@ -5,9 +5,9 @@ class DisconnectController extends BaseController {
         $this->session_only = false;
     }
 
-    function dispatch() {        
+    function dispatch() {
         $user = new User();
         $user->desauth();
-        $this->redirect('login');
+        $this->redirect('main');
     }
 }

app/widgets/System/System.php

@@ -25,7 +25,7 @@ class System extends WidgetBase {
         else
             $this->view->assign('page_key_uri', '');
 
-        if(FAIL_SAFE)
+        if(FAIL_SAFE != null)
             $this->view->assign('fail_safe',    FAIL_SAFE);
         else
             $this->view->assign('fail_safe',    '');