- Add new emojis

- Add some events filter in Groups and News - Fix the blog and syndication page behaviour
11 years ago · acc77bc86b
12 changed files with 56 additions and 43 deletions
--- a/app/widgets/Blog/Blog.php
+++ b/app/widgets/Blog/Blog.php
@ -8,29 +8,23 @@ class Blog extends WidgetCommon {

    function display()
    {
-        if(!isset($_GET['f'])) {
+        if(!$this->get('f')) {
            return;
        }
        
-        $from = $_GET['f'];
+        $from = $this->get('f');
        if(filter_var($from, FILTER_VALIDATE_EMAIL)) {
            $node = 'urn:xmpp:microblog:0';
        } else {
            return;
        }
+
+        $cd = new \modl\ContactDAO();
+        $c  = $cd->get($from, true);
+        $this->view->assign('contact', $c);
        
        $pd = new \modl\PostnDAO();
        $messages = $pd->getPublic($from, $node, 10, 0);
-
-        if($messages[0] != null) {
-            // Title and logo
-
-            $cd = new \modl\ContactDAO();
-            $c  = $cd->get($from);
-            $this->view->assign('contact', $c);
-        } else {
-            $this->view->assign('title', $this->__('page.feed'));
-        }
        
        $this->view->assign('posts', $messages);
    }
--- a/app/widgets/Blog/blog.tpl
+++ b/app/widgets/Blog/blog.tpl
@ -4,7 +4,7 @@
        <li class="action">
            <div class="action">
                <a 
-                    href="{$c->route('feed', array($contact->jid, 'urn:xmpp:microblog:0'))}"
+                    href="{$c->route('feed', array($contact->jid))}"
                    target="_blank"
                >
                    <i class="md md-wifi-tethering"></i> Atom
@ -14,7 +14,11 @@
                <i class="md md-edit"></i>
            </span>
            <span>
+                {if="$contact"}
                <h2>{$c->__('blog.title', $contact->getTrueName())}</h2>
+                {else}
+                <h2>{$c->__('page.blog')}</h2>
+                {/if}
            </span>
        </li>
    </ul>
@ -85,4 +89,11 @@
            </footer>
        </article>
    {/loop}
+    {if="$posts == null"}
+        <ul class="simple thick">
+            <li>
+                <span>{$c->__('blog.empty')}</span>
+            </li>
+        </ul>
+    {/if}
 </div>
--- a/app/widgets/Blog/locales.ini
+++ b/app/widgets/Blog/locales.ini
@ -1 +1,2 @@
 blog.title      = "%s's feed"
+blog.empty      = 'This user has not posted anything right now'
--- a/app/widgets/Chat/_chat_smiley.tpl
+++ b/app/widgets/Chat/_chat_smiley.tpl
@ -41,14 +41,6 @@
                <td onclick="Chat.addSmiley(this);" data-emoji="🍜"><img alt=":ramen:" class="emoji" src="themes/material/img/emojis/large/1f35c.png"></td>
                <td onclick="Chat.addSmiley(this);" data-emoji="🍣"><img alt=":sushi:" class="emoji" src="themes/material/img/emojis/large/1f363.png"></td>
            </tr>
-            <tr class="active">
-                <td onclick="Chat.addSmiley(this);" data-emoji="💋"><img alt=":kiss:" class="emoji" src="themes/material/img/emojis/large/1f48b.png"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="💊"><img alt=":pill:" class="emoji" src="themes/material/img/emojis/large/1f48a.png"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="💡"><img alt=":bulb:" class="emoji" src="themes/material/img/emojis/large/1f4a1.png"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="💩"><img alt=":hankey:" class="emoji" src="themes/material/img/emojis/large/1f4a9.png"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="☕"><img alt=":coffee:" class="emoji" src="themes/material/img/emojis/large/2615.png"></td>
-                <td onclick="Chat.addSmiley(this);" data-emoji="⏰"><img alt=":alarm_clock:" class="emoji" src="themes/material/img/emojis/large/23f0.png"></td>
-            </tr>
            <tr class="active">
                <td onclick="Chat.addSmiley(this);" data-emoji="🛀"><img alt=":bath:" class="emoji" src="themes/material/img/emojis/large/1f6c0.png"></td>
                <td onclick="Chat.addSmiley(this);" data-emoji="🎧"><img alt=":headphones:" class="emoji" src="themes/material/img/emojis/large/1f3a7.png"></td>
@ -57,6 +49,22 @@
                <td onclick="Chat.addSmiley(this);" data-emoji="💼"><img alt=":briefcase:" class="emoji" src="themes/material/img/emojis/large/1f4bc.png"></td>
                <td onclick="Chat.addSmiley(this);" data-emoji="🎒"><img alt=":school_satchel:" class="emoji" src="themes/material/img/emojis/large/1f392.png"></td>
            </tr>
+            <tr class="active">
+                <td onclick="Chat.addSmiley(this);" data-emoji="💡"><img alt=":bulb:" class="emoji" src="themes/material/img/emojis/large/1f4a1.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="📞"><img alt=":telephone_receiver:" class="emoji" src="themes/material/img/emojis/large/1f4de.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🔥"><img alt=":fire:" class="emoji" src="themes/material/img/emojis/large/1f525.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="🕐"><img alt=":clock1:" class="emoji" src="themes/material/img/emojis/large/1f550.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="✉"><img alt=":email:" class="emoji" src="themes/material/img/emojis/large/2709.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="✏"><img alt=":pencil2:" class="emoji" src="themes/material/img/emojis/large/270f.png"></td>
+            </tr>
+            <tr class="active">
+                <td onclick="Chat.addSmiley(this);" data-emoji="💋"><img alt=":kiss:" class="emoji" src="themes/material/img/emojis/large/1f48b.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="♥"><img alt=":hearts:" class="emoji" src="themes/material/img/emojis/large/2665.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="💊"><img alt=":pill:" class="emoji" src="themes/material/img/emojis/large/1f48a.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="💩"><img alt=":hankey:" class="emoji" src="themes/material/img/emojis/large/1f4a9.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="☕"><img alt=":coffee:" class="emoji" src="themes/material/img/emojis/large/2615.png"></td>
+                <td onclick="Chat.addSmiley(this);" data-emoji="⏰"><img alt=":alarm_clock:" class="emoji" src="themes/material/img/emojis/large/23f0.png"></td>
+            </tr>
            <tr class="active">
                <td onclick="Chat.addSmiley(this);" data-emoji="🐷"><img alt=":pig:" class="emoji" src="themes/material/img/emojis/large/1f437.png"></td>
                <td onclick="Chat.addSmiley(this);" data-emoji="🐵"><img alt=":monkey_face:" class="emoji" src="themes/material/img/emojis/large/1f435.png"></td>
--- a/app/widgets/Group/Group.php
+++ b/app/widgets/Group/Group.php
@ -18,9 +18,9 @@ class Group extends WidgetCommon

    function load()
    {
-        $this->registerEvent('pubsub_getitem_handle', 'onItems');
-        $this->registerEvent('pubsub_getitems_handle', 'onItems');
-        $this->registerEvent('pubsub_getitemsid_handle', 'onItems');
+        $this->registerEvent('pubsub_getitem_handle', 'onItems', 'groups');
+        $this->registerEvent('pubsub_getitems_handle', 'onItems', 'groups');
+        $this->registerEvent('pubsub_getitemsid_handle', 'onItems', 'groups');

        $this->registerEvent('pubsub_getitems_error', 'onItemsError');
        $this->registerEvent('pubsub_subscribe_handle', 'onSubscribed');
--- a/app/widgets/Groups/groups.js
+++ b/app/widgets/Groups/groups.js
@ -25,6 +25,7 @@ var Groups = {
 }

 MovimWebsocket.attach(function() {
+    Notification.current('groups');
    Groups_ajaxHeader();
    Groups.refresh();
 });
--- a/app/widgets/Menu/Menu.php
+++ b/app/widgets/Menu/Menu.php
@ -8,7 +8,7 @@ class Menu extends WidgetCommon
    
    function load()
    {
-        $this->registerEvent('post', 'onPost');
+        $this->registerEvent('post', 'onPost', 'news');
        $this->addjs('menu.js');
    }

--- a/app/widgets/Menu/menu.js
+++ b/app/widgets/Menu/menu.js
@ -29,5 +29,6 @@ var Menu = {

 MovimWebsocket.attach(function() {
    Notification_ajaxClear('news');
+    Notification.current('news');
    Menu.refresh();
 });
--- a/app/widgets/Rooms/_rooms_list.tpl
+++ b/app/widgets/Rooms/_rooms_list.tpl
@ -4,7 +4,7 @@
    <ul>
        {$presence = getPresencesTxt()}
        {loop="$list"}
-            <li class="action">
+            <li class="action" title="{$value->resource}">
                {$url = $value->getPhoto('s')}
                {if="$url"}
                    <span class="icon bubble status {$presence[$value->value]}">
@ -25,7 +25,7 @@
        {/loop}
    </ul>
 </section>
-<div class="no_bar">
+<div>
    <a onclick="Dialog.clear()" class="button flat">
        {$c->__('button.cancel')}
    </a>
--- a/app/widgets/Syndication/Syndication.php
+++ b/app/widgets/Syndication/Syndication.php
@ -11,11 +11,11 @@ class Syndication extends WidgetBase
    {
        ob_clean();

-        if(!isset($_GET['f'])) {
+        if(!$this->get('f')) {
            return;
        }
-        
-        $from = $_GET['f'];
+
+        $from = $this->get('f');
        if(filter_var($from, FILTER_VALIDATE_EMAIL)) {
            $node = 'urn:xmpp:microblog:0';
        } else {
@ -23,6 +23,10 @@ class Syndication extends WidgetBase
        }
        
        $pd = new \modl\PostnDAO();
+        $cd = new \modl\ContactDAO();
+
+        $this->view->assign('contact', $cd->get($from, true));
+        $this->view->assign('uri',  Route::urlize('blog',array($from)));
        
        if(isset($from) && isset($node)) {
            $messages = $pd->getPublic($from, $node, 10, 0);
@ -32,12 +36,7 @@ class Syndication extends WidgetBase
        if(isset($messages[0])) {
            header("Content-Type: application/atom+xml; charset=UTF-8");

-            $cd = new \modl\ContactDAO();
-
            $this->view->assign('date', date('c'));
-            $this->view->assign('contact', $cd->get($from));
-
-            $this->view->assign('uri',  Route::urlize('blog',array($from)));
        }
    }
    
--- a/app/widgets/Syndication/syndication.tpl
+++ b/app/widgets/Syndication/syndication.tpl
@ -1,12 +1,11 @@
 {if="isset($contact)"}  
-    {if="!empty($messages)"}        
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
    <title>{$c->__('feed.title', $contact->getTrueName())}</title>
    <updated>{$date}</updated>
    <author>
        <name>{$contact->getTrueName()}</name>
-        <uri>{$uri}</uri>
+        <uri><![CDATA[{$uri}]]></uri>
    </author>
    {$link}
    <logo>{$contact->getPhoto('xl')}</logo>
@ -16,13 +15,14 @@
    </generator>

    <id>urn:uuid:{$uuid}</id>
+     {if="!empty($messages)"}   
    {loop="$messages"}
    <entry>
        <title>
            {if="$value->title != null"}
-                {$c->prepareTitle($value->title)}
+                <![CDATA[{$c->prepareTitle($value->title)}]]>
            {else}
-                {$c->__('post.default_title')}
+                <![CDATA[{$c->__('post.default_title')}]]>
            {/if}
        </title>
        <id>urn:uuid:{$c->generateUUID($value->content)}</id>
@ -35,11 +35,9 @@
            {/if}
        </content>
    </entry>
+    {/if}
    {/loop}
 </feed>
-    {else}
-        {$c->__('feed.no')}
-    {/if}
 {else}
    {$c->__('feed.no_contact')}
 {/if}
--- a/system/Route.php
+++ b/system/Route.php
@ -28,7 +28,7 @@ class Route extends \BaseController {
                'disconnect'    => array('err'),
                'friend'        => array('f'),
                'blog'          => array('f'),
-                'feed'          => array('f', 'n'),
+                'feed'          => array('f'),
                'nodeconfig'    => array('s', 'n'),
                'node'          => array('s', 'n'),
                'server'        => array('s'),