Patches applied, added prefs_lang.

5 files changed, 75 insertions, 67 deletions

diff --git a/functions/todo.js b/functions/todo.js
index e9f6c3b..cdcb7f8 100644
--- a/functions/todo.js
+++ b/functions/todo.js
@@ -1,18 +1,12 @@
 

 <script language="JavaScript" type="text/javascript">

 <!--

-	function openTodoInfo(vtodo, calendarname, start, due, description, status, priority)

+	function openTodoInfo(vtodo_array)

 	{	

 		var windowW = 450;

 		var windowH = 275;

 	

-		var url = "includes/todo.php?vtodo="+vtodo+

-			"&calendar_name="+calendarname+

-			"&start="+start+

-			"&due="+due+

-			"&description="+description+

-			"&status="+status+

-			"&priority="+priority;

+		var url = "includes/todo.php?vtodo_array="+vtodo_array;

 				

 		options = "scrollbars=no"+",width="+windowW+",height="+windowH;

 	

diff --git a/includes/sidebar.php b/includes/sidebar.php
index 663ff8b..948bce5 100644
--- a/includes/sidebar.php
+++ b/includes/sidebar.php
@@ -218,32 +218,35 @@ if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?>
 											$vtodo_text = stripslashes(urldecode($val["vtodo_text"]));
 											$vtodo_text = strip_tags($vtodo_text, '<b><i><u>');
 											if ($vtodo_text != "") {	
-												$vtodo_text2 	= rawurlencode(addslashes($val["vtodo_text"]));
-												$description 	= addslashes(urlencode($val["description"]));
-												$completed 		= $val['completed_date'];
-												if(isset($completed)) $completed = localizeDate($dateFormat_day, strtotime($completed));
+												$description 	= $val["description"];
+												$completed_date = $val['completed_date'];
 												$status 		= $val["status"];
-												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']));
-												else $due_date 	= '';
+												$due_date 		= $val['due_date'];
+												$vtodo_array 	= array(
+													'calendar_name' => $calendar_name,
+													'completed_date'=> $completed_date,
+													'description'	=> $description,
+													'due_date'		=> $due_date,
+													'priority'		=> $priority,
+													'start_date'	=> $start_date,
+													'status'		=> $status,
+													'vtodo_text' 	=> $vtodo_text);
 
-												$calendar_name2	= addslashes($calendar_name);
-												$calendar_name2 = urlencode($calendar_name2);
-												$vtodo_text = word_wrap($vtodo_text, 21, $tomorrows_events_lines);
+												$vtodo_array 	= base64_encode(serialize($vtodo_array));
+												
+												$vtodo_text 	= word_wrap($vtodo_text, 21, $tomorrows_events_lines);
+												
 												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', '$priority')\"><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_array')\"><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', '$priority')\"><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_array')\"><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', '$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";
+													echo "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_array')\"><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 a47e3e0..ae0cc9d 100644
--- a/includes/todo.php
+++ b/includes/todo.php
@@ -1,66 +1,72 @@
 <?php 

 

 define('BASE', '../');

-include (BASE.'functions/init.inc.php'); 

+include (BASE.'functions/init.inc.php');

+include (BASE.'functions/date_functions.php');

 

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

-	$vtodo = $HTTP_GET_VARS['vtodo'];

+// Unserialize the array so that we can use it.

+$vtodo_array = unserialize(base64_decode($HTTP_GET_VARS['vtodo_array']));

+

+// Set the variables from the array

+if (isset($vtodo_array['vtodo_text']) && ($vtodo_array['vtodo_text'] !== '') ) {

+	$vtodo_text = $vtodo_array['vtodo_text'];

 } else {

-	$vtodo = '';

+	$vtodo_text = '';

 }

 

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

-	$description = $HTTP_GET_VARS['description'];

+if (isset($vtodo_array['description']) && ($vtodo_array['description'] !== '') ) {

+	$description = $vtodo_array['description'];

 } else {

 	$description = '';

 }

 

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

-	$status = $HTTP_GET_VARS['status'];

+if (isset($vtodo_array['completed_date']) && ($vtodo_array['completed_date'] !== '') ) {

+	$completed_date = localizeDate ($dateFormat_day, strtotime($vtodo_array['completed_date']));

+}

+

+if (isset($vtodo_array['status']) && ($vtodo_array['status'] !== '') ) {

+	$status = $vtodo_array['status'];

+}

+if ((!isset($status) || $status == "COMPLETED") && isset($completed_date)) {

+	$status = $completed_date_lang . $completed_date;

+} else if ($status == "COMPLETED") {

+	$status = $completed_lang;

 } else {

 	$status = $unfinished_lang;

 }

 

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

-	$calendar_name = $HTTP_GET_VARS['calendar_name'];

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

+	$calendar_name = $vtodo_array['calendar_name'];

 } else {

 	$calendar_name = '';

 }

 

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

-	$start = $HTTP_GET_VARS['start'];

-} else {

-	$start = '';

+if (isset($vtodo_array['start_date']) && ($vtodo_array['start_date'] !== '') ) {

+	$start_date = localizeDate ($dateFormat_day, strtotime($vtodo_array['start_date']));

 }

 

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

-	$due = $HTTP_GET_VARS['due'];

+if (isset($vtodo_array['due_date']) && ($vtodo_array['due_date'] !== '') && strtotime($vtodo_array['due_date']) != strtotime("+1 year", strtotime($start_date))) {

+	$due_date = localizeDate ($dateFormat_day, strtotime($vtodo_array['due_date']));

 } else {

-	$due = '';

+	$due_date = '';

 }

 

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

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

+if (isset($vtodo_array['priority']) && ($vtodo_array['priority'] !== '')) {

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

+

+	if ($priority >= 1 && $priority <= 4) {

+		$priority = $priority_high_lang;

+	} else if ($priority == 5) {

+		$priority = $priority_medium_lang;

+	} else if ($priority >= 6 && $priority <= 9) {

+		$priority = $priority_low_lang;

+	} else {

+		$priority = $priority_none_lang;

+	}

 } else {

-	$priority = $no_priority_lang;

+	$priority = $priority_none_lang;

 }

 

-$vtodo = rawurldecode($vtodo);

-$vtodo = stripslashes($vtodo);

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

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

-$description = rawurldecode($description);

-$description = stripslashes($description);

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

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

-$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">

@@ -85,7 +91,7 @@ $status = str_replace('\\', '', $status);
 	   		<table width="100%" border="0" cellspacing="0" cellpadding="0">

 				<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).'<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_text).'<br /><br />'; ?></td>

 				</tr>

 				

 				<?php if ($description) { ?>    

@@ -110,13 +116,13 @@ $status = str_replace('\\', '', $status);
 

 				<tr>

 					 <td></td>

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

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

 				</tr>

 

-				<?php if ($due) { ?>

+				<?php if ($due_date) { ?>

 				<tr>

 					 <td></td>

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

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

 				</tr>

 				<?php } ?>

 				

diff --git a/languages/english.inc.php b/languages/english.inc.php
index 735b0d2..4dd044d 100644
--- a/languages/english.inc.php
+++ b/languages/english.inc.php
@@ -74,13 +74,18 @@ $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:';
+$set_prefs_lang			= 'Set preferences';
 
 //To-dos
-$completed_lang			= 'Completed on ';
+$completed_date_lang	= 'Completed on ';
+$completed_lang			= 'Completed';
 $created_lang			= 'Created: ';
 $due_lang				= 'Due: ';
-$no_priority_lang		= 'None';
 $priority_lang			= 'Priority: ';
+$priority_high_lang		= 'High';
+$priority_low_lang		= 'Low';
+$priority_medium_lang	= 'Medium';
+$priority_none_lang		= 'None';
 $status_lang			= 'Status: ';
 $todo_lang				= 'To do items';
 $unfinished_lang		= 'Unfinished';
diff --git a/preferences.php b/preferences.php
index 5104297..6382a00 100644
--- a/preferences.php
+++ b/preferences.php
@@ -249,7 +249,7 @@ include(BASE.'functions/ical_parser.php');
 									<tr>
 										<td align="left" valign="top" nowrap>&nbsp;</td>
 										<td align="left" valign="top"><img src="images/spacer.gif" alt="" width="20" height="1" border="0"></td>
-										<td align="left" valign="top"><button type="submit" name="set" value="true" class="query_style">Set Cookie</button></td>
+										<td align="left" valign="top"><button type="submit" name="set" value="true"><?php echo "$set_prefs_lang"; ?></button></td>
 									</tr>
 								</table>
 								</form>