Add support for members-only addons

diff --git a/mod/admin.php b/mod/admin.php
index ecca0b8be3bf5cec455945d7ef98d2b4fcf7452f..48cc4b1510afc9c54e4e2741574a83c202473f03 100644 (file)
--- 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 8049b45fb3e846162b8a06ab41bfa2763b61b84a..a821ef5d5b89192b5534df7e8b78cd074e9a7964 100644 (file)
--- a/mod/apps.php
+++ b/mod/apps.php
@@ -1,7 +1,14 @@
 <?php
 
 function apps_content(&$a) {
-       $title = t('Applications');
+    $privateaddons = get_config('config','private_addons');
+      if ($privateaddons === "1") {
+       if((! (local_user())))  {
+       info( t("You must be logged in to use addons. "));
+      return;};
+}
+
+      $title = t('Applications');
 
        if(count($a->apps)==0)
                notice( t('No installed applications.') . EOL);

diff --git a/view/admin_site.tpl b/view/admin_site.tpl
index 20a0839fee2ab67ac7f0d84ee5ca33c645e84ea9..0d3d451b1c459e4ee89b2018020adb91d6709a6f 100644 (file)
--- 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 }}    
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
        <h3>$advanced</h3>

diff --git a/view/smarty3/admin_site.tpl b/view/smarty3/admin_site.tpl
index c1442202d16911c5ca5ccd22b626332e188f9ca6..30678f1bf2ea2bfe0dfecc371db417af9aacd927 100644 (file)
--- 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}}     
        <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
        
        <h3>{{$advanced}}</h3>

diff --git a/view/smarty3/admin_users.tpl b/view/smarty3/admin_users.tpl
index e3fc14ac3bd9e703319cb89c2acdb13094f29c1b..80345b78bd6b98374790fedb27cc4b88f5dcc2c8 100644 (file)
--- a/view/smarty3/admin_users.tpl
+++ b/view/smarty3/admin_users.tpl
@@ -75,7 +75,7 @@
                                                <td class='register_date'>{{$u.register_date}}</td>
                                                <td class='login_date'>{{$u.login_date}}</td>
                                                <td class='lastitem_date'>{{$u.lastitem_date}}</td>
-                                               <td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.accountexpired}}{{$account_expired}}{{/if}}</td>
+                                               <td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
                                                <td class="checkbox"> 
                                     {{if $u.is_admin}}
                                         &nbsp;