Merge pull request #7343 from MrPetovan/bug/notices

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index e75b2abd917ec6e8e973ae116079b4ebf910298c..086e74d2f47bdf69882fa94f94748a3d40bddea8 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -31,7 +31,7 @@ use Friendica\Util\DateTimeFormat;
 
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'Dalmatian Bellflower');
-define('FRIENDICA_VERSION',      '2019.06-dev');
+define('FRIENDICA_VERSION',      '2019.09-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
@@ -82,17 +82,6 @@ define('MAX_IMAGE_LENGTH',        -1);
  */
 define('DEFAULT_DB_ENGINE',  'InnoDB');
 
-/**
- * @name SSL Policy
- *
- * SSL redirection policies
- * @{
- */
-define('SSL_POLICY_NONE',         0);
-define('SSL_POLICY_FULL',         1);
-define('SSL_POLICY_SELFSIGN',     2);
-/* @}*/
-
 /** @deprecated since version 2019.03, please use \Friendica\Module\Register::CLOSED instead */
 define('REGISTER_CLOSED',        \Friendica\Module\Register::CLOSED);
 /** @deprecated since version 2019.03, please use \Friendica\Module\Register::APPROVE instead */
@@ -345,6 +334,7 @@ function get_app()
  * @param array $args
  * @brief Returns a defaut value if the provided variable or array key is falsy
  * @return mixed
+ * @deprecated since version 2019.06, use native coalesce operator (??) instead
  */
 function defaults(...$args)
 {
@@ -545,39 +535,6 @@ function is_site_admin()
        return local_user() && $admin_email && in_array(defaults($a->user, 'email', ''), $adminlist);
 }
 
-/**
- * @brief Returns querystring as string from a mapped array.
- *
- * @param array  $params mapped array with query parameters
- * @param string $name   of parameter, default null
- *
- * @return string
- */
-function build_querystring($params, $name = null)
-{
-       $ret = "";
-       foreach ($params as $key => $val) {
-               if (is_array($val)) {
-                       /// @TODO maybe not compare against null, use is_null()
-                       if ($name == null) {
-                               $ret .= build_querystring($val, $key);
-                       } else {
-                               $ret .= build_querystring($val, $name . "[$key]");
-                       }
-               } else {
-                       $val = urlencode($val);
-                       /// @TODO maybe not compare against null, use is_null()
-                       if ($name != null) {
-                               /// @TODO two string concated, can be merged to one
-                               $ret .= $name . "[$key]" . "=$val&";
-                       } else {
-                               $ret .= "$key=$val&";
-                       }
-               }
-       }
-       return $ret;
-}
-
 function explode_querystring($query)
 {
        $arg_st = strpos($query, '?');