X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fgroup.php;h=981796f67efe6a0674dbd5fd21d3b61d45b53ea7;hb=2aa23843e401e7f448c3d12f844934da6c27f8ef;hp=3da633edfe4d87f3552e04fa215fa8ed80e499c4;hpb=4cff911939b263993eb41682ca558c975e2db01f;p=friendica.git

diff --git a/mod/group.php b/mod/group.php
index 3da633edfe..981796f67e 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -7,7 +7,7 @@ function validate_members(&$item) {
 function group_init(&$a) {
 	if(local_user()) {
 		require_once('include/group.php');
-		$a->page['aside'] = group_side();
+		$a->page['aside'] = group_side('contacts','group',false,(($a->argc > 1) ? intval($a->argv[1]) : 0));
 	}
 }
 
@@ -24,7 +24,7 @@ function group_post(&$a) {
 		$name = notags(trim($_POST['groupname']));
 		$r = group_add(local_user(),$name);
 		if($r) {
-			notice( t('Group created.') . EOL );
+			info( t('Group created.') . EOL );
 			$r = group_byname(local_user(),$name);
 			if($r)
 				goaway($a->get_baseurl() . '/group/' . $r);
@@ -53,7 +53,7 @@ function group_post(&$a) {
 				intval($group['id'])
 			);
 			if($r)
-				notice( t('Group name changed.') . EOL );
+				info( t('Group name changed.') . EOL );
 		}
 
 		$a->page['aside'] = group_side();
@@ -68,6 +68,14 @@ function group_content(&$a) {
 		return;
 	}
 
+	// Switch to text mod interface if we have more than 'n' contacts or group members
+
+	$switchtotext = get_pconfig(local_user(),'system','groupedit_image_limit');
+	if($switchtotext === false)
+		$switchtotext = get_config('system','groupedit_image_limit');
+	if($switchtotext === false)
+		$switchtotext = 400;
+
 	if(($a->argc == 2) && ($a->argv[1] === 'new')) {
 		$tpl = get_markup_template('group_new.tpl');
 		$o .= replace_macros($tpl,array(
@@ -87,7 +95,7 @@ function group_content(&$a) {
 			if(count($r)) 
 				$result = group_rmv(local_user(),$r[0]['name']);
 			if($result)
-				notice( t('Group removed.') . EOL);
+				info( t('Group removed.') . EOL);
 			else
 				notice( t('Unable to remove group.') . EOL);
 		}
@@ -170,10 +178,11 @@ function group_content(&$a) {
 
 	$o .= '<div id="group-members">';
 	$o .= '<h3>' . t('Members') . '</h3>';
+	$textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false);
 	foreach($members as $member) {
 		if($member['url']) {
 			$member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . '); return true;';
-			$o .= micropro($member,true,'mpgroup');
+			$o .= micropro($member,true,'mpgroup', $textmode);
 		}
 		else
 			group_rmv_member(local_user(),$group['name'],$member['id']);
@@ -189,10 +198,11 @@ function group_content(&$a) {
 		);
 
 		if(count($r)) {
+			$textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
 			foreach($r as $member) {
 				if(! in_array($member['id'],$preselected)) {
 					$member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . '); return true;';
-					$o .= micropro($member,true,'mpall');
+					$o .= micropro($member,true,'mpall', $textmode);
 				}
 			}
 		}