X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregister.php;h=3b26f69712f56d4694378a334e488dba5afdd126;hb=1b14c1733ba9fcd016eb7c8ed79a25633a5d08ae;hp=53ead682f16be7f85e491552fa85ca2ae7bacea3;hpb=6695b4a203ab03941c8b3305a3e55cc02b85a5ac;p=friendica.git
diff --git a/mod/register.php b/mod/register.php
index 53ead682f1..3b26f69712 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -14,15 +14,15 @@ function register_post(&$a) {
$verified = 1;
break;
- case REGISTER_VERIFY:
+ case REGISTER_APPROVE:
$blocked = 1;
- $verify = 0;
+ $verified = 0;
break;
default:
case REGISTER_CLOSED:
if((! x($_SESSION,'authenticated') && (! x($_SESSION,'administrator')))) {
- notice( "Permission denied." . EOL );
+ notice( t('Permission denied.') . EOL );
return;
}
$blocked = 1;
@@ -32,30 +32,71 @@ function register_post(&$a) {
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']));
+ $email = notags(trim($_POST['email']));
+ if(x($_POST,'openid_url'))
+ $openid_url = notags(trim($_POST['openid_url']));
+
+
+ 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');
+ goaway($openid->authUrl());
+ // NOTREACHED
+ }
- if((! x($username)) || (! x($email))) {
- notice( "Please enter the required information.". EOL );
+ notice( t('Please enter the required information.') . EOL );
return;
}
$err = '';
- if(!eregi('[A-Za-z0-9._%-]+@[A-Za-z0-9._%-]+\.[A-Za-z]{2,6}',$email))
- $err .= " Not valid email.";
- if(strlen($username) > 40)
- $err .= " Please use a shorter name.";
+
+ if(strlen($username) > 48)
+ $err .= t('Please use a shorter name.') . EOL;
if(strlen($username) < 3)
- $err .= " Name too short.";
- $r = q("SELECT `uid` FROM `user`
- WHERE `email` = '%s' LIMIT 1",
- dbesc($email)
- );
- if($r !== false && count($r))
- $err .= " This email address is already registered.";
+ $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' );
+
+ $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(! allowed_email($email))
+ $err .= t('Your email domain is not among those allowed on this site.') . EOL;
+
+ if((! valid_email($email)) || (! validate_email($email)))
+ $err .= t('Not a valid email address.') . EOL;
+
+ $nickname = $_POST['nickname'] = strtolower($nickname);
+
+ 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.') . EOL;
+
if(strlen($err)) {
- notice( $err . EOL );
+ notice( $err );
return;
}
@@ -79,14 +120,32 @@ function register_post(&$a) {
$pkey = openssl_pkey_get_details($res);
$pubkey = $pkey["key"];
- $r = q("INSERT INTO `user` ( `username`, `password`, `email`,
- `pubkey`, `prvkey`, `verified`, `blocked` )
- VALUES ( '%s', '%s', '%s', '%s', '%s', %d, %d )",
+ $sres=openssl_pkey_new(array(
+ '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`, `verified`, `blocked` )
+ VALUES ( '%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),
intval($verified),
intval($blocked)
);
@@ -101,49 +160,97 @@ function register_post(&$a) {
$newuid = intval($r[0]['uid']);
}
else {
- notice( "An error occurred during registration. Please try again." . EOL );
+ notice( t('An error occurred during registration. Please try again.') . EOL );
return;
}
- if(x($newuid) !== NULL) {
+ if(x($newuid) !== false) {
$r = q("INSERT INTO `profile` ( `uid`, `profile-name`, `is-default`, `name`, `photo`, `thumb` )
VALUES ( %d, '%s', %d, '%s', '%s', '%s' ) ",
intval($newuid),
'default',
1,
dbesc($username),
- dbesc($a->get_baseurl() . '/images/default-profile.jpg'),
- dbesc($a->get_baseurl() . '/images/default-profile-sm.jpg')
+ dbesc($a->get_baseurl() . "/photo/profile/{$newuid}.jpg"),
+ dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg")
);
if($r === false) {
- notice( "An error occurred creating your default profile. Please try again." . EOL );
+ notice( t('An error occurred creating your default profile. Please try again.') . EOL );
// Start fresh next time.
$r = q("DELETE FROM `user` WHERE `uid` = %d",
intval($newuid));
return;
}
- $r = q("INSERT INTO `contact` ( `uid`, `created`, `self`, `name`, `photo`, `thumb`, `blocked`, `pending`, `url`,
- `request`, `notify`, `poll`, `confirm` )
- VALUES ( %d, '%s', 1, '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s' ) ",
+ $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', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
intval($newuid),
datetime_convert(),
dbesc($username),
- dbesc($a->get_baseurl() . '/images/default-profile.jpg'),
- dbesc($a->get_baseurl() . '/images/default-profile-sm.jpg'),
- dbesc($a->get_baseurl() . '/profile/' . intval($newuid)),
- dbesc($a->get_baseurl() . '/dfrn_request/' . intval($newuid)),
- dbesc($a->get_baseurl() . '/dfrn_notify/' . intval($newuid)),
- dbesc($a->get_baseurl() . '/dfrn_poll/' . intval($newuid)),
- dbesc($a->get_baseurl() . '/dfrn_confirm/' . intval($newuid))
-
+ 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"),
+ dbesc($a->get_baseurl() . "/dfrn_poll/$nickname"),
+ dbesc($a->get_baseurl() . "/dfrn_confirm/$nickname"),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert())
);
}
+ $use_gravatar = ((get_config('system','no_gravatar')) ? false : true);
+ if($use_gravatar) {
+
+ require_once('include/Photo.php');
+
+ $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(),
@@ -152,18 +259,52 @@ function register_post(&$a) {
'$password' => $new_password,
'$uid' => $newuid ));
- $res = mail($email,"Registration details for {$a->config['sitename']}",$email_tpl,"From: Administrator@{$_SERVER[SERVER_NAME]}");
+ $res = mail($email, t('Registration details for ') . $a->config['sitename'],
+ $email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
- }
- if($res) {
- notice( "Registration successful. Please check your email for further instructions." . EOL ) ;
- goaway($a->get_baseurl());
+ if($res) {
+ notice( t('Registration successful. Please check your email for further instructions.') . EOL ) ;
+ goaway($a->get_baseurl());
+ }
+ else {
+ notice( t('Failed to send email message. Here is the message that failed.') . $email_tpl . EOL );
+ }
}
- else {
- notice( "Failed to send email message. Here is the message that failed. $email_tpl " . EOL );
+ 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());
+ }
+
+ $hash = random_string();
+ $r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password` ) VALUES ( '%s', '%s', %d, '%s' ) ",
+ dbesc($hash),
+ dbesc(datetime_convert()),
+ intval($newuid),
+ dbesc($new_password)
+ );
+
+ $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(),
+ '$username' => $username,
+ '$email' => $email,
+ '$password' => $new_password,
+ '$uid' => $newuid,
+ '$hash' => $hash
+ ));
+
+ $res = mail($a->config['admin_email'], t('Registration request at ') . $a->config['sitename'],
+ $email_tpl,'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
+
+ if($res) {
+ notice( t('Your registration is pending approval by the site owner.') . EOL ) ;
+ goaway($a->get_baseurl());
+ }
+
}
-
return;
}}
@@ -175,13 +316,42 @@ 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");
- $o = replace_macros($o, array('$registertext' =>((x($a->config,'register_text'))? $a->config['register_text'] : "" )));
+ $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'] : ''));
+
+ $o = load_view_file("view/register.tpl");
+ $o = replace_macros($o, array(
+ '$regtitle' => t('Registration'),
+ '$registertext' =>((x($a->config,'register_text'))
+ ? '' . $a->config['register_text'] . '
'
+ : "" ),
+ '$fillwith' => t('You may ' . "\x28" . 'optionally' . "\x29" . ' fill in this form via OpenID by supplying your OpenID and clicking ') . "'" . t('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 ' . "\x28" . 'optional' . "\x29" . ': '),
+ '$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: '),
+ '$regbutt' => t('Register'),
+ '$username' => $username,
+ '$email' => $email,
+ '$nickname' => $nickname,
+ '$sitename' => $a->get_hostname()
+ ));
return $o;
}}