More cleanup of ContactDAO

app/views/admin.tpl

@@ -17,7 +17,7 @@
             <?php $this->widget('Tabs');?>
             <?php $this->widget('AdminTest');?>
             <?php $this->widget('AdminMain');?>
-            <?php //$this->widget('Statistics');?>
+            <?php $this->widget('Statistics');?>
             <?php $this->widget('Api');?>
         </div>
     </section>

app/widgets/Avatar/Avatar.php

@@ -26,32 +26,25 @@ class Avatar extends \Movim\Widget\Base
 
     function onGetAvatar($packet)
     {
-        $me = $packet->content;
-        $html = $this->prepareForm($me);
-
-        $this->rpc('MovimTpl.fill', '#avatar_form', $html);
+        $this->rpc('MovimTpl.fill', '#avatar_form', $this->prepareForm());
         Notification::append(null, $this->__('avatar.updated'));
     }
 
     function onMyAvatarError()
     {
-        $cd = new \Modl\ContactDAO;
-        $me = $cd->get();
-        $html = $this->prepareForm($me);
-
-        $this->rpc('MovimTpl.fill', '#avatar_form', $html);
+        $this->rpc('MovimTpl.fill', '#avatar_form', $this->prepareForm());
         Notification::append(null, $this->__('avatar.not_updated'));
     }
 
-    function prepareForm($me)
+    function prepareForm()
     {
         $avatarform = $this->tpl();
 
         $p = new Picture;
-        $p->get($this->user->getLogin());
+        $p->get($this->user->jid);
 
         $avatarform->assign('photobin', $p->toBase());
-        $avatarform->assign('me',       $me);
+        $avatarform->assign('me',       \App\Contact::firstOrNew(['id' => $this->user->jid]));
         $avatarform->assign(
             'submit',
             $this->call('ajaxSubmit', "MovimUtils.formToJson('avatarform')")
@@ -63,17 +56,14 @@ class Avatar extends \Movim\Widget\Base
     function ajaxGetAvatar()
     {
         $r = new Get;
-        $r->setTo($this->user->getLogin())
+        $r->setTo($this->user->id)
           ->setMe()
           ->request();
     }
 
     function ajaxDisplay()
     {
-        $cd = new \Modl\ContactDAO;
-        $me = $cd->get();
-
-        $this->rpc('MovimTpl.fill', '#avatar_form', $this->prepareForm($me));
+        $this->rpc('MovimTpl.fill', '#avatar_form', $this->prepareForm());
     }
 
     function ajaxSubmit($avatar)

app/widgets/Login/Login.php

@@ -70,9 +70,7 @@ class Login extends Base
 
             if ($invitation) {
                 $this->view->assign('invitation', $invitation);
-
-                $cd = new \Modl\ContactDAO;
-                $this->view->assign('contact', $cd->get($invitation->jid));
+                $this->view->assign('contact', \App\Contact::firstOrNew(['id' => $invitation->jid]));
             }
         }
 

app/widgets/Search/Search.php

@@ -2,7 +2,6 @@
 
 use Respect\Validation\Validator;
 use Modl\PostnDAO;
-use Modl\ContactDAO;
 
 class Search extends \Movim\Widget\Base
 {

app/widgets/Statistics/Statistics.php

@@ -4,22 +4,13 @@ use Modl\SessionxDAO;
 
 class Statistics extends \Movim\Widget\Base
 {
-    public function getContact($username, $host)
+    public function getContact(\App\User $user)
     {
-        $jid = $username.'@'.$host;
-        $cd = new modl\ContactDAO;
-        return $cd->get($jid);
-    }
-
-    function getTime($date)
-    {
-        return prepareDate(strtotime($date));
+        return \App\Contact::firstOrNew(['id' => $user->id]);
     }
 
     function display()
     {
-        $sd = new SessionxDAO;
-        $sessions = $sd->getAll();
-        $this->view->assign('sessions', is_array($sessions) ? $sessions : []);
+        $this->view->assign('sessions', \App\Session::get());
     }
 }

app/widgets/Statistics/statistics.tpl

@@ -4,25 +4,23 @@
             <p>{$c->__('statistics.sessions')} <span class="second">{$sessions|count}</a></p>
         </li>
         {loop="$sessions"}
-            {$user = $c->getContact($value->username, $value->host)}
-            <li class="block" onclick="MovimUtils.redirect('{$c->route('contact', $value->jid)}')">
+            {$user = $c->getContact($value->user)}
+            <li class="block" onclick="MovimUtils.redirect('{$c->route('contact', $user->id)}')">
                 {$url = $user->getPhoto('s')}
                 {if="$url"}
                     <span class="primary icon bubble">
                         <img src="{$url}">
                     </span>
                 {else}
-                    <span class="primary icon bubble color {$user->jid|stringToColor}">
+                    <span class="primary icon bubble color {$user->id|stringToColor}">
                         <i class="zmdi zmdi-account"></i>
                     </span>
                 {/if}
-                <p class="line" title="{$value->username}@{$value->host}">
-                    {$user->getTrueName()} <span class="second">{$value->username}@{$value->host}</span>
+                <p class="line" title="{$user->id}">
+                    {$user->truename} <span class="second">{$user->id}</span>
                 </p>
                 <p>
-                    {if="isset($value->start)"}
-                        {$c->getTime($value->start)}
-                    {/if}
+                    {$value->created_at|strtotime|prepareDate}
                 </p>
             </li>
         {/loop}

app/widgets/Syndication/Syndication.php

@@ -11,7 +11,6 @@ class Syndication extends \Movim\Widget\Base
         ob_clean();
 
         $pd = new \Modl\PostnDAO;
-        $cd = new \Modl\ContactDAO;
         $id = new \Modl\InfoDAO;
 
         if (!$this->get('s')) {
@@ -23,7 +22,7 @@ class Syndication extends \Movim\Widget\Base
 
         if (filter_var($from, FILTER_VALIDATE_EMAIL)) {
             $node = 'urn:xmpp:microblog:0';
-            $contact = $cd->get($from);
+            $contact = \App\Contact::firstOrNew(['id' => $from]);
         } elseif (!$this->get('n')) {
             return;
         } else {

app/widgets/Vcard4/Vcard4.php

@@ -56,7 +56,7 @@ class Vcard4 extends \Movim\Widget\Base
     function ajaxGetVcard()
     {
         $r = new Get;
-        $r->setTo($this->dbuser->id)
+        $r->setTo($this->user->id)
           ->setMe()
           ->request();
     }