===================================================================
RCS file: /home/cvsd/home/cvs/wolboard/wolboard.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- wolboard/wolboard.php	2002/04/13 22:49:49	1.8
+++ wolboard/wolboard.php	2002/04/25 08:42:46	1.9
@@ -3,14 +3,15 @@
 	Module:	WolBoard.php3
 
 	Author:	Martin Karas a.k.a. Wolcano
-	Date:	14.03.2002
+	Date:	24.04.2002
 	Mail:	wolcano@pobox.sk
-	Version:	v5.1
+	Version:	v5.2
 	License:	not chosen yet - this file is strictly private,
 		you may not copy/change/distribute it without authors
 		explicit premission.
 	Description:	Simple message-board. Can store data in files or
 		PEAR-compliant DB (not fully implemented yet)
+	Copyright: Platon SDG     http://www.platon.sk
 
 	TODO: (see TODO file)
 
@@ -24,11 +25,8 @@
 		<user_line> :== <username>:<email>:<md5sum_of_password>
 
 	Database specification:
-	create table messages <unknown for now>
-
-	create table users <unknown>
-
-
+		See "sql/" files.
+	
 	Input parameters:
 		$pagesize	- # of messages  per page
 		$page		- #th page
@@ -56,8 +54,10 @@
 		$archive	- archive file prefix
 		$archive_no	- index of archived file
 		$submit_type	- submit button type
+		$reply_to	- index of message you want to reply (inserts quoted message)
 
 		CHANGE LOG:
+		* 5.2	- added "reply" link
 		* 5.1   - updated SQL queries
 				   - sprtinf()-ed and quote()-ed all SQL queries
 		        - some bug fixes
@@ -78,7 +78,7 @@
 
 
 	// IMPORTANT CONSTANTS (change if needed)
-	$WB_version = "5.1";
+	$WB_version = "5.2";
 	$WB_name = "Wol's Message Board";
 	$strip_slashes = 0;
 	$DEFAULT_HEAD_FRAME = "";
@@ -97,7 +97,7 @@
 	$min_msgs_in_board = 50;
 
 	// Database defaults
-	$use_db = 1;
+	$use_db = 0;
 	$db_message_table = "wolboard_messages";
 	$db_user_table = "wolboard_users";
 	//$db_host = "db.host.sk";
@@ -206,6 +206,20 @@
 		);
 	} // create_link()
 
+	function create_reply($msg_arr) {
+		/*
+		 $msg_arr keys: time, name, message, email 
+		*/
+		$quote_string = "&gt; ";
+		$ret = $msg_arr["name"] .
+			" (" .
+			format_time($msg_arr["time"]) . 
+			")<br>\n$quote_string" .
+			eregi_replace("\n", "\n$quote_string", $msg_arr["message"]) .
+			"<br>";
+		return $ret;
+	} // create_reply($msg_arr)
+	
 	function wait_read_lock($f, $max_wait = 9999) {
 		$start = time();
 		while ((!flock($f, 1)) && ($start + $max_wait < time()))
@@ -309,7 +323,7 @@
 	} // get_time($str)
 
 	function get_pass($str) {
-		return rawurldecode(trim(strtr(strrchr($str, ":"), ":", ";")));
+		return rawurldecode(trim(strtr(strrchr($str, ":"), ":", " ")));
 	} // get_pass($str)
 
 	function get_email($str) {
@@ -805,7 +819,7 @@
 		}
 	}
 
-	function show_data_form($user_file, $self, $nick,
+	function show_data_form($user_file, $self, $nick, $message,
 		$style, $WB_name, $autorefresh, $pagesize, $use_db = 0, $db_conn = 0) {
 		// TODO !!!!!!
 		global $headframe;
@@ -827,7 +841,8 @@ Current time is <?echo format_time(time(
 ?>" target="<?echo $bodyframe?>">
 <tr>
 	<td align=center valign=middle rowspan=3>
-		<textarea name="message" cols=30 rows=5></textarea></td>
+		<textarea name="message" cols=30 rows=<?
+	echo (sizeof(explode("\n",$message)) + 5)?>><?echo $message?></textarea></td>
 	<td align=center valign=middle><font face="Arial" color=#ffcc00 size=3>Nick</font></td>
 	<td align=left valign=middle>
 		<select name="nick">
@@ -849,18 +864,18 @@ Current time is <?echo format_time(time(
 	</td>
 </tr>
 <tr>
-	<td valign=middle align=center colspan=2 rowspan=1><input type=submit name=submit_type value="Send"<?
+	<td valign=middle align=center colspan=1 rowspan=1><input type=submit name=submit_type value="Send"<?
 		// TODO redo the JS inline function (it doesn't clear the memo now)
 		if (!$show_body)
 			echo " onClick=\"javascript:submit();message.value=''\"";
 
 ?>></td>
-</tr>
-<tr></tr>
-<tr>
 	<td align=center>
 		<a href="<?echo $self . "?" . link_replace(create_link(), "createuser", "1")?>">New nick</a>
 	</td>
+</tr>
+<tr></tr>
+<tr>
 	<td align=right><?
 		if (!$style)
 			echo "Board\t /</td><td><a href=$self?" .
@@ -1004,6 +1019,7 @@ Current time is <?echo format_time(time(
 
 	function show_message($message, $style = 0) {
 		global $self;
+		global $headframe;
 		switch($style) {
 			case 1:
 			// Chat message line
@@ -1026,7 +1042,7 @@ Current time is <?echo format_time(time(
 				break;
 			default:
 			// Board message style
-				// remark this /* so the modes switch
+				// remark this /* to a //* and the modes will switch
 				/*
 				echo "<tr><td valign=top class=email>";
 				if ($message["email"] != "")
@@ -1058,6 +1074,13 @@ Current time is <?echo format_time(time(
 						"nick",
 						$message["name"]) .
 					">delete</a>\n";
+				echo "<a href=$self?" .
+					link_replace(
+						create_link(),
+						"reply_to",
+						rawurlencode($message["name"]."#".$message["time"])
+					) .
+					" target=$headframe>reply</a>\n";
 				echo "</td></tr><tr><td>";
 				echo "\t" . $message["message"] . "\n";
 				echo "</td></tr>\n";
@@ -1186,6 +1209,12 @@ Current time is <?echo format_time(time(
 	if (good($archive_no) && !$use_db)
 		$message_file = $old_messages_folder . $hist_file_prefix . $archive_no;
 
+	// check for superuser view
+	if (($nick == $root_name) && (md5($pass) == $root_md5_password))
+		$superuser = 1;
+	else
+		$superuser = 0;
+
 	//header ("Cache-Control: no-cache, must-revalidate");
 	//header ("Pragma: no-cache");
 
@@ -1206,6 +1235,33 @@ Current time is <?echo format_time(time(
 			$message_file = $db_message_table;
 		}
 	}
+
+	// Insert quoted REPLY TO message
+	if (good($reply_to)) {
+		$pivot = strrpos($reply_to, "#");
+		if (!($pivot === false)) {
+			$tmp_name = substr($reply_to, 0, $pivot);
+			$tmp_time = substr($reply_to, $pivot + 1);
+			$messages = read_messages($message_file, $user_file, $superuser,
+				$use_db, $db_conn);
+			for ($i = 0; $i < sizeof($messages); $i++) {
+				if (($messages[$i]["time"] == $tmp_time) &&
+					($messages[$i]["name"] == $tmp_name)){
+					$found = true;
+					break;
+				}
+			}
+			if ($found) {
+				$tmp_msg = create_reply($messages[$i]);
+				if (good($message)) {
+					$tmp_msg .= $message;
+				}
+				$message = $tmp_msg;
+			$message = strip_tags($message);
+			}
+		}
+	}
+	
 	// CREATE NEW USER
 	if ($createuser) {
 		$mails = get_emails($user_file, $use_db, $db_handle);
@@ -1226,11 +1282,12 @@ Current time is <?echo format_time(time(
 	}
 
 	// WRITE MESSAGE TO DB
-	if (good($message) && good($submit_type)) {
+	if (good($message) && good($submit_type) && $submit_type == "Send") {
 		if (write_message($message_file, $user_file, $nick, $message, 0,
 			$old_messages_folder, $max_msgs_in_one_file, $min_msgs_in_board,
 			$hist_file_prefix, $allowed_tags, $use_db, $db_handle))
 			; // something failed, ignoring for now
+		$message = "";
 	}
 
 	// DELETE MESSAGE FROM DB
@@ -1262,11 +1319,6 @@ Current time is <?echo format_time(time(
 		}
 	}
 
-	// check for superuser view
-	if (($nick == $root_name) && (md5($pass) == $root_md5_password))
-		$superuser = 1;
-	else
-		$superuser = 0;
 
 	// We don't want to show body, when other form is shown
 
@@ -1306,8 +1358,8 @@ Current time is <?echo format_time(time(
 </head>
 <body bgcolor=black text=#C0C0C0 link=#888ff alink=#888ff vlink=#888ff>
 <?
-		show_data_form($user_file, $self, $nick, $style, $WB_name,
-			$autorefresh, $pagesize, $use_db, $db_handle);
+		show_data_form($user_file, $self, $nick, $message, $style,
+			$WB_name, $autorefresh, $pagesize, $use_db, $db_handle);
 	}
 
 	if ($show_body) {