better fatal error handling by frontend (remove error.php)

[tt-rss.git] / functions.php

diff --git a/functions.php b/functions.php
index 8175a43261a2d50dfc891abff8bde8757e7e6b72..d4feaf5d686efd8e3d9dec63dd67e8ba1f2ce38f 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -9,6 +9,7 @@
        require_once 'config.php';
        require_once 'db-prefs.php';
        require_once 'compat.php';
+       require_once 'errors.php';
 
        require_once 'magpierss/rss_utils.inc';
 
@@ -24,7 +25,9 @@
                                (SELECT date_entered FROM ttrss_entries WHERE
                                        id = ref_id) < NOW() - INTERVAL '$purge_interval days'"); */
 
-                       if (PG_VERSION == "7.4" || PG_VERSION == "8.0") {
+                       $pg_version = get_pgsql_version($link);
+
+                       if (preg_match("/^7\./", $pg_version) || preg_match("/^8\.0/", $pg_version)) {
 
                                $result = db_query($link, "DELETE FROM ttrss_user_entries WHERE 
                                        ttrss_entries.id = ref_id AND 
@@ -39,7 +42,7 @@
                                        WHERE ttrss_entries.id = ref_id AND 
                                        marked = false AND 
                                        feed_id = '$feed_id' AND 
-                                       ttrss_entries.date_entered < NOW() - INTERVAL '$purge_interval days')");
+                                       ttrss_entries.date_entered < NOW() - INTERVAL '$purge_interval days'");
                        }
 
                        $rows = pg_affected_rows($result);
@@ -1482,4 +1485,29 @@
                }
        }
 
+       function get_script_dt_add() {
+               if (strpos(VERSION, "99") === false) {
+                       return VERSION;
+               } else {
+                       return time();
+               }
+       }
+
+       function get_pgsql_version($link) {
+               $result = db_query($link, "SELECT version() AS version");
+               $version = split(" ", db_fetch_result($result, 0, "version"));
+               return $version[1];
+       }
+
+       function print_error_xml($code, $add_msg = "") {
+               global $ERRORS;
+
+               $error_msg = $ERRORS[$code];
+               
+               if ($add_msg) {
+                       $error_msg = "$error_msg; $add_msg";
+               }
+               
+               print "<error error-code=\"$code\" error-msg=\"$error_msg\"/>";
+       }
 ?>