X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fgroup.php;h=854ac06a9ad53165f51bae8eb6a918b232811f53;hb=f033c9a4ae822bf2ad46f1885a80daf85eca2f62;hp=8798adf5ab3a2e20b0b6a7e1c50ad5dacf1a3207;hpb=2f5a34ad1791f01cacb3b86c11501f0e11c67df4;p=friendica.git

diff --git a/include/group.php b/include/group.php
index 8798adf5ab..854ac06a9a 100644
--- a/include/group.php
+++ b/include/group.php
@@ -6,8 +6,26 @@ function group_add($uid,$name) {
 	$ret = false;
 	if(x($uid) && x($name)) {
 		$r = group_byname($uid,$name); // check for dups
-		if($r !== false) 
+		if($r !== false) {
+
+			// This could be a problem. 
+			// Let's assume we've just created a group which we once deleted
+			// all the old members are gone, but the group remains so we don't break any security
+			// access lists. What we're doing here is reviving the dead group, but old content which
+			// was restricted to this group may now be seen by the new group members. 
+
+			$z = q("SELECT * FROM `group` WHERE `id` = %d LIMIT 1",
+				intval($r)
+			);
+			if(count($z) && $z[0]['deleted']) {
+				$r = q("UPDATE `group` SET `deleted` = 0 WHERE `uid` = %d AND `name` = '%s' LIMIT 1",
+					intval($uid),
+					dbesc($name)
+				);
+				notice( t('A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name.') . EOL); 
+			}
 			return true;
+		}
 		$r = q("INSERT INTO `group` ( `uid`, `name` )
 			VALUES( %d, '%s' ) ",
 			intval($uid),
@@ -79,8 +97,9 @@ function group_rmv_member($uid,$name,$member) {
 }
 
 
-function group_add_member($uid,$name,$member) {
-	$gid = group_byname($uid,$name);
+function group_add_member($uid,$name,$member,$gid = 0) {
+	if(! $gid)
+		$gid = group_byname($uid,$name);
 	if((! $gid) || (! $uid) || (! $member))
 		return false;
 
@@ -91,7 +110,7 @@ function group_add_member($uid,$name,$member) {
 	);
 	if(count($r))
 		return true;	// You might question this, but 
-				// we indicate success because the group was in fact created
+				// we indicate success because the group member was in fact created
 				// -- It was just created at another time
  	if(! count($r))
 		$r = q("INSERT INTO `group_member` (`uid`, `gid`, `contact-id`)
@@ -124,7 +143,7 @@ function group_public_members($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` = '%s' OR `contact`.`notify` = '' )",
+			AND  `contact`.`network` = '%s' AND `contact`.`notify` != '' ",
 			intval($gid),
 			intval(local_user()),
 			dbesc(NETWORK_OSTATUS)
@@ -136,6 +155,32 @@ function group_public_members($gid) {
 }
 
 
+function mini_group_select($uid,$gid = 0) {
+	
+	$grps = array();
+	$o = '';
+
+	$r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC",
+		intval($uid)
+	);
+	$grps[] = array('name' => '', 'id' => '0', 'selected' => '');
+	if(count($r)) {
+		foreach($r as $rr) {
+			$grps[] = array('name' => $rr['name'], 'id' => $rr['id'], 'selected' => (($gid == $rr['id']) ? 'true' : ''));
+		}
+
+	}
+	logger('groups: ' . print_r($grps,true));
+
+	$o = replace_macros(get_markup_template('group_selection.tpl'), array(
+		'$label' => t('Default privacy group for new contacts'),
+		'$groups' => $grps 
+	));
+	return $o;
+}
+
+
+
 
 function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = 0) {
 
@@ -144,49 +189,62 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
 	if(! local_user())
 		return '';
 
-	$createtext = t('Create a new group');
-	$linktext= t('Everybody');
-	$selected = (($group_id == 0) ? ' class="group-selected" ' : '');
-$o .= <<< EOT
-
-<div id="group-sidebar">
-<h3>Groups</h3>
+	$groups = array();
+	
+	$groups[] = array(
+		'text' 	=> t('Everybody'),
+		'id' => 0,
+		'selected' => (($group_id == 0) ? 'group-selected' : ''),
+		'href' 	=> $every,
+	);
 
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-	<li class="sidebar-group-li" ><a href="$every" class="sidebar-group-element" $selected >$linktext</a></li>
 
-EOT;
 
 	$r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC",
 		intval($_SESSION['uid'])
 	);
+	$member_of = array();
 	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') 
-				. "\" class=\"groupsideedit\" ><img src=\"images/spencil.gif\" alt=\"" . t('Edit') . "\"></a> " : "") 
-			. (($cid) ? '<input type="checkbox" class="' . (($selected) ? 'ticked' : 'unticked') . '" onclick="contactgroupChangeMember(' . $rr['id'] . ',' . $cid . ');return true;" '
-				. ((in_array($rr['id'],$member_of)) ? ' checked="checked" ' : '') . '/>' : '')
-			. "<a href=\"$each/{$rr['id']}\" class=\"sidebar-group-element\" $selected >{$rr['name']}</a></li>\r\n";
+			$selected = (($group_id == $rr['id']) ? ' group-selected' : '');
+			
+			if ($edit) {
+				$groupedit = array(
+					'href' => "group/".$rr['id'],
+					'title' => t('edit'),
+				);
+			} else {
+				$groupedit = null;
+			}
+			
+			$groups[] = array(
+				'id'		=> $rr['id'],
+				'cid'		=> $cid,
+				'text' 		=> $rr['name'],
+				'selected' 	=> $selected,
+				'href'		=> $each."/".$rr['id'],
+				'edit'		=> $groupedit,
+				'ismember'	=> in_array($rr['id'],$member_of),
+			);
 		}
 	}
-	$o .= "	</ul>\r\n	</div>";
-
-	$o .= <<< EOT
-
-  <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
-  </div>
-</div>
 	
-EOT;
-
+	
+	$tpl = get_markup_template("group_side.tpl");
+	$o = replace_macros($tpl, array(
+		'$title'		=> t('Groups'),
+		'$edittext'     => t('Edit group'),
+		'$createtext' 	=> t('Create a new group'),
+		'$ungrouped'    => (($every === 'contacts') ? t('Contacts not in any group') : ''),
+		'$groups'		=> $groups,
+		'$add'			=> t('add'),
+	));
+		
+	
 	return $o;
 }
 
@@ -228,4 +286,4 @@ function groups_containing($uid,$c) {
 	}
 
 	return $ret;
-}
\ No newline at end of file
+}