recipient ui, friend suggestions

diff --git a/mod/notifications.php b/mod/notifications.php
index a3339199efaaea8e4ac5a98b54c48e9854ed4ab1..90f62fa4767ab98f7f8d40cb52aa6b877285bbc1 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -13,11 +13,9 @@ function notifications_post(&$a) {
 
        if($request_id) {
 
-               $r = q("SELECT * FROM `intro` 
-                       WHERE `id` = %d 
-                       AND `uid` = %d LIMIT 1",
-                               intval($request_id),
-                               intval(local_user())
+               $r = q("SELECT * FROM `intro` WHERE `id` = %d  AND `uid` = %d LIMIT 1",
+                       intval($request_id),
+                       intval(local_user())
                );
        
                if(count($r)) {
@@ -28,14 +26,22 @@ function notifications_post(&$a) {
                        notice( t('Invalid request identifier.') . EOL);
                        return;
                }
+
+               // If it is a friend suggestion, the contact is not a new friend but an existing friend
+               // that should not be deleted.
+
+               $fid = $r[0]['fid'];
+
                if($_POST['submit'] == t('Discard')) {
                        $r = q("DELETE FROM `intro` WHERE `id` = %d LIMIT 1", 
                                intval($intro_id)
                        );      
-                       $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1", 
-                               intval($contact_id),
-                               intval(local_user())
-                       );
+                       if(! $fid) {
+                               $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1", 
+                                       intval($contact_id),
+                                       intval(local_user())
+                               );
+                       }
                        return;
                }
                if($_POST['submit'] == t('Ignore')) {
@@ -81,18 +87,41 @@ function notifications_content(&$a) {
                $a->set_pager_itemspage(20);
        }
 
-       $r = q("SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.* 
-               FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
+       $r = q("SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*, `fcontact`.`name` AS `fname`,`fcontact`.`url` AS `furl`,`fcontact`.`photo` AS `fphoto`,`fcontact`.`request` AS `frequest`
+               FROM `intro` LEFT JOIN `contact` ON `contact`.`id` = `intro`.`contact-id` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
                WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ",
                        intval($_SESSION['uid']));
 
        if(($r !== false) && (count($r))) {
 
-
+               $sugg = get_markup_template('suggestions.tpl');
                $tpl = get_markup_template("intros.tpl");
 
                foreach($r as $rr) {
+                       if($rr['fid']) {
 
+                               $return_addr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
+                               $o .= 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"),
+                                       '$fullname' => $rr['fname'],
+                                       '$url' => $rr['furl'],
+                                       '$knowyou' => $knowyou,
+                                       '$approve' => t('Approve'),
+                                       '$note' => $rr['note'],
+                                       '$request' => $rr['frequest'] . '?addr=' . $return_addr,
+                                       '$ignore' => t('Ignore'),
+                                       '$discard' => t('Discard')
+
+                               ));
+
+                               continue;
+
+                       }
                        $friend_selected = (($rr['network'] !== 'stat') ? ' checked="checked" ' : ' disabled ');
                        $fan_selected = (($rr['network'] === 'stat') ? ' checked="checked" disabled ' : '');
                        $dfrn_tpl = get_markup_template('netfriend.tpl');
@@ -138,6 +167,7 @@ function notifications_content(&$a) {
        else
                info( t('No notifications.') . EOL);
 
+/*
        if ($a->config['register_policy'] == REGISTER_APPROVE &&        
                $a->config['admin_email'] === $a->user['email']){
                $o .= '<h1>' . t('User registrations waiting for confirm') . '</h1>' . "\r\n";
@@ -159,6 +189,7 @@ function notifications_content(&$a) {
                        info( t('No registrations.') . EOL);
 
        }
+*/
 
        $o .= paginate($a);
        return $o;

diff --git a/view/intros.tpl b/view/intros.tpl
index 4534f2191692a718159c9ad8f28742bc697b15a5..d52c3a7aac906c9798c2dff86b650ad34e3b1b7a 100644 (file)
--- a/view/intros.tpl
+++ b/view/intros.tpl
@@ -3,7 +3,7 @@
 
 <p class="intro-desc">$str_notifytype $notify_type</p>
 <div class="intro-fullname" id="intro-fullname-$contact_id" >$fullname</div>
-<a class="intro-url-link" id="intro-url-link-$contact_id" href="$url" ><img id="photo-$contact_id" class="intro-photo" src="$photo" width="175" height=175" name="$fullname" alt="fullname" /></a>
+<a class="intro-url-link" id="intro-url-link-$contact_id" href="$url" ><img id="photo-$contact_id" class="intro-photo" src="$photo" width="175" height=175" title="$fullname" alt="$fullname" /></a>
 <div class="intro-knowyou">$knowyou</div>
 <div class="intro-note" id="intro-note-$contact_id">$note</div>
 <div class="intro-wrapper-end" id="intro-wrapper-end-$contact_id"></div>

diff --git a/view/suggestions.tpl b/view/suggestions.tpl
new file mode 100644 (file)
index 0000000..46c9277
--- /dev/null
+++ b/view/suggestions.tpl
@@ -0,0 +1,20 @@
+
+<div class="intro-wrapper" >
+
+<p class="intro-desc">$str_notifytype $notify_type</p>
+<div class="intro-madeby">$madeby</div>
+<div class="intro-fullname" >$fullname</div>
+<a class="intro-url-link" href="$url" ><img class="intro-photo" src="$photo" width="175" height=175" title="$fullname" alt="$fullname" /></a>
+<div class="intro-note" >$note</div>
+<div class="intro-wrapper-end"></div>
+<form class="intro-form" action="notifications/$intro_id" method="post">
+<input class="intro-submit-ignore" type="submit" name="submit" value="$ignore" />
+<input class="intro-submit-discard" type="submit" name="submit" value="$discard" />
+</form>
+<div class="intro-form-end"></div>
+
+<form class="intro-approve-form" action="$request" method="get">
+<input class="intro-submit-approve" type="submit" name="submit" value="$approve" />
+</form>
+</div>
+<div class="intro-end"></div>