define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily');
define('FRIENDICA_VERSION', '2018-05-dev');
define('DFRN_PROTOCOL_VERSION', '2.23');
-define('DB_UPDATE_VERSION', 1257);
+define('DB_UPDATE_VERSION', 1259);
define('NEW_UPDATE_ROUTINE_VERSION', 1170);
/**
*
* ACCOUNT_TYPE_COMMUNITY - the account is community forum
* Associated page types: PAGE_COMMUNITY, PAGE_PRVGROUP
+ *
+ * ACCOUNT_TYPE_RELAY - the account is a relay
+ * This will only be assigned to contacts, not to user accounts
* @{
*/
define('ACCOUNT_TYPE_PERSON', 0);
define('ACCOUNT_TYPE_ORGANISATION', 1);
define('ACCOUNT_TYPE_NEWS', 2);
define('ACCOUNT_TYPE_COMMUNITY', 3);
+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);
/**
* @}
*/
*/
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']);
}