valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add auth to xml-export if required, bump schema compatibility constants

This commit is contained in:
Andrew Dolgov 2006-02-12 11:20:22 +01:00
parent 3f286c4c2b
commit cce5b59a75
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
utils/xml-export.php
View File

@ -1,7 +1,7 @@
<? <?
session_start(); session_start();
define('MAX_SCHEMA_VERSION', 4); define('MAX_SCHEMA_VERSION', 5);
require_once "config.php"; require_once "config.php";
require_once "functions.php"; require_once "functions.php";
@ -10,6 +10,27 @@
if ($_GET["export"]) { if ($_GET["export"]) {
header("Content-Type: application/xml"); header("Content-Type: application/xml");
} }
$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
if (!$link) {
if (DB_TYPE == "mysql") {
print mysql_error();
}
// PG seems to display its own errors just fine by default.
return;
}
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 > 1) login_sequence($link);
?> ?>
<? if (!$_GET["export"]) { ?> <? if (!$_GET["export"]) { ?>
@ -39,23 +60,6 @@
<xmldb> <xmldb>
<? <?
$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
if (!$link) {
if (DB_TYPE == "mysql") {
print mysql_error();
}
// PG seems to display its own errors just fine by default.
return;
}
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) { /* if ($schema_version != SCHEMA_VERSION) {
print "<error>Source database schema is invalid print "<error>Source database schema is invalid

4
utils/xml-import.php
View File

@ -5,8 +5,8 @@
require_once "functions.php"; require_once "functions.php";
require_once "db.php"; require_once "db.php";
define('MAX_SOURCE_SCHEMA_VERSION', 4); define('MAX_SOURCE_SCHEMA_VERSION', 5);
define('TARGET_SCHEMA_VERSION', 4); define('TARGET_SCHEMA_VERSION', 5);
$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);