diff options
author | jwangen <jwangen> | 2002-10-09 19:40:02 +0000 |
---|---|---|
committer | jwangen <jwangen> | 2002-10-09 19:40:02 +0000 |
commit | 6c01da53c2e1714b80c796aced24d82698258fad (patch) | |
tree | ba7d18e2d0f3c5948411645b1169779531a5cfa1 | |
parent | d00b2746b30e9fecdf038bd1cc05ba1545cf1105 (diff) | |
download | phpicalendar-6c01da53c2e1714b80c796aced24d82698258fad.tar.gz phpicalendar-6c01da53c2e1714b80c796aced24d82698258fad.tar.bz2 phpicalendar-6c01da53c2e1714b80c796aced24d82698258fad.zip |
commented out in init where it required $getdate to come from HTTP_GET_VARS
-rw-r--r-- | config.inc.php | 2 | ||||
-rw-r--r-- | day.php | 8 | ||||
-rw-r--r-- | event.php | 6 | ||||
-rw-r--r-- | functions/ical_parser.php | 2 | ||||
-rw-r--r-- | functions/init.inc.php | 3 |
5 files changed, 11 insertions, 10 deletions
diff --git a/config.inc.php b/config.inc.php index 1425cb4..bc538bf 100644 --- a/config.inc.php +++ b/config.inc.php @@ -20,7 +20,7 @@ $tomorrows_events_lines = '1'; // Number of lines to wrap each event title in // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase. $save_parsed_cals = 'no'; // Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence. $use_sessions = 'yes'; // This has not yet been implemented. -$display_custom_goto = 'no'; // In the 'Jump To' box, display the custom 'go to day' box. +$display_custom_goto = 'yes'; // In the 'Jump To' box, display the custom 'go to day' box. $display_ical_list = 'yes'; // In the 'Jump To' box, display the pop-up menu with the list of all calendars in the $calendar_path directory. $allow_webcals = 'no'; // Allow http:// and webcal:// prefixed URLs to be used as the $cal for remote viewing of "subscribe-able" calendars. This does not have to be enabled to allow specific ones below. $this_months_events = 'yes'; // Display "This month's events" at the bottom off the month page. @@ -106,7 +106,7 @@ if (is_array($master_array[($getdate)])) { foreach($master_array[($getdate)]['-1'] as $allday) { $all_day_text = $allday['event_text']; $description = $allday['description']; - $event_text2 = urlencode(addslashes($all_day_text)); + $event_text2 = rawurlencode(addslashes($all_day_text)); echo '<tr>'."\n"; echo '<td valign="top" align="center" class="eventbg"><a class="psf" href="javascript:openEventInfo(\''.$event_text2.'\', \''.$calendar_name.'\', \''.$event_start.'\', \''.$event_end.'\', \''.$description.'\')"><font color="#ffffff"><i>'.$all_day_text.'</i></font></a></td>'."\n"; @@ -186,17 +186,17 @@ if (is_array($master_array[($getdate)])) { $event_length[$i]['state'] = 'started'; $event_text = $master_array[($getdate)][$cal_time][($event_length[$i]['key'])]['event_text']; $event_text2 = addslashes($master_array[($getdate)][$cal_time][($event_length[$i]['key'])]['event_text']); - $event_text2 = urlencode($event_text2); + $event_text2 = rawurlencode($event_text2); $event_start = $master_array[($getdate)][$cal_time][($event_length[$i]['key'])]['event_start']; $event_end = $master_array[($getdate)][$cal_time][($event_length[$i]['key'])]['event_end']; $description = addslashes($master_array[($getdate)][$cal_time][($event_length[$i]['key'])]['description']); - $description = urlencode($description); + $description = rawurlencode($description); $event_start = strtotime ($event_start); $event_start = date ($timeFormat, $event_start); $event_end = strtotime ($event_end); $event_end = date ($timeFormat, $event_end); $calendar_name2 = addslashes($calendar_name); - $calendar_name2 = urlencode($calendar_name2); + $calendar_name2 = rawurlencode($calendar_name2); echo '<td rowspan="' . $event_length[$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2">'."\n"; echo '<table width="100%" border="0" cellspacing="0" cellpadding="2">'."\n"; echo '<tr>'."\n"; @@ -29,15 +29,15 @@ if (isset($HTTP_GET_VARS['end']) && ($HTTP_GET_VARS['end'] !== '') ) { $end = ''; } -$event = urldecode($event); +$event = rawurldecode($event); $event = stripslashes($event); $event = str_replace('\\', '', $event); $event = htmlspecialchars($event); -$description = urldecode($description); +$description = rawurldecode($description); $description = stripslashes($description); $description = str_replace('\\', '', $description); //$description = htmlspecialchars($description); -$calendar_name2 = urldecode($calendar_name); +$calendar_name2 = rawurldecode($calendar_name); $calendar_name2 = stripslashes($calendar_name2); $calendar_name2 = str_replace('\\', '', $calendar_name2); //$calendar_name2 = htmlspecialchars($calendar_name2); diff --git a/functions/ical_parser.php b/functions/ical_parser.php index 2e1dc3f..5635518 100644 --- a/functions/ical_parser.php +++ b/functions/ical_parser.php @@ -29,7 +29,7 @@ while ($fillTime != '2400') { // what date we want to get data for (for day calendar) -if (!$getdate) $getdate = date('Ymd'); +if (!isset($getdate) || $getdate == '') $getdate = date('Ymd'); ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $getdate, $day_array2); $this_day = $day_array2[3]; $this_month = $day_array2[2]; diff --git a/functions/init.inc.php b/functions/init.inc.php index e6f2b53..2bb2bc8 100644 --- a/functions/init.inc.php +++ b/functions/init.inc.php @@ -29,12 +29,13 @@ if (file_exists($lang_file)) { exit(error('The requested language "'.$language.'" is not a supported language. Please use the configuration file to choose a supported language.')); } +/* if (isset($HTTP_GET_VARS['getdate']) && ($HTTP_GET_VARS['getdate'] !== '')) { $getdate = $HTTP_GET_VARS['getdate']; } else { $getdate = date('Ymd'); } - +*/ $is_webcal = FALSE; |