X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregister.php;h=fbd21a567f7e513f805810cdf9e4e56e6e7edb56;hb=fcf6651299418f834076649f1fad4833476aad76;hp=da629a21436e9f036176293aa32af46600098f3e;hpb=5eea0d5ecb7d98ebc70c038d23c87442d8200310;p=friendica.git

diff --git a/mod/register.php b/mod/register.php
index da629a2143..fbd21a567f 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -3,6 +3,8 @@
 if(! function_exists('register_post')) {
 function register_post(&$a) {
 
+	global $lang;
+
 	$verified = 0;
 	$blocked  = 1;
 
@@ -30,7 +32,11 @@ function register_post(&$a) {
 		break;
 	}
 
+	$using_invites = get_config('system','invitation_only');
+	$num_invites = get_config('system','number_invites');
+
 
+	$invite_id  = ((x($_POST,'invite_id'))  ? notags(trim($_POST['invite_id']))  : '');
 	$username   = ((x($_POST,'username'))   ? notags(trim($_POST['username']))   : '');
 	$nickname   = ((x($_POST,'nickname'))   ? notags(trim($_POST['nickname']))   : '');
 	$email      = ((x($_POST,'email'))      ? notags(trim($_POST['email']))      : '');
@@ -41,6 +47,19 @@ function register_post(&$a) {
 	$netpublish = ((strlen(get_config('system','directory_submit_url'))) ? $publish : 0);
 		
 	$tmp_str = $openid_url;
+
+	if($using_invites) {
+		if(! $invite_id) {
+			notice( t('An invitation is required.') . EOL);
+			return;
+		}
+		$r = q("select * from register where `hash` = '%s' limit 1", dbesc($invite_id));
+		if(! results($r)) {
+			notice( t('Invitation could not be verified.') . EOL);
+			return;
+		}
+	} 
+
 	if((! x($username)) || (! x($email)) || (! x($nickname))) {
 		if($openid_url) {
 			if(! validate_url($tmp_str)) {
@@ -69,6 +88,8 @@ function register_post(&$a) {
 
 	$err = '';
 
+	// collapse multiple spaces in name
+	$username = preg_replace('/ +/',' ',$username);
 
 	if(mb_strlen($username) > 48)
 		$err .= t('Please use a shorter name.') . EOL;
@@ -91,6 +112,7 @@ function register_post(&$a) {
 			$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;
 
@@ -98,10 +120,15 @@ function register_post(&$a) {
 		$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.
+	// 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))
-		$err .= t('Cannot use that email.') . EOL;
+	if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0) && strlen($openid_url)) {
+		$r = q("SELECT * FROM `user` WHERE `email` = '%s' LIMIT 1",
+			dbesc($email)
+		);
+		if(count($r))
+			$err .= t('Cannot use that email.') . EOL;
+	}
 
 	$nickname = $_POST['nickname'] = strtolower($nickname);
 
@@ -171,9 +198,10 @@ function register_post(&$a) {
 	$spkey = openssl_pkey_get_details($sres);
 	$spubkey = $spkey["key"];
 
-	$r = q("INSERT INTO `user` ( `username`, `password`, `email`, `openid`, `nickname`,
+	$r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`,
 		`pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked` )
-		VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
+		VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
+		dbesc(generate_user_guid()),
 		dbesc($username),
 		dbesc($new_password_encoded),
 		dbesc($email),
@@ -318,8 +346,16 @@ function register_post(&$a) {
 	}
 
 
+	call_hooks('register_account', $newuid);
+
 	if( $a->config['register_policy'] == REGISTER_OPEN ) {
-		$email_tpl = load_view_file("view/register_open_eml.tpl");
+
+		if($using_invites && $invite_id) {
+			q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
+			set_pconfig($newuid,'system','invites_remaining',$num_invites);
+		}
+
+		$email_tpl = get_intltext_template("register_open_eml.tpl");
 		$email_tpl = replace_macros($email_tpl, array(
 				'$sitename' => $a->config['sitename'],
 				'$siteurl' =>  $a->get_baseurl(),
@@ -336,8 +372,8 @@ function register_post(&$a) {
 
 
 		if($res) {
-			notice( t('Registration successful. Please check your email for further instructions.') . EOL ) ;
-			goaway($a->get_baseurl());
+			info( t('Registration successful. Please check your email for further instructions.') . EOL ) ;
+			goaway(z_root());
 		}
 		else {
 			notice( t('Failed to send email message. Here is the message that failed.') . $email_tpl . EOL );
@@ -346,18 +382,32 @@ function register_post(&$a) {
 	elseif($a->config['register_policy'] == REGISTER_APPROVE) {
 		if(! strlen($a->config['admin_email'])) {
 			notice( t('Your registration can not be processed.') . EOL);
-			goaway($a->get_baseurl());
+			goaway(z_root());
 		}
 
 		$hash = random_string();
-		$r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password` ) VALUES ( '%s', '%s', %d, '%s' ) ",
+		$r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password`, `language` ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ",
 			dbesc($hash),
 			dbesc(datetime_convert()),
 			intval($newuid),
-			dbesc($new_password)
+			dbesc($new_password),
+			dbesc($lang)
 		);
 
-		$email_tpl = load_view_file("view/register_verify_eml.tpl");
+		$r = q("SELECT `language` FROM `user` WHERE `email` = '%s' LIMIT 1",
+			dbesc($a->config['admin_email'])
+		);
+		if(count($r))
+			push_lang($r[0]['language']);
+		else
+			push_lang('en');
+
+		if($using_invites && $invite_id) {
+			q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
+			set_pconfig($newuid,'system','invites_remaining',$num_invites);
+		}
+
+		$email_tpl = get_intltext_template("register_verify_eml.tpl");
 		$email_tpl = replace_macros($email_tpl, array(
 				'$sitename' => $a->config['sitename'],
 				'$siteurl' =>  $a->get_baseurl(),
@@ -373,9 +423,12 @@ function register_post(&$a) {
 				'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
 				. 'Content-type: text/plain; charset=UTF-8' . "\n"
 				. 'Content-transfer-encoding: 8bit' );
+
+		pop_lang();
+
 		if($res) {
-			notice( t('Your registration is pending approval by the site owner.') . EOL ) ;
-			goaway($a->get_baseurl());
+			info( t('Your registration is pending approval by the site owner.') . EOL ) ;
+			goaway(z_root());
 		}
 
 	}
@@ -411,6 +464,7 @@ function register_content(&$a) {
 	$openid_url   = ((x($_POST,'openid_url'))   ? $_POST['openid_url']   : ((x($_GET,'openid_url'))   ? $_GET['openid_url']            : ''));
 	$nickname     = ((x($_POST,'nickname'))     ? $_POST['nickname']     : ((x($_GET,'nickname'))     ? $_GET['nickname']              : ''));
 	$photo        = ((x($_POST,'photo'))        ? $_POST['photo']        : ((x($_GET,'photo'))        ? hex2bin($_GET['photo'])        : ''));
+	$invite_id    = ((x($_POST,'invite_id'))    ? $_POST['invite_id']    : ((x($_GET,'invite_id'))    ? $_GET['invite_id']             : ''));
 
 	$noid = get_config('system','no_openid');
 
@@ -435,7 +489,7 @@ function register_content(&$a) {
 		$profile_publish_reg = '<input type="hidden" name="profile_publish_reg" value="1" />';
 	}
 	else {
-		$publish_tpl = file_get_contents("view/profile_publish.tpl");
+		$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?'),
@@ -450,9 +504,13 @@ function register_content(&$a) {
 	$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 = file_get_contents("view/register.tpl");
+	$o = get_markup_template("register.tpl");
 	$o = replace_macros($o, array(
 		'$oidhtml' => $oidhtml,
+		'$invitations' => get_config('system','invitation_only'),
+		'$invite_desc' => t('Membership on this site is by invitation only.'),
+		'$invite_label' => t('Your invitation ID: '),
+		'$invite_id' => $invite_id,
 		'$realpeople' => $realpeople,
 		'$regtitle'  => t('Registration'),
 		'$registertext' =>((x($a->config,'register_text'))