Merge pull request #3879 from zeroadam/Remove-Includes-#3873

[friendica.git] / include / group.php

diff --git a/include/group.php b/include/group.php
index ab805e68749ad80cf9de08bef527c195ef40de8b..ce8bc217cd7a9e9419544fe1fee40de08f112386 100644 (file)
--- a/include/group.php
+++ b/include/group.php
@@ -1,5 +1,6 @@
 <?php
 
+use Friendica\Core\PConfig;
 
 function group_add($uid,$name) {
 
@@ -26,11 +27,7 @@ function group_add($uid,$name) {
                        }
                        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;
@@ -144,12 +141,7 @@ function group_add_member($uid,$name,$member,$gid = 0) {
                                // 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)
-               );
+               $r = dba::insert('group_member', array('uid' => $uid, 'gid' => $gid, 'contact-id' => $member));
        }
        return $r;
 }
@@ -394,7 +386,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;