X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregister.php;h=c9521f9be5dd3826d873322927cf8e4813383784;hb=730322ee5fd1b04a026ce6d0bafae9079f307a4b;hp=773d5536406a6961e6eff03d4857f36bdbcb8212;hpb=f9497bcb95abae02427f9fe7e998bce29923020c;p=friendica.git
diff --git a/mod/register.php b/mod/register.php
index 773d553640..c9521f9be5 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -30,44 +30,78 @@ function register_post(&$a) {
break;
}
- if(x($_POST,'username'))
- $username = notags(trim($_POST['username']));
- if(x($_POST['nickname']))
- $nickname = notags(trim($_POST['nickname']));
- if(x($_POST,'email'))
- $email = notags(trim($_POST['email']));
+ $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((! 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');
+ $openid = new LightOpenID;
+ $openid->identity = $openid_url;
+ $openid->returnUrl = $a->get_baseurl() . '/openid';
+ $openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
+ $openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
+ goaway($openid->authUrl());
+ // NOTREACHED
+ }
+
notice( t('Please enter the required information.') . EOL );
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
// on the number of auto-registrations by Russian spammers
- $no_utf = get_config('system','no_utf');
-
- $pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' );
+ // Using preg_match was completely unreliable, due to mixed UTF-8 regex support
+ // $no_utf = get_config('system','no_utf');
+ // $pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' );
+ // So now we are just looking for a space in the full name.
+
$loose_reg = get_config('system','no_regfullname');
-
- if((! $loose_reg) && (! preg_match($pat,$username)))
- $err .= t('That doesn\'t appear to be your full 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;
- if(! valid_email($email))
+ 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);
@@ -90,12 +124,17 @@ function register_post(&$a) {
$new_password_encoded = hash('whirlpool',$new_password);
$res=openssl_pkey_new(array(
- 'digest_alg' => 'whirlpool',
+ 'digest_alg' => 'sha1',
'private_key_bits' => 4096,
'encrypt_key' => false ));
// Get private key
+ if(empty($res)) {
+ notice( t('SERIOUS ERROR: Generation of security keys failed.') . EOL);
+ return;
+ }
+
$prvkey = '';
openssl_pkey_export($res, $prvkey);
@@ -105,7 +144,20 @@ function register_post(&$a) {
$pkey = openssl_pkey_get_details($res);
$pubkey = $pkey["key"];
+ /**
+ *
+ * Create another keypair for signing/verifying
+ * salmon protocol messages. We have to use a slightly
+ * less robust key because this won't be using openssl
+ * but the phpseclib. Since it is PHP interpreted code
+ * it is not nearly as efficient, and the larger keys
+ * will take several minutes each to process.
+ *
+ */
+
$sres=openssl_pkey_new(array(
+ 'digest_alg' => 'sha1',
+ 'private_key_bits' => 512,
'encrypt_key' => false ));
// Get private key
@@ -119,17 +171,19 @@ function register_post(&$a) {
$spkey = openssl_pkey_get_details($sres);
$spubkey = $spkey["key"];
- $r = q("INSERT INTO `user` ( `username`, `password`, `email`, `nickname`,
- `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `verified`, `blocked` )
- VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
+ $r = q("INSERT INTO `user` ( `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 )",
dbesc($username),
dbesc($new_password_encoded),
dbesc($email),
+ dbesc($openid_url),
dbesc($nickname),
dbesc($pubkey),
dbesc($prvkey),
dbesc($spubkey),
dbesc($sprvkey),
+ dbesc(datetime_convert()),
intval($verified),
intval($blocked)
);
@@ -148,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) {
@@ -189,48 +263,63 @@ function register_post(&$a) {
}
- require_once('include/Photo.php');
+ $use_gravatar = ((get_config('system','no_gravatar')) ? false : true);
+
+ // if we have an openid photo use it.
+ // otherwise unless it is disabled, use gravatar
- $photo = gravatar_img($email);
- $photo_failure = false;
+ if($use_gravatar || strlen($photo)) {
- $filename = basename($photo);
- $img_str = fetch_url($photo,true);
- $img = new Photo($img_str);
- if($img->is_valid()) {
+ require_once('include/Photo.php');
- $img->scaleImageSquare(175);
+ if(($use_gravatar) && (! strlen($photo)))
+ $photo = gravatar_img($email);
+ $photo_failure = false;
+
+ $filename = basename($photo);
+ $img_str = fetch_url($photo,true);
+ $img = new Photo($img_str);
+ if($img->is_valid()) {
+
+ $img->scaleImageSquare(175);
- $hash = photo_new_resource();
+ $hash = photo_new_resource();
- $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 4 );
+ $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 4 );
- if($r === false)
- $photo_failure = true;
+ if($r === false)
+ $photo_failure = true;
- $img->scaleImage(80);
+ $img->scaleImage(80);
- $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 5 );
+ $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 5 );
- if($r === false)
- $photo_failure = true;
+ if($r === false)
+ $photo_failure = true;
- $img->scaleImage(48);
+ $img->scaleImage(48);
- $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 6 );
+ $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 6 );
- if($r === false)
- $photo_failure = true;
+ if($r === false)
+ $photo_failure = true;
- if(! $photo_failure) {
- q("UPDATE `photo` SET `profile` = 1 WHERE `resource-id` = '%s' ",
- dbesc($hash)
- );
+ if(! $photo_failure) {
+ q("UPDATE `photo` SET `profile` = 1 WHERE `resource-id` = '%s' ",
+ dbesc($hash)
+ );
+ }
}
}
+ 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(),
@@ -239,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) {
@@ -265,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(),
@@ -276,16 +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;
}}
@@ -303,29 +397,82 @@ 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;
}
- $username = ((x($_POST,'username')) ? $_POST['username'] : ((x($_GET,'username')) ? $_GET['username'] : ''));
- $email = ((x($_POST,'email')) ? $_POST['email'] : ((x($_GET,'email')) ? $_GET['email'] : ''));
- $nickname = ((x($_POST,'nickname')) ? $_POST['nickname'] : ((x($_GET,'nickname')) ? $_GET['nickname'] : ''));
+ 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'] : ''));
+ $nickname = ((x($_POST,'nickname')) ? $_POST['nickname'] : ((x($_GET,'nickname')) ? $_GET['nickname'] : ''));
+ $photo = ((x($_POST,'photo')) ? $_POST['photo'] : ((x($_GET,'photo')) ? hex2bin($_GET['photo']) : ''));
+
+ $noid = get_config('system','no_openid');
+
+ if($noid) {
+ $oidhtml = '';
+ $fillwith = '';
+ $fillext = '';
+ $oidlabel = '';
+ }
+ else {
+ $oidhtml = '';
+ $fillwith = t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.");
+ $fillext = t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.');
+ $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 = '';
+ }
+ 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 Creative Commons Attribution 3.0 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'))
? '
' . $a->config['register_text'] . '
'
: "" ),
- '$namelabel' => t('Your Full Name (e.g. Joe Smith): '),
+ '$fillwith' => $fillwith,
+ '$fillext' => $fillext,
+ '$oidlabel' => $oidlabel,
+ '$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,
'$nickname' => $nickname,
+ '$license' => $license,
'$sitename' => $a->get_hostname()
));
return $o;