]> git.mxchange.org Git - friendica.git/blobdiff - mod/notifications.php
projects / friendica.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
simplify by making Smarty include directives behave like Friendica native ones
[friendica.git] / mod / notifications.php
diff --git a/mod/notifications.php b/mod/notifications.php
old mode 100755 (executable)
new mode 100644 (file)
index 5831c1b..128317e
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -37,17 +37,21 @@ function notifications_post(&$a) {
                                intval($intro_id)
                        );      
                        if(! $fid) {
-                               $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1", 
+
+                               // The check for blocked and pending is in case the friendship was already approved
+                               // and we just want to get rid of the now pointless notification
+
+                               $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 AND `blocked` = 1 AND `pending` = 1 LIMIT 1", 
                                        intval($contact_id),
                                        intval(local_user())
                                );
                        }
-                       goaway($a->get_baseurl() . '/notifications/intros');
+                       goaway($a->get_baseurl(true) . '/notifications/intros');
                }
                if($_POST['submit'] == t('Ignore')) {
                        $r = q("UPDATE `intro` SET `ignore` = 1 WHERE `id` = %d LIMIT 1",
                                intval($intro_id));
-                       goaway($a->get_baseurl() . '/notifications/intros');
+                       goaway($a->get_baseurl(true) . '/notifications/intros');
                }
        }
 }
@@ -65,36 +69,39 @@ function notifications_content(&$a) {
 
        nav_set_selected('notifications');              
 
+       $json = (($a->argc > 1 && $a->argv[$a->argc - 1] === 'json') ? true : false);
+
+
        $o = '';
        $tabs = array(
                array(
                        'label' => t('System'),
-                       'url'=>$a->get_baseurl() . '/notifications/system',
+                       'url'=>$a->get_baseurl(true) . '/notifications/system',
                        'sel'=> (($a->argv[1] == 'system') ? 'active' : ''),
                ),
                array(
                        'label' => t('Network'),
-                       'url'=>$a->get_baseurl() . '/notifications/network',
+                       'url'=>$a->get_baseurl(true) . '/notifications/network',
                        'sel'=> (($a->argv[1] == 'network') ? 'active' : ''),
                ),
                array(
                        'label' => t('Personal'),
-                       'url'=>$a->get_baseurl() . '/notifications/personal',
+                       'url'=>$a->get_baseurl(true) . '/notifications/personal',
                        'sel'=> (($a->argv[1] == 'personal') ? 'active' : ''),
                ),
                array(
                        'label' => t('Home'),
-                       'url' => $a->get_baseurl() . '/notifications/home',
+                       'url' => $a->get_baseurl(true) . '/notifications/home',
                        'sel'=> (($a->argv[1] == 'home') ? 'active' : ''),
                ),
                array(
                        'label' => t('Introductions'),
-                       'url' => $a->get_baseurl() . '/notifications/intros',
+                       'url' => $a->get_baseurl(true) . '/notifications/intros',
                        'sel'=> (($a->argv[1] == 'intros') ? 'active' : ''),
                ),
                array(
                        'label' => t('Messages'),
-                       'url' => $a->get_baseurl() . '/message',
+                       'url' => $a->get_baseurl(true) . '/message',
                        'sel'=> '',
                ),
        );
@@ -137,24 +144,25 @@ function notifications_content(&$a) {
                                if($rr['fid']) {
 
                                        $return_addr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
-                                       $notif_content .= replace_macros($sugg,array(
+
+                                       $notif_content .= replace_macros($sugg, array(
                                                '$str_notifytype' => t('Notification type: '),
                                                '$notify_type' => t('Friend Suggestion'),
                                                '$intro_id' => $rr['intro_id'],
                                                '$madeby' => sprintf( t('suggested by %s'),$rr['name']),
                                                '$contact_id' => $rr['contact-id'],
-                                               '$photo' => ((x($rr,'fphoto')) ? $rr['fphoto'] : "images/default-profile.jpg"),
+                                               '$photo' => ((x($rr,'fphoto')) ? $rr['fphoto'] : "images/person-175.jpg"),
                                                '$fullname' => $rr['fname'],
-                                               '$url' => $rr['furl'],
+                                               '$url' => zrl($rr['furl']),
                                                '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
-                                               '$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')),
+                                               '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')),
 
                                                '$knowyou' => $knowyou,
                                                '$approve' => t('Approve'),
                                                '$note' => $rr['note'],
                                                '$request' => $rr['frequest'] . '?addr=' . $return_addr,
                                                '$ignore' => t('Ignore'),
-                                               '$discard' => t('Discard')
+                                               '$discard' => t('Discard'),
 
                                        ));
 
@@ -183,7 +191,7 @@ function notifications_content(&$a) {
                                        ));
                                }                       
 
-                               $notif_content .= replace_macros($tpl,array(
+                               $notif_content .= replace_macros($tpl, array(
                                        '$str_notifytype' => t('Notification type: '),
                                        '$notify_type' => (($rr['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')),
                                        '$dfrn_text' => $dfrn_text,     
@@ -191,26 +199,26 @@ function notifications_content(&$a) {
                                        '$uid' => $_SESSION['uid'],
                                        '$intro_id' => $rr['intro_id'],
                                        '$contact_id' => $rr['contact-id'],
-                                       '$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/default-profile.jpg"),
+                                       '$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/person-175.jpg"),
                                        '$fullname' => $rr['name'],
                                        '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
-                                       '$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')),
-                                       '$url' => $rr['url'],
+                                       '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')),
+                                       '$url' => zrl($rr['url']),
                                        '$knowyou' => $knowyou,
                                        '$approve' => t('Approve'),
                                        '$note' => $rr['note'],
                                        '$ignore' => t('Ignore'),
-                                       '$discard' => t('Discard')
+                                       '$discard' => t('Discard'),
 
                                ));
                        }
                }
                else
                        info( t('No introductions.') . EOL);
-               
-               $o .= replace_macros($notif_tpl,array(
+
+               $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('Notifications'),
-                       '$tabs' => $tabs,
+                       '$tabs_data' => $tabs,
                        '$notif_content' => $notif_content,
                ));
                
@@ -225,7 +233,7 @@ function notifications_content(&$a) {
                                `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, 
                                `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` 
                                FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
-                               WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
+                               WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND `pitem`.`parent` != 0
                                 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC" ,
                        intval(local_user())
                );
@@ -238,13 +246,13 @@ function notifications_content(&$a) {
                
                $notif_content = '';
                
-               if (count($r) > 0) {
+               if ($r) {
                        
                        foreach ($r as $it) {
                                switch($it['verb']){
                                        case ACTIVITY_LIKE:
                                                $notif_content .= replace_macros($tpl_item_likes,array(
-                                                       '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+                                                       '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_image' => $it['author-avatar'],
                                                        '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
                                                        '$item_when' => relative_date($it['created'])
@@ -253,7 +261,7 @@ function notifications_content(&$a) {
                                                
                                        case ACTIVITY_DISLIKE:
                                                $notif_content .= replace_macros($tpl_item_dislikes,array(
-                                                       '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+                                                       '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_image' => $it['author-avatar'],
                                                        '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']),
                                                        '$item_when' => relative_date($it['created'])
@@ -267,7 +275,7 @@ function notifications_content(&$a) {
                                                $it['fname'] = $obj->title;
                                                
                                                $notif_content .= replace_macros($tpl_item_friends,array(
-                                                       '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+                                                       '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_image' => $it['author-avatar'],
                                                        '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']),
                                                        '$item_when' => relative_date($it['created'])
@@ -281,7 +289,7 @@ function notifications_content(&$a) {
                                                $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments);
 
                                                $notif_content .= replace_macros($tpl,array(
-                                                       '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+                                                       '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_image' => $it['author-avatar'],
                                                        '$item_text' => $item_text,
                                                        '$item_when' => relative_date($it['created'])
@@ -294,9 +302,9 @@ function notifications_content(&$a) {
                        $notif_content = t('No more network notifications.');
                }
                
-               $o .= replace_macros($notif_tpl,array(
-                       '$notif_header' => t('Notifications'),
-                       '$tabs' => $tabs,
+               $o .= replace_macros($notif_tpl, array(
+                       '$notif_header' => t('Network Notifications'),
+                       '$tabs_data' => $tabs,
                        '$notif_content' => $notif_content,
                ));
                
@@ -314,7 +322,7 @@ function notifications_content(&$a) {
                if (count($r) > 0) {
                        foreach ($r as $it) {
                                $notif_content .= replace_macros($not_tpl,array(
-                                       '$item_link' => $a->get_baseurl().'/notify/view/'. $it['id'],
+                                       '$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'],
                                        '$item_image' => $it['photo'],
                                        '$item_text' => strip_tags(bbcode($it['msg'])),
                                        '$item_when' => relative_date($it['date'])
@@ -324,9 +332,9 @@ function notifications_content(&$a) {
                        $notif_content .= t('No more system notifications.');
                }
                
-               $o .= replace_macros($notif_tpl,array(
-                       '$notif_header' => t('System'),
-                       '$tabs' => $tabs,
+               $o .= replace_macros($notif_tpl, array(
+                       '$notif_header' => t('System Notifications'),
+                       '$tabs_data' => $tabs,
                        '$notif_content' => $notif_content,
                ));
 
@@ -334,7 +342,7 @@ function notifications_content(&$a) {
                
                $notif_tpl = get_markup_template('notifications.tpl');
                
-               $myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
+               $myurl = $a->get_baseurl(true) . '/profile/'. $a->user['nickname'];
                $myurl = substr($myurl,strpos($myurl,'://')+3);
                $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
                $diasp_url = str_replace('/profile/','/u/',$myurl);
@@ -369,7 +377,7 @@ function notifications_content(&$a) {
                                switch($it['verb']){
                                        case ACTIVITY_LIKE:
                                                $notif_content .= replace_macros($tpl_item_likes,array(
-                                                       '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+                                                       '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_image' => $it['author-avatar'],
                                                        '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
                                                        '$item_when' => relative_date($it['created'])
@@ -378,7 +386,7 @@ function notifications_content(&$a) {
                                                
                                        case ACTIVITY_DISLIKE:
                                                $notif_content .= replace_macros($tpl_item_dislikes,array(
-                                                       '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+                                                       '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_image' => $it['author-avatar'],
                                                        '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']),
                                                        '$item_when' => relative_date($it['created'])
@@ -392,7 +400,7 @@ function notifications_content(&$a) {
                                                $it['fname'] = $obj->title;
                                                
                                                $notif_content .= replace_macros($tpl_item_friends,array(
-                                                       '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+                                                       '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_image' => $it['author-avatar'],
                                                        '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']),
                                                        '$item_when' => relative_date($it['created'])
@@ -406,7 +414,7 @@ function notifications_content(&$a) {
                                                $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments);
 
                                                $notif_content .= replace_macros($tpl,array(
-                                                       '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+                                                       '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_image' => $it['author-avatar'],
                                                        '$item_text' => $item_text,
                                                        '$item_when' => relative_date($it['created'])
@@ -419,9 +427,9 @@ function notifications_content(&$a) {
                        $notif_content = t('No more personal notifications.');
                }
                
-               $o .= replace_macros($notif_tpl,array(
-                       '$notif_header' => t('Notifications'),
-                       '$tabs' => $tabs,
+               $o .= replace_macros($notif_tpl, array(
+                       '$notif_header' => t('Personal Notifications'),
+                       '$tabs_data' => $tabs,
                        '$notif_content' => $notif_content,
                ));
                
@@ -456,7 +464,7 @@ function notifications_content(&$a) {
                                switch($it['verb']){
                                        case ACTIVITY_LIKE:
                                                $notif_content .= replace_macros($tpl_item_likes,array(
-                                                       '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+                                                       '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_image' => $it['author-avatar'],
                                                        '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
                                                        '$item_when' => relative_date($it['created'])
@@ -465,7 +473,7 @@ function notifications_content(&$a) {
                                                break;
                                        case ACTIVITY_DISLIKE:
                                                $notif_content .= replace_macros($tpl_item_dislikes,array(
-                                                       '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+                                                       '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_image' => $it['author-avatar'],
                                                        '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']),
                                                        '$item_when' => relative_date($it['created'])
@@ -479,7 +487,7 @@ function notifications_content(&$a) {
                                                $it['fname'] = $obj->title;
                                                
                                                $notif_content .= replace_macros($tpl_item_friends,array(
-                                                       '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+                                                       '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_image' => $it['author-avatar'],
                                                        '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']),
                                                        '$item_when' => relative_date($it['created'])
@@ -488,7 +496,7 @@ function notifications_content(&$a) {
                                                break;
                                        default:
                                                $notif_content .= replace_macros($tpl_item_comments,array(
-                                                       '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+                                                       '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_image' => $it['author-avatar'],
                                                        '$item_text' => sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']),
                                                        '$item_when' => relative_date($it['created'])
@@ -500,9 +508,9 @@ function notifications_content(&$a) {
                        $notif_content = t('No more home notifications.');
                }
                
-               $o .= replace_macros($notif_tpl,array(
-                       '$notif_header' => t('Notifications'),
-                       '$tabs' => $tabs,
+               $o .= replace_macros($notif_tpl, array(
+                       '$notif_header' => t('Home Notifications'),
+                       '$tabs_data' => $tabs,
                        '$notif_content' => $notif_content,
                ));
        }
Unnamed repository; edit this file 'description' to name the repository.