X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fuser.php;h=8528bfbfa50a72e3e556cc08379cc26df8bc1dfe;hb=30efb0c1e641b0b9d3aa40a5a79897c6d06ac3ef;hp=220d3d8c8b628a5abf65a51ca4e8361a27dde4d1;hpb=be3111dc6f3d0a4a6ee5662d3551c7fb8e9bac58;p=friendica.git

diff --git a/include/user.php b/include/user.php
index 220d3d8c8b..8528bfbfa5 100644
--- a/include/user.php
+++ b/include/user.php
@@ -31,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) {
@@ -63,7 +63,7 @@ function create_user($arr) {
 			try {			
 				$authurl = $openid->authUrl();
 			} catch (Exception $e){
-				$result['message'] .= t('Error:').$e->getMessage() . EOL . t('Check your OpenID url') . EOL;
+				$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);
@@ -96,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');
@@ -110,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)
 		);
@@ -230,7 +233,7 @@ function create_user($arr) {
 	);
 	if((count($r) > 1) && $newuid) {
 		$result['message'] .= t('Nickname is already registered. Please choose another.') . EOL;
-		q("DELETE FROM `user` WHERE `uid` = %d LIMIT 1",
+		q("DELETE FROM `user` WHERE `uid` = %d",
 			intval($newuid)
 		);
 		return $result;