X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=ba12f86d2c4f392bfcec9c8b73827e4822c8b0b8;hb=bbbebb2b9c8ff401829d336e2c39c0dc0cecfc10;hp=65867593df34008db274d34a4a7210d57bd85d73;hpb=a75858f02ca699718e1e6b823f986658cb8ead47;p=friendica.git diff --git a/boot.php b/boot.php index 65867593df..ba12f86d2c 100644 --- a/boot.php +++ b/boot.php @@ -232,10 +232,11 @@ define('ACCOUNT_TYPE_RELAY', 4); * Type of the community page * @{ */ -define('CP_NO_COMMUNITY_PAGE', -1); -define('CP_USERS_ON_SERVER', 0); -define('CP_GLOBAL_COMMUNITY', 1); -define('CP_USERS_AND_GLOBAL', 2); +define('CP_NO_INTERNAL_COMMUNITY', -2); +define('CP_NO_COMMUNITY_PAGE', -1); +define('CP_USERS_ON_SERVER', 0); +define('CP_GLOBAL_COMMUNITY', 1); +define('CP_USERS_AND_GLOBAL', 2); /** * @} */ @@ -953,10 +954,12 @@ function public_contact() */ function remote_user() { - // You cannot be both local and remote - if (local_user()) { - return false; - } + // You cannot be both local and remote. + // Unncommented by rabuzarus because remote authentication to local + // profiles wasn't possible anymore (2018-04-12). +// if (local_user()) { +// return false; +// } if (x($_SESSION, 'authenticated') && x($_SESSION, 'visitor_id')) { return intval($_SESSION['visitor_id']); } @@ -1289,7 +1292,7 @@ function get_server() $server = Config::get("system", "directory"); if ($server == "") { - $server = "http://dir.friendica.social"; + $server = "https://dir.friendica.social"; } return($server);