Some more documentation - again.

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index fe4e5a275701d54126aeb447c71981999aee9dee..a70c7bf616397e707f337095be8257b3534c88c8 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1098,6 +1098,11 @@ class App {
                return($this->is_friendica_app);
        }
 
+       /**
+        * @brief Checks if the maximum load is reached
+        *
+        * @return bool Is the load reached?
+        */
        function maxload_reached() {
 
                $maxsysload = intval(get_config('system', 'maxloadavg'));
@@ -1114,7 +1119,16 @@ class App {
                return false;
        }
 
-       function is_already_running($task, $taskname, $timeout = 540) {
+       /**
+        * @brief Checks if the process is already running
+        *
+        * @param string $taskname The name of the task that will be used for the name of the lockfile
+        * @param string $task The path and name of the php script
+        * @param int $timeout The timeout after which a task should be killed
+        *
+        * @return bool Is the process running?
+        */
+       function is_already_running($taskname, $task = "", $timeout = 540) {
 
                $lockpath = get_lockpath();
                if ($lockpath != '') {
@@ -1544,7 +1558,7 @@ function killme() {
  * @brief Redirect to another URL and terminate this process.
  */
 function goaway($s) {
-       if (!strstr(normalise_link($s), normalise_link(App::get_baseurl())))
+       if (!strstr(normalise_link($s), "http://"))
                $s = App::get_baseurl()."/".$s;
 
        header("Location: $s");