Beatification/coding convention:

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 08f24af60f49238d43a7d30832767dd939feea2b..f05151757b5466f8944299821cde706398e2ae11 100644 (file)
--- a/index.php
+++ b/index.php
@@ -60,15 +60,15 @@ if(!$install) {
        if ($a->max_processes_reached() OR $a->maxload_reached()) {
                header($_SERVER["SERVER_PROTOCOL"].' 503 Service Temporarily Unavailable');
                header('Retry-After: 120');
-               header('Refresh: 120; url='.$a->get_baseurl()."/".$a->query_string);
+               header('Refresh: 120; url='.App::get_baseurl()."/".$a->query_string);
                die("System is currently unavailable. Please try again later");
        }
 
        if (get_config('system','force_ssl') AND ($a->get_scheme() == "http") AND
                (intval(get_config('system','ssl_policy')) == SSL_POLICY_FULL) AND
-               (substr($a->get_baseurl(), 0, 8) == "https://")) {
+               (substr(App::get_baseurl(), 0, 8) == "https://")) {
                header("HTTP/1.1 302 Moved Temporarily");
-               header("Location: ".$a->get_baseurl()."/".$a->query_string);
+               header("Location: ".App::get_baseurl()."/".$a->query_string);
                exit();
        }
 
@@ -150,24 +150,28 @@ if((x($_GET,'zrl')) && (!$install && !$maintenance)) {
  *
  */
 
-// header('Link: <' . $a->get_baseurl() . '/amcd>; rel="acct-mgmt";');
+// header('Link: <' . App::get_baseurl() . '/amcd>; rel="acct-mgmt";');
 
-if(x($_COOKIE["Friendica"]) || (x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login'))
+if (x($_COOKIE["Friendica"]) || (x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login')) {
        require("include/auth.php");
+}
 
-if(! x($_SESSION,'authenticated'))
+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'] = '';
 
 
-if(! x($_SESSION,'sysmsg'))
+if (! x($_SESSION,'sysmsg')) {
        $_SESSION['sysmsg'] = array();
+}
 
-if(! x($_SESSION,'sysmsg_info'))
+if (! x($_SESSION,'sysmsg_info')) {
        $_SESSION['sysmsg_info'] = array();
+}
 
 /*
  * check_config() is responsible for running update scripts. These automatically
@@ -177,11 +181,11 @@ if(! x($_SESSION,'sysmsg_info'))
 
 // in install mode, any url loads install module
 // but we need "view" module for stylesheet
-if($install && $a->module!="view")
+if ($install && $a->module!="view") {
        $a->module = 'install';
-elseif($maintenance && $a->module!="view")
+} elseif ($maintenance && $a->module!="view") {
        $a->module = 'maintenance';
-else {
+} else {
        check_url($a);
        check_db();
        check_plugins($a);
@@ -191,8 +195,7 @@ nav_set_selected('nothing');
 
 //Don't populate apps_menu if apps are private
 $privateapps = get_config('config','private_addons');
-if((local_user()) || (! $privateapps === "1"))
-{
+if ((local_user()) || (! $privateapps === "1")) {
        $arr = array('app_menu' => $a->apps);
 
        call_hooks('app_menu', $arr);
@@ -238,9 +241,9 @@ if(strlen($a->module)) {
 
        $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")) {
+       if (is_array($a->plugins) && in_array($a->module,$a->plugins) && 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") {
+               if ((!local_user()) && plugin_is_app($a->module) && $privateapps === "1") {
                        info( t("You must be logged in to use addons. "));
                }
                else {
@@ -254,7 +257,7 @@ if(strlen($a->module)) {
         * If not, next look for a 'standard' program module in the 'mod' directory
         */
 
-       if((! $a->module_loaded) && (file_exists("mod/{$a->module}.php"))) {
+       if ((! $a->module_loaded) && (file_exists("mod/{$a->module}.php"))) {
                include_once("mod/{$a->module}.php");
                $a->module_loaded = true;
        }
@@ -272,16 +275,16 @@ if(strlen($a->module)) {
         *
         */
 
-       if(! $a->module_loaded) {
+       if (! $a->module_loaded) {
 
                // Stupid browser tried to pre-fetch our Javascript img template. Don't log the event or return anything - just quietly exit.
-               if((x($_SERVER,'QUERY_STRING')) && preg_match('/{[0-9]}/',$_SERVER['QUERY_STRING']) !== 0) {
+               if ((x($_SERVER,'QUERY_STRING')) && preg_match('/{[0-9]}/',$_SERVER['QUERY_STRING']) !== 0) {
                        killme();
                }
 
-               if((x($_SERVER,'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
+               if ((x($_SERVER,'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
                        logger('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']);
-                       goaway($a->get_baseurl() . $_SERVER['REQUEST_URI']);
+                       goaway(App::get_baseurl() . $_SERVER['REQUEST_URI']);
                }
 
                logger('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], LOGGER_DEBUG);
@@ -304,11 +307,13 @@ if (file_exists($theme_info_file)){
 
 /* initialise content region */
 
-if(! x($a->page,'content'))
+if (! x($a->page,'content')) {
        $a->page['content'] = '';
+}
 
-if(!$install && !$maintenance)
+if (!$install && !$maintenance) {
        call_hooks('page_content_top',$a->page['content']);
+}
 
 /**
  * Call module functions