Merge pull request #2190 from annando/1512-getload

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 02316e1e952b4362a627356f6d71525884168e2a..89ed058465db00a7e7e9177e65632d95b6042b85 100644 (file)
--- a/index.php
+++ b/index.php
@@ -56,10 +56,11 @@ if(!$install) {
        $maxsysload_frontend = intval(get_config('system','maxloadavg_frontend'));
        if($maxsysload_frontend < 1)
                $maxsysload_frontend = 50;
-       if(function_exists('sys_getloadavg')) {
-               $load = sys_getloadavg();
-               if(intval($load[0]) > $maxsysload_frontend) {
-                       logger('system: load ' . $load[0] . ' too high. Service Temporarily Unavailable.');
+
+       $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");
@@ -102,13 +103,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);