X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregister.php;h=6b4f2b1f5cb385e7127bf8fe42191d1977c42d1e;hb=796056a6feaf305dd9fb7c97bb43cdbc75ad0641;hp=76c5073d59c3aed5c38da966493da661dc75faf7;hpb=0c52866693add20fc4476e26a5c7ae14f5d5272a;p=friendica.git

diff --git a/mod/register.php b/mod/register.php
index 76c5073d59..6b4f2b1f5c 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @file_tag_list_to_file mod/register.php
+ * @file mod/register.php
  */
 
 use Friendica\App;
@@ -12,10 +12,10 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Model\User;
+use Friendica\Module\Tos;
 use Friendica\Util\DateTimeFormat;
 
 require_once 'include/enotify.php';
-require_once 'include/bbcode.php';
 
 function register_post(App $a)
 {
@@ -134,7 +134,7 @@ function register_post(App $a)
 		}
 
 		// send email to admins
-		$admin_mail_list = "'" . implode("','", array_map(dbesc, explode(",", str_replace(" ", "", $a->config['admin_email'])))) . "'";
+		$admin_mail_list = "'" . implode("','", array_map("dbesc", explode(",", str_replace(" ", "", $a->config['admin_email'])))) . "'";
 		$adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s)",
 			$admin_mail_list
 		);
@@ -233,8 +233,8 @@ function register_content(App $a)
 		$profile_publish = replace_macros($publish_tpl, [
 			'$instance' => 'reg',
 			'$pubdesc' => L10n::t('Include your profile in member directory?'),
-			'$yes_selected' => ' checked="checked" ',
-			'$no_selected' => '',
+			'$yes_selected' => '',
+			'$no_selected' => ' checked="checked"',
 			'$str_yes' => L10n::t('Yes'),
 			'$str_no' => L10n::t('No'),
 		]);
@@ -253,17 +253,19 @@ function register_content(App $a)
 
 	$tpl = $arr['template'];
 
+	$tos = new Tos();
+
 	$o = replace_macros($tpl, [
 		'$oidhtml' => $oidhtml,
 		'$invitations' => Config::get('system', 'invitation_only'),
 		'$permonly'    => $a->config['register_policy'] == REGISTER_APPROVE,
 		'$permonlybox' => ['permonlybox', L10n::t('Note for the admin'), '', L10n::t('Leave a message for the admin, why you want to join this node')],
 		'$invite_desc' => L10n::t('Membership on this site is by invitation only.'),
-		'$invite_label' => L10n::t('Your invitation ID: '),
+		'$invite_label' => L10n::t('Your invitation code: '),
 		'$invite_id'  => $invite_id,
 		'$realpeople' => $realpeople,
 		'$regtitle'  => L10n::t('Registration'),
-		'$registertext' => x($a->config, 'register_text') ? BBCode::convert($a->config['register_text']) : "",
+		'$registertext' => BBCode::convert(Config::get('config', 'register_text', '')),
 		'$fillwith'  => $fillwith,
 		'$fillext'   => $fillext,
 		'$oidlabel'  => $oidlabel,
@@ -285,7 +287,14 @@ function register_content(App $a)
 		'$sitename'  => $a->get_hostname(),
 		'$importh'   => L10n::t('Import'),
 		'$importt'   => L10n::t('Import your profile to this friendica instance'),
-		'$form_security_token' => get_form_security_token("register")
+		'$showtoslink' => Config::get('system', 'tosdisplay'),
+		'$tostext'   => L10n::t('Terms of Service'),
+		'$showprivstatement' => Config::get('system', 'tosprivstatement'),
+		'$privstatement' => $tos->privacy_complete,
+		'$baseurl'   => System::baseurl(),
+		'$form_security_token' => get_form_security_token("register"),
+		'$explicit_content' => Config::get('system', 'explicit_content', false),
+		'$explicit_content_note' => L10n::t('Note: This node explicitly contains adult content')
 	]);
 	return $o;
 }