X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fgroup.php;h=793e854be046bc7f43db7572b249621e2dc19e8d;hb=4a14e51e25c58d5a81b68798f2340c6196dec8ea;hp=598d09c2ea1ed086c283c650facff8e77d4018da;hpb=7a21a000a2b02e7dd443fd0f3ee09172de825b08;p=friendica.git

diff --git a/include/group.php b/include/group.php
index 598d09c2ea..793e854be0 100644
--- a/include/group.php
+++ b/include/group.php
@@ -8,7 +8,7 @@ function group_add($uid,$name) {
 		$r = group_byname($uid,$name); // check for dups
 		if($r !== false) 
 			return true;
-		$r = q("INSERT INTO `group` ( `uid`', `name` )
+		$r = q("INSERT INTO `group` ( `uid`, `name` )
 			VALUES( %d, '%s' ) ",
 			intval($uid),
 			dbesc($name)
@@ -38,7 +38,7 @@ function group_rmv($uid,$name) {
 		);
 
 		// remove group
-		$r = q("DELETE FROM `group` WHERE `uid` = %d AND `id` = %d LIMIT 1",
+		$r = q("UPDATE `group` SET `deleted` = 1 WHERE `uid` = %d AND `name` = '%s' LIMIT 1",
 			intval($uid),
 			dbesc($name)
 		);
@@ -46,7 +46,6 @@ function group_rmv($uid,$name) {
 		$ret = $r;
 
 	}
-	// TODO!! remove this group from all content ACL's !!
 
 	return $ret;
 }
@@ -104,34 +103,69 @@ function group_add_member($uid,$name,$member) {
 	return $r;
 }
 
+function group_get_members($gid) {
+	$ret = array();
+	if(intval($gid)) {
+		$r = q("SELECT `group_member`.`contact-id`, `contact`.* FROM `group_member` 
+			LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` 
+			WHERE `gid` = %d AND `group_member`.`uid` = %d",
+			intval($gid),
+			intval($_SESSION['uid'])
+		);
+		if(count($r))
+			$ret = $r;
+	}
+	return $ret;
+}
+
 
 
-function group_side() {
+function group_side($every="contacts",$each="group") {
+
+	$o = '';
 
 	if(! local_user())
-		return;
+		return '';
+
+	$createtext = t('Create a new group');
+	$linktext= t('Everybody');
+
 $o .= <<< EOT
 
 <div id="group-sidebar">
 <h3>Groups</h3>
 
 <div id="sidebar-new-group">
-<a href="group/new">Create a new group</a>
+<a href="group/new">$createtext</a>
 </div>
 
 <div id="sidebar-group-list">
-<ul id="sidebar-group-ul">
-<li class="sidebar-group-li"><a href="contacts">Everybody</a></li>
+	<ul id="sidebar-group-ul">
+	<li class="sidebar-group-li" ><a href="$every" >$linktext</a></li>
+
 EOT;
 
-	$r = q("SELECT * FROM `group` WHERE `uid` = %d",
+	$r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d",
 		intval($_SESSION['uid'])
 	);
 	if(count($r)) {
 		foreach($r as $rr)
-			$o .= "<li class=\"sidebar-group-li\"><a href=\"group/{$rr['id']}\">{$rr['name']}</li>";
+			$o .= "	<li class=\"sidebar-group-li\"><a href=\"$each/{$rr['id']}\">{$rr['name']}</a></li>\r\n";
 	}
-	$o .= '</ul></div></div>';	
+	$o .= "	</ul>\r\n	</div>\r\n</div>";	
 
 	return $o;
-}
\ No newline at end of file
+}
+
+function expand_groups($a) {
+	if(! (is_array($a) && count($a)))
+		return array();
+	$groups = implode(',', $a);
+	$groups = dbesc($groups);
+	$r = q("SELECT `contact-id` FROM `group_member` WHERE `gid` IN ( $groups )");
+	$ret = array();
+	if(count($r))
+		foreach($r as $rr)
+			$ret[] = $rr['contact-id'];
+	return $ret;
+}