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

[friendica.git] / include / user.php

diff --git a/include/user.php b/include/user.php
index a05bd831a8e7d81aa19344d3853846acc363ee36..7eb1058dc05655a9a174b460748ab4ae44ddd9e7 100644 (file)
--- a/include/user.php
+++ b/include/user.php
@@ -1,8 +1,8 @@
 <?php
 
+use Friendica\Core\Config;
 use Friendica\Core\System;
 
-require_once('include/config.php');
 require_once('include/network.php');
 require_once('include/plugin.php');
 require_once('include/text.php');
@@ -18,8 +18,8 @@ function create_user($arr) {
        $a = get_app();
        $result = array('success' => false, 'user' => null, 'password' => '', 'message' => '');
 
-       $using_invites = get_config('system','invitation_only');
-       $num_invites   = get_config('system','number_invites');
+       $using_invites = Config::get('system','invitation_only');
+       $num_invites   = Config::get('system','number_invites');
 
 
        $invite_id  = ((x($arr,'invite_id'))  ? notags(trim($arr['invite_id']))  : '');
@@ -35,7 +35,7 @@ function create_user($arr) {
        $verified   = ((x($arr,'verified'))   ? intval($arr['verified']) : 0);
 
        $publish    = ((x($arr,'profile_publish_reg') && intval($arr['profile_publish_reg'])) ? 1 : 0);
-       $netpublish = ((strlen(get_config('system','directory'))) ? $publish : 0);
+       $netpublish = ((strlen(Config::get('system','directory'))) ? $publish : 0);
 
        if ($password1 != $confirm) {
                $result['message'] .= t('Passwords do not match. Password unchanged.') . EOL;
@@ -101,7 +101,7 @@ function create_user($arr) {
 
        // So now we are just looking for a space in the full name.
 
-       $loose_reg = get_config('system','no_regfullname');
+       $loose_reg = Config::get('system','no_regfullname');
        if(! $loose_reg) {
                $username = mb_convert_case($username,MB_CASE_TITLE,'UTF-8');
                if(! strpos($username,' '))
@@ -169,11 +169,6 @@ function create_user($arr) {
                return $result;
        }
 
-       $default_service_class = get_config('system','default_service_class');
-       if(! $default_service_class)
-               $default_service_class = '';
-
-
        $prvkey = $keys['prvkey'];
        $pubkey = $keys['pubkey'];
 
@@ -182,9 +177,9 @@ function create_user($arr) {
        $sprvkey = $sres['prvkey'];
        $spubkey = $sres['pubkey'];
 
-       $r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`,
-               `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone`, `service_class`, `default-location` )
-               VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC', '%s', '' )",
+       $r = q("INSERT INTO `user` (`guid`, `username`, `password`, `email`, `openid`, `nickname`,
+               `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone`, `default-location`)
+               VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC', '')",
                dbesc(generate_user_guid()),
                dbesc($username),
                dbesc($new_password_encoded),
@@ -197,8 +192,7 @@ function create_user($arr) {
                dbesc($sprvkey),
                dbesc(datetime_convert()),
                intval($verified),
-               intval($blocked),
-               dbesc($default_service_class)
+               intval($blocked)
        );
 
        if ($r) {
@@ -274,7 +268,7 @@ function create_user($arr) {
                        );
                }
 
-               if(get_config('system', 'newuser_private') && $def_gid) {
+               if(Config::get('system', 'newuser_private') && $def_gid) {
                        q("UPDATE `user` SET `allow_gid` = '%s' WHERE `uid` = %d",
                                dbesc("<" . $def_gid . ">"),
                                intval($newuid)