she'll be right

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
index b4116bbe3d8000d198dc808ca01bce0ed39600ff..9765c14526d100ace3da9d380be125b17f7a69bd 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -13,8 +13,8 @@ function notifications_post(&$a) {
 
        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(local_user())
@@ -22,6 +22,7 @@ function notifications_post(&$a) {
        
                if(count($r)) {
                        $intro_id = $r[0]['id'];
+                       $contact_id = $r[0]['contact-id'];
                }
                else {
                        notice( t('Invalid request identifier.') . EOL);
@@ -31,8 +32,8 @@ 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),
+                       $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1", 
+                               intval($contact_id),
                                intval(local_user())
                        );
                        return;
@@ -83,14 +84,14 @@ function notifications_content(&$a) {
 
                foreach($r as $rr) {
 
-                       $friend_selected = (($rr['network'] === 'dfrn') ? ' checked="checked" ' : ' disabled ');
+                       $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'] === 'dfrn') {
+                       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(
@@ -103,7 +104,8 @@ function notifications_content(&$a) {
 
 
                        $o .= replace_macros($tpl,array(
-                               '$notify_type' => (($rr['network'] === 'dfrn') ? t('Friend/Connect Request') : t('New Follower')),
+                               '$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'],
@@ -113,6 +115,7 @@ function notifications_content(&$a) {
                                '$fullname' => $rr['name'],
                                '$url' => $rr['url'],
                                '$knowyou' => $knowyou,
+                               '$approve' => t('Approve'),
                                '$note' => $rr['note']
                        ));
                }