X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregister.php;h=7ad7ef211861d980862aa581cadf67713630c858;hb=57eb0576b018902d020bbf17e5b38a4ed7c440fd;hp=57a15c0081904b68479ca8eb1b35af96dac0ecab;hpb=4bd7667a48cbe57c89f2a385ea3fbf9543370157;p=friendica.git

diff --git a/mod/register.php b/mod/register.php
index 57a15c0081..7ad7ef2118 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -30,17 +30,12 @@ function register_post(&$a) {
 		break;
 	}
 
-	if(x($_POST,'username'))
-		$username = notags(trim($_POST['username']));
-	if(x($_POST['nickname']))
-		$nickname = notags(trim($_POST['nickname']));
-	if(x($_POST,'email'))
-		$email = notags(trim($_POST['email']));
-	if(x($_POST,'openid_url'))
-		$openid_url = notags(trim($_POST['openid_url']));
-
-	$photo = ((x($_POST,'photo')) ? notags(trim($_POST['photo'])) : '');
 
+	$username   = ((x($_POST,'username'))   ? notags(trim($_POST['username']))   : '');
+	$nickname   = ((x($_POST,'nickname'))   ? notags(trim($_POST['nickname']))   : '');
+	$email      = ((x($_POST,'email'))      ? notags(trim($_POST['email']))      : '');
+	$openid_url = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : '');
+	$photo      = ((x($_POST,'photo'))      ? notags(trim($_POST['photo']))      : '');
 
 	if((! x($username)) || (! x($email)) || (! x($nickname))) {
 		if($openid_url) {
@@ -71,14 +66,15 @@ function register_post(&$a) {
 	// I don't really like having this rule, but it cuts down
 	// on the number of auto-registrations by Russian spammers
 	
-	$no_utf = get_config('system','no_utf');
-
-	$pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' ); 
+	//  Using preg_match was completely unreliable, due to mixed UTF-8 regex support
+	//	$no_utf = get_config('system','no_utf');
+	//	$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) && (! preg_match($pat,$username)))
-		$err .= t('That doesn\'t appear to be your full name.') . EOL;
+	if((! $loose_reg) && (! strpos($username,' ')))
+		$err .= t("That doesn\'t appear to be your full \x28First Last\x29 name.") . EOL;
 
 	if(! allowed_email($email))
 			$err .= t('Your email domain is not among those allowed on this site.') . EOL;
@@ -345,15 +341,31 @@ function register_content(&$a) {
 	$nickname     = ((x($_POST,'nickname'))     ? $_POST['nickname']     : ((x($_GET,'nickname'))     ? $_GET['nickname']              : ''));
 	$photo        = ((x($_POST,'photo'))        ? $_POST['photo']        : ((x($_GET,'photo'))        ? hex2bin($_GET['photo'])        : ''));
 
+	$noid = get_config('system','no_openid');
+
+	if($noid) {
+		$oidhtml = '';
+		$fillwith = '';
+		$fillext = '';
+		$oidlabel = '';
+	}
+	else {
+		$oidhtml = '<label for="register-openid" id="label-register-openid" >$oidlabel</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >';
+		$fillwith = t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.");
+		$fillext =  t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.');
+		$oidlabel = t("Your OpenID \x28optional\x29: ");
+	}
+
 	$o = load_view_file("view/register.tpl");
 	$o = replace_macros($o, array(
+		'$oidhtml' => $oidhtml,
 		'$regtitle'  => t('Registration'),
 		'$registertext' =>((x($a->config,'register_text'))
 			? '<div class="error-message">' . $a->config['register_text'] . '</div>'
 			: "" ),
-		'$fillwith'  => t('You may ' . "\x28" . 'optionally' . "\x29" . ' fill in this form via OpenID by supplying your OpenID and clicking ') . "'" . t('Register') . "'",
-		'$fillext'   => t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'),
-		'$oidlabel'  => t('Your OpenID ' . "\x28" . 'optional' . "\x29" . ': '),
+		'$fillwith'  => $fillwith,
+		'$fillext'   => $fillext,
+		'$oidlabel'  => $oidlabel,
 		'$openid'    => $openid_url,
 		'$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '),
 		'$addrlabel' => t('Your Email Address: '),