group select on network page

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index 999617aa19d155328ca638096cc51e7409fad362..dcbadd2bac5def3ddc6f80616ff10da2c5092333 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -88,11 +88,11 @@ function contacts_content(&$a) {
                }
 
 
-               $photo = str_replace('-4.jpg', '' , $r[0]['photo']);
-               $photos = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d",
-                               dbesc($photo),
-                               intval($_SESSION['uid'])
-               );
+//             $photo = str_replace('-4.jpg', '' , $r[0]['photo']);
+//             $photos = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d",
+//                             dbesc($photo),
+//                             intval($_SESSION['uid'])
+//             );
        
                if($cmd == 'block') {
                        $blocked = (($orig_record[0]['blocked']) ? 0 : 1);
@@ -113,13 +113,15 @@ function contacts_content(&$a) {
                        $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                intval($contact_id),
                                intval($_SESSION['uid']));
-                       if(count($photos)) {
-                               foreach($photos as $p) {
-                                       q("DELETE FROM `photos` WHERE `id` = %d LIMIT 1",
-                                               $p['id']);
-                               }
-                       }
-                       if($intval($contact_id))
+
+//                     if(count($photos)) {
+//                             foreach($photos as $p) {
+//                                     q("DELETE FROM `photos` WHERE `id` = %d LIMIT 1",
+//                                             $p['id']);
+//                             }
+//                     }
+
+                       if(intval($contact_id))
                                q("DELETE FROM `item` WHERE `contact-id` = %d LIMIT 1",
                                        intval($contact_id)
                                );
@@ -198,21 +200,21 @@ function contacts_content(&$a) {
 
        switch($sort_type) {
                case DIRECTION_BOTH :
-                       $sql_extra = " AND `dfrn-id` != '' AND `issued-id` != '' ";
+                       $sql_extra2 = " AND `dfrn-id` != '' AND `issued-id` != '' ";
                        break;
                case DIRECTION_IN :
-                       $sql_extra = " AND `dfrn-id` = '' AND `issued-id` != '' ";
+                       $sql_extra2 = " AND `dfrn-id` = '' AND `issued-id` != '' ";
                        break;
                case DIRECTION_OUT :
-                       $sql_extra = " AND `dfrn-id` != '' AND `issued-id` = '' ";
+                       $sql_extra2 = " AND `dfrn-id` != '' AND `issued-id` = '' ";
                        break;
                case DIRECTION_ANY :
                default:
-                       $sql_extra = '';
+                       $sql_extra2 = '';
                        break;
        }
 
-       $r = q("SELECT * FROM `contact` WHERE `uid` = %d $sql_extra",
+       $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ",
                intval($_SESSION['uid']));
 
        if(count($r)) {