codysnider / tt-rss

plugins/af_psql_trgm/init.php

Spacing +12 added lines, -12 removed lines

@@ -41,7 +41,7 @@ 
 	}
 
 	public function get_js() {
-		return file_get_contents(__DIR__ . "/init.js");
+		return file_get_contents(__DIR__."/init.js");
 	}
 
 	public function showrelated() {
@@ -98,7 +98,7 @@ 
 
 				print "</div>";
 
-				print "<div style='text-align : right' class='text-muted'>" . smart_date_time(strtotime($line["updated"])) . "</div>";
+				print "<div style='text-align : right' class='text-muted'>".smart_date_time(strtotime($line["updated"]))."</div>";
 
 				print "</li>";
 			}
@@ -163,24 +163,24 @@ 
 			print_hidden("method", "save");
 			print_hidden("plugin", "af_psql_trgm");
 
-			print "<h2>" . __("Global settings") . "</h2>";
+			print "<h2>".__("Global settings")."</h2>";
 
 			print_notice("Enable for specific feeds in the feed editor.");
 
 			print "<fieldset>";
 
-			print "<label>" . __("Minimum similarity:") . "</label> ";
+			print "<label>".__("Minimum similarity:")."</label> ";
 			print "<input dojoType=\"dijit.form.NumberSpinner\"
 				placeholder=\"0.75\" id='psql_trgm_similarity'
 				required=\"1\" name=\"similarity\" value=\"$similarity\">";
 
-			print "<div dojoType='dijit.Tooltip' connectId='psql_trgm_similarity' position='below'>" .
-				__("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking.") .
+			print "<div dojoType='dijit.Tooltip' connectId='psql_trgm_similarity' position='below'>".
+				__("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking.").
 				"</div>";
 
 			print "</fieldset><fieldset>";
 
-			print "<label>" . __("Minimum title length:") . "</label> ";
+			print "<label>".__("Minimum title length:")."</label> ";
 			print "<input dojoType=\"dijit.form.NumberSpinner\"
 				placeholder=\"32\"
 				required=\"1\" name=\"min_title_length\" value=\"$min_title_length\">";
@@ -189,7 +189,7 @@ 
 
 			print "<label class='checkbox'>";
 			print_checkbox("enable_globally", $enable_globally);
-			print " " . __("Enable for all feeds:");
+			print " ".__("Enable for all feeds:");
 			print "</label>";
 
 			print "</fieldset>";
@@ -204,14 +204,14 @@ 
 			$this->host->set($this, "enabled_feeds", $enabled_feeds);
 
 			if (count($enabled_feeds) > 0) {
-				print "<h3>" . __("Currently enabled for (click to edit):") . "</h3>";
+				print "<h3>".__("Currently enabled for (click to edit):")."</h3>";
 
 				print "<ul class=\"panel panel-scrollable list list-unstyled\">";
 				foreach ($enabled_feeds as $f) {
-					print "<li>" .
+					print "<li>".
 						"<i class='material-icons'>rss_feed</i> <a href='#'
-							onclick='CommonDialogs.editFeed($f)'>" .
-						Feeds::getFeedTitle($f) . "</a></li>";
+							onclick='CommonDialogs.editFeed($f)'>".
+						Feeds::getFeedTitle($f)."</a></li>";
 				}
 				print "</ul>";
 			}

Braces +42 added lines, -14 removed lines

@@ -15,10 +15,16 @@ 
 		$min_title_length = (int) $_POST["min_title_length"];
 		$enable_globally = checkbox_to_sql_bool($_POST["enable_globally"]);
 
-		if ($similarity < 0) $similarity = 0;
-		if ($similarity > 1) $similarity = 1;
+		if ($similarity < 0) {
+			$similarity = 0;
+		}
+		if ($similarity > 1) {
+			$similarity = 1;
+		}
 
-		if ($min_title_length < 0) $min_title_length = 0;
+		if ($min_title_length < 0) {
+			$min_title_length = 0;
+		}
 
 		$similarity = sprintf("%.2f", $similarity);
 
@@ -121,7 +127,9 @@ 
 	}
 
 	public function hook_prefs_tab($args) {
-		if ($args != "prefFeeds") return;
+		if ($args != "prefFeeds") {
+			return;
+		}
 
 		print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>extension</i> ".__('Mark similar articles as read')."\">";
@@ -140,8 +148,12 @@ 
 			$min_title_length = $this->host->get($this, "min_title_length");
 			$enable_globally = $this->host->get($this, "enable_globally");
 
-			if (!$similarity) $similarity = '0.75';
-			if (!$min_title_length) $min_title_length = '32';
+			if (!$similarity) {
+				$similarity = '0.75';
+			}
+			if (!$min_title_length) {
+				$min_title_length = '32';
+			}
 
 			print "<form dojoType=\"dijit.form.Form\">";
 
@@ -198,7 +210,9 @@ 
 			print "</form>";
 
 			$enabled_feeds = $this->host->get($this, "enabled_feeds");
-			if (!array($enabled_feeds)) $enabled_feeds = array();
+			if (!array($enabled_feeds)) {
+				$enabled_feeds = array();
+			}
 
 			$enabled_feeds = $this->filter_unknown_feeds($enabled_feeds);
 			$this->host->set($this, "enabled_feeds", $enabled_feeds);
@@ -225,7 +239,9 @@ 
 		print "<section>";
 
 		$enabled_feeds = $this->host->get($this, "enabled_feeds");
-		if (!array($enabled_feeds)) $enabled_feeds = array();
+		if (!array($enabled_feeds)) {
+			$enabled_feeds = array();
+		}
 
 		$key = array_search($feed_id, $enabled_feeds);
 		$checked = $key !== FALSE ? "checked" : "";
@@ -242,7 +258,9 @@ 
 
 	public function hook_prefs_save_feed($feed_id) {
 		$enabled_feeds = $this->host->get($this, "enabled_feeds");
-		if (!is_array($enabled_feeds)) $enabled_feeds = array();
+		if (!is_array($enabled_feeds)) {
+			$enabled_feeds = array();
+		}
 
 		$enable = checkbox_to_sql_bool($_POST["trgm_similarity_enabled"]);
 		$key = array_search($feed_id, $enabled_feeds);
@@ -262,24 +280,34 @@ 
 
 	public function hook_article_filter($article) {
 
-		if (DB_TYPE != "pgsql") return $article;
+		if (DB_TYPE != "pgsql") {
+			return $article;
+		}
 
 		$res = $this->pdo->query("select 'similarity'::regproc");
-		if (!$res->fetch()) return $article;
+		if (!$res->fetch()) {
+			return $article;
+		}
 
 		$enable_globally = $this->host->get($this, "enable_globally");
 
 		if (!$enable_globally) {
 			$enabled_feeds = $this->host->get($this, "enabled_feeds");
 			$key = array_search($article["feed"]["id"], $enabled_feeds);
-			if ($key === FALSE) return $article;
+			if ($key === FALSE) {
+				return $article;
+			}
 		}
 
 		$similarity = (float) $this->host->get($this, "similarity");
-		if ($similarity < 0.01) return $article;
+		if ($similarity < 0.01) {
+			return $article;
+		}
 
 		$min_title_length = (int) $this->host->get($this, "min_title_length");
-		if (mb_strlen($article["title"]) < $min_title_length) return $article;
+		if (mb_strlen($article["title"]) < $min_title_length) {
+			return $article;
+		}
 
 		$owner_uid = $article["owner_uid"];
 		$entry_guid = $article["guid_hashed"];

plugins/toggle_sidebar/init.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 	}
 
 	public function get_js() {
-		return file_get_contents(__DIR__ . "/init.js");
+		return file_get_contents(__DIR__."/init.js");
 	}
 
 	public function hook_main_toolbar_button() {

api/index.php

Indentation +32 added lines, -32 removed lines

@@ -5,9 +5,9 @@ 
 require_once "..".DIRECTORY_SEPARATOR."config.php";
 
 set_include_path(dirname(__FILE__).PATH_SEPARATOR.
-    dirname(dirname(__FILE__)).PATH_SEPARATOR.
-    dirname(dirname(__FILE__)).DIRECTORY_SEPARATOR."include".PATH_SEPARATOR.
-    get_include_path());
+	dirname(dirname(__FILE__)).PATH_SEPARATOR.
+	dirname(dirname(__FILE__)).DIRECTORY_SEPARATOR."include".PATH_SEPARATOR.
+	get_include_path());
 
 chdir("..");
 
@@ -24,33 +24,33 @@ 
 ini_set("session.gc_maxlifetime", 86400);
 
 if (defined('ENABLE_GZIP_OUTPUT') && ENABLE_GZIP_OUTPUT &&
-        function_exists("ob_gzhandler")) {
+		function_exists("ob_gzhandler")) {
 
-    ob_start("ob_gzhandler");
+	ob_start("ob_gzhandler");
 } else {
-    ob_start();
+	ob_start();
 }
 
 $input = file_get_contents("php://input");
 
 if (defined('_API_DEBUG_HTTP_ENABLED') && _API_DEBUG_HTTP_ENABLED) {
-    // Override $_REQUEST with JSON-encoded data if available
-    // fallback on HTTP parameters
-    if ($input) {
-        $input = json_decode($input, true);
-        if ($input) $_REQUEST = $input;
-    }
+	// Override $_REQUEST with JSON-encoded data if available
+	// fallback on HTTP parameters
+	if ($input) {
+		$input = json_decode($input, true);
+		if ($input) $_REQUEST = $input;
+	}
 } else {
-    // Accept JSON only
-    $input = json_decode($input, true);
-    $_REQUEST = $input;
+	// Accept JSON only
+	$input = json_decode($input, true);
+	$_REQUEST = $input;
 }
 
 if ($_REQUEST["sid"]) {
-    session_id($_REQUEST["sid"]);
-    @session_start();
+	session_id($_REQUEST["sid"]);
+	@session_start();
 } else if (defined('_API_DEBUG_HTTP_ENABLED')) {
-    @session_start();
+	@session_start();
 }
 
 startup_gettext();
@@ -58,17 +58,17 @@ 
 if (!init_plugins()) return;
 
 if ($_SESSION["uid"]) {
-    if (!validate_session()) {
-        header("Content-Type: text/json");
+	if (!validate_session()) {
+		header("Content-Type: text/json");
 
-        print json_encode(array("seq" => -1,
-            "status" => 1,
-            "content" => array("error" => "NOT_LOGGED_IN")));
+		print json_encode(array("seq" => -1,
+			"status" => 1,
+			"content" => array("error" => "NOT_LOGGED_IN")));
 
-        return;
-    }
+		return;
+	}
 
-    load_user_plugins( $_SESSION["uid"]);
+	load_user_plugins( $_SESSION["uid"]);
 }
 
 $method = strtolower($_REQUEST["op"]);
@@ -76,12 +76,12 @@ 
 $handler = new API($_REQUEST);
 
 if ($handler->before($method)) {
-    if ($method && method_exists($handler, $method)) {
-        $handler->$method();
-    } else if (method_exists($handler, 'index')) {
-        $handler->index($method);
-    }
-    $handler->after();
+	if ($method && method_exists($handler, $method)) {
+		$handler->$method();
+	} else if (method_exists($handler, 'index')) {
+		$handler->index($method);
+	}
+	$handler->after();
 }
 
 header("Api-Content-Length: " . ob_get_length());

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
         return;
     }
 
-    load_user_plugins( $_SESSION["uid"]);
+    load_user_plugins($_SESSION["uid"]);
 }
 
 $method = strtolower($_REQUEST["op"]);
@@ -84,6 +84,6 @@ 
     $handler->after();
 }
 
-header("Api-Content-Length: " . ob_get_length());
+header("Api-Content-Length: ".ob_get_length());
 
 ob_end_flush();

Braces +6 added lines, -2 removed lines

@@ -38,7 +38,9 @@ 
     // fallback on HTTP parameters
     if ($input) {
         $input = json_decode($input, true);
-        if ($input) $_REQUEST = $input;
+        if ($input) {
+        	$_REQUEST = $input;
+        }
     }
 } else {
     // Accept JSON only
@@ -55,7 +57,9 @@ 
 
 startup_gettext();
 
-if (!init_plugins()) return;
+if (!init_plugins()) {
+	return;
+}
 
 if ($_SESSION["uid"]) {
     if (!validate_session()) {

update_daemon2.php

Indentation +138 added lines, -138 removed lines

@@ -1,7 +1,7 @@ 
 #!/usr/bin/env php
 <?php
 set_include_path(dirname(__FILE__) .DIRECTORY_SEPARATOR."include" . PATH_SEPARATOR .
-    get_include_path());
+	get_include_path());
 
 declare(ticks = 1);
 chdir(dirname(__FILE__));
@@ -23,16 +23,16 @@ 
 require_once "db-prefs.php";
 
 if (!function_exists('pcntl_fork')) {
-    die("error: This script requires PHP compiled with PCNTL module.\n");
+	die("error: This script requires PHP compiled with PCNTL module.\n");
 }
 
 $options = getopt("");
 
 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");
+	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");
 }
 
 
@@ -44,137 +44,137 @@ 
 $last_checkpoint = -1;
 
 function reap_children() {
-    global $children;
-    global $ctimes;
+	global $children;
+	global $ctimes;
 
-    $tmp = array();
+	$tmp = array();
 
-    foreach ($children as $pid) {
-        if (pcntl_waitpid($pid, $status, WNOHANG) != $pid) {
+	foreach ($children as $pid) {
+		if (pcntl_waitpid($pid, $status, WNOHANG) != $pid) {
 
-            if (file_is_locked("update_daemon-$pid.lock")) {
-                array_push($tmp, $pid);
-            } else {
-                Debug::log("[reap_children] child $pid seems active but lockfile is unlocked.");
-                unset($ctimes[$pid]);
+			if (file_is_locked("update_daemon-$pid.lock")) {
+				array_push($tmp, $pid);
+			} else {
+				Debug::log("[reap_children] child $pid seems active but lockfile is unlocked.");
+				unset($ctimes[$pid]);
 
-            }
-        } else {
-            Debug::log("[reap_children] child $pid reaped.");
-            unset($ctimes[$pid]);
-        }
-    }
+			}
+		} else {
+			Debug::log("[reap_children] child $pid reaped.");
+			unset($ctimes[$pid]);
+		}
+	}
 
-    $children = $tmp;
+	$children = $tmp;
 
-    return count($tmp);
+	return count($tmp);
 }
 
 function check_ctimes() {
-    global $ctimes;
+	global $ctimes;
 
-    foreach (array_keys($ctimes) as $pid) {
-        $started = $ctimes[$pid];
+	foreach (array_keys($ctimes) as $pid) {
+		$started = $ctimes[$pid];
 
-        if (time() - $started > MAX_CHILD_RUNTIME) {
-            Debug::log("[MASTER] child process $pid seems to be stuck, aborting...");
-            posix_kill($pid, SIGKILL);
-        }
-    }
+		if (time() - $started > MAX_CHILD_RUNTIME) {
+			Debug::log("[MASTER] child process $pid seems to be stuck, aborting...");
+			posix_kill($pid, SIGKILL);
+		}
+	}
 }
 
 function sigchld_handler($signal) {
-    $running_jobs = reap_children();
+	$running_jobs = reap_children();
 
-    Debug::log("[SIGCHLD] jobs left: $running_jobs");
+	Debug::log("[SIGCHLD] jobs left: $running_jobs");
 
-    pcntl_waitpid(-1, $status, WNOHANG);
+	pcntl_waitpid(-1, $status, WNOHANG);
 }
 
 function shutdown($caller_pid) {
-    if ($caller_pid == posix_getpid()) {
-        if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
-            Debug::log("removing lockfile (master)...");
-            unlink(LOCK_DIRECTORY . "/update_daemon.lock");
-        }
-    }
+	if ($caller_pid == posix_getpid()) {
+		if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
+			Debug::log("removing lockfile (master)...");
+			unlink(LOCK_DIRECTORY . "/update_daemon.lock");
+		}
+	}
 }
 
 function task_shutdown() {
-    $pid = posix_getpid();
+	$pid = posix_getpid();
 
-    if (file_exists(LOCK_DIRECTORY . "/update_daemon-$pid.lock")) {
-        Debug::log("removing lockfile ($pid)...");
-        unlink(LOCK_DIRECTORY . "/update_daemon-$pid.lock");
-    }
+	if (file_exists(LOCK_DIRECTORY . "/update_daemon-$pid.lock")) {
+		Debug::log("removing lockfile ($pid)...");
+		unlink(LOCK_DIRECTORY . "/update_daemon-$pid.lock");
+	}
 }
 
 function sigint_handler() {
-    Debug::log("[MASTER] SIG_INT received.\n");
-    shutdown(posix_getpid());
-    die;
+	Debug::log("[MASTER] SIG_INT received.\n");
+	shutdown(posix_getpid());
+	die;
 }
 
 function task_sigint_handler() {
-    Debug::log("[TASK] SIG_INT received.\n");
-    task_shutdown();
-    die;
+	Debug::log("[TASK] SIG_INT received.\n");
+	task_shutdown();
+	die;
 }
 
 pcntl_signal(SIGCHLD, 'sigchld_handler');
 
 $longopts = array(
-    "log:",
-    "log-level:",
-    "tasks:",
-    "interval:",
-    "quiet",
-    "help"
+	"log:",
+	"log-level:",
+	"tasks:",
+	"interval:",
+	"quiet",
+	"help"
 );
 
 $options = getopt("", $longopts);
 
 if (isset($options["help"]) ) {
-    print "Tiny Tiny RSS update daemon.\n\n";
-    print "Options:\n";
-    print "  --log FILE           - log messages to FILE\n";
-    print "  --log-level N        - log verbosity level\n";
-    print "  --tasks N            - amount of update tasks to spawn\n";
-    print "                         default: " . MAX_JOBS . "\n";
-    print "  --interval N         - task spawn interval\n";
-    print "                         default: " . SPAWN_INTERVAL . " seconds.\n";
-    print "  --quiet              - don't output messages to stdout\n";
-    return;
+	print "Tiny Tiny RSS update daemon.\n\n";
+	print "Options:\n";
+	print "  --log FILE           - log messages to FILE\n";
+	print "  --log-level N        - log verbosity level\n";
+	print "  --tasks N            - amount of update tasks to spawn\n";
+	print "                         default: " . MAX_JOBS . "\n";
+	print "  --interval N         - task spawn interval\n";
+	print "                         default: " . SPAWN_INTERVAL . " seconds.\n";
+	print "  --quiet              - don't output messages to stdout\n";
+	return;
 }
 
 Debug::set_enabled(true);
 
 if (isset($options["log-level"])) {
-    Debug::set_loglevel((int)$options["log-level"]);
+	Debug::set_loglevel((int)$options["log-level"]);
 }
 
 if (isset($options["log"])) {
-    Debug::set_quiet(isset($options['quiet']));
-    Debug::set_logfile($options["log"]);
-    Debug::log("Logging to " . $options["log"]);
+	Debug::set_quiet(isset($options['quiet']));
+	Debug::set_logfile($options["log"]);
+	Debug::log("Logging to " . $options["log"]);
 } else {
-    if (isset($options['quiet'])) {
-        Debug::set_loglevel(Debug::$LOG_DISABLED);
-    }
+	if (isset($options['quiet'])) {
+		Debug::set_loglevel(Debug::$LOG_DISABLED);
+	}
 }
 
 if (isset($options["tasks"])) {
-    Debug::log("Set to spawn " . $options["tasks"] . " children.");
-    $max_jobs = $options["tasks"];
+	Debug::log("Set to spawn " . $options["tasks"] . " children.");
+	$max_jobs = $options["tasks"];
 } else {
-    $max_jobs = MAX_JOBS;
+	$max_jobs = MAX_JOBS;
 }
 
 if (isset($options["interval"])) {
-    Debug::log("Spawn interval: " . $options["interval"] . " seconds.");
-    $spawn_interval = $options["interval"];
+	Debug::log("Spawn interval: " . $options["interval"] . " seconds.");
+	$spawn_interval = $options["interval"];
 } else {
-    $spawn_interval = SPAWN_INTERVAL;
+	$spawn_interval = SPAWN_INTERVAL;
 }
 
 // let's enforce a minimum spawn interval as to not forkbomb the host
@@ -182,22 +182,22 @@ 
 Debug::log("Spawn interval: $spawn_interval sec");
 
 if (file_is_locked("update_daemon.lock")) {
-    die("error: Can't create lockfile. ".
-        "Maybe another daemon is already running.\n");
+	die("error: Can't create lockfile. ".
+		"Maybe another daemon is already running.\n");
 }
 
 // Try to lock a file in order to avoid concurrent update.
 $lock_handle = make_lockfile("update_daemon.lock");
 
 if (!$lock_handle) {
-    die("error: Can't create lockfile. ".
-        "Maybe another daemon is already running.\n");
+	die("error: Can't create lockfile. ".
+		"Maybe another daemon is already running.\n");
 }
 
 $schema_version = get_schema_version();
 
 if ($schema_version != SCHEMA_VERSION) {
-    die("Schema version is wrong, please upgrade the database.\n");
+	die("Schema version is wrong, please upgrade the database.\n");
 }
 
 // Protip: children close shared database handle when terminating, it's a bad idea to
@@ -205,56 +205,56 @@ 
 
 while (true) {
 
-    // Since sleep is interupted by SIGCHLD, we need another way to
-    // respect the spawn interval
-    $next_spawn = $last_checkpoint + $spawn_interval - time();
-
-    if ($next_spawn % 60 == 0) {
-        $running_jobs = count($children);
-        Debug::log("[MASTER] active jobs: $running_jobs, next spawn at $next_spawn sec.");
-    }
-
-    if ($last_checkpoint + $spawn_interval < time()) {
-        check_ctimes();
-        reap_children();
-
-        for ($j = count($children); $j < $max_jobs; $j++) {
-            $pid = pcntl_fork();
-            if ($pid == -1) {
-                die("fork failed!\n");
-            } else if ($pid) {
-
-                if (!$master_handlers_installed) {
-                    Debug::log("[MASTER] installing shutdown handlers");
-                    pcntl_signal(SIGINT, 'sigint_handler');
-                    pcntl_signal(SIGTERM, 'sigint_handler');
-                    register_shutdown_function('shutdown', posix_getpid());
-                    $master_handlers_installed = true;
-                }
-
-                Debug::log("[MASTER] spawned client $j [PID:$pid]...");
-                array_push($children, $pid);
-                $ctimes[$pid] = time();
-            } else {
-                pcntl_signal(SIGCHLD, SIG_IGN);
-                pcntl_signal(SIGINT, 'task_sigint_handler');
-
-                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 $log --task $j --pidlock $my_pid");
-
-                sleep(1);
-
-                // We exit in order to avoid fork bombing.
-                exit(0);
-            }
-        }
-        $last_checkpoint = time();
-    }
-    sleep(1);
+	// Since sleep is interupted by SIGCHLD, we need another way to
+	// respect the spawn interval
+	$next_spawn = $last_checkpoint + $spawn_interval - time();
+
+	if ($next_spawn % 60 == 0) {
+		$running_jobs = count($children);
+		Debug::log("[MASTER] active jobs: $running_jobs, next spawn at $next_spawn sec.");
+	}
+
+	if ($last_checkpoint + $spawn_interval < time()) {
+		check_ctimes();
+		reap_children();
+
+		for ($j = count($children); $j < $max_jobs; $j++) {
+			$pid = pcntl_fork();
+			if ($pid == -1) {
+				die("fork failed!\n");
+			} else if ($pid) {
+
+				if (!$master_handlers_installed) {
+					Debug::log("[MASTER] installing shutdown handlers");
+					pcntl_signal(SIGINT, 'sigint_handler');
+					pcntl_signal(SIGTERM, 'sigint_handler');
+					register_shutdown_function('shutdown', posix_getpid());
+					$master_handlers_installed = true;
+				}
+
+				Debug::log("[MASTER] spawned client $j [PID:$pid]...");
+				array_push($children, $pid);
+				$ctimes[$pid] = time();
+			} else {
+				pcntl_signal(SIGCHLD, SIG_IGN);
+				pcntl_signal(SIGINT, 'task_sigint_handler');
+
+				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 $log --task $j --pidlock $my_pid");
+
+				sleep(1);
+
+				// We exit in order to avoid fork bombing.
+				exit(0);
+			}
+		}
+		$last_checkpoint = time();
+	}
+	sleep(1);
 }

Spacing +14 added lines, -14 removed lines

@@ -1,9 +1,9 @@ 
 #!/usr/bin/env php
 <?php
-set_include_path(dirname(__FILE__) .DIRECTORY_SEPARATOR."include" . PATH_SEPARATOR .
+set_include_path(dirname(__FILE__).DIRECTORY_SEPARATOR."include".PATH_SEPARATOR.
     get_include_path());
 
-declare(ticks = 1);
+declare(ticks=1);
 chdir(dirname(__FILE__));
 
 define('DISABLE_SESSIONS', true);
@@ -93,9 +93,9 @@ 
 
 function shutdown($caller_pid) {
     if ($caller_pid == posix_getpid()) {
-        if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
+        if (file_exists(LOCK_DIRECTORY."/update_daemon.lock")) {
             Debug::log("removing lockfile (master)...");
-            unlink(LOCK_DIRECTORY . "/update_daemon.lock");
+            unlink(LOCK_DIRECTORY."/update_daemon.lock");
         }
     }
 }
@@ -103,9 +103,9 @@ 
 function task_shutdown() {
     $pid = posix_getpid();
 
-    if (file_exists(LOCK_DIRECTORY . "/update_daemon-$pid.lock")) {
+    if (file_exists(LOCK_DIRECTORY."/update_daemon-$pid.lock")) {
         Debug::log("removing lockfile ($pid)...");
-        unlink(LOCK_DIRECTORY . "/update_daemon-$pid.lock");
+        unlink(LOCK_DIRECTORY."/update_daemon-$pid.lock");
     }
 }
 
@@ -134,15 +134,15 @@ 
 
 $options = getopt("", $longopts);
 
-if (isset($options["help"]) ) {
+if (isset($options["help"])) {
     print "Tiny Tiny RSS update daemon.\n\n";
     print "Options:\n";
     print "  --log FILE           - log messages to FILE\n";
     print "  --log-level N        - log verbosity level\n";
     print "  --tasks N            - amount of update tasks to spawn\n";
-    print "                         default: " . MAX_JOBS . "\n";
+    print "                         default: ".MAX_JOBS."\n";
     print "  --interval N         - task spawn interval\n";
-    print "                         default: " . SPAWN_INTERVAL . " seconds.\n";
+    print "                         default: ".SPAWN_INTERVAL." seconds.\n";
     print "  --quiet              - don't output messages to stdout\n";
     return;
 }
@@ -150,13 +150,13 @@ 
 Debug::set_enabled(true);
 
 if (isset($options["log-level"])) {
-    Debug::set_loglevel((int)$options["log-level"]);
+    Debug::set_loglevel((int) $options["log-level"]);
 }
 
 if (isset($options["log"])) {
     Debug::set_quiet(isset($options['quiet']));
     Debug::set_logfile($options["log"]);
-    Debug::log("Logging to " . $options["log"]);
+    Debug::log("Logging to ".$options["log"]);
 } else {
     if (isset($options['quiet'])) {
         Debug::set_loglevel(Debug::$LOG_DISABLED);
@@ -164,14 +164,14 @@ 
 }
 
 if (isset($options["tasks"])) {
-    Debug::log("Set to spawn " . $options["tasks"] . " children.");
+    Debug::log("Set to spawn ".$options["tasks"]." children.");
     $max_jobs = $options["tasks"];
 } else {
     $max_jobs = MAX_JOBS;
 }
 
 if (isset($options["interval"])) {
-    Debug::log("Spawn interval: " . $options["interval"] . " seconds.");
+    Debug::log("Spawn interval: ".$options["interval"]." seconds.");
     $spawn_interval = $options["interval"];
 } else {
     $spawn_interval = SPAWN_INTERVAL;
@@ -246,7 +246,7 @@ 
 
                 $my_pid = posix_getpid();
 
-                passthru(PHP_EXECUTABLE . " update.php --daemon-loop $quiet $log --task $j --pidlock $my_pid");
+                passthru(PHP_EXECUTABLE." update.php --daemon-loop $quiet $log --task $j --pidlock $my_pid");
 
                 sleep(1);