X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=a4a86244332415168f5b47a0456e15190cd65cd9;hb=106b0b5d23f36353eeff70946a51d848a8cb14ff;hp=d628f9ad214397acfad50f7685fb3c23d9cb202a;hpb=b95e746259a763fc3f7635299d99141e0accdf95;p=friendica.git

diff --git a/index.php b/index.php
index d628f9ad21..a4a8624433 100644
--- a/index.php
+++ b/index.php
@@ -53,6 +53,13 @@ if(!$install) {
 	load_config('config');
 	load_config('system');
 
+	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://")) {
+		header("HTTP/1.1 302 Moved Temporarily");
+		header("location: ".$a->get_baseurl()."/".$a->query_string);
+	}
+
 	require_once("include/session.php");
 	load_hooks();
 	call_hooks('init_1');
@@ -108,7 +115,6 @@ if((x($_GET,'zrl')) && (!$install && !$maintenance)) {
  *
  * 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";');
@@ -491,30 +497,38 @@ $(document).ready(function() {
 });
 
 function loadcontent() {
-	//$("div.loader").show();
+	if (lockLoadContent) return;
+	lockLoadContent = true;
+
+	$("#scroll-loader").fadeIn('normal');
 
 	num+=1;
 
 	console.log('Loading page ' + num);
 
 	$.get('/network?mode=raw$reload_uri&page=' + num, function(data) {
-		$(data).insertBefore('#conversation-end');
+		$("#scroll-loader").hide();
+		if ($(data).length > 0) {
+			$(data).insertBefore('#conversation-end');
+			lockLoadContent = false;
+		} else {
+			$("#scroll-end").fadeIn('normal');
+		}
 	});
-
-	//$("div.loader").fadeOut('normal');
 }
 
 var num = $pageno;
+var lockLoadContent = false;
 
 $(window).scroll(function(e){
 
 	if ($(document).height() != $(window).height()) {
 		// First method that is expected to work - but has problems with Chrome
-		if ($(window).scrollTop() == $(document).height() - $(window).height())
+		if ($(window).scrollTop() > ($(document).height() - $(window).height() * 1.5))
 			loadcontent();
 	} else {
 		// This method works with Chrome - but seems to be much slower in Firefox
-		if ($(window).scrollTop() > (($("section").height() + $("header").height() + $("footer").height()) - $(window).height()))
+		if ($(window).scrollTop() > (($("section").height() + $("header").height() + $("footer").height()) - $(window).height() * 1.5))
 			loadcontent();
 	}
 });