Added correct calname to todo popup, started cleanup of todo.php code.

3 files changed, 26 insertions, 58 deletions

diff --git a/includes/event.php b/includes/event.php
index 96e2e93..58cb30a 100644
--- a/includes/event.php
+++ b/includes/event.php
@@ -8,17 +8,17 @@ function decode_popup ($item) {
 	return $item;
 }
 
-$event			= (isset($HTTP_POST_VARS['event'])) ? decode_popup($HTTP_POST_VARS['event']) : ('unset');
-$description	= (isset($HTTP_POST_VARS['description'])) ? decode_popup($HTTP_POST_VARS['description']) : ('unset');
-$cal			= (isset($HTTP_POST_VARS['cal'])) ? decode_popup($HTTP_POST_VARS['cal']) : ('unset');
-$start			= (isset($HTTP_POST_VARS['start'])) ? decode_popup($HTTP_POST_VARS['start']) : ('unset');
-$end			= (isset($HTTP_POST_VARS['end'])) ? decode_popup($HTTP_POST_VARS['end']) : ('unset');
-$status			= (isset($HTTP_POST_VARS['status'])) ? decode_popup($HTTP_POST_VARS['status']) : ('unset');
-$location		= (isset($HTTP_POST_VARS['location'])) ? decode_popup($HTTP_POST_VARS['location']) : ('unset');
-$url			= (isset($HTTP_POST_VARS['url'])) ? decode_popup($HTTP_POST_VARS['url']) : ('unset');
-$organizer		= (isset($HTTP_POST_VARS['organizer'])) ? ($HTTP_POST_VARS['organizer']) : ('unset');
+$event			= (isset($HTTP_POST_VARS['event'])) ? decode_popup($HTTP_POST_VARS['event']) : ('');
+$description	= (isset($HTTP_POST_VARS['description'])) ? decode_popup($HTTP_POST_VARS['description']) : ('');
+$cal			= (isset($HTTP_POST_VARS['cal'])) ? decode_popup($HTTP_POST_VARS['cal']) : ('');
+$start			= (isset($HTTP_POST_VARS['start'])) ? decode_popup($HTTP_POST_VARS['start']) : ('');
+$end			= (isset($HTTP_POST_VARS['end'])) ? decode_popup($HTTP_POST_VARS['end']) : ('');
+$status			= (isset($HTTP_POST_VARS['status'])) ? decode_popup($HTTP_POST_VARS['status']) : ('');
+$location		= (isset($HTTP_POST_VARS['location'])) ? decode_popup($HTTP_POST_VARS['location']) : ('');
+$url			= (isset($HTTP_POST_VARS['url'])) ? decode_popup($HTTP_POST_VARS['url']) : ('');
+$organizer		= (isset($HTTP_POST_VARS['organizer'])) ? ($HTTP_POST_VARS['organizer']) : ('');
 $organizer 		= unserialize (decode_popup ($organizer));
-$attendee		= (isset($HTTP_POST_VARS['attendee'])) ? ($HTTP_POST_VARS['attendee']) : ('unset');
+$attendee		= (isset($HTTP_POST_VARS['attendee'])) ? ($HTTP_POST_VARS['attendee']) : ('');
 $attendee 		= unserialize (decode_popup ($attendee));
 $cal_title_full	= $cal.' '.$calendar_lang;
 
diff --git a/includes/sidebar.php b/includes/sidebar.php
index 6f77a95..009ace0 100644
--- a/includes/sidebar.php
+++ b/includes/sidebar.php
@@ -162,12 +162,13 @@ $search_box = '<form style="margin-bottom:0;" action="search.php" method="GET"><
 									$description = ""; 
 								}
 								$completed_date = $val['completed_date'];
+								$event_calna 	= $val['calname'];
 								$status 		= $val["status"];
 								$priority 		= $val['priority'];
 								$start_date 	= $val["start_date"];
 								$due_date 		= $val['due_date'];
 								$vtodo_array 	= array(
-									'cal'			=> $calendar_name,
+									'cal'			=> $event_calna,
 									'completed_date'=> $completed_date,
 									'description'	=> $description,
 									'due_date'		=> $due_date,
diff --git a/includes/todo.php b/includes/todo.php
index b721875..f3f0a9f 100644
--- a/includes/todo.php
+++ b/includes/todo.php
@@ -4,29 +4,18 @@ define('BASE', '../');
 include (BASE.'functions/init.inc.php');
 include (BASE.'functions/date_functions.php');
 
-// 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_text = '';
-}
-
-if (isset($vtodo_array['description']) && ($vtodo_array['description'] !== '') ) {
-	$description = $vtodo_array['description'];
-} else {
-	$description = '';
-}
+$vtodo_text		= (isset($vtodo_array['vtodo_text'])) ? $vtodo_array['vtodo_text'] : ('');
+$description	= (isset($vtodo_array['description'])) ? $vtodo_array['description'] : ('');
+$completed_date	= (isset($vtodo_array['completed_date'])) ? localizeDate ($dateFormat_day, strtotime($vtodo_array['completed_date'])) : ('');
+$status			= (isset($vtodo_array['status'])) ? $vtodo_array['status'] : ('');
+$calendar_name  = (isset($vtodo_array['cal'])) ? $vtodo_array['cal'] : ('');
+$start_date 	= (isset($vtodo_array['start_date'])) ? localizeDate ($dateFormat_day, strtotime($vtodo_array['start_date'])) : ('');
+$due_date 		= (isset($vtodo_array['due_date'])) ? localizeDate ($dateFormat_day, strtotime($vtodo_array['due_date'])) : ('');
+$priority 		= (isset($vtodo_array['priority'])) ? $vtodo_array['due_date'] : ('');
 
-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") {
@@ -35,34 +24,12 @@ if ((!isset($status) || $status == "COMPLETED") && isset($completed_date)) {
 	$status = $unfinished_lang;
 }
 
-if (isset($vtodo_array['cal']) && ($vtodo_array['cal'] !== '') ) {
-	$calendar_name = $vtodo_array['cal'];
-} else {
-	$calendar_name = '';
-}
-
-if (isset($vtodo_array['start_date']) && ($vtodo_array['start_date'] !== '') ) {
-	$start_date = localizeDate ($dateFormat_day, strtotime($vtodo_array['start_date']));
-}
-
-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_date = '';
-}
-
-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;
-	}
+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;
 }