[frio] Fix spacing in field_input.tpl

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 0caf59145914c7444061071f711a38fa214d6ac3..a699a66f95d29cc5b0c17c3624584808959c687a 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1,5 +1,4 @@
 <?php
-
 /** @file boot.php
  *
  * This file defines some global constants and includes the central App class.
@@ -22,26 +21,24 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'a
 
 use Friendica\App;
 use Friendica\Core\Addon;
-use Friendica\Core\System;
-use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
-use Friendica\Model\Contact;
 use Friendica\Database\DBStructure;
-use Friendica\Module\Login;
+use Friendica\Model\Contact;
+use Friendica\Util\DateTimeFormat;
 
-require_once 'include/network.php';
 require_once 'include/text.php';
 require_once 'include/datetime.php';
-require_once 'include/pgettext.php';
 
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'Asparagus');
 define('FRIENDICA_VERSION',      '3.6-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1245);
+define('DB_UPDATE_VERSION',      1248);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**
@@ -59,7 +56,6 @@ const DB_UPDATE_FAILED = 2;      // Database check failed
  * This can be used in HTML and JavaScript where needed a line break.
  */
 define('EOL',                    "<br />\r\n");
-define('ATOM_TIME',              'Y-m-d\TH:i:s\Z');
 
 /**
  * @brief Image storage quality.
@@ -782,7 +778,7 @@ function run_update_function($x)
                        //send the administrator an e-mail
                        DBStructure::updateFail(
                                $x,
-                               sprintf(t('Update %s failed. See error logs.'), $x)
+                               L10n::t('Update %s failed. See error logs.', $x)
                        );
                        return false;
                } else {
@@ -1146,14 +1142,14 @@ function feed_birthday($uid, $tz)
        if (DBM::is_result($p)) {
                $tmp_dob = substr($p[0]['dob'], 5);
                if (intval($tmp_dob)) {
-                       $y = datetime_convert($tz, $tz, 'now', 'Y');
+                       $y = DateTimeFormat::timezoneNow($tz, 'Y');
                        $bd = $y . '-' . $tmp_dob . ' 00:00';
                        $t_dob = strtotime($bd);
-                       $now = strtotime(datetime_convert($tz, $tz, 'now'));
+                       $now = strtotime(DateTimeFormat::timezoneNow($tz));
                        if ($t_dob < $now) {
                                $bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
                        }
-                       $birthday = datetime_convert($tz, 'UTC', $bd, ATOM_TIME);
+                       $birthday = DateTimeFormat::convert($bd, 'UTC', $tz, DateTimeFormat::ATOM);
                }
        }