aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-04-21 19:12:22 -0700
committerFriendika <info@friendika.com>2011-04-21 19:12:22 -0700
commit639d52ec181e2c481a8f7697f93278c84a78ec7e (patch)
tree5eececec077d197cfcb8841e780b0d87d815eec0
parenteeb3c13ad3af963b9150821fbdd6a5145d1cb188 (diff)
downloadvolse-hubzilla-639d52ec181e2c481a8f7697f93278c84a78ec7e.tar.gz
volse-hubzilla-639d52ec181e2c481a8f7697f93278c84a78ec7e.tar.bz2
volse-hubzilla-639d52ec181e2c481a8f7697f93278c84a78ec7e.zip
block_public should also block the contacts page and 'Connect' page if not logged in
-rw-r--r--mod/dfrn_request.php10
-rw-r--r--mod/viewcontacts.php10
2 files changed, 19 insertions, 1 deletions
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 4463c713f..1af0dc85d 100644
--- 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 063637bf9..c970db33a 100644
--- 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;