block_public should also block the contacts page and 'Connect' page if not logged in

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 4463c713f97fcc0807c9bfaba57ceaeb6ac097ba..1af0dc85ddf6f6b9103b24fa495e9bc5a1f19c5a 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -12,6 +12,10 @@
 if(! function_exists('dfrn_request_init')) {
 function dfrn_request_init(&$a) {
 
+       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+               return;
+       }
+
        if($a->argc > 1)
                $which = $a->argv[1];
 
@@ -583,6 +587,12 @@ function dfrn_request_content(&$a) {
                 * Normal web request. Display our user's introduction form.
                 */
  
+               if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+                       notice( t('Public access denied.') . EOL);
+                       return;
+               }
+
+
                /**
                 * Try to auto-fill the profile address
                 */

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 063637bf9e2d26e8d98e9f606a4ba801842c2e2c..c970db33aa5298c2e531faa3533dc174767372f1 100644 (file)
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -2,13 +2,21 @@
 
 function viewcontacts_init(&$a) {
 
-       profile_load($a,$a->argv[1]);
+       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+               return;
+       }
 
+       profile_load($a,$a->argv[1]);
 }
 
 
 function viewcontacts_content(&$a) {
 
+       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+               notice( t('Public access denied.') . EOL);
+               return;
+       }
+
        if(((! count($a->profile)) || ($a->profile['hide-friends']))) {
                notice( t('Permission denied.') . EOL);
                return;