X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontactgroup.php;h=388725c0064cfe87848c2f140210b300e4675a5d;hb=4d5b79a9d46ad07716febaac02e59dafe3baad90;hp=553c7d6cd38b54f1cc4b5657c16b6da6b2b86e4a;hpb=d2280d4120ca09ff5f3013e961a1f43bb5244cc6;p=friendica.git

diff --git a/mod/contactgroup.php b/mod/contactgroup.php
index 553c7d6cd3..388725c006 100644
--- a/mod/contactgroup.php
+++ b/mod/contactgroup.php
@@ -1,47 +1,50 @@
 <?php
 
-require_once('include/group.php');
-
-function contactgroup_content(App &$a) {
-
-
-	if (! local_user()) {
+use Friendica\App;
+use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\Group;
+
+function contactgroup_content(App $a)
+{
+	if (!local_user()) {
 		killme();
 	}
 
-	if(($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
+	$change = null;
+	if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
 		$r = q("SELECT `id` FROM `contact` WHERE `id` = %d AND `uid` = %d and `self` = 0 and `blocked` = 0 AND `pending` = 0 LIMIT 1",
 			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]))) {
-
+	if (($a->argc > 1) && (intval($a->argv[1]))) {
 		$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (! dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			killme();
 		}
 
 		$group = $r[0];
-		$members = group_get_members($group['id']);
-		$preselected = array();
-		if(count($members))	{
-			foreach($members as $member)
+		$members = Contact::getByGroupId($group['id']);
+		$preselected = [];
+		if (count($members)) {
+			foreach ($members as $member) {
 				$preselected[] = $member['id'];
+			}
 		}
 
-		if($change) {
-			if(in_array($change,$preselected)) {
-				group_rmv_member(local_user(),$group['name'],$change);
-			}
-			else {
-				group_add_member(local_user(),$group['name'],$change);
+		if (x($change)) {
+			if (in_array($change, $preselected)) {
+				Group::removeMember($group['id'], $change);
+			} else {
+				Group::addMember($group['id'], $change);
 			}
 		}
 	}