From d43591fb0f5c552b1c725dc2cbaeaea8fe441319 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 22 Jan 2013 20:13:20 -0800
Subject: fixed contactgroup editor

---
 mod/connections.php  |  2 +-
 mod/contactgroup.php | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'mod')

diff --git a/mod/connections.php b/mod/connections.php
index a12f51e68..0a2edb4cd 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -34,7 +34,7 @@ function connections_aside(&$a) {
 		$a->set_widget('follow', follow_widget());
 	}
 
-	$a->set_widget('collections', group_side('connnections','group',false,0,((array_key_exists('abook',$a->data)) ? $a->data['abook']['abook_id'] : '')));
+	$a->set_widget('collections', group_side('connnections','group',false,0,((array_key_exists('abook',$a->data)) ? $a->data['abook']['abook_xchan'] : '')));
 	$a->set_widget('findpeople',findpeople_widget());
 
 }
diff --git a/mod/contactgroup.php b/mod/contactgroup.php
index bf81afe07..4b46605a6 100644
--- a/mod/contactgroup.php
+++ b/mod/contactgroup.php
@@ -4,27 +4,27 @@ require_once('include/group.php');
 
 function contactgroup_content(&$a) {
 
-
 	if(! local_user()) {
 		killme();
 	}
 
-	if(($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
-		$r = q("SELECT `id` FROM `contact` WHERE `id` = %d AND `uid` = %d and `self` = 0 and `blocked` = 0 AND `pending` = 0 LIMIT 1",
-			intval($a->argv[2]),
-			intval(local_user())
+	if((argc() > 2) && (intval(argv(1))) && (argv(2))) {
+		$r = q("SELECT abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d and not ( abook_flags & %d ) limit 1",
+			dbesc(argv(2)),
+			intval(local_user()),
+			intval(ABOOK_FLAG_SELF)
 		);
-		if(count($r))
-			$change = intval($a->argv[2]);
+		if($r)
+			$change = $r[0]['abook_xchan'];
 	}
 
-	if(($a->argc > 1) && (intval($a->argv[1]))) {
+	if((argc() > 1) && (intval(argv(1)))) {
 
 		$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
-			intval($a->argv[1]),
+			intval(argv(1)),
 			intval(local_user())
 		);
-		if(! count($r)) {
+		if(! $r) {
 			killme();
 		}
 
@@ -33,7 +33,7 @@ function contactgroup_content(&$a) {
 		$preselected = array();
 		if(count($members))	{
 			foreach($members as $member)
-				$preselected[] = $member['id'];
+				$preselected[] = $member['xchan_hash'];
 		}
 
 		if($change) {
-- 
cgit v1.2.3