merged 2 if() into one as requested by CR

[friendica.git] / include / cronhooks.php

diff --git a/include/cronhooks.php b/include/cronhooks.php
index 7524a0c3a8883c80b4a914e54093d7cfa9351508..bea0f6a198a13121fc9df746b5e8db8cf8b3eddf 100644 (file)
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -1,38 +1,12 @@
 <?php
 
-require_once("boot.php");
-
+use \Friendica\Core\Config;
 
 function cronhooks_run(&$argv, &$argc){
-       global $a, $db;
-
-       if(is_null($a)) {
-               $a = new App;
-       }
-
-       if(is_null($db)) {
-               @include(".htconfig.php");
-               require_once("include/dba.php");
-               $db = new dba($db_host, $db_user, $db_pass, $db_data);
-               unset($db_host, $db_user, $db_pass, $db_data);
-       };
+       global $a;
 
-       require_once('include/session.php');
        require_once('include/datetime.php');
 
-       load_config('config');
-       load_config('system');
-
-       // Don't check this stuff if the function is called by the poller
-       if (App::callstack() != "poller_run") {
-               if ($a->maxload_reached())
-                       return;
-               if (App::is_already_running('cronhooks', 'include/cronhooks.php', 1140))
-                       return;
-       }
-
-       load_hooks();
-
        if (($argc == 2) AND is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) {
                 foreach ($a->hooks["cron"] as $hook)
                        if ($hook[1] == $argv[1]) {
@@ -42,7 +16,7 @@ function cronhooks_run(&$argv, &$argc){
                return;
        }
 
-       $last = get_config('system','last_cronhook');
+       $last = get_config('system', 'last_cronhook');
 
        $poll_interval = intval(get_config('system','cronhook_interval'));
        if(! $poll_interval)
@@ -62,22 +36,16 @@ function cronhooks_run(&$argv, &$argc){
 
        $d = datetime_convert();
 
-       if (get_config("system", "worker") AND is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) {
+       if (is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) {
                 foreach ($a->hooks["cron"] as $hook) {
                        logger("Calling cronhooks for '".$hook[1]."'", LOGGER_DEBUG);
                        proc_run(PRIORITY_MEDIUM, "include/cronhooks.php", $hook[1]);
                }
-       } else
-               call_hooks('cron', $d);
+       }
 
        logger('cronhooks: end');
 
-       set_config('system','last_cronhook', time());
+       set_config('system', 'last_cronhook', time());
 
        return;
 }
-
-if (array_search(__file__,get_included_files())===0){
-       cronhooks_run($_SERVER["argv"],$_SERVER["argc"]);
-       killme();
-}