- Update the translations

- Display the roster subscription status
- Add actions on contact with 'none', 'to' or 'from' status

app/models/contact/Contact.php

@@ -393,6 +393,7 @@ class Contact extends Model {
         return array(
             'jid'        => $this->jid,
             'rostername' => $this->rostername,
+            'rostername' => $this->rostername,
             'groupname'  => $this->groupname,
             'status'     => $this->status,
             'resource'   => $this->resource,
@@ -504,6 +505,7 @@ class RosterContact extends Contact {
     protected $publickey;
     protected $muc;
     protected $rosterask;
+    protected $rostersubscription;
     protected $node;
     protected $ver;
     protected $category;
@@ -517,6 +519,8 @@ class RosterContact extends Contact {
                 {'type':'string', 'size':128 },
             'rosterask' : 
                 {'type':'string', 'size':128 },
+            'rostersubscription' : 
+                {'type':'string', 'size':8 },
             'groupname' : 
                 {'type':'string', 'size':128 },
             'resource' : 

app/models/contact/ContactDAO.php

@@ -422,6 +422,7 @@ class ContactDAO extends SQL {
             contact.tuneartist,
             contact.tunetitle,
             rosterlink.rostername,
+            rosterlink.rostersubscription,
             rosterlink.groupname,
             rosterlink.chaton,
             presence.status,
@@ -460,6 +461,7 @@ class ContactDAO extends SQL {
             contact.tuneartist,
             contact.tunetitle,
             rosterlink.rostername,
+            rosterlink.rostersubscription,
             rosterlink.groupname,
             rosterlink.chaton
         from rosterlink
@@ -531,6 +533,7 @@ class ContactDAO extends SQL {
             contact.tuneartist,
             contact.tunetitle,
             rosterlink.rostername,
+            rosterlink.rostersubscription,
             rosterlink.groupname,
             rosterlink.chaton,
             presence.status,

app/widgets/Contact/_contact.tpl

@@ -301,6 +301,46 @@
         </ul>
     {/if}
 
+    {if="$contactr->rostersubscription != 'both'"}
+        <div class="card">
+            <ul class="middle">
+                <li class="condensed">
+                    {if="$contactr->rostersubscription == 'to'"}
+                        <span class="icon gray">
+                            <i class="md md-call-received"></i>
+                        </span>
+                        <span>{$c->__('subscription.to')}</span>
+                        <p>{$c->__('subscription.to_text')}</p>
+                        <a class="button flat" onclick="Notifs_ajaxAccept('{$contactr->jid}')">
+                            {$c->__('subscription.to_button')}
+                        </a>
+                    {/if}
+                    {if="$contactr->rostersubscription == 'from'"}
+                        <span class="icon gray">
+                            <i class="md md-call-made"></i>
+                        </span>
+                        <span>{$c->__('subscription.from')}</span>
+                        <p>{$c->__('subscription.from_text')}</p>
+                        <a class="button flat" onclick="Notifs_ajaxAsk('{$contactr->jid}')">
+                            {$c->__('subscription.from_button')}
+                        </a>
+                    {/if}
+                    {if="$contactr->rostersubscription == 'none'"}
+                        <span class="icon gray">
+                            <i class="md md-do-not-disturb"></i>
+                        </span>
+
+                        <span>{$c->__('subscription.none')}</span>
+                        <p>{$c->__('subscription.none_text')}</p>
+                        <a class="button flat" onclick="Notifs_ajaxAsk('{$contactr->jid}')">
+                            {$c->__('subscription.none_button')}
+                        </a>
+                    {/if}
+                </li>
+            </ul>
+        </div>
+    {/if}
+
     <a onclick="{$chat}" class="button action color red">
         <i class="md md-chat"></i>
     </a>

app/widgets/Contact/locales.ini

@@ -49,3 +49,14 @@ age.years            = '%s years'
 
 [blog]
 blog.last            = 'Last public post'
+
+[subscription]
+subscription.to         = 'You can see this contact status'
+subscription.to_button  = 'Share my status'
+subscription.to_text    = 'But this contact cannot see yours'
+subscription.from       = 'You are not subscribed to this contact'
+subscription.from_button= 'Ask to subscribe'
+subscription.from_text  = 'But this contact can still see if you are online'
+subscription.none       = 'No subscriptions'
+subscription.none_button= 'Invite'
+subscription.none_text  = 'This contact is in your contact list but there is no subscriptions between the two accounts'

app/widgets/Notifs/Notifs.php

@@ -20,6 +20,7 @@
 use Moxl\Xec\Action\Presence\Subscribed;
 use Moxl\Xec\Action\Presence\Unsubscribed;
 use Moxl\Xec\Action\Roster\AddItem;
+use Moxl\Xec\Action\Roster\UpdateItem;
 use Moxl\Xec\Action\Presence\Subscribe;
 
 class Notifs extends WidgetBase
@@ -31,6 +32,7 @@ class Notifs extends WidgetBase
 
         $this->registerEvent('subscribe', 'onNotifs');
         $this->registerEvent('roster_additem_handle', 'onNotifs');
+        $this->registerEvent('roster_updateitem_handle', 'onNotifs');
         $this->registerEvent('presence_subscribe_handle', 'onNotifs');
         $this->registerEvent('presence_subscribed_handle', 'onNotifs');
     }
@@ -78,10 +80,22 @@ class Notifs extends WidgetBase
     {
         $jid = echapJid($jid);
 
-        $r = new AddItem;
-        $r->setTo($jid)
-          ->setFrom($this->user->getLogin())
-          ->request();
+        $rd = new \Modl\RosterLinkDAO();
+        $c  = $rd->get($jid);
+
+        if(isset($c) && $c->groupname) {
+            $ui = new UpdateItem;
+            $ui->setTo($jid)
+               ->setFrom($this->user->getLogin())
+               ->setName($c->rostername)
+               ->setGroup($c->groupname)
+               ->request();
+        } else {
+            $r = new AddItem;
+            $r->setTo($jid)
+              ->setFrom($this->user->getLogin())
+              ->request();
+        }
 
         $p = new Subscribe;
         $p->setTo($jid)

app/widgets/Roster/Roster.php

@@ -287,6 +287,7 @@ class Roster extends WidgetBase
         $c['rosterview']['color']    = stringToColor($oc->jid);
         $c['rosterview']['name']     = $oc->getTrueName();
         $c['rosterview']['friendpage']     = $this->route('contact', $oc->jid);
+        $c['rosterview']['subscription']   = $oc->rostersubscription;
 
         // Some data relative to the presence
         if($oc->last != null && $oc->last > 60)

app/widgets/Roster/roster.tpl

@@ -30,13 +30,16 @@
                 <!--ng-class="rosterCtrl.getContactClient(myjid.ajiditems)"-- >-->
                 <div
                     class="action"
-                    ng-if="myjid.ajiditems.rosterview.tune != '' || myjid.ajiditems.rosterview.type != '' "
+                    ng-if="myjid.ajiditems.rosterview.tune != '' || myjid.ajiditems.rosterview.type != '' || myjid.ajiditems.rosterview.subscription != 'both'"
                     ng-switch on="myjid.ajiditems.rosterview.type">
                     <i ng-switch-when="handheld" class="md md-smartphone"></i>
                     <i ng-switch-when="phone" class="md md-smartphone"></i>
                     <i ng-switch-when="web" class="md md-language"></i>
                     <i ng-switch-when="bot" class="md md-memory"></i>
                     <i ng-if="myjid.ajiditems.rosterview.tune" class="md md-play-arrow"></i>
+                    <i ng-if="myjid.ajiditems.rosterview.subscription == 'to'" class="md md-call-received"></i>
+                    <i ng-if="myjid.ajiditems.rosterview.subscription == 'from'" class="md md-call-made"></i>
+                    <i ng-if="myjid.ajiditems.rosterview.subscription == 'none'" class="md md-do-not-disturb"></i>
                 </div>
 
                 <span

mud.php

@@ -24,9 +24,9 @@ Here some requests you can do with me :", 'green')."
         case 'getloc':
             getloc();
             break;
-        case 'comploc':
+        /*case 'comploc':
             comploc();
-            break;
+            break;*/
         case 'comptz':
             comptz();
             break;

themes/material/css/form.css

@@ -320,7 +320,7 @@ header.big ~ .button.action {
     top: 16rem;
 }
 
-@media screen and (min-width: 1024px) {
+@media screen and (min-width: 1025px) {
     main > section > div:first-child:nth-last-child(2) .button.action {
         right: calc(70% + 3rem);
     }