X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregister.php;h=cb9c1729f5891f93021e7f04da2982e91cd22941;hb=10ede7314136edb1c475e1af546a59ff4c5648cf;hp=dd953de35619119cb7a7d898a4e11f974bec9452;hpb=a020086128e3d903a030cc3b3d403ab9bce02d88;p=friendica.git
diff --git a/mod/register.php b/mod/register.php
index dd953de356..cb9c1729f5 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -1,11 +1,15 @@
config['register_policy'] != REGISTER_APPROVE) {
- $url = App::get_baseurl() . '/profile/' . $user['nickname'];
+ $url = System::baseUrl() . '/profile/' . $user['nickname'];
proc_run(PRIORITY_LOW, "include/directory.php", $url);
}
@@ -81,17 +85,17 @@ function register_post(App &$a) {
}
// 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 +107,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();
@@ -142,9 +146,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 +162,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,7 +176,7 @@ 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.
@@ -282,7 +286,7 @@ function register_content(App &$a) {
'$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 +298,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;