From f5d15a7ff8277d842e3bbdc83806cea4d74cb24c Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 28 Feb 2013 00:29:06 +0000 Subject: [PATCH] Add support for members-only addons --- mod/admin.php | 14 +++++++------- mod/apps.php | 9 ++++++++- view/admin_site.tpl | 2 +- view/smarty3/admin_site.tpl | 2 +- view/smarty3/admin_users.tpl | 2 +- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index ecca0b8be3..48cc4b1510 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -256,7 +256,8 @@ function admin_page_site_post(&$a){ $thread_allow = ((x($_POST,'thread_allow')) ? True : False); $newuser_private = ((x($_POST,'newuser_private')) ? True : False); $enotify_no_content = ((x($_POST,'enotify_no_content')) ? True : False); - + $private_addons = ((x($_POST,'private_addons')) ? True : False); + $no_multi_reg = ((x($_POST,'no_multi_reg')) ? True : False); $no_openid = !((x($_POST,'no_openid')) ? True : False); $no_regfullname = !((x($_POST,'no_regfullname')) ? True : False); @@ -283,7 +284,6 @@ function admin_page_site_post(&$a){ $temppath = ((x($_POST,'temppath')) ? notags(trim($_POST['temppath'])) : ''); $basepath = ((x($_POST,'basepath')) ? notags(trim($_POST['basepath'])) : ''); $singleuser = ((x($_POST,'singleuser')) ? notags(trim($_POST['singleuser'])) : ''); - if($ssl_policy != intval(get_config('system','ssl_policy'))) { if($ssl_policy == SSL_POLICY_FULL) { q("update `contact` set @@ -387,7 +387,8 @@ function admin_page_site_post(&$a){ set_config('system','dfrn_only', $dfrn_only); set_config('system','ostatus_disabled', $ostatus_disabled); set_config('system','diaspora_enabled', $diaspora_enabled); - + set_config('config','private_addons', $private_addons); + set_config('system','new_share', $new_share); set_config('system','hide_help', $hide_help); set_config('system','use_fulltext_engine', $use_fulltext_engine); @@ -396,8 +397,7 @@ function admin_page_site_post(&$a){ set_config('system','lockpath', $lockpath); set_config('system','temppath', $temppath); set_config('system','basepath', $basepath); - - + info( t('Site settings updated.') . EOL); goaway($a->get_baseurl(true) . '/admin/site' ); return; // NOTREACHED @@ -509,7 +509,8 @@ function admin_page_site(&$a) { '$thread_allow' => array('thread_allow', t("Allow threaded items"), get_config('system','thread_allow'), t("Allow infinite level threading for items on this site.")), '$newuser_private' => array('newuser_private', t("Private posts by default for new users"), get_config('system','newuser_private'), t("Set default post permissions for all new members to the default privacy group rather than public.")), '$enotify_no_content' => array('enotify_no_content', t("Don't include post content in email notifications"), get_config('system','enotify_no_content'), t("Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.")), - + '$private_addons' => array('private_addons', t("Disallow public access to addons listed in the apps menu."), get_config('config','private_addons'), t("Checking this box will restrict addons listed in the apps menu to members only.")), + '$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")), '$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")), '$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")), @@ -532,7 +533,6 @@ function admin_page_site(&$a) { '$lockpath' => array('lockpath', t("Path for lock file"), get_config('system','lockpath'), "The lock file is used to avoid multiple pollers at one time. Only define a folder here."), '$temppath' => array('temppath', t("Temp path"), get_config('system','temppath'), "If you have a restricted system where the webserver can't access the system temp path, enter another path here."), '$basepath' => array('basepath', t("Base path to installation"), get_config('system','basepath'), "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."), - '$form_security_token' => get_form_security_token("admin_site"), )); diff --git a/mod/apps.php b/mod/apps.php index 8049b45fb3..a821ef5d5b 100644 --- a/mod/apps.php +++ b/mod/apps.php @@ -1,7 +1,14 @@ apps)==0) notice( t('No installed applications.') . EOL); diff --git a/view/admin_site.tpl b/view/admin_site.tpl index 20a0839fee..0d3d451b1c 100644 --- a/view/admin_site.tpl +++ b/view/admin_site.tpl @@ -85,7 +85,7 @@ {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }} - + {{ inc field_checkbox.tpl with $field=$private_addons }}{{ endinc }}

$advanced

diff --git a/view/smarty3/admin_site.tpl b/view/smarty3/admin_site.tpl index c1442202d1..30678f1bf2 100644 --- a/view/smarty3/admin_site.tpl +++ b/view/smarty3/admin_site.tpl @@ -90,7 +90,7 @@ {{include file="field_checkbox.tpl" field=$thread_allow}} {{include file="field_checkbox.tpl" field=$newuser_private}} {{include file="field_checkbox.tpl" field=$enotify_no_content}} - + {{include file="field_checkbox.tpl" field=$private_addons}}

{{$advanced}}

diff --git a/view/smarty3/admin_users.tpl b/view/smarty3/admin_users.tpl index e3fc14ac3b..80345b78bd 100644 --- a/view/smarty3/admin_users.tpl +++ b/view/smarty3/admin_users.tpl @@ -75,7 +75,7 @@ {{$u.register_date}} {{$u.login_date}} {{$u.lastitem_date}} - {{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.accountexpired}}{{$account_expired}}{{/if}} + {{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}} {{if $u.is_admin}}