cleanup

5 files changed, 70 insertions, 41 deletions

diff --git a/include/main.js b/include/main.js
index 8779f8413..1710115af 100644
--- a/include/main.js
+++ b/include/main.js
@@ -277,4 +277,12 @@
         }  
           
         return a.join('');  
-    }  
\ No newline at end of file
+    }  
+
+	function groupChangeMember(gid,cid) {
+		$.get('group/' + gid + '/' + cid, function(data) {
+				$('#group-update-wrapper').html(data);
+				$('#group-update2-wrapper').html(data);
+				
+		});
+	}
diff --git a/mod/group.php b/mod/group.php
index 8733614dd..75fd0f995 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -55,28 +55,7 @@ function group_post(&$a) {
 			if($r)
 				notice( t('Group name changed.') . EOL );
 		}
-		$members = $_POST['group_members_select'];
-		if(is_array($members))
-			array_walk($members,'validate_members');
-		$r = q("DELETE FROM `group_member` WHERE `gid` = %d AND `uid` = %d",
-			intval($a->argv[1]),
-			intval(local_user())
-		);
-		$result = true;
-		if(is_array($members) && count($members)) {
-			foreach($members as $member) {
-				$r = q("INSERT INTO `group_member` ( `uid`, `gid`, `contact-id`)
-					VALUES ( %d, %d, %d )",
-					intval(local_user()),
-					intval($group['id']),
-					intval($member)
-				);
-				if(! $r)
-					$result = false;
-			}
-		}
-		if($result)
-			notice( t('Membership list updated.') . EOL);
+
 		$a->page['aside'] = group_side();
 	}
 	return;	
@@ -116,8 +95,17 @@ function group_content(&$a) {
 		return; // NOTREACHED
 	}
 
+	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]))) {
 
-	if(($a->argc == 2) && (intval($a->argv[1]))) {
 		require_once('include/acl_selectors.php');
 		$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($a->argv[1]),
@@ -135,6 +123,23 @@ function group_content(&$a) {
 				$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);
+			}
+
+			$members = group_get_members($group['id']);
+			$preselected = array();
+			if(count($members))	{
+				foreach($members as $member)
+					$preselected[] = $member['id'];
+			}
+		}
+
+
 		$drop_tpl = load_view_file('view/group_drop.tpl');
 		$drop_txt = replace_macros($drop_tpl, array(
 			'$id' => $group['id'],
@@ -148,20 +153,27 @@ function group_content(&$a) {
 			'$gid' => $group['id'],
 			'$name' => $group['name'],
 			'$drop' => $drop_txt,
-			'$selector' => contact_select('group_members_select','group_members_select',$preselected,25,false,$celeb),
+			'$desc' => t('Click on a contact to add or remove.'),
 			'$title' => t('Group Editor'),
 			'$gname' => t('Group Name: '),
-			'$members' => t('Members:'),
 			'$submit' => t('Submit')
 		));
 
 	}
 
+	$o .= '<div id="group-update-wrapper">';
+	if($change) 
+		$o = '';
+
 	$o .= '<div id="group-members">';
-	$o .= '<h3>' . t('In Group') . '</h3>';
+	$o .= '<h3>' . t('Members') . '</h3>';
 	foreach($members as $member) {
-		$member['click'] = 'groupMember(' . $member['id'] . '); return true;';
-		$o .= micropro($member,true,'mpgroup');
+		if($member['url']) {
+			$member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . '); return true;';
+			$o .= micropro($member,true,'mpgroup');
+		}
+		else
+			group_rmv_member(local_user(),$group['name'],$member['id']);
 	}
 
 	$o .= '</div><div id="group-members-end"></div>';
@@ -175,13 +187,21 @@ function group_content(&$a) {
 
 		if(count($r)) {
 			foreach($r as $member) {
-				$member['click'] = 'groupMember(' . $member['id'] . '); return true;';
-				$o .= micropro($member,true,'mpall');
+				if(! in_array($member['id'],$preselected)) {
+					$member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . '); return true;';
+					$o .= micropro($member,true,'mpall');
+				}
 			}
 		}
 
 		$o .= '</div><div id="group-all-contacts-end"></div>';
 
+	if($change) {
+		echo $o;
+		killme();
+	}
+	$o .= '</div>';
 	return $o;
 
-}
\ No newline at end of file
+}
+
diff --git a/view/group_edit.tpl b/view/group_edit.tpl
index a955d50f9..51782ab95 100644
--- a/view/group_edit.tpl
+++ b/view/group_edit.tpl
@@ -8,17 +8,11 @@
 <input type="text" id="group-edit-name" name="groupname" value="$name" />
 </div>
 <div id="group-edit-name-end"></div>
-<div id="group-edit-select-wrapper" >
-<label id="group_members_select_label"  for="group_members_select" >$members</label>
-$selector
-
-</div>
 $drop
-<div id="group_members_select_end"></div>
 <div id="group-edit-submit-wrapper" >
 <input type="submit" name="submit" value="$submit" >
 </div>
-
+<div id="group-edit-desc">$desc</div>
 <div id="group-edit-select-end" ></div>
 </form>
 </div>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 8bddbdfba..4ef0a05e1 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2230,7 +2230,7 @@ a.mail-list-link {
 #group-members {
 	margin-top: 20px;
 	padding: 10px;
-	height: 450px;
+	height: 250px;
 	overflow: auto;
 	border: 1px solid #ddd;
 }
@@ -2254,3 +2254,7 @@ a.mail-list-link {
 #group-all-contacts-end {
 	clear: both;
 }
+
+#group-edit-desc {
+	margin-top: 15px;
+}
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 76c2df46b..8c1a79ec2 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -2254,7 +2254,7 @@ a.mail-list-link {
 #group-members {
 	margin-top: 20px;
 	padding: 10px;
-	height: 450px;
+	height: 250px;
 	overflow: auto;
 	border: 1px solid #ddd;
 }
@@ -2279,3 +2279,6 @@ a.mail-list-link {
 	clear: both;
 }
 
+#group-edit-desc {
+    margin-top: 15px;
+}