profice a general content wrapper template.

[friendica.git] / index.php

diff --git a/index.php b/index.php
index c6a9a88fe1013d299d6586758f27b4bfebf421f6..bf4ee378af840ccb0810f7cfa686921a251863ba 100644 (file)
--- a/index.php
+++ b/index.php
@@ -41,10 +41,11 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
  */
 
 require_once("include/dba.php");
+require_once("include/dbm.php");
 
 if(!$install) {
        $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
-           unset($db_host, $db_user, $db_pass, $db_data);
+           unset($db_host, $db_user, $db_pass, $db_data);
 
        /**
         * Load configs from db. Overwrite configs from .htconfig.php
@@ -53,6 +54,21 @@ if(!$install) {
        load_config('config');
        load_config('system');
 
+       $processlist = dbm::processlist();
+       if ($processlist["list"] != "") {
+
+               logger("Processcheck: Processes: ".$processlist["amount"]." - Processlist: ".$processlist["list"], LOGGER_DEBUG);
+
+               $max_processes = get_config('system', 'max_processes_frontend');
+               if (intval($max_processes) == 0)
+                       $max_processes = 20;
+
+               if ($processlist["amount"] > $max_processes) {
+                       logger("Processcheck: Maximum number of processes for frontend tasks (".$max_processes.") reached.", LOGGER_DEBUG);
+                       system_unavailable();
+               }
+       }
+
        $maxsysload_frontend = intval(get_config('system','maxloadavg_frontend'));
        if($maxsysload_frontend < 1)
                $maxsysload_frontend = 50;
@@ -442,9 +458,9 @@ if($a->is_mobile || $a->is_tablet) {
                $link = 'toggle_mobile?off=1&address=' . curPageURL();
        }
        $a->page['footer'] = replace_macros(get_markup_template("toggle_mobile_footer.tpl"), array(
-                               '$toggle_link' => $link,
-                               '$toggle_text' => t('toggle mobile')
-                        ));
+                               '$toggle_link' => $link,
+                               '$toggle_text' => t('toggle mobile')
+                        ));
 }
 
 /**
@@ -491,70 +507,6 @@ if (isset($_GET["mode"]) AND ($_GET["mode"] == "raw")) {
        session_write_close();
        exit;
 
-} elseif (get_pconfig(local_user(),'system','infinite_scroll')
-          AND ($a->module == "network") AND ($_GET["mode"] != "minimal")) {
-       if (is_string($_GET["page"]))
-               $pageno = $_GET["page"];
-       else
-               $pageno = 1;
-
-       $reload_uri = "";
-
-       foreach ($_GET AS $param => $value)
-               if (($param != "page") AND ($param != "q"))
-                       $reload_uri .= "&".$param."=".urlencode($value);
-
-       if (($a->page_offset != "") AND !strstr($reload_uri, "&offset="))
-               $reload_uri .= "&offset=".urlencode($a->page_offset);
-
-
-$a->page['htmlhead'] .= <<< EOT
-<script type="text/javascript">
-
-$(document).ready(function() {
-    num = $pageno;
-});
-
-function loadcontent() {
-       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) {
-               $("#scroll-loader").hide();
-               if ($(data).length > 0) {
-                       $(data).insertBefore('#conversation-end');
-                       lockLoadContent = false;
-               } else {
-                       $("#scroll-end").fadeIn('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() * 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() * 1.5))
-                       loadcontent();
-       }
-});
-</script>
-
-EOT;
-
 }
 
 $page    = $a->page;