X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=732816d1b9354f28010bdbfa67a85f2055060809;hb=411a4004723b7822ad9484a57b5dcc4880449ef3;hp=4bfa5c09858acdf0e7d1e9e26e1ccf283bbb6f64;hpb=26b335ef3d8b1ec4e1b4e22cd7d3c34e66d2549d;p=friendica.git

diff --git a/boot.php b/boot.php
index 4bfa5c0985..732816d1b9 100644
--- 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.
@@ -21,9 +20,11 @@
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
 use Friendica\App;
+use Friendica\Core\Addon;
 use Friendica\Core\System;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendida\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
@@ -31,18 +32,14 @@ use Friendica\Model\Contact;
 use Friendica\Database\DBStructure;
 use Friendica\Module\Login;
 
-require_once 'include/network.php';
-require_once 'include/plugin.php';
 require_once 'include/text.php';
 require_once 'include/datetime.php';
-require_once 'include/pgettext.php';
-require_once 'include/nav.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);
 
 /**
@@ -783,7 +780,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 {
@@ -799,19 +796,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)) {
@@ -820,36 +817,36 @@ 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)) {
-				uninstall_plugin($i['name']);
+			if (!in_array($i['name'], $addons_arr)) {
+				Addon::uninstall($i['name']);
 			} else {
 				$installed_arr[] = $i['name'];
 			}
 		}
 	}
 
-	if (count($plugins_arr)) {
-		foreach ($plugins_arr as $p) {
+	if (count($addons_arr)) {
+		foreach ($addons_arr as $p) {
 			if (!in_array($p, $installed_arr)) {
-				install_plugin($p);
+				Addon::install($p);
 			}
 		}
 	}
 
-	load_hooks();
+	Addon::loadHooks();
 
 	return;
 }