X-Git-Url: https://reisub.nsupdate.info/git/?a=blobdiff_plain;f=boot.php;h=dfedcdbbbecd87668ae4d14eca4866f91cd8f08e;hb=dc9c9040e5eec735ef20838afa8ccd64dc106b2c;hp=1f503c908a6935c087bd1ef8de8c7ced72342473;hpb=c7308d98fa6e40fbef4f212300cc0ef6739e9c00;p=friendica.git%2F.git

diff --git a/boot.php b/boot.php
index 1f503c908a..dfedcdbbbe 100644
--- a/boot.php
+++ b/boot.php
@@ -25,12 +25,13 @@ use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\Term;
 use Friendica\Util\BasePath;
 use Friendica\Util\DateTimeFormat;
 
 define('FRIENDICA_PLATFORM',     'Friendica');
-define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
-define('FRIENDICA_VERSION',      '2019.03-dev');
+define('FRIENDICA_CODENAME',     'Dalmatian Bellflower');
+define('FRIENDICA_VERSION',      '2019.06-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
@@ -81,17 +82,6 @@ define('MAX_IMAGE_LENGTH',        -1);
  */
 define('DEFAULT_DB_ENGINE',  'InnoDB');
 
-/**
- * @name SSL Policy
- *
- * SSL redirection policies
- * @{
- */
-define('SSL_POLICY_NONE',         0);
-define('SSL_POLICY_FULL',         1);
-define('SSL_POLICY_SELFSIGN',     2);
-/* @}*/
-
 /** @deprecated since version 2019.03, please use \Friendica\Module\Register::CLOSED instead */
 define('REGISTER_CLOSED',        \Friendica\Module\Register::CLOSED);
 /** @deprecated since version 2019.03, please use \Friendica\Module\Register::APPROVE instead */
@@ -171,23 +161,27 @@ define('NOTIFY_SYSTEM',   32768);
 /* @}*/
 
 
-/**
- * @name Term
- *
- * Tag/term types
- * @{
- */
-define('TERM_UNKNOWN',   0);
-define('TERM_HASHTAG',   1);
-define('TERM_MENTION',   2);
-define('TERM_CATEGORY',  3);
-define('TERM_PCATEGORY', 4);
-define('TERM_FILE',      5);
-define('TERM_SAVEDSEARCH', 6);
-define('TERM_CONVERSATION', 7);
-
-define('TERM_OBJ_POST',  1);
-define('TERM_OBJ_PHOTO', 2);
+/** @deprecated since 2019.03, use Term::UNKNOWN instead */
+define('TERM_UNKNOWN',   Term::UNKNOWN);
+/** @deprecated since 2019.03, use Term::HASHTAG instead */
+define('TERM_HASHTAG',   Term::HASHTAG);
+/** @deprecated since 2019.03, use Term::MENTION instead */
+define('TERM_MENTION',   Term::MENTION);
+/** @deprecated since 2019.03, use Term::CATEGORY instead */
+define('TERM_CATEGORY',  Term::CATEGORY);
+/** @deprecated since 2019.03, use Term::PCATEGORY instead */
+define('TERM_PCATEGORY', Term::PCATEGORY);
+/** @deprecated since 2019.03, use Term::FILE instead */
+define('TERM_FILE',      Term::FILE);
+/** @deprecated since 2019.03, use Term::SAVEDSEARCH instead */
+define('TERM_SAVEDSEARCH', Term::SAVEDSEARCH);
+/** @deprecated since 2019.03, use Term::CONVERSATION instead */
+define('TERM_CONVERSATION', Term::CONVERSATION);
+
+/** @deprecated since 2019.03, use Term::OBJECT_TYPE_POST instead */
+define('TERM_OBJ_POST',  Term::OBJECT_TYPE_POST);
+/** @deprecated since 2019.03, use Term::OBJECT_TYPE_PHOTO instead */
+define('TERM_OBJ_PHOTO', Term::OBJECT_TYPE_PHOTO);
 
 /**
  * @name Namespaces
@@ -199,6 +193,7 @@ define('NAMESPACE_ZOT',             'http://purl.org/zot');
 define('NAMESPACE_DFRN',            'http://purl.org/macgirvin/dfrn/1.0');
 define('NAMESPACE_THREAD',          'http://purl.org/syndication/thread/1.0');
 define('NAMESPACE_TOMB',            'http://purl.org/atompub/tombstones/1.0');
+define('NAMESPACE_ACTIVITY2',       'https://www.w3.org/ns/activitystreams#');
 define('NAMESPACE_ACTIVITY',        'http://activitystrea.ms/spec/1.0/');
 define('NAMESPACE_ACTIVITY_SCHEMA', 'http://activitystrea.ms/schema/1.0/');
 define('NAMESPACE_MEDIA',           'http://purl.org/syndication/atommedia');
@@ -241,6 +236,7 @@ define('ACTIVITY_FAVORITE',    NAMESPACE_ACTIVITY_SCHEMA . 'favorite');
 define('ACTIVITY_UNFAVORITE',  NAMESPACE_ACTIVITY_SCHEMA . 'unfavorite');
 define('ACTIVITY_SHARE',       NAMESPACE_ACTIVITY_SCHEMA . 'share');
 define('ACTIVITY_DELETE',      NAMESPACE_ACTIVITY_SCHEMA . 'delete');
+define('ACTIVITY2_ANNOUNCE',   NAMESPACE_ACTIVITY2       . 'Announce');
 
 define('ACTIVITY_POKE',        NAMESPACE_ZOT . '/activity/poke');