X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fuser.php;h=93b34e1f5656d270bb2bb4525fe66620219c645c;hb=68e0324c1b50b18f78a754553d487cc20b8de6b1;hp=039b30bbd10ef7eee76be202f58cd5b93e5476cf;hpb=dd71f9446b05274550ebcb3ce4773762832084e3;p=friendica.git

diff --git a/include/user.php b/include/user.php
index 039b30bbd1..93b34e1f56 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 }
@@ -30,7 +31,7 @@ function create_user($arr) {
 
 	$publish    = ((x($arr,'profile_publish_reg') && intval($arr['profile_publish_reg'])) ? 1 : 0);
 	$netpublish = ((strlen(get_config('system','directory_submit_url'))) ? $publish : 0);
-		
+
 	$tmp_str = $openid_url;
 
 	if($using_invites) {
@@ -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	
 		}
 
@@ -89,7 +96,7 @@ function create_user($arr) {
 	//	$pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' ); 
 
 	// So now we are just looking for a space in the full name. 
-	
+
 	$loose_reg = get_config('system','no_regfullname');
 	if(! $loose_reg) {
 		$username = mb_convert_case($username,MB_CASE_TITLE,'UTF-8');
@@ -103,11 +110,14 @@ function create_user($arr) {
 
 	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.
 
-	if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0) && strlen($openid_url)) {
+	$adminlist = explode(",", str_replace(" ", "", strtolower($a->config['admin_email'])));
+
+	//if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0) && strlen($openid_url)) {
+	if((x($a->config,'admin_email')) && in_array(strtolower($email), $adminlist) && strlen($openid_url)) {
 		$r = q("SELECT * FROM `user` WHERE `email` = '%s' LIMIT 1",
 			dbesc($email)
 		);
@@ -277,6 +287,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