diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | doc/Home.md | 4 | ||||
| -rw-r--r-- | doc/Profiles.md | 6 | ||||
| -rw-r--r-- | doc/Settings.md | 11 |
4 files changed, 17 insertions, 6 deletions
@@ -2513,7 +2513,7 @@ function current_theme(){ $a = get_app(); $system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : ''); - $theme_name = ((x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme); + $theme_name = ((is_array($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme); if($theme_name && file_exists('view/theme/' . $theme_name . '/style.css')) return($theme_name); diff --git a/doc/Home.md b/doc/Home.md index 4dccfde84..838e63065 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -5,10 +5,10 @@ Friendika Documentation and Resources **Contents** * [Account Basics](help/Account-Basics) -* [Making Friends](help/Making-Friends) -* [Tags and Mentions](help/Tags-and-Mentions) * [Profiles](help/Profiles) +* [Making Friends](help/Making-Friends) * [Groups and Privacy](help/Groups-and-Privacy) +* [Tags and Mentions](help/Tags-and-Mentions) * [Pages](help/Pages) * [Remove Account](help/Remove-Account) * [Bugs and Issues](help/Bugs-and-Issues) diff --git a/doc/Profiles.md b/doc/Profiles.md index 9c81071c5..631a4331b 100644 --- a/doc/Profiles.md +++ b/doc/Profiles.md @@ -5,7 +5,7 @@ Profiles Friendika has unlimited profiles. You may use different profiles to show different "sides of yourself" to different audiences. -You always have a profile known as your "default" profile (though you may change the name). This profile is always available to the general public and cannot be hidden. You may (and probably should) restrict the information you make available on your public profile. +You always have a profile known as your "default" or "public" profile. This profile is always available to the general public and cannot be hidden (there may be rare exceptions on privately run or disconnected sites). You may, and probably should restrict the information you make available on your public profile. That said, if you want other friends to be able to find you, it helps to have the following information in your public profile... @@ -15,7 +15,7 @@ That said, if you want other friends to be able to find you, it helps to have th Without this basic information, you could get very lonely here. Most people (even your best friends) will not try and connect with somebody that has a fake name or doesn't contain a real photo. -In addition, if you'd like to meet people that share some general interests with you, please take a moment and add some "Public Keywords" to your profile. Such as "music, linux, photography" or whatever. You can add as many keywords as you like. Without this, people with similar interests may never know it unless you stumble across them through another friend. +In addition, if you'd like to meet people that share some general interests with you, please take a moment and add some "Public Keywords" to your profile. Such as "music, linux, photography" or whatever. You can add as many keywords as you like. Your default or public profile is also shown to contacts on other networks, since they do not have the ability to view your private profiles. Only members of the Friendika network can see alternate/private profiles. @@ -41,7 +41,7 @@ Although you may have multiple profiles, you only have one profile photo. This i **Keywords and Directory Search** -On the site Directory page, you may search for people with published profiles who are on this site. The search is typically for your nickname or part of your full name. However this search will also match against other profile fields - such as gender, location, "about", work, and education. You may also include "Keywords" in your default profile - which may be used to search for common interests with other members. These keywords are *not* displayed on your profile page. You could use these keywords to locate people who share membership in secret societies, or that share a love of fishing (for example) - without making this information visible on your public profile. In Friendika version 2.2 and later there are two sets of Keywords - public and private. Public keywords are used in the friend suggestion tool and although they aren't readily visible, they may be seen by viewing the HTML of your profile page. Private keywords are hidden and secret. (Keywords from earlier releases are all converted into private keywords during upgrade). +On the site Directory page, you may search for people with published profiles who are on this site. The search is typically for your nickname or part of your full name. However this search will also match against other profile fields - such as gender, location, "about", work, and education. You may also include "Keywords" in your default profile - which may be used to search for common interests with other members. You have two sets of keywords available - public and private. Private keywords are *not* visible to anybody. You could use these keywords to locate people who share membership in secret societies, or that share a love of fishing (for example) - without making this information visible on your public profile. Public keywords are used in the friend suggestion tool and although they aren't readily visible, they may be seen by viewing the HTML of your profile page. Directory searches are also able to use "boolean" logic so that you can search for "+lesbian +Florida" and find those who's sexual preference (or keywords) contain the world "lesbian" and that live in Florida. See the section on "Topical Tags" on the [[Tags-and-Mentions]] page for more information on performing boolean searches. diff --git a/doc/Settings.md b/doc/Settings.md index 215eeb327..8abb8a567 100644 --- a/doc/Settings.md +++ b/doc/Settings.md @@ -75,6 +75,17 @@ Config: $a->config['system']['allowed_email'] = "sitea.com, *siteb.com"; ``` +**Block Public** + +Corporate/Edu enhancement + +Set to true to block public access to all otherwise public personal pages on this site unless you are currently logged in. This blocks the viewing of profiles, friends, photos, the site directory and search pages to unauthorised persons. A side effect is that entries from this site will not appear in the global directory. We recommend specifically disabling that also (setting is described elsewhere on this page). Note: this is specifically for sites that desire to be "standalone" and do not wish to be connected to any other Friendika sites. Unauthorised persons will also not be able to request friendship with site members. Default is false. Available in version 2.2 or greater. + +Config: +``` +$a->config['system']['block_public'] = true; +``` + **Force Publish** |