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,7 +43,7 @@ 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);
@ -54,17 +54,17 @@ function getline($fp, $delim) {
$result .= $tmp; $result .= $tmp;
} }
return $result; return $result;
} }
$op = $_POST["op"]; $op = $_POST["op"];
$result = db_query($link, "SELECT schema_version FROM ttrss_version"); $result = db_query($link, "SELECT schema_version FROM ttrss_version");
$version = db_fetch_result($result, 0, "schema_version"); $version = db_fetch_result($result, 0, "schema_version");
$update_files = glob("schema/versions/".DB_TYPE."/*sql"); $update_files = glob("schema/versions/".DB_TYPE."/*sql");
$update_versions = array(); $update_versions = array();
foreach ($update_files as $f) { foreach ($update_files as $f) {
$m = array(); $m = array();
preg_match_all("/schema\/versions\/".DB_TYPE."\/(\d*)\.sql/", $f, $m, preg_match_all("/schema\/versions\/".DB_TYPE."\/(\d*)\.sql/", $f, $m,
PREG_PATTERN_ORDER); PREG_PATTERN_ORDER);
@ -72,25 +72,25 @@ foreach ($update_files as $f) {
if ($m[1][0]) { if ($m[1][0]) {
$update_versions[$m[1][0]] = $f; $update_versions[$m[1][0]] = $f;
} }
} }
ksort($update_versions, SORT_NUMERIC); ksort($update_versions, SORT_NUMERIC);
$latest_version = max(array_keys($update_versions)); $latest_version = max(array_keys($update_versions));
if ($version == $latest_version) { if ($version == $latest_version) {
print "<p>Tiny Tiny RSS database is up to date (version $version).</p>"; 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>"; print "<p><a href='tt-rss.php'>Return to Tiny Tiny RSS</a></p>";
return; return;
} }
if (!$op) { if (!$op) {
print "<p class='warning'><b>Warning:</b> Please backup your database before proceeding.</p>"; 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 print "<p>Your Tiny Tiny RSS database needs update to the latest
version ($version &mdash;&gt; $latest_version).</p>"; version ($version &mdash;&gt; $latest_version).</p>";
/* print "<p>Available incremental updates:"; /* print "<p>Available incremental updates:";
foreach (array_keys($update_versions) as $v) { foreach (array_keys($update_versions) as $v) {
if ($v > $version) { if ($v > $version) {
@ -105,7 +105,7 @@ if (!$op) {
<input type='submit' onclick='return confirmOP()' value='Perform updates'> <input type='submit' onclick='return confirmOP()' value='Perform updates'>
</form>"; </form>";
} else if ($op == "do") { } else if ($op == "do") {
print "<p>Performing updates (from version $version)...</p>"; print "<p>Performing updates (from version $version)...</p>";
@ -147,11 +147,10 @@ if (!$op) {
print "<p><a href='tt-rss.php'>Return to Tiny Tiny RSS</a></p>"; print "<p><a href='tt-rss.php'>Return to Tiny Tiny RSS</a></p>";
} }
?> ?>
</body> </body>
</html> </html>