X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fgroup.php;h=05a358ba70adb5ea86981ef9c582a162ec6da0bf;hb=ddaeb305bc9ed5ac4087d8b64ead5d71fc5957bd;hp=5d624e90e43c945cc24cbe8925f8ed4aa3894a93;hpb=2a814623d8a61227f464820ac1615848874b474e;p=friendica.git

diff --git a/mod/group.php b/mod/group.php
index 5d624e90e4..05a358ba70 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -7,20 +7,23 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\Group;
 
 function group_init(App $a) {
 	if (local_user()) {
-		require_once 'include/group.php';
-		$a->page['aside'] = group_side('contacts', 'group', 'extended', (($a->argc > 1) ? intval($a->argv[1]) : 0));
+		$a->page['aside'] = Group::sidebarWidget('contacts', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone'));
 	}
 }
 
 function group_post(App $a) {
 
 	if (! local_user()) {
-		notice(t('Permission denied.') . EOL);
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
@@ -28,15 +31,15 @@ function group_post(App $a) {
 		check_form_security_token_redirectOnErr('/group/new', 'group_edit');
 
 		$name = notags(trim($_POST['groupname']));
-		$r = group_add(local_user(), $name);
+		$r = Group::create(local_user(), $name);
 		if ($r) {
-			info(t('Group created.') . EOL);
-			$r = group_byname(local_user(), $name);
+			info(L10n::t('Group created.') . EOL);
+			$r = Group::getIdByName(local_user(), $name);
 			if ($r) {
 				goaway(System::baseUrl() . '/group/' . $r);
 			}
 		} else {
-			notice(t('Could not create group.') . EOL);
+			notice(L10n::t('Could not create group.') . EOL);
 		}
 		goaway(System::baseUrl() . '/group');
 		return; // NOTREACHED
@@ -49,8 +52,8 @@ function group_post(App $a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (! dbm::is_result($r)) {
-			notice(t('Group not found.') . EOL);
+		if (! DBM::is_result($r)) {
+			notice(L10n::t('Group not found.') . EOL);
 			goaway(System::baseUrl() . '/contacts');
 			return; // NOTREACHED
 		}
@@ -64,11 +67,11 @@ function group_post(App $a) {
 			);
 
 			if ($r) {
-				info(t('Group name changed.') . EOL);
+				info(L10n::t('Group name changed.') . EOL);
 			}
 		}
 
-		$a->page['aside'] = group_side();
+		$a->page['aside'] = Group::sidebarWidget();
 	}
 	return;
 }
@@ -77,11 +80,15 @@ function group_content(App $a) {
 	$change = false;
 
 	if (! local_user()) {
-		notice(t('Permission denied') . EOL);
+		notice(L10n::t('Permission denied') . EOL);
 		return;
 	}
 
 	// Switch to text mode interface if we have more than 'n' contacts or group members
+	
+	if ($a->argc == 1) {
+		goaway(System::baseUrl() . '/contacts');
+	}
 
 	$switchtotext = PConfig::get(local_user(), 'system', 'groupedit_image_limit');
 	if (is_null($switchtotext)) {
@@ -90,21 +97,45 @@ function group_content(App $a) {
 
 	$tpl = get_markup_template('group_edit.tpl');
 
-	$context = array(
-			'$submit' => t('Save Group'),
-	);
+	$context = [
+		'$submit' => L10n::t('Save Group'),
+		'$submit_filter' => L10n::t('Filter'),
+	];
 
 	if (($a->argc == 2) && ($a->argv[1] === 'new')) {
-		return replace_macros($tpl, $context + array(
-			'$title' => t('Create a group of contacts/friends.'),
-			'$gname' => array('groupname', t('Group Name: '), '', ''),
+		return replace_macros($tpl, $context + [
+			'$title' => L10n::t('Create a group of contacts/friends.'),
+			'$gname' => ['groupname', L10n::t('Group Name: '), '', ''],
 			'$gid' => 'new',
 			'$form_security_token' => get_form_security_token("group_edit"),
-		));
+		]);
+
+
+	}
 
+	if (($a->argc == 2) && ($a->argv[1] === 'none')) {
+		require_once 'mod/contacts.php';
 
+		$id = -1;
+		$nogroup = True;
+		$group = [
+			'id' => $id,
+			'name' => L10n::t('Contacts not in any group'),
+		];
+
+		$members = [];
+		$preselected = [];
+		$entry = [];
+
+		$context = $context + [
+			'$title' => $group['name'],
+			'$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''],
+			'$gid' => $id,
+			'$editable' => 0,
+		];
 	}
 
+
 	if (($a->argc == 3) && ($a->argv[1] === 'drop')) {
 		check_form_security_token_redirectOnErr('/group', 'group_drop', 't');
 
@@ -116,14 +147,14 @@ function group_content(App $a) {
 
 			$result = null;
 
-			if (dbm::is_result($r)) {
-				$result = group_rmv(local_user(), $r[0]['name']);
+			if (DBM::is_result($r)) {
+				$result = Group::removeByName(local_user(), $r[0]['name']);
 			}
 
 			if ($result) {
-				info(t('Group removed.') . EOL);
+				info(L10n::t('Group removed.') . EOL);
 			} else {
-				notice(t('Unable to remove group.') . EOL);
+				notice(L10n::t('Unable to remove group.') . EOL);
 			}
 		}
 		goaway(System::baseUrl() . '/group');
@@ -137,13 +168,12 @@ function group_content(App $a) {
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$change = intval($a->argv[2]);
 		}
 	}
 
 	if (($a->argc > 1) && (intval($a->argv[1]))) {
-		require_once 'include/acl_selectors.php';
 		require_once 'mod/contacts.php';
 
 		$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
@@ -151,15 +181,15 @@ function group_content(App $a) {
 			intval(local_user())
 		);
 
-		if (! dbm::is_result($r)) {
-			notice(t('Group not found.') . EOL);
+		if (! DBM::is_result($r)) {
+			notice(L10n::t('Group not found.') . EOL);
 			goaway(System::baseUrl() . '/contacts');
 		}
 
 		$group = $r[0];
-		$members = group_get_members($group['id']);
-		$preselected = array();
-		$entry = array();
+		$members = Contact::getByGroupId($group['id']);
+		$preselected = [];
+		$entry = [];
 		$id = 0;
 
 		if (count($members)) {
@@ -170,13 +200,13 @@ function group_content(App $a) {
 
 		if ($change) {
 			if (in_array($change, $preselected)) {
-				group_rmv_member(local_user(), $group['name'], $change);
+				Group::removeMember($group['id'], $change);
 			} else {
-				group_add_member(local_user(), $group['name'], $change);
+				Group::addMember($group['id'], $change);
 			}
 
-			$members = group_get_members($group['id']);
-			$preselected = array();
+			$members = Contact::getByGroupId($group['id']);
+			$preselected = [];
 			if (count($members)) {
 				foreach ($members as $member) {
 					$preselected[] = $member['id'];
@@ -185,21 +215,22 @@ function group_content(App $a) {
 		}
 
 		$drop_tpl = get_markup_template('group_drop.tpl');
-		$drop_txt = replace_macros($drop_tpl, array(
+		$drop_txt = replace_macros($drop_tpl, [
 			'$id' => $group['id'],
-			'$delete' => t('Delete Group'),
+			'$delete' => L10n::t('Delete Group'),
 			'$form_security_token' => get_form_security_token("group_drop"),
-		));
+		]);
 
 
-		$context = $context + array(
-			'$title' => t('Group Editor'),
-			'$gname' => array('groupname', t('Group Name: '), $group['name'], ''),
+		$context = $context + [
+			'$title' => $group['name'],
+			'$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''],
 			'$gid' => $group['id'],
 			'$drop' => $drop_txt,
 			'$form_security_token' => get_form_security_token('group_edit'),
-			'$edit_name' => t('Edit Group Name')
-		);
+			'$edit_name' => L10n::t('Edit Group Name'),
+			'$editable' => 1,
+		];
 
 	}
 
@@ -207,13 +238,13 @@ function group_content(App $a) {
 		return;
 	}
 
-	$groupeditor = array(
-		'label_members' => t('Members'),
-		'members' => array(),
-		'label_contacts' => t('All Contacts'),
-		'group_is_empty' => t('Group is empty'),
-		'contacts' => array(),
-	);
+	$groupeditor = [
+		'label_members' => L10n::t('Members'),
+		'members' => [],
+		'label_contacts' => L10n::t('All Contacts'),
+		'group_is_empty' => L10n::t('Group is empty'),
+		'contacts' => [],
+	];
 
 	$sec_token = addslashes(get_form_security_token('group_member_change'));
 
@@ -223,36 +254,45 @@ function group_content(App $a) {
 			$entry = _contact_detail_for_template($member);
 			$entry['label'] = 'members';
 			$entry['photo_menu'] = '';
-			$entry['change_member'] = array(
-				'title'     => t("Remove Contact"),
+			$entry['change_member'] = [
+				'title'     => L10n::t("Remove contact from group"),
 				'gid'       => $group['id'],
 				'cid'       => $member['id'],
 				'sec_token' => $sec_token
-			);
+			];
 
 			$groupeditor['members'][] = $entry;
 		} else {
-			group_rmv_member(local_user(), $group['name'], $member['id']);
+			Group::removeMember($group['id'], $member['id']);
 		}
 	}
 
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `self` ORDER BY `name` ASC",
-		intval(local_user())
-	);
+	if ($nogroup) {
+		$r = Contact::getUngroupedList(local_user());
+	} else {
+		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `self` ORDER BY `name` ASC",
+			intval(local_user())
+		);
+		$context['$desc'] = L10n::t('Click on a contact to add or remove.');
+	}
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		// Format the data of the contacts who aren't in the contact group
 		foreach ($r as $member) {
 			if (! in_array($member['id'], $preselected)) {
 				$entry = _contact_detail_for_template($member);
 				$entry['label'] = 'contacts';
-				$entry['photo_menu'] = '';
-				$entry['change_member'] = array(
-					'title'     => t("Add Contact"),
-					'gid'       => $group['id'],
-					'cid'       => $member['id'],
-					'sec_token' => $sec_token
-				);
+				if (!$nogroup)
+					$entry['photo_menu'] = [];
+
+				if (!$nogroup) {
+					$entry['change_member'] = [
+						'title'     => L10n::t("Add contact to group"),
+						'gid'       => $group['id'],
+						'cid'       => $member['id'],
+						'sec_token' => $sec_token
+					];
+				}
 
 				$groupeditor['contacts'][] = $entry;
 			}
@@ -260,7 +300,6 @@ function group_content(App $a) {
 	}
 
 	$context['$groupeditor'] = $groupeditor;
-	$context['$desc'] = t('Click on a contact to add or remove.');
 
 	// If there are to many contacts we could provide an alternative view mode
 	$total = count($groupeditor['members']) + count($groupeditor['contacts']);