perform backend sanity check on startup, update schema version in backend.php

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

index ed58fcea2c6f55451edd0eca027bd372f9bfe9f6..2ed2f926640ac9a4b7e0e90d7ec7b986ee91b18f 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -1,4 +1,6 @@
  <?
+       define(SCHEMA_VERSION, 2);
+
         $op = $_GET["op"];
  
         if ($op == "rpc") {
@@ -25,7 +27,19 @@
         if (DB_TYPE == "pgsql") {
                 pg_query("set client_encoding = 'utf-8'");
         }
-       
+
+/*
+       $result = db_query($link, "SELECT schema_version FROM ttrss_version");
+
+       $schema_version = db_fetch_result($result, 0, "schema_version");
+
+       if ($schema_version != SCHEMA_VERSION) {
+               print "Error: database schema is invalid
+                       (got version $schema_version; expected ".SCHEMA_VERSION.")";
+               return;
+       }
+*/
+
         $fetch = $_GET["fetch"];
  
         /* FIXME this needs reworking */
@@ -123,7 +137,7 @@
                         <script type=\"text/javascript\" src=\"functions.js\"></script>
                         <script type=\"text/javascript\" src=\"feedlist.js\"></script>
                         <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
-                       </head><body>";
+                       </head><body onload=\"init()\">";
  
                 print "<ul class=\"feedList\" id=\"feedList\">";
  
@@ -135,7 +149,7 @@
                                 FROM ttrss_entries WHERE marked = true AND unread = true");
                         $num_starred = db_fetch_result($result, 0, "num_starred");
  
-                       $class = "odd";
+                       $class = "virt";
  
                         if ($num_starred > 0) $class .= "Unread";
  
@@ -160,7 +174,7 @@
         
                                         $count = db_fetch_result($tmp_result, 0, "count");
         
-                                       $class = "odd";
+                                       $class = "label";
         
                                         if ($count > 0) {
                                                 $class .= "Unread";
@@ -203,7 +217,7 @@
                                 
         //                      $class = ($lnum % 2) ? "even" : "odd";
         
-                               $class = "odd";
+                               $class = "feed";
         
                                 if ($unread > 0) $class .= "Unread";
         
@@ -320,6 +334,7 @@
                 }
  
                 if ($subop == "forceUpdateAllFeeds" || $subop == "updateAllFeeds") {
+               
                         update_all_feeds($link, true);                  
  
                         $omode = $_GET["omode"];
@@ -347,6 +362,21 @@
  
                         print "Marked active page as read.";
                 }
+
+               if ($subop == "sanityCheck") {
+
+                       $error_code = 0;
+
+                       $result = db_query($link, "SELECT schema_version FROM ttrss_version");
+
+                       $schema_version = db_fetch_result($result, 0, "schema_version");
+
+                       if ($schema_version != SCHEMA_VERSION) {
+                               $error_code = 5;
+                       }
+
+                       print "<error code='$error_code'/>";
+               }
         }
         
         if ($op == "feeds") {
@@ -456,7 +486,18 @@
                                 <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
                                 <script type=\"text/javascript\" src=\"functions.js\"></script>
                                 <script type=\"text/javascript\" src=\"viewfeed.js\"></script>
-                               </head><body>";
+                               </head><body onload='init()'>";
+               }
+
+               if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0) {
+
+                       $tmp_result = db_query($link, "SELECT feed_url FROM ttrss_feeds
+                               WHERE id = '$feed'");
+
+                       $feed_url = db_fetch_result($tmp_result, 0, "feed_url");
+
+                       update_rss_feed($link, $feed_url, $feed);
+
                 }
  
                 if ($subop == "MarkAllRead")  {
@@ -695,7 +736,8 @@
  
                         if ($line["feed_title"]) {                      
                                 print "<td width='50%'>$content_link</td>";
-                               print "<td width='20%'>".$line["feed_title"]."</td>";
+                               print "<td width='20%'>
+                                       <a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a></td>";
                         } else {
                                 print "<td width='70%'>$content_link</td>";
                         }
@@ -803,6 +845,27 @@
                         }
                 }
  
+               $result = db_query($link, "SELECT id,title,feed_url,last_error 
+                       FROM ttrss_feeds WHERE last_error != ''");
+
+               if (db_num_rows($result) > 0) {
+               
+                       print "<div class=\"warning\">";
+               
+                       print "<b>Feeds with update errors:</b>";
+
+                       print "<ul class=\"nomarks\">";
+                                               
+                       while ($line = db_fetch_assoc($result)) {
+                               print "<li>" . $line["title"] . " (" . $line["feed_url"] . "): " . 
+                                       $line["last_error"];
+                       }
+
+                       print "</ul>";
+                       print "</div>";
+
+               }
+
                 print "<table class=\"prefAddFeed\"><tr>
                         <td><input id=\"fadd_link\"></td>
                         <td colspan=\"4\" align=\"right\">
@@ -935,6 +998,13 @@
                 
                         }
  
+               print "<h3>OPML Import</h3>
+               <form   enctype=\"multipart/form-data\" method=\"POST\" action=\"opml.php\">
+                       File: <input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp;
+                       <input class=\"button\" name=\"op\" onclick=\"return validateOpmlImport();\"
+                               type=\"submit\" value=\"Import\">
+                       </form>";
+
         }
  
         if ($op == "pref-filters") {
@@ -1268,7 +1338,6 @@
                         <title>Tiny Tiny RSS : Help</title>
                         <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">
                         <script type=\"text/javascript\" src=\"functions.js\"></script>
-                       <script type=\"text/javascript\" src=\"feedlist.js\"></script>
                         <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
                         </head><body>";