From: Andrew Dolgov <fox@bah.spb.su>
Date: Wed, 16 Nov 2005 17:23:55 +0000 (+0100)
Subject: sql-ize error.php
X-Git-Tag: schema_feature_freeze_for_1.1~283
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=75c56ed7d7c6eb01feaa8f412388155f4de85d14;p=tt-rss.git

sql-ize error.php
---

diff --git a/db-prefs.php b/db-prefs.php
index 38382193..7ff64a89 100644
--- a/db-prefs.php
+++ b/db-prefs.php
@@ -1,4 +1,5 @@
 <?
+	// TODO cache last query results
 
 	require_once "config.php";
 	require_once "db.php";
diff --git a/error.php b/error.php
index e1e9045b..8582f257 100644
--- a/error.php
+++ b/error.php
@@ -1,7 +1,10 @@
-<? require_once "version.php" ?>
-<? require_once "config.php" ?>
-
 <?
+	require_once "version.php"
+	require_once "config.php"
+	require_once "db-prefs.php"
+
+	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);	
+
 	$ERRORS[0] = "Unknown error";
 
 	$ERRORS[1] = "This program requires XmlHttpRequest " .
@@ -32,7 +35,7 @@
 </head>
 
 <table width="100%" height="100%" cellspacing="0" cellpadding="0" class="main">
-<? if (DISPLAY_HEADER) { ?>
+<? if (get_pref($link, 'DISPLAY_HEADER')) { ?>
 <tr>
 	<td colspan="2">
 		<table cellspacing="0" cellpadding="0" width="100%"><tr>
@@ -55,7 +58,7 @@
 
 	</td>
 </tr>
-<? if (DISPLAY_FOOTER) { ?>
+<? if (get_pref($link, 'DISPLAY_FOOTER')) { ?>
 <tr>
 	<td class="footer" colspan="2">
 		<a href="http://bah.spb.su/~fox/tt-rss/">Tiny-Tiny RSS</a> v<?= VERSION ?> &copy; 2005 Andrew Dolgov