fix indent

This commit is contained in:
Andrew Dolgov 2007-03-01 09:54:55 +01:00
parent 57c9393e75
commit 81596c6612
1 changed files with 121 additions and 122 deletions

View File

@ -1,27 +1,27 @@
<?php <?php
require_once "sessions.php"; require_once "sessions.php";
require_once "sanity_check.php"; require_once "sanity_check.php";
require_once "functions.php"; require_once "functions.php";
require_once "config.php"; require_once "config.php";
require_once "db.php"; require_once "db.php";
$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
if (DB_TYPE == "pgsql") { if (DB_TYPE == "pgsql") {
pg_query($link, "set client_encoding = 'utf-8'"); pg_query($link, "set client_encoding = 'utf-8'");
pg_set_client_encoding("UNICODE"); pg_set_client_encoding("UNICODE");
} }
login_sequence($link); login_sequence($link);
$owner_uid = $_SESSION["uid"]; $owner_uid = $_SESSION["uid"];
if ($_SESSION["access_level"] < 10) { if ($_SESSION["access_level"] < 10) {
header("Location: login.php"); die; header("Location: login.php"); die;
} }
define('SCHEMA_VERSION', 13); define('SCHEMA_VERSION', 13);
?> ?>
@ -43,115 +43,114 @@ function confirmOP() {
<h1>Database Updater</h1> <h1>Database Updater</h1>
<?php <?php
function getline($fp, $delim) { function getline($fp, $delim) {
$result = ""; $result = "";
while(!feof($fp)) { while(!feof($fp)) {
$tmp = fgetc($fp); $tmp = fgetc($fp);
if($tmp == $delim) { if($tmp == $delim) {
return $result; return $result;
}
$result .= $tmp;
} }
$result .= $tmp; return $result;
} }
return $result;
} $op = $_POST["op"];
$op = $_POST["op"]; $result = db_query($link, "SELECT schema_version FROM ttrss_version");
$version = db_fetch_result($result, 0, "schema_version");
$result = db_query($link, "SELECT schema_version FROM ttrss_version");
$version = db_fetch_result($result, 0, "schema_version"); $update_files = glob("schema/versions/".DB_TYPE."/*sql");
$update_versions = array();
$update_files = glob("schema/versions/".DB_TYPE."/*sql");
$update_versions = array(); foreach ($update_files as $f) {
$m = array();
foreach ($update_files as $f) { preg_match_all("/schema\/versions\/".DB_TYPE."\/(\d*)\.sql/", $f, $m,
$m = array(); PREG_PATTERN_ORDER);
preg_match_all("/schema\/versions\/".DB_TYPE."\/(\d*)\.sql/", $f, $m,
PREG_PATTERN_ORDER); if ($m[1][0]) {
$update_versions[$m[1][0]] = $f;
if ($m[1][0]) {
$update_versions[$m[1][0]] = $f;
}
}
ksort($update_versions, SORT_NUMERIC);
$latest_version = max(array_keys($update_versions));
if ($version == $latest_version) {
print "<p>Tiny Tiny RSS database is up to date (version $version).</p>";
print "<p><a href='tt-rss.php'>Return to Tiny Tiny RSS</a></p>";
return;
}
if (!$op) {
print "<p class='warning'><b>Warning:</b> Please backup your database before proceeding.</p>";
print "<p>Your Tiny Tiny RSS database needs update to the latest
version ($version &mdash;&gt; $latest_version).</p>";
/* print "<p>Available incremental updates:";
foreach (array_keys($update_versions) as $v) {
if ($v > $version) {
print " <a href='$update_versions[$v]'>$v</a>";
} }
} */ }
print "</p>"; ksort($update_versions, SORT_NUMERIC);
print "<form method='POST'> $latest_version = max(array_keys($update_versions));
<input type='hidden' name='op' value='do'>
<input type='submit' onclick='return confirmOP()' value='Perform updates'> if ($version == $latest_version) {
</form>"; print "<p>Tiny Tiny RSS database is up to date (version $version).</p>";
print "<p><a href='tt-rss.php'>Return to Tiny Tiny RSS</a></p>";
} else if ($op == "do") { return;
}
print "<p>Performing updates (from version $version)...</p>";
if (!$op) {
$num_updates = 0; print "<p class='warning'><b>Warning:</b> Please backup your database before proceeding.</p>";
foreach (array_keys($update_versions) as $v) { print "<p>Your Tiny Tiny RSS database needs update to the latest
if ($v == $version + 1) { version ($version &mdash;&gt; $latest_version).</p>";
print "<p>Updating to version $v...</p>";
$fp = fopen($update_versions[$v], "r"); /* print "<p>Available incremental updates:";
if ($fp) {
while (!feof($fp)) { foreach (array_keys($update_versions) as $v) {
$query = trim(getline($fp, ";")); if ($v > $version) {
if ($query != "") { print " <a href='$update_versions[$v]'>$v</a>";
print "<p class='query'><b>QUERY:</b> $query</p>"; }
db_query($link, $query); } */
print "</p>";
print "<form method='POST'>
<input type='hidden' name='op' value='do'>
<input type='submit' onclick='return confirmOP()' value='Perform updates'>
</form>";
} else if ($op == "do") {
print "<p>Performing updates (from version $version)...</p>";
$num_updates = 0;
foreach (array_keys($update_versions) as $v) {
if ($v == $version + 1) {
print "<p>Updating to version $v...</p>";
$fp = fopen($update_versions[$v], "r");
if ($fp) {
while (!feof($fp)) {
$query = trim(getline($fp, ";"));
if ($query != "") {
print "<p class='query'><b>QUERY:</b> $query</p>";
db_query($link, $query);
}
} }
} }
fclose($fp);
print "<p>Checking version... ";
$result = db_query($link, "SELECT schema_version FROM ttrss_version");
$version = db_fetch_result($result, 0, "schema_version");
if ($version == $v) {
print "OK! ($version)";
} else {
print "<b>ERROR!</b>";
return;
}
$num_updates++;
} }
fclose($fp);
print "<p>Checking version... ";
$result = db_query($link, "SELECT schema_version FROM ttrss_version");
$version = db_fetch_result($result, 0, "schema_version");
if ($version == $v) {
print "OK! ($version)";
} else {
print "<b>ERROR!</b>";
return;
}
$num_updates++;
} }
print "<p>Finished. Performed $num_updates updates up to schema
version $version.</p>";
print "<p><a href='tt-rss.php'>Return to Tiny Tiny RSS</a></p>";
} }
print "<p>Finished. Performed $num_updates updates up to schema
version $version.</p>";
print "<p><a href='tt-rss.php'>Return to Tiny Tiny RSS</a></p>";
}
?> ?>
</body> </body>
</html> </html>