Rename functions

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 2c4a6fa0a8a92cb1f32dc0e1476322cf18d92615..004ebf3adecde4a4563a754dccf46153a66d1c5e 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,23 @@ 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',      1242);
+define('DB_UPDATE_VERSION',      1248);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**
@@ -59,7 +55,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 +777,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 {
@@ -798,19 +793,19 @@ function run_update_function($x)
 }
 
 /**
- * @brief Synchronise plugins:
+ * @brief Synchronise addons:
  *
  * $a->config['system']['addon'] contains a comma-separated list of names
- * of plugins/addons which are used on this system.
+ * of addons which are used on this system.
  * Go through the database list of already installed addons, and if we have
  * an entry, but it isn't in the config list, call the uninstall procedure
  * and mark it uninstalled in the database (for now we'll remove it).
- * Then go through the config list and if we have a plugin that isn't installed,
+ * Then go through the config list and if we have a addon that isn't installed,
  * call the install procedure and add it to the database.
  *
  * @param object $a App
  */
-function check_plugins(App $a)
+function check_addons(App $a)
 {
        $r = q("SELECT * FROM `addon` WHERE `installed` = 1");
        if (DBM::is_result($r)) {
@@ -819,20 +814,20 @@ function check_plugins(App $a)
                $installed = [];
        }
 
-       $plugins = Config::get('system', 'addon');
-       $plugins_arr = [];
+       $addons = Config::get('system', 'addon');
+       $addons_arr = [];
 
-       if ($plugins) {
-               $plugins_arr = explode(',', str_replace(' ', '', $plugins));
+       if ($addons) {
+               $addons_arr = explode(',', str_replace(' ', '', $addons));
        }
 
-       $a->plugins = $plugins_arr;
+       $a->addons = $addons_arr;
 
        $installed_arr = [];
 
        if (count($installed)) {
                foreach ($installed as $i) {
-                       if (!in_array($i['name'], $plugins_arr)) {
+                       if (!in_array($i['name'], $addons_arr)) {
                                Addon::uninstall($i['name']);
                        } else {
                                $installed_arr[] = $i['name'];
@@ -840,8 +835,8 @@ function check_plugins(App $a)
                }
        }
 
-       if (count($plugins_arr)) {
-               foreach ($plugins_arr as $p) {
+       if (count($addons_arr)) {
+               foreach ($addons_arr as $p) {
                        if (!in_array($p, $installed_arr)) {
                                Addon::install($p);
                        }
@@ -875,13 +870,10 @@ function get_guid($size = 16, $prefix = "")
 
 /**
  * @brief Used to end the current process, after saving session state.
+ * @deprecated
  */
 function killme()
 {
-       if (!get_app()->is_backend()) {
-               session_write_close();
-       }
-
        exit();
 }
 
@@ -1146,14 +1138,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);
                }
        }