when registering feed title, consider its maximum length (closes #818)

[tt-rss.git] / update.php
diff --git a/update.php b/update.php

index d8ea52361ac27c0571f51c4628a5c31f86638427..521b956ad33b7d60311928690ff0da1716864042 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -42,12 +42,19 @@
  
         $options = getopt("", $longopts);
  
+       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");
+       }
+
         if (count($options) == 0 && !defined('STDIN')) {
                 ?> <html>
                 <head>
                 <title>Tiny Tiny RSS data update script.</title>
                 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-               <link rel="stylesheet" type="text/css" href="utility.css">
+               <link rel="stylesheet" type="text/css" href="css/utility.css">
                 </head>
  
                 <body>
@@ -148,18 +155,8 @@
         }
  
         if (isset($options["feeds"])) {
-               // Update all feeds needing a update.
                 update_daemon_common();
-
-               // Update feedbrowser
-               $count = update_feedbrowser_cache();
-               _debug("Feedbrowser updated, $count feeds processed.");
-
-               // Purge orphans and cleanup tags
-               purge_orphans( true);
-
-               $rc = cleanup_tags( 14, 50000);
-               _debug("Cleaned $rc cached tags.");
+               housekeeping_common(true);
  
                 PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
         }
@@ -172,8 +169,9 @@
         if (isset($options["daemon"])) {
                 while (true) {
                         $quiet = (isset($options["quiet"])) ? "--quiet" : "";
+         $log = isset($options['log']) ? '--log '.$options['log'] : '';
  
-                       passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet");
+                       passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log");
                         _debug("Sleeping for " . DAEMON_SLEEP_INTERVAL . " seconds...");
                         sleep(DAEMON_SLEEP_INTERVAL);
                 }
@@ -184,24 +182,12 @@
                         _debug("warning: unable to create stampfile\n");
                 }
  
-               // Call to the feed batch update function
-               // or regenerate feedbrowser cache
-
-               if (rand(0,100) > 30) {
-                       update_daemon_common();
-               } else {
-                       $count = update_feedbrowser_cache();
-                       _debug("Feedbrowser updated, $count feeds processed.");
-
-                       purge_orphans( true);
-
-                       $rc = cleanup_tags( 14, 50000);
-
-                       _debug("Cleaned $rc cached tags.");
+               update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
  
-                       PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
-               }
+               if (!isset($options["pidlock"]) || $options["task"] == 0)
+                       housekeeping_common(true);
  
+               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
         }
  
         if (isset($options["cleanup-tags"])) {
@@ -308,7 +294,7 @@
                                 $_REQUEST = $filter;
                                 $_SESSION["uid"] = $owner_uid;
  
-                               $filters = new Pref_Filters( $_REQUEST);
+                               $filters = new Pref_Filters($_REQUEST);
                                 $filters->add();
                         }
                 }
@@ -345,7 +331,7 @@
         }
  
         if (isset($options["list-plugins"])) {
-               $tmppluginhost = new PluginHost(Db::get());
+               $tmppluginhost = new PluginHost();
                 $tmppluginhost->load_all($tmppluginhost::KIND_ALL);
                 $enabled = array_map("trim", explode(",", PLUGINS));
  
@@ -368,10 +354,6 @@
  
         PluginHost::getInstance()->run_commands($options);
  
-       if ($lock_handle != false) {
-               fclose($lock_handle);
-       }
-
         if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
                 unlink(LOCK_DIRECTORY . "/$lock_filename");
  ?>