detect php cgi binary because people keep trying to run service scripts using it

[tt-rss.git] / update_daemon2.php

diff --git a/update_daemon2.php b/update_daemon2.php
index 9d948a64d3c5cdea2e19cea5e1fcfa8d9f04c5ae..9b8a7ad66b0e9376cf92c3a9a3fdba7560383630 100755 (executable)
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -9,9 +9,9 @@
        define('DISABLE_SESSIONS', true);
 
        require_once "version.php";
-       require_once "config.php";
        require_once "autoload.php";
        require_once "functions.php";
+       require_once "config.php";
        require_once "rssfuncs.php";
 
        // defaults
@@ -29,6 +29,13 @@
                die("error: This script requires PHP compiled with PCNTL module.\n");
        }
 
+       if (!is_array($options)) {
+               die("error: getopt() failed. ".
+                       "Most probably you are using PHP CGI to run this script ".
+                       "instead of required PHP CLI. Check tt-rss wiki page on updating feeds for ".
+                       "additional information.\n");
+       }
+
        $master_handlers_installed = false;
 
        $children = array();
@@ -218,10 +225,11 @@
                                        register_shutdown_function('task_shutdown');
 
                                        $quiet = (isset($options["quiet"])) ? "--quiet" : "";
+                                       $log = function_exists("flock") && isset($options['log']) ? '--log '.$options['log'] : '';
 
                                        $my_pid = posix_getpid();
 
-                                       passthru(PHP_EXECUTABLE . " update.php --daemon-loop $quiet --task $j --pidlock $my_pid");
+                                       passthru(PHP_EXECUTABLE . " update.php --daemon-loop $quiet $log --task $j --pidlock $my_pid");
 
                                        sleep(1);