Reshare of reshares now work.

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 5dcb9a54a0da070f7e606c3c3b3862cf7a034c78..625c2d82dc5806929ad7697e919e83eb319c403a 100644 (file)
--- a/index.php
+++ b/index.php
@@ -53,11 +53,27 @@ if(!$install) {
        load_config('config');
        load_config('system');
 
+       $maxsysload_frontend = intval(get_config('system','maxloadavg_frontend'));
+       if($maxsysload_frontend < 1)
+               $maxsysload_frontend = 50;
+
+       $load = current_load();
+       if($load) {
+               if($load > $maxsysload_frontend) {
+                       logger('system: load ' . $load . ' too high. Service Temporarily Unavailable.');
+                       header($_SERVER["SERVER_PROTOCOL"].' 503 Service Temporarily Unavailable');
+                       header('Retry-After: 300');
+                       die("System is currently unavailable. Please try again later");
+               }
+       }
+
+
        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);
+               header("Location: ".$a->get_baseurl()."/".$a->query_string);
+               exit();
        }
 
        require_once("include/session.php");
@@ -88,13 +104,13 @@ session_start();
  * Language was set earlier, but we can over-ride it in the session.
  * We have to do it here because the session was just now opened.
  */
-
-if(array_key_exists('system_language',$_POST)) {
-       if(strlen($_POST['system_language']))
-               $_SESSION['language'] = $_POST['system_language'];
-       else
-               unset($_SESSION['language']);
+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((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
        $lang = $_SESSION['language'];
        load_translation_table($lang);
@@ -115,7 +131,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";');
@@ -357,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>';
@@ -393,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
@@ -418,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,
@@ -498,30 +504,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();
        }
 });
@@ -534,6 +548,7 @@ EOT;
 $page    = $a->page;
 $profile = $a->profile;
 
+header("X-Friendica-Version: ".FRIENDICA_VERSION);
 header("Content-type: text/html; charset=utf-8");