X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fuser.php;h=7eef876ad6c360914add2af2938bfc916795f3b0;hb=86d3adaa5084639a1221fc74ac44d5508add25f4;hp=4ed5e57f3d39464f2a8bf7ddcb5cfdade6f95430;hpb=94f6f12ba3a5c1d506255803e709cb640147ebf4;p=friendica.git

diff --git a/include/user.php b/include/user.php
index 4ed5e57f3d..7eef876ad6 100644
--- a/include/user.php
+++ b/include/user.php
@@ -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) {
@@ -404,7 +398,7 @@ function send_register_pending_eml($email, $sitename, $username) {
 	$body = sprintf($body, $username, $sitename);
 
 	return notification(array(
-		'type' => "SYSTEM_EMAIL",
+		'type' => SYSTEM_EMAIL,
 		'to_email' => $email,
 		'subject'=> sprintf( t('Registration at %s'), $sitename),
 		'body' => $body));
@@ -450,7 +444,7 @@ function send_register_open_eml($email, $sitename, $siteurl, $username, $passwor
 		$body = sprintf($body, $email, $sitename, $siteurl, $username, $password);
 
 		return notification(array(
-			'type' => "SYSTEM_EMAIL",
+			'type' => SYSTEM_EMAIL,
 			'to_email' => $email,
 			'subject'=> sprintf( t('Registration details for %s'), $sitename),
 			'preamble'=> $preamble,