X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=512238b52eb07b45632fd189f595c9fa122bb17a;hb=fd1da749808cdfccf05a4fa9ba8ba6aeafd35a9b;hp=3852c3279af24e3dc00ca1729d6a8e38d1ec5c6c;hpb=16c2705016554289b8e2644d8f2093fb0f16178a;p=friendica.git

diff --git a/boot.php b/boot.php
index 3852c3279a..512238b52e 100644
--- a/boot.php
+++ b/boot.php
@@ -1,11 +1,21 @@
 <?php
 /**
- * @file boot.php
- * This file defines some global constants and includes the central App class.
- */
-
-/**
- * Friendica
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * Friendica is a communications platform for integrated social communications
  * utilising decentralised communications and linkage to several indie social
@@ -22,13 +32,13 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\Term;
+use Friendica\Model\Notify;
 use Friendica\Util\BasePath;
 use Friendica\Util\DateTimeFormat;
 
 define('FRIENDICA_PLATFORM',     'Friendica');
-define('FRIENDICA_CODENAME',     'Dalmatian Bellflower');
-define('FRIENDICA_VERSION',      '2020.03-dev');
+define('FRIENDICA_CODENAME',     'Red Hot Poker');
+define('FRIENDICA_VERSION',      '2020.09-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
@@ -140,44 +150,33 @@ define('MAX_LIKERS',    75);
  * Email notification options
  * @{
  */
-define('NOTIFY_INTRO',        1);
-define('NOTIFY_CONFIRM',      2);
-define('NOTIFY_WALL',         4);
-define('NOTIFY_COMMENT',      8);
-define('NOTIFY_MAIL',        16);
-define('NOTIFY_SUGGEST',     32);
-define('NOTIFY_PROFILE',     64);
-define('NOTIFY_TAGSELF',    128);
-define('NOTIFY_TAGSHARE',   256);
-define('NOTIFY_POKE',       512);
-define('NOTIFY_SHARE',     1024);
-
-define('NOTIFY_SYSTEM',   32768);
+/** @deprecated since 2020.03, use Notify\Type::INTRO instead */
+define('NOTIFY_INTRO',        Notify\Type::INTRO);
+/** @deprecated since 2020.03, use Notify\Type::CONFIRM instead */
+define('NOTIFY_CONFIRM',      Notify\Type::CONFIRM);
+/** @deprecated since 2020.03, use Notify\Type::WALL instead */
+define('NOTIFY_WALL',         Notify\Type::WALL);
+/** @deprecated since 2020.03, use Notify\Type::COMMENT instead */
+define('NOTIFY_COMMENT',      Notify\Type::COMMENT);
+/** @deprecated since 2020.03, use Notify\Type::MAIL instead */
+define('NOTIFY_MAIL',        Notify\Type::MAIL);
+/** @deprecated since 2020.03, use Notify\Type::SUGGEST instead */
+define('NOTIFY_SUGGEST',     Notify\Type::SUGGEST);
+/** @deprecated since 2020.03, use Notify\Type::PROFILE instead */
+define('NOTIFY_PROFILE',     Notify\Type::PROFILE);
+/** @deprecated since 2020.03, use Notify\Type::TAG_SELF instead */
+define('NOTIFY_TAGSELF',     Notify\Type::TAG_SELF);
+/** @deprecated since 2020.03, use Notify\Type::TAG_SHARE instead */
+define('NOTIFY_TAGSHARE',    Notify\Type::TAG_SHARE);
+/** @deprecated since 2020.03, use Notify\Type::POKE instead */
+define('NOTIFY_POKE',        Notify\Type::POKE);
+/** @deprecated since 2020.03, use Notify\Type::SHARE instead */
+define('NOTIFY_SHARE',       Notify\Type::SHARE);
+
+/** @deprecated since 2020.12, use Notify\Type::SYSTEM instead */
+define('NOTIFY_SYSTEM',      Notify\Type::SYSTEM);
 /* @}*/
 
-
-/** @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 Gravity
  *
@@ -254,10 +253,10 @@ function public_contact()
 	if (!$public_contact_id && !empty($_SESSION['authenticated'])) {
 		if (!empty($_SESSION['my_address'])) {
 			// Local user
-			$public_contact_id = intval(Contact::getIdForURL($_SESSION['my_address'], 0, true));
+			$public_contact_id = intval(Contact::getIdForURL($_SESSION['my_address'], 0, false));
 		} elseif (!empty($_SESSION['visitor_home'])) {
 			// Remote user
-			$public_contact_id = intval(Contact::getIdForURL($_SESSION['visitor_home'], 0, true));
+			$public_contact_id = intval(Contact::getIdForURL($_SESSION['visitor_home'], 0, false));
 		}
 	} elseif (empty($_SESSION['authenticated'])) {
 		$public_contact_id = false;
@@ -317,10 +316,6 @@ function info($s)
 {
 	$a = DI::app();
 
-	if (local_user() && DI::pConfig()->get(local_user(), 'system', 'ignore_info')) {
-		return;
-	}
-
 	if (empty($_SESSION['sysmsg_info'])) {
 		$_SESSION['sysmsg_info'] = [];
 	}