X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fgroup.php;h=5dca08c76bd7357d97a823c72edcc8c83156ec27;hb=229eb9c681d62edc5faa63bb1d66046d123c3f35;hp=bca369cd1aaaab9c4aa116256e4362009499f283;hpb=52a2c7eb46ea3b9509e48f29eca6f1c398a85538;p=friendica.git

diff --git a/include/group.php b/include/group.php
index bca369cd1a..5dca08c76b 100644
--- a/include/group.php
+++ b/include/group.php
@@ -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;
 }
@@ -109,9 +108,9 @@ function group_get_members($gid) {
 	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",
+			WHERE `gid` = %d AND `group_member`.`uid` = %d ORDER BY `contact`.`name` ASC ",
 			intval($gid),
-			intval($_SESSION['uid'])
+			intval(local_user())
 		);
 		if(count($r))
 			$ret = $r;
@@ -119,33 +118,55 @@ function group_get_members($gid) {
 	return $ret;
 }
 
+function group_public_members($gid) {
+	$ret = 0;
+	if(intval($gid)) {
+		$r = q("SELECT `contact`.`id` AS `contact-id` FROM `group_member` 
+			LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` 
+			WHERE `gid` = %d AND `group_member`.`uid` = %d 
+			AND `contact`.`network` != 'dfrn' AND `contact`.`network` != 'mail' ",
+			intval($gid),
+			intval(local_user())
+		);		
+		if(count($r))
+			$ret = count($r);
+	}
+	return $ret;
+}
+
+
 
+function group_side($every="contacts",$each="group",$edit = false) {
 
-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="$every">Everybody</a></li>
+	<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=\"$each/{$rr['id']}\">{$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> " : "") . "<a href=\"$each/{$rr['id']}\">{$rr['name']}</a></li>\r\n";
 	}
 	$o .= "	</ul>\r\n	</div>\r\n</div>";