X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontactgroup.php;h=07997cd1160cbd9d7e58d89895d1a61081c2dc3b;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=0be57483865d0216a4abfea6e0e22e9fc3f187a9;hpb=fe89e7760ebfe6f4d0c4a603e2ef777d53fcc8ef;p=friendica.git

diff --git a/mod/contactgroup.php b/mod/contactgroup.php
index 0be5748386..07997cd116 100644
--- a/mod/contactgroup.php
+++ b/mod/contactgroup.php
@@ -1,22 +1,23 @@
 <?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)
 {
 	if (!local_user()) {
-		killme();
+		exit();
 	}
 
+	$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,28 +27,27 @@ function contactgroup_content(App $a)
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (!DBM::is_result($r)) {
-			killme();
+		if (!DBA::isResult($r)) {
+			exit();
 		}
 
 		$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 (!empty($change)) {
+			if (in_array($change, $preselected)) {
+				Group::removeMember($group['id'], $change);
+			} else {
+				Group::addMember($group['id'], $change);
 			}
 		}
 	}
 
-	killme();
+	exit();
 }