X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fgroup.php;h=854ac06a9ad53165f51bae8eb6a918b232811f53;hb=428fce633feea10d0ba1b04be34a82fbc4448904;hp=cae76eb6d2c6fdfbcb6f556f49dc4c3c11a6b5ba;hpb=a86fd26bd86945fe75b7220e149b8986f88feb01;p=friendica.git

diff --git a/include/group.php b/include/group.php
index cae76eb6d2..854ac06a9a 100644
--- a/include/group.php
+++ b/include/group.php
@@ -97,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;
 
@@ -109,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`)
@@ -154,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) {
 
@@ -166,6 +193,7 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
 	
 	$groups[] = array(
 		'text' 	=> t('Everybody'),
+		'id' => 0,
 		'selected' => (($group_id == 0) ? 'group-selected' : ''),
 		'href' 	=> $every,
 	);
@@ -209,7 +237,9 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
 	$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'),
 	));