X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fuser.php;h=23023abd65122901045c4b11244fe29186951b05;hb=8adc1bd703a6f610296691dabf54c5b8fd0e1699;hp=af43a2b52c490861a8c916d55fe56b7935db3e5f;hpb=8503a0e4cc4a5e01d8a30b4a827524d1bf313fc6;p=friendica.git

diff --git a/include/user.php b/include/user.php
index af43a2b52c..23023abd65 100644
--- a/include/user.php
+++ b/include/user.php
@@ -7,6 +7,7 @@ require_once('include/text.php');
 require_once('include/pgettext.php');
 require_once('include/datetime.php');
 
+
 function create_user($arr) {
 
 	// Required: { username, nickname, email } or { openid_url }
@@ -59,7 +60,13 @@ function create_user($arr) {
 			$openid->returnUrl = $a->get_baseurl() . '/openid'; 
 			$openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
 			$openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
-			goaway($openid->authUrl());
+			try {			
+				$authurl = $openid->authUrl();
+			} catch (Exception $e){
+				$result['message'] .= t("We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."). EOL . EOL . t("The error message was:") . $e->getMessage() . EOL; 
+				return $result;
+			}
+			goaway($authurl);
 			// NOTREACHED	
 		}
 
@@ -99,11 +106,11 @@ function create_user($arr) {
 
 
 	if(! allowed_email($email))
-			$result['message'] .= t('Your email domain is not among those allowed on this site.') . EOL;
+		$result['message'] .= t('Your email domain is not among those allowed on this site.') . EOL;
 
 	if((! valid_email($email)) || (! validate_email($email)))
 		$result['message'] .= t('Not a valid email address.') . EOL;
-
+		
 	// Disallow somebody creating an account using openid that uses the admin email address,
 	// since openid bypasses email verification. We'll allow it if there is not yet an admin account.
 
@@ -147,13 +154,18 @@ function create_user($arr) {
 
 	require_once('include/crypto.php');
 
-	$keys = new_keypair(1024);
+	$keys = new_keypair(4096);
 
 	if($keys === false) {
 		$result['message'] .= t('SERIOUS ERROR: Generation of security keys failed.') . EOL;
 		return $result;
 	}
 
+	$default_service_class = get_config('system','default_service_class');
+	if(! $default_service_class)
+		$default_service_class = '';
+
+
 	$prvkey = $keys['prvkey'];
 	$pubkey = $keys['pubkey'];
 
@@ -173,8 +185,8 @@ function create_user($arr) {
 	$spubkey = $sres['pubkey'];
 
 	$r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`,
-		`pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone` )
-		VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC' )",
+		`pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone`, `service_class` )
+		VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC', '%s' )",
 		dbesc(generate_user_guid()),
 		dbesc($username),
 		dbesc($new_password_encoded),
@@ -187,7 +199,8 @@ function create_user($arr) {
 		dbesc($sprvkey),
 		dbesc(datetime_convert()),
 		intval($verified),
-		intval($blocked)
+		intval($blocked),
+		dbesc($default_service_class)
 	);
 
 	if($r) {
@@ -271,6 +284,26 @@ function create_user($arr) {
 		require_once('include/group.php');
 		group_add($newuid, t('Friends'));
 
+		$r = q("SELECT id FROM `group` WHERE uid = %d AND name = '%s'",
+			intval($newuid),
+			dbesc(t('Friends'))
+		);
+		if($r && count($r)) {
+			$def_gid = $r[0]['id'];
+
+			q("UPDATE user SET def_gid = %d WHERE uid = %d",
+				intval($r[0]['id']),
+				intval($newuid)
+			);
+		}
+
+		if(get_config('system', 'newuser_private') && $def_gid) {
+			q("UPDATE user SET allow_gid = '%s' WHERE uid = %d",
+			   dbesc("<" . $def_gid . ">"),
+			   intval($newuid)
+			);
+		}
+
 	}
 
 	// if we have no OpenID photo try to look up an avatar
@@ -284,7 +317,11 @@ function create_user($arr) {
 
 		$filename = basename($photo);
 		$img_str = fetch_url($photo,true);
-		$img = new Photo($img_str);
+		// guess mimetype from headers or filename
+		$type = guess_image_type($photo,true);
+
+		
+		$img = new Photo($img_str, $type);
 		if($img->is_valid()) {
 
 			$img->scaleImageSquare(175);
@@ -324,4 +361,4 @@ function create_user($arr) {
 	$result['user'] = $u;
 	return $result;
 
-}
\ No newline at end of file
+}