From e22e823e93756fbfbb175f4f9f182aee64c1f5b1 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 2 Aug 2011 22:39:35 -0700
Subject: [PATCH] allow group selection from contact edit page

---
 include/group.php    | 28 +++++++++++++++++++++++--
 include/main.js      |  8 +++++++
 mod/contactgroup.php | 50 ++++++++++++++++++++++++++++++++++++++++++++
 mod/contacts.php     | 21 ++++++++++++-------
 4 files changed, 97 insertions(+), 10 deletions(-)
 create mode 100644 mod/contactgroup.php

diff --git a/include/group.php b/include/group.php
index e16c900d90..8ee7face6d 100644
--- a/include/group.php
+++ b/include/group.php
@@ -136,7 +136,7 @@ function group_public_members($gid) {
 
 
 
-function group_side($every="contacts",$each="group",$edit = false, $group_id = 0) {
+function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = 0) {
 
 	$o = '';
 
@@ -160,10 +160,19 @@ EOT;
 	$r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC",
 		intval($_SESSION['uid'])
 	);
+	if($cid) {
+		$member_of = groups_containing(local_user(),$cid);
+	} 
+
 	if(count($r)) {
 		foreach($r as $rr) {
 			$selected = (($group_id == $rr['id']) ? ' class="group-selected" ' : '');
-			$o .= '	<li class="sidebar-group-li">' . (($edit) ? "<a href=\"group/{$rr['id']}\" title=\"" . t('Edit') . "\" ><img src=\"images/spencil.gif\" alt=\"" . t('Edit') . "\"></a> " : "") . "<a href=\"$each/{$rr['id']}\" $selected >{$rr['name']}</a></li>\r\n";
+			$o .= '	<li class="sidebar-group-li">' 
+			. (($edit) ? "<a href=\"group/{$rr['id']}\" title=\"" . t('Edit') 
+				. "\" ><img src=\"images/spencil.gif\" alt=\"" . t('Edit') . "\"></a> " : "") 
+			. (($cid) ? '<input type="checkbox" onclick="contactgroupChangeMember(' . $rr['id'] . ',' . $cid . ');return true;" '
+				. ((in_array($rr['id'],$member_of)) ? ' checked="checked" ' : '') . '/>' : '')
+			. "<a href=\"$each/{$rr['id']}\" $selected >{$rr['name']}</a></li>\r\n";
 		}
 	}
 	$o .= "	</ul>\r\n	</div>";
@@ -204,3 +213,18 @@ function member_of($c) {
 
 }
 
+function groups_containing($uid,$c) {
+
+	$r = q("SELECT `gid` FROM `group_member` WHERE `uid` = %d AND `group_member`.`contact-id` = %d ",
+		intval($uid),
+		intval($c)
+	);
+
+	$ret = array();
+	if(count($r)) {
+		foreach($r as $rr)
+			$ret[] = $rr['gid'];
+	}
+
+	return $ret;
+}
\ No newline at end of file
diff --git a/include/main.js b/include/main.js
index d17d923e42..e5c78a0654 100644
--- a/include/main.js
+++ b/include/main.js
@@ -341,6 +341,14 @@
 		});
 	}
 
+	function contactgroupChangeMember(gid,cid) {
+		$('body').css('cursor', 'wait');
+		$.get('contactgroup/' + gid + '/' + cid, function(data) {
+				$('body').css('cursor', 'auto');				
+		});
+	}
+
+
 function checkboxhighlight(box) {
   if($(box).is(':checked')) {
 	$(box).addClass('checkeditem');
diff --git a/mod/contactgroup.php b/mod/contactgroup.php
new file mode 100644
index 0000000000..bf81afe079
--- /dev/null
+++ b/mod/contactgroup.php
@@ -0,0 +1,50 @@
+<?php
+
+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(count($r))
+			$change = intval($a->argv[2]);
+	}
+
+	if(($a->argc > 1) && (intval($a->argv[1]))) {
+
+		$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
+			intval($a->argv[1]),
+			intval(local_user())
+		);
+		if(! count($r)) {
+			killme();
+		}
+
+		$group = $r[0];
+		$members = group_get_members($group['id']);
+		$preselected = array();
+		if(count($members))	{
+			foreach($members as $member)
+				$preselected[] = $member['id'];
+		}
+
+		if($change) {
+			if(in_array($change,$preselected)) {
+				group_rmv_member(local_user(),$group['name'],$change);
+			}
+			else {
+				group_add_member(local_user(),$group['name'],$change);
+			}
+		}
+	}
+
+	killme();
+}
\ No newline at end of file
diff --git a/mod/contacts.php b/mod/contacts.php
index 2fc01a0d8b..4f5a49acd1 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -6,10 +6,22 @@ function contacts_init(&$a) {
 	if(! local_user())
 		return;
 
+	$contact_id = 0;
+	if(($a->argc == 2) && intval($a->argv[1])) {
+		$contact_id = intval($a->argv[1]);
+		$r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1",
+			intval(local_user()),
+			intval($contact_id)
+		);
+		if(! count($r)) {
+			$contact_id = 0;
+		}
+	}
+
 	require_once('include/group.php');
 	if(! x($a->page,'aside'))
 		$a->page['aside'] = '';
-	$a->page['aside'] .= group_side();
+	$a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
 
 	$inv = '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
 
@@ -264,13 +276,6 @@ function contacts_content(&$a) {
 		}
 
 		$grps = '';
-		$member_of = member_of($r[0]['id']);
-		if(is_array($member_of) && count($member_of)) {
-			$grps = t('Member of: ') . EOL . '<ul>';
-			foreach($member_of as $member)
-				$grps .= '<li><a href="group/' . $member['id'] . '" title="' . t('Edit') . '" ><img src="images/spencil.gif" alt="' . t('Edit') . '" /></a> <a href="network/' . $member['id'] . '">' . $member['name'] . '</a></li>';
-			$grps .= '</ul>';
-		}
 
 		$insecure = '<div id="profile-edit-insecure"><p><img src="images/unlock_icon.gif" alt="' . t('Privacy Unavailable') . '" />&nbsp;'
 			. t('Private communications are not available for this contact.') . '</p></div>';