Create config keys if they not exists on set.

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 84bb9741e695319a23efa0129a30e365b8652bbb..79ec53abf5cbd31628c16696b8435f8fa56f3c8a 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -39,9 +39,9 @@ require_once 'include/text.php';
 
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
-define('FRIENDICA_VERSION',      '2018-05-dev');
+define('FRIENDICA_VERSION',      '2018.08-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1259);
+define('DB_UPDATE_VERSION',      1268);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**
@@ -486,16 +486,6 @@ define('SR_SCOPE_TAGS', 'tags');
  */
 define('NULL_DATE', '0001-01-01 00:00:00');
 
-/**
- * Deliver commands
- */
-define('DELIVER_MAIL',       'mail');
-define('DELIVER_SUGGESTION', 'suggest');
-define('DELIVER_RELOCATION', 'relocate');
-define('DELIVER_DELETION',   'drop');
-define('DELIVER_POST',       'wall-new');
-define('DELIVER_COMMENT',    'comment-new');
-
 // Normally this constant is defined - but not if "pcntl" isn't installed
 if (!defined("SIGTERM")) {
        define("SIGTERM", 15);
@@ -1028,114 +1018,6 @@ function get_max_import_size()
        return (x($a->config, 'max_import_size') ? $a->config['max_import_size'] : 0);
 }
 
-
-function current_theme()
-{
-       $app_base_themes = ['duepuntozero', 'dispy', 'quattro'];
-
-       $a = get_app();
-
-       $page_theme = null;
-
-       // Find the theme that belongs to the user whose stuff we are looking at
-
-       if ($a->profile_uid && ($a->profile_uid != local_user())) {
-               $r = q(
-                       "select theme from user where uid = %d limit 1",
-                       intval($a->profile_uid)
-               );
-               if (DBM::is_result($r)) {
-                       $page_theme = $r[0]['theme'];
-               }
-       }
-
-       // Allow folks to over-rule user themes and always use their own on their own site.
-       // This works only if the user is on the same server
-
-       if ($page_theme && local_user() && (local_user() != $a->profile_uid)) {
-               if (PConfig::get(local_user(), 'system', 'always_my_theme')) {
-                       $page_theme = null;
-               }
-       }
-
-//             $mobile_detect = new Mobile_Detect();
-//             $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
-       $is_mobile = $a->is_mobile || $a->is_tablet;
-
-       $standard_system_theme = Config::get('system', 'theme', '');
-       $standard_theme_name = ((isset($_SESSION) && x($_SESSION, 'theme')) ? $_SESSION['theme'] : $standard_system_theme);
-
-       if ($is_mobile) {
-               if (isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
-                       $theme_name = $standard_theme_name;
-               } else {
-                       $system_theme = Config::get('system', 'mobile-theme', '');
-                       if ($system_theme == '') {
-                               $system_theme = $standard_system_theme;
-                       }
-                       $theme_name = ((isset($_SESSION) && x($_SESSION, 'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
-
-                       if ($theme_name === '---') {
-                               // user has selected to have the mobile theme be the same as the normal one
-                               $theme_name = $standard_theme_name;
-
-                               if ($page_theme) {
-                                       $theme_name = $page_theme;
-                               }
-                       }
-               }
-       } else {
-               $theme_name = $standard_theme_name;
-
-               if ($page_theme) {
-                       $theme_name = $page_theme;
-               }
-       }
-
-       if ($theme_name
-               && (file_exists('view/theme/' . $theme_name . '/style.css')
-               || file_exists('view/theme/' . $theme_name . '/style.php'))
-       ) {
-               return($theme_name);
-       }
-
-       foreach ($app_base_themes as $t) {
-               if (file_exists('view/theme/' . $t . '/style.css')
-                       || file_exists('view/theme/' . $t . '/style.php')
-               ) {
-                       return($t);
-               }
-       }
-
-       $fallback = array_merge(glob('view/theme/*/style.css'), glob('view/theme/*/style.php'));
-       if (count($fallback)) {
-               return (str_replace('view/theme/', '', substr($fallback[0], 0, -10)));
-       }
-
-       /// @TODO No final return statement?
-}
-
-/**
- * @brief Return full URL to theme which is currently in effect.
- *
- * Provide a sane default if nothing is chosen or the specified theme does not exist.
- *
- * @return string
- */
-function current_theme_url()
-{
-       $a = get_app();
-
-       $t = current_theme();
-
-       $opts = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : '');
-       if (file_exists('view/theme/' . $t . '/style.php')) {
-               return('view/theme/' . $t . '/style.pcss' . $opts);
-       }
-
-       return('view/theme/' . $t . '/style.css');
-}
-
 function feed_birthday($uid, $tz)
 {
        /**
@@ -1194,6 +1076,7 @@ function is_site_admin()
        $adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
 
        //if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
+       /// @TODO This if() + 2 returns can be shrinked into one return
        if (local_user() && x($a->user, 'email') && x($a->config, 'admin_email') && in_array($a->user['email'], $adminlist)) {
                return true;
        }
@@ -1291,7 +1174,7 @@ function random_digits($digits)
 {
        $rn = '';
        for ($i = 0; $i < $digits; $i++) {
-               /// @TODO rand() is different to mt_rand() and maybe lesser "random"
+               /// @TODO Avoid rand/mt_rand, when it comes to cryptography, they are generating predictable (seedable) numbers.
                $rn .= rand(0, 9);
        }
        return $rn;
@@ -1302,10 +1185,10 @@ function get_server()
        $server = Config::get("system", "directory");
 
        if ($server == "") {
-               $server = "http://dir.friendica.social";
+               $server = "https://dir.friendica.social";
        }
 
-       return($server);
+       return $server;
 }
 
 function get_temppath()
@@ -1354,7 +1237,7 @@ function get_cachefile($file, $writemode = true)
        $cache = get_itemcachepath();
 
        if ((!$cache) || (!is_dir($cache))) {
-               return("");
+               return "";
        }
 
        $subfolder = $cache . "/" . substr($file, 0, 2);
@@ -1368,7 +1251,6 @@ function get_cachefile($file, $writemode = true)
                }
        }
 
-       /// @TODO no need to put braces here
        return $cachepath;
 }
 
@@ -1475,7 +1357,6 @@ function get_spoolpath()
        return "";
 }
 
-
 if (!function_exists('exif_imagetype')) {
        function exif_imagetype($file)
        {
@@ -1513,7 +1394,7 @@ function validate_include(&$file)
        }
 
        // Simply return flag
-       return ($valid);
+       return $valid;
 }
 
 function current_load()