Catch HTTPExceptions in App::runFrontend()

[friendica.git] / mod / contactgroup.php

diff --git a/mod/contactgroup.php b/mod/contactgroup.php
index 5c4cd79868ef63a43a3c1c40a74a05204c7f9cf9..753d3a07332139f4690deb35d4eb8785e2a6e832 100644 (file)
--- 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\DBA;
+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 (DBA::isResult($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 (!DBA::isResult($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 (!empty($change)) {
+                       if (in_array($change, $preselected)) {
+                               Group::removeMember($group['id'], $change);
+                       } else {
+                               Group::addMember($group['id'], $change);
                        }
                }
        }