From ad11be7850fff3f34abf75184ca939ac066ed342 Mon Sep 17 00:00:00 2001
From: Chad Little <clittle@users.sourceforge.net>
Date: Tue, 13 Sep 2005 21:57:28 +0000
Subject: Minor cosmetics.

---
 README                       | 2 ++
 includes/event.php           | 7 ++++---
 templates/default/search.tpl | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/README b/README
index c030270..5e4c69d 100644
--- a/README
+++ b/README
@@ -87,7 +87,9 @@ Changes:
 	-Event popup respect CHARSET
 	-Tabs parsed into &nbsp;
 	-Search links work again.
+	-Search cleaned up.
 	-Weekly repeating events display better.
+	-Slashes stripped from event popups.
 
 2.0 c
 	-Enhanced error messaging system.
diff --git a/includes/event.php b/includes/event.php
index 620f22b..c770c9f 100644
--- a/includes/event.php
+++ b/includes/event.php
@@ -25,7 +25,8 @@ if ($_POST['time'] == -1) {
 	$event_times = date($timeFormat, $event['start_unixtime']) . ' - ' .  date($timeFormat, $event['end_unixtime']); 
 }
 
-$event['description'] = urldecode($event['description']);
+$event['description'] 	= urldecode(stripslashes($event['description']));
+$event['event_text'] 	= urldecode(stripslashes($event['event_text']));
 
 if ($event['description']) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']);
 
@@ -65,9 +66,9 @@ $page = new Page(BASE.'templates/'.$template.'/event.tpl');
 $page->replace_tags(array(
 	'charset'			=> $charset,
 	'cal' 				=> $event['calname'],
-	'event_text' 		=> urldecode($event['event_text']),
+	'event_text' 		=> $event['event_text'],
 	'event_times' 		=> $event_times,
-	'description' 		=> urldecode($event['description']),
+	'description' 		=> $event['description'],
 	'organizer' 		=> $organizer,
 	'attendee'	 		=> $attendee,
 	'status'	 		=> $event['status'],
diff --git a/templates/default/search.tpl b/templates/default/search.tpl
index 272facd..dfb83e3 100644
--- a/templates/default/search.tpl
+++ b/templates/default/search.tpl
@@ -5,7 +5,7 @@
 		<td>
 			<table width="100%" border="0" cellspacing="0" cellpadding="0">
 				<tr valign="top">
-					<td align="left" width="400" class="navback"><div style="padding: 5px;"><h1>{L_RESULTS}</h1><br /><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></div></td>
+					<td align="left" width="400" class="title"><h1>{L_RESULTS}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></td>
 					<td valign="top" align="right" width="120" class="navback">	
 						<div style="padding-top: 3px;">
 						<table width="120" border="0" cellpadding="0" cellspacing="0">
@@ -52,7 +52,7 @@
 						<!-- switch recur off -->
 						<!-- switch description on -->
 						<tr>
-							<td valign="top" width="100" class="G10BOLD">{L_DESCRIPTION}</td>
+							<td valign="top" width="100" class="G10BOLD">{L_DESCRIPTION}:</td>
 							<td valign="top" align="left" class="G10B">{DESCRIPTION}</td>
 						</tr>
 						<!-- switch description off -->
-- 
cgit v1.2.3