From 76672070188977e6ceb44388e59d67a8d5779f52 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Sun, 4 Feb 2007 15:52:40 +0000
Subject: [PATCH] * use isset() to be correct and don't produce warnings * have
 a config.php containing our server connection.

---
 ctdlphp/config.php       | 10 ++++++++++
 ctdlphp/ctdlelements.php |  4 ++--
 ctdlphp/ctdlheader.php   |  6 +++---
 ctdlphp/ctdlsession.php  |  7 +++----
 ctdlphp/sessionproxy.php |  5 ++---
 5 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 ctdlphp/config.php

diff --git a/ctdlphp/config.php b/ctdlphp/config.php
new file mode 100644
index 000000000..ff8b76744
--- /dev/null
+++ b/ctdlphp/config.php
@@ -0,0 +1,10 @@
+<?PHP
+#could be: "uncensored.citadel.org"
+# or the path of the unix domain socket: /var/run/citadel/citadel.sock
+define('CITADEL_HOSTNAME',"127.0.0.1");
+
+#make it 0 to use unix domain sockets
+define('CITADEL_TCP_PORTNO','504');
+
+
+?>
\ No newline at end of file
diff --git a/ctdlphp/ctdlelements.php b/ctdlphp/ctdlelements.php
index 31ab4d28d..8834601c4 100644
--- a/ctdlphp/ctdlelements.php
+++ b/ctdlphp/ctdlelements.php
@@ -30,7 +30,7 @@ function display_message($msgnum) {
 	echo strftime("%b %d %Y %I:%M%p ", $fields["time"]) ;
 	echo " from " . htmlspecialchars($fields["from"]) ;
 	
-	if (strlen($fields["rfca"]) > 0) {
+	if (isset($fields["rfca"]) && strlen($fields["rfca"]) > 0) {
 		echo " &lt;" . htmlspecialchars($fields["rfca"]) . "&gt;" ;
 	}
 	else if ( (strlen($fields["node"]) > 0) 
@@ -41,7 +41,7 @@ function display_message($msgnum) {
 		}
 	}
 
-	if (strlen($fields["rcpt"]) > 0) {
+	if (isset($fields["rcpt"]) && strlen($fields["rcpt"]) > 0) {
 		echo " to " . htmlspecialchars($fields["rcpt"]) ;
 	}
 	echo "</I></B><BR>\n" ;
diff --git a/ctdlphp/ctdlheader.php b/ctdlphp/ctdlheader.php
index 39aadf9ea..9e8dfde61 100644
--- a/ctdlphp/ctdlheader.php
+++ b/ctdlphp/ctdlheader.php
@@ -61,14 +61,14 @@ LITERAL;
 	echo '<TABLE BORDER=0 WIDTH=100%>';
 	echo '<TR>';
 	echo '<TD>' . $_SESSION["serv_humannode"] . '</TD>' ;
-	echo '<TD>' . $_SESSION["username"] . '</TD>' ;
-	echo '<TD>' . $_SESSION["room"] . '</TD>' ;
+	echo '<TD>' . (isset($_SESSION["username"]))?'':$_SESSION["username"] . '</TD>' ;
+	echo '<TD>' . (isset($_SESSION["room"]))?'':$_SESSION["room"] . '</TD>' ;
 	echo '<TD ALIGN=RIGHT><A HREF="logout.php">Log out</A></TD>' ;
 	echo '</TR></TABLE>';
 	echo '</div>';
 
 	// Temporary menu
-	if ($_SESSION["logged_in"]) {
+	if (isset($_SESSION["logged_in"])) {
 		echo	'<div id="Menu">' .
 			'<a href="listrooms.php">' .
 			'room list</A><BR>' .
diff --git a/ctdlphp/ctdlsession.php b/ctdlphp/ctdlsession.php
index a12009402..996975d7a 100644
--- a/ctdlphp/ctdlsession.php
+++ b/ctdlphp/ctdlsession.php
@@ -1,5 +1,4 @@
 <?PHP
-
 // $Id$
 //
 // This gets called from within the header functions.  It establishes or
@@ -22,7 +21,7 @@ function establish_citadel_session() {
 
 	session_start();
 
-	if ($_SESSION["ctdlsession"]) {
+	if (isset($_SESSION["ctdlsession"])) {
 		$session = $_SESSION["ctdlsession"];
 	}
 	else {
@@ -81,7 +80,7 @@ function establish_citadel_session() {
 		}
 	}
 
-	if (!$_SESSION["serv_humannode"]) {
+	if (!isset($_SESSION["serv_humannode"])) {
 		ctdl_get_serv_info();
 	}
 
@@ -89,7 +88,7 @@ function establish_citadel_session() {
 	// login.php logout.php do_login.php,
 	// and the session is not logged in, redirect to login.php
 	//
-	if ($_SESSION["logged_in"] != 1) {
+	if (isset($_SESSION["logged_in"]) && ($_SESSION["logged_in"] != 1)) {
 		$filename = basename(getenv('SCRIPT_NAME'));
 		if (	(strcmp($filename, "login.php"))
 		   &&	(strcmp($filename, "logout.php"))
diff --git a/ctdlphp/sessionproxy.php b/ctdlphp/sessionproxy.php
index 75bd90243..2e59e81df 100755
--- a/ctdlphp/sessionproxy.php
+++ b/ctdlphp/sessionproxy.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php -q
 
 <?php
-
+include "config.php";
 // $Id$
 //
 // This is the session proxy that binds a unix domain socket to a Citadel
@@ -86,8 +86,7 @@ chmod($sockname, 0600);
 
 // We need to get a connection to the Citadel server going now.
 
-$ctdlsock = fsockopen("uncensored.citadel.org", 504, $errno, $errstr, 30);
-//$ctdlsock = fsockopen("/appl/citadel/citadel.socket", 0, $errno, $errstr, 30);
+$ctdlsock = fsockopen(CITADEL_HOSTNAME, CITADEL_TCP_PORTNO, $errno, $errstr, 30);
 if (!$ctdlsock) {
 	socket_close ($sock);
 	system("/bin/rm -f " . $sockname);
-- 
2.30.2