]> git.mxchange.org Git - friendica.git/blobdiff - mod/ping.php
DE update to the strings
[friendica.git] / mod / ping.php
index 97a3070d8486fdfcb0e76946f428d68b25a4ae3e..57728d32949ef64aab036fbd6f8ffd10531366f3 100644 (file)
@@ -1,7 +1,9 @@
 <?php
 require_once("include/datetime.php");
 require_once('include/bbcode.php');
-
+require_once('include/forums.php');
+require_once('include/group.php');
+require_once("mod/proxy.php");
 
 function ping_init(&$a) {
 
@@ -21,9 +23,7 @@ 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();
@@ -35,6 +35,8 @@ function ping_init(&$a) {
 
                $home = 0;
                $network = 0;
+               $groups_unseen = array();
+               $forums_unseen = array();
 
                $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
                                `item`.`contact-id`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
@@ -42,8 +44,9 @@ function ping_init(&$a) {
                                FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
                                WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
                                 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `pitem`.`parent` != 0
+                               AND `item`.`contact-id` != %d
                                ORDER BY `item`.`created` DESC",
-                       intval(local_user())
+                       intval(local_user()), intval(local_user())
                );
 
                if(count($r)) {
@@ -86,6 +89,17 @@ function ping_init(&$a) {
                        }
                }
 
+               if($network) {
+                       if(intval(feature_enabled(local_user(),'groups'))) {
+                               // Find out how unseen network posts are spread across groups
+                               $groups_unseen = groups_count_unseen();
+                       }
+
+                       if(intval(feature_enabled(local_user(),'forumlist_widget'))) {
+                               $forums_unseen = forums_count_unseen();
+                       }
+               }
+
                $intros1 = q("SELECT  `intro`.`id`, `intro`.`datetime`,
                        `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
                        FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
@@ -162,13 +176,23 @@ function ping_init(&$a) {
                }
 
 
-
-               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'], false, PROXY_SIZE_MICRO);
+
+                       $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['_']));
@@ -176,13 +200,16 @@ function ping_init(&$a) {
                        $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'])
                        );
                }
 
@@ -192,6 +219,22 @@ function ping_init(&$a) {
                                <home>$home</home>\r\n";
                if ($register!=0) echo "<register>$register</register>";
 
+               if ( count($groups_unseen) ) {
+                       echo '<groups>';
+                       foreach ($groups_unseen as $it) {
+                               echo '<group id="' . $it['id'] . '">' . $it['count'] . "</group>";
+                       }
+                       echo "</groups>";
+               }
+
+               if ( count($forums_unseen) ) {
+                       echo '<forums>';
+                       foreach ($forums_unseen as $it) {
+                               echo '<forum id="' . $it['id'] . '">' . $it['count'] . "</forum>";
+                       }
+                       echo "</forums>";
+               }
+
                echo "<all-events>$all_events</all-events>
                        <all-events-today>$all_events_today</all-events-today>
                        <events>$events</events>
@@ -199,99 +242,79 @@ function ping_init(&$a) {
                        <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', "&rarr; ".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',"&rarr; ".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', "&rarr; ".t("{0} requested registration"));
-                               };
+               if(count($notifs) && (! $sysnotify)) {
+                       foreach($notifs as $zz) {
+                               if($zz['seen'] == 0)
+                                       $sysnotify ++;
                        }
+               }
 
-                       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'] ? '' : '&rarr; ') .strip_tags(bbcode($zz['msg'])));
-                               }
+               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($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 ($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($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'] ) );
-                               };
+               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($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 (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 (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>";
@@ -322,7 +345,7 @@ function ping_get_notifications($uid) {
        $offset = 0;
        $seen = false;
        $seensql = "NOT";
-       $order = "";
+       $order = "DESC";
        $quit = false;
 
        $a = get_app();
@@ -349,6 +372,7 @@ function ping_get_notifications($uid) {
                else
                        $offset += 50;
 
+
                foreach ($r AS $notification) {
                        if (is_null($notification["visible"]))
                                $notification["visible"] = true;
@@ -359,22 +383,26 @@ function ping_get_notifications($uid) {
                        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);
 }