- Add a disconnect view to prevent Fatal error

- Create the 'root' URL and use it everywhere ! - Fix some handlers - Fix some CSS
12 years ago · 8ff69d8407
31 changed files with 45 additions and 34 deletions
--- a/app/controllers/AboutController.php
+++ b/app/controllers/AboutController.php
@ -8,7 +8,7 @@ class AboutController extends BaseController {
    function dispatch() {
        $this->page->setTitle(__('title.about', APP_TITLE));
        
-        $this->page->menuAddLink(__('page.home'), 'main');
+        $this->page->menuAddLink(__('page.home'), 'root');
        $this->page->menuAddLink(__('page.discover'), 'discover');
        $this->page->menuAddLink(__('page.pods'), 'pods');
        $this->page->menuAddLink(__('page.about'), 'about', true);
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@ -8,7 +8,7 @@ class AccountController extends BaseController {
    function dispatch() {
        $this->page->setTitle(__('title.account', APP_TITLE));
        
-        $this->page->menuAddLink(__('page.home'), 'main');
+        $this->page->menuAddLink(__('page.home'), 'root');
        $this->page->menuAddLink(__('page.account_creation'), 'account', true);
    }
 }
--- a/app/controllers/AccountnextController.php
+++ b/app/controllers/AccountnextController.php
@ -8,7 +8,7 @@ class AccountnextController extends BaseController {
    function dispatch() {
        $this->page->setTitle(__('title.account', APP_TITLE));
        
-        $this->page->menuAddLink(__('page.home'), 'main');
+        $this->page->menuAddLink(__('page.home'), 'root');
        $this->page->menuAddLink(__('page.account_creation'), 'account', true);
    }
 }
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@ -11,7 +11,7 @@ class AdminController extends BaseController {
        if(isset($_SESSION['admin']) && $_SESSION['admin'] == true) {            
            $this->page->setTitle(__('title.administration', APP_TITLE));

-            $this->page->menuAddLink(__('page.home'), 'main');
+            $this->page->menuAddLink(__('page.home'), 'root');
            $this->page->menuAddLink(__('page.administration'), 'admin', true);
        } else {
            $this->name = 'adminlogin';
--- a/app/controllers/AdminloginController.php
+++ b/app/controllers/AdminloginController.php
@ -11,7 +11,7 @@ class AdminloginController extends BaseController
    {
        $this->page->setTitle(__('title.administration', APP_TITLE));

-        $this->page->menuAddLink(__('page.home'), 'main');
+        $this->page->menuAddLink(__('page.home'), 'root');
        $this->page->menuAddLink(__('page.administration'), 'admin', true);
        
        $cd = new \Modl\ConfigDAO();
--- a/app/controllers/BlogController.php
+++ b/app/controllers/BlogController.php
@ -8,7 +8,7 @@ class BlogController extends BaseController {
    function dispatch() {
        $this->page->setTitle(__('title.blog', APP_TITLE));
        
-        $this->page->menuAddLink(__('page.home'), 'main');
+        $this->page->menuAddLink(__('page.home'), 'root');
        $this->page->menuAddLink(__('page.blog'), 'blog', true);
    }
 }
--- a/app/controllers/ConfController.php
+++ b/app/controllers/ConfController.php
@ -8,7 +8,7 @@ class ConfController extends BaseController {
    function dispatch() {
        $this->page->setTitle(__('title.configuration', APP_TITLE));
        
-        $this->page->menuAddLink(__('page.home'), 'main');
+        $this->page->menuAddLink(__('page.home'), 'root');
        $this->page->menuAddLink(__('page.news'), 'news');
        $this->page->menuAddLink(__('page.explore'), 'explore');
        $this->page->menuAddLink(__('page.profile'), 'profile');
--- a/app/controllers/DisconnectController.php
+++ b/app/controllers/DisconnectController.php
@ -8,6 +8,6 @@ class DisconnectController extends BaseController {
    function dispatch() {
        $user = new User();
        $user->desauth();
-        $this->redirect('main');
+        $this->redirect('login');
    }
 }
--- a/app/controllers/DiscoverController.php
+++ b/app/controllers/DiscoverController.php
@ -10,7 +10,7 @@ class DiscoverController extends BaseController {
    function dispatch() {
        $this->page->setTitle(__('title.discover', APP_TITLE));
        
-        $this->page->menuAddLink(__('page.home'), 'main');
+        $this->page->menuAddLink(__('page.home'), 'root');
        $this->page->menuAddLink(__('page.discover'), 'discover', true);
        $this->page->menuAddLink(__('page.pods'), 'pods');
        $this->page->menuAddLink(__('page.about'), 'about');
--- a/app/controllers/ExploreController.php
+++ b/app/controllers/ExploreController.php
@ -10,7 +10,7 @@ class ExploreController extends BaseController {
    function dispatch() {
        $this->page->setTitle(__('title.explore', APP_TITLE));
    
-        $this->page->menuAddLink(__('page.home'), 'main');
+        $this->page->menuAddLink(__('page.home'), 'root');
        $this->page->menuAddLink(__('page.news'), 'news');
        $this->page->menuAddLink(__('page.explore'), 'explore', true);
        $this->page->menuAddLink(__('page.profile'), 'profile');
--- a/app/controllers/FriendController.php
+++ b/app/controllers/FriendController.php
@ -18,7 +18,7 @@ class FriendController extends BaseController {
                $name = $_GET['f'];
            
            $this->page->setTitle(APP_TITLE.' - '.$name);
-            $this->page->menuAddLink(__('page.home'), 'main');
+            $this->page->menuAddLink(__('page.home'), 'root');
            $this->page->menuAddLink(__('page.news'), 'news');
            $this->page->menuAddLink(__('page.explore'), 'explore');
            $this->page->menuAddLink(__('page.profile'), 'profile');
--- a/app/controllers/HelpController.php
+++ b/app/controllers/HelpController.php
@ -8,7 +8,7 @@ class HelpController extends BaseController {
    function dispatch() {
        $this->page->setTitle(__('title.help', APP_TITLE));
    
-        $this->page->menuAddLink(__('page.home'), 'main');
+        $this->page->menuAddLink(__('page.home'), 'root');
        $this->page->menuAddLink(__('page.news'), 'news');
        $this->page->menuAddLink(__('page.explore'), 'explore');
        $this->page->menuAddLink(__('page.profile'), 'profile');
--- a/app/controllers/LoginController.php
+++ b/app/controllers/LoginController.php
@ -8,7 +8,7 @@ class LoginController extends BaseController {
    function dispatch() {
        $this->page->setTitle(__('title.login', APP_TITLE));
        
-        $this->page->menuAddLink(__('page.home'), 'main', true);
+        $this->page->menuAddLink(__('page.home'), 'root', true);
        $this->page->menuAddLink(__('page.discover'), 'discover');
        $this->page->menuAddLink(__('page.pods'), 'pods');
        $this->page->menuAddLink(__('page.about'), 'about');
--- a/app/controllers/MainController.php
+++ b/app/controllers/MainController.php
@ -8,7 +8,7 @@ class MainController extends BaseController {
    function dispatch() {
        $this->page->setTitle(__('title.main', APP_TITLE));
        
-        $this->page->menuAddLink(__('page.home'), 'main', true);
+        $this->page->menuAddLink(__('page.home'), 'root', true);
        $this->page->menuAddLink(__('page.news'), 'news');
        $this->page->menuAddLink(__('page.explore'), 'explore');
        $this->page->menuAddLink(__('page.profile'), 'profile');
--- a/app/controllers/MediaController.php
+++ b/app/controllers/MediaController.php
@ -8,7 +8,7 @@ class MediaController extends BaseController {
    function dispatch() {
        $this->page->setTitle(__('title.media', APP_TITLE));
        
-        $this->page->menuAddLink(__('page.home'), 'main');
+        $this->page->menuAddLink(__('page.home'), 'root');
        $this->page->menuAddLink(__('page.news'), 'news');
        $this->page->menuAddLink(__('page.explore'), 'explore');
        $this->page->menuAddLink(__('page.profile'), 'profile');
--- a/app/controllers/NewsController.php
+++ b/app/controllers/NewsController.php
@ -8,7 +8,7 @@ class NewsController extends BaseController {
    function dispatch() {
        $this->page->setTitle(__('title.news', APP_TITLE));
        
-        $this->page->menuAddLink(__('page.home'), 'main');
+        $this->page->menuAddLink(__('page.home'), 'root');
        $this->page->menuAddLink(__('page.news'), 'news', true);
        $this->page->menuAddLink(__('page.explore'), 'explore');
        $this->page->menuAddLink(__('page.profile'), 'profile');
--- a/app/controllers/NodeController.php
+++ b/app/controllers/NodeController.php
@ -9,7 +9,7 @@ class NodeController extends BaseController {
        if(isset($_GET['s']) && $_GET['s'] != "" ) {
            $this->page->setTitle(__('title.node', APP_TITLE));
            
-            $this->page->menuAddLink(__('page.home'), 'main');
+            $this->page->menuAddLink(__('page.home'), 'root');
            $this->page->menuAddLink(__('page.news'), 'news');
            $this->page->menuAddLink(__('page.explore'), 'explore');
            $this->page->menuAddLink(__('page.profile'), 'profile');
--- a/app/controllers/NodeconfigController.php
+++ b/app/controllers/NodeconfigController.php
@ -9,7 +9,7 @@ class NodeconfigController extends BaseController {
        if(isset($_GET['s']) && $_GET['s'] != "" ) {
            $this->page->setTitle(__('title.node_configuration', APP_TITLE));
            
-            $this->page->menuAddLink(__('page.home'), 'main');
+            $this->page->menuAddLink(__('page.home'), 'root');
            $this->page->menuAddLink(__('page.news'), 'news');
            $this->page->menuAddLink(__('page.explore'), 'explore');
            $this->page->menuAddLink(__('page.profile'), 'profile');
--- a/app/controllers/NotfoundController.php
+++ b/app/controllers/NotfoundController.php
@ -8,6 +8,6 @@ class NotfoundController extends BaseController {
    function dispatch() {
        $this->page->setTitle(__('title.not_found', APP_TITLE));
        
-        $this->page->menuAddLink(__('page.home'), 'main');
+        $this->page->menuAddLink(__('page.home'), 'root');
    }
 }
--- a/app/controllers/PodsController.php
+++ b/app/controllers/PodsController.php
@ -10,7 +10,7 @@ class PodsController extends BaseController {
    function dispatch() {
        $this->page->setTitle(__('title.discover', APP_TITLE));
        
-        $this->page->menuAddLink(__('page.home'), 'main');
+        $this->page->menuAddLink(__('page.home'), 'root');
        $this->page->menuAddLink(__('page.discover'), 'discover');
        $this->page->menuAddLink(__('page.pods'), 'pods', true);
        $this->page->menuAddLink(__('page.about'), 'about');
--- a/app/controllers/ProfileController.php
+++ b/app/controllers/ProfileController.php
@ -8,7 +8,7 @@ class ProfileController extends BaseController {
    function dispatch() {
        $this->page->setTitle(__('title.profile', APP_TITLE));
        
-        $this->page->menuAddLink(__('page.home'), 'main');
+        $this->page->menuAddLink(__('page.home'), 'root');
        $this->page->menuAddLink(__('page.news'), 'news');
        $this->page->menuAddLink(__('page.explore'), 'explore');
        $this->page->menuAddLink(__('page.profile'), 'profile', true);
--- a/app/controllers/ServerController.php
+++ b/app/controllers/ServerController.php
@ -9,7 +9,7 @@ class ServerController extends BaseController {
        if(isset($_GET['s']) && $_GET['s'] != "" ) {
            $this->page->setTitle(__('title.server', APP_TITLE));
            
-            $this->page->menuAddLink(__('page.home'), 'main');
+            $this->page->menuAddLink(__('page.home'), 'root');
            $this->page->menuAddLink(__('page.news'), 'news');
            $this->page->menuAddLink(__('page.explore'), 'explore');
            $this->page->menuAddLink(__('page.profile'), 'profile');
--- a/app/views/disconnect.tpl
+++ b/app/views/disconnect.tpl
--- a/app/widgets/Login/Login.php
+++ b/app/widgets/Login/Login.php
@ -280,7 +280,7 @@ class Login extends WidgetBase
            $pd = new modl\PresenceDAO();
            $pd->clearPresence($element['login']);
        
-            RPC::call('movim_redirect', Route::urlize('main'));            
+            RPC::call('movim_redirect', Route::urlize('root'));            
            RPC::commit();
        }
    }
--- a/app/widgets/Node/Node.php
+++ b/app/widgets/Node/Node.php
@ -32,6 +32,7 @@ class Node extends WidgetCommon
    
    function load()
    {
+        $this->registerEvent('post', 'onStream');
        $this->registerEvent('stream', 'onStream');
        $this->registerEvent('nostream', 'onStream');
        $this->registerEvent('pubsubaffiliations', 'onPubsubAffiliations');
@ -99,10 +100,14 @@ class Node extends WidgetCommon
    function onPubsubMetadata($params) {
        // The URL add form
        $metadataview = $this->tpl();
-        $metadataview->assign('title',       $params[0]['title']);
-        $metadataview->assign('description', $params[0]['description']);
-        $metadataview->assign('creation', prepareDate(strtotime($params[0]['creation_date'])));
-        $metadataview->assign('creator',     $params[0]['creator']);
+        if(isset($params[0]['title']))
+            $metadataview->assign('title',       $params[0]['title']);
+        if(isset($params[0]['description']))
+            $metadataview->assign('description', $params[0]['description']);
+        if(isset($params[0]['creation_date']))
+            $metadataview->assign('creation', prepareDate(strtotime($params[0]['creation_date'])));
+        if(isset($params[0]['creator']))
+            $metadataview->assign('creator',     $params[0]['creator']);

        $html = $metadataview->draw('_node_metadata', true);
        RPC::call('movim_fill', 'metadata', $html);
--- a/app/widgets/ServerNodes/ServerNodes.php
+++ b/app/widgets/ServerNodes/ServerNodes.php
@ -136,7 +136,8 @@ class ServerNodes extends WidgetCommon
    
    function onCreationSuccess($items)
    {        
-        $html = '<a href="
+        $html = '
+            <a href="
            '.Route::urlize('node', array($items[0], $items[1])).'
            ">'.$items[2].'</a>';

--- a/app/widgets/ServerNodes/servernodes.tpl
+++ b/app/widgets/ServerNodes/servernodes.tpl
@ -14,7 +14,7 @@
        {$c->__('button.refresh')}
    </a>
 </div>
-<div id="servernodes" class="tabelem paddedtop" title="{$c->__('page.server')}">
+<div id="servernodes" class="tabelem padded" title="{$c->__('page.server')}">
    <div id="newGroupForm"></div>
    <div id="servernodeslist">
        {$server}
--- a/app/widgets/Wall/Wall.php
+++ b/app/widgets/Wall/Wall.php
@ -59,9 +59,11 @@ class Wall extends WidgetCommon
    }

    function prepareFeed($start, $from = false) {
-        
-        if(!$from)
+        if(!$from && isset($_GET['f'])) {
            $from = $_GET['f'];
+        } else {
+            return '';
+        }
        
        $pd = new \Modl\PostnDAO();
        $pl = $pd->getNode($from, 'urn:xmpp:microblog:0', $start+1, 10);
--- a/system/Route.php
+++ b/system/Route.php
@ -66,6 +66,9 @@ class Route extends \BaseController {
    public static function urlize($page, $params = false, $tab = false) {
        $r = new Route();
        $routes = $r->_routes;
+
+        if($page === 'root')
+            return BASE_URI;
        
        if(isset($routes[$page])) {        
            if($params != false && count($routes[$page]) != count($params)) {
--- a/themes/movim/css/forms.css
+++ b/themes/movim/css/forms.css
@ -58,9 +58,9 @@ legend {
    min-height: 0;
 }

-/*.element > *:not(label):not(img):not(span):not(a):not(dl) {*/
 .element > input,
-.element > textarea {
+.element > textarea,
+.element > .select {
    display: inline-block;
    width: 100%;
    border: 1px solid #DDD;
--- a/themes/movim/css/nav.css
+++ b/themes/movim/css/nav.css
@ -48,7 +48,7 @@ nav .wrapper {
    background-position: 1em center;
 }

-.menu li a.main, .menu li a.main.active {
+.menu li a.root, .menu li a.root.active {
 	width: 200px;
    color: transparent;
    background-image: url(../img/logo.svg);