diff --git a/Code/Module/Admin/Site.php b/Code/Module/Admin/Site.php index 205199e86..772d1f6d8 100644 --- a/Code/Module/Admin/Site.php +++ b/Code/Module/Admin/Site.php @@ -9,6 +9,7 @@ use Code\Access\PermissionRoles; use Code\Lib\Channel; use Code\Render\Theme; use Code\Lib\Addon; +use Code\Module\Legal; class Site { @@ -262,7 +263,7 @@ class Site $legal = PConfig::Get(App::$sys_channel['channel_id'], 'system', 'legal'); if (!$legal) { - $legal = file_get_contents('doc/en/TermsOfService.mc'); + $legal = file_get_contents(Legal::LEGAL_SOURCE); } $homelogin = get_config('system', 'login_on_homepage'); diff --git a/Code/Module/Legal.php b/Code/Module/Legal.php index 2c63c85df..b505821a4 100644 --- a/Code/Module/Legal.php +++ b/Code/Module/Legal.php @@ -4,19 +4,20 @@ namespace Code\Module; use App; use Code\Lib\PConfig; use Code\Web\Controller; +use Code\Render\Theme; class Legal extends Controller { - const LEGAL_SOURCE = 'doc/en/TermsOfService.mc'; + const LEGAL_SOURCE = 'doc/src/TermsOfService.mc'; public function get() { - $sys_channel = App::$sys_channel; - $site_document = PConfig::Get($sys_channel['channel_id'],'system', 'legal'); - if (!$site_document) { - $site_document = file_get_contents($this::LEGAL_SOURCE); - } - $html = bbcode($site_document); - return $html; + $sys_channel = App::$sys_channel; + $site_document = PConfig::Get($sys_channel['channel_id'],'system', 'legal'); + if (!$site_document) { + $site_document = file_get_contents(self::LEGAL_SOURCE); + } + return replace_macros(Theme::get_template('legal.tpl'), ['$content' => bbcode($site_document)]); + } } diff --git a/Code/Module/Register.php b/Code/Module/Register.php index fafaafee7..afcbd3777 100644 --- a/Code/Module/Register.php +++ b/Code/Module/Register.php @@ -247,7 +247,7 @@ class Register extends Controller $tosurl = get_config('system', 'tos_url'); if (!$tosurl) { - $tosurl = z_root() . '/help/TermsOfService'; + $tosurl = z_root() . '/legal'; } $toslink = '' . t('Terms of Service') . ''; diff --git a/doc/site/README.mc b/doc/site/README.mc index 2c359cc98..94c07c1c9 100644 --- a/doc/site/README.mc +++ b/doc/site/README.mc @@ -1,5 +1 @@ The site directory is for local modifications of documentation files. - -Please copy the file doc/en/TermsOfService.mc to doc/site/en/TermsOfService.mc and add -the contact details for the site owner per the GDPR. You may also translate documentation -into other languages as desired. diff --git a/doc/en/TermsOfService.mc b/doc/src/TermsOfService.mc similarity index 100% rename from doc/en/TermsOfService.mc rename to doc/src/TermsOfService.mc diff --git a/view/ca/lostpass_eml.tpl b/view/ca/lostpass_eml.tpl index 6a1d0bb80..4c2f077a2 100644 --- a/view/ca/lostpass_eml.tpl +++ b/view/ca/lostpass_eml.tpl @@ -31,5 +31,5 @@ Atentament, -- Condicions del servei: -{{$siteurl}}/help/TermsOfService +{{$siteurl}}/legal \ No newline at end of file diff --git a/view/ca/passchanged_eml.tpl b/view/ca/passchanged_eml.tpl index fb9459940..dc434011b 100644 --- a/view/ca/passchanged_eml.tpl +++ b/view/ca/passchanged_eml.tpl @@ -21,4 +21,4 @@ Atentament, -- Condicions del servei: -{{$siteurl}}/help/TermsOfService +{{$siteurl}}/legal diff --git a/view/ca/register_verify_eml.tpl b/view/ca/register_verify_eml.tpl index f808d3ce5..d1f1cfa5a 100644 --- a/view/ca/register_verify_eml.tpl +++ b/view/ca/register_verify_eml.tpl @@ -31,4 +31,4 @@ Gràcies. -- Condicions del servei: -{{$siteurl}}/help/TermsOfService +{{$siteurl}}/legal diff --git a/view/en-au/register_verify_member.tpl b/view/en-au/register_verify_member.tpl index 9bdd7fa51..a78e3fe71 100644 --- a/view/en-au/register_verify_member.tpl +++ b/view/en-au/register_verify_member.tpl @@ -31,5 +31,5 @@ Thank you. -- Terms Of Service: -{{$siteurl}}/help/TermsOfService +{{$siteurl}}/legal diff --git a/view/en-gb/register_verify_member.tpl b/view/en-gb/register_verify_member.tpl index 9bdd7fa51..a78e3fe71 100644 --- a/view/en-gb/register_verify_member.tpl +++ b/view/en-gb/register_verify_member.tpl @@ -31,5 +31,5 @@ Thank you. -- Terms Of Service: -{{$siteurl}}/help/TermsOfService +{{$siteurl}}/legal diff --git a/view/en/lostpass_eml.tpl b/view/en/lostpass_eml.tpl index 285a65ade..a95ca4e6d 100644 --- a/view/en/lostpass_eml.tpl +++ b/view/en/lostpass_eml.tpl @@ -31,5 +31,5 @@ Sincerely, -- Terms Of Service: -{{$siteurl}}/help/TermsOfService +{{$siteurl}}/legal diff --git a/view/en/passchanged_eml.tpl b/view/en/passchanged_eml.tpl index 61bf27943..0de095116 100644 --- a/view/en/passchanged_eml.tpl +++ b/view/en/passchanged_eml.tpl @@ -21,5 +21,5 @@ Sincerely, -- Terms Of Service: -{{$siteurl}}/help/TermsOfService +{{$siteurl}}/legal diff --git a/view/en/register_verify_member.tpl b/view/en/register_verify_member.tpl index 9bdd7fa51..a78e3fe71 100644 --- a/view/en/register_verify_member.tpl +++ b/view/en/register_verify_member.tpl @@ -31,5 +31,5 @@ Thank you. -- Terms Of Service: -{{$siteurl}}/help/TermsOfService +{{$siteurl}}/legal diff --git a/view/es-es/lostpass_eml.tpl b/view/es-es/lostpass_eml.tpl index 1e92ee758..07d545ec4 100644 --- a/view/es-es/lostpass_eml.tpl +++ b/view/es-es/lostpass_eml.tpl @@ -31,5 +31,5 @@ Atentamente, -- Términos del servicio -{{$siteurl}}/help/TermsOfService +{{$siteurl}}/legal \ No newline at end of file diff --git a/view/es-es/passchanged_eml.tpl b/view/es-es/passchanged_eml.tpl index 9e81f89eb..0debe4a6c 100644 --- a/view/es-es/passchanged_eml.tpl +++ b/view/es-es/passchanged_eml.tpl @@ -21,4 +21,4 @@ Atentamente, -- Términos del servicio -{{$siteurl}}/help/TermsOfService +{{$siteurl}}/legal diff --git a/view/es-es/register_verify_member.tpl b/view/es-es/register_verify_member.tpl index 1d3c24e80..d80f5dd4f 100644 --- a/view/es-es/register_verify_member.tpl +++ b/view/es-es/register_verify_member.tpl @@ -31,4 +31,4 @@ Gracias. -- Términos del servicio -{{$siteurl}}/help/TermsOfService +{{$siteurl}}/legal diff --git a/view/pl/passchanged_eml.tpl b/view/pl/passchanged_eml.tpl index 51f9123e1..16b7e46cb 100644 --- a/view/pl/passchanged_eml.tpl +++ b/view/pl/passchanged_eml.tpl @@ -18,4 +18,4 @@ Z poważaniem, -- Warunki świadczenia usług: -{{$siteurl}}/help/TermsOfService \ No newline at end of file +{{$siteurl}}/legal \ No newline at end of file diff --git a/view/pl/register_verify_member.tpl b/view/pl/register_verify_member.tpl index 8de6226ce..0fd056ceb 100644 --- a/view/pl/register_verify_member.tpl +++ b/view/pl/register_verify_member.tpl @@ -29,5 +29,5 @@ Dziękjemy. -- Warunki świadczenia usług: -{{$siteurl}}/help/TermsOfService +{{$siteurl}}/legal diff --git a/view/ru/lostpass_eml.tpl b/view/ru/lostpass_eml.tpl index 6cff3c485..3829f2537 100644 --- a/view/ru/lostpass_eml.tpl +++ b/view/ru/lostpass_eml.tpl @@ -31,5 +31,5 @@ -- Условия использования сервиса: -{{$siteurl}}/help/TermsOfService +{{$siteurl}}/legal \ No newline at end of file diff --git a/view/ru/passchanged_eml.tpl b/view/ru/passchanged_eml.tpl index a9b689f1d..c71702c14 100644 --- a/view/ru/passchanged_eml.tpl +++ b/view/ru/passchanged_eml.tpl @@ -21,4 +21,4 @@ -- Условия предоставления услуг: -{{$siteurl}}/help/TermsOfService +{{$siteurl}}/legal diff --git a/view/ru/register_verify_member.tpl b/view/ru/register_verify_member.tpl index 347ae870f..731226576 100644 --- a/view/ru/register_verify_member.tpl +++ b/view/ru/register_verify_member.tpl @@ -31,4 +31,4 @@ -- Условия предоставления услуг: -{{$siteurl}}/help/TermsOfService +{{$siteurl}}/legal diff --git a/view/tpl/legal.tpl b/view/tpl/legal.tpl new file mode 100644 index 000000000..a3914c004 --- /dev/null +++ b/view/tpl/legal.tpl @@ -0,0 +1,5 @@ +
+
+ {{$content}} +
+
diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl deleted file mode 100755 index e15494adf..000000000 --- a/view/tpl/siteinfo.tpl +++ /dev/null @@ -1,21 +0,0 @@ -
-

{{$title}}

- -project icon

- -

{{$sitenametxt}}

- -
{{$sitename}}

- -

{{$headline}}

- -
{{if $site_about}}{{$site_about}}{{else}}--{{/if}}

- -

{{$admin_headline}}

- -
{{if $admin_about}}{{$admin_about}}{{else}}--{{/if}}

- -
 {{$terms}}
- - -