Cleanup some code

app/widgets/Ack/Ack.php

@@ -4,31 +4,30 @@ use Moxl\Xec\Action\Ack\Send;
 use Moxl\Xec\Action\Disco\Request;
 use Moxl\Stanza\Disco;
 
-class Ack extends \Movim\Widget\Base {
+class Ack extends \Movim\Widget\Base
+{
     function load()
     {
         $this->registerEvent('ack', 'onAckRequest');
     }
 
-    function display()
+    function onAckRequest($ack)
     {
-        $this->view->assign('ack',
-                            $this->call(
-                                "ajaxAckRequest", 'to', 'id')
-                        );
-    }
-
-    function onAckRequest($ack) {
         $to = $ack[0];
         $id = $ack[1];
         $this->rpc('ackRequest', $to, $id);
     }
 
-    function ajaxAckRequest($to, $id) {
+    function ajaxAckRequest($to, $id)
+    {
         $ack = new Send;
         $ack->setTo($to)
             ->setId($id)
             ->request();
     }
 
+    function display()
+    {
+        $this->view->assign('ack', $this->call('ajaxAckRequest', 'to', 'id'));
+    }
 }

app/widgets/AdHoc/AdHoc.php

@@ -129,13 +129,8 @@ class AdHoc extends \Movim\Widget\Base
 
         if(array_key_exists($command, $icons)) {
             return $icons[$command];
-        } else {
-            return 'zmdi-chevron-right';
         }
-    }
-
-    function display()
-    {
 
+        return 'zmdi-chevron-right';
     }
 }

app/widgets/Api/Api.php

@@ -6,6 +6,32 @@ class Api extends \Movim\Widget\Base
     {
     }
 
+    function ajaxRegister()
+    {
+        $json = requestURL(
+            MOVIM_API.'pods/register',
+            3,
+            ['url' => BASE_URI]);
+
+        $json = json_decode($json);
+
+        if(isset($json) && $json->status == 200) {
+            $this->rpc('MovimUtils.reloadThis');
+            Notification::append(null, $this->__('api.conf_updated'));
+        }
+    }
+
+    function ajaxUnregister()
+    {
+        $cd = new \Modl\ConfigDAO();
+        $config = $cd->get();
+
+        $config->unregister = !$config->unregister;
+        $cd->set($config);
+
+        $this->rpc('MovimUtils.reloadThis');
+    }
+
     function display()
     {
         $this->view->assign(
@@ -35,30 +61,4 @@ class Api extends \Movim\Widget\Base
             $this->view->assign('json', null);
         }
     }
-
-    function ajaxRegister()
-    {
-        $json = requestURL(
-            MOVIM_API.'pods/register',
-            3,
-            ['url' => BASE_URI]);
-
-        $json = json_decode($json);
-
-        if(isset($json) && $json->status == 200) {
-            $this->rpc('MovimUtils.reloadThis');
-            Notification::append(null, $this->__('api.conf_updated'));
-        }
-    }
-
-    function ajaxUnregister()
-    {
-        $cd = new \Modl\ConfigDAO();
-        $config = $cd->get();
-
-        $config->unregister = !$config->unregister;
-        $cd->set($config);
-
-        $this->rpc('MovimUtils.reloadThis');
-    }
 }

app/widgets/Avatar/Avatar.php

@@ -89,8 +89,4 @@ class Avatar extends \Movim\Widget\Base
         $r = new Set;
         $r->setData($p->toBase())->request();
     }
-
-    function display()
-    {
-    }
 }

app/widgets/CommunityAffiliations/CommunityAffiliations.php

@@ -195,13 +195,7 @@ class CommunityAffiliations extends \Movim\Widget\Base
         $validate_server = Validator::stringType()->noWhitespace()->length(6, 40);
         $validate_node = Validator::stringType()->length(3, 100);
 
-        if(!$validate_server->validate($origin)
-        || !$validate_node->validate($node)
-        ) return false;
-        else return true;
-    }
-
-    public function display()
-    {
+        return ($validate_server->validate($origin)
+             && $validate_node->validate($node));
     }
 }

app/widgets/CommunityConfig/CommunityConfig.php

@@ -67,13 +67,7 @@ class CommunityConfig extends \Movim\Widget\Base
         $validate_server = Validator::stringType()->noWhitespace()->length(6, 40);
         $validate_node = Validator::stringType()->length(3, 100);
 
-        if(!$validate_server->validate($origin)
-        || !$validate_node->validate($node)
-        ) return false;
-        else return true;
-    }
-
-    public function display()
-    {
+        return ($validate_server->validate($origin)
+             && $validate_node->validate($node));
     }
 }

app/widgets/CommunityHeader/CommunityHeader.php

@@ -210,10 +210,8 @@ class CommunityHeader extends \Movim\Widget\Base
         $validate_server = Validator::stringType()->noWhitespace()->length(6, 40);
         $validate_node = Validator::stringType()->length(3, 100);
 
-        if(!$validate_server->validate($origin)
-        || !$validate_node->validate($node)
-        ) return false;
-        else return true;
+        return ($validate_server->validate($origin)
+             && $validate_node->validate($node));
     }
 
     public function display()

app/widgets/CommunityPosts/CommunityPosts.php

@@ -202,10 +202,8 @@ class CommunityPosts extends \Movim\Widget\Base
         $validate_server = Validator::stringType()->noWhitespace()->length(6, 40);
         $validate_node = Validator::stringType()->length(3, 100);
 
-        if(!$validate_server->validate($origin)
-        || !$validate_node->validate($node)
-        ) return false;
-        else return true;
+        return ($validate_server->validate($origin)
+             && $validate_node->validate($node));
     }
 
     function getComments($post)

app/widgets/CommunitySubscriptions/CommunitySubscriptions.php

@@ -10,12 +10,9 @@ class CommunitySubscriptions extends \Movim\Widget\Base
     {
     }
 
-    function checkNewServer($node) {
-        $r = false;
-
-        if($this->_list_server != $node->server)
-            $r = true;
-
+    function checkNewServer($node)
+    {
+        $r = ($this->_list_server != $node->server);
         $this->_list_server = $node->server;
         return $r;
     }
@@ -30,8 +27,4 @@ class CommunitySubscriptions extends \Movim\Widget\Base
 
         return $html;
     }
-
-    public function display()
-    {
-    }
 }

app/widgets/ContactActions/ContactActions.php

@@ -75,11 +75,6 @@ class ContactActions extends \Movim\Widget\Base
     private function validateJid($jid)
     {
         $validate_jid = Validator::stringType()->noWhitespace()->length(6, 60);
-        if(!$validate_jid->validate($jid)) return false;
-        else return true;
-    }
-
-    function display()
-    {
+        return ($validate_jid->validate($jid));
     }
 }

app/widgets/ContactData/ContactData.php

@@ -20,8 +20,6 @@ class ContactData extends \Movim\Widget\Base
 
     public function prepareData($jid)
     {
-        $view = $this->tpl();
-
         $id = new \Modl\InfoDAO;
         $cd = new \Modl\ContactDAO;
         $md = new \Modl\MessageDAO;
@@ -92,8 +90,7 @@ class ContactData extends \Movim\Widget\Base
     private function validateJid($jid)
     {
         $validate_jid = Validator::stringType()->noWhitespace()->length(6, 60);
-        if(!$validate_jid->validate($jid)) return false;
-        else return true;
+        return ($validate_jid->validate($jid));
     }
 
     public function display()

app/widgets/ContactDisco/ContactDisco.php

@@ -29,8 +29,4 @@ class ContactDisco extends \Movim\Widget\Base
 
         return $view->draw('_contactdisco', true);
     }
-
-    public function display()
-    {
-    }
 }

app/widgets/ContactHeader/ContactHeader.php

@@ -106,8 +106,7 @@ class ContactHeader extends \Movim\Widget\Base
     private function validateJid($jid)
     {
         $validate_jid = Validator::stringType()->noWhitespace()->length(6, 60);
-        if(!$validate_jid->validate($jid)) return false;
-        else return true;
+        return ($validate_jid->validate($jid));
     }
 
     public function display()

app/widgets/Dialog/Dialog.php

@@ -23,8 +23,4 @@ class Dialog extends \Movim\Widget\Base
         RPC::call('MovimUtils.removeClass', '#dialog', 'scroll');
         RPC::call('MovimTpl.fill', '#dialog', '');
     }
-
-    function display()
-    {
-    }
 }

app/widgets/Drawer/Drawer.php

@@ -24,8 +24,4 @@ class Drawer extends \Movim\Widget\Base
         RPC::call('MovimUtils.addClass', '#drawer', 'empty');
         RPC::call('MovimUtils.removeClass', '#drawer', 'actions');
     }
-
-    function display()
-    {
-    }
 }

app/widgets/Help/Help.php

@@ -22,9 +22,5 @@ class Help extends \Movim\Widget\Base
 
         $this->rpc('MovimUtils.redirect', $this->route('chat', [$room, 'room']));
     }
-
-    function display()
-    {
-    }
 }
 

app/widgets/LoginAnonymous/LoginAnonymous.php

@@ -48,8 +48,4 @@ class LoginAnonymous extends \Movim\Widget\Base
 
         \Moxl\Stanza\Stream::init($host);
     }
-
-    function display()
-    {
-    }
 }

app/widgets/Menu/Menu.php

@@ -206,8 +206,4 @@ class Menu extends \Movim\Widget\Base
         $pw = new \Post;
         return $pw->preparePost($p, true, false, true);
     }
-
-    function display()
-    {
-    }
 }

app/widgets/Notifs/Notifs.php

@@ -37,8 +37,4 @@ class Notifs extends \Movim\Widget\Base
 
         return $view->draw('_notifs', true);
     }
-
-    function display()
-    {
-    }
 }

app/widgets/Publish/Publish.php

@@ -326,7 +326,9 @@ class Publish extends \Movim\Widget\Base
     {
         if($url == '') {
             return;
-        } elseif(!filter_var($url, FILTER_VALIDATE_URL)) {
+        }
+
+        if(!filter_var($url, FILTER_VALIDATE_URL)) {
             Notification::append(false, $this->__('publish.valid_url'));
             return;
         }

app/widgets/PublishBrief/PublishBrief.php

@@ -115,7 +115,9 @@ class PublishBrief extends \Movim\Widget\Base
     {
         if($url == '') {
             return;
-        } elseif(!Validator::url()->validate($url)) {
+        }
+
+        if(!Validator::url()->validate($url)) {
             Notification::append(false, $this->__('publish.valid_url'));
             $this->ajaxClearEmbed();
             return;

app/widgets/PublishHelp/PublishHelp.php

@@ -5,8 +5,4 @@ class PublishHelp extends \Movim\Widget\Base
     function load()
     {
     }
-
-    function display()
-    {
-    }
 }

app/widgets/Rooms/Rooms.php

@@ -384,11 +384,7 @@ class Rooms extends \Movim\Widget\Base
 
         $presence = $pd->getPresence($room, $resource);
 
-        if($presence != null) {
-            return true;
-        } else {
-            return false;
-        }
+        return ($presence != null);
     }
 
     /**
@@ -436,8 +432,7 @@ class Rooms extends \Movim\Widget\Base
     private function validateRoom($room)
     {
         $validate_server = Validator::stringType()->noWhitespace()->length(6, 80);
-        if(!$validate_server->validate($room)) return false;
-        else return true;
+        return ($validate_server->validate($room));
     }
 
     /**
@@ -448,11 +443,6 @@ class Rooms extends \Movim\Widget\Base
     private function validateResource($resource)
     {
         $validate_resource = Validator::stringType()->length(2, 40);
-        if(!$validate_resource->validate($resource)) return false;
-        else return true;
-    }
-
-    function display()
-    {
+        return ($validate_resource->validate($resource));
     }
 }

app/widgets/Roster/Roster.php

@@ -267,8 +267,4 @@ class Roster extends \Movim\Widget\Base
 
         return $view->draw('_roster_item', true);
     }
-
-    function display()
-    {
-    }
 }

app/widgets/Share/Share.php

@@ -40,8 +40,4 @@ class Share extends \Movim\Widget\Base
             }
         }
     }
-
-    function display()
-    {
-    }
 }

app/widgets/Statistics/Statistics.php

@@ -62,12 +62,6 @@ class Statistics extends \Movim\Widget\Base
         $this->rpc('Statistics.drawGraphs', $data);
     }
 
-    function display()
-    {
-        $sd = new SessionxDAO;
-        $this->view->assign('sessions', $sd->getAll());
-    }
-
     public function getContact($username, $host)
     {
         $jid = $username.'@'.$host;
@@ -79,4 +73,10 @@ class Statistics extends \Movim\Widget\Base
     {
         return prepareDate(strtotime($date));
     }
+
+    function display()
+    {
+        $sd = new SessionxDAO;
+        $this->view->assign('sessions', $sd->getAll());
+    }
 }

app/widgets/Vcard4/Vcard4.php

@@ -14,20 +14,6 @@ class Vcard4 extends \Movim\Widget\Base
         $this->registerEvent('vcard4_set_handle', 'onMyVcard4');
     }
 
-    function display()
-    {
-        $cd = new \Modl\ContactDAO;
-        $me = $cd->get();
-
-        $this->view->assign('getvcard', $this->call('ajaxGetVcard'));
-
-        if($me == null) {
-            $this->view->assign('form', $this->prepareForm(new \Modl\Contact));
-        } else {
-            $this->view->assign('form', $this->prepareForm($me));
-        }
-    }
-
     function prepareForm($me)
     {
         $vcardform = $this->tpl();
@@ -144,4 +130,18 @@ class Vcard4 extends \Movim\Widget\Base
             Notification::append(null, $this->__('vcard.restricted'));
         }
     }
+
+    function display()
+    {
+        $cd = new \Modl\ContactDAO;
+        $me = $cd->get();
+
+        $this->view->assign('getvcard', $this->call('ajaxGetVcard'));
+
+        if($me == null) {
+            $this->view->assign('form', $this->prepareForm(new \Modl\Contact));
+        } else {
+            $this->view->assign('form', $this->prepareForm($me));
+        }
+    }
 }