diff options
| -rw-r--r-- | mod/admin.php | 9 | ||||
| -rw-r--r-- | view/admin_site.tpl | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/mod/admin.php b/mod/admin.php index 3c73e8ad2..203d4873f 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -188,6 +188,8 @@ function admin_page_site_post(&$a){ $proxyuser = ((x($_POST,'proxyuser')) ? notags(trim($_POST['global_search_url'])) : ''); $proxy = ((x($_POST,'proxy')) ? notags(trim($_POST['global_search_url'])) : ''); $timeout = ((x($_POST,'timeout')) ? intval(trim($_POST['timeout'])) : 60); + $dfrn_only = ((x($_POST,'dfrn_only')) ? True : False); + $ostatus_disabled = !((x($_POST,'ostatus_disabled')) ? True : False); set_config('config','sitename',$sitename); @@ -230,7 +232,8 @@ function admin_page_site_post(&$a){ set_config('system','proxyuser', $proxyuser); set_config('system','proxy', $proxy); set_config('system','curl_timeout', $timeout); - + set_config('system','dfrn_only', $dfrn_only); + set_config('system','ostatus_disabled', $ostatus_disabled); info( t('Site settings updated.') . EOL); goaway($a->get_baseurl() . '/admin/site' ); @@ -313,7 +316,9 @@ function admin_page_site(&$a) { '$no_gravatar' => array('no_gravatar', t("Gravatar support"), !get_config('system','no_gravatar'), "Search new user's photo on Gravatar."), '$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), "Force users to register with a space between firstname and lastname in Full name, as an antispam measure"), '$no_utf' => array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','proxy'), "Use PHP UTF8 regular expressions"), - '$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), "Display a Community page showing all recent public postings on this site."), + '$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), "Display a Community page showing all recent public postings on this site."), + '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), "Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."), + '$dfrn_only' => array('dfrn_only', t('Only allow Friendika contacts'), get_config('system','dfrn_only'), "All contacts must use Friendika protocols. All other built-in communication protocols disabled."), '$verifyssl' => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."), '$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""), '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""), diff --git a/view/admin_site.tpl b/view/admin_site.tpl index c531cbf14..5ee0125de 100644 --- a/view/admin_site.tpl +++ b/view/admin_site.tpl @@ -30,6 +30,8 @@ {{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }} {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }} <div class="submit"><input type="submit" name="page_site" value="$submit" /></div> |