Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
index 6422b3b008c1339449e3ab6fdca224ca32ff35bb..1c680794e49debdeb1bee99c138ffceae63ac209 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -8,20 +8,21 @@ function notifications_post(&$a) {
        
        $request_id = (($a->argc > 1) ? $a->argv[1] : 0);
        
-       if($request_id == "all")
+       if($request_id === "all")
                return;
 
        if($request_id) {
 
-               $r = q("SELECT `id` FROM `intro` 
-                       WHERE `request-id` = %d 
+               $r = q("SELECT * FROM `intro` 
+                       WHERE `id` = %d 
                        AND `uid` = %d LIMIT 1",
                                intval($request_id),
-                               intval(get_uid())
+                               intval(local_user())
                );
        
                if(count($r)) {
                        $intro_id = $r[0]['id'];
+                       $contact_id = $r[0]['contact-id'];
                }
                else {
                        notice( t('Invalid request identifier.') . EOL);
@@ -31,9 +32,9 @@ function notifications_post(&$a) {
                        $r = q("DELETE FROM `intro` WHERE `id` = %d LIMIT 1", 
                                intval($intro_id)
                        );      
-                       $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", 
-                               intval($request_id),
-                               intval(get_uid())
+                       $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1", 
+                               intval($contact_id),
+                               intval(local_user())
                        );
                        return;
                }
@@ -57,6 +58,7 @@ function notifications_content(&$a) {
        }
 
        $o = '';
+       $o .= '<script> $(document).ready(function() { $(\'#nav-notify-link\').addClass(\'nav-selected\'); });</script>';
 
        if(($a->argc > 1) && ($a->argv[1] == 'all'))
                $sql_extra = '';
@@ -64,13 +66,13 @@ function notifications_content(&$a) {
                $sql_extra = " AND `ignore` = 0 ";
 
 
-       $tpl = file_get_contents('view/intros-top.tpl');
+       $tpl = load_view_file('view/intros-top.tpl');
        $o .= replace_macros($tpl,array(
                '$hide_url' => ((strlen($sql_extra)) ? 'notifications/all' : 'notifications' ),
                '$hide_text' => ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests'))
        )); 
 
-       $r = q("SELECT `intro`.`id` AS `intro-id`, `intro`.*, `contact`.* 
+       $r = q("SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.* 
                FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
                WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ",
                        intval($_SESSION['uid']));
@@ -78,20 +80,46 @@ function notifications_content(&$a) {
        if(($r !== false) && (count($r))) {
 
 
-               $tpl = file_get_contents("view/intros.tpl");
+               $tpl = load_view_file("view/intros.tpl");
 
                foreach($r as $rr) {
 
+                       $friend_selected = (($rr['network'] !== 'stat') ? ' checked="checked" ' : ' disabled ');
+                       $fan_selected = (($rr['network'] === 'stat') ? ' checked="checked" disabled ' : '');
+                       $dfrn_tpl = load_view_file('view/netfriend.tpl');
+
+                       $knowyou   = '';
+                       $dfrn_text = '';
+                                               
+                       if($rr['network'] !== 'stat') {
+                               $knowyou = t('Claims to be known to you: ') . (($rr['knowyou']) ? t('yes') : t('no'));
+
+                               $dfrn_text = replace_macros($dfrn_tpl,array(
+                                       '$intro_id' => $rr['intro_id'],
+                                       '$friend_selected' => $friend_selected,
+                                       '$fan_selected' => $fan_selected,
+                               ));
+                       }                       
+
+
+
                        $o .= replace_macros($tpl,array(
-                               '$intro_id' => $rr['intro-id'],
-                               '$dfrn-id' => $rr['issued-id'],
+                               '$str_notifytype' => t('Notification type: '),
+                               '$notify_type' => (($rr['network'] !== 'stat') ? t('Friend/Connect Request') : t('New Follower')),
+                               '$dfrn_text' => $dfrn_text,     
+                               '$dfrn_id' => $rr['issued-id'],
                                '$uid' => $_SESSION['uid'],
-                               '$contact-id' => $rr['contact-id'],
+                               '$intro_id' => $rr['intro_id'],
+                               '$contact_id' => $rr['contact-id'],
                                '$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/default-profile.jpg"),
                                '$fullname' => $rr['name'],
-                               '$knowyou' => (($rr['knowyou']) ? t('yes') : t('no')),
                                '$url' => $rr['url'],
-                               '$note' => $rr['note']
+                               '$knowyou' => $knowyou,
+                               '$approve' => t('Approve'),
+                               '$note' => $rr['note'],
+                               '$ignore' => t('Ignore'),
+                               '$discard' => t('Discard')
+
                        ));
                }
        }