X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregister.php;h=1963bd7a6023c8b6c67196f95a0d1f7271f8211d;hb=4dd2a748b9625e134b62d71ef2e2772b75d51a96;hp=f4c6570877ff2dc7e681d02c452a1db588b06306;hpb=88cc4143558f3ea4b3cfe59d1725a4a6ba35cc8d;p=friendica.git diff --git a/mod/register.php b/mod/register.php index f4c6570877..1963bd7a60 100644 --- a/mod/register.php +++ b/mod/register.php @@ -1,5 +1,9 @@ config['register_policy']) { - + case REGISTER_OPEN: $blocked = 0; $verified = 1; @@ -42,9 +46,7 @@ function register_post(&$a) { $verified = 0; break; } - - require_once('include/user.php'); $arr = $_POST; @@ -59,7 +61,7 @@ function register_post(&$a) { } $user = $result['user']; - + if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) { $url = $a->get_baseurl() . '/profile/' . $user['nickname']; proc_run('php',"include/directory.php","$url"); @@ -77,28 +79,27 @@ function register_post(&$a) { set_pconfig($user['uid'],'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(), - '$username' => $user['username'], - '$email' => $user['email'], - '$password' => $result['password'], - '$uid' => $user['uid'] )); - - $res = mail($user['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) { - 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 ); + // 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:
login: %s
password: %s

You can change your password after login.'), + $user['email'], + $result['password'] + ). EOL + ); + } } } elseif($a->config['register_policy'] == REGISTER_APPROVE) { @@ -116,43 +117,40 @@ function register_post(&$a) { dbesc($lang) ); - $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'); - + // invite system if($using_invites && $invite_id) { q("delete * from register where hash = '%s' limit 1", dbesc($invite_id)); set_pconfig($user['uid'],'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(), - '$username' => $user['username'], - '$email' => $user['email'], - '$password' => $result['password'], - '$uid' => $user['uid'], - '$hash' => $hash - )); - - $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' ); - - pop_lang(); - - if($res) { - info( t('Your registration is pending approval by the site owner.') . EOL ) ; - goaway(z_root()); + // send email to admins + $admin_mail_list = "'".implode("','", array_map(dbesc, explode(",", str_replace(" ", "", $a->config['admin_email']))))."'"; + $adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s)", + $admin_mail_list + ); + + + foreach ($adminlist as $admin) { + notification(array( + 'type' => NOTIFY_SYSTEM, + 'event' => 'SYSTEM_REGISTER_REQUEST', + 'source_name' => $user['username'], + 'source_mail' => $user['email'], + 'source_nick' => $user['nickname'], + '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['email'], + 'uid' => $admin['uid'], + 'language' => ($admin['language']?$admin['language']:'en')) + ); } + + info( t('Your registration is pending approval by the site owner.') . EOL ) ; + goaway(z_root()); + + } return; @@ -239,6 +237,9 @@ function register_content(&$a) { )); } + $r = q("SELECT count(*) AS `contacts` FROM `contact`"); + $passwords = !$r[0]["contacts"]; + $license = ''; $o = get_markup_template("register.tpl"); @@ -258,7 +259,7 @@ function register_content(&$a) { '$realpeople' => $realpeople, '$regtitle' => t('Registration'), '$registertext' =>((x($a->config,'register_text')) - ? '
' . $a->config['register_text'] . '
' + ? bbcode($a->config['register_text']) : "" ), '$fillwith' => $fillwith, '$fillext' => $fillext, @@ -266,6 +267,9 @@ function register_content(&$a) { '$openid' => $openid_url, '$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\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 \'nickname@$sitename\'.')), '$nicklabel' => t('Choose a nickname: '), '$photo' => $photo, @@ -276,7 +280,9 @@ function register_content(&$a) { '$nickname' => $nickname, '$license' => $license, '$sitename' => $a->get_hostname(), - + '$importh' => t('Import'), + '$importt' => t('Import your profile to this friendica instance'), + )); return $o;