Merge pull request #1460 from FlxAlbroscheit/develop

[friendica.git] / index.php

diff --git a/index.php b/index.php
index d628f9ad214397acfad50f7685fb3c23d9cb202a..a4a86244332415168f5b47a0456e15190cd65cd9 100644 (file)
--- 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();
        }
 });