Changed loglevels in the worker

[friendica.git/.git] / boot.php

diff --git a/boot.php b/boot.php
index 33cdafc..24e7559 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -33,13 +33,12 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Notify;
-use Friendica\Model\Term;
 use Friendica\Util\BasePath;
 use Friendica\Util\DateTimeFormat;
 
 define('FRIENDICA_PLATFORM',     'Friendica');
-define('FRIENDICA_CODENAME',     'Dalmatian Bellflower');
-define('FRIENDICA_VERSION',      '2020.03-rc');
+define('FRIENDICA_CODENAME',     'Red Hot Poker');
+define('FRIENDICA_VERSION',      '2020.09-rc');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
@@ -178,29 +177,6 @@ define('NOTIFY_SHARE',       Notify\Type::SHARE);
 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
  *
@@ -277,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;
@@ -290,7 +266,7 @@ function public_contact()
 }
 
 /**
- * Returns contact id of authenticated site visitor or false
+ * Returns public contact id of authenticated site visitor or false
  *
  * @return int|bool visitor_id or false
  */
@@ -406,38 +382,6 @@ function is_site_admin()
        return local_user() && $admin_email && in_array($a->user['email'] ?? '', $adminlist);
 }
 
-function explode_querystring($query)
-{
-       $arg_st = strpos($query, '?');
-       if ($arg_st !== false) {
-               $base = substr($query, 0, $arg_st);
-               $arg_st += 1;
-       } else {
-               $base = '';
-               $arg_st = 0;
-       }
-
-       $args = explode('&', substr($query, $arg_st));
-       foreach ($args as $k => $arg) {
-               /// @TODO really compare type-safe here?
-               if ($arg === '') {
-                       unset($args[$k]);
-               }
-       }
-       $args = array_values($args);
-
-       if (!$base) {
-               $base = $args[0];
-               unset($args[0]);
-               $args = array_values($args);
-       }
-
-       return [
-               'base' => $base,
-               'args' => $args,
-       ];
-}
-
 /**
  * Returns the complete URL of the current page, e.g.: http(s)://something.com/network
  *