added curly braces

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 349e1cc607993c19a3f0c317bdc2ecf181b5569a..ebc65cdb018904f550ccda6c6e1cd21ff2c8bca1 100644 (file)
--- a/index.php
+++ b/index.php
@@ -66,10 +66,10 @@ if (!$install) {
        }
 
        if (get_config('system', 'force_ssl') AND ($a->get_scheme() == "http") AND
-               (intval(get_config('system','ssl_policy')) == SSL_POLICY_FULL) AND
+               (intval(get_config('system', 'ssl_policy')) == SSL_POLICY_FULL) AND
                (substr(App::get_baseurl(), 0, 8) == "https://")) {
                header("HTTP/1.1 302 Moved Temporarily");
-               header("Location: ".App::get_baseurl()."/".$a->query_string);
+               header("Location: " . App::get_baseurl() . "/" . $a->query_string);
                exit();
        }
 
@@ -336,14 +336,6 @@ if ($a->module_loaded) {
                $func = str_replace('-','_',current_theme()) . '_init';
                $func($a);
        }
-/// @TODO commented out? old-lost again? :-)
-//     elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/theme.php")) {
-//             require_once("view/theme/".$a->theme_info["extends"]."/theme.php");
-//             if (function_exists(str_replace('-','_',$a->theme_info["extends"]) . '_init')) {
-//                     $func = str_replace('-','_',$a->theme_info["extends"]) . '_init';
-//                     $func($a);
-//             }
-//     }
 
        if (($_SERVER['REQUEST_METHOD'] === 'POST') && (! $a->error)
                && (function_exists($a->module . '_post'))
@@ -395,7 +387,7 @@ $a->init_page_end();
 // If you're just visiting, let javascript take you home
 if (x($_SESSION, 'visitor_home')) {
        $homebase = $_SESSION['visitor_home'];
-] elseif (local_user()) {
+} elseif (local_user()) {
        $homebase = 'profile/' . $a->user['nickname'];
 }
 
@@ -403,17 +395,11 @@ if (isset($homebase)) {
        $a->page['content'] .= '<script>var homebase="' . $homebase . '" ; </script>';
 }
 
-<<<<<<< HEAD
-// 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.
-
-=======
 /*
  * 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.
  */
->>>>>>> 29f1028... Convention:
-if (stristr( implode("",$_SESSION['sysmsg']), t('Permission denied'))) {
+if (stristr(implode("", $_SESSION['sysmsg']), t('Permission denied'))) {
        header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . t('Permission denied.'));
 }