todo change

2 files changed, 34 insertions, 21 deletions

diff --git a/includes/sidebar.php b/includes/sidebar.php
index c0b0140..6619997 100644
--- a/includes/sidebar.php
+++ b/includes/sidebar.php
@@ -223,7 +223,10 @@ if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?>
 												$completed 		= $val['completed_date'];
 												if(isset($completed)) $completed = localizeDate($dateFormat_day, strtotime($completed));
 												$status 		= $val["status"];
-												if ((!isset($status) || $status == "COMPLETED") && isset($completed)) $status = "Completed on " . $completed;
+												if ((!isset($status) || $status == "COMPLETED") && isset($completed)) $status = $completed_lang . $completed;
+
+												$priority 		= $val['priority'];
+												
 												$start_date 	= $val["start_date"];
 												$start_date = localizeDate ($dateFormat_day, strtotime($start_date));
 												if(isset($val['due_date']) && strtotime($val['due_date']) != strtotime("+1 year",strtotime($start_date))) $due_date = localizeDate ($dateFormat_day, strtotime($val['due_date']));
@@ -235,12 +238,12 @@ if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?>
 												if ($status == 'COMPLETED' || (isset($val['completed_date']) && isset($val['completed_time']))) {
 													if ($show_completed == 'yes') {
 														$vtodo_text = "<S>$vtodo_text</S>";
-														echo "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_text2', '$calendar_name2', '$start_date', '$due_date', '$description', '$status')\"><font class=\"G10B\"><img src=\"images/completed.gif\" alt=\"\" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"> $vtodo_text</font></a><br>\n";
+														echo "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_text2', '$calendar_name2', '$start_date', '$due_date', '$description', '$status', '$priority')\"><font class=\"G10B\"><img src=\"images/completed.gif\" alt=\"\" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"> $vtodo_text</font></a><br>\n";
 													}
 												} elseif (isset($val['priority']) && ($val['priority'] != 0) && ($val['priority'] <= 5)) {
-													echo "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_text2', '$calendar_name2', '$start_date', '$due_date', '$description', '$status')\"><font class=\"G10B\"><img src=\"images/important.gif\" alt=\"\" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"> $vtodo_text</font></a><br>\n";
+													echo "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_text2', '$calendar_name2', '$start_date', '$due_date', '$description', '$status', '$priority')\"><font class=\"G10B\"><img src=\"images/important.gif\" alt=\"\" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"> $vtodo_text</font></a><br>\n";
 												} else {
-													echo "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_text2', '$calendar_name2', '$start_date', '$due_date', '$description', '$status')\"><font class=\"G10B\"><img src=\"images/not_completed.gif\" alt=\"\" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"> $vtodo_text</font></a><br>\n";
+													echo "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_text2', '$calendar_name2', '$start_date', '$due_date', '$description', '$status', '$priority')\"><font class=\"G10B\"><img src=\"images/not_completed.gif\" alt=\"\" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"> $vtodo_text</font></a><br>\n";
 												}
 											}
 										}
diff --git a/includes/todo.php b/includes/todo.php
index d9dca39..a47e3e0 100644
--- a/includes/todo.php
+++ b/includes/todo.php
@@ -18,7 +18,7 @@ if (isset($HTTP_GET_VARS['description']) && ($HTTP_GET_VARS['description'] !== '
 if (isset($HTTP_GET_VARS['status']) && ($HTTP_GET_VARS['status'] !== '') ) {

 	$status = $HTTP_GET_VARS['status'];

 } else {

-	$status = '';

+	$status = $unfinished_lang;

 }

 

 if (isset($HTTP_GET_VARS['calendar_name']) && ($HTTP_GET_VARS['calendar_name'] !== '') ) {

@@ -39,6 +39,12 @@ if (isset($HTTP_GET_VARS['due']) && ($HTTP_GET_VARS['due'] !== '') ) {
 	$due = '';

 }

 

+if (isset($HTTP_GET_VARS['priority']) && ($HTTP_GET_VARS['priority'] !== '') && ($HTTP_GET_VARS['priority'] < 10)) {

+	$priority = $HTTP_GET_VARS['priority'];

+} else {

+	$priority = $no_priority_lang;

+}

+

 $vtodo = rawurldecode($vtodo);

 $vtodo = stripslashes($vtodo);

 $vtodo = str_replace('\\', '', $vtodo);

@@ -47,24 +53,28 @@ $description = rawurldecode($description);
 $description = stripslashes($description);

 $description = str_replace('\\', '', $description);

 //$description = htmlspecialchars($description);

-$calendar_name2 = rawurldecode($calendar_name);

-$calendar_name2 = stripslashes($calendar_name2);

-$calendar_name2 = str_replace('\\', '', $calendar_name2);

-//$calendar_name2 = htmlspecialchars($calendar_name2);

+$calendar_name = rawurldecode($calendar_name);

+$calendar_name = stripslashes($calendar_name);

+$calendar_name = str_replace('\\', '', $calendar_name);

+//$calendar_name = htmlspecialchars($calendar_name);

+$status = rawurldecode($status);

+$status = stripslashes($status);

+$status = str_replace('\\', '', $status);

+//$status = htmlspecialchars($status);

 ?>

 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"

         "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">

 <html>

 <head>

 	<meta http-equiv="content-type" content="text/html;charset=UTF-8">

-	<title><?php echo $calendar_name2; ?></title>

+	<title><?php echo $calendar_name; ?></title>

 	<link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>">

 </head>

 <body bgcolor="#eeeeee"><center>

 <table border="0" width="430" cellspacing="0" cellpadding="0" class="calborder">

 	<tr>

 		<td align="left" valign="top" width="1%" class="sideback"><img src="images/spacer.gif" width="1" height="20"></td>

-		<td align="center" width="98%" class="sideback"><font class="G10BOLD"><?php echo "$calendar_name2 $calendar_lang"; ?></font></td>

+		<td align="center" width="98%" class="sideback"><font class="G10BOLD"><?php echo "$calendar_name $calendar_lang"; ?></font></td>

 		<td align="right" valign="top" width="1%" class="sideback"></td>

 	</tr>

 	<tr>

@@ -73,40 +83,40 @@ $calendar_name2 = str_replace('\\', '', $calendar_name2);
 	<tr>

 		<td colspan="3">  

 	   		<table width="100%" border="0" cellspacing="0" cellpadding="0">

-				<?php 

-//				if (($start) && ($end)) $vtodo_times = ' - <font class="V9">(<i>'.$start.' - '.$end.'</i>)</font>'; 

-//				if ($start == '' && $end == '' && isset($start, $end)) $vtodo_times = ' - <font class="V9">(<i>'.$all_day_lang.'</i>)</font>';

-				?>

 				<tr>

 					 <td width="1%"><img src="images/spacer.gif" width="6" height="1"></td>

-		 			 <td align="left" colspan="2" class="V12"><?php echo ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$vtodo).' '.$vtodo_times.'<br /><br />'; ?></td>

+		 			 <td align="left" colspan="2" class="V12"><?php echo ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$vtodo).'<br /><br />'; ?></td>

 				</tr>

 				

 				<?php if ($description) { ?>    

 					<tr>

 					 <td width="1%"><img src="images/spacer.gif" width="6" height="1"></td>

 					 <td align="left" colspan="2" class="V12">

-					 <?php echo ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",

-							'<a target="_new" href="\0">\0</a>', $description); ?></td>

+					 <?php echo ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", '<a target="_new" href="\0">\0</a>', $description); ?></td>

 					</tr>

 				<?php } ?>

 

 				<?php if ($status) { ?>

 				<tr>

 					 <td></td>

-		 			 <td align="left" colspan="2" class="V12">Status: <? echo $status; ?></td>

+		 			 <td align="left" colspan="2" class="V12"><?php echo $status_lang . $status; ?></td>

 				</tr>

 				<?php } ?>

 

 				<tr>

 					 <td></td>

-		 			 <td align="left" colspan="2" class="V12">Created: <? echo $start; ?></td>

+		 			 <td align="left" colspan="2" class="V12"><?php echo $priority_lang . $priority; ?></td>

+				</tr>

+

+				<tr>

+					 <td></td>

+		 			 <td align="left" colspan="2" class="V12"><?php echo $created_lang . $start; ?></td>

 				</tr>

 

 				<?php if ($due) { ?>

 				<tr>

 					 <td></td>

-		 			 <td align="left" colspan="2" class="V12">Due: <? echo $due; ?></td>

+		 			 <td align="left" colspan="2" class="V12"><?php echo $due_lang . $due; ?></td>

 				</tr>

 				<?php } ?>