X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=1b60071534c5df978ca5a9beea8e5e5adb5bd284;hb=992684c3620185da00663e25eb1460c4b18920ea;hp=bd5b3e396eede03224986634504e6cd915d1e59b;hpb=cbbd68563bf03e2d077a35fe02944ffccd25eaa8;p=friendica.git diff --git a/index.php b/index.php index bd5b3e396e..1b60071534 100644 --- a/index.php +++ b/index.php @@ -1,5 +1,6 @@ query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string); zrl_init($a); @@ -100,21 +104,21 @@ if((x($_GET,'zrl')) && (! $install)) { * 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')) - require("auth.php"); + require("include/auth.php"); 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'] = ''; @@ -132,19 +136,28 @@ if(! x($_SESSION,'sysmsg_info')) * any plugins have been added or removed and reacts accordingly. */ - if($install) $a->module = 'install'; -else - check_config($a); +elseif($maintenance) + $a->module = 'maintenance'; +else { + check_url($a); + check_db(); + check_plugins($a); +} 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']; +} /** * @@ -174,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; + } } /** @@ -237,7 +266,7 @@ if (file_exists($theme_info_file)){ if(! x($a->page,'content')) $a->page['content'] = ''; -if(! $install) +if(!$install && !$maintenance) call_hooks('page_content_top',$a->page['content']); /** @@ -294,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 @@ -372,20 +399,14 @@ $a->page['content'] .= '
'; * */ -if($a->module != 'install') { +if($a->module != 'install' && $a->module != 'maintenance') { nav($a); } /** - * Build the page - now that we have all the components + * Add a "toggle mobile" link if we're using a mobile device */ -if(!$a->theme['stylesheet']) - $stylesheet = current_theme_url(); -else - $stylesheet = $a->theme['stylesheet']; -$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet)); - if($a->is_mobile || $a->is_tablet) { if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) { $link = $a->get_baseurl() . '/toggle_mobile?address=' . curPageURL(); @@ -399,18 +420,128 @@ if($a->is_mobile || $a->is_tablet) { )); } +/** + * Build the page - now that we have all the components + */ + +if(!$a->theme['stylesheet']) + $stylesheet = current_theme_url(); +else + $stylesheet = $a->theme['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("