X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=ede6fc77b9be4c94f416f806501e16c074bccaf7;hb=9ab55181ed9a08c4887eabe5a85e58bc3b34d9fb;hp=379d1bf3daad640bb35670f0815f505a827321b2;hpb=9a3e773a9a0464a309e4891f40c1105c8e2fed33;p=friendica.git

diff --git a/boot.php b/boot.php
index 379d1bf3da..ede6fc77b9 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;
@@ -32,18 +33,14 @@ 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';
-require_once 'include/identity.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',      1238);
+define('DB_UPDATE_VERSION',      1247);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**
@@ -229,9 +226,10 @@ define('ACCOUNT_TYPE_COMMUNITY',   3);
  * Type of the community page
  * @{
  */
-define('CP_NO_COMMUNITY_PAGE',   -1);
+define('CP_NO_COMMUNITY_PAGE',  -1);
 define('CP_USERS_ON_SERVER',     0);
 define('CP_GLOBAL_COMMUNITY',    1);
+define('CP_USERS_AND_GLOBAL',    2);
 /**
  * @}
  */
@@ -288,7 +286,7 @@ define('NETWORK_PHANTOM',          'unkn');    // Place holder
  * and existing allocations MUST NEVER BE CHANGED
  * OR RE-ASSIGNED! You may only add to them.
  */
-$netgroup_ids = array(
+$netgroup_ids = [
 	NETWORK_DFRN     => (-1),
 	NETWORK_ZOT      => (-2),
 	NETWORK_OSTATUS  => (-3),
@@ -310,7 +308,7 @@ $netgroup_ids = array(
 	NETWORK_PNUT      => (-20),
 
 	NETWORK_PHANTOM  => (-127),
-);
+];
 
 /**
  * Maximum number of "people who like (or don't like) this"  that we will list by name
@@ -504,7 +502,7 @@ function startup()
 	ini_set('pcre.backtrack_limit', 500000);
 
 	if (get_magic_quotes_gpc()) {
-		$process = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
+		$process = [&$_GET, &$_POST, &$_COOKIE, &$_REQUEST];
 		while (list($key, $val) = each($process)) {
 			foreach ($val as $k => $v) {
 				unset($process[$key][$k]);
@@ -596,9 +594,6 @@ function defaults() {
 	if (count($args) > 3) {
 		throw new BadFunctionCallException('defaults() cannot use more than 3 parameters');
 	}
-	if (count($args) === 3 && !is_array($args[0])) {
-		throw new BadFunctionCallException('defaults($arr, $key, $def) requires an array as first parameter');
-	}
 	if (count($args) === 3 && is_null($args[1])) {
 		throw new BadFunctionCallException('defaults($arr, $key, $def) $key is null');
 	}
@@ -666,7 +661,7 @@ function check_db($via_worker)
 	$build = Config::get('system', 'build');
 
 	if (empty($build)) {
-		Config::set('system', 'build', DB_UPDATE_VERSION);
+		Config::set('system', 'build', DB_UPDATE_VERSION - 1);
 		$build = DB_UPDATE_VERSION;
 	}
 
@@ -678,7 +673,7 @@ function check_db($via_worker)
 	if ($build != DB_UPDATE_VERSION) {
 		// When we cannot execute the database update via the worker, we will do it directly
 		if (!Worker::add(PRIORITY_CRITICAL, 'DBUpdate') && $via_worker) {
-			update_db(get_app());
+			update_db();
 		}
 	}
 }
@@ -699,11 +694,8 @@ function check_url(App $a)
 	// and www.example.com vs example.com.
 	// We will only change the url to an ip address if there is no existing setting
 
-	if (empty($url)) {
-		$url = Config::set('system', 'url', System::baseUrl());
-	}
-	if ((!link_compare($url, System::baseUrl())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $a->get_hostname))) {
-		$url = Config::set('system', 'url', System::baseUrl());
+	if (empty($url) || (!link_compare($url, System::baseUrl())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $a->get_hostname))) {
+		Config::set('system', 'url', System::baseUrl());
 	}
 
 	return;
@@ -713,13 +705,13 @@ function check_url(App $a)
  * @brief Automatic database updates
  * @param object $a App
  */
-function update_db(App $a)
+function update_db()
 {
 	$build = Config::get('system', 'build');
 
-	if (empty($build)) {
-		Config::set('system', 'build', DB_UPDATE_VERSION);
-		$build = DB_UPDATE_VERSION;
+	if (empty($build) || ($build > DB_UPDATE_VERSION)) {
+		$build = DB_UPDATE_VERSION - 1;
+		Config::set('system', 'build', $build);
 	}
 
 	if ($build != DB_UPDATE_VERSION) {
@@ -789,74 +781,73 @@ 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 {
 			Config::set('database', 'update_' . $x, 'success');
-			Config::set('system', 'build', $x + 1);
+			Config::set('system', 'build', $x);
 			return true;
 		}
 	} else {
 		Config::set('database', 'update_' . $x, 'success');
-		Config::set('system', 'build', $x + 1);
+		Config::set('system', 'build', $x);
 		return true;
 	}
-	return true;
 }
 
 /**
- * @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)) {
 		$installed = $r;
 	} else {
-		$installed = array();
+		$installed = [];
 	}
 
-	$plugins = Config::get('system', 'addon');
-	$plugins_arr = array();
+	$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 = array();
+	$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;
 }
@@ -973,7 +964,7 @@ function notice($s)
 {
 	$a = get_app();
 	if (!x($_SESSION, 'sysmsg')) {
-		$_SESSION['sysmsg'] = array();
+		$_SESSION['sysmsg'] = [];
 	}
 	if ($a->interactive) {
 		$_SESSION['sysmsg'][] = $s;
@@ -996,7 +987,7 @@ function info($s)
 	}
 
 	if (!x($_SESSION, 'sysmsg_info')) {
-		$_SESSION['sysmsg_info'] = array();
+		$_SESSION['sysmsg_info'] = [];
 	}
 	if ($a->interactive) {
 		$_SESSION['sysmsg_info'][] = $s;
@@ -1017,7 +1008,7 @@ function get_max_import_size()
 
 function current_theme()
 {
-	$app_base_themes = array('duepuntozero', 'dispy', 'quattro');
+	$app_base_themes = ['duepuntozero', 'dispy', 'quattro'];
 
 	$a = get_app();
 
@@ -1053,7 +1044,6 @@ function current_theme()
 
 	if ($is_mobile) {
 		if (isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
-			$system_theme = $standard_system_theme;
 			$theme_name = $standard_theme_name;
 		} else {
 			$system_theme = Config::get('system', 'mobile-theme', '');
@@ -1064,7 +1054,6 @@ function current_theme()
 
 			if ($theme_name === '---') {
 				// user has selected to have the mobile theme be the same as the normal one
-				$system_theme = $standard_system_theme;
 				$theme_name = $standard_theme_name;
 
 				if ($page_theme) {
@@ -1073,7 +1062,6 @@ function current_theme()
 			}
 		}
 	} else {
-		$system_theme = $standard_system_theme;
 		$theme_name = $standard_theme_name;
 
 		if ($page_theme) {
@@ -1248,10 +1236,10 @@ function explode_querystring($query)
 		$args = array_values($args);
 	}
 
-	return array(
+	return [
 		'base' => $base,
 		'args' => $args,
-	);
+	];
 }
 
 /**
@@ -1581,7 +1569,7 @@ function infinite_scroll_data($module)
 			$reload_uri .= "&offset=" . urlencode($a->page_offset);
 		}
 
-		$arr = array("pageno" => $pageno, "reload_uri" => $reload_uri);
+		$arr = ["pageno" => $pageno, "reload_uri" => $reload_uri];
 
 		return $arr;
 	}