From 7d4c898ab3adbfbb0ad2c6887afc391273762828 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 18 Nov 2005 07:29:36 +0100 Subject: [PATCH] optional SINGLE_USER_MODE --- backend.php | 44 ++++++++++++++++++++++++-------------------- config.php-dist | 6 +++++- prefs.php | 19 ++++++++++++++----- tt-rss.php | 18 +++++++++++++----- 4 files changed, 56 insertions(+), 31 deletions(-) diff --git a/backend.php b/backend.php index ed8ab6c18..edef18a03 100644 --- a/backend.php +++ b/backend.php @@ -1621,28 +1621,32 @@ } else { - print "
"; + if (!SINGLE_USER_MODE) { - print ""; - print ""; + print ""; + + print "

Authentication

"; + print ""; + + print ""; + print ""; + + print ""; + + print ""; + + print "

Authentication

Old password
New password
"; + + print ""; + + print "

"; + + print "

"; - print "Old password"; - print ""; - - print "New password"; - - print ""; - - print ""; - - print ""; - - print "

"; - - print ""; + } $result = db_query($link, "SELECT ttrss_user_prefs.pref_name,short_desc,help_text,value,type_name, diff --git a/config.php-dist b/config.php-dist index 8e34e7b2c..9cea364dd 100644 --- a/config.php-dist +++ b/config.php-dist @@ -16,5 +16,9 @@ define(USE_HTTP_AUTH, false); // use HTTP Basic authentication -?> + define(SINGLE_USER_MODE, true); + // disable all multi-user stuff altogether and just assume admin user + // is always logged in + +?> diff --git a/prefs.php b/prefs.php index 837cf584f..f6b862f07 100644 --- a/prefs.php +++ b/prefs.php @@ -8,15 +8,22 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!USE_HTTP_AUTH) { - if (!$_SESSION["uid"]) { - header("Location: login.php"); - exit; + if (!SINGLE_USER_MODE) { + + if (!USE_HTTP_AUTH) { + if (!$_SESSION["uid"]) { + header("Location: login.php"); + exit; + } + } else { + authenticate_user($link); } } else { - authenticate_user($link); + $_SESSION["uid"] = 1; + $_SESSION["name"] = "admin"; } + initialize_user_prefs($link, $_SESSION["uid"]); // FIXME this needs to be moved somewhere after user creation @@ -61,7 +68,9 @@

+ Hello, (Logout) + diff --git a/tt-rss.php b/tt-rss.php index 9348944f6..6dd4195fa 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -8,13 +8,19 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!USE_HTTP_AUTH) { - if (!$_SESSION["uid"]) { - header("Location: login.php"); - exit; + if (!SINGLE_USER_MODE) { + + if (!USE_HTTP_AUTH) { + if (!$_SESSION["uid"]) { + header("Location: login.php"); + exit; + } + } else { + authenticate_user($link); } } else { - authenticate_user($link); + $_SESSION["uid"] = 1; + $_SESSION["name"] = "admin"; } initialize_user_prefs($link, $_SESSION["uid"]); @@ -70,7 +76,9 @@
+ Hello, (Logout) +