X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=1b60071534c5df978ca5a9beea8e5e5adb5bd284;hb=992684c3620185da00663e25eb1460c4b18920ea;hp=3ccdc725f60ab955e42d478a19e5403c1818d665;hpb=41f31f32824849a475b0259b4d5987e179f00b16;p=friendica.git
diff --git a/index.php b/index.php
index 3ccdc725f6..1b60071534 100644
--- a/index.php
+++ b/index.php
@@ -32,9 +32,7 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
-$lang = get_browser_language();
-load_translation_table($lang);
/**
*
@@ -62,6 +60,9 @@ if(!$install) {
$maintenance = get_config('system', 'maintenance');
}
+$lang = get_browser_language();
+
+load_translation_table($lang);
/**
*
@@ -103,12 +104,13 @@ if((x($_GET,'zrl')) && (!$install && !$maintenance)) {
* For Mozilla auth manager - still needs sorting, and this might conflict with LRDD header.
* Apache/PHP lumps the Link: headers into one - and other services might not be able to parse it
* this way. There's a PHP flag to link the headers because by default this will over-write any other
- * link header.
+ * link header.
*
* What we really need to do is output the raw headers ourselves so we can keep them separate.
*
+
*/
-
+
// header('Link: <' . $a->get_baseurl() . '/amcd>; rel="acct-mgmt";');
if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login'))
@@ -117,7 +119,6 @@ if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module ==
if(! x($_SESSION,'authenticated'))
header('X-Account-Management-Status: none');
-
/* set up page['htmlhead'] and page['end'] for the modules to use */
$a->page['htmlhead'] = '';
$a->page['end'] = '';
@@ -135,7 +136,6 @@ if(! x($_SESSION,'sysmsg_info'))
* any plugins have been added or removed and reacts accordingly.
*/
-
if($install)
$a->module = 'install';
elseif($maintenance)
@@ -148,11 +148,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'];
+}
/**
*
@@ -182,10 +187,26 @@ if(strlen($a->module)) {
*
*/
+ // Compatibility with the Android Diaspora client
+ if ($a->module == "stream")
+ $a->module = "network";
+
+ // Compatibility with the Firefox App
+ if (($a->module == "users") AND ($a->cmd == "users/sign_in"))
+ $a->module = "login";
+
+ $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;
+ }
}
/**
@@ -302,10 +323,8 @@ if($a->module_loaded) {
$func = str_replace('-','_',current_theme()) . '_content_loaded';
$func($a);
}
-
}
-
/*
* Create the page head after setting the language
* and getting any auth credentials
@@ -409,20 +428,120 @@ if(!$a->theme['stylesheet'])
$stylesheet = current_theme_url();
else
$stylesheet = $a->theme['stylesheet'];
-$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
+
+$a->page['htmlhead'] = str_replace('{{$stylesheet}}',$stylesheet,$a->page['htmlhead']);
+//$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
+
+if (isset($_GET["mode"]) AND (($_GET["mode"] == "raw") OR ($_GET["mode"] == "minimal"))) {
+ $doc = new DOMDocument();
+
+ $target = new DOMDocument();
+ $target->loadXML("