Updated configuration files

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 79ec53abf5cbd31628c16696b8435f8fa56f3c8a..728f36b16e56581ca7e0adb32a61733cfba07aed 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.08-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1268);
+define('DB_UPDATE_VERSION',      1277);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**
@@ -64,15 +64,13 @@ define('EOL',                    "<br />\r\n");
  * @brief Image storage quality.
  *
  * Lower numbers save space at cost of image detail.
- * For ease of upgrade, please do not change here. Change jpeg quality with
- * $a->config['system']['jpeg_quality'] = n;
- * in .htconfig.php, where n is netween 1 and 100, and with very poor results
- * below about 50
+ * For ease of upgrade, please do not change here. Set [system] jpegquality = n in config/local.ini.php,
+ * where n is between 1 and 100, and with very poor results below about 50
  */
 define('JPEG_QUALITY',            100);
 
 /**
- * $a->config['system']['png_quality'] from 0 (uncompressed) to 9
+ * [system] png_quality = n where is between 0 (uncompressed) to 9
  */
 define('PNG_QUALITY',             8);
 
@@ -83,9 +81,10 @@ define('PNG_QUALITY',             8);
  * this length (on the longest side, the other side will be scaled appropriately).
  * Modify this value using
  *
- *    $a->config['system']['max_image_length'] = n;
+ * [system]
+ * max_image_length = n;
  *
- * in .htconfig.php
+ * in config/local.ini.php
  *
  * If you don't want to set a maximum length, set to -1. The default value is
  * defined by 'MAX_IMAGE_LENGTH' below.
@@ -451,8 +450,9 @@ define('ACTIVITY_OBJ_QUESTION', 'http://activityschema.org/object/question');
  * @{
  */
 define('GRAVITY_PARENT',       0);
-define('GRAVITY_LIKE',         3);
+define('GRAVITY_ACTIVITY',     3);
 define('GRAVITY_COMMENT',      6);
+define('GRAVITY_UNKNOWN',      9);
 /* @}*/
 
 /**
@@ -498,36 +498,6 @@ if (!defined("SIGTERM")) {
 if (!defined('CURLE_OPERATION_TIMEDOUT')) {
        define('CURLE_OPERATION_TIMEDOUT', CURLE_OPERATION_TIMEOUTED);
 }
-/**
- * Reverse the effect of magic_quotes_gpc if it is enabled.
- * Please disable magic_quotes_gpc so we don't have to do this.
- * See http://php.net/manual/en/security.magicquotes.disabling.php
- */
-function startup()
-{
-       error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
-       set_time_limit(0);
-
-       // This has to be quite large to deal with embedded private photos
-       ini_set('pcre.backtrack_limit', 500000);
-
-       if (get_magic_quotes_gpc()) {
-               $process = [&$_GET, &$_POST, &$_COOKIE, &$_REQUEST];
-               while (list($key, $val) = each($process)) {
-                       foreach ($val as $k => $v) {
-                               unset($process[$key][$k]);
-                               if (is_array($v)) {
-                                       $process[$key][stripslashes($k)] = $v;
-                                       $process[] = &$process[$key][stripslashes($k)];
-                               } else {
-                                       $process[$key][stripslashes($k)] = stripslashes($v);
-                               }
-                       }
-               }
-               unset($process);
-       }
-}
 
 /**
  * @brief Retrieve the App structure
@@ -538,14 +508,7 @@ function startup()
  */
 function get_app()
 {
-       global $a;
-
-       if (empty($a)) {
-               $a = new App(dirname(__DIR__));
-               BaseObject::setApp($a);
-       }
-
-       return $a;
+       return BaseObject::getApp();
 }
 
 /**
@@ -706,7 +669,7 @@ function check_url(App $a)
        // 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->get_hostname))) {
+       if (empty($url) || (!link_compare($url, System::baseUrl())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $a->get_hostname()))) {
                Config::set('system', 'url', System::baseUrl());
        }
 
@@ -864,28 +827,6 @@ function check_addons(App $a)
        return;
 }
 
-function get_guid($size = 16, $prefix = '')
-{
-       if (is_bool($prefix) && !$prefix) {
-               $prefix = '';
-       } elseif ($prefix == '') {
-               $a = get_app();
-               $prefix = hash('crc32', $a->get_hostname());
-       }
-
-       while (strlen($prefix) < ($size - 13)) {
-               $prefix .= mt_rand();
-       }
-
-       if ($size >= 24) {
-               $prefix = substr($prefix, 0, $size - 22);
-               return str_replace('.', '', uniqid($prefix, true));
-       } else {
-               $prefix = substr($prefix, 0, max($size - 13, 0));
-               return uniqid($prefix);
-       }
-}
-
 /**
  * @brief Used to end the current process, after saving session state.
  * @deprecated
@@ -917,7 +858,7 @@ function goaway($path)
  */
 function local_user()
 {
-       if (x($_SESSION, 'authenticated') && x($_SESSION, 'uid')) {
+       if (!empty($_SESSION['authenticated']) && !empty($_SESSION['uid'])) {
                return intval($_SESSION['uid']);
        }
        return false;
@@ -960,6 +901,11 @@ function remote_user()
 //     if (local_user()) {
 //             return false;
 //     }
+
+       if (empty($_SESSION)) {
+               return false;
+       }
+
        if (x($_SESSION, 'authenticated') && x($_SESSION, 'visitor_id')) {
                return intval($_SESSION['visitor_id']);
        }
@@ -975,6 +921,10 @@ function remote_user()
  */
 function notice($s)
 {
+       if (empty($_SESSION)) {
+               return;
+       }
+
        $a = get_app();
        if (!x($_SESSION, 'sysmsg')) {
                $_SESSION['sysmsg'] = [];