Merge pull request #5977 from nupplaphil/move_global_functions_3

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 939c6829fce0acbe50c4e905b3673810b8abaf67..d55f4b7bc979f23bda425417172f329b50949c1b 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -41,7 +41,7 @@ define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
 define('FRIENDICA_VERSION',      '2018.12-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1288);
+define('DB_UPDATE_VERSION',      1289);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**
@@ -121,24 +121,6 @@ define('LOGGER_DATA',            4);
 define('LOGGER_ALL',             5);
 /* @}*/
 
-/**
- * @name Cache
- * @deprecated since version 3.6
- * @see Cache
- *
- * Cache levels
- * @{
- */
-define('CACHE_MONTH',            Cache::MONTH);
-define('CACHE_WEEK',             Cache::WEEK);
-define('CACHE_DAY',              Cache::DAY);
-define('CACHE_HOUR',             Cache::HOUR);
-define('CACHE_HALF_HOUR',        Cache::HALF_HOUR);
-define('CACHE_QUARTER_HOUR',     Cache::QUARTER_HOUR);
-define('CACHE_FIVE_MINUTES',     Cache::FIVE_MINUTES);
-define('CACHE_MINUTE',           Cache::MINUTE);
-/* @}*/
-
 /**
  * @name Register
  *
@@ -212,11 +194,6 @@ $netgroup_ids = [
  */
 define('MAX_LIKERS',    75);
 
-/**
- * Communication timeout
- */
-define('ZCURL_TIMEOUT', (-1));
-
 /**
  * @name Notify
  *
@@ -502,29 +479,6 @@ function check_db($via_worker)
        }
 }
 
-/**
- * Sets the base url for use in cmdline programs which don't have
- * $_SERVER variables
- *
- * @param object $a App
- */
-function check_url(App $a)
-{
-       $url = Config::get('system', 'url');
-
-       // if the url isn't set or the stored url is radically different
-       // than the currently visited url, store the current value accordingly.
-       // "Radically different" ignores common variations such as http vs https
-       // and www.example.com vs example.com.
-       // We will only change the url to an ip address if there is no existing setting
-
-       if (empty($url) || (!link_compare($url, System::baseUrl())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $a->getHostName()))) {
-               Config::set('system', 'url', System::baseUrl());
-       }
-
-       return;
-}
-
 /**
  * @brief Automatic database updates
  * @param object $a App
@@ -647,7 +601,7 @@ function killme()
 /**
  * @brief Redirect to another URL and terminate this process.
  */
-function goaway($path)
+function goaway($path = '')
 {
        if (strstr(normalise_link($path), 'http://')) {
                $url = $path;