Small cleanup

[friendica.git] / index.php

diff --git a/index.php b/index.php
index ca93eb61e79064a7b8eede16fe01831d4b64569a..625c2d82dc5806929ad7697e919e83eb319c403a 100644 (file)
--- a/index.php
+++ b/index.php
@@ -72,7 +72,8 @@ if(!$install) {
                (intval(get_config('system','ssl_policy')) == SSL_POLICY_FULL) AND
                (substr($a->get_baseurl(), 0, 8) == "https://")) {
                header("HTTP/1.1 302 Moved Temporarily");
-               header("location: ".$a->get_baseurl()."/".$a->query_string);
+               header("Location: ".$a->get_baseurl()."/".$a->query_string);
+               exit();
        }
 
        require_once("include/session.php");
@@ -233,16 +234,7 @@ if(strlen($a->module)) {
        }
 
        /**
-        * If not, next look for module overrides by the theme
-        */
-
-       if((! $a->module_loaded) && (file_exists("view/theme/" . current_theme() . "/mod/{$a->module}.php"))) {
-               include_once("view/theme/" . current_theme() . "/mod/{$a->module}.php");
-               // We will not set module_loaded to true to allow for partial overrides.
-       }
-
-       /**
-        * Finally, look for a 'standard' program module in the 'mod' directory
+        * If not, next look for a 'standard' program module in the 'mod' directory
         */
 
        if((! $a->module_loaded) && (file_exists("mod/{$a->module}.php"))) {
@@ -380,7 +372,7 @@ $a->init_page_end();
 if(x($_SESSION,'visitor_home'))
        $homebase = $_SESSION['visitor_home'];
 elseif(local_user())
-       $homebase = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
+       $homebase = 'profile/' . $a->user['nickname'];
 
 if(isset($homebase))
        $a->page['content'] .= '<script>var homebase="' . $homebase . '" ; </script>';
@@ -432,10 +424,10 @@ if($a->module != 'install' && $a->module != 'maintenance') {
 
 if($a->is_mobile || $a->is_tablet) {
        if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
-               $link = $a->get_baseurl() . '/toggle_mobile?address=' . curPageURL();
+               $link = 'toggle_mobile?address=' . curPageURL();
        }
        else {
-               $link = $a->get_baseurl() . '/toggle_mobile?off=1&address=' . curPageURL();
+               $link = 'toggle_mobile?off=1&address=' . curPageURL();
        }
        $a->page['footer'] = replace_macros(get_markup_template("toggle_mobile_footer.tpl"), array(
                                '$toggle_link' => $link,