|
From: <cl...@us...> - 2003-11-22 09:30:45
|
Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv22055/includes
Modified Files:
event.php sidebar.php todo.php
Log Message:
Added correct calname to todo popup, started cleanup of todo.php code.
Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** event.php 22 Nov 2003 03:45:33 -0000 1.16
--- event.php 22 Nov 2003 09:30:41 -0000 1.17
***************
*** 9,23 ****
}
! $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');
$organizer = unserialize (decode_popup ($organizer));
! $attendee = (isset($HTTP_POST_VARS['attendee'])) ? ($HTTP_POST_VARS['attendee']) : ('unset');
$attendee = unserialize (decode_popup ($attendee));
$cal_title_full = $cal.' '.$calendar_lang;
--- 9,23 ----
}
! $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']) : ('');
$attendee = unserialize (decode_popup ($attendee));
$cal_title_full = $cal.' '.$calendar_lang;
Index: sidebar.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** sidebar.php 20 Nov 2003 05:18:38 -0000 1.27
--- sidebar.php 22 Nov 2003 09:30:41 -0000 1.28
***************
*** 163,166 ****
--- 163,167 ----
}
$completed_date = $val['completed_date'];
+ $event_calna = $val['calname'];
$status = $val["status"];
$priority = $val['priority'];
***************
*** 168,172 ****
$due_date = $val['due_date'];
$vtodo_array = array(
! 'cal' => $calendar_name,
'completed_date'=> $completed_date,
'description' => $description,
--- 169,173 ----
$due_date = $val['due_date'];
$vtodo_array = array(
! 'cal' => $event_calna,
'completed_date'=> $completed_date,
'description' => $description,
Index: todo.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/todo.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** todo.php 14 Sep 2003 18:31:14 -0000 1.9
--- todo.php 22 Nov 2003 09:30:41 -0000 1.10
***************
*** 5,31 ****
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 = '';
! }
!
! 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";
--- 5,20 ----
include (BASE.'functions/date_functions.php');
$vtodo_array = unserialize(base64_decode($HTTP_GET_VARS['vtodo_array']));
// Set the variables from the array
! $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($status) || $status == "COMPLETED") && isset($completed_date)) {
$status = "$completed_date_lang $completed_date";
***************
*** 36,67 ****
}
! 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;
! }
} else {
$priority = $priority_none_lang;
--- 25,34 ----
}
! 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;
|