Merge pull request #4005 from zeroadam/Features-#3878

[friendica.git] / include / group.php

diff --git a/include/group.php b/include/group.php
index fa0e8f59a69af6854e2d1822d08c6038a52bb458..6e7348c4e269e8416a1fc5124d01cf18fc3297b0 100644 (file)
--- a/include/group.php
+++ b/include/group.php
@@ -1,5 +1,7 @@
 <?php
 
+use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
 
 function group_add($uid,$name) {
 
@@ -22,15 +24,11 @@ function group_add($uid,$name) {
                                        intval($uid),
                                        dbesc($name)
                                );
-                               notice( t('A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name.') . EOL); 
+                               notice( t('A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name.') . EOL);
                        }
                        return true;
                }
-               $r = q("INSERT INTO `group` ( `uid`, `name` )
-                       VALUES( %d, '%s' ) ",
-                       intval($uid),
-                       dbesc($name)
-               );
+               $r = dba::insert('group', array('uid' => $uid, 'name' => $name));
                $ret = $r;
        }
        return $ret;
@@ -44,7 +42,7 @@ function group_rmv($uid,$name) {
                        intval($uid),
                        dbesc($name)
                );
-               if (dbm::is_result($r))
+               if (DBM::is_result($r))
                        $group_id = $r[0]['id'];
                if (! $group_id)
                        return false;
@@ -81,10 +79,7 @@ function group_rmv($uid,$name) {
                }
 
                // remove all members
-               $r = q("DELETE FROM `group_member` WHERE `uid` = %d AND `gid` = %d ",
-                       intval($uid),
-                       intval($group_id)
-               );
+               dba::delete('group_member', array('uid' => $uid, 'pid' => $group_id));
 
                // remove group
                $r = q("UPDATE `group` SET `deleted` = 1 WHERE `uid` = %d AND `name` = '%s'",
@@ -106,25 +101,24 @@ function group_byname($uid,$name) {
                intval($uid),
                dbesc($name)
        );
-       if (dbm::is_result($r))
+       if (DBM::is_result($r))
                return $r[0]['id'];
        return false;
 }
 
-function group_rmv_member($uid,$name,$member) {
-       $gid = group_byname($uid,$name);
-       if (! $gid)
-               return false;
-       if (! ( $uid && $gid && $member))
+function group_rmv_member($uid, $name, $member) {
+       $gid = group_byname($uid, $name);
+
+       if (!$gid) {
                return false;
-       $r = q("DELETE FROM `group_member` WHERE `uid` = %d AND `gid` = %d AND `contact-id` = %d",
-               intval($uid),
-               intval($gid),
-               intval($member)
-       );
-       return $r;
+       }
 
+       if (!($uid && $gid && $member)) {
+               return false;
+       }
 
+       $r = dba::delete('group_member', array('uid' => $uid, 'gid' => $gid, 'contact-id' => $member));
+       return $r;
 }
 
 
@@ -139,17 +133,12 @@ function group_add_member($uid,$name,$member,$gid = 0) {
                intval($gid),
                intval($member)
        );
-       if (dbm::is_result($r))
+       if (DBM::is_result($r))
                return true;    // You might question this, but
                                // we indicate success because the group member was in fact created
                                // -- It was just created at another time
-       if (! dbm::is_result($r)) {
-               $r = q("INSERT INTO `group_member` (`uid`, `gid`, `contact-id`)
-                       VALUES( %d, %d, %d ) ",
-                       intval($uid),
-                       intval($gid),
-                       intval($member)
-               );
+       if (! DBM::is_result($r)) {
+               $r = dba::insert('group_member', array('uid' => $uid, 'gid' => $gid, 'contact-id' => $member));
        }
        return $r;
 }
@@ -165,7 +154,7 @@ function group_get_members($gid) {
                        intval($gid),
                        intval(local_user())
                );
-               if (dbm::is_result($r))
+               if (DBM::is_result($r))
                        $ret = $r;
        }
        return $ret;
@@ -182,7 +171,7 @@ function group_public_members($gid) {
                        intval(local_user()),
                        dbesc(NETWORK_OSTATUS)
                );
-               if (dbm::is_result($r))
+               if (DBM::is_result($r))
                        $ret = count($r);
        }
        return $ret;
@@ -198,7 +187,7 @@ function mini_group_select($uid,$gid = 0, $label = "") {
                intval($uid)
        );
        $grps[] = array('name' => '', 'id' => '0', 'selected' => '');
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                foreach ($r as $rr) {
                        $grps[] = array('name' => $rr['name'], 'id' => $rr['id'], 'selected' => (($gid == $rr['id']) ? 'true' : ''));
                }
@@ -256,7 +245,7 @@ function group_side($every="contacts",$each="group",$editmode = "standard", $gro
                $member_of = groups_containing(local_user(),$cid);
        }
 
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                foreach ($r as $rr) {
                        $selected = (($group_id == $rr['id']) ? ' group-selected' : '');
 
@@ -317,10 +306,10 @@ function expand_groups($a,$check_dead = false, $use_gcontact = false) {
 
 
        $ret = array();
-       if (dbm::is_result($r))
+       if (DBM::is_result($r))
                foreach ($r as $rr)
                        $ret[] = $rr['contact-id'];
-       if ($check_dead AND !$use_gcontact) {
+       if ($check_dead && !$use_gcontact) {
                require_once('include/acl_selectors.php');
                $ret = prune_deadguys($ret);
        }
@@ -346,7 +335,7 @@ function groups_containing($uid,$c) {
        );
 
        $ret = array();
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                foreach ($r as $rr) {
                        $ret[] = $rr['gid'];
                }
@@ -394,7 +383,7 @@ function get_default_group($uid, $network = "") {
        $default_group = 0;
 
        if ($network == NETWORK_OSTATUS)
-               $default_group = get_pconfig($uid, "ostatus", "default_group");
+               $default_group = PConfig::get($uid, "ostatus", "default_group");
 
        if ($default_group != 0)
                return $default_group;