X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregister.php;h=c9521f9be5dd3826d873322927cf8e4813383784;hb=730322ee5fd1b04a026ce6d0bafae9079f307a4b;hp=68c7297c90267a571a38b2202b766bd1f47905bc;hpb=4f796c68d2db16813b0115f8b7f983326b9a072d;p=friendica.git

diff --git a/mod/register.php b/mod/register.php
index 68c7297c90..c9521f9be5 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -36,9 +36,17 @@ function register_post(&$a) {
 	$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']))      : '');
+	$publish    = ((x($_POST,'profile_publish_reg') && intval($_POST['profile_publish_reg'])) ? 1 : 0);
 
+	$netpublish = ((strlen(get_config('system','directory_submit_url'))) ? $publish : 0);
+		
+	$tmp_str = $openid_url;
 	if((! x($username)) || (! x($email)) || (! x($nickname))) {
 		if($openid_url) {
+			if(! validate_url($tmp_str)) {
+				notice( t('Invalid OpenID url') . EOL);
+				return;
+			}
 			$_SESSION['register'] = 1;
 			$_SESSION['openid'] = $openid_url;
 			require_once('library/openid.php');
@@ -55,12 +63,16 @@ function register_post(&$a) {
 		return;
 	}
 
+	if(! validate_url($tmp_str))
+		$openid_url = '';
+
+
 	$err = '';
 
 
-	if(strlen($username) > 48)
+	if(mb_strlen($username) > 48)
 		$err .= t('Please use a shorter name.') . EOL;
-	if(strlen($username) < 3)
+	if(mb_strlen($username) < 3)
 		$err .= t('Name too short.') . EOL;
 
 	// I don't really like having this rule, but it cuts down
@@ -73,8 +85,11 @@ function register_post(&$a) {
 	// So now we are just looking for a space in the full name. 
 	
 	$loose_reg = get_config('system','no_regfullname');
-	if((! $loose_reg) && (! strpos($username,' ')))
-		$err .= t("That doesn\'t appear to be your full \x28First Last\x29 name.") . EOL;
+	if(! $loose_reg) {
+		$username = mb_convert_case($username,MB_CASE_TITLE,'UTF-8');
+		if(! 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;
@@ -82,6 +97,12 @@ function register_post(&$a) {
 	if((! valid_email($email)) || (! validate_email($email)))
 		$err .= 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.
+
+	if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0) && strlen($openid_url))
+		$err .= t('Cannot use that email.') . EOL;
+
 	$nickname = $_POST['nickname'] = strtolower($nickname);
 
 	if(! preg_match("/^[a-z][a-z0-9\-\_]*$/",$nickname))
@@ -181,15 +202,35 @@ function register_post(&$a) {
 		return;
 	} 		
 
+	/**
+	 * if somebody clicked submit twice very quickly, they could end up with two accounts 
+	 * due to race condition. Remove this one.
+	 */
+
+	$r = q("SELECT `uid` FROM `user`
+               	WHERE `nickname` = '%s' ",
+               	dbesc($nickname)
+	);
+	if((count($r) > 1) && $newuid) {
+		$err .= t('Nickname is already registered. Please choose another.') . EOL;
+		q("DELETE FROM `user` WHERE `uid` = %d LIMIT 1",
+			intval($newuid)
+		);
+		notice ($err);
+		return;
+	}
+
 	if(x($newuid) !== false) {
-		$r = q("INSERT INTO `profile` ( `uid`, `profile-name`, `is-default`, `name`, `photo`, `thumb` )
-			VALUES ( %d, '%s', %d, '%s', '%s', '%s' ) ",
+		$r = q("INSERT INTO `profile` ( `uid`, `profile-name`, `is-default`, `name`, `photo`, `thumb`, `publish`, `net-publish` )
+			VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, %d ) ",
 			intval($newuid),
 			'default',
 			1,
 			dbesc($username),
 			dbesc($a->get_baseurl() . "/photo/profile/{$newuid}.jpg"),
-			dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg")
+			dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg"),
+			intval($publish),
+			intval($netpublish)
 
 		);
 		if($r === false) {
@@ -271,8 +312,14 @@ function register_post(&$a) {
 		}
 	}
 
+	if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) {
+		$url = $a->get_baseurl() . "/profile/$nickname";
+		proc_run('php',"include/directory.php","$url");
+	}
+
+
 	if( $a->config['register_policy'] == REGISTER_OPEN ) {
-		$email_tpl = load_view_file("view/register_open_eml.tpl");
+		$email_tpl = get_intltext_template("register_open_eml.tpl");
 		$email_tpl = replace_macros($email_tpl, array(
 				'$sitename' => $a->config['sitename'],
 				'$siteurl' =>  $a->get_baseurl(),
@@ -281,8 +328,11 @@ function register_post(&$a) {
 				'$password' => $new_password,
 				'$uid' => $newuid ));
 
-		$res = mail($email, t('Registration details for ') . $a->config['sitename'],
-			$email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
+		$res = mail($email, sprintf(t('Registration details for %s'), $a->config['sitename']),
+			$email_tpl, 
+				'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+				. 'Content-type: text/plain; charset=UTF-8' . "\n"
+				. 'Content-transfer-encoding: 8bit' );
 
 
 		if($res) {
@@ -307,7 +357,7 @@ function register_post(&$a) {
 			dbesc($new_password)
 		);
 
-		$email_tpl = load_view_file("view/register_verify_eml.tpl");
+		$email_tpl = get_intltext_template("register_verify_eml.tpl");
 		$email_tpl = replace_macros($email_tpl, array(
 				'$sitename' => $a->config['sitename'],
 				'$siteurl' =>  $a->get_baseurl(),
@@ -318,15 +368,18 @@ function register_post(&$a) {
 				'$hash' => $hash
 		 ));
 
-		$res = mail($a->config['admin_email'], t('Registration request at ') . $a->config['sitename'],
-			$email_tpl,'From: ' .  t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
-
+		$res = mail($a->config['admin_email'], sprintf(t('Registration request at %s'), $a->config['sitename']),
+			$email_tpl,
+				'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+				. 'Content-type: text/plain; charset=UTF-8' . "\n"
+				. 'Content-transfer-encoding: 8bit' );
 		if($res) {
 			notice( t('Your registration is pending approval by the site owner.') . EOL ) ;
 			goaway($a->get_baseurl());
 		}
 
 	}
+
 	return;
 }}
 
@@ -344,11 +397,15 @@ function register_content(&$a) {
 
 	$block = get_config('system','block_extended_register');
 
-	if((($a->config['register_policy'] == REGISTER_CLOSED) && (! getuid())) || ($block)) {
+	if((($a->config['register_policy'] == REGISTER_CLOSED) && (! local_user())) || ($block)) {
 		notice("Permission denied." . EOL);
 		return;
 	}
 
+	if(x($_SESSION,'theme'))
+		unset($_SESSION['theme']);
+
+
 	$username     = ((x($_POST,'username'))     ? $_POST['username']     : ((x($_GET,'username'))     ? $_GET['username']              : ''));
 	$email        = ((x($_POST,'email'))        ? $_POST['email']        : ((x($_GET,'email'))        ? $_GET['email']                 : ''));
 	$openid_url   = ((x($_POST,'openid_url'))   ? $_POST['openid_url']   : ((x($_GET,'openid_url'))   ? $_GET['openid_url']            : ''));
@@ -370,12 +427,33 @@ function register_content(&$a) {
 		$oidlabel = t("Your OpenID \x28optional\x29: ");
 	}
 
+	// I set this and got even more fake names than before...
+
+	$realpeople = ''; // t('Members of this network prefer to communicate with real people who use their real names.');
+
+	if(get_config('system','publish_all')) {
+		$profile_publish_reg = '<input type="hidden" name="profile_publish_reg" value="1" />';
+	}
+	else {
+		$publish_tpl = get_markup_template("profile_publish.tpl");
+		$profile_publish = replace_macros($publish_tpl,array(
+			'$instance'     => 'reg',
+			'$pubdesc'      => t('Include your profile in member directory?'),
+			'$yes_selected' => ' checked="checked" ',
+			'$no_selected'  => '',
+			'$str_yes'      => t('Yes'),
+			'$str_no'       => t('No')
+		));
+	}
+
+
 	$license = t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.');
 
 
-	$o = load_view_file("view/register.tpl");
+	$o = get_markup_template("register.tpl");
 	$o = replace_macros($o, array(
 		'$oidhtml' => $oidhtml,
+		'$realpeople' => $realpeople,
 		'$regtitle'  => t('Registration'),
 		'$registertext' =>((x($a->config,'register_text'))
 			? '<div class="error-message">' . $a->config['register_text'] . '</div>'
@@ -386,9 +464,10 @@ function register_content(&$a) {
 		'$openid'    => $openid_url,
 		'$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '),
 		'$addrlabel' => t('Your Email Address: '),
-		'$nickdesc'  => t('Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'<strong>nickname@$sitename</strong>\'.'),
+		'$nickdesc'  => t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.'),
 		'$nicklabel' => t('Choose a nickname: '),
 		'$photo'     => $photo,
+		'$publish'   => $profile_publish,
 		'$regbutt'   => t('Register'),
 		'$username'  => $username,
 		'$email'     => $email,