Merge pull request #5972 from friendica/bug/5946-remove-last-include-security

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 6be5f3aecb44d29b230e493b268fbaadddf16b4f..acbc737658c2a8d4aef307aee52092abc74c7008 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',      1285);
+define('DB_UPDATE_VERSION',      1288);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**
@@ -475,44 +475,6 @@ function defaults() {
        return $return;
 }
 
-/**
- * @brief Returns the baseurl.
- *
- * @see System::baseUrl()
- *
- * @return string
- * @TODO Function is deprecated and only used in some addons
- */
-function z_root()
-{
-       return System::baseUrl();
-}
-
-/**
- * @brief Return absolut URL for given $path.
- *
- * @param string $path given path
- *
- * @return string
- */
-function absurl($path)
-{
-       if (strpos($path, '/') === 0) {
-               return z_path() . $path;
-       }
-       return $path;
-}
-
-/**
- * @brief Function to check if request was an AJAX (xmlhttprequest) request.
- *
- * @return boolean
- */
-function is_ajax()
-{
-       return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
-}
-
 /**
  * @brief Function to check if request was an AJAX (xmlhttprequest) request.
  *
@@ -685,7 +647,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;
@@ -1175,46 +1137,6 @@ function validate_include(&$file)
        return $valid;
 }
 
-function current_load()
-{
-       if (!function_exists('sys_getloadavg')) {
-               return false;
-       }
-
-       $load_arr = sys_getloadavg();
-
-       if (!is_array($load_arr)) {
-               return false;
-       }
-
-       return max($load_arr[0], $load_arr[1]);
-}
-
-/**
- * @brief get c-style args
- *
- * @return int
- */
-function argc()
-{
-       return get_app()->argc;
-}
-
-/**
- * @brief Returns the value of a argv key
- *
- * @param int $x argv key
- * @return string Value of the argv key
- */
-function argv($x)
-{
-       if (array_key_exists($x, get_app()->argv)) {
-               return get_app()->argv[$x];
-       }
-
-       return '';
-}
-
 /**
  * @brief Get the data which is needed for infinite scroll
  *