X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregister.php;h=68c7297c90267a571a38b2202b766bd1f47905bc;hb=a51a1007a38e763adcae5ea3865745b2ae80f921;hp=451cb12465635cda2fdc3dded1259e39b5f216ff;hpb=2a47f5ab463012d63cf72a7729627f00fd90f721;p=friendica.git
diff --git a/mod/register.php b/mod/register.php
index 451cb12465..68c7297c90 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -30,55 +30,71 @@ 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'])) : '');
if((! x($username)) || (! x($email)) || (! x($nickname))) {
+ if($openid_url) {
+ $_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;
}
$err = '';
- // TODO fix some of these regex's for int'l/utf-8.
- if(!eregi('[A-Za-z0-9._%-]+@[A-Za-z0-9._%-]+\.[A-Za-z]{2,6}',$email))
- $err .= t(' Not a valid email address.');
if(strlen($username) > 48)
- $err .= t(' Please use a shorter name.');
+ $err .= t('Please use a shorter name.') . EOL;
if(strlen($username) < 3)
- $err .= t(' Name too short.');
+ $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
+
+ // 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' );
- if(! preg_match("/^[a-zA-Z]* [a-zA-Z]*$/",$username))
- $err .= t(' That doesn\'t appear to be your full name.');
+ // 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(! allowed_email($email))
+ $err .= t('Your email domain is not among those allowed on this site.') . EOL;
- $r = q("SELECT `uid` FROM `user`
- WHERE `email` = '%s' LIMIT 1",
- dbesc($email)
- );
+ if((! valid_email($email)) || (! validate_email($email)))
+ $err .= t('Not a valid email address.') . EOL;
- if($r !== false && count($r))
- $err .= t(' Your email address is already registered on this system.') ;
+ $nickname = $_POST['nickname'] = strtolower($nickname);
- if(! preg_match("/^[a-zA-Z][a-zA-Z0-9\-\_]*$/",$nickname))
- $err .= t(' Nickname must start with a letter and contain only letters, numbers, dashes, or underscore.') ;
+ if(! preg_match("/^[a-z][a-z0-9\-\_]*$/",$nickname))
+ $err .= t('Your "nickname" can only contain "a-z", "0-9", "-", and "_", and must also begin with a letter.') . EOL;
$r = q("SELECT `uid` FROM `user`
WHERE `nickname` = '%s' LIMIT 1",
dbesc($nickname)
);
if(count($r))
- $err .= t(' Nickname is already registered. Please choose another.');
+ $err .= t('Nickname is already registered. Please choose another.') . EOL;
if(strlen($err)) {
- notice( $err . EOL );
+ notice( $err );
return;
}
@@ -87,12 +103,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);
@@ -102,15 +123,46 @@ function register_post(&$a) {
$pkey = openssl_pkey_get_details($res);
$pubkey = $pkey["key"];
- $r = q("INSERT INTO `user` ( `username`, `password`, `email`, `nickname`,
- `pubkey`, `prvkey`, `verified`, `blocked` )
- VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
+ /**
+ *
+ * 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
+
+ $sprvkey = '';
+
+ openssl_pkey_export($sres, $sprvkey);
+
+ // Get public key
+
+ $spkey = openssl_pkey_get_details($sres);
+ $spubkey = $spkey["key"];
+
+ $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)
);
@@ -147,14 +199,16 @@ function register_post(&$a) {
intval($newuid));
return;
}
- $r = q("INSERT INTO `contact` ( `uid`, `created`, `self`, `name`, `photo`, `thumb`, `blocked`, `pending`, `url`,
+ $r = q("INSERT INTO `contact` ( `uid`, `created`, `self`, `name`, `nick`, `photo`, `thumb`, `micro`, `blocked`, `pending`, `url`,
`request`, `notify`, `poll`, `confirm`, `name-date`, `uri-date`, `avatar-date` )
- VALUES ( %d, '%s', 1, '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
+ VALUES ( %d, '%s', 1, '%s', '%s', '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
intval($newuid),
datetime_convert(),
dbesc($username),
+ dbesc($nickname),
dbesc($a->get_baseurl() . "/photo/profile/{$newuid}.jpg"),
dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg"),
+ dbesc($a->get_baseurl() . "/photo/micro/{$newuid}.jpg"),
dbesc($a->get_baseurl() . "/profile/$nickname"),
dbesc($a->get_baseurl() . "/dfrn_request/$nickname"),
dbesc($a->get_baseurl() . "/dfrn_notify/$nickname"),
@@ -168,8 +222,57 @@ function register_post(&$a) {
}
+ $use_gravatar = ((get_config('system','no_gravatar')) ? false : true);
+
+ // if we have an openid photo use it.
+ // otherwise unless it is disabled, use gravatar
+
+ if($use_gravatar || strlen($photo)) {
+
+ require_once('include/Photo.php');
+
+ 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();
+
+ $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 4 );
+
+ if($r === false)
+ $photo_failure = true;
+
+ $img->scaleImage(80);
+
+ $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 5 );
+
+ if($r === false)
+ $photo_failure = true;
+
+ $img->scaleImage(48);
+
+ $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 6 );
+
+ if($r === false)
+ $photo_failure = true;
+
+ if(! $photo_failure) {
+ q("UPDATE `photo` SET `profile` = 1 WHERE `resource-id` = '%s' ",
+ dbesc($hash)
+ );
+ }
+ }
+ }
+
if( $a->config['register_policy'] == REGISTER_OPEN ) {
- $email_tpl = file_get_contents("view/register_open_eml.tpl");
+ $email_tpl = load_view_file("view/register_open_eml.tpl");
$email_tpl = replace_macros($email_tpl, array(
'$sitename' => $a->config['sitename'],
'$siteurl' => $a->get_baseurl(),
@@ -179,7 +282,7 @@ function register_post(&$a) {
'$uid' => $newuid ));
$res = mail($email, t('Registration details for ') . $a->config['sitename'],
- $email_tpl, 'From: ' . t('Administrator@') . $_SERVER[SERVER_NAME]);
+ $email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
if($res) {
@@ -204,7 +307,7 @@ function register_post(&$a) {
dbesc($new_password)
);
- $email_tpl = file_get_contents("view/register_verify_eml.tpl");
+ $email_tpl = load_view_file("view/register_verify_eml.tpl");
$email_tpl = replace_macros($email_tpl, array(
'$sitename' => $a->config['sitename'],
'$siteurl' => $a->get_baseurl(),
@@ -216,7 +319,7 @@ function register_post(&$a) {
));
$res = mail($a->config['admin_email'], t('Registration request at ') . $a->config['sitename'],
- $email_tpl,'From: ' . t('Administrator@') . $_SERVER[SERVER_NAME]);
+ $email_tpl,'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
if($res) {
notice( t('Your registration is pending approval by the site owner.') . EOL ) ;
@@ -224,7 +327,6 @@ function register_post(&$a) {
}
}
-
return;
}}
@@ -236,17 +338,63 @@ function register_post(&$a) {
if(! function_exists('register_content')) {
function register_content(&$a) {
- if($a->config['register_policy'] == REGISTER_CLOSED) {
+ // logged in users can register others (people/pages/groups)
+ // even with closed registrations, unless specifically prohibited by site policy.
+ // 'block_extended_register' blocks all registrations, period.
+
+ $block = get_config('system','block_extended_register');
+
+ if((($a->config['register_policy'] == REGISTER_CLOSED) && (! getuid())) || ($block)) {
notice("Permission denied." . EOL);
return;
}
- $o = file_get_contents("view/register.tpl");
+ $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: ");
+ }
+
+ $license = t('Shared content is covered by the Creative Commons Attribution 3.0 license.');
+
+
+ $o = load_view_file("view/register.tpl");
$o = replace_macros($o, array(
+ '$oidhtml' => $oidhtml,
+ '$regtitle' => t('Registration'),
'$registertext' =>((x($a->config,'register_text'))
? '' . $a->config['register_text'] . '
'
: "" ),
- '$sitename' => $a->get_hostname()
+ '$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\'.'),
+ '$nicklabel' => t('Choose a nickname: '),
+ '$photo' => $photo,
+ '$regbutt' => t('Register'),
+ '$username' => $username,
+ '$email' => $email,
+ '$nickname' => $nickname,
+ '$license' => $license,
+ '$sitename' => $a->get_hostname()
));
return $o;