X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=484c276343ba458071530b0e03170d05a78bda9d;hb=46f5fc0a09f836b84bf97a36541a0602080c622a;hp=2b1053cc1b7b976588d22a69168b5a87d293f010;hpb=0c764684bb32a9432fd161e62db907efb78af1a5;p=friendica.git

diff --git a/index.php b/index.php
index 2b1053cc1b..484c276343 100644
--- 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");
@@ -107,7 +108,7 @@ if (x($_SESSION,'authenticated') && !x($_SESSION,'language')) {
 	// we didn't loaded user data yet, but we need user language
 	$r = q("SELECT language FROM user WHERE uid=%d", intval($_SESSION['uid']));
 	$_SESSION['language'] = $lang;
-	if (count($r)>0) $_SESSION['language'] = $r[0]['language'];
+	if (dba::is_result($r)) $_SESSION['language'] = $r[0]['language'];
 }
 
 if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
@@ -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>';
@@ -416,15 +408,6 @@ if(x($_SESSION,'sysmsg_info')) {
 call_hooks('page_end', $a->page['content']);
 
 
-/**
- *
- * Add a place for the pause/resume Ajax indicator
- *
- */
-
-$a->page['content'] .=  '<div id="pause"></div>';
-
-
 /**
  *
  * Add the navigation (menu) template
@@ -441,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,