From ae98a291c60e29ad4a13df14b384693864ddfcb4 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Sat, 1 Nov 2003 06:12:20 +0000 Subject: [PATCH] * Got login/logout working. Still need to redirect unloggedin sessions to a login page. --- ctdlphp/ChangeLog | 5 ++- ctdlphp/ctdlheader.php | 13 +++++++- ctdlphp/ctdlprotocol.php | 72 +++++++++++++++++++++++++++++++++++----- ctdlphp/ctdlsession.php | 30 ++++++++--------- ctdlphp/login.php | 19 +++++++++++ 5 files changed, 113 insertions(+), 26 deletions(-) diff --git a/ctdlphp/ChangeLog b/ctdlphp/ChangeLog index a9197843f..7d56f4ed7 100644 --- a/ctdlphp/ChangeLog +++ b/ctdlphp/ChangeLog @@ -1,4 +1,8 @@ $Log$ + Revision 1.4 2003/11/01 06:12:20 ajc + * Got login/logout working. Still need to redirect unloggedin sessions to + a login page. + Revision 1.3 2003/11/01 05:10:49 ajc * When sending the QUIT command to the server, output a bunch more newlines so the session proxy has a chance to see that the Citadel server closed @@ -11,4 +15,3 @@ Revision 1.1 2003/10/31 03:47:13 ajc * Initial CVS import - diff --git a/ctdlphp/ctdlheader.php b/ctdlphp/ctdlheader.php index e8073362c..6fbae0eda 100644 --- a/ctdlphp/ctdlheader.php +++ b/ctdlphp/ctdlheader.php @@ -18,7 +18,18 @@ function bbs_page_header() { - FIXME NAME BBS + +LITERAL; + + if ($_SESSION["serv_humannode"]) { + echo $_SESSION["serv_humannode"] ; + } + else { + echo "BBS powered by Citadel" ; + } + + echo <<<LITERAL + \n"; do { $buf = serv_gets(); - if ($buf != "000") { + if (strcasecmp($buf, "000")) { echo "", $buf, "
\n" ; } - } while ($buf != "000"); + } while (strcasecmp($buf, "000")); echo "\n"; } else { diff --git a/ctdlphp/ctdlsession.php b/ctdlphp/ctdlsession.php index 6669eac75..5683467ab 100644 --- a/ctdlphp/ctdlsession.php +++ b/ctdlphp/ctdlsession.php @@ -42,24 +42,24 @@ function establish_citadel_session() { // Ok, now try again. $clientsocket = fsockopen($sockname, 0, $errno, $errstr, 5); + + // Try to log the user back in. + if ($clientsocket) { + + + if ($_SESSION["username"]) { + login_existing_user( + $_SESSION["username"], + $_SESSION["password"] + ); + } + } } if ($clientsocket) { - /* - echo "Connected. Performing echo tests.
\n"; - flush(); - $cmd = "ECHO test echo string upon connection\n"; - fwrite($clientsocket, $cmd); - $response = fgets($clientsocket, 4096); - echo "Response is: ", $response, "
\n"; - flush(); - - $cmd = "ECHO second test for echo\n"; - fwrite($clientsocket, $cmd); - $response = fgets($clientsocket, 4096); - echo "Response is: ", $response, "
\n"; - flush(); - */ + if (!$_SESSION["serv_humannode"]) { + ctdl_get_serv_info(); + } } else { echo "ERROR: no Citadel socket!
\n"; diff --git a/ctdlphp/login.php b/ctdlphp/login.php index 7938064bc..2190447d2 100644 --- a/ctdlphp/login.php +++ b/ctdlphp/login.php @@ -5,6 +5,25 @@ ctdl_mesg("hello"); ?> +
+
+ + + + + + + + + +
User name:
Password:
+ + + +
+
+
+ Page Two
Page Three
-- 2.30.2