X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fregister.php;h=cd6385144cd21e660b13327d073b60f136357160;hb=2336fa9d74ff395439066e9ffcf77a83fb0a35c1;hp=dd953de35619119cb7a7d898a4e11f974bec9452;hpb=4f25396faeaa501907e93b24ee51ebdd08f84993;p=friendica.git
diff --git a/mod/register.php b/mod/register.php
index dd953de356..cd6385144c 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -1,11 +1,18 @@
$_POST);
call_hooks('register_post', $arr);
- $max_dailies = intval(get_config('system','max_daily_registrations'));
+ $max_dailies = intval(Config::get('system','max_daily_registrations'));
if($max_dailies) {
$r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
if($r && $r[0]['total'] >= $max_dailies) {
@@ -64,12 +71,12 @@ function register_post(App &$a) {
$user = $result['user'];
if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) {
- $url = App::get_baseurl() . '/profile/' . $user['nickname'];
- proc_run(PRIORITY_LOW, "include/directory.php", $url);
+ $url = System::baseUrl() . '/profile/' . $user['nickname'];
+ Worker::add(PRIORITY_LOW, "Directory", $url);
}
- $using_invites = get_config('system','invitation_only');
- $num_invites = get_config('system','number_invites');
+ $using_invites = Config::get('system','invitation_only');
+ $num_invites = Config::get('system','number_invites');
$invite_id = ((x($_POST,'invite_id')) ? notags(trim($_POST['invite_id'])) : '');
@@ -77,21 +84,21 @@ function register_post(App &$a) {
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);
+ PConfig::set($user['uid'],'system','invites_remaining',$num_invites);
}
// Only send a password mail when the password wasn't manually provided
- if (!x($_POST,'password1') OR !x($_POST,'confirm')) {
+ if (!x($_POST,'password1') || !x($_POST,'confirm')) {
$res = send_register_open_eml(
$user['email'],
$a->config['sitename'],
- App::get_baseurl(),
+ System::baseUrl(),
$user['username'],
$result['password']);
if($res) {
info( t('Registration successful. Please check your email for further instructions.') . EOL ) ;
- goaway(z_root());
+ goaway(System::baseUrl());
} else {
notice(
sprintf(
@@ -103,13 +110,13 @@ function register_post(App &$a) {
}
} else {
info( t('Registration successful.') . EOL ) ;
- goaway(z_root());
+ goaway(System::baseUrl());
}
}
elseif($a->config['register_policy'] == REGISTER_APPROVE) {
if(! strlen($a->config['admin_email'])) {
notice( t('Your registration can not be processed.') . EOL);
- goaway(z_root());
+ goaway(System::baseUrl());
}
$hash = random_string();
@@ -125,7 +132,7 @@ function register_post(App &$a) {
// 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);
+ PConfig::set($user['uid'],'system','invites_remaining',$num_invites);
}
// send email to admins
@@ -142,9 +149,9 @@ function register_post(App &$a) {
'source_name' => $user['username'],
'source_mail' => $user['email'],
'source_nick' => $user['nickname'],
- 'source_link' => App::get_baseurl()."/admin/users/",
- 'link' => App::get_baseurl()."/admin/users/",
- 'source_photo' => App::get_baseurl() . "/photo/avatar/".$user['uid'].".jpg",
+ 'source_link' => System::baseUrl()."/admin/users/",
+ 'link' => System::baseUrl()."/admin/users/",
+ 'source_photo' => System::baseUrl() . "/photo/avatar/".$user['uid'].".jpg",
'to_email' => $admin['email'],
'uid' => $admin['uid'],
'language' => ($admin['language']?$admin['language']:'en'),
@@ -158,7 +165,7 @@ function register_post(App &$a) {
$user['username']);
info( t('Your registration is pending approval by the site owner.') . EOL ) ;
- goaway(z_root());
+ goaway(System::baseUrl());
}
@@ -172,13 +179,13 @@ function register_post(App &$a) {
if(! function_exists('register_content')) {
-function register_content(App &$a) {
+function register_content(App $a) {
// 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');
+ $block = Config::get('system','block_extended_register');
if(local_user() && ($block)) {
notice("Permission denied." . EOL);
@@ -190,7 +197,7 @@ function register_content(App &$a) {
return;
}
- $max_dailies = intval(get_config('system','max_daily_registrations'));
+ $max_dailies = intval(Config::get('system','max_daily_registrations'));
if($max_dailies) {
$r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
if($r && $r[0]['total'] >= $max_dailies) {
@@ -213,7 +220,7 @@ function register_content(App &$a) {
$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');
+ $noid = Config::get('system','no_openid');
if($noid) {
$oidhtml = '';
@@ -232,7 +239,7 @@ function register_content(App &$a) {
$realpeople = ''; // t('Members of this network prefer to communicate with real people who use their real names.');
- if(get_config('system','publish_all')) {
+ if(Config::get('system','publish_all')) {
$profile_publish_reg = '';
}
else {
@@ -262,7 +269,7 @@ function register_content(App &$a) {
$o = replace_macros($o, array(
'$oidhtml' => $oidhtml,
- '$invitations' => get_config('system','invitation_only'),
+ '$invitations' => Config::get('system','invitation_only'),
'$permonly' => $a->config['register_policy'] == REGISTER_APPROVE,
'$permonlybox' => array('permonlybox', t('Note for the admin'), '', t('Leave a message for the admin, why you want to join this node')),
'$invite_desc' => t('Membership on this site is by invitation only.'),
@@ -278,11 +285,11 @@ function register_content(App &$a) {
'$oidlabel' => $oidlabel,
'$openid' => $openid_url,
'$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith, real or real-looking' . "\x29" . ': '),
- '$addrlabel' => t('Your Email Address: '),
+ '$addrlabel' => t('Your Email Address: (Initial information will be send there, so this has to be an existing 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\'.')),
+ '$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,
'$publish' => $profile_publish,
@@ -294,7 +301,7 @@ function register_content(App &$a) {
'$sitename' => $a->get_hostname(),
'$importh' => t('Import'),
'$importt' => t('Import your profile to this friendica instance'),
-
+ '$form_security_token' => get_form_security_token("register")
));
return $o;