You can turn on and off completed TODOs in config now.

3 files changed, 58 insertions, 49 deletions

diff --git a/config.inc.php b/config.inc.php
index 54c6d62..d5e93c5 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -39,6 +39,7 @@ $header_always			= 'no';				// Set to yes to have header on print.php
 $allow_preferences		= 'yes';			// Allow visitors to change various preferences via cookies.
 $printview_default		= 'no';				// Set print view as the default view. day, week, and month only supported views for $default_view (listed well above).
 $show_todos				= 'yes';			// Show your todo list on the side of day and week view.
+$show_completed			= 'yes';			// Show completed todos on your todo list.
 										
 $blacklisted_cals[] = '';					// Fill in between the quotes the name of the calendars 
 $blacklisted_cals[] = '';					// you wish to 'blacklist' or that you don't want to show up in your calendar
diff --git a/languages/english.inc.php b/languages/english.inc.php
index 39e2eee..2b8bed6 100644
--- a/languages/english.inc.php
+++ b/languages/english.inc.php
@@ -74,7 +74,7 @@ $select_view_lang		= 'Select your default view:';
 $select_time_lang		= 'Select your default start time:';
 $select_day_lang		= 'Select your default start day of week:';
 $select_style_lang		= 'Select your default style:';
-$todo_lang				= 'Todo list';
+$todo_lang				= 'To do items';
 
 // $format_recur, items enclosed in % will be substituted with variables
 $format_recur_lang['delimiter']	= ', ';								// ie, 'one, two, three'
diff --git a/sidebar.php b/sidebar.php
index 126b4f2..06b701f 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -147,35 +147,37 @@
 								</tr>
 								
 								<?php
-								foreach ($master_array[("$tomorrows_date")] as $event_times) {
-									foreach ($event_times as $val) {
-										$event_text = stripslashes(urldecode($val["event_text"]));
-										$event_text = strip_tags($event_text, '<b><i><u>');
-										if ($event_text != "") {	
-											$event_text2 	= rawurlencode(addslashes($val["event_text"]));
-											$description 	= addslashes(urlencode($val["description"]));
-											$event_start 	= @$val["event_start"];
-											$event_end 		= @$val["event_end"];
-											$event_start 	= date ($timeFormat, @strtotime ("$event_start"));
-											$event_end 		= date ($timeFormat, @strtotime ("$event_end"));
-											$calendar_name2	= addslashes($calendar_name);
-											$calendar_name2 = urlencode($calendar_name2);
-											$event_text = word_wrap($event_text, 21, $tomorrows_events_lines);
-											echo "<tr>\n";
-											echo "<td width=\"1%\"><img src=\"images/spacer.gif\" width=\"4\" height=\"1\"></td>";
-											echo "<td colspan=\"6\" class=\"G10B\" align=\"left\">\n";
-											if (!isset($val["event_start"])) {
-												$event_start = $all_day_lang;
-												$event_end = '';
-												echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><i>$event_text</i></a>\n";
-											} else {	
-												echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><font class=\"G10B\">&#149; $event_text</font></a>\n";
+									echo "<tr>\n";
+									echo "<td width=\"1%\"><img src=\"images/spacer.gif\" width=\"4\" height=\"1\"></td>";
+									echo "<td colspan=\"6\" class=\"G10B\" align=\"left\">\n";
+									foreach ($master_array[("$tomorrows_date")] as $event_times) {
+										foreach ($event_times as $val) {
+											$event_text = stripslashes(urldecode($val["event_text"]));
+											$event_text = strip_tags($event_text, '<b><i><u>');
+											if ($event_text != "") {	
+												$event_text2 	= rawurlencode(addslashes($val["event_text"]));
+												$description 	= addslashes(urlencode($val["description"]));
+												$event_start 	= @$val["event_start"];
+												$event_end 		= @$val["event_end"];
+												$event_start 	= date ($timeFormat, @strtotime ("$event_start"));
+												$event_end 		= date ($timeFormat, @strtotime ("$event_end"));
+												$calendar_name2	= addslashes($calendar_name);
+												$calendar_name2 = urlencode($calendar_name2);
+												$event_text = word_wrap($event_text, 21, $tomorrows_events_lines);
+												
+												if (!isset($val["event_start"])) {
+													$event_start = $all_day_lang;
+													$event_end = '';
+													echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><i>$event_text</i></a><br>\n";
+												} else {	
+													echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><font class=\"G10B\">&#149; $event_text</font></a><br>\n";
+												}
+												
 											}
-											echo "</td>\n";
-											echo "</tr>\n";
 										}
 									}
-								}
+									echo "</td>\n";
+									echo "</tr>\n";
 								?>
 							</table>
 						</td>
@@ -208,30 +210,36 @@ if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?>
 								</tr>
 								
 								<?php
-								foreach ($master_array['-2'] as $event_times) {
-									foreach ($event_times as $val) {
-										$event_text = stripslashes(urldecode($val["event_text"]));
-										$event_text = strip_tags($event_text, '<b><i><u>');
-										if ($event_text != "") {	
-											$event_text2 	= rawurlencode(addslashes($val["event_text"]));
-											$description 	= addslashes(urlencode($val["description"]));
-											$event_start 	= @$val["event_start"];
-											$event_end 		= @$val["event_end"];
-											$event_start 	= date ($timeFormat, @strtotime ("$event_start"));
-											$event_end 		= date ($timeFormat, @strtotime ("$event_end"));
-											$calendar_name2	= addslashes($calendar_name);
-											$calendar_name2 = urlencode($calendar_name2);
-											$event_text = word_wrap($event_text, 21, $tomorrows_events_lines);
-											if ($val['status'] == 'COMPLETED') $event_text = "<S>$event_text</S>";
-											echo "<tr>\n";
-											echo "<td width=\"1%\"><img src=\"images/spacer.gif\" width=\"4\" height=\"1\"></td>";
-											echo "<td colspan=\"6\" class=\"G10B\" align=\"left\">\n";
-											echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><font class=\"G10B\">&#149; $event_text</font></a>\n";
-											echo "</td>\n";
-											echo "</tr>\n";
+									echo "<tr>\n";
+									echo "<td width=\"1%\"><img src=\"images/spacer.gif\" width=\"4\" height=\"1\"></td>";
+									echo "<td colspan=\"6\" class=\"G10B\" align=\"left\">\n";
+									foreach ($master_array['-2'] as $event_times) {
+										foreach ($event_times as $val) {
+											$event_text = stripslashes(urldecode($val["event_text"]));
+											$event_text = strip_tags($event_text, '<b><i><u>');
+											if ($event_text != "") {	
+												$event_text2 	= rawurlencode(addslashes($val["event_text"]));
+												$description 	= addslashes(urlencode($val["description"]));
+												$event_start 	= @$val["event_start"];
+												$event_end 		= @$val["event_end"];
+												$event_start 	= date ($timeFormat, @strtotime ("$event_start"));
+												$event_end 		= date ($timeFormat, @strtotime ("$event_end"));
+												$calendar_name2	= addslashes($calendar_name);
+												$calendar_name2 = urlencode($calendar_name2);
+												$event_text = word_wrap($event_text, 21, $tomorrows_events_lines);
+												if ($val['status'] == 'COMPLETED') {
+													if ($show_completed == 'yes') {
+														$event_text = "<S>$event_text</S>";
+														echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><font class=\"G10B\">&#149; $event_text</font></a><br>\n";
+													}
+												} else {
+													echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><font class=\"G10B\">&#149; $event_text</font></a><br>\n";
+												}
+											}
 										}
 									}
-								}
+									echo "</td>\n";
+									echo "</tr>\n";
 								?>
 							</table>
 						</td>