X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregister.php;h=4c4fcc2af12e7b980bcc3a7b4ec6c658ab87c7f1;hb=89c5989cfb679449fb776df7380e972d0f676d8d;hp=4ad84ecd6f872c01da1a6d0ae6b69ba80346c9a5;hpb=3ac5e4508b2c11f04acabbeb50bdbabcc904ec5e;p=friendica.git

diff --git a/mod/register.php b/mod/register.php
index 4ad84ecd6f..4c4fcc2af1 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -48,8 +48,6 @@ function register_post(&$a) {
 	}
 
 
-	require_once('include/user.php');
-
 	$arr = $_POST;
 
 	$arr['blocked'] = $blocked;
@@ -81,26 +79,31 @@ function register_post(&$a) {
 			set_pconfig($user['uid'],'system','invites_remaining',$num_invites);
 		}
 
-		$res = send_register_open_eml(
-			$user['email'],
-			$a->config['sitename'],
-			$a->get_baseurl(),
-			$user['username'],
-			$result['password']);
-
-		if($res) {
-			info( t('Registration successful. Please check your email for further instructions.') . EOL ) ;
+		// Only send a password mail when the password wasn't manually provided
+		if (!x($_POST,'password1') OR !x($_POST,'confirm')) {
+			$res = send_register_open_eml(
+				$user['email'],
+				$a->config['sitename'],
+				$a->get_baseurl(),
+				$user['username'],
+				$result['password']);
+
+			if($res) {
+				info( t('Registration successful. Please check your email for further instructions.') . EOL ) ;
+				goaway(z_root());
+			} else {
+				notice(
+					sprintf(
+						t('Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login.'),
+						 $user['email'],
+						 $result['password']
+						 ). EOL
+				);
+			}
+		} else {
+			info( t('Registration successful.') . EOL ) ;
 			goaway(z_root());
 		}
-		else {
-			notice(
-				sprintf(
-					t('Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login.'),
-					 $user['email'],
-					 $result['password']
-					 ). EOL
-			);
-		}
 	}
 	elseif($a->config['register_policy'] == REGISTER_APPROVE) {
 		if(! strlen($a->config['admin_email'])) {
@@ -140,7 +143,7 @@ function register_post(&$a) {
 				'source_link' => $a->get_baseurl()."/admin/users/",
 				'link' => $a->get_baseurl()."/admin/users/",
 				'source_photo' => $a->get_baseurl() . "/photo/avatar/".$user['uid'].".jpg",
-				'to_email' => $admin['mail'],
+				'to_email' => $admin['email'],
 				'uid' => $admin['uid'],
 				'language' => ($admin['language']?$admin['language']:'en'))
 			);
@@ -237,6 +240,9 @@ function register_content(&$a) {
 		));
 	}
 
+	$r = q("SELECT count(*) AS `contacts` FROM `contact`");
+	$passwords = !$r[0]["contacts"];
+
 	$license = '';
 
 	$o = get_markup_template("register.tpl");
@@ -262,8 +268,11 @@ function register_content(&$a) {
 		'$fillext'   => $fillext,
 		'$oidlabel'  => $oidlabel,
 		'$openid'    => $openid_url,
-		'$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '),
+		'$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith, real or real-looking' . "\x29" . ': '),
 		'$addrlabel' => t('Your Email Address: '),
+		'$passwords' => $passwords,
+		'$password1' => array('password1', t('New Password:'), '', t('Leave empty for an auto generated password.')),
+		'$password2' => array('confirm', t('Confirm:'), '', ''),
 		'$nickdesc'  => str_replace('$sitename',$a->get_hostname(),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,