X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=2f07fa9af98b6fc3ad2c2590582a9af9ff3598ee;hb=6871481a7858495c204088e17beb5e7b4be2075a;hp=dcb25cc3a37d513998914d1aab4c887b0cc8d22f;hpb=286811357ab86bc73a5b6b0fd92bdcef1ea55c08;p=friendica.git

diff --git a/index.php b/index.php
index dcb25cc3a3..2f07fa9af9 100644
--- a/index.php
+++ b/index.php
@@ -11,8 +11,11 @@
 use Friendica\App;
 use Friendica\BaseObject;
 use Friendica\Content\Nav;
+use Friendica\Core\Addon;
 use Friendica\Core\System;
+use Friendica\Core\Theme;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Profile;
@@ -75,15 +78,15 @@ if (!$install) {
 	}
 
 	require_once 'include/session.php';
-	load_hooks();
-	call_hooks('init_1');
+	Addon::loadHooks();
+	Addon::callHooks('init_1');
 
 	$maintenance = Config::get('system', 'maintenance');
 }
 
-$lang = get_browser_language();
+$lang = L10n::getBrowserLanguage();
 
-load_translation_table($lang);
+L10n::loadTranslationTable($lang);
 
 /**
  * Important stuff we always need to do.
@@ -119,7 +122,7 @@ if (x($_SESSION, 'authenticated') && !x($_SESSION, 'language')) {
 
 if ((x($_SESSION, 'language')) && ($_SESSION['language'] !== $lang)) {
 	$lang = $_SESSION['language'];
-	load_translation_table($lang);
+	L10n::loadTranslationTable($lang);
 }
 
 if ((x($_GET, 'zrl')) && (!$install && !$maintenance)) {
@@ -178,7 +181,7 @@ if (! x($_SESSION, 'last_updated')) {
 /*
  * check_config() is responsible for running update scripts. These automatically
  * update the DB schema whenever we push a new one out. It also checks to see if
- * any plugins have been added or removed and reacts accordingly.
+ * any addons have been added or removed and reacts accordingly.
  */
 
 // in install mode, any url loads install module
@@ -190,7 +193,7 @@ if ($install && $a->module!="view") {
 } else {
 	check_url($a);
 	check_db(false);
-	check_plugins($a);
+	check_addons($a);
 }
 
 Nav::setSelected('nothing');
@@ -200,7 +203,7 @@ $privateapps = Config::get('config', 'private_addons');
 if ((local_user()) || (! $privateapps === "1")) {
 	$arr = ['app_menu' => $a->apps];
 
-	call_hooks('app_menu', $arr);
+	Addon::callHooks('app_menu', $arr);
 
 	$a->apps = $arr['app_menu'];
 }
@@ -226,7 +229,7 @@ if (strlen($a->module)) {
 
 	/**
 	 * We will always have a module name.
-	 * First see if we have a plugin which is masquerading as a module.
+	 * First see if we have an addon which is masquerading as a module.
 	 */
 
 	// Compatibility with the Android Diaspora client
@@ -241,10 +244,10 @@ if (strlen($a->module)) {
 
 	$privateapps = Config::get('config', 'private_addons');
 
-	if (is_array($a->plugins) && in_array($a->module, $a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
+	if (is_array($a->addons) && in_array($a->module, $a->addons) && file_exists("addon/{$a->module}/{$a->module}.php")) {
 		//Check if module is an app and if public access to apps is allowed or not
-		if ((!local_user()) && plugin_is_app($a->module) && $privateapps === "1") {
-			info(t("You must be logged in to use addons. "));
+		if ((!local_user()) && Addon::isApp($a->module) && $privateapps === "1") {
+			info(L10n::t("You must be logged in to use addons. "));
 		} else {
 			include_once "addon/{$a->module}/{$a->module}.php";
 			if (function_exists($a->module . '_module')) {
@@ -291,12 +294,12 @@ if (strlen($a->module)) {
 		}
 
 		logger('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], LOGGER_DEBUG);
-		header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found'));
+		header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . L10n::t('Not Found'));
 		$tpl = get_markup_template("404.tpl");
 		$a->page['content'] = replace_macros(
 			$tpl,
 			[
-			'$message' =>  t('Page not found.')]
+			'$message' =>  L10n::t('Page not found.')]
 		);
 	}
 }
@@ -317,7 +320,7 @@ if (! x($a->page, 'content')) {
 }
 
 if (!$install && !$maintenance) {
-	call_hooks('page_content_top', $a->page['content']);
+	Addon::callHooks('page_content_top', $a->page['content']);
 }
 
 /**
@@ -329,10 +332,10 @@ if ($a->module_loaded) {
 	$placeholder = '';
 
 	if ($a->module_class) {
-		call_hooks($a->module . '_mod_init', $placeholder);
+		Addon::callHooks($a->module . '_mod_init', $placeholder);
 		call_user_func([$a->module_class, 'init']);
 	} else if (function_exists($a->module . '_init')) {
-		call_hooks($a->module . '_mod_init', $placeholder);
+		Addon::callHooks($a->module . '_mod_init', $placeholder);
 		$func = $a->module . '_init';
 		$func($a);
 	}
@@ -343,7 +346,7 @@ if ($a->module_loaded) {
 	}
 
 	if (! $a->error && $_SERVER['REQUEST_METHOD'] === 'POST') {
-		call_hooks($a->module . '_mod_post', $_POST);
+		Addon::callHooks($a->module . '_mod_post', $_POST);
 		if ($a->module_class) {
 			call_user_func([$a->module_class, 'post']);
 		} else if (function_exists($a->module . '_post')) {
@@ -353,7 +356,7 @@ if ($a->module_loaded) {
 	}
 
 	if (! $a->error) {
-		call_hooks($a->module . '_mod_afterpost', $placeholder);
+		Addon::callHooks($a->module . '_mod_afterpost', $placeholder);
 		if ($a->module_class) {
 			call_user_func([$a->module_class, 'afterpost']);
 		} else if (function_exists($a->module . '_afterpost')) {
@@ -364,7 +367,7 @@ if ($a->module_loaded) {
 
 	if (! $a->error) {
 		$arr = ['content' => $a->page['content']];
-		call_hooks($a->module . '_mod_content', $arr);
+		Addon::callHooks($a->module . '_mod_content', $arr);
 		$a->page['content'] = $arr['content'];
 		if ($a->module_class) {
 			$arr = ['content' => call_user_func([$a->module_class, 'content'])];
@@ -372,7 +375,7 @@ if ($a->module_loaded) {
 			$func = $a->module . '_content';
 			$arr = ['content' => $func($a)];
 		}
-		call_hooks($a->module . '_mod_aftercontent', $arr);
+		Addon::callHooks($a->module . '_mod_aftercontent', $arr);
 		$a->page['content'] .= $arr['content'];
 	}
 
@@ -414,14 +417,14 @@ if (isset($homebase)) {
  * now that we've been through the module content, see if the page reported
  * a permission problem and if so, a 403 response would seem to be in order.
  */
-if (stristr(implode("", $_SESSION['sysmsg']), t('Permission denied'))) {
-	header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . t('Permission denied.'));
+if (stristr(implode("", $_SESSION['sysmsg']), L10n::t('Permission denied'))) {
+	header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . L10n::t('Permission denied.'));
 }
 
 /*
  * Report anything which needs to be communicated in the notification area (before the main body)
  */
-call_hooks('page_end', $a->page['content']);
+Addon::callHooks('page_end', $a->page['content']);
 
 /*
  * Add the navigation (menu) template
@@ -443,7 +446,7 @@ if ($a->is_mobile || $a->is_tablet) {
 		get_markup_template("toggle_mobile_footer.tpl"),
 		[
 			'$toggle_link' => $link,
-			'$toggle_text' => t('toggle mobile')]
+			'$toggle_text' => L10n::t('toggle mobile')]
 	);
 }
 
@@ -516,15 +519,15 @@ header('X-Frame-Options: sameorigin');
  * The page templates are located in /view/php/ or in the theme directory.
  */
 if (isset($_GET["mode"])) {
-	$template = theme_include($_GET["mode"] . '.php');
+	$template = Theme::getPathForFile($_GET["mode"] . '.php');
 }
 
 // If there is no page template use the default page template
 if (empty($template)) {
-	$template = theme_include("default.php");
+	$template = Theme::getPathForFile("default.php");
 }
 
-/// @TODO Looks unsafe (remote-inclusion), is maybe not but theme_include() uses file_exists() but does not escape anything
+/// @TODO Looks unsafe (remote-inclusion), is maybe not but Theme::getPathForFile() uses file_exists() but does not escape anything
 require_once $template;
 
 killme();