#!/usr/bin/env php
<?php
- set_include_path(get_include_path() . PATH_SEPARATOR .
- dirname(__FILE__) . "/include");
+ set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+ get_include_path());
define('DISABLE_SESSIONS', true);
require_once "db-prefs.php";
require_once "update_self.php";
- if (!defined('STDIN')) {
+ if (!defined('PHP_EXECUTABLE'))
+ define('PHP_EXECUTABLE', '/usr/bin/php');
+
+ $op = $argv;
+
+ if (count($argv) == 0 && !defined('STDIN')) {
?> <html>
<head>
- <title>Database Updater</title>
+ <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">
</head>
<body>
<div class="floatingLogo"><img src="images/logo_wide.png"></div>
- <h1><?php echo __("Update") ?></h1>
+ <h1><?php echo __("Tiny Tiny RSS data update script.") ?></h1>
- <?php print_error("Please run this script from the command line."); ?>
+ <?php print_error("Please run this script from the command line. Use option \"-help\" to display command help if this error is displayed erroneously."); ?>
</body></html>
<?php
exit;
}
- if (!defined('PHP_EXECUTABLE'))
- define('PHP_EXECUTABLE', '/usr/bin/php');
-
- $op = $argv;
-
if (count($argv) == 1 || in_array("-help", $op) ) {
print "Tiny Tiny RSS data update script.\n\n";
print "Options:\n";
print " -quiet - don't show messages\n";
print " -indexes - recreate missing schema indexes\n";
print " -convert-filters - convert type1 filters to type2\n";
+ print " -force-update - force update of all feeds\n";
print " -help - show this help\n";
return;
}
while ($line = db_fetch_assoc($result)) {
$owner_uid = $line["owner_uid"];
- $filter = array();
+ // date filters are removed
+ if ($line["filter_type"] != 5) {
+ $filter = array();
- if (sql_bool_to_bool($line["cat_filter"])) {
- $feed_id = "CAT:" . (int)$line["cat_id"];
- } else {
- $feed_id = (int)$line["feed_id"];
- }
-
- $filter["enabled"] = $line["enabled"] ? "on" : "off";
- $filter["rule"] = array(
- json_encode(array(
- "reg_exp" => $line["reg_exp"],
- "feed_id" => $feed_id,
- "filter_type" => $line["filter_type"])));
+ if (sql_bool_to_bool($line["cat_filter"])) {
+ $feed_id = "CAT:" . (int)$line["cat_id"];
+ } else {
+ $feed_id = (int)$line["feed_id"];
+ }
- $filter["action"] = array(
- json_encode(array(
- "action_id" => $line["action_id"],
- "action_param_label" => $line["action_param"],
- "action_param" => $line["action_param"])));
+ $filter["enabled"] = $line["enabled"] ? "on" : "off";
+ $filter["rule"] = array(
+ json_encode(array(
+ "reg_exp" => $line["reg_exp"],
+ "feed_id" => $feed_id,
+ "filter_type" => $line["filter_type"])));
- // Oh god it's full of hacks
+ $filter["action"] = array(
+ json_encode(array(
+ "action_id" => $line["action_id"],
+ "action_param_label" => $line["action_param"],
+ "action_param" => $line["action_param"])));
-## print_r($filter);
+ // Oh god it's full of hacks
- $_REQUEST = $filter;
- $_SESSION["uid"] = $owner_uid;
+ $_REQUEST = $filter;
+ $_SESSION["uid"] = $owner_uid;
- $filters = new Pref_Filters($link, $_REQUEST);
- $filters->add();
+ $filters = new Pref_Filters($link, $_REQUEST);
+ $filters->add();
+ }
}
}
+ if (in_array("-force-update", $op)) {
+ _debug("marking all feeds as needing update...");
+
+ db_query($link, "UPDATE ttrss_feeds SET last_update_started = '1970-01-01',
+ last_updated = '1970-01-01'");
+ }
+
db_close($link);
if ($lock_handle != false) {
git.wh0rd.org / tt-rss.git / blobdiff