X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fgroup.php;h=799065e27dd34e5e780fa47eff07c4ae46f44169;hb=eb5e6aae7273fef06a06f983fe78aaad737aa729;hp=f2e3d18203b570266cc70edaaba32f7350d65942;hpb=d20e1a6f938d088708166e039ae0088a8ddf11e4;p=friendica.git

diff --git a/include/group.php b/include/group.php
index f2e3d18203..799065e27d 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;
 }
@@ -121,31 +120,35 @@ function group_get_members($gid) {
 
 
 
-function group_side() {
+function group_side($every="contacts",$each="group") {
 
 	if(! local_user())
 		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>
+	<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']}</a></li>\r\n";
+			$o .= "	<li class=\"sidebar-group-li\"><a href=\"$each/{$rr['id']}\">{$rr['name']}</a></li>\r\n";
 	}
 	$o .= "	</ul>\r\n	</div>\r\n</div>";