setupFieldRichtext();
/* popup menus */
- function close_last_popup_menu() {
- if(last_popup_menu) {
- last_popup_menu.hide();
- last_popup_button.removeClass("selected");
- last_popup_menu = null;
- last_popup_button = null;
- }
- }
+ function close_last_popup_menu() {
+ if(last_popup_menu) {
+ last_popup_menu.hide();
+ last_popup_button.removeClass("selected");
+ last_popup_menu = null;
+ last_popup_button = null;
+ }
+ }
$('a[rel^=#]').click(function(e){
e.preventDefault();
var parent = $(this).parent();
return false;
});
$('html').click(function() {
- close_last_popup_menu();
+ close_last_popup_menu();
});
// fancyboxes
nnm = $("#nav-notifications-menu");
nnm.html(notifications_all + notifications_mark);
//nnm.attr('popup','true');
+
+ var notification_lastitem = parseInt(localStorage.getItem("notification-lastitem"));
+ var notification_id = 0;
eNotif.children("note").each(function(){
e = $(this);
- text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
- html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen'));
+ var text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
+ var seenclass = (e.attr('seen')==1)?"notify-seen":"notify-unseen";
+ var html = notifications_tpl.format(e.attr('href'),
+ e.attr('photo'), // {0}
+ text, // {1}
+ e.attr('date'), // {2}
+ seenclass, // {3}
+ new Date(e.attr('timestamp')*1000) // {4}
+ );
nnm.append(html);
+ });
+ $(eNotif.children("note").get().reverse()).each(function(){
+ e = $(this);
+ notification_id = parseInt(e.attr('timestamp'));
+ if (notification_lastitem!== null && notification_id > notification_lastitem) {
+ if (getNotificationPermission()==="granted") {
+ var notification = new Notification(document.title, {
+ body: e.text().replace('→ ','').format(e.attr('name')),
+ icon: e.attr('photo'),
+ });
+ notification['url'] = e.attr('href');
+ notification.addEventListener("click", function(ev){
+ window.location = ev.target.url;
+ });
+ }
+ }
- if(e.text().search('→') == 0) {
- var notification = new Notification(document.title, {
- body: e.text().replace('→ ',''),
- icon: e.attr('photo')
- });
-
- // TODO (yet unsupported by most browsers):
- // Implement notification.onclick()
-
- // notifyMarkAll();
- }
});
+ notification_lastitem = notification_id;
+ localStorage.setItem("notification-lastitem", notification_lastitem)
$("img[data-src]", nnm).each(function(i, el){
// Add src attribute for images with a data-src attribute
});
}
+
+// notification permission settings in localstorage
+// set by settings page
+function getNotificationPermission() {
+ if (window["Notification"] === undefined) {
+ return null;
+ }
+ if (Notification.permission === 'granted') {
+ var val = localStorage.getItem('notification-permissions');
+ if (val === null) return 'denied';
+ return val;
+ } else {
+ return Notification.permission;
+ }
+}
<?php
require_once("include/datetime.php");
require_once('include/bbcode.php');
-
+require_once("mod/proxy.php");
function ping_init(&$a) {
killme();
}
- $firehose = intval(get_pconfig(local_user(),'system','notify_full'));
-
- $z = ping_get_notifications(local_user());
+ $notifs = ping_get_notifications(local_user());
$sysnotify = 0; // we will update this in a moment
$tags = array();
}
-
- function xmlize($href, $name, $url, $photo, $date, $seen, $message){
- require_once("mod/proxy.php");
- $photo = proxy_url($photo);
-
- $message = html_entity_decode($message, ENT_COMPAT | ENT_HTML401, "UTF-8");
- $name = html_entity_decode($name, ENT_COMPAT | ENT_HTML401, "UTF-8");
+ /**
+ * return xml from notification array
+ *
+ * @param array $n Notification array:
+ * 'href' => notification link
+ * 'name' => subject name
+ * 'url' => subject url
+ * 'photo' => subject photo
+ * 'date' => notification date
+ * 'seen' => bool true/false
+ * 'message' => notification message. "{0}" will be replaced by subject name
+ **/
+ function xmlize($n){
+ $n['photo'] = proxy_url($n['photo']);
+
+ $n['message'] = html_entity_decode($n['message'], ENT_COMPAT | ENT_HTML401, "UTF-8");
+ $n['name'] = html_entity_decode($n['name'], ENT_COMPAT | ENT_HTML401, "UTF-8");
// Are the nofications calles from the regular process or via the friendica app?
$regularnotifications = (intval($_GET['uid']) AND intval($_GET['_']));
$a = get_app();
if ($a->is_friendica_app() OR !$regularnotifications)
- $message = str_replace("{0}", $name, $message);
+ $n['message'] = str_replace("{0}", $n['name'], $n['message']);
- $data = array('href' => &$href, 'name' => &$name, 'url'=>&$url, 'photo'=>&$photo, 'date'=>&$date, 'seen'=>&$seen, 'messsage'=>&$message);
- call_hooks('ping_xmlize', $data);
- $notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" >%s</note>'."\n";
+ $local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']);
+
+ call_hooks('ping_xmlize', $n);
+ $notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" timestamp="%s" >%s</note>'."\n";
return sprintf ( $notsxml,
- xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($seen), xmlify($message)
+ xmlify($n['href']), xmlify($n['name']), xmlify($n['url']), xmlify($n['photo']),
+ xmlify(relative_date($n['date'])), xmlify($n['seen']), xmlify(strtotime($local_time)),
+ xmlify($n['message'])
);
}
<birthdays>$birthdays</birthdays>
<birthdays-today>$birthdays_today</birthdays-today>\r\n";
- $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags);
- if($firehose) {
- echo ' <notif count="'.$tot.'">';
- }
- else {
- if(count($z) && (! $sysnotify)) {
- foreach($z as $zz) {
- if($zz['seen'] == 0)
- $sysnotify ++;
- }
- }
-
- echo ' <notif count="'. ($sysnotify + $intro + $mail + $register) .'">';
-
- if ($intro>0){
- foreach ($intros as $i) {
- echo xmlize($a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), 'notify-unseen', "→ ".t("{0} wants to be your friend"));
- };
- }
- if ($mail>0){
- foreach ($mails as $i) {
- echo xmlize($a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), 'notify-unseen',"→ ".t("{0} sent you a message"));
- };
- }
- if ($register>0){
- foreach ($regs as $i) {
- echo xmlize($a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), 'notify-unseen', "→ ".t("{0} requested registration"));
- };
- }
-
- if(count($z)) {
- foreach($z as $zz) {
- echo xmlize($a->get_baseurl() . '/notify/view/' . $zz['id'], $zz['name'],$zz['url'],$zz['photo'],relative_date($zz['date']), ($zz['seen'] ? 'notify-seen' : 'notify-unseen'), ($zz['seen'] ? '' : '→ ') .strip_tags(bbcode($zz['msg'])));
- }
+ if(count($notifs) && (! $sysnotify)) {
+ foreach($notifs as $zz) {
+ if($zz['seen'] == 0)
+ $sysnotify ++;
}
}
- if($firehose) {
- if ($intro>0){
- foreach ($intros as $i) {
- echo xmlize( $a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), 'notify-unseen',t("{0} wants to be your friend") );
- };
- }
- if ($mail>0){
- foreach ($mails as $i) {
- echo xmlize( $a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), 'notify-unseen',t("{0} sent you a message") );
- };
- }
- if ($register>0){
- foreach ($regs as $i) {
- echo xmlize( $a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), 'notify-unseen',t("{0} requested registration") );
- };
- }
-
- if (count($comments)){
- foreach ($comments as $i) {
- echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} commented %s's post"), $i['pname'] ) );
- };
- }
- if (count($likes)){
- foreach ($likes as $i) {
- echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} liked %s's post"), $i['pname'] ) );
- };
+ echo ' <notif count="'. ($sysnotify + $intro + $mail + $register) .'">';
+
+ // merge all notification types in one array
+ if ($intro>0){
+ foreach ($intros as $i) {
+ $n = array(
+ 'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'],
+ 'name' => $i['name'],
+ 'url' => $i['url'],
+ 'photo' => $i['photo'],
+ 'date' => $i['datetime'],
+ 'seen' => false,
+ 'message' => t("{0} wants to be your friend"),
+ );
+ $notifs[] = $n;
}
- if (count($dislikes)){
- foreach ($dislikes as $i) {
- echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} disliked %s's post"), $i['pname'] ) );
- };
- }
- if (count($friends)){
- foreach ($friends as $i) {
- echo xmlize($a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'],$i['author-name'],$i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} is now friends with %s"), $i['fname'] ) );
- };
+ }
+
+ if ($mail>0){
+ foreach ($mails as $i) {
+ $n = array(
+ 'href' => $a->get_baseurl().'/message/'.$i['id'],
+ 'name' => $i['from-name'],
+ 'url' => $i['from-url'],
+ 'photo' => $i['from-photo'],
+ 'date' => $i['created'],
+ 'seen' => false,
+ 'message' => t("{0} sent you a message"),
+ );
+ $notifs[] = $n;
}
- if (count($posts)){
- foreach ($posts as $i) {
- echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} posted") ) );
- };
+ }
+
+ if ($register>0){
+ foreach ($regs as $i) {
+ $n = array(
+ 'href' => $a->get_baseurl().'/admin/users/',
+ 'name' => $i['name'],
+ 'url' => $i['url'],
+ 'photo' => $i['micro'],
+ 'date' => $i['created'],
+ 'seen' => false,
+ 'message' => t("{0} requested registration"),
+ );
+ $notifs[] = $n;
}
- if (count($tags)){
- foreach ($tags as $i) {
- echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} tagged %s's post with #%s"), $i['pname'], $i['tname'] ) );
- };
+ }
+ // sort notifications by $[]['date']
+ $sort_function = function($a, $b) {
+ $adate = date($a['date']);
+ $bdate = date($b['date']);
+ if ($adate == $bdate) {
+ return 0;
}
+ return ($adate < $bdate) ? 1 : -1;
+ };
+ usort($notifs, $sort_function);
- if (count($cit)){
- foreach ($cit as $i) {
- echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',t("{0} mentioned you in a post") );
- };
+ if(count($notifs)) {
+ foreach($notifs as $n) {
+ echo xmlize($n);
}
}
+
echo " </notif>";
}
echo " <sysmsgs>";
$offset = 0;
$seen = false;
$seensql = "NOT";
- $order = "";
+ $order = "DESC";
$quit = false;
$a = get_app();
$quit = true;
else
$offset += 50;
+
foreach ($r AS $notification) {
if (is_null($notification["visible"]))
if (is_null($notification["deleted"]))
$notification["deleted"] = 0;
- $notification["msg"] = strip_tags(bbcode($notification["msg"]));
+ $notification["message"] = strip_tags(bbcode($notification["msg"]));
$notification["name"] = strip_tags(bbcode($notification["name"]));
// Replace the name with {0} but ensure to make that only once
// The {0} is used later and prints the name in bold.
- $pos = strpos($notification["msg"],$notification['name']);
+ $pos = strpos($notification["message"],$notification['name']);
if ($pos !== false)
- $notification["msg"] = substr_replace($notification["msg"],"{0}",$pos,strlen($notification["name"]));
+ $notification["message"] = substr_replace($notification["message"],"{0}",$pos,strlen($notification["name"]));
+ $notification['href'] = $a->get_baseurl() . '/notify/view/' . $notification['id'];
+
if ($notification["visible"] AND !$notification["spam"] AND
- !$notification["deleted"] AND !is_array($result[$notification["parent"]]))
+ !$notification["deleted"] AND !is_array($result[$notification["parent"]])) {
$result[$notification["parent"]] = $notification;
+ }
}
} while ((count($result) < 50) AND !$quit);
+
return($result);
}
projects / friendica.git / commitdiff