X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fcontactgroup.php;h=bf34c59d75eceb1dd39a6d7d1cfca864e437a8a9;hb=18fd86f51efc8c505393a5219c921204e18d0392;hp=0be57483865d0216a4abfea6e0e22e9fc3f187a9;hpb=fe89e7760ebfe6f4d0c4a603e2ef777d53fcc8ef;p=friendica.git

diff --git a/mod/contactgroup.php b/mod/contactgroup.php
index 0be5748386..bf34c59d75 100644
--- a/mod/contactgroup.php
+++ b/mod/contactgroup.php
@@ -1,9 +1,9 @@
 <?php
 
 use Friendica\App;
-use Friendica\Database\DBM;
-
-require_once('include/group.php');
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Model\Group;
 
 function contactgroup_content(App $a)
 {
@@ -11,12 +11,13 @@ function contactgroup_content(App $a)
 		killme();
 	}
 
+	$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 (DBA::isResult($r)) {
 			$change = intval($a->argv[2]);
 		}
 	}
@@ -26,25 +27,24 @@ function contactgroup_content(App $a)
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			killme();
 		}
 
 		$group = $r[0];
-		$members = group_get_members($group['id']);
-		$preselected = array();
+		$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);
 			}
 		}
 	}