X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fregister.php;h=5fceebd4bd87c006e2e5afeb60f7cfdb5c3d1379;hb=c8cf2d1773623980d8055ff392b400aecb2a09b3;hp=86bfe2066e9888e397fc583c98a1a1846a6470e8;hpb=2a269e0c182eb90405644190abe6f40a9cdef615;p=friendica.git diff --git a/mod/register.php b/mod/register.php index 86bfe2066e..5fceebd4bd 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,14 +32,34 @@ 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'])) : ''); $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($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)) { @@ -60,12 +82,18 @@ function register_post(&$a) { return; } + if(! validate_url($tmp_str)) + $openid_url = ''; + + $err = ''; + // collapse multiple spaces in name + $username = preg_replace('/ +/',' ',$username); - 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 @@ -78,8 +106,12 @@ 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; @@ -88,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); @@ -161,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), @@ -192,15 +230,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) { @@ -282,8 +340,22 @@ 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"); + } + + + 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(), @@ -292,13 +364,16 @@ 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) { - 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 ); @@ -307,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) + ); + + $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 = 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(), @@ -329,15 +418,21 @@ 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' ); + + 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()); } } + return; }} @@ -355,7 +450,7 @@ 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; } @@ -369,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'); @@ -385,12 +481,37 @@ function register_content(&$a) { $oidlabel = t("Your OpenID \x28optional\x29: "); } - $license = t('Shared content is covered by the Creative Commons Attribution 3.0 license.'); + // 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 = ''; + } + 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 = cc_license(); - $o = load_view_file("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')) ? '
' @@ -401,9 +522,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 \'nickname@$sitename\'.'), + '$nickdesc' => 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, + '$publish' => $profile_publish, '$regbutt' => t('Register'), '$username' => $username, '$email' => $email,