X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=67c0c495cf9316994d77926214bc7021da605786;hb=e746c4955bd9b8230d1c5427cfaeb18c6e370a3a;hp=d3a4cef44ebf5bfca9239583d7923858ce3109e8;hpb=ed6ca1d3845070decc732ce5df266b49b448b940;p=friendica.git

diff --git a/index.php b/index.php
index d3a4cef44e..67c0c495cf 100644
--- a/index.php
+++ b/index.php
@@ -53,6 +53,9 @@ if(!$install) {
 	load_config('config');
 	load_config('system');
 
+	if ($hostname =  get_config('system', 'hostname'))
+		$a->set_hostname($hostname);
+
 	require_once("include/session.php");
 	load_hooks();
 	call_hooks('init_1');
@@ -149,11 +152,16 @@ else {
 
 nav_set_selected('nothing');
 
-$arr = array('app_menu' => $a->apps);
+//Don't populate apps_menu if apps are private
+$privateapps = get_config('config','private_addons');
+if((local_user()) || (! $privateapps === "1"))
+{
+	$arr = array('app_menu' => $a->apps);
 
-call_hooks('app_menu', $arr);
+	call_hooks('app_menu', $arr);
 
-$a->apps = $arr['app_menu'];
+	$a->apps = $arr['app_menu'];
+}
 
 /**
  *
@@ -186,11 +194,19 @@ if(strlen($a->module)) {
 	// Compatibility with the Android Diaspora client
 	if ($a->module == "stream")
 		$a->module = "network";
+	
+	$privateapps = get_config('config','private_addons');
 
 	if(is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
-		include_once("addon/{$a->module}/{$a->module}.php");
-		if(function_exists($a->module . '_module'))
-			$a->module_loaded = true;
+		//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. "));
+		}
+		else {
+			include_once("addon/{$a->module}/{$a->module}.php");
+			if(function_exists($a->module . '_module'))
+				$a->module_loaded = true;
+		}
 	}
 
 	/**