Browse Source

Fix issue #20 regarding the notification for contact invitation

pull/56/head
Jaussoin Timothée 10 years ago
parent
commit
68f75c1941
  1. 2
      app/widgets/Navigation/navigation.tpl
  2. 23
      app/widgets/Notifs/Notifs.php

2
app/widgets/Navigation/navigation.tpl

@ -27,7 +27,7 @@
<a class="classic" href="{$c->route('contact')}">
<li {if="$page == 'contact'"}class="active"{/if}>
<span class="icon"><i class="zmdi zmdi-accounts"></i></span>
<span class="counter"></span>
<span data-key="invite" class="counter"></span>
<span>{$c->__('page.contacts')}</span>
</li>
</a>

23
app/widgets/Notifs/Notifs.php

@ -37,11 +37,20 @@ class Notifs extends WidgetBase
$this->registerEvent('presence_subscribed_handle', 'onNotifs');
}
function onNotifs($packet = false)
function onNotifs($from = false)
{
$html = $this->prepareNotifs();
RPC::call('movim_fill', 'notifs_widget', $html);
RPC::call('Notifs.refresh');
if(is_string($from)) {
$cd = new \Modl\ContactDAO;
$contact = $cd->get($from);
$avatar = $contact->getPhoto('s');
if($avatar == false) $avatar = null;
Notification::append('invite|'.$from, $contact->getTrueName(), $this->__('notifs.wants_to_talk', $contact->getTrueName()), $avatar, 4);
}
}
function ajaxGet()
@ -118,6 +127,7 @@ class Notifs extends WidgetBase
unset($notifs[$jid]);
$session->set('activenotifs', $notifs);
Notification::ajaxClear('invite|'.$jid);
}
function ajaxRefuse($jid)
@ -137,15 +147,6 @@ class Notifs extends WidgetBase
$session->set('activenotifs', $notifs);
$this->onNotifs();
}
function genCallAccept($jid)
{
return $this->call('ajaxAccept', "'".$jid."'");
}
function genCallRefuse($jid)
{
return $this->call('ajaxRefuse', "'".$jid."'");
Notification::ajaxClear('invite|'.$jid);
}
}
Loading…
Cancel
Save