From 99bd0712b6170b337de6d1c31db7c66ad8a18767 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 6 Aug 2013 17:15:41 -0700 Subject: Add a site access policy (to determine if this is really a public site or just an open site) and add an orphan flag to xchans in case all their hublocs go away. Get rid of a couple of DO NOT EDIT template messages which were still lurking in the tree. --- view/en/htconfig.tpl | 14 ++++++++++++++ view/ru/strings.php | 2 +- view/tpl/admin_plugins.tpl | 5 ----- view/tpl/api_user_xml.tpl | 5 ----- 4 files changed, 15 insertions(+), 11 deletions(-) (limited to 'view') diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 493cb5d00..0417e9af2 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -33,6 +33,7 @@ $a->config['system']['baseurl'] = '{{$siteurl}}'; $a->config['system']['sitename'] = "Red Matrix"; $a->config['system']['location_hash'] = '{{$site_id}}'; + // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. // Be certain to create your own personal account before setting // REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on @@ -44,6 +45,19 @@ $a->config['system']['register_policy'] = REGISTER_OPEN; $a->config['system']['register_text'] = ''; $a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Site access restrictions. By default we will create private sites. +// Your choices are ACCESS_PRIVATE, ACCESS_PAID, and ACCESS_FREE. +// If you leave REGISTER_OPEN above, anybody may register on your +// site, however your site will not be listed anywhere as an open +// registration hub. We will use the system access policy (below) +// to determine whether or not to list your site in the directory +// as an open hub where anybody may create accounts. Your choice of +// paid or free determines how these listings will be presented. + +$a->config['system']['access_policy'] = ACCESS_PRIVATE; + + // Maximum size of an imported message, 0 is unlimited $a->config['system']['max_import_size'] = 200000; diff --git a/view/ru/strings.php b/view/ru/strings.php index 90e08ca4a..03d38589a 100644 --- a/view/ru/strings.php +++ b/view/ru/strings.php @@ -1172,7 +1172,7 @@ $a->strings["Connections: settings for %s"] = ""; $a->strings["When receiving a channel introduction, any permissions provided here will be applied to the new connection automatically and the introduction approved. Leave this page if you do not wish to use this feature."] = ""; $a->strings["Slide to adjust your degree of friendship"] = ""; $a->strings["Connection has no individual permissions!"] = ""; -$a->strings["This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"] = ""; +$a->strings["This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\""] = ""; $a->strings["Profile Visibility"] = ""; $a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = ""; $a->strings["Contact Information / Notes"] = ""; diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index 307814e87..01c178c3e 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}

{{$title}} - {{$page}}

diff --git a/view/tpl/api_user_xml.tpl b/view/tpl/api_user_xml.tpl index d7efcf3fb..3b51992f6 100755 --- a/view/tpl/api_user_xml.tpl +++ b/view/tpl/api_user_xml.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} {{$user.id}} {{$user.name}} -- cgit v1.2.3