X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fgroup.php;h=13401ef0d90390d76cd76abe3ab2afcf22666d03;hb=70709a882594250684c954a21d186877ea6f983c;hp=3da633edfe4d87f3552e04fa215fa8ed80e499c4;hpb=4cff911939b263993eb41682ca558c975e2db01f;p=friendica.git diff --git a/mod/group.php b/mod/group.php old mode 100644 new mode 100755 index 3da633edfe..13401ef0d9 --- 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,14 +68,26 @@ function group_content(&$a) { return; } + // Switch to text mode 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; + + $tpl = get_markup_template('group_edit.tpl'); + $context = array('$submit' => t('Submit')); + if(($a->argc == 2) && ($a->argv[1] === 'new')) { - $tpl = get_markup_template('group_new.tpl'); - $o .= replace_macros($tpl,array( - '$desc' => t('Create a group of contacts/friends.'), - '$name' => t('Group Name: '), - '$submit' => t('Submit') - )); - return $o; + + return replace_macros($tpl, $context + array( + '$title' => t('Create a group of contacts/friends.'), + '$gname' => array('groupname',t('Group Name: '),$group['name'], ''), + '$gid' => 'new', + )); + + } if(($a->argc == 3) && ($a->argv[1] === 'drop')) { @@ -87,7 +99,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); } @@ -148,63 +160,61 @@ function group_content(&$a) { $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); - $tpl = get_markup_template('group_edit.tpl'); - $o .= replace_macros($tpl, array( + + $context = $context + array( + '$title' => t('Group Editor'), + '$gname' => array('groupname',t('Group Name: '),$group['name'], ''), '$gid' => $group['id'], - '$name' => $group['name'], '$drop' => $drop_txt, - '$desc' => t('Click on a contact to add or remove.'), - '$title' => t('Group Editor'), - '$gname' => t('Group Name: '), - '$submit' => t('Submit') - )); + ); } if(! isset($group)) return; - $o .= '