Binary files oldcal/.DS_Store and newcal/.DS_Store differ diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/README newcal/README --- oldcal/README 2005-11-23 23:28:34.000000000 -0500 +++ newcal/README 2006-04-09 21:16:26.000000000 -0400 @@ -81,6 +81,31 @@ Changes: -------- +cvs +2.22 + template.php will look in templates/default if a file is missing from templates/$template + add support for WKST and BYPOS tags + change popup to not require reparsing cal files + differentiate cookie names for different installs on the same host + allow image tags in events + use real calendar names instead of filenames + Year printview + Added sidebar to year view + Modified rss/index.php + -bug fixes from 2.21 + Suppress lots of warnings and notices + all combined selection of webcals + passing of webcals in calendar links + More items controlled by language files + Problem with webcals with encoded spaces in URL + Fixes related to various recurring event combinations + Fix security hole for getting template file from cookies +2.21 + -patched security hole + -bug fixes from 2.2 + Modified rss.php to improve compatibility + + -Modified templates to validate as XHTML 1.0 Transitional 2.2 -Added Apple iCal native repository support. -Added support for finding calendars in subdirectories. Binary files oldcal/calendars/.DS_Store and newcal/calendars/.DS_Store differ diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/calendars/publish.ical.php newcal/calendars/publish.ical.php --- oldcal/calendars/publish.ical.php 2004-08-30 17:20:34.000000000 -0400 +++ newcal/calendars/publish.ical.php 2006-04-02 05:32:50.000000000 -0400 @@ -49,9 +49,12 @@ // include PHP iCalendar configuration variables include('../config.inc.php'); -// set calendar path, or just use current directory -$calendar_path = (isset($calendar_path) && $calendar_path != '') ? $calendar_path : ''; - +// set calendar path, or just use current directory...make sure there's a trailing slash +if(isset($calendar_path) && $calendar_path != ''){ + if (substr($calendar_path, -1, 1) !='/') $calendar_path = $calendar_path.'/'; +}else{ + $calendar_path = ''; +} // allow/disallow publishing $phpicalendar_publishing = isset($phpicalendar_publishing) ? $phpicalendar_publishing : 0; @@ -91,33 +94,25 @@ } // publishing - if($_SERVER['REQUEST_METHOD'] == 'PUT') - { + if($_SERVER['REQUEST_METHOD'] == 'PUT'){ // get calendar data - if($fp = fopen('php://input','r')) - { - while(!@feof($fp)) - { + if($fp = fopen('php://input','r')){ + while(!@feof($fp)){ $data .= fgets($fp,4096); } @fclose($fp); - } - else - { + }else{ logmsg('unable to read input data'); } - if(isset($data)) - { + if(isset($data)){ // get calendar name $cal_arr = explode("\n",$data); - foreach($cal_arr as $k => $v) - { - if(strstr($v,'X-WR-CALNAME:')) - { + foreach($cal_arr as $k => $v){ + if(strstr($v,'X-WR-CALNAME:')){ $arr = explode(':',$v); $calendar_name = trim($arr[1]); break; @@ -127,13 +122,10 @@ $calendar_name = isset($calendar_name) ? $calendar_name : 'default'; // write to file - if($fp = fopen($calendar_path.$calendar_name.'.ics','w+')) - { + if($fp = fopen($calendar_path.$calendar_name.'.ics','w+')){ fputs($fp, $data, strlen($data) ); @fclose($fp); - } - else - { + }else{ logmsg( 'couldnt open file '.$calendar_path.$calendar_name.'.ics' ); } } diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/calendars/publish.mozilla.php newcal/calendars/publish.mozilla.php --- oldcal/calendars/publish.mozilla.php 2004-08-19 18:12:10.000000000 -0400 +++ newcal/calendars/publish.mozilla.php 2006-04-02 05:33:07.000000000 -0400 @@ -60,9 +60,12 @@ // include PHP iCalendar configuration variables include('../config.inc.php'); -// set calendar path, or just use current directory -$calendar_path = (isset($calendar_path) && $calendar_path != '') ? $calendar_path : ''; - +// set calendar path, or just use current directory...make sure there's a trailing slash +if(isset($calendar_path) && $calendar_path != ''){ + if (substr($calendar_path, -1, 1) !='/') $calendar_path = $calendar_path.'/'; +}else{ + $calendar_path = ''; +} // allow/disallow publishing $phpicalendar_publishing = isset($phpicalendar_publishing) ? $phpicalendar_publishing : 0; diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/day.php newcal/day.php --- oldcal/day.php 2005-11-29 21:20:32.000000000 -0500 +++ newcal/day.php 2006-04-09 21:26:02.000000000 -0400 @@ -48,11 +48,12 @@ 'header' => BASE.'templates/'.$template.'/header.tpl', 'event_js' => BASE.'functions/event.js', 'footer' => BASE.'templates/'.$template.'/footer.tpl', - 'sidebar' => BASE.'templates/'.$template.'/sidebar.tpl', - 'search_box' => BASE.'templates/'.$template.'/search_box.tpl' + 'sidebar' => BASE.'templates/'.$template.'/sidebar.tpl', + 'search_box' => BASE.'templates/'.$template.'/search_box.tpl' )); $page->replace_tags(array( + 'version' => $phpicalendar_version, 'charset' => $charset, 'default_path' => '', 'template' => $template, @@ -96,6 +97,7 @@ 'l_week' => $lang['l_week'], 'l_month' => $lang['l_month'], 'l_year' => $lang['l_year'], + 'l_pick_multiple' => $lang['l_pick_multiple'], 'l_powered_by' => $lang['l_powered_by'], 'l_subscribe' => $lang['l_subscribe'], 'l_download' => $lang['l_download'], diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/error.php newcal/error.php --- oldcal/error.php 2004-10-25 13:16:08.000000000 -0400 +++ newcal/error.php 2006-04-09 21:20:31.000000000 -0400 @@ -35,7 +35,8 @@ )); $page->replace_tags(array( - 'default_path' => $error_base, + 'version' => $phpicalendar_version, + 'default_path' => $default_path.'/', 'template' => $template, 'cal' => $cal, 'getdate' => $getdate, diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/functions/calendar_functions.php newcal/functions/calendar_functions.php --- oldcal/functions/calendar_functions.php 2005-12-14 22:26:31.000000000 -0500 +++ newcal/functions/calendar_functions.php 2006-04-09 20:49:05.000000000 -0400 @@ -196,7 +196,7 @@ } // At this point, just pull the name off the file. - return basename($cal_path, ".ics"); + return str_replace(".ics", '', basename($cal_path)); } // This function prints out the calendars available to the user, for @@ -205,8 +205,7 @@ // // $cals = The calendars (entire path, e.g. from availableCalendars). function display_ical_list($cals, $pick=FALSE) { - global $cal, $ALL_CALENDARS_COMBINED, $current_view, $getdate, $calendar_lang, $all_cal_comb_lang; - + global $cal, $ALL_CALENDARS_COMBINED, $current_view, $getdate, $calendar_lang, $all_cal_comb_lang, $cal_filelist, $cal_displaynames; // Print each calendar option. foreach ($cals as $cal_tmp) { // Format the calendar path for display. @@ -215,6 +214,34 @@ // and remove the .ics suffix. $cal_displayname_tmp = getCalendarName($cal_tmp); $cal_displayname_tmp = str_replace("32", " ", $cal_displayname_tmp); + #overwrite the display name if we already have a real name + if (is_numeric(array_search($cal_tmp, $cal_filelist))){ + $cal_displayname_tmp = $cal_displaynames[array_search($cal_tmp,$cal_filelist)]; + }else{ + # pull the name from the $cal_tmp file + $ifile = @fopen($cal_tmp, "r"); + if ($ifile == FALSE) exit(error($lang['l_error_cantopen'], $cal_tmp)); + while (!feof($ifile)) { + $line = fgets($ifile, 1024); + $line = trim($line); + if (ereg ("([^:]+):(.*)", $line, $regs)){ + $field = $regs[1]; + $data = $regs[2]; + $property = $field; + $prop_pos = strpos($property,';'); + if ($prop_pos !== false) $property = substr($property,0,$prop_pos); + $property = strtoupper($property); + if ($property == "X-WR-CALNAME"){ + $cal_displayname_tmp = $data; + break; + } + } + #stop reading if we find an event or timezone before there's a name + if ($line == "BEGIN:VTIMEZONE" ||$line == "BEGIN:VEVENT") break; + } + echo ""; + + } // If this is a webcal, add 'Webcal' to the display name. if (preg_match("/^(https?|webcal):\/\//i", $cal_tmp)) { @@ -241,7 +268,7 @@ // if it is a webcal. So that is how we perform the comparison when // trying to figure out if this is the selected calendar. if($pick) { - if (in_array($cal_encoded_tmp, explode(",", $cal))) { + if (in_array($cal_encoded_tmp, explode(",", $cal)) || count($cals) == count(explode(",", $cal))) { $return .= "\n"; } else { $return .= "\n"; diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/functions/date_functions.php newcal/functions/date_functions.php --- oldcal/functions/date_functions.php 2005-12-02 12:18:31.000000000 -0500 +++ newcal/functions/date_functions.php 2006-04-02 05:27:13.000000000 -0400 @@ -49,16 +49,11 @@ // that differ between them. requires dateOfWeek() function weekCompare($now, $then) { global $week_start_day; - $sun_now = dateOfWeek($now, $week_start_day); - $sun_then = dateOfWeek($then, $week_start_day); + $sun_now = dateOfWeek($now, "Sunday"); + $sun_then = dateOfWeek($then, "Sunday"); $seconds_now = strtotime($sun_now); $seconds_then = strtotime($sun_then); - $diff_seconds = $seconds_now - $seconds_then; - $diff_minutes = $diff_seconds/60; - $diff_hours = $diff_minutes/60; - $diff_days = round($diff_hours/24); - $diff_weeks = $diff_days/7; - + $diff_weeks = round(($seconds_now - $seconds_then)/(60*60*24*7)); return $diff_weeks; } @@ -163,7 +158,7 @@ } function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') { - global $cpath; + global $cpath, $master_array; $event_text = stripslashes(urldecode($arr["event_text"])); if (empty($start)) { $title = $event_text; @@ -176,7 +171,7 @@ $event_text = $matches[2]; } else { $full_event_text = $event_text; - $event_text = strip_tags($event_text, ''); + $event_text = strip_tags($event_text, ''); } if (!empty($event_text)) { @@ -188,11 +183,12 @@ $escaped_date = addslashes($event_date); $escaped_time = addslashes($time); $escaped_uid = addslashes($uid); + $event_data = addslashes(serialize ($master_array[$event_date][$time][$uid])); // fix for URL-length bug in IE: populate and submit a hidden form on click static $popup_data_index = 0; $return = " "; @@ -219,9 +215,7 @@ // Initialize values. unset($unixtime, $date, $time, $allday); - // What the heck is this doing in here? - #$data = str_replace ('/softwarestudio.org/Olson_20011030_5/', '', $data); - + $allday =''; #suppress error on returning undef. // Check for zulu time. $zulu_time = false; if (substr($data,-1) == 'Z') $zulu_time = true; diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/functions/event.js newcal/functions/event.js --- oldcal/functions/event.js 2005-09-07 02:08:02.000000000 -0400 +++ newcal/functions/event.js 2006-04-02 06:27:52.000000000 -0400 @@ -8,6 +8,7 @@ form.elements.time.value = data.time; form.elements.uid.value = data.uid; form.elements.cpath.value = data.cpath; + form.elements.event_data.value = data.event_data; // open a new window var w = window.open('', 'Popup', 'scrollbars=yes,width=460,height=275'); @@ -15,11 +16,12 @@ form.submit(); } -function EventData(date, time, uid, cpath) { +function EventData(date, time, uid, cpath, event_data) { this.date = date; this.time = time; this.uid = uid; this.cpath = cpath; + this.event_data = event_data; } function openTodoInfo(vtodo_array) { diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/functions/ical_parser.php newcal/functions/ical_parser.php --- oldcal/functions/ical_parser.php 2005-12-02 12:18:31.000000000 -0500 +++ newcal/functions/ical_parser.php 2006-04-10 00:20:20.000000000 -0400 @@ -58,6 +58,10 @@ } $z++; } + foreach ($master_array['-3'] as $temp_array) { + if (isset($temp_array) && $temp_array !='') $caldisplaynames[] = $temp_array; + } + if ($y == sizeof($cal_filelist)) { if ($master_array['-1'] == 'valid cal file') { $parse_file = false; @@ -96,7 +100,7 @@ } $calnumber = 1; -foreach ($cal_filelist as $filename) { +foreach ($cal_filelist as $cal_key=>$filename) { // Find the real name of the calendar. $actual_calname = getCalendarName($filename); @@ -104,9 +108,9 @@ if ($parse_file) { // Let's see if we're doing a webcal - $is_webcal == FALSE; + $is_webcal = FALSE; if (substr($filename, 0, 7) == 'http://' || substr($filename, 0, 8) == 'https://' || substr($filename, 0, 9) == 'webcal://') { - $is_webcal == TRUE; + $is_webcal = TRUE; $cal_webcalPrefix = str_replace('http://','webcal://',$filename); $cal_httpPrefix = str_replace('webcal://','http://',$filename); $cal_httpsPrefix = str_replace('webcal://','https://',$filename); @@ -299,7 +303,17 @@ if (($start < $mArray_end) && ($start < $end)) { while (($start != $end) && ($start < $mArray_end)) { $start_date2 = date('Ymd', $start); - $master_array[($start_date2)][('-1')][$uid]= array ('event_text' => $summary, 'description' => $description, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url, 'status' => $status, 'class' => $class ); + $master_array[($start_date2)][('-1')][$uid]= array ( + 'event_text' => $summary, + 'description' => $description, + 'location' => $location, + 'organizer' => serialize($organizer), + 'attendee' => serialize($attendee), + 'calnumber' => $calnumber, + 'calname' => $actual_calname, + 'url' => $url, + 'status' => $status, + 'class' => $class ); $start = strtotime('+1 day', $start); } if (!$write_processed) $master_array[($start_date)]['-1'][$uid]['exception'] = true; @@ -327,7 +341,27 @@ $display_end_tmp = $end_time; } - $master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => 0, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url ); + $master_array[$start_date_tmp][$time_tmp][$uid] = array ( + 'event_start' => $start_time_tmp, + 'event_end' => $end_time_tmp, + 'start_unixtime' => $start_unixtime, + 'end_unixtime' => $end_unixtime, + 'event_text' => $summary, + 'event_length' => $length, + 'event_overlap' => 0, + 'description' => $description, + 'status' => $status, + 'class' => $class, + 'spans_day' => true, + 'location' => $location, + 'organizer' => serialize($organizer), + 'attendee' => serialize($attendee), + 'calnumber' => $calnumber, + 'calname' => $actual_calname, + 'url' => $url ); + if (isset($display_end_tmp)){ + $master_array[$start_date_tmp][$time_tmp][$uid]['display_end'] = $display_end_tmp; + } checkOverlap($start_date_tmp, $time_tmp, $uid); $start_tmp = strtotime('+1 day',$start_tmp); } @@ -342,7 +376,27 @@ // This if statement should prevent writing of an excluded date if its the first recurrance - CL if (!in_array($start_date, $except_dates)) { - $master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => 0, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url ); + $master_array[($start_date)][($hour.$minute)][$uid] = array ( + 'event_start' => $start_time, + 'event_end' => $end_time_tmp1, + 'start_unixtime' => $start_unixtime, + 'end_unixtime' => $end_unixtime, + 'event_text' => $summary, + 'event_length' => $length, + 'event_overlap' => 0, + 'description' => $description, + 'status' => $status, + 'class' => $class, + 'spans_day' => false, + 'location' => $location, + 'organizer' => serialize($organizer), + 'attendee' => serialize($attendee), + 'calnumber' => $calnumber, + 'calname' => $actual_calname, + 'url' => $url ); + if (isset($display_end_tmp)){ + $master_array[($start_date)][($hour.$minute)][$uid]['display_end'] = $display_end_tmp; + } checkOverlap($start_date, ($hour.$minute), $uid); if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true; } @@ -373,7 +427,7 @@ $start_date_time = strtotime($start_date); $this_month_start_time = strtotime($this_year.$this_month.'01'); - if ($current_view == 'year' || ($save_parsed_cals == 'yes' && !$is_webcal)) { + if ($current_view == 'year' || ($save_parsed_cals == 'yes' && !$is_webcal)|| $current_view == 'print' && $printview == 'year') { $start_range_time = strtotime($this_year.'-01-01 -2 weeks'); $end_range_time = strtotime($this_year.'-12-31 +2 weeks'); } else { @@ -409,8 +463,10 @@ $master_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = localizeDate($dateFormat_week,$until); break; case 'INTERVAL': + if ($val > 0){ $number = $val; $master_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = $number; + } break; case 'BYSECOND': $bysecond = $val; @@ -487,7 +543,9 @@ if ($end_range_time_tmp >= $start_date_time && $start_range_time_tmp <= $end_date_time) { // if the beginning of our range is less than the start of the item, we may as well set it equal to it - if ($start_range_time_tmp < $start_date_time) $start_range_time_tmp = $start_date_time; + if ($start_range_time_tmp < $start_date_time){ + $start_range_time_tmp = $start_date_time; + } if ($end_range_time_tmp > $end_date_time) $end_range_time_tmp = $end_date_time; // initialize the time we will increment @@ -498,6 +556,9 @@ $count_to = 0; // start at the $start_range and go until we hit the end of our range. + if(!isset($wkst)) $wkst='SU'; + $wkst3char = two2threeCharDays($wkst); + while (($next_range_time >= $start_range_time_tmp) && ($next_range_time <= $end_range_time_tmp) && ($count_to != $count)) { $func = $freq_type.'Compare'; $diff = $func(date('Ymd',$next_range_time), $start_date); @@ -512,17 +573,30 @@ case 'WEEKLY': // Populate $byday with the default day if it's not set. if (!isset($byday)) { - $byday[] = strtoupper(substr($daysofweekshort_lang[date('w', $start_date_time)], 0, 2)); + $byday[] = strtoupper(substr(date('D', $start_date_time), 0, 2)); } if (is_array($byday)) { foreach($byday as $day) { $day = two2threeCharDays($day); - $next_date_time = strtotime($day,$next_range_time) + (12 * 60 * 60); + #need to find the first day of the appropriate week. + #dateOfweek uses weekstartday as a global variable. This has to be changed to $wkst, + #but then needs to be reset for other functions + $week_start_day_tmp = $week_start_day; + $week_start_day = $wkst3char; + + $the_sunday = dateOfWeek(date("Ymd",$next_range_time), $wkst3char); + $next_date_time = strtotime($day,strtotime($the_sunday)) + (12 * 60 * 60); + $week_start_day = $week_start_day_tmp; #see above reset to global value + + #reset $next_range_time to first instance in this week. + if ($next_date_time < $next_range_time){ + $next_range_time = $next_date_time; + } // Since this renders events from $next_range_time to $next_range_time + 1 week, I need to handle intervals // as well. This checks to see if $next_date_time is after $day_start (i.e., "next week"), and thus // if we need to add $interval weeks to $next_date_time. if ($next_date_time > strtotime($week_start_day, $next_range_time) && $interval > 1) { - $next_date_time = strtotime('+'.($interval - 1).' '.$freq_type, $next_date_time); + # $next_date_time = strtotime('+'.($interval - 1).' '.$freq_type, $next_date_time); } $recur_data[] = $next_date_time; } @@ -532,7 +606,35 @@ if (empty($bymonth)) $bymonth = array(1,2,3,4,5,6,7,8,9,10,11,12); $next_range_time = strtotime(date('Y-m-01', $next_range_time)); $next_date_time = $next_date_time; - if ((isset($bymonthday)) && (!isset($byday))) { + if (isset($bysetpos)){ + /* bysetpos code from dustinbutler + start on day 1 or last day. + if day matches any BYDAY the count is incremented. + SETPOS = 4, need 4th match + SETPOS = -1, need 1st match + */ + $year = date('Y', $next_range_time); + $month = date('m', $next_range_time); + if ($bysetpos > 0) { + $next_day = '+1 day'; + $day = 1; + } else { + $next_day = '-1 day'; + $day = $totalDays[$month]; + } + $day = mktime(0, 0, 0, $month, $day, $year); + $countMatch = 0; + while ($countMatch != abs($bysetpos)) { + /* Does this day match a BYDAY value? */ + $thisDay = $day; + $textDay = strtoupper(substr(date('D', $thisDay), 0, 2)); + if (in_array($textDay, $byday)) { + $countMatch++; + } + $day = strtotime($next_day, $thisDay); + } + $recur_data[] = $thisDay; + }elseif ((isset($bymonthday)) && (!isset($byday))) { foreach($bymonthday as $day) { if ($day < 0) $day = ((date('t', $next_range_time)) + ($day)) + 1; $year = date('Y', $next_range_time); @@ -602,7 +704,33 @@ } else { $year = date('Y', $next_range_time); } - + if (isset($bysetpos)){ + /* bysetpos code from dustinbutler + start on day 1 or last day. + if day matches any BYDAY the count is incremented. + SETPOS = 4, need 4th match + SETPOS = -1, need 1st match + */ + if ($bysetpos > 0) { + $next_day = '+1 day'; + $day = 1; + } else { + $next_day = '-1 day'; + $day = date("t",$month); + } + $day = mktime(12, 0, 0, $month, $day, $year); + $countMatch = 0; + while ($countMatch != abs($bysetpos)) { + /* Does this day match a BYDAY value? */ + $thisDay = $day; + $textDay = strtoupper(substr(date('D', $thisDay), 0, 2)); + if (in_array($textDay, $byday)) { + $countMatch++; + } + $day = strtotime($next_day, $thisDay); + } + $recur_data[] = $thisDay; + } if ((isset($byday)) && (is_array($byday))) { $checkdate_time = mktime(0,0,0,$month,1,$year); foreach($byday as $day) { @@ -704,7 +832,28 @@ // Let's double check the until to not write past it $until_check = $start_date_tmp.$time_tmp.'00'; if ($abs_until > $until_check) { - $master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => 0, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url, 'recur' => $recur); + $master_array[$start_date_tmp][$time_tmp][$uid] = array ( + 'event_start' => $start_time_tmp, + 'event_end' => $end_time_tmp, + 'start_unixtime' => $start_unixtime_tmp, + 'end_unixtime' => $end_unixtime_tmp, + 'event_text' => $summary, + 'event_length' => $length, + 'event_overlap' => 0, + 'description' => $description, + 'status' => $status, + 'class' => $class, + 'spans_day' => true, + 'location' => $location, + 'organizer' => serialize($organizer), + 'attendee' => serialize($attendee), + 'calnumber' => $calnumber, + 'calname' => $actual_calname, + 'url' => $url, + 'recur' => $recur); + if (isset($display_end_tmp)){ + $master_array[$start_date_tmp][$time_tmp][$uid]['display_end'] = $display_end_tmp; + } checkOverlap($start_date_tmp, $time_tmp, $uid); } $start_tmp = strtotime('+1 day',$start_tmp); @@ -720,7 +869,28 @@ // Let's double check the until to not write past it $until_check = $recur_data_date.$hour.$minute.'00'; if ($abs_until > $until_check) { - $master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => 0, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url, 'recur' => $recur); + $master_array[($recur_data_date)][($hour.$minute)][$uid] = array ( + 'event_start' => $start_time, + 'event_end' => $end_time_tmp1, + 'start_unixtime' => $start_unixtime_tmp, + 'end_unixtime' => $end_unixtime_tmp, + 'event_text' => $summary, + 'event_length' => $length, + 'event_overlap' => 0, + 'description' => $description, + 'status' => $status, + 'class' => $class, + 'spans_day' => false, + 'location' => $location, + 'organizer' => serialize($organizer), + 'attendee' => serialize($attendee), + 'calnumber' => $calnumber, + 'calname' => $actual_calname, + 'url' => $url, + 'recur' => $recur); + if (isset($display_end_tmp)){ + $master_array[($recur_data_date)][($hour.$minute)][$uid]['display_end'] = $display_end_tmp; + } checkOverlap($recur_data_date, ($hour.$minute), $uid); } } @@ -736,19 +906,18 @@ } // This should remove any exdates that were missed. - // Added for version 0.9.5 + // Added for version 0.9.5 modified in 2.22 remove anything that doesn't have an event_start if (is_array($except_dates)) { foreach ($except_dates as $key => $value) { - $time = $except_times[$key]; + if (isset ($master_array[$value])){ + foreach ($master_array[$value] as $time => $value2){ + if (!isset($value2[$uid]['event_start'])){ unset($master_array[$value][$time][$uid]); - if (count($master_array[$value][$time]) < 1) { - unset($master_array[$value][$time]); - if (count($master_array[$value]) < 1) { - unset($master_array[$value]); } } } } + } // Clear event data now that it's been saved. unset($start_time, $start_time_tmp, $end_time, $end_time_tmp, $start_unixtime, $start_unixtime_tmp, $end_unixtime, $end_unixtime_tmp, $summary, $length, $description, $status, $class, $location, $organizer, $attendee); @@ -793,7 +962,7 @@ default: unset ($field, $data, $prop_pos, $property); - ereg ("([^:]+):(.*)", $line, $line); + if (ereg ("([^:]+):(.*)", $line, $line)){ $field = $line[1]; $data = $line[2]; @@ -946,6 +1115,7 @@ case 'X-WR-CALNAME': $actual_calname = $data; $master_array['calendar_name'] = $actual_calname; + $cal_displaynames[$cal_key] = $actual_calname; #correct the default calname based on filename break; case 'X-WR-TIMEZONE': $calendar_tz = $data; @@ -995,6 +1165,7 @@ } } } + } if (!isset($master_array['-3'][$calnumber])) $master_array['-3'][$calnumber] = $actual_calname; if (!isset($master_array['-4'][$calnumber]['mtime'])) $master_array['-4'][$calnumber]['mtime'] = $actual_mtime; if (!isset($master_array['-4'][$calnumber]['filename'])) $master_array['-4'][$calnumber]['filename'] = $filename; @@ -1028,6 +1199,14 @@ } } + +// Set a calender name for all calenders combined +if ($cal == $ALL_CALENDARS_COMBINED) { + $calendar_name = $all_cal_comb_lang; +} +$cal_displayname = urldecode(implode(', ', $cal_displaynames)); #reset this with the correct names +$template_started = getmicrotime(); + //If you want to see the values in the arrays, uncomment below. //print '
';
@@ -1036,13 +1215,7 @@
 //print_r($day_array);
 //print_r($rrule_array);
 //print_r($recurrence_delete);
+//print_r($cal_displaynames);
+//print_r($cal_filelist);
 //print '
'; - -// Set a calender name for all calenders combined -if ($cal == $ALL_CALENDARS_COMBINED) { - $calendar_name = $all_cal_comb_lang; -} - -$template_started = getmicrotime(); - ?> diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/functions/init.inc.php newcal/functions/init.inc.php --- oldcal/functions/init.inc.php 2005-12-07 20:06:09.000000000 -0500 +++ newcal/functions/init.inc.php 2006-04-09 21:24:52.000000000 -0400 @@ -1,13 +1,13 @@ "; +#echo "cals"; +#print_r($cals);echo"\n\n"; +#echo "cal_filenames"; +#print_r($cal_filenames);echo"\n\n"; +#echo "web_cals"; +#print_r($web_cals);echo"\n\n"; +#echo "local_cals"; +#print_r($local_cals);echo"\n\n"; +#echo "cal_filelist"; +#print_r($cal_filelist); +#echo "cal_displaynames"; +#print_r($cal_displaynames); +#echo "
"; ?> diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/functions/overlapping_events.php newcal/functions/overlapping_events.php --- oldcal/functions/overlapping_events.php 2005-05-16 14:05:29.000000000 -0400 +++ newcal/functions/overlapping_events.php 2006-03-15 19:26:59.000000000 -0500 @@ -110,7 +110,7 @@ // Builds $overlap_array structure, and updates event_overlap in $master_array for the given events. function checkOverlap($event_date, $event_time, $uid) { global $master_array, $overlap_array; - + if (!isset($event_date)) return; $event = $master_array[$event_date][$event_time][$uid]; // Copy out the array - we replace this at the end. $ol_day_array = $overlap_array[$event_date]; diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/functions/template.php newcal/functions/template.php --- oldcal/functions/template.php 2005-12-01 01:25:09.000000000 -0500 +++ newcal/functions/template.php 2006-04-09 21:00:53.000000000 -0400 @@ -61,10 +61,11 @@ $loop_event = trim($match1[1]); $loop_day = trim($match3[1]); $parse_month = date ("Ym", strtotime($getdate)); + $parse_year = date ("Y", strtotime($getdate)); foreach($master_array as $key => $val) { preg_match ('/([0-9]{6})([0-9]{2})/', $key, $regs); - if ((($regs[1] == $parse_month) && ($printview == 'month')) || (($key == $getdate) && ($printview == 'day')) || ((($key >= $week_start) && ($key <= $week_end)) && ($printview == 'week'))) { + if ((($regs[1] == $parse_month) && ($printview == 'month')) || (($key == $getdate) && ($printview == 'day')) || ((($key >= $week_start) && ($key <= $week_end)) && ($printview == 'week')) || ((substr($regs[1],0,4) == $parse_year) && ($printview == 'year'))) { $events_week++; $dayofmonth = strtotime ($key); $dayofmonth = localizeDate ($dateFormat_day, $dayofmonth); @@ -864,12 +865,12 @@ $first_of_year = $minical_year."0101"; // Add links in to the month/year views. - $dateFormat_month = str_replace("%B", "%B", $dateFormat_month); - $dateFormat_month = str_replace("%Y", "%Y", $dateFormat_month); + $dateFormat_month_local = str_replace("%B", "%B", $dateFormat_month); + $dateFormat_month_local = str_replace("%Y", "%Y", $dateFormat_month_local); //$start_day = strtotime($week_start_day); $start_day = strtotime(dateOfWeek($getdate, $week_start_day)); - $month_title = localizeDate ($dateFormat_month, $fake_getdate_time); + $month_title = localizeDate ($dateFormat_month_local, $fake_getdate_time); $month_date = date ('Ymd', $fake_getdate_time); if ($type == 'small') { @@ -907,7 +908,7 @@ } else { $temp = $t_month[2]; } - if ($master_array[$daylink]) { + if (isset($master_array[$daylink])) { if ($type != 'small') { foreach ($master_array[$daylink] as $cal_time => $event_times) { foreach ($event_times as $uid => $val) { @@ -1026,19 +1027,32 @@ } - function Page($template = 'std.tpl') { - if (file_exists($template)) - $this->page = join('', file($template)); - else - die("Template file $template not found."); - } + function Page($file = 'std.tpl') { + global $template; + if (!file_exists($file)){ + #look for it in default if not found + $file = str_replace("templates/$template","templates/default",$file); + if (!file_exists($file)) die("Template file $file not found."); + } + $this->page = join('', file($file)); + } function parse($file) { - ob_start(); - include($file); - $buffer = ob_get_contents(); - ob_end_clean(); - return $buffer; + global $template; $lang; + if (basename(dirname($file)) == "$template" || $file =='./functions/event.js'){ + if (!is_file($file)){ + #look for it in default if not found + $file = str_replace("templates/$template","templates/default",$file); + } + if (!is_file($file)){ + exit(error($lang['l_error_path'], $file)); + } + ob_start(); + include($file); + $buffer = ob_get_contents(); + ob_end_clean(); + return $buffer; + } } function replace_tags($tags = array()) { @@ -1063,7 +1077,7 @@ foreach ($tags as $tag => $data) { // This opens up another template and parses it as well. - $data = (file_exists($data)) ? $this->parse($data) : $data; + $data = $this->parse($data); // This removes any unfilled tags if (!$data) { diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/includes/event.php newcal/includes/event.php --- oldcal/includes/event.php 2005-12-07 02:26:14.000000000 -0500 +++ newcal/includes/event.php 2006-04-04 02:18:26.000000000 -0400 @@ -2,7 +2,7 @@ define('BASE', '../'); $getdate = $_POST['date']; include_once(BASE.'functions/init.inc.php'); -include_once(BASE.'functions/ical_parser.php'); +#include_once(BASE.'functions/ical_parser.php'); require_once(BASE.'functions/template.php'); function decode_popup ($item) { @@ -13,7 +13,8 @@ -$event = $master_array[$_POST['date']][$_POST['time']][decode_popup($_POST['uid'])]; +#$event = $master_array[$_POST['date']][$_POST['time']][decode_popup($_POST['uid'])]; +$event = unserialize(stripslashes($_POST['event_data'])); $organizer = unserialize($event['organizer']); $attendee = unserialize($event['attendee']); @@ -63,6 +64,18 @@ if (sizeof($attendee) == 0) $attendee = ''; if (sizeof($organizer) == 0) $organizer = ''; +switch ($event['status']){ + case 'CONFIRMED': + $event['status'] = $lang['l_status_confirmed'] ; + break; + case 'CANCELLED': + $event['status'] = $lang['l_status_cancelled'] ; + break; + case 'TENTATIVE': + $event['status'] = $lang['l_status_tentative'] ; + break; +} + $page = new Page(BASE.'templates/'.$template.'/event.tpl'); $page->replace_tags(array( diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/afrikaans.inc.php newcal/languages/afrikaans.inc.php --- oldcal/languages/afrikaans.inc.php 2005-05-05 22:08:26.000000000 -0400 +++ newcal/languages/afrikaans.inc.php 2006-03-20 03:46:16.000000000 -0500 @@ -47,6 +47,7 @@ $lang['l_goyear'] = 'Gaan na Hierdie Jaar'; $lang['l_search'] = 'Soek'; // the verb $lang['l_results'] = 'Soektog Resultate'; +$lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Soek vir'; // will be followed by the search query $lang['l_no_results'] = 'Geen aktiwiteite gevind nie'; $lang['l_goprint'] = 'Drukker Vriendelik'; @@ -84,6 +85,9 @@ $lang['l_priority_medium'] = 'Gemiddeld'; $lang['l_priority_none'] = 'Geen'; $lang['l_status'] = 'Status'; +$lang['l_status_confirmed'] = 'CONFIRMED' ; +$lang['l_status_cancelled'] = 'CANCELLED'; +$lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'Hangende items'; $lang['l_unfinished'] = 'Onvoltooid'; $lang['l_prefs_set'] = 'U voorkeure is bygewerk.'; @@ -176,6 +180,7 @@ $dateFormat_week_jump = '%e %b'; $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %e %B'; +$dateFormat_year = '%Y'; /* Notes about dateFormat_* diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/brazilian.inc.php newcal/languages/brazilian.inc.php --- oldcal/languages/brazilian.inc.php 2005-05-05 22:08:26.000000000 -0400 +++ newcal/languages/brazilian.inc.php 2006-03-20 03:46:34.000000000 -0500 @@ -43,6 +43,7 @@ $lang['l_goyear'] = 'Ir para este ano'; $lang['l_search'] = 'Buscar'; // the verb $lang['l_results'] = 'Buscar Resultados'; +$lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Questão: '; // will be followed by the search query $lang['l_no_results'] = 'Eventos não encontrados'; $lang['l_goprint'] = 'Versão para imprimir'; @@ -80,6 +81,9 @@ $lang['l_priority_medium'] = 'Medium'; $lang['l_priority_none'] = 'None'; $lang['l_status'] = 'Status'; +$lang['l_status_confirmed'] = 'CONFIRMED' ; +$lang['l_status_cancelled'] = 'CANCELLED'; +$lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'To do items'; $lang['l_unfinished'] = 'Unfinished'; $lang['l_prefs_set'] = 'Your preferences have been set.'; @@ -171,6 +175,7 @@ $dateFormat_week_jump = '%e %b'; $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %e %B'; +$dateFormat_year = '%Y'; /* Notes about dateFormat_* diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/catalan.inc.php newcal/languages/catalan.inc.php --- oldcal/languages/catalan.inc.php 2005-05-05 22:08:26.000000000 -0400 +++ newcal/languages/catalan.inc.php 2006-03-20 03:46:54.000000000 -0500 @@ -43,6 +43,7 @@ $lang['l_goyear'] = 'Anar a aquest Any'; $lang['l_search'] = 'Buscar'; // the verb $lang['l_results'] = 'Resultats de la cerca'; +$lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Consulta: '; // will be followed by the search query $lang['l_no_results'] = 'No s\'ha trobat cap event'; $lang['l_goprint'] = 'Format d\'impressió'; @@ -80,6 +81,9 @@ $lang['l_priority_medium'] = 'Mitjana'; $lang['l_priority_none'] = 'Cap'; $lang['l_status'] = 'Estat'; +$lang['l_status_confirmed'] = 'CONFIRMED' ; +$lang['l_status_cancelled'] = 'CANCELLED'; +$lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'Pendent'; $lang['l_unfinished'] = 'Sense acabar'; $lang['l_prefs_set'] = 'Les teves preferències s\'han guardat.'; @@ -171,6 +175,7 @@ $dateFormat_week_jump = '%e de %b'; $dateFormat_month = '%B de %Y'; $dateFormat_month_list = '%A, %e de %B'; +$dateFormat_year = '%Y'; /* Notes about dateFormat_* diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/czech.inc.php newcal/languages/czech.inc.php --- oldcal/languages/czech.inc.php 2005-05-05 22:08:26.000000000 -0400 +++ newcal/languages/czech.inc.php 2006-04-09 21:05:02.000000000 -0400 @@ -1,159 +1,171 @@ - diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/danish.inc.php newcal/languages/danish.inc.php --- oldcal/languages/danish.inc.php 2005-05-05 22:08:26.000000000 -0400 +++ newcal/languages/danish.inc.php 2006-03-20 03:47:28.000000000 -0500 @@ -165,6 +165,7 @@ $dateFormat_week_jump = '%e %b'; $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %e %B'; +$dateFormat_year = '%Y'; /* Notes about dateFormat_* diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/dutch.inc.php newcal/languages/dutch.inc.php --- oldcal/languages/dutch.inc.php 2005-05-05 22:08:26.000000000 -0400 +++ newcal/languages/dutch.inc.php 2006-03-15 21:04:45.000000000 -0500 @@ -43,6 +43,7 @@ $lang['l_goyear'] = 'Ga naar Dit Jaar'; $lang['l_search'] = 'Zoeken'; // the verb $lang['l_results'] = 'Zoekresultaten'; +$lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Zoekopdracht'; // will be followed by the search query $lang['l_no_results'] = 'Geen activiteiten gevonden'; $lang['l_goprint'] = 'Makkelijk printbaar'; @@ -80,6 +81,9 @@ $lang['l_priority_medium'] = 'Gemiddeld'; $lang['l_priority_none'] = 'Geen'; $lang['l_status'] = 'Status'; +$lang['l_status_confirmed'] = 'CONFIRMED' ; +$lang['l_status_cancelled'] = 'CANCELLED'; +$lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'Af te werken items'; $lang['l_unfinished'] = 'Niet afgewerkt'; $lang['l_prefs_set'] = 'Uw voorkeuren zijn bewaard.'; diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/english.inc.php newcal/languages/english.inc.php --- oldcal/languages/english.inc.php 2005-05-05 22:08:26.000000000 -0400 +++ newcal/languages/english.inc.php 2006-03-20 01:53:24.000000000 -0500 @@ -5,7 +5,7 @@ // // Translation by Chad Little (chad@chadsdomain.com) // -// Submit new translations to chad@chadsdomain.com +// Submit new translations to phpicalendar@gmail.com $lang['l_day'] = 'Day'; $lang['l_week'] = 'Week'; @@ -43,6 +43,7 @@ $lang['l_goyear'] = 'Go to This Year'; $lang['l_search'] = 'Search'; // the verb $lang['l_results'] = 'Search Results'; +$lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Query'; // will be followed by the search query $lang['l_no_results'] = 'No events found'; $lang['l_goprint'] = 'Printer Friendly'; @@ -80,6 +81,9 @@ $lang['l_priority_medium'] = 'Medium'; $lang['l_priority_none'] = 'None'; $lang['l_status'] = 'Status'; +$lang['l_status_confirmed'] = 'CONFIRMED' ; +$lang['l_status_cancelled'] = 'CANCELLED'; +$lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'To do items'; $lang['l_unfinished'] = 'Unfinished'; $lang['l_prefs_set'] = 'Your preferences have been set.'; @@ -172,6 +176,8 @@ $dateFormat_week_jump = '%b %e'; $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %B %e'; +$dateFormat_year = '%Y'; + /* Notes about dateFormat_* diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/esperanto.inc.php newcal/languages/esperanto.inc.php --- oldcal/languages/esperanto.inc.php 2005-05-05 22:08:26.000000000 -0400 +++ newcal/languages/esperanto.inc.php 2006-03-20 03:47:46.000000000 -0500 @@ -167,6 +167,7 @@ $dateFormat_week_jump = '%e %b'; $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %B %e'; +$dateFormat_year = '%Y'; /* Notes about dateFormat_* diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/finnish.inc.php newcal/languages/finnish.inc.php --- oldcal/languages/finnish.inc.php 2005-10-02 18:34:11.000000000 -0400 +++ newcal/languages/finnish.inc.php 2006-03-20 03:48:11.000000000 -0500 @@ -45,6 +45,7 @@ $lang['l_goyear'] = 'Mene Tähän Vuoteen'; $lang['l_search'] = 'Etsi'; // the verb $lang['l_results'] = 'Etsinnän Tulokset'; +$lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Kysely'; // will be followed by the search query $lang['l_no_results'] = 'Tapahtumia ei löytynyt'; $lang['l_goprint'] = 'Tulostettava versio'; @@ -82,6 +83,9 @@ $lang['l_priority_medium'] = 'Keski'; $lang['l_priority_none'] = 'Ei mitään'; $lang['l_status'] = 'Tila'; +$lang['l_status_confirmed'] = 'CONFIRMED' ; +$lang['l_status_cancelled'] = 'CANCELLED'; +$lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'Tehtävät:'; $lang['l_unfinished'] = 'Päättymättömät'; $lang['l_unfinished'] = 'Päättymättömät'; diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/french.inc.php newcal/languages/french.inc.php --- oldcal/languages/french.inc.php 2005-10-04 21:07:40.000000000 -0400 +++ newcal/languages/french.inc.php 2006-04-02 15:56:31.000000000 -0400 @@ -44,6 +44,7 @@ $lang['l_goyear'] = 'Voir cette année'; $lang['l_search'] = 'Rechercher'; // the verb $lang['l_results'] = 'Résultats de la recherche'; +$lang['l_pick_multiple'] = 'Choix multiple'; $lang['l_query'] = 'Requète'; // will be followed by the search query $lang['l_no_results'] = 'Aucun événement trouvé'; $lang['l_goprint'] = 'Version imprimable'; @@ -81,6 +82,9 @@ $lang['l_priority_medium'] = 'Moyenne'; $lang['l_priority_none'] = 'Aucune'; $lang['l_status'] = 'Status:'; +$lang['l_status_confirmed'] = 'CONFIRMED' ; +$lang['l_status_cancelled'] = 'CANCELLED'; +$lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'Tâches à réaliser'; $lang['l_unfinished'] = 'Non faites'; $lang['l_prefs_set'] = 'Vos préférences ont été modifiées.'; @@ -174,6 +178,7 @@ $dateFormat_week_jump = '%e %b'; $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A %e %B'; +$dateFormat_year = '%Y'; /* Notes about dateFormat_* diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/german.inc.php newcal/languages/german.inc.php --- oldcal/languages/german.inc.php 2005-05-05 22:08:26.000000000 -0400 +++ newcal/languages/german.inc.php 2006-03-20 03:37:47.000000000 -0500 @@ -45,6 +45,7 @@ $lang['l_goyear'] = 'Gehe zum aktuellen Jahr'; $lang['l_search'] = 'Suchen'; // the verb $lang['l_results'] = 'Suchergebnisse'; +$lang['l_pick_multiple'] = 'Mehrfachauswahl'; $lang['l_query'] = 'Suche'; // will be followed by the search query $lang['l_no_results'] = 'Keine Einträge gefunden'; $lang['l_goprint'] = 'Druckversion'; @@ -82,6 +83,9 @@ $lang['l_priority_medium'] = 'mittel'; $lang['l_priority_none'] = 'keine'; $lang['l_status'] = 'Status'; +$lang['l_status_confirmed'] = 'Bestätigt' ; +$lang['l_status_cancelled'] = 'Vorläufig'; +$lang['l_status_tentative'] = 'Abgesagt'; $lang['l_todo'] = 'Aufgaben'; $lang['l_unfinished'] = 'Andauernd'; $lang['l_prefs_set'] = 'Einstellungen wurden gespeichert.'; @@ -157,7 +161,7 @@ // --------------------------------- -$daysofweek_lang = array ('Sonntag','Montag','Dienstag','Mittwoch','Donerstag','Freitag','Samstag'); +$daysofweek_lang = array ('Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag'); $daysofweekshort_lang = array ('Son','Mon','Die','Mit','Don','Fre','Sam'); $daysofweekreallyshort_lang = array ('S','M','D','M','D','F','S'); $monthsofyear_lang = array ('Januar','Februar','März','April','Mai','Juni','Juli','August','September','Oktober','November','Dezember'); @@ -174,6 +178,7 @@ $dateFormat_week_jump = ' %e. %b'; $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %e. %B'; +$dateFormat_year = '%Y'; /* Notes about dateFormat_* diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/italian.inc.php newcal/languages/italian.inc.php --- oldcal/languages/italian.inc.php 2005-05-05 22:08:26.000000000 -0400 +++ newcal/languages/italian.inc.php 2006-03-20 03:37:36.000000000 -0500 @@ -45,6 +45,7 @@ $lang['l_goyear'] = 'Vai a Questo Anno'; $lang['l_search'] = 'Cerca'; // the verb $lang['l_results'] = 'Risultati Ricerca'; +$lang['l_pick_multiple'] = 'Selezione multipla'; $lang['l_query'] = 'Chiave di ricerca'; // will be followed by the search query $lang['l_no_results'] = 'Nessun evento trovato'; $lang['l_goprint'] = 'Versione Stampabile'; @@ -82,6 +83,9 @@ $lang['l_priority_medium'] = 'Media'; $lang['l_priority_none'] = 'Nessuna'; $lang['l_status'] = 'Stato'; +$lang['l_status_confirmed'] = 'Confermato' ; +$lang['l_status_cancelled'] = 'Annullato'; +$lang['l_status_tentative'] = 'Sperimentale'; $lang['l_todo'] = 'Attività'; $lang['l_unfinished'] = 'Non terminato'; $lang['l_prefs_set'] = 'Le tue preferenze sono state registrate.'; @@ -174,6 +178,7 @@ $dateFormat_week_jump = '%e %b'; $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %e %B'; +$dateFormat_year = '%Y'; /* Notes about dateFormat_* diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/japanese.inc.php newcal/languages/japanese.inc.php --- oldcal/languages/japanese.inc.php 2005-05-05 22:08:27.000000000 -0400 +++ newcal/languages/japanese.inc.php 2006-03-20 03:37:25.000000000 -0500 @@ -44,6 +44,7 @@ $lang['l_goyear'] = '今年に移動'; $lang['l_search'] = '検索'; // the verb $lang['l_results'] = '検索結果'; +$lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = '検索キーワード'; // will be followed by the search query $lang['l_no_results'] = '一致する予定はありませんでした。'; $lang['l_goprint'] = '印刷用表示'; @@ -81,6 +82,9 @@ $lang['l_priority_medium'] = '普通'; $lang['l_priority_none'] = 'なし'; $lang['l_status'] = '状態'; +$lang['l_status_confirmed'] = 'CONFIRMED' ; +$lang['l_status_cancelled'] = 'CANCELLED'; +$lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = '備忘録'; $lang['l_unfinished'] = '完成されていない'; $lang['l_prefs_set'] = 'Your preferences have been set.'; @@ -173,6 +177,7 @@ $dateFormat_week_jump = '%b%e日'; $dateFormat_month = '%Y年%B'; $dateFormat_month_list = '%B%e日 %A'; +$dateFormat_year = '%Y'; /* Notes about dateFormat_* diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/korean.inc.php newcal/languages/korean.inc.php --- oldcal/languages/korean.inc.php 2005-05-05 22:08:27.000000000 -0400 +++ newcal/languages/korean.inc.php 2006-03-20 03:37:12.000000000 -0500 @@ -163,6 +163,7 @@ $dateFormat_week_jump = '%b %e일'; $dateFormat_month = '%Y년 %B'; $dateFormat_month_list = '%B %e일, %A'; +$dateFormat_year = '%Y'; /* Notes about dateFormat_* diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/lithuanian.inc.php newcal/languages/lithuanian.inc.php --- oldcal/languages/lithuanian.inc.php 2004-09-06 19:05:31.000000000 -0400 +++ newcal/languages/lithuanian.inc.php 2006-03-20 03:36:59.000000000 -0500 @@ -43,6 +43,7 @@ $lang['l_goyear'] = 'Pereiti į šiuos metus'; $lang['l_search'] = 'Ieškoti'; // the verb $lang['l_results'] = 'Paieškos rezultatai'; +$lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Užklausa'; // will be followed by the search query $lang['l_no_results'] = 'Neradome jokių renginių'; $lang['l_goprint'] = 'Spausdinimui'; @@ -80,6 +81,9 @@ $lang['l_priority_medium'] = 'Vidutinė'; $lang['l_priority_none'] = 'Jokia'; $lang['l_status'] = 'Būklė'; +$lang['l_status_confirmed'] = 'CONFIRMED' ; +$lang['l_status_cancelled'] = 'CANCELLED'; +$lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'Užduotys'; $lang['l_unfinished'] = 'Nebaigtos'; $lang['l_prefs_set'] = 'Jūsų pasirinkti nustatymai patvirtiniti.'; @@ -172,6 +176,7 @@ $dateFormat_week_jump = '%b %e d.'; $dateFormat_month = '%Y m. %b mėn.'; $dateFormat_month_list = '%A, %B %e d.'; +$dateFormat_year = '%Y'; /* Notes about dateFormat_* diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/norwegian.inc.php newcal/languages/norwegian.inc.php --- oldcal/languages/norwegian.inc.php 2005-10-04 21:07:40.000000000 -0400 +++ newcal/languages/norwegian.inc.php 2006-03-20 03:36:48.000000000 -0500 @@ -43,6 +43,7 @@ $lang['l_goyear'] = 'Vis dette året'; $lang['l_search'] = 'Søk'; // the verb $lang['l_results'] = 'Søkeresultater'; +$lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Forespørsel: '; // will be followed by the search query $lang['l_no_results'] = 'Ingen hendelser'; $lang['l_goprint'] = 'Utskriftsvennlig'; @@ -80,6 +81,9 @@ $lang['l_priority_medium'] = 'Medium'; $lang['l_priority_none'] = 'Ingen'; $lang['l_status'] = 'Status'; +$lang['l_status_confirmed'] = 'CONFIRMED' ; +$lang['l_status_cancelled'] = 'CANCELLED'; +$lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'Oppgaver'; $lang['l_unfinished'] = 'Uferdig'; $lang['l_prefs_set'] = 'Valgene dine har blitt lagret.'; @@ -173,6 +177,7 @@ $dateFormat_week_jump = '%b %e'; $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A %e. %B'; +$dateFormat_year = '%Y'; /* Notes about dateFormat_* diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/polish.inc.php newcal/languages/polish.inc.php --- oldcal/languages/polish.inc.php 2005-05-05 22:08:27.000000000 -0400 +++ newcal/languages/polish.inc.php 2006-03-20 03:36:38.000000000 -0500 @@ -163,6 +163,7 @@ $dateFormat_week_jump = '%e %B';// new since last translation $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %e %B'; +$dateFormat_year = '%Y'; /* Notes about $dateFormat_* diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/portuguese.inc.php newcal/languages/portuguese.inc.php --- oldcal/languages/portuguese.inc.php 2005-05-05 22:08:27.000000000 -0400 +++ newcal/languages/portuguese.inc.php 2006-03-20 03:36:29.000000000 -0500 @@ -43,6 +43,7 @@ $lang['l_goyear'] = 'Ir para este Ano'; $lang['l_search'] = 'Buscar'; // the verb $lang['l_results'] = 'Buscar Resultados'; +$lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Questão: '; // will be followed by the search query $lang['l_no_results'] = 'Registos não encontrados'; $lang['l_goprint'] = 'Versão para imprimir'; @@ -80,6 +81,9 @@ $lang['l_priority_medium'] = 'Medium'; $lang['l_priority_none'] = 'None'; $lang['l_status'] = 'Estado'; +$lang['l_status_confirmed'] = 'CONFIRMED' ; +$lang['l_status_cancelled'] = 'CANCELLED'; +$lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'To do items'; $lang['l_unfinished'] = 'Unfinished'; $lang['l_prefs_set'] = 'Your preferences have been set.'; @@ -171,6 +175,7 @@ $dateFormat_week_jump = '%e %b'; $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %e %B'; +$dateFormat_year = '%Y'; /* Notes about dateFormat_* diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/spanish.inc.php newcal/languages/spanish.inc.php --- oldcal/languages/spanish.inc.php 2005-05-05 22:08:27.000000000 -0400 +++ newcal/languages/spanish.inc.php 2006-03-20 03:36:13.000000000 -0500 @@ -42,6 +42,7 @@ $lang['l_goyear'] = 'Ir a este Año'; $lang['l_search'] = 'Buscar'; // the verb $lang['l_results'] = 'Resultados de la búsqueda'; +$lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Consulta: '; // will be followed by the search query $lang['l_no_results'] = 'Ningún evento encontrado'; $lang['l_goprint'] = 'Formato de impresión'; @@ -79,6 +80,9 @@ $lang['l_priority_medium'] = 'Media'; $lang['l_priority_none'] = 'Ninguna'; $lang['l_status'] = 'Estado'; +$lang['l_status_confirmed'] = 'CONFIRMED' ; +$lang['l_status_cancelled'] = 'CANCELLED'; +$lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'Por hacer'; $lang['l_unfinished'] = 'Sin terminar'; $lang['l_prefs_set'] = 'Sus preferencias han sido guardadas.'; @@ -171,6 +175,7 @@ $dateFormat_week_jump = '%e de %b'; $dateFormat_month = '%B de %Y'; $dateFormat_month_list = '%A, %e de %B'; +$dateFormat_year = '%Y'; /* Notes about dateFormat_* diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/swedish.inc.php newcal/languages/swedish.inc.php --- oldcal/languages/swedish.inc.php 2005-05-05 22:08:27.000000000 -0400 +++ newcal/languages/swedish.inc.php 2006-03-20 03:35:58.000000000 -0500 @@ -43,6 +43,7 @@ $lang['l_goyear'] = 'Gå till detta År'; $lang['l_search'] = 'Sök'; // the verb $lang['l_results'] = 'Resultat av Sökning'; +$lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Sökord'; // will be followed by the search query $lang['l_no_results'] = 'Inga kalenderhändelser funna'; $lang['l_goprint'] = 'Utskriftsvänlig'; @@ -80,6 +81,9 @@ $lang['l_priority_medium'] = 'Medium'; $lang['l_priority_none'] = 'Ingen'; $lang['l_status'] = 'Status'; +$lang['l_status_confirmed'] = 'CONFIRMED' ; +$lang['l_status_cancelled'] = 'CANCELLED'; +$lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'Att göra'; $lang['l_unfinished'] = 'Ouppklarade'; $lang['l_prefs_set'] = 'Dina inställningar har sparats.'; @@ -172,6 +176,7 @@ $dateFormat_week_jump = '%e %b'; $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %B %e'; +$dateFormat_year = '%Y'; /* Notes about dateFormat_* diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/languages/traditional_chinese.inc.php newcal/languages/traditional_chinese.inc.php --- oldcal/languages/traditional_chinese.inc.php 2005-05-05 22:08:27.000000000 -0400 +++ newcal/languages/traditional_chinese.inc.php 2006-03-20 03:35:43.000000000 -0500 @@ -165,6 +165,7 @@ $dateFormat_week_jump = '%b %e 日'; $dateFormat_month = '%Y 年 %B'; $dateFormat_month_list = '%A, %B %e 日'; +$dateFormat_year = '%Y'; /* Notes about dateFormat_* diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/month.php newcal/month.php --- oldcal/month.php 2005-11-29 21:20:32.000000000 -0500 +++ newcal/month.php 2006-04-09 21:21:07.000000000 -0400 @@ -61,6 +61,7 @@ )); $page->replace_tags(array( + 'version' => $phpicalendar_version, 'charset' => $charset, 'template' => $template, 'cal' => $cal, @@ -103,6 +104,7 @@ 'l_download' => $lang['l_download'], 'l_this_months' => $lang['l_this_months'], 'l_search' => $lang['l_search'], + 'l_pick_multiple' => $lang['l_pick_multiple'], 'l_powered_by' => $lang['l_powered_by'], 'l_this_site_is' => $lang['l_this_site_is'] )); diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/preferences.php newcal/preferences.php --- oldcal/preferences.php 2005-11-27 02:56:31.000000000 -0500 +++ newcal/preferences.php 2006-04-09 21:21:27.000000000 -0400 @@ -29,7 +29,7 @@ if ($action == 'setcookie') { $cookie_language = $_POST['cookie_language']; - $cookie_cpath = $_POST['cpath']; + $cookie_cpath = $_POST['cpath']; $cookie_calendar = $_POST['cookie_calendar']; $cookie_view = $_POST['cookie_view']; $cookie_style = $_POST['cookie_style']; @@ -39,17 +39,23 @@ $the_cookie = array ("cookie_language" => "$cookie_language", "cookie_calendar" => "$cookie_calendar", "cookie_view" => "$cookie_view", "cookie_startday" => "$cookie_startday", "cookie_style" => "$cookie_style", "cookie_time" => "$cookie_time", "cookie_cpath"=>"$cookie_cpath"); $the_cookie = serialize($the_cookie); if ($cookie_unset) { - setcookie("phpicalendar","$the_cookie",time()-(60*60*24*7) ,"/","$cookie_uri",0); + setcookie("$cookie_name","$the_cookie",time()-(60*60*24*7) ,"/","$cookie_uri",0); } else { - setcookie("phpicalendar","$the_cookie",time()+(60*60*24*7*12*10) ,"/","$cookie_uri",0); + setcookie("$cookie_name","$the_cookie",time()+(60*60*24*7*12*10) ,"/","$cookie_uri",0); + if (isset($_POST['cookie_view'])) + $default_view = $_POST['cookie_view']; + if (isset($_POST['cookie_style']) && is_dir(BASE.'templates/'.$_POST['cookie_style'].'/')) + $template = $_POST['cookie_style']; + if (isset($_POST['cookie_language']) && is_file(BASE.'languages/'.strtolower($_POST['cookie_language']).'.inc.php')) + include(BASE.'languages/'.strtolower($_POST['cookie_language']).'.inc.php'); } - $_COOKIE['phpicalendar'] = $the_cookie; + $_COOKIE[$cookie_name] = $the_cookie; $cpath = $cookie_cpath; $cal = $cookie_calendar; } -if (isset($_COOKIE['phpicalendar'])) { - $phpicalendar = unserialize(stripslashes($_COOKIE['phpicalendar'])); +if (isset($_COOKIE[$cookie_name])) { + $phpicalendar = unserialize(stripslashes($_COOKIE[$cookie_name])); $cookie_language = $phpicalendar['cookie_language']; $cookie_calendar = $phpicalendar['cookie_calendar']; $cookie_view = $phpicalendar['cookie_view']; @@ -61,7 +67,7 @@ } } -if ((!isset($_COOKIE['phpicalendar'])) || ($cookie_unset)) { +if ((!isset($_COOKIE[$cookie_name])) || ($cookie_unset)) { # No cookie set -> use defaults from config file. $cookie_language = ucfirst($language); $cookie_calendar = $default_cal; @@ -99,11 +105,11 @@ // select for calendars $calendar_select = display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED),TRUE); $calendar_select .=""; - +$calendar_select = str_replace("' : ''; -$view_select .= ($cookie_view == 'week') ? '' : ''; -$view_select .= ($cookie_view == 'month') ? '' : ''; +$view_select = ($default_view == 'day') ? '' : ''; +$view_select .= ($default_view == 'week') ? '' : ''; +$view_select .= ($default_view == 'month') ? '' : ''; // select for time for ($i = 000; $i <= 1200; $i += 100) { @@ -129,7 +135,7 @@ $dir_handle = @opendir(BASE.'templates/'); while ($file = readdir($dir_handle)) { if (($file != ".") && ($file != "..") && ($file != "CVS")) { - if (!is_file($file)) { + if (is_dir(BASE.'templates/'.$file)) { $file_disp = ucfirst($file); $style_select .= ($file == "$cookie_style") ? "\n" : "\n"; } @@ -148,6 +154,7 @@ )); $page->replace_tags(array( + 'version' => $phpicalendar_version, 'charset' => $charset, 'template' => $template, 'default_path' => '', diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/print.php newcal/print.php --- oldcal/print.php 2005-12-01 01:25:09.000000000 -0500 +++ newcal/print.php 2006-04-09 21:36:20.000000000 -0400 @@ -1,18 +1,16 @@ replace_tags(array( + 'version' => $phpicalendar_version, 'event_js' => '', 'charset' => $charset, 'default_path' => '', diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/rss/index.php newcal/rss/index.php --- oldcal/rss/index.php 2005-11-23 02:51:01.000000000 -0500 +++ newcal/rss/index.php 2006-04-09 21:22:24.000000000 -0400 @@ -1,82 +1,112 @@ -'.$cal_displayname_tmp.' '. $calendar_lang.'
'; - $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&cpath='.$cpath.'&rssview=day
'; - $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&cpath='.$cpath.'&rssview=week
'; - $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&cpath='.$cpath.'&rssview=month

'; - $footer_check = $default_path.'/rss/rss.php?cal='.$default_cal.'&rssview='.$default_view; -} - - -$page = new Page(BASE.'templates/'.$template.'/rss_index.tpl'); - -$page->replace_files(array( - 'header' => BASE.'templates/'.$template.'/header.tpl', - 'footer' => BASE.'templates/'.$template.'/footer.tpl', - 'event_js' => '' - )); - -$page->replace_tags(array( - 'default_path' => $default_path.'/', - 'template' => $template, - 'cal' => $cal, - 'getdate' => $getdate, - 'calendar_name' => $calendar_name, - 'display_date' => $display_date, - 'current_view' => $current_view, - 'sidebar_date' => $sidebar_date, - 'rss_powered' => $rss_powered, - 'rss_list' => $rss_list, - 'charset' => $charset, - 'rss_available' => '', - 'rssdisable' => '', - 'rss_valid' => '', - 'show_search' => $show_search, - 'l_rss_info' => $lang['l_rss_info'], - 'l_rss_subhead' => $lang['l_rss_subhead'], - 'l_day' => $lang['l_day'], - 'l_week' => $lang['l_week'], - 'l_month' => $lang['l_month'], - 'l_year' => $lang['l_year'], - 'l_subscribe' => $lang['l_subscribe'], - 'l_download' => $lang['l_download'], - 'l_this_months' => $lang['l_this_months'], - 'l_powered_by' => $lang['l_powered_by'], - 'l_this_site_is' => $lang['l_this_site_is'] - )); - -$page->output(); - - -?> +\n"; +$xml_icon ="xml"; + +$filelist = availableCalendars($username, $password, $ALL_CALENDARS_COMBINED); +foreach ($filelist as $file) { + // $cal_filename is the filename of the calendar without .ics + // $cal is a urlencoded version of $cal_filename + // $cal_displayname is $cal_filename with occurrences of "32" replaced with " " + + if (is_numeric(array_search($file, $cal_filelist))){ + $cal_displayname_tmp = $cal_displaynames[array_search($file,$cal_filelist)]; + }else{ + $cal_displayname_tmp = str_replace("32", " ", str_replace(".ics",'',basename($file))); + } + $rss_list .= ''.$cal_displayname_tmp.' '. $lang['l_calendar'].''; + +/* Changed to show links without urlencode, but links valid urls */ + $rss_list .= "".$lang['l_day'].""; + $rss_list .= ''.$xml_icon.' RSS 0.91'; + $rss_list .= ''.$xml_icon.' RSS 1.0'; + $rss_list .= ''.$xml_icon.' RSS 2.0'; + + $rss_list .= "".$lang['l_week'].""; + $rss_list .= ''.$xml_icon.' RSS 0.91'; + $rss_list .= ''.$xml_icon.' RSS 1.0'; + $rss_list .= ''.$xml_icon.' RSS 2.0'; + + $rss_list .= "".$lang['l_month'].""; + $rss_list .= ''.$xml_icon.' RSS 0.91'; + $rss_list .= ''.$xml_icon.' RSS 1.0'; + $rss_list .= ''.$xml_icon.' RSS 2.0'; + + $footer_check = $default_path.'/rss/rss.php?cal%3D'.rawurlencode($file.'&cpath='.$cpath.'&rssview='.$default_view); + $validrss_check = str_replace('%', '%25', $footer_check); + $rss_list .= " \n"; + +} +$rss_list .= "\n"; + + +/* End link modification */ + + +$page = new Page(BASE.'templates/'.$template.'/rss_index.tpl'); + +$page->replace_files(array( + 'header' => BASE.'templates/'.$template.'/header.tpl', + 'footer' => BASE.'templates/'.$template.'/footer.tpl', + 'event_js' => '' + )); + +$page->replace_tags(array( + 'version' => $phpicalendar_version, + 'default_path' => $default_path.'/', + 'template' => $template, + 'cal' => $cal, + 'getdate' => $getdate, + 'calendar_name' => $calendar_name, + 'display_date' => $display_date, + 'current_view' => $current_view, + 'sidebar_date' => $sidebar_date, + 'rss_powered' => $rss_powered, + 'rss_list' => $rss_list, + 'charset' => $charset, + 'rss_available' => '', + 'rssdisable' => '', + 'rss_valid' => '', + 'rss_docinfo' => "RSS feeds can also be set up for a specified number of days before or after a given date, or between two dates. See the documentation for how to set up the URLs", +/* Replaces footer.tpl {validrss_check} with $validrss_check */ + 'validrss_check' => $validrss_check, + 'show_search' => $show_search, + 'l_rss_info' => $lang['l_rss_info'], + 'l_rss_subhead' => $lang['l_rss_subhead'], + 'l_day' => $lang['l_day'], + 'l_week' => $lang['l_week'], + 'l_month' => $lang['l_month'], + 'l_year' => $lang['l_year'], + 'l_subscribe' => $lang['l_subscribe'], + 'l_download' => $lang['l_download'], + 'l_this_months' => $lang['l_this_months'], + 'l_powered_by' => $lang['l_powered_by'], + 'l_this_site_is' => $lang['l_this_site_is'] + )); + +$page->output(); + + +?> diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/rss/rss.php newcal/rss/rss.php --- oldcal/rss/rss.php 2005-11-30 12:05:56.000000000 -0500 +++ newcal/rss/rss.php 2006-04-09 20:51:49.000000000 -0400 @@ -1,235 +1,256 @@ -"; - $theview = $_GET['days']." days from ".date('n/d/Y',strtotime($fromdate)); - break; - case 'daysto': - $todate = $getdate; - $fromdate = date("Ymd", strtotime($getdate) - $_GET['days']*60*60*24); - #print "from:$fromdate to: $todate
"; - $theview = $_GET['days']." days before ".date('n/d/Y',strtotime($todate)); - break; - case 'range': - if(isset($_GET['from'])){ - $fromdate = $_GET['from']; - }else{ - $fromdate = $getdate; - } - $todate = $_GET['to']; - $theview = date('n/d/Y',strtotime($fromdate)).'-'.date('n/d/Y',strtotime($todate)); - break; - default: - #default to week - $fromdate = dateOfWeek($getdate, $week_start_day); - $todate = $fromdate + 6; - $theview = ""; - -} -#need to give ical_parser the most distant date to correctly set up master_array. -$getdate = $todate; -#echo "from:$fromdate to:$todate"; -include(BASE.'functions/ical_parser.php'); -if ($enable_rss != 'yes') { - die ("RSS feeds are not enabled on this site."); -} - -//Set calendar or calendar directory name for feed -//Note that this depends on other modifications I've made to -//allow phpicalendar to use calendar subdirectories - see bbs - -$cal_displayname = urldecode($cal); -if ($cal == $ALL_CALENDARS_COMBINED) { - $temp = explode("/",$calendar_path); - $cal_displayname = str_replace("32"," ",ucfirst(array_pop($temp))); -} - -$events_count = 0; - -// calculate a value for Last Modified and ETag -if ($cal == $ALL_CALENDARS_COMBINED) { - $filemod = filemtime("$calendar_path"); -}else{ - $filemod = filemtime("$calendar_path/$cal.ics"); -} -$filemodtime = date("r", $filemod); - -//send relevant headers -header ("Last-Modified: $filemodtime"); -header ("ETag:\"$filemodtime\""); - -// checks the user agents headers to see if they kept track of our -// stuff, if so be nice and send back a 304 and exit. - -if ( ($_SERVER['HTTP_IF_MODIFIED_SINCE'] == $filemodtime) || ($_SERVER['HTTP_IF_NONE_MATCH'] == $filemodtime)) -{ - header ("HTTP/1.1 304 Not Modified"); - exit; -} - -//If client needs new feed - make the header -$rss = ""."\n"; -$rss .= ''."\n"; -$rss .= ''."\n"; -$rss .= ''."\n"; -$rss .= ''.$cal_displayname; -if ($theview !=""){$rss .= ' - '.$theview;} -$rss .= "\n"; -$rss .= ''.htmlspecialchars ("$default_path").''."\n"; -$rss .= ''.$cal_displayname.' '.$lang['l_calendar'].' - '.$theview.''."\n"; -$rss .= ''.$rss_language.''."\n"; -$rss .= 'Copyright '.date(Y).', '.htmlspecialchars ("$default_path").''."\n"; - -//generate the items -$numdays = round((strtotime($todate) - strtotime($fromdate))/(60*60*24)-1); -$thisdate = $fromdate; # start at beginning of date range, - # note that usage of $thisdate is different from distribution - # I use it as a date, dist uses it as a time -$i = 0; #day counter -$uid_arr = array(); - do { - $thisdate=date('Ymd', strtotime($thisdate)); - #echo "Date: $thisdate
\n"; - $dayofweek = localizeDate ("%a %b %e %Y", strtotime($thisdate)); - if (isset($master_array[($thisdate)]) && sizeof($master_array[($thisdate)]) > 0) { - foreach ($master_array[("$thisdate")] as $event_times) { - foreach ($event_times as $uid=>$val) { - #handle multiday all day events - if(!$val["event_start"]){ - if (isset($uid_arr[$uid])){ - $uid_arr[$uid] .= "+$dayofweek" ; - continue; - }else{ - $uid_arr[$uid] = "$dayofweek" ; - } - $event_start = $lang['l_all_day']; - }else{ - $event_start = @$val["event_start"]; - $event_start = date ($timeFormat, @strtotime ("$event_start")); - } - $event_text = stripslashes(urldecode($val["event_text"])); - $event_text = strip_tags($event_text, ''); - $event_text = str_replace('&','&',$event_text); - $event_text = str_replace('&amp;','&',$event_text); - $event_text = urlencode($event_text); - #uncomment for shorter event text with ... - # $event_text = word_wrap($event_text, 21, $tomorrows_events_lines); - $description = stripslashes(urldecode($val["description"])); - $description = strip_tags($description, ''); - $description = str_replace('&','&',$description); - $description = str_replace('&amp;','&',$description); - - - $rss_title = htmlspecialchars ("$dayofweek: $event_text"); - $rss_link = htmlspecialchars ("$default_path/day.php?getdate=$thisdate&cal=$cal&cpath=$cpath"); - $rss_description = htmlspecialchars ("$dayofweek $event_start: $description"); - - $rss .= ''."\n"; - $rss .= ''.$uid.''."\n"; - $rss .= ''.$event_start.''."\n"; - $rss .= ''.$rss_title.''."\n"; - /* custom stuff for Jim Hu's RSS feeds. Deprecated - $rss .= ''.$dayofweek.''."\n"; - $rss .= ''.$event_text.''."\n"; - $rss .= ''.$description.''."\n"; - $rss .= ''.$val["description"].''."\n"; - $rss .= ''.$val['attendee'].''."\n"; - $rss .= ''.$val['organizer'].''."\n"; - $rss .= ''.$val['status'].''."\n"; - */ - $rss .= ''.$rss_link.''."\n"; - $rss .= ''.$rss_description.''."\n"; - $location = str_replace('&','&',$val['location']); - $location = str_replace('&amp;','&',$location); - $rss .= ''.$location.''; - $rss .= ''."\n"; - $events_count++; - } - } - } - if (($events_count < 1) && ($i == $numdays)) { - $rss .= ''."\n"; - $rss .= 'No events found'."\n"; - $rss .= ''.htmlspecialchars ("$default_path").''."\n"; - $rss .= ''."\n"; - } - $thisdate++; - $i++; - } while ($i <= $numdays); - -$rss .= ''."\n"; -$rss .= ''."\n"; - -foreach ($uid_arr as $uid=>$date_range){ - #echo "date_range:$date_range
"; - - if(strpos($date_range,"+")>0){ - #echo "+ in date_range
"; - $temp = explode("+",$date_range); - $date_range = $temp[0].'-'.array_pop($temp); - } - $rss = str_replace("$uid\n".$lang['l_all_day']."","$uid\n$date_range", $rss); - -} -header ("Content-Type: text/xml"); - -echo "$rss"; - -?> + $filemod) $filemod = $calinfo['mtime']; +} +$filemodtime = date("r", $filemod); + +//send relevant headers +header ("Last-Modified: $filemodtime"); +header ("ETag:\"$filemodtime\""); + +// checks the user agents headers to see if they kept track of our +// stuff, if so be nice and send back a 304 and exit. + +if ( ($_SERVER['HTTP_IF_MODIFIED_SINCE'] == $filemodtime) || ($_SERVER['HTTP_IF_NONE_MATCH'] == $filemodtime)){ + header ("HTTP/1.1 304 Not Modified"); + exit; +} + +/* Change languages to ISO 639-1 to validate RSS without changing long version in config.inc.php */ +$user_language = array ("english", "polish", "german", "french", "dutch", "italian", "japanese", "norwegian", "spanish", "swedish", "portuguese", "catalan", "traditional_chinese", "esperanto", "korean"); +$iso_language = array ("en", "pl", "de", "fr", "nl", "da", "it", "ja", "no", "es", "sv", "pt", "ca", "zh-tw", "eo", "ko"); +$rss_language = str_replace($user_language, $iso_language, $language); +/* End language modification */ + +$rss = ""."\n"; + +/* Use 1.0 and strip encoding, use rss_language */ +$rss .= ''."\n"; + +$rss .= ''."\n"; +if (isset($cpath) && $cpath !='') $rss_link.="?cpath=$cpath"; +$rss .= "$rss_link\n"; + +$rss .= ''.$cal_displayname.' '.$lang['l_calendar'].' - '.$theview.''."\n"; +$rss .= ''.$language.''."\n"; +$rss .= 'Copyright '.date('Y').', '.htmlspecialchars ("$default_path").''."\n"; + +//generate the items +$numdays = round((strtotime($todate) - strtotime($fromdate))/(60*60*24))+1; +$thisdate = $fromdate; # start at beginning of date range, + # note that usage of $thisdate is different from distribution + # I use it as a date, dist uses it as a time +$i = 1; #day counter +$uid_arr = array(); + do { + $thisdate=date('Ymd', strtotime($thisdate)); + #echo "Date: $thisdate
\n"; + $dayofweek = localizeDate ("%a %b %e %Y", strtotime($thisdate)); + if (isset($master_array[($thisdate)]) && sizeof($master_array[($thisdate)]) > 0) { + foreach ($master_array[("$thisdate")] as $event_times) { + foreach ($event_times as $uid=>$val) { + #handle multiday all day events + if(!$val["event_start"]){ + if (isset($uid_arr[$uid])){ + $uid_arr[$uid] .= "+$dayofweek" ; + continue; + }else{ + $uid_arr[$uid] = "$dayofweek" ; + } + $event_start = $lang['l_all_day']; + }else{ + $event_start = @$val["event_start"]; + $event_start = date ($timeFormat, @strtotime ("$event_start")); + } + $event_text = stripslashes(urldecode($val["event_text"])); + $event_text = strip_tags($event_text, ''); + $event_text = str_replace('&','&',$event_text); + $event_text = str_replace('&amp;','&',$event_text); + # $event_text = urlencode($event_text); + #uncomment for shorter event text with ... + # $event_text = word_wrap($event_text, 21, $tomorrows_events_lines); + $description = stripslashes(urldecode($val["description"])); + $description = strip_tags($description, ''); + $description = str_replace('&','&',$description); + $description = str_replace('&amp;','&',$description); + + + $rss_title = urldecode ("$dayofweek: $event_text"); + $rss_link = "$default_path/day.php?getdate=$thisdate&cal=$cal"; + if (isset($cpath) && $cpath !='') $rss_link.="&cpath=$cpath"; + $rss_description = htmlspecialchars ("$dayofweek $event_start: $description"); + + $rss .= ''."\n"; + $rss .= ''.$uid.''."\n"; + $rss .= ''.$event_start.''."\n"; + $rss .= ''.$rss_title.''."\n"; + /* custom stuff for Jim Hu's RSS feeds. Deprecated + $rss .= ''.$dayofweek.''."\n"; + $rss .= ''.$event_text.''."\n"; + $rss .= ''.$description.''."\n"; + $rss .= ''.$val["description"].''."\n"; + $rss .= ''.$val['attendee'].''."\n"; + $rss .= ''.$val['organizer'].''."\n"; + $rss .= ''.$val['status'].''."\n"; + */ + $rss .= ''.$rss_link.''."\n"; + $rss .= ''.$rss_description.''."\n"; + if (isset($val['location']) && $val['location'] !=''){ + $location = str_replace('&','&',$val['location']); + $location = str_replace('&amp;','&',$location); + $rss .= ''.$location."\n"; + } + $rss .= ''."\n"; + $events_count++; + } + } + } + if (($events_count < 1) && ($i == $numdays)) { + $rss .= ''."\n"; + $rss .= 'No events found'."\n"; + $rss .= ''.htmlspecialchars ("$default_path").''."\n"; + $rss .= ''."\n"; + } + $thisdate++; + $i++; + } while ($i <= $numdays); + +$rss .= ''."\n"; +$rss .= ''."\n"; + +foreach ($uid_arr as $uid=>$date_range){ + #echo "date_range:$date_range
"; + + if(strpos($date_range,"+")>0){ + #echo "+ in date_range
"; + $temp = explode("+",$date_range); + $date_range = $temp[0].'-'.array_pop($temp); + } + $rss = str_replace("$uid\n".$lang['l_all_day']."","$uid\n$date_range", $rss); + +} +header ("Content-Type: text/xml"); + +echo "$rss"; + +?> diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/rss/rss1.0.php newcal/rss/rss1.0.php --- oldcal/rss/rss1.0.php 1969-12-31 19:00:00.000000000 -0500 +++ newcal/rss/rss1.0.php 2006-04-02 22:38:48.000000000 -0400 @@ -0,0 +1,255 @@ + $filemod) $filemod = $calinfo['mtime']; +} +$filemodtime = date("r", $filemod); + +//send relevant headers +header ("Last-Modified: $filemodtime"); +header ("ETag:\"$filemodtime\""); + +// checks the user agents headers to see if they kept track of our +// stuff, if so be nice and send back a 304 and exit. + +if ( ($_SERVER['HTTP_IF_MODIFIED_SINCE'] == $filemodtime) || ($_SERVER['HTTP_IF_NONE_MATCH'] == $filemodtime)){ + header ("HTTP/1.1 304 Not Modified"); + exit; +} + +/* Change languages to ISO 639-1 to validate RSS without changing long version in config.inc.php */ +$user_language = array ("english", "polish", "german", "french", "dutch", "italian", "japanese", "norwegian", "spanish", "swedish", "portuguese", "catalan", "traditional_chinese", "esperanto", "korean"); +$iso_language = array ("en", "pl", "de", "fr", "nl", "da", "it", "ja", "no", "es", "sv", "pt", "ca", "zh-tw", "eo", "ko"); +$rss_language = str_replace($user_language, $iso_language, $language); +/* End language modification */ + +$rss = ""."\n"; + +/* Use 1.0 and strip encoding, use rss_language */ +$rss .= ''."\n"; + +$rss .= ''."\n"; +$rss .= ''.$cal_displayname.' '.$lang['l_calendar'].' - '.$theview.''."\n"; +#$rss .= ''.$rss_language.''."\n"; + + +//generate the items +$numdays = round((strtotime($todate) - strtotime($fromdate))/(60*60*24))+1; +$thisdate = $fromdate; # start at beginning of date range, + # note that usage of $thisdate is different from distribution + # I use it as a date, dist uses it as a time +$i = 1; #day counter + +$rss .= "\n\n"; +$rss_items =''; +$uid_arr = array(); + do { + $thisdate=date('Ymd', strtotime($thisdate)); + #echo "Date: $thisdate
\n"; + $dayofweek = localizeDate ("%a %b %e %Y", strtotime($thisdate)); + if (isset($master_array[($thisdate)]) && sizeof($master_array[($thisdate)]) > 0) { + foreach ($master_array[("$thisdate")] as $event_times) { + foreach ($event_times as $uid=>$val) { + #handle multiday all day events + if(!$val["event_start"]){ + if (isset($uid_arr[$uid])){ + $uid_arr[$uid] .= "+$dayofweek" ; + continue; + }else{ + $uid_arr[$uid] = "$dayofweek" ; + } + $event_start = $lang['l_all_day']; + }else{ + $event_start = @$val["event_start"]; + $event_start = date ($timeFormat, @strtotime ("$event_start")); + } + $event_text = stripslashes(urldecode($val["event_text"])); + $event_text = strip_tags($event_text, ''); + # $event_text = urlencode($event_text); + #uncomment for shorter event text with ... + # $event_text = word_wrap($event_text, 21, $tomorrows_events_lines); + $description = stripslashes(urldecode($val["description"])); + $description = strip_tags($description, ''); + + $rss_title = htmlspecialchars ("$dayofweek: $event_text"); + /* original link, not valid url coding + $rss_link = htmlspecialchars ("$default_path/day.php?getdate=$thisdate&cal=$cal&cpath=$cpath"); + */ + /* Add %20's for spaces for the calendar links to make them valid url's */ + $urlcal = rawurlencode ("$cal"); + $rss_link = ("$default_path/day.php?getdate=$thisdate&cal=$urlcal"); + if (isset($cpath) && $cpath !=''){ + $rss_link .= "&cpath=$cpath"; + } + /* End link modification */ + $rss_description = htmlspecialchars ("$dayofweek $event_start: $description"); + + $rss .= ''."\n"; + $rss_items .= ''."\n"; + + /* Create guid, and use uid to make link unique */ + # $rss .= ''.$rss_link.$uid.''."\n"; + /* End guid modification */ + $rss_items .= ''.$rss_title.''."\n"; + $rss_items .= ''.date("Y-m-d", strtotime($thisdate)).'T'.date("h:m:s",$val["event_start"]).''."\n"; + $rss_items .= ''.date("Y-m-d", strtotime($thisdate)).'T'.date("h:m:s",$val["event_start"]).''."\n"; + + $rss_items .= ''.$rss_link.''."\n"; + $rss_items .= ''.$rss_description.''."\n"; + if (isset($val['location']) && $val['location'] !=''){ + $rss_items .= ''.$val['location']."\n"; + } + $rss_items .= ''."\n"; + $events_count++; + } + } + } + if (($events_count < 1) && ($i == $numdays)) { + $rss_items .= ''."\n"; + $rss_items .= 'No events found'."\n"; + $rss_items .= ''.htmlspecialchars ("$default_path").''."\n"; + $rss_items .= ''."\n"; + } + $thisdate++; + $i++; + } while ($i <= $numdays); + +$rss .= "\n\n"; +$rss .= "\n"; +$rss .= $rss_items.''."\n"; + +foreach ($uid_arr as $uid=>$date_range){ + #echo "date_range:$date_range
"; + + if(strpos($date_range,"+")>0){ + #echo "+ in date_range
"; + $temp = explode("+",$date_range); + $date_range = $temp[0].'-'.array_pop($temp); + } + $rss = str_replace("$uid\n".$lang['l_all_day']."","$uid\n$date_range", $rss); + +} +header ("Content-Type: text/xml"); + +echo "$rss"; + +?> diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/rss/rss2.0.php newcal/rss/rss2.0.php --- oldcal/rss/rss2.0.php 1969-12-31 19:00:00.000000000 -0500 +++ newcal/rss/rss2.0.php 2006-04-02 23:31:39.000000000 -0400 @@ -0,0 +1,257 @@ + $filemod) $filemod = $calinfo['mtime']; +} +$filemodtime = date("r", $filemod); + +//send relevant headers +header ("Last-Modified: $filemodtime"); +header ("ETag:\"$filemodtime\""); + +// checks the user agents headers to see if they kept track of our +// stuff, if so be nice and send back a 304 and exit. + +if ( ($_SERVER['HTTP_IF_MODIFIED_SINCE'] == $filemodtime) || ($_SERVER['HTTP_IF_NONE_MATCH'] == $filemodtime)) +{ +# header ("HTTP/1.1 304 Not Modified"); +# exit; +} + +/* Change languages to ISO 639-1 to validate RSS without changing long version in config.inc.php */ +$user_language = array ("english", "polish", "german", "french", "dutch", "italian", "japanese", "norwegian", "spanish", "swedish", "portuguese", "catalan", "traditional_chinese", "esperanto", "korean"); +$iso_language = array ("en", "pl", "de", "fr", "nl", "da", "it", "ja", "no", "es", "sv", "pt", "ca", "zh-tw", "eo", "ko"); +$rss_language = str_replace($user_language, $iso_language, $language); +/* End language modification */ + +$rss = ""."\n"; +#$rss .= ''."\n"; + +/* Use 2.0 and strip encoding, use rss_language */ +$rss .= ''."\n"; +$rss .= ''.$rss_language.''."\n"; + + +/* End rss 2.0 modification */ + + +//generate the items +$numdays = round((strtotime($todate) - strtotime($fromdate))/(60*60*24))+1; +$thisdate = $fromdate; # start at beginning of date range, + # note that usage of $thisdate is different from distribution + # I use it as a date, dist uses it as a time +$i = 1; #day counter + +#$rss .= "\n\n"; +$uid_arr = array(); + do { + $thisdate=date('Ymd', strtotime($thisdate)); + #echo "Date: $thisdate
\n"; + $dayofweek = localizeDate ("%a %b %e %Y", strtotime($thisdate)); + if (isset($master_array[($thisdate)]) && sizeof($master_array[($thisdate)]) > 0) { + foreach ($master_array[("$thisdate")] as $event_times) { + foreach ($event_times as $uid=>$val) { + #handle multiday all day events + if(!$val["event_start"]){ + if (isset($uid_arr[$uid])){ + $uid_arr[$uid] .= "+$dayofweek" ; + continue; + }else{ + $uid_arr[$uid] = "$dayofweek" ; + } + $event_start = $lang['l_all_day']; + }else{ + $event_start = @$val["event_start"]; + $event_start = date ($timeFormat, @strtotime ("$event_start")); + } + $event_text = stripslashes(urldecode($val["event_text"])); + $event_text = strip_tags($event_text, ''); + # $event_text = urlencode($event_text); + #uncomment for shorter event text with ... + # $event_text = word_wrap($event_text, 21, $tomorrows_events_lines); + $description = stripslashes(urldecode($val["description"])); + $description = strip_tags($description, ''); + + $rss_title = htmlspecialchars ("$dayofweek: $event_text"); + /* original link, not valid url coding + $rss_link = htmlspecialchars ("$default_path/day.php?getdate=$thisdate&cal=$cal&cpath=$cpath"); + */ + /* Add %20's for spaces for the calendar links to make them valid url's */ + $urlcal = rawurlencode ("$cal"); + $rss_link = ("$default_path/day.php?getdate=$thisdate&cal=$urlcal"); + if (isset($cpath) && $cpath !=''){ + $rss_link .= "&cpath=$cpath"; + } + /* End link modification */ + $rss_description = htmlspecialchars ("$dayofweek $event_start: $description"); + + #$rss .= ''."\n"; + $rss .= ''."\n"; + + /* Create guid, and use uid to make link unique */ + $rss .= ''.$rss_link.'&uid='.$uid.''."\n"; + /* End guid modification */ + $rss .= ''.$rss_title.''."\n"; + $rss .= ''.date("Y-m-d", strtotime($thisdate)).'T'.date("h:m:s",$val["event_start"]).''."\n"; + $rss .= ''.date("Y-m-d", strtotime($thisdate)).'T'.date("h:m:s",$val["event_start"]).''."\n"; + + $rss .= ''.$rss_link.''."\n"; + $rss .= ''.$rss_description.''."\n"; + if (isset($val['location']) && $val['location'] !=''){ + $rss .= ''.$val['location']."\n"; + } + $rss .= ''."\n"; + $events_count++; + } + } + } + if (($events_count < 1) && ($i == $numdays)) { + $rss .= ''."\n"; + $rss .= 'No events found'."\n"; + $rss .= ''.htmlspecialchars ("$default_path").''."\n"; + $rss .= ''."\n"; + } + $thisdate++; + $i++; + } while ($i <= $numdays); + +#$rss .= "\n\n"; +$rss .= "\n\n\n"; + +foreach ($uid_arr as $uid=>$date_range){ + #echo "date_range:$date_range
"; + + if(strpos($date_range,"+")>0){ + #echo "+ in date_range
"; + $temp = explode("+",$date_range); + $date_range = $temp[0].'-'.array_pop($temp); + } + $rss = str_replace("$uid\n".$lang['l_all_day']."","$uid\n$date_range", $rss); + +} +header ("Content-Type: text/xml"); + +echo "$rss"; + +?> Binary files oldcal/rss/xml.gif and newcal/rss/xml.gif differ diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/search.php newcal/search.php --- oldcal/search.php 2005-11-23 23:28:34.000000000 -0500 +++ newcal/search.php 2006-04-09 21:22:53.000000000 -0400 @@ -2,7 +2,7 @@ define('BASE','./'); $current_view = 'search'; -$display_date = $results_lang; +$display_date = $lang['l_results']; require_once(BASE.'functions/ical_parser.php'); require_once(BASE.'functions/list_functions.php'); require_once(BASE.'functions/template.php'); @@ -287,23 +287,11 @@ 'footer' => BASE.'templates/'.$template.'/footer.tpl', 'sidebar' => BASE.'templates/'.$template.'/sidebar.tpl', 'event_js' => BASE.'functions/event.js', - 'charset' => $charset, - 'default_path' => '', - 'template' => $template, - 'cal' => $cal, - 'getdate' => $getdate, - 'calendar_name' => $cal_displayname, - 'display_date' => $display_date, - 'current_view' => $current_view, - 'sidebar_date' => $sidebar_date, - 'rss_powered' => $rss_powered, - 'rss_available' => '', - 'rss_valid' => '', - 'show_search' => '' )); $page->replace_tags(array( + 'version' => $phpicalendar_version, 'formatted_search' => $formatted_search, 'l_results' => $lang['l_results'], 'l_query' => $lang['l_query'], Binary files oldcal/templates/.DS_Store and newcal/templates/.DS_Store differ diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/default/calendar_nav.tpl newcal/templates/default/calendar_nav.tpl --- oldcal/templates/default/calendar_nav.tpl 2005-11-11 00:15:25.000000000 -0500 +++ newcal/templates/default/calendar_nav.tpl 2006-03-16 01:03:24.000000000 -0500 @@ -27,27 +27,27 @@


- + {SEARCH_BOX} -
- - - - + + + + +
-
-
Pick Multiple:
+
+
{L_PICK_MULTIPLE}:
- - + +
- +
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/default/footer.tpl newcal/templates/default/footer.tpl --- oldcal/templates/default/footer.tpl 2005-11-23 03:05:30.000000000 -0500 +++ newcal/templates/default/footer.tpl 2006-04-09 21:17:35.000000000 -0400 @@ -1,4 +1,4 @@ -

{L_POWERED_BY} PHP iCalendar 2.2
+

{L_POWERED_BY} PHP iCalendar {VERSION}

diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/default/header.tpl newcal/templates/default/header.tpl --- oldcal/templates/default/header.tpl 2005-09-07 02:08:02.000000000 -0400 +++ newcal/templates/default/header.tpl 2006-04-02 05:29:39.000000000 -0400 @@ -6,7 +6,7 @@ {CALENDAR_NAME} - {DISPLAY_DATE} - + {EVENT_JS} @@ -16,4 +16,5 @@ + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/default/images/CVS/Entries newcal/templates/default/images/CVS/Entries --- oldcal/templates/default/images/CVS/Entries 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/default/images/CVS/Entries 2006-03-15 19:11:03.000000000 -0500 @@ -0,0 +1,38 @@ +/allday_1.gif/1.1/Wed Feb 4 05:55:15 2004/-kb/ +/allday_2.gif/1.1/Thu Feb 5 03:14:55 2004/-kb/ +/allday_3.gif/1.1/Thu Feb 5 03:14:55 2004/-kb/ +/allday_4.gif/1.1/Thu Feb 5 03:14:55 2004/-kb/ +/allday_5.gif/1.1/Thu Feb 5 04:07:57 2004/-kb/ +/allday_6.gif/1.2/Sun May 23 23:31:22 2004/-kb/ +/allday_7.gif/1.1/Thu Feb 5 04:07:57 2004/-kb/ +/allday_bg.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/allday_dot.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/back.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/day_on.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/day_title.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/download_arrow.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/event_dot.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/left_arrows.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/left_day.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/month_on.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/monthdot_1.gif/1.1/Mon Feb 2 23:11:25 2004/-kb/ +/monthdot_2.gif/1.1/Mon Feb 2 23:11:29 2004/-kb/ +/monthdot_3.gif/1.1/Mon Feb 2 23:11:29 2004/-kb/ +/monthdot_4.gif/1.1/Mon Feb 2 23:11:29 2004/-kb/ +/monthdot_5.gif/1.1/Mon Feb 2 23:11:29 2004/-kb/ +/monthdot_6.gif/1.2/Sun May 23 23:31:23 2004/-kb/ +/monthdot_7.gif/1.1/Mon Feb 2 23:11:29 2004/-kb/ +/printer.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/right_arrows.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/right_day.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/search.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/shadow_l.gif/1.1/Fri Jan 30 07:34:19 2004/-kb/ +/shadow_m.gif/1.1/Fri Jan 30 07:34:19 2004/-kb/ +/shadow_r.gif/1.1/Fri Jan 30 07:34:19 2004/-kb/ +/side_bg.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/smallicon.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/spacer.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/time_bg.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/week_on.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +/year_on.gif/1.1/Mon Jan 26 22:51:33 2004/-kb/ +D diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/default/images/CVS/Repository newcal/templates/default/images/CVS/Repository --- oldcal/templates/default/images/CVS/Repository 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/default/images/CVS/Repository 2006-03-15 19:11:01.000000000 -0500 @@ -0,0 +1 @@ +phpicalendar/templates/default/images diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/default/images/CVS/Root newcal/templates/default/images/CVS/Root --- oldcal/templates/default/images/CVS/Root 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/default/images/CVS/Root 2006-03-15 19:11:01.000000000 -0500 @@ -0,0 +1 @@ +:ext:jimhu@cvs.sourceforge.net:/cvsroot/phpicalendar diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/default/month_medium.tpl newcal/templates/default/month_medium.tpl --- oldcal/templates/default/month_medium.tpl 2004-05-19 23:37:06.000000000 -0400 +++ newcal/templates/default/month_medium.tpl 2006-02-08 03:07:54.000000000 -0500 @@ -1,6 +1,6 @@ - + + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/default/print.tpl newcal/templates/default/print.tpl --- oldcal/templates/default/print.tpl 2005-12-01 01:25:09.000000000 -0500 +++ newcal/templates/default/print.tpl 2006-03-20 03:18:22.000000000 -0500 @@ -13,6 +13,7 @@ +
{MONTH_TITLE}{MONTH_TITLE}
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/default/preferences.tpl newcal/templates/default/preferences.tpl --- oldcal/templates/default/preferences.tpl 2005-11-27 02:56:31.000000000 -0500 +++ newcal/templates/default/preferences.tpl 2006-02-08 03:07:54.000000000 -0500 @@ -46,7 +46,7 @@ {L_SELECT_CAL}: -
{L_SELECT_VIEW}:{L_DAY} {L_WEEK} {L_MONTH}{L_YEAR}
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/default/rss_index.tpl newcal/templates/default/rss_index.tpl --- oldcal/templates/default/rss_index.tpl 2004-05-19 14:26:10.000000000 -0400 +++ newcal/templates/default/rss_index.tpl 2006-04-05 02:45:23.000000000 -0400 @@ -35,10 +35,11 @@
- {L_THIS_SITE_IS} RSS 0.91 enabled.
+

{RSS_LIST}
+

{RSS_DOCINFO}

diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/default/search_box.tpl newcal/templates/default/search_box.tpl --- oldcal/templates/default/search_box.tpl 2005-04-13 10:57:58.000000000 -0400 +++ newcal/templates/default/search_box.tpl 2006-02-08 03:07:54.000000000 -0500 @@ -1,9 +1,9 @@ -
+
{L_SEARCH}:
- - - - - + + + + +
\ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/default/sidebar.tpl newcal/templates/default/sidebar.tpl --- oldcal/templates/default/sidebar.tpl 2006-01-12 22:03:14.000000000 -0500 +++ newcal/templates/default/sidebar.tpl 2006-03-16 01:04:45.000000000 -0500 @@ -83,7 +83,7 @@


- + @@ -93,16 +93,16 @@
- +
-
-
Pick Multiple:
+
+
{L_PICK_MULTIPLE}:
- - + +
- +
@@ -130,7 +130,7 @@ {T_ALLDAY}
- • {T_EVENT}
+ • {T_EVENT}
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/default/sidebar_year.tpl newcal/templates/default/sidebar_year.tpl --- oldcal/templates/default/sidebar_year.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/default/sidebar_year.tpl 2006-03-20 03:18:55.000000000 -0500 @@ -0,0 +1,196 @@ + +
+ + + + + + + + + + + + + + + + + + + + + +
{L_LOGIN}
+
+ {L_INVALID_LOGIN} +
+
{L_USERNAME}:
{L_PASSWORD}:
+
+ + + + + + +
+
+ + + + + + + + + + +
{L_PREV}{SIDEBAR_DATE}{L_NEXT}
+
+ {L_LEGEND}:
+ {LEGEND} + {L_GOPRINT}
+ + {L_PREFERENCES}
+ + + {L_SUBSCRIBE} | {L_DOWNLOAD}
+ + + {L_LOGOUT} {USERNAME} + +
+
+ + + + + + +
+
+ + + + + + + + +
{L_JUMP}
+
+
+
+
+
+
+
+ + +
+ + {SEARCH_BOX} + + +
+ + + +
+ +
+
{L_PICK_MULTIPLE}:
+
+ + +
+ +
+
+
+ + + + + + +
+
+ + + + + + + + + + +
{L_TOMORROWS}
+
+ + {T_ALLDAY}
+ + + • {T_EVENT}
+ +
+
+ + + + + + +
+
+ + + + + + + + + + + + +
{L_TODO}
+
+ + + + + + + + + + + + + + + + + + + + + + +
{VTODO_TEXT}
{VTODO_TEXT}
{VTODO_TEXT}
+
+
+ + + + + + +
+
+ + + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/default/year.tpl newcal/templates/default/year.tpl --- oldcal/templates/default/year.tpl 2005-11-23 01:08:45.000000000 -0500 +++ newcal/templates/default/year.tpl 2006-03-20 03:20:08.000000000 -0500 @@ -56,6 +56,10 @@ {MONTH_MEDIUM|03} + + + + {SIDEBAR} Binary files oldcal/templates/green/.DS_Store and newcal/templates/green/.DS_Store differ diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/admin.tpl newcal/templates/green/admin.tpl --- oldcal/templates/green/admin.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/admin.tpl 2005-07-11 04:01:16.000000000 -0400 @@ -0,0 +1,132 @@ +{HEADER} +
+ + + + + + + + + + + + + +
+ + + + + +

{L_ADMIN_HEADER}

{L_ADMIN_SUBHEAD}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + {L_LOGOUT}  + +
+ + + + + +
+ + {L_INVALID_LOGIN}

+ + + +
+ + + + + + + + + + + + + + +
{L_USERNAME}:
{L_PASSWORD}:
 
+
+ + + + + {L_ADDUPDATE_CAL}
+ {L_ADDUPDATE_DESC}

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_CAL_FILE} 1:
{L_CAL_FILE} 2:
{L_CAL_FILE} 3:
{L_CAL_FILE} 4:
{L_CAL_FILE} 5:
 
{ADDUPDATE_MSG}  
+
+ + {L_DELETE_CAL} +
+ + {DELETE_TABLE} +
+ +

+

{DELETE_MSG}  

+
+ + +
+
+ + + + + + +
+{FOOTER} + + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/calendar_nav.tpl newcal/templates/green/calendar_nav.tpl --- oldcal/templates/green/calendar_nav.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/calendar_nav.tpl 2006-03-23 19:57:09.000000000 -0500 @@ -0,0 +1,113 @@ + + + + + + +
+ {MONTH_SMALL|-1} + + + + + + +
+ 		+ + + + + + +
+ + + + + + + +
{L_JUMP}
+
+
+
+
+
+
+
+ + +
+ + {SEARCH_BOX} + + +
+ + + + +
+ +
+
{L_PICK_MULTIPLE}:
+
+ + +
+ +
+
+
+ + + + + + +
+ 		+ + + + + + + + + +
{SIDEBAR_DATE}
+
+ {L_LEGEND}:
+ {LEGEND} + {L_GOPRINT}
+ + {L_PREFERENCES}
+ + + {L_SUBSCRIBE} | {L_DOWNLOAD}
+ + + Logout {USERNAME} + +
+
+ + + + + + +
+
+ 		+ {MONTH_SMALL|+1} + + + + + + +
+
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/day.tpl newcal/templates/green/day.tpl --- oldcal/templates/green/day.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/day.tpl 2005-11-19 01:55:40.000000000 -0500 @@ -0,0 +1,104 @@ +{HEADER} +
+ + + + + + +
+ + + + + + + + + + +
+ + + + + + + + +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+ + + + + + + + +
+ « + + {DAY} + + » +
+
+
+ +
+ {ALLDAY} +
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+
{CONFIRMED}{EVENT_START} - {EVENT_END}
+
{EVENT}
+
+ +
9:00 AM 
 
 
 
+
+ + + + + + +
+ 		+ {SIDEBAR} +
+
+{FOOTER} + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/default.css newcal/templates/green/default.css --- oldcal/templates/green/default.css 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/default.css 2006-04-09 15:52:21.000000000 -0400 @@ -0,0 +1,161 @@ +/* Style sheet for the green calendar */ + +table, td {font: 11px Verdana, Arial, sans-serif; color: #000;} + +/* Background images for tables */ +.tbll {background: url(images/shadow_l.gif) no-repeat; width:8px} +.tblbot {background: url(images/shadow_m.gif) repeat-x; width:100%} +.tblr {background: url(images/shadow_r.gif) no-repeat; width:8px} + +.alldaybg_1 {background: url(images/allday_1.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_2 {background: url(images/allday_2.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_3 {background: url(images/allday_3.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_4 {background: url(images/allday_4.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_5 {background: url(images/allday_5.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_6 {background: url(images/allday_6.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_7 {background: url(images/allday_7.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} + +.rowOn { background-color: #cfc; border-top: 1px solid #fff; border-left: 1px solid #fff; } +.rowOn2 { background-color: #cfc; border-top: 1px solid #fff; } +.rowOff { background-color: #E1E8F1; border-top: 1px solid #fff; border-left: 1px solid #fff; } +.rowOff2 { background-color: #E1E8F1; border-top: 1px solid #fff; } +.rowToday { background-color: #cff; border-top: 1px solid #fff; border-left: 1px solid #fff; } + +.padd { padding: 2px; } + +/* Styles for day and week events */ +.eventbg_1 { background-color: #00790c; padding: 2px;} +.eventbg_2 { background-color: #00c400; padding: 2px;} +.eventbg_3 { background-color: #005050; padding: 2px;} +.eventbg_4 { background-color: #5abf04; padding: 2px;} +.eventbg_5 { background-color: #506000; padding: 2px;} +.eventbg_6 { background-color: #ac9200; padding: 2px;} +.eventbg_7 { background-color: #00a28f; padding: 2px;} + +#allday a { font-size: 9px; color: #fff; font-weight: 900; text-decoration:none;} +#allday a:hover { text-decoration:underline;} + +.eventbg2_1 { background-color: #00992c; border: 1px solid #00790c; } +.eventbg2_2 { background-color: #00e400; border: 1px solid #00c400; } +.eventbg2_3 { background-color: #007070; border: 1px solid #005050; } +.eventbg2_4 { background-color: #7adf24; border: 1px solid #5abf04; } +.eventbg2_5 { background-color: #708000; border: 1px solid #506000; } +.eventbg2_6 { background-color: #ccb21f; border: 1px solid #ac9200; } +.eventbg2_7 { background-color: #12c2af; border: 1px solid #00a28f; } + +.alldaybg_8 {background: url(images/allday_8.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.eventbg_8 { background-color: #008888; padding: 2px;} +.eventbg2_8 { background-color: #00AAAA; border: 1px solid #73738C; } + +.alldaybg_9 {background: url(images/allday_9.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.eventbg_9 { background-color: #DDDD00; padding: 2px;} +.eventbg2_9 { background-color: #FFFF00; border: 1px solid #73738C; } + +.alldaybg_10 {background: url(images/allday_10.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.eventbg_10 { background-color: #000068; padding: 2px;} +.eventbg2_10 { background-color: #000089; border: 1px solid #73738C; } + +.alldaybg_11 {background: url(images/allday_11.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.eventbg_11 { background-color: #009A78; padding: 2px;} +.eventbg2_11 { background-color: #00AA88; border: 1px solid #73738C; } + + +.dayborder { background-color: #fff; border-top: 1px solid #A1A5A9; } +.dayborder2 { background-color: #fff; border-top: 1px dashed #ccc; } + +.title { background-image: url(images/time_bg.gif); padding: 5px; } +.title h1 { font-family: Helvetica, sans-serif; font-size: 18px; color: #000; margin: 0px;} + +/* Month View */ + +.monthback { background-color: #A1A5A9; } +.monthreg { background-color: #fff; height: 105px; width: 105px; text-align: left; vertical-align: top; } +.monthoff { background-color: #F2F2F2; height: 105px; width: 105px; text-align: left; vertical-align: top; } +.monthon { background-color: #F2F9FF; height: 105px; width: 105px; text-align: left; vertical-align: top; } +.montheventtop { background-image: url(images/side_bg.gif); border-top: 1px solid #A1A5A9; } +.montheventline { border-right: 1px dotted #A1A5A9; } + +/* Year View */ + +.medtitle { background-image: url(images/side_bg.gif); height: 20px; margin-top: 3px; font-weight: 900; } +.yearreg { background-color: #fff; height: 30px; width: 30px; text-align: right; vertical-align: top; font-size: 9px; } +.yearoff { background-color: #F2F2F2; height: 30px; width: 30px; text-align: right; vertical-align: top; font-size: 9px; } +.yearon { background-color: #F2F9FF; height: 30px; width: 30px; text-align: right; vertical-align: top; font-size: 9px; } +.yearmonth { background-color: #ccc; } +.yearweek { background-color: #eee; width: 30px; font-size: 9px; font-weight: 900; text-align: center; height: 15px; } + + +/* older styles */ + +/*.eventborder { background-image: url(images/day_title.gif); border: 1px #006699 solid; }*/ +.eventborder { background-color: #006600; border: 1px #003300 solid; } + +.eventbg { background-color: #339933; } + +.calborder { background-color: #ffffff; border: 1px #A1A5A9 solid; } + +.dateback { background-color: #eee; } +.weekborder { border-top: 1px dashed #A1A5A9; border-right: 1px solid #A1A5A9; } +.weekborder2 { border-right: 1px solid #A1A5A9; } +.timeborder { border-right: 2px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); } +.timeborder2 { border-right: 2px solid #A1A5A9; border-top: 1px solid #A1A5A9; background-image: url(images/time_bg.gif); } +.navback { background-image: url(images/time_bg.gif); } +.sideback { background-image: url(images/side_bg.gif); } + + +/* Link colors and attributes */ +/* This is the main link style */ +a.psf { text-decoration: none; } +a.psf:link { color: #009900; } +a.psf:visited { color: #009900; } +a.psf:active { color: #009900; } +a.psf:hover { color: #003300; text-decoration: underline; } + +/* This is the link style for the mini-cals */ +a.ps2 { text-decoration: underline; } +a.ps2:link { color: #009900; } +a.ps2:visited { color: #009900; } +a.ps2:active { color: #33CC66; } +a.ps2:hover { color: #003300; } + +/* This is the link style for year months */ +a.ps3 { text-decoration: none; } +a.ps3:link { color: #000; } +a.ps3:visited { color: #000; } +a.ps3:active { color: #000; } +a.ps3:hover { color: #000; text-decoration: underline; } + +/* This is the link style for events */ +a.ps { text-decoration: none; } +a.ps:link { color: #fff; } +a.ps:visited { color: #fff; } +a.ps:active { color: #fff; } +a.ps:hover { color: #fff; text-decoration: underline; } + +/* Body attributes */ + +body { background-image: url(images/background.gif); } + +/* CSS definitions for fonts */ + +.V9 { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; color: #000000; } +.V10W { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 10px; color: #FFFFFF; text-decoration: none;} +.V9W { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; color: #FFFFFF; text-decoration: none;} +.V10WB { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 10px; color: #FFFFFF; font-weight: 900; } +.V9G { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; color: #666666; } +.V10 { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 10px; color: #000000; } +.V9BOLD { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; font-weight: 900; } +.G10 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #0066FF; } +.G10B { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #000000; } +.G10BOLD { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; font-weight: 900; } +.G10G { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #A1A5A9; } +.V12 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; color: #000000; } +/*h1 { font-family: Helvetica, sans-serif; font-size: 18px; color: #000000; }*/ +.eventfont { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #FFFFFF; } + + +/* Length of the form drop downs */ + +.query_style { font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; } +.search_style { font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; } +.login_style { font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 80px; margin-bottom: 0; } diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/error.tpl newcal/templates/green/error.tpl --- oldcal/templates/green/error.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/error.tpl 2004-12-18 13:37:52.000000000 -0500 @@ -0,0 +1,43 @@ +{HEADER} +
+ + + + +
+ + + + + + + +
+ + + + + + +
{L_ERROR_WINDOW}
+
+ + + + +
+ {ERROR_MSG}
+ [What does this mean?] +
+
+ {ERROR_CALENDAR} +
+
+ {L_ERROR_BACK} +
+ +
+
+
+
+{FOOTER} \ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/event.tpl newcal/templates/green/event.tpl --- oldcal/templates/green/event.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/event.tpl 2005-09-06 22:52:07.000000000 -0400 @@ -0,0 +1,43 @@ + + + + + {CAL} + + + +
+ + + + + + + +
{CAL_TITLE_FULL}
+
+

{EVENT_TEXT} - ({EVENT_TIMES})

+ +

{DESCRIPTION}

+ +

+ + {L_ORGANIZER}: {ORGANIZER}
+ + + {L_ATTENDEE}: {ATTENDEE}
+ + + {L_STATUS}: {STATUS}
+ + + {L_LOCATION}: {LOCATION}
+ +

+
+
+
+ + + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/footer.tpl newcal/templates/green/footer.tpl --- oldcal/templates/green/footer.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/footer.tpl 2006-04-09 21:17:22.000000000 -0400 @@ -0,0 +1,15 @@ +

{L_POWERED_BY} PHP iCalendar {VERSION}
+ +

+ +[Valid RSS] +

+ + +{L_THIS_SITE_IS} RSS-Enabled
+ + +
+ + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/header.tpl newcal/templates/green/header.tpl --- oldcal/templates/green/header.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/header.tpl 2006-04-02 05:29:55.000000000 -0400 @@ -0,0 +1,20 @@ + + + + + {CALENDAR_NAME} - {DISPLAY_DATE} + + + + + {EVENT_JS} + + + Binary files oldcal/templates/green/images/.DS_Store and newcal/templates/green/images/.DS_Store differ Binary files oldcal/templates/green/images/allday_1.gif and newcal/templates/green/images/allday_1.gif differ Binary files oldcal/templates/green/images/allday_2.gif and newcal/templates/green/images/allday_2.gif differ Binary files oldcal/templates/green/images/allday_3.gif and newcal/templates/green/images/allday_3.gif differ Binary files oldcal/templates/green/images/allday_4.gif and newcal/templates/green/images/allday_4.gif differ Binary files oldcal/templates/green/images/allday_5.gif and newcal/templates/green/images/allday_5.gif differ Binary files oldcal/templates/green/images/allday_6.gif and newcal/templates/green/images/allday_6.gif differ Binary files oldcal/templates/green/images/allday_7.gif and newcal/templates/green/images/allday_7.gif differ Binary files oldcal/templates/green/images/allday_bg.gif and newcal/templates/green/images/allday_bg.gif differ Binary files oldcal/templates/green/images/allday_dot.gif and newcal/templates/green/images/allday_dot.gif differ Binary files oldcal/templates/green/images/back.gif and newcal/templates/green/images/back.gif differ Binary files oldcal/templates/green/images/background.gif and newcal/templates/green/images/background.gif differ Binary files oldcal/templates/green/images/day_on.gif and newcal/templates/green/images/day_on.gif differ Binary files oldcal/templates/green/images/day_title.gif and newcal/templates/green/images/day_title.gif differ Binary files oldcal/templates/green/images/download_arrow.gif and newcal/templates/green/images/download_arrow.gif differ Binary files oldcal/templates/green/images/event_dot.gif and newcal/templates/green/images/event_dot.gif differ Binary files oldcal/templates/green/images/left_arrows.gif and newcal/templates/green/images/left_arrows.gif differ Binary files oldcal/templates/green/images/left_day.gif and newcal/templates/green/images/left_day.gif differ Binary files oldcal/templates/green/images/month_on.gif and newcal/templates/green/images/month_on.gif differ Binary files oldcal/templates/green/images/monthdot_1.gif and newcal/templates/green/images/monthdot_1.gif differ Binary files oldcal/templates/green/images/monthdot_2.gif and newcal/templates/green/images/monthdot_2.gif differ Binary files oldcal/templates/green/images/monthdot_3.gif and newcal/templates/green/images/monthdot_3.gif differ Binary files oldcal/templates/green/images/monthdot_4.gif and newcal/templates/green/images/monthdot_4.gif differ Binary files oldcal/templates/green/images/monthdot_5.gif and newcal/templates/green/images/monthdot_5.gif differ Binary files oldcal/templates/green/images/monthdot_6.gif and newcal/templates/green/images/monthdot_6.gif differ Binary files oldcal/templates/green/images/monthdot_7.gif and newcal/templates/green/images/monthdot_7.gif differ Binary files oldcal/templates/green/images/printer.gif and newcal/templates/green/images/printer.gif differ Binary files oldcal/templates/green/images/right_arrows.gif and newcal/templates/green/images/right_arrows.gif differ Binary files oldcal/templates/green/images/right_day.gif and newcal/templates/green/images/right_day.gif differ Binary files oldcal/templates/green/images/search.gif and newcal/templates/green/images/search.gif differ Binary files oldcal/templates/green/images/shadow_l.gif and newcal/templates/green/images/shadow_l.gif differ Binary files oldcal/templates/green/images/shadow_m.gif and newcal/templates/green/images/shadow_m.gif differ Binary files oldcal/templates/green/images/shadow_r.gif and newcal/templates/green/images/shadow_r.gif differ Binary files oldcal/templates/green/images/side_bg.gif and newcal/templates/green/images/side_bg.gif differ Binary files oldcal/templates/green/images/smallicon.gif and newcal/templates/green/images/smallicon.gif differ Binary files oldcal/templates/green/images/spacer.gif and newcal/templates/green/images/spacer.gif differ Binary files oldcal/templates/green/images/time_bg.gif and newcal/templates/green/images/time_bg.gif differ Binary files oldcal/templates/green/images/week_on.gif and newcal/templates/green/images/week_on.gif differ Binary files oldcal/templates/green/images/year_on.gif and newcal/templates/green/images/year_on.gif differ diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/month.tpl newcal/templates/green/month.tpl --- oldcal/templates/green/month.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/month.tpl 2005-11-19 01:56:27.000000000 -0500 @@ -0,0 +1,88 @@ +{HEADER} +
+ + + + +
+ + + + + +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ {MONTH_LARGE|+0} + + + + + + +
+
+ {CALENDAR_NAV} + +
+ + + + + + + +
+ + + + + + +
{L_PREV}

{L_THIS_MONTHS}

{L_NEXT}
+
+ + + + + + + + + + + + + +
+ {START_DATE}
+ {START_TIME} + 		+ {EVENT_TEXT}
{CALNAME} +
+ {START_DATE}
+ {START_TIME} + 		+ {EVENT_TEXT}
{CALNAME} +
+
+ + + + + + +
+ +
+{FOOTER} diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/month_large.tpl newcal/templates/green/month_large.tpl --- oldcal/templates/green/month_large.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/month_large.tpl 2004-05-19 23:59:37.000000000 -0400 @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + +
+
{LOOP_WEEKDAY}
+
+
+ {DAY} +
+ {ALLDAY} + {EVENT} + 		+
+ {DAY} +
+ {ALLDAY} + {EVENT} + 		+
+ {DAY} +
+ {ALLDAY} + {EVENT} +
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/month_medium.tpl newcal/templates/green/month_medium.tpl --- oldcal/templates/green/month_medium.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/month_medium.tpl 2006-03-23 19:59:55.000000000 -0500 @@ -0,0 +1,45 @@ + + + + + + + +
{MONTH_TITLE}
+ + + + + + + + + + + + + + + + + + + + + +
{LOOP_WEEKDAY}
+ {DAY} + + {DAY} +
+ {ALLDAY} + {EVENT} +
+ 		+ {DAY} +
+ {ALLDAY} + {EVENT} +
+
+
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/month_small.tpl newcal/templates/green/month_small.tpl --- oldcal/templates/green/month_small.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/month_small.tpl 2004-09-13 15:35:23.000000000 -0400 @@ -0,0 +1,38 @@ + + + + + + + +
{MONTH_TITLE}
+ + + + + + + + + + + + + + + + + + + + + +
{LOOP_WEEKDAY}
+ {DAY} + + {DAY} + + {DAY} +
+
+
\ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/preferences.tpl newcal/templates/green/preferences.tpl --- oldcal/templates/green/preferences.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/preferences.tpl 2006-03-23 20:00:10.000000000 -0500 @@ -0,0 +1,102 @@ +{HEADER} +
+ + + + + + + + + + +
+ + + + + +

{L_PREFERENCES}

{L_PREFS_SUBHEAD}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + + + + + + +
{MESSAGE}
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_SELECT_LANG}:
{L_SELECT_CAL}: +
{L_SELECT_VIEW}:
{L_SELECT_TIME}:
{L_SELECT_DAY}:
{L_SELECT_STYLE}:
{L_UNSET_PREFS}:
 
+
+
+
+ + + + + + +
+ +
+{FOOTER} diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/print.tpl newcal/templates/green/print.tpl --- oldcal/templates/green/print.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/print.tpl 2006-03-23 20:00:58.000000000 -0500 @@ -0,0 +1,81 @@ +{HEADER} +
+ + + + + + + + + + +
+ + + + + +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}
+ Calendar view		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + +
+ +
{DAYOFMONTH}
+ +
+ + + + + + + + + + + + + + + + + + + + + +
{L_TIME}:{EVENT_START}
{L_LOCATION}:{LOCATION}
{L_SUMMARY}:{EVENT_TEXT}
{L_DESCRIPTION}:{DESCRIPTION}
+
+ + + + +
{L_NO_RESULTS}
+ +
+
+ + + + + + +
+
+{FOOTER} \ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/rss_index.tpl newcal/templates/green/rss_index.tpl --- oldcal/templates/green/rss_index.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/rss_index.tpl 2006-04-05 02:45:50.000000000 -0400 @@ -0,0 +1,60 @@ +{HEADER} +
+ + + + +
+ + + + + + + + + + +
+ + + + + +

{L_RSS_INFO}

{L_RSS_SUBHEAD}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + + +
+
+
+ {RSS_LIST} +
+

{RSS_DOCINFO}

+
+
+
+ + + + + + +
+
+ +{FOOTER} \ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/search.tpl newcal/templates/green/search.tpl --- oldcal/templates/green/search.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/search.tpl 2005-10-30 01:15:47.000000000 -0500 @@ -0,0 +1,115 @@ +{HEADER} +
+ + + + + + + + + + +
+ + + + + +

{L_RESULTS}

{CALENDAR_NAME} {L_CALENDAR}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+
+

{L_QUERY}: {FORMATTED_SEARCH}

+ + {DAYOFMONTH}
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
{L_TIME}:{EVENT_START}
{L_LOCATION}:{LOCATION}
{L_SUMMARY}:{EVENT_TEXT}
{L_RECURRING_EVENT}:{RECUR}
{L_DESCRIPTION}:{DESCRIPTION}
+
+ + {L_EXCEPTION}: {DAYOFMONTH}
+
+ + + + + + + + + + + + + + + + + + + + + +
{L_TIME}:{EVENT_START}
{L_SUMMARY}:{EVENT_TEXT}
{L_RECURRING_EVENT}:{EXCEPT_RECUR}
{L_DESCRIPTION}:{EXCEPT_DESCRIPTION}
+
+ +
+ + + +
+

{L_NO_RESULTS}

+
+ + +
+ {SEARCH_BOX} +
+
+
+
+ + + + + + +
+
+ +{FOOTER} + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/search_box.tpl newcal/templates/green/search_box.tpl --- oldcal/templates/green/search_box.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/search_box.tpl 2006-03-23 20:01:37.000000000 -0500 @@ -0,0 +1,9 @@ +
+
{L_SEARCH}:
+
+ + + + + +
\ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/seminar.tpl newcal/templates/green/seminar.tpl --- oldcal/templates/green/seminar.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/seminar.tpl 2004-09-27 12:31:30.000000000 -0400 @@ -0,0 +1,43 @@ + + + + + {CAL} + + + +
+ + + + + + + +
{CAL_TITLE_FULL}
+
+

{EVENT} - ({EVENT_TIMES})

+ +

{DESCRIPTION}

+ +

+ + + Host:: {ATTENDEE}
+ + + {L_STATUS}: {STATUS}
+ + + {L_LOCATION}: {LOCATION}
+ +

+
+
+
+ + + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/sidebar.tpl newcal/templates/green/sidebar.tpl --- oldcal/templates/green/sidebar.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/sidebar.tpl 2006-03-23 20:02:15.000000000 -0500 @@ -0,0 +1,225 @@ + +
+ + + + + + + + + + + + + + + + + + + + + +
{L_LOGIN}
+
+ {L_INVALID_LOGIN} +
+
{L_USERNAME}:
{L_PASSWORD}:
+
+ + + + + + +
+
+ + + + + + + + + + +
{L_PREV}{SIDEBAR_DATE}{L_NEXT}
+
+ {L_LEGEND}:
+ {LEGEND} + {L_GOPRINT}
+ + {L_PREFERENCES}
+ + + {L_SUBSCRIBE} | {L_DOWNLOAD}
+ + + {L_LOGOUT} {USERNAME} + +
+
+ + + + + + +
+
+ + + + + + + + +
{L_JUMP}
+
+
+
+
+
+
+
+ + +
+ + {SEARCH_BOX} + + +
+ + + +
+ +
+
{L_PICK_MULTIPLE}:
+
+ + +
+ +
+
+
+ + + + + + +
+
+ + + + + + + + + + +
{L_TOMORROWS}
+
+ + {T_ALLDAY}
+ + + • {T_EVENT}
+ +
+
+ + + + + + +
+
+ + + + + + + + + + + + +
{L_TODO}
+
+ + + + + + + + + + + + + + + + + + + + + + +
{VTODO_TEXT}
{VTODO_TEXT}
{VTODO_TEXT}
+
+
+ + + + + + +
+
+ + + + +{MONTH_SMALL|-1} + + + + + + +
+
+ +{MONTH_SMALL|+0} + + + + + + +
+
+ +{MONTH_SMALL|+1} + + + + + + +
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/todo.tpl newcal/templates/green/todo.tpl --- oldcal/templates/green/todo.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/todo.tpl 2004-12-18 13:35:39.000000000 -0500 @@ -0,0 +1,42 @@ + + + + + {CAL} + + + +
+ + + + + + + +
{CAL_TITLE_FULL}
+
+

{VTODO_TEXT}

+ +

{DESCRIPTION}

+ +

+ + {L_STATUS}: {STATUS}
+ + + {L_PRIORITY}: {PRIORITY}
+ + + {L_CREATED}: {START_DATE}
+ + + {L_DUE}: {DUE_DATE}
+ +

+
+
+
+ + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/week.tpl newcal/templates/green/week.tpl --- oldcal/templates/green/week.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/week.tpl 2005-11-19 01:59:28.000000000 -0500 @@ -0,0 +1,117 @@ +{HEADER} +
+ + + + + + +
+ + + + + + + +
+ + + + + +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
{CONFIRMED}{EVENT_START}
+
{EVENT}
+
+ +
+
 «
+ 		+
 ‹
+ 		+
› 
+ 		+
» 
+ 		+ {DAY} +
+ +
+ {ALLDAY} + +
+ +
9:00 AM 
 
 
 
+
+
+ + + + + + +
+ 		+ + + {SIDEBAR} +
+
+{FOOTER} diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/green/year.tpl newcal/templates/green/year.tpl --- oldcal/templates/green/year.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/green/year.tpl 2006-03-23 20:02:32.000000000 -0500 @@ -0,0 +1,132 @@ +{HEADER} +
+ + + + +
+ + + + + + +
+   + + + + + + + +
+ [Previous Year] + +

{THIS_YEAR}

+ 		+ [Next Year] +
+ 		+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {MONTH_MEDIUM|01} + + + + {MONTH_MEDIUM|02} + + + + {MONTH_MEDIUM|03} + + + {SIDEBAR}
+ +
+ {MONTH_MEDIUM|04} + + + + {MONTH_MEDIUM|05} + + + + {MONTH_MEDIUM|06} +
+ +
+ {MONTH_MEDIUM|07} + + + + {MONTH_MEDIUM|08} + + + + {MONTH_MEDIUM|09} +
+ +
+ {MONTH_MEDIUM|10} + + + + {MONTH_MEDIUM|11} + + + + {MONTH_MEDIUM|12} +
+
+{FOOTER} Binary files oldcal/templates/grey/.DS_Store and newcal/templates/grey/.DS_Store differ diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/admin.tpl newcal/templates/grey/admin.tpl --- oldcal/templates/grey/admin.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/admin.tpl 2005-07-11 04:01:16.000000000 -0400 @@ -0,0 +1,132 @@ +{HEADER} +
+ + + + + + + + + + + + + +
+ + + + + +

{L_ADMIN_HEADER}

{L_ADMIN_SUBHEAD}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + {L_LOGOUT}  + +
+ + + + + +
+ + {L_INVALID_LOGIN}

+ + + +
+ + + + + + + + + + + + + + +
{L_USERNAME}:
{L_PASSWORD}:
 
+
+ + + + + {L_ADDUPDATE_CAL}
+ {L_ADDUPDATE_DESC}

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_CAL_FILE} 1:
{L_CAL_FILE} 2:
{L_CAL_FILE} 3:
{L_CAL_FILE} 4:
{L_CAL_FILE} 5:
 
{ADDUPDATE_MSG}  
+
+ + {L_DELETE_CAL} +
+ + {DELETE_TABLE} +
+ +

+

{DELETE_MSG}  

+
+ + +
+
+ + + + + + +
+{FOOTER} + + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/calendar_nav.tpl newcal/templates/grey/calendar_nav.tpl --- oldcal/templates/grey/calendar_nav.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/calendar_nav.tpl 2006-03-23 19:57:09.000000000 -0500 @@ -0,0 +1,113 @@ + + + + + + +
+ {MONTH_SMALL|-1} + + + + + + +
+ 		+ + + + + + +
+ + + + + + + +
{L_JUMP}
+
+
+
+
+
+
+
+ + +
+ + {SEARCH_BOX} + + +
+ + + + +
+ +
+
{L_PICK_MULTIPLE}:
+
+ + +
+ +
+
+
+ + + + + + +
+ 		+ + + + + + + + + +
{SIDEBAR_DATE}
+
+ {L_LEGEND}:
+ {LEGEND} + {L_GOPRINT}
+ + {L_PREFERENCES}
+ + + {L_SUBSCRIBE} | {L_DOWNLOAD}
+ + + Logout {USERNAME} + +
+
+ + + + + + +
+
+ 		+ {MONTH_SMALL|+1} + + + + + + +
+
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/day.tpl newcal/templates/grey/day.tpl --- oldcal/templates/grey/day.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/day.tpl 2005-11-19 01:55:40.000000000 -0500 @@ -0,0 +1,104 @@ +{HEADER} +
+ + + + + + +
+ + + + + + + + + + +
+ + + + + + + + +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+ + + + + + + + +
+ « + + {DAY} + + » +
+
+
+ +
+ {ALLDAY} +
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+
{CONFIRMED}{EVENT_START} - {EVENT_END}
+
{EVENT}
+
+ +
9:00 AM 
 
 
 
+
+ + + + + + +
+ 		+ {SIDEBAR} +
+
+{FOOTER} + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/default.css newcal/templates/grey/default.css --- oldcal/templates/grey/default.css 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/default.css 2006-04-09 15:51:17.000000000 -0400 @@ -0,0 +1,139 @@ +/* Style sheet for the grey calendar */ + +table, td {font: 11px Verdana, Arial, sans-serif; color: #000;} + +/* Background images for tables */ +.tbll {background: url(images/shadow_l.gif) no-repeat; width:8px} +.tblbot {background: url(images/shadow_m.gif) repeat-x; width:100%} +.tblr {background: url(images/shadow_r.gif) no-repeat; width:8px} + +.alldaybg_1 {background: url(images/allday_1.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_2 {background: url(images/allday_2.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_3 {background: url(images/allday_3.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_4 {background: url(images/allday_4.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_5 {background: url(images/allday_5.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_6 {background: url(images/allday_6.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_7 {background: url(images/allday_7.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} + +.rowOn { background-color: #cfc; border-top: 1px solid #fff; border-left: 1px solid #fff; } +.rowOn2 { background-color: #cfc; border-top: 1px solid #fff; } +.rowOff { background-color: #E1E8F1; border-top: 1px solid #fff; border-left: 1px solid #fff; } +.rowOff2 { background-color: #E1E8F1; border-top: 1px solid #fff; } +.rowToday { background-color: #cff; border-top: 1px solid #fff; border-left: 1px solid #fff; } + +.padd { padding: 2px; } + +/* Styles for day and week events (varies)*/ +.eventbg_1 { background-color: #303030; padding: 2px;} +.eventbg_2 { background-color: #707060; padding: 2px;} +.eventbg_3 { background-color: #505060; padding: 2px;} +.eventbg_4 { background-color: #606060; padding: 2px;} +.eventbg_5 { background-color: #705f60; padding: 2px;} +.eventbg_6 { background-color: #608060; padding: 2px;} +.eventbg_7 { background-color: #a0a090; padding: 2px;} + + +.eventbg2_1 { background-color: #505050; border: 1px solid #303030; } +.eventbg2_2 { background-color: #909080; border: 1px solid #707060; } +.eventbg2_3 { background-color: #707080; border: 1px solid #505060; } +.eventbg2_4 { background-color: #808080; border: 1px solid #606060; } +.eventbg2_5 { background-color: #907f80; border: 1px solid #705f60; } +.eventbg2_6 { background-color: #80a080; border: 1px solid #608060; } +.eventbg2_7 { background-color: #c0c0b0; border: 1px solid #a0a090; } + +.dayborder { background-color: #fff; border-top: 1px solid #A1A5A9; } +.dayborder2 { background-color: #fff; border-top: 1px dashed #ccc; } + +.title { background-image: url(images/time_bg.gif); padding: 5px; } +.title h1 { font-family: Helvetica, sans-serif; font-size: 18px; color: #000; margin: 0px;} + +/* Month View */ + +.monthback { background-color: #A1A5A9; } +.monthreg { background-color: #fff; height: 105px; width: 105px; text-align: left; vertical-align: top; } +.monthoff { background-color: #F2F2F2; height: 105px; width: 105px; text-align: left; vertical-align: top; } +.monthon { background-color: #F2F9FF; height: 105px; width: 105px; text-align: left; vertical-align: top; } +.montheventtop { background-image: url(images/side_bg.gif); border-top: 1px solid #A1A5A9; } +.montheventline { border-right: 1px dotted #A1A5A9; } + +/* Year View */ + +.medtitle { background-image: url(images/side_bg.gif); height: 20px; margin-top: 3px; font-weight: 900; } +.yearreg { background-color: #fff; height: 30px; width: 30px; text-align: right; vertical-align: top; font-size: 9px; } +.yearoff { background-color: #F2F2F2; height: 30px; width: 30px; text-align: right; vertical-align: top; font-size: 9px; } +.yearon { background-color: #F2F9FF; height: 30px; width: 30px; text-align: right; vertical-align: top; font-size: 9px; } +.yearmonth { background-color: #ccc; } +.yearweek { background-color: #eee; width: 30px; font-size: 9px; font-weight: 900; text-align: center; height: 15px; } + + +/* older styles */ + +.eventborder { background-image: url(images/day_title.gif); border: 1px #006699 solid; } +.eventbg { background-color: #6699CC; } + +.calborder { background-color: #fff; border: 1px #A1A5A9 solid; } +.dateback { background-color: #eee; } +.weekborder { border-top: 1px dashed #A1A5A9; border-right: 1px solid #A1A5A9; } +.weekborder2 { border-right: 1px solid #A1A5A9; } +.timeborder { border-right: 2px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); } +.timeborder2 { border-right: 2px solid #A1A5A9; border-top: 1px solid #A1A5A9; background-image: url(images/time_bg.gif); } +.navback { background-image: url(images/time_bg.gif); } +.sideback { background-image: url(images/side_bg.gif); } + + +/* Link colors and attributes */ +/* This is the main link style (varies) */ +a.psf { text-decoration: none; } +a.psf:link { color: #666; } +a.psf:visited { color: #888; } +a.psf:active { color: #666; } +a.psf:hover { color: #333; text-decoration: underline; } + +/* This is the link style for the mini-cals (varies)*/ +a.ps2 { text-decoration: underline; } +a.ps2:link { color: #0066FF; } +a.ps2:visited { color: #0066FF; } +a.ps2:active { color: #3366CC; } +a.ps2:hover { color: #000099; } + +/* This is the link style for year months */ +a.ps3 { text-decoration: none; } +a.ps3:link { color: #000; } +a.ps3:visited { color: #000; } +a.ps3:active { color: #000; } +a.ps3:hover { color: #000; text-decoration: underline; } + +/* This is the link style for events */ +a.ps { text-decoration: none; } +a.ps:link { color: #fff; } +a.ps:visited { color: #fff; } +a.ps:active { color: #fff; } +a.ps:hover { color: #fff; text-decoration: underline; } + +/* Body attributes */ + +body { background-image: url(images/background.gif); } + +/* CSS definitions for fonts */ + +.V9 { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; color: #000000; } +.V10W { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 10px; color: #FFFFFF; text-decoration: none;} +.V9W { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; color: #FFFFFF; text-decoration: none;} +.V10WB { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 10px; color: #FFFFFF; font-weight: 900; } +.V9G { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; color: #666666; } +.V10 { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 10px; color: #000000; } +.V9BOLD { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; font-weight: 900; } +.G10 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #0066FF; } +.G10B { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #000000; } +.G10BOLD { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; font-weight: 900; } +.G10G { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #A1A5A9; } +.V12 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; color: #000000; } +/*h1 { font-family: Helvetica, sans-serif; font-size: 18px; color: #000000; }*/ +.eventfont { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #FFFFFF; } + + +/* Length of the form drop downs */ + +.query_style { font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; } +.search_style { font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; } +.login_style { font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 80px; margin-bottom: 0; } diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/error.tpl newcal/templates/grey/error.tpl --- oldcal/templates/grey/error.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/error.tpl 2004-12-18 13:37:52.000000000 -0500 @@ -0,0 +1,43 @@ +{HEADER} +
+ + + + +
+ + + + + + + +
+ + + + + + +
{L_ERROR_WINDOW}
+
+ + + + +
+ {ERROR_MSG}
+ [What does this mean?] +
+
+ {ERROR_CALENDAR} +
+
+ {L_ERROR_BACK} +
+ +
+
+
+
+{FOOTER} \ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/event.tpl newcal/templates/grey/event.tpl --- oldcal/templates/grey/event.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/event.tpl 2005-09-06 22:52:07.000000000 -0400 @@ -0,0 +1,43 @@ + + + + + {CAL} + + + +
+ + + + + + + +
{CAL_TITLE_FULL}
+
+

{EVENT_TEXT} - ({EVENT_TIMES})

+ +

{DESCRIPTION}

+ +

+ + {L_ORGANIZER}: {ORGANIZER}
+ + + {L_ATTENDEE}: {ATTENDEE}
+ + + {L_STATUS}: {STATUS}
+ + + {L_LOCATION}: {LOCATION}
+ +

+
+
+
+ + + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/footer.tpl newcal/templates/grey/footer.tpl --- oldcal/templates/grey/footer.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/footer.tpl 2006-04-09 21:18:05.000000000 -0400 @@ -0,0 +1,15 @@ +

{L_POWERED_BY} PHP iCalendar {VERSION}
+ +

+ +[Valid RSS] +

+ + +{L_THIS_SITE_IS} RSS-Enabled
+ + +
+ + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/header.tpl newcal/templates/grey/header.tpl --- oldcal/templates/grey/header.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/header.tpl 2006-04-02 05:30:11.000000000 -0400 @@ -0,0 +1,20 @@ + + + + + {CALENDAR_NAME} - {DISPLAY_DATE} + + + + + {EVENT_JS} + + + Binary files oldcal/templates/grey/images/.DS_Store and newcal/templates/grey/images/.DS_Store differ Binary files oldcal/templates/grey/images/allday_1.gif and newcal/templates/grey/images/allday_1.gif differ Binary files oldcal/templates/grey/images/allday_2.gif and newcal/templates/grey/images/allday_2.gif differ Binary files oldcal/templates/grey/images/allday_3.gif and newcal/templates/grey/images/allday_3.gif differ Binary files oldcal/templates/grey/images/allday_4.gif and newcal/templates/grey/images/allday_4.gif differ Binary files oldcal/templates/grey/images/allday_5.gif and newcal/templates/grey/images/allday_5.gif differ Binary files oldcal/templates/grey/images/allday_6.gif and newcal/templates/grey/images/allday_6.gif differ Binary files oldcal/templates/grey/images/allday_7.gif and newcal/templates/grey/images/allday_7.gif differ Binary files oldcal/templates/grey/images/allday_bg.gif and newcal/templates/grey/images/allday_bg.gif differ Binary files oldcal/templates/grey/images/allday_dot.gif and newcal/templates/grey/images/allday_dot.gif differ Binary files oldcal/templates/grey/images/back.gif and newcal/templates/grey/images/back.gif differ Binary files oldcal/templates/grey/images/background.gif and newcal/templates/grey/images/background.gif differ Binary files oldcal/templates/grey/images/day_on.gif and newcal/templates/grey/images/day_on.gif differ Binary files oldcal/templates/grey/images/day_title.gif and newcal/templates/grey/images/day_title.gif differ Binary files oldcal/templates/grey/images/download_arrow.gif and newcal/templates/grey/images/download_arrow.gif differ Binary files oldcal/templates/grey/images/event_dot.gif and newcal/templates/grey/images/event_dot.gif differ Binary files oldcal/templates/grey/images/left_arrows.gif and newcal/templates/grey/images/left_arrows.gif differ Binary files oldcal/templates/grey/images/left_day.gif and newcal/templates/grey/images/left_day.gif differ Binary files oldcal/templates/grey/images/month_on.gif and newcal/templates/grey/images/month_on.gif differ Binary files oldcal/templates/grey/images/monthdot_1.gif and newcal/templates/grey/images/monthdot_1.gif differ Binary files oldcal/templates/grey/images/monthdot_2.gif and newcal/templates/grey/images/monthdot_2.gif differ Binary files oldcal/templates/grey/images/monthdot_3.gif and newcal/templates/grey/images/monthdot_3.gif differ Binary files oldcal/templates/grey/images/monthdot_4.gif and newcal/templates/grey/images/monthdot_4.gif differ Binary files oldcal/templates/grey/images/monthdot_5.gif and newcal/templates/grey/images/monthdot_5.gif differ Binary files oldcal/templates/grey/images/monthdot_6.gif and newcal/templates/grey/images/monthdot_6.gif differ Binary files oldcal/templates/grey/images/monthdot_7.gif and newcal/templates/grey/images/monthdot_7.gif differ Binary files oldcal/templates/grey/images/printer.gif and newcal/templates/grey/images/printer.gif differ Binary files oldcal/templates/grey/images/right_arrows.gif and newcal/templates/grey/images/right_arrows.gif differ Binary files oldcal/templates/grey/images/right_day.gif and newcal/templates/grey/images/right_day.gif differ Binary files oldcal/templates/grey/images/search.gif and newcal/templates/grey/images/search.gif differ Binary files oldcal/templates/grey/images/shadow_l.gif and newcal/templates/grey/images/shadow_l.gif differ Binary files oldcal/templates/grey/images/shadow_m.gif and newcal/templates/grey/images/shadow_m.gif differ Binary files oldcal/templates/grey/images/shadow_r.gif and newcal/templates/grey/images/shadow_r.gif differ Binary files oldcal/templates/grey/images/side_bg.gif and newcal/templates/grey/images/side_bg.gif differ Binary files oldcal/templates/grey/images/smallicon.gif and newcal/templates/grey/images/smallicon.gif differ Binary files oldcal/templates/grey/images/spacer.gif and newcal/templates/grey/images/spacer.gif differ Binary files oldcal/templates/grey/images/time_bg.gif and newcal/templates/grey/images/time_bg.gif differ Binary files oldcal/templates/grey/images/week_on.gif and newcal/templates/grey/images/week_on.gif differ Binary files oldcal/templates/grey/images/year_on.gif and newcal/templates/grey/images/year_on.gif differ diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/month.tpl newcal/templates/grey/month.tpl --- oldcal/templates/grey/month.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/month.tpl 2005-11-19 01:56:27.000000000 -0500 @@ -0,0 +1,88 @@ +{HEADER} +
+ + + + +
+ + + + + +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ {MONTH_LARGE|+0} + + + + + + +
+
+ {CALENDAR_NAV} + +
+ + + + + + + +
+ + + + + + +
{L_PREV}

{L_THIS_MONTHS}

{L_NEXT}
+
+ + + + + + + + + + + + + +
+ {START_DATE}
+ {START_TIME} + 		+ {EVENT_TEXT}
{CALNAME} +
+ {START_DATE}
+ {START_TIME} + 		+ {EVENT_TEXT}
{CALNAME} +
+
+ + + + + + +
+ +
+{FOOTER} diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/month_large.tpl newcal/templates/grey/month_large.tpl --- oldcal/templates/grey/month_large.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/month_large.tpl 2004-05-19 23:59:37.000000000 -0400 @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + +
+
{LOOP_WEEKDAY}
+
+
+ {DAY} +
+ {ALLDAY} + {EVENT} + 		+
+ {DAY} +
+ {ALLDAY} + {EVENT} + 		+
+ {DAY} +
+ {ALLDAY} + {EVENT} +
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/month_medium.tpl newcal/templates/grey/month_medium.tpl --- oldcal/templates/grey/month_medium.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/month_medium.tpl 2006-03-23 19:59:55.000000000 -0500 @@ -0,0 +1,45 @@ + + + + + + + +
{MONTH_TITLE}
+ + + + + + + + + + + + + + + + + + + + + +
{LOOP_WEEKDAY}
+ {DAY} + + {DAY} +
+ {ALLDAY} + {EVENT} +
+ 		+ {DAY} +
+ {ALLDAY} + {EVENT} +
+
+
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/month_small.tpl newcal/templates/grey/month_small.tpl --- oldcal/templates/grey/month_small.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/month_small.tpl 2004-09-13 15:35:23.000000000 -0400 @@ -0,0 +1,38 @@ + + + + + + + +
{MONTH_TITLE}
+ + + + + + + + + + + + + + + + + + + + + +
{LOOP_WEEKDAY}
+ {DAY} + + {DAY} + + {DAY} +
+
+
\ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/preferences.tpl newcal/templates/grey/preferences.tpl --- oldcal/templates/grey/preferences.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/preferences.tpl 2006-03-23 20:00:10.000000000 -0500 @@ -0,0 +1,102 @@ +{HEADER} +
+ + + + + + + + + + +
+ + + + + +

{L_PREFERENCES}

{L_PREFS_SUBHEAD}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + + + + + + +
{MESSAGE}
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_SELECT_LANG}:
{L_SELECT_CAL}: +
{L_SELECT_VIEW}:
{L_SELECT_TIME}:
{L_SELECT_DAY}:
{L_SELECT_STYLE}:
{L_UNSET_PREFS}:
 
+
+
+
+ + + + + + +
+ +
+{FOOTER} diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/print.tpl newcal/templates/grey/print.tpl --- oldcal/templates/grey/print.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/print.tpl 2006-03-23 20:00:58.000000000 -0500 @@ -0,0 +1,81 @@ +{HEADER} +
+ + + + + + + + + + +
+ + + + + +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}
+ Calendar view		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + +
+ +
{DAYOFMONTH}
+ +
+ + + + + + + + + + + + + + + + + + + + + +
{L_TIME}:{EVENT_START}
{L_LOCATION}:{LOCATION}
{L_SUMMARY}:{EVENT_TEXT}
{L_DESCRIPTION}:{DESCRIPTION}
+
+ + + + +
{L_NO_RESULTS}
+ +
+
+ + + + + + +
+
+{FOOTER} \ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/rss_index.tpl newcal/templates/grey/rss_index.tpl --- oldcal/templates/grey/rss_index.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/rss_index.tpl 2006-04-05 02:46:10.000000000 -0400 @@ -0,0 +1,60 @@ +{HEADER} +
+ + + + +
+ + + + + + + + + + +
+ + + + + +

{L_RSS_INFO}

{L_RSS_SUBHEAD}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + + +
+
+
+ {RSS_LIST} +
+

{RSS_DOCINFO}

+
+
+
+ + + + + + +
+
+ +{FOOTER} \ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/search.tpl newcal/templates/grey/search.tpl --- oldcal/templates/grey/search.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/search.tpl 2005-10-30 01:15:47.000000000 -0500 @@ -0,0 +1,115 @@ +{HEADER} +
+ + + + + + + + + + +
+ + + + + +

{L_RESULTS}

{CALENDAR_NAME} {L_CALENDAR}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+
+

{L_QUERY}: {FORMATTED_SEARCH}

+ + {DAYOFMONTH}
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
{L_TIME}:{EVENT_START}
{L_LOCATION}:{LOCATION}
{L_SUMMARY}:{EVENT_TEXT}
{L_RECURRING_EVENT}:{RECUR}
{L_DESCRIPTION}:{DESCRIPTION}
+
+ + {L_EXCEPTION}: {DAYOFMONTH}
+
+ + + + + + + + + + + + + + + + + + + + + +
{L_TIME}:{EVENT_START}
{L_SUMMARY}:{EVENT_TEXT}
{L_RECURRING_EVENT}:{EXCEPT_RECUR}
{L_DESCRIPTION}:{EXCEPT_DESCRIPTION}
+
+ +
+ + + +
+

{L_NO_RESULTS}

+
+ + +
+ {SEARCH_BOX} +
+
+
+
+ + + + + + +
+
+ +{FOOTER} + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/search_box.tpl newcal/templates/grey/search_box.tpl --- oldcal/templates/grey/search_box.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/search_box.tpl 2006-03-23 20:01:37.000000000 -0500 @@ -0,0 +1,9 @@ +
+
{L_SEARCH}:
+
+ + + + + +
\ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/seminar.tpl newcal/templates/grey/seminar.tpl --- oldcal/templates/grey/seminar.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/seminar.tpl 2004-09-27 12:31:30.000000000 -0400 @@ -0,0 +1,43 @@ + + + + + {CAL} + + + +
+ + + + + + + +
{CAL_TITLE_FULL}
+
+

{EVENT} - ({EVENT_TIMES})

+ +

{DESCRIPTION}

+ +

+ + + Host:: {ATTENDEE}
+ + + {L_STATUS}: {STATUS}
+ + + {L_LOCATION}: {LOCATION}
+ +

+
+
+
+ + + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/sidebar.tpl newcal/templates/grey/sidebar.tpl --- oldcal/templates/grey/sidebar.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/sidebar.tpl 2006-03-23 20:02:15.000000000 -0500 @@ -0,0 +1,225 @@ + +
+ + + + + + + + + + + + + + + + + + + + + +
{L_LOGIN}
+
+ {L_INVALID_LOGIN} +
+
{L_USERNAME}:
{L_PASSWORD}:
+
+ + + + + + +
+
+ + + + + + + + + + +
{L_PREV}{SIDEBAR_DATE}{L_NEXT}
+
+ {L_LEGEND}:
+ {LEGEND} + {L_GOPRINT}
+ + {L_PREFERENCES}
+ + + {L_SUBSCRIBE} | {L_DOWNLOAD}
+ + + {L_LOGOUT} {USERNAME} + +
+
+ + + + + + +
+
+ + + + + + + + +
{L_JUMP}
+
+
+
+
+
+
+
+ + +
+ + {SEARCH_BOX} + + +
+ + + +
+ +
+
{L_PICK_MULTIPLE}:
+
+ + +
+ +
+
+
+ + + + + + +
+
+ + + + + + + + + + +
{L_TOMORROWS}
+
+ + {T_ALLDAY}
+ + + • {T_EVENT}
+ +
+
+ + + + + + +
+
+ + + + + + + + + + + + +
{L_TODO}
+
+ + + + + + + + + + + + + + + + + + + + + + +
{VTODO_TEXT}
{VTODO_TEXT}
{VTODO_TEXT}
+
+
+ + + + + + +
+
+ + + + +{MONTH_SMALL|-1} + + + + + + +
+
+ +{MONTH_SMALL|+0} + + + + + + +
+
+ +{MONTH_SMALL|+1} + + + + + + +
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/todo.tpl newcal/templates/grey/todo.tpl --- oldcal/templates/grey/todo.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/todo.tpl 2004-12-18 13:35:39.000000000 -0500 @@ -0,0 +1,42 @@ + + + + + {CAL} + + + +
+ + + + + + + +
{CAL_TITLE_FULL}
+
+

{VTODO_TEXT}

+ +

{DESCRIPTION}

+ +

+ + {L_STATUS}: {STATUS}
+ + + {L_PRIORITY}: {PRIORITY}
+ + + {L_CREATED}: {START_DATE}
+ + + {L_DUE}: {DUE_DATE}
+ +

+
+
+
+ + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/week.tpl newcal/templates/grey/week.tpl --- oldcal/templates/grey/week.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/week.tpl 2005-11-19 01:59:28.000000000 -0500 @@ -0,0 +1,117 @@ +{HEADER} +
+ + + + + + +
+ + + + + + + +
+ + + + + +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
{CONFIRMED}{EVENT_START}
+
{EVENT}
+
+ +
+
 «
+ 		+
 ‹
+ 		+
› 
+ 		+
» 
+ 		+ {DAY} +
+ +
+ {ALLDAY} + +
+ +
9:00 AM 
 
 
 
+
+
+ + + + + + +
+ 		+ + + {SIDEBAR} +
+
+{FOOTER} diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/grey/year.tpl newcal/templates/grey/year.tpl --- oldcal/templates/grey/year.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/grey/year.tpl 2006-03-23 20:02:32.000000000 -0500 @@ -0,0 +1,132 @@ +{HEADER} +
+ + + + +
+ + + + + + +
+   + + + + + + + +
+ [Previous Year] + +

{THIS_YEAR}

+ 		+ [Next Year] +
+ 		+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {MONTH_MEDIUM|01} + + + + {MONTH_MEDIUM|02} + + + + {MONTH_MEDIUM|03} + + + {SIDEBAR}
+ +
+ {MONTH_MEDIUM|04} + + + + {MONTH_MEDIUM|05} + + + + {MONTH_MEDIUM|06} +
+ +
+ {MONTH_MEDIUM|07} + + + + {MONTH_MEDIUM|08} + + + + {MONTH_MEDIUM|09} +
+ +
+ {MONTH_MEDIUM|10} + + + + {MONTH_MEDIUM|11} + + + + {MONTH_MEDIUM|12} +
+
+{FOOTER} diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/admin.tpl newcal/templates/red/admin.tpl --- oldcal/templates/red/admin.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/admin.tpl 2004-10-01 21:23:53.000000000 -0400 @@ -0,0 +1,132 @@ +{HEADER} +
+ + + + + + + + + + + + + +
+ + + + + +

{L_ADMIN_HEADER}

{L_ADMIN_SUBHEAD}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + {L_LOGOUT}  + +
+ + + + + +
+ + {L_INVALID_LOGIN}

+ + + +
+ + + + + + + + + + + + + + +
{L_USERNAME}:
{L_PASSWORD}:
 
+
+ + + + + {L_ADDUPDATE_CAL}
+ {L_ADDUPDATE_DESC}

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_CAL_FILE} 1:
{L_CAL_FILE} 2:
{L_CAL_FILE} 3:
{L_CAL_FILE} 4:
{L_CAL_FILE} 5:
 
{ADDUPDATE_MSG}  
+
+ + {L_DELETE_CAL} +
+ + {DELETE_TABLE} +
+ +

+

{DELETE_MSG}  

+
+ + +
+
+ + + + + + +
+{FOOTER} + + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/calendar_nav.tpl newcal/templates/red/calendar_nav.tpl --- oldcal/templates/red/calendar_nav.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/calendar_nav.tpl 2006-03-16 01:03:24.000000000 -0500 @@ -0,0 +1,113 @@ + + + + + + +
+ {MONTH_SMALL|-1} + + + + + + +
+ 		+ + + + + + +
+ + + + + + + +
{L_JUMP}
+
+
+
+
+
+
+
+ + +
+ + {SEARCH_BOX} + + +
+ + + + +
+ +
+
{L_PICK_MULTIPLE}:
+
+ + +
+ +
+
+
+ + + + + + +
+ 		+ + + + + + + + + +
{SIDEBAR_DATE}
+
+ {L_LEGEND}:
+ {LEGEND} + {L_GOPRINT}
+ + {L_PREFERENCES}
+ + + {L_SUBSCRIBE} | {L_DOWNLOAD}
+ + + Logout {USERNAME} + +
+
+ + + + + + +
+
+ 		+ {MONTH_SMALL|+1} + + + + + + +
+
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/day.tpl newcal/templates/red/day.tpl --- oldcal/templates/red/day.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/day.tpl 2005-11-23 01:07:56.000000000 -0500 @@ -0,0 +1,104 @@ +{HEADER} +
+ + + + + + +
+ + + + + + + + + + +
+ + + + + + + + +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+ + + + + + + + +
+ « + + {DAY} + + » +
+
+
+ +
+ {ALLDAY} +
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+
{CONFIRMED}{EVENT_START} - {EVENT_END}
+
{EVENT}
+
+ +
9:00 AM 
 
 
 
+
+ + + + + + +
+ 		+ {SIDEBAR} +
+
+{FOOTER} + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/default.css newcal/templates/red/default.css --- oldcal/templates/red/default.css 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/default.css 2006-04-09 15:58:34.000000000 -0400 @@ -0,0 +1,138 @@ +/* Style sheet for the silver calendar (default) */ + +table, td {font: 11px Verdana, Arial, sans-serif; color: #000;} + +/* Background images for tables */ +.tbll {background: url(images/shadow_l.gif) no-repeat; width:8px} +.tblbot {background: url(images/shadow_m.gif) repeat-x; width:100%} +.tblr {background: url(images/shadow_r.gif) no-repeat; width:8px} + +.alldaybg_1 {background: url(images/allday_1.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_2 {background: url(images/allday_2.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_3 {background: url(images/allday_3.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_4 {background: url(images/allday_4.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_5 {background: url(images/allday_5.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_6 {background: url(images/allday_6.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_7 {background: url(images/allday_7.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} + +.rowOn { background-color: #cfc; border-top: 1px solid #fff; border-left: 1px solid #fff; } +.rowOn2 { background-color: #cfc; border-top: 1px solid #fff; } +.rowOff { background-color: #E1E8F1; border-top: 1px solid #fff; border-left: 1px solid #fff; } +.rowOff2 { background-color: #E1E8F1; border-top: 1px solid #fff; } +.rowToday { background-color: #cff; border-top: 1px solid #fff; border-left: 1px solid #fff; } + +.padd { padding: 2px; } + +/* Styles for day and week events */ +.eventbg_1 { background-color: #a01010; padding: 2px;} +.eventbg_2 { background-color: #ab6c00; padding: 2px;} +.eventbg_3 { background-color: #df903c; padding: 2px;} +.eventbg_4 { background-color: #ab7848; padding: 2px;} +.eventbg_5 { background-color: #bc4700; padding: 2px;} +.eventbg_6 { background-color: #df2c6c; padding: 2px;} +.eventbg_7 { background-color: #ac4848; padding: 2px;} + + +.eventbg2_1 { background-color: #c03030; border: 1px solid #a01010; } +.eventbg2_2 { background-color: #cb8c00; border: 1px solid #ab6c00; } +.eventbg2_3 { background-color: #ffb05c; border: 1px solid #df903c; } +.eventbg2_4 { background-color: #cb9868; border: 1px solid #ab7848; } +.eventbg2_5 { background-color: #dc6700; border: 1px solid #bc4700; } +.eventbg2_6 { background-color: #ff4c8c; border: 1px solid #df2c6c; } +.eventbg2_7 { background-color: #cc6868; border: 1px solid #ac4848; } +.dayborder { background-color: #fff; border-top: 1px solid #A1A5A9; } +.dayborder2 { background-color: #fff; border-top: 1px dashed #ccc; } + +.title { background-image: url(images/time_bg.gif); padding: 5px; } +.title h1 { font-family: Helvetica, sans-serif; font-size: 18px; color: #000; margin: 0px;} + +/* Month View */ + +.monthback { background-color: #A1A5A9; } +.monthreg { background-color: #fff; height: 105px; width: 105px; text-align: left; vertical-align: top; } +.monthoff { background-color: #F2F2F2; height: 105px; width: 105px; text-align: left; vertical-align: top; } +.monthon { background-color: #F2F9FF; height: 105px; width: 105px; text-align: left; vertical-align: top; } +.montheventtop { background-image: url(images/side_bg.gif); border-top: 1px solid #A1A5A9; } +.montheventline { border-right: 1px dotted #A1A5A9; } + +/* Year View */ + +.medtitle { background-image: url(images/side_bg.gif); height: 20px; margin-top: 3px; font-weight: 900; } +.yearreg { background-color: #fff; height: 30px; width: 30px; text-align: right; vertical-align: top; font-size: 9px; } +.yearoff { background-color: #F2F2F2; height: 30px; width: 30px; text-align: right; vertical-align: top; font-size: 9px; } +.yearon { background-color: #F2F9FF; height: 30px; width: 30px; text-align: right; vertical-align: top; font-size: 9px; } +.yearmonth { background-color: #ccc; } +.yearweek { background-color: #eee; width: 30px; font-size: 9px; font-weight: 900; text-align: center; height: 15px; } + + +/* older styles */ + +.eventborder { background-image: url(images/day_title.gif); border: 1px #006699 solid; } +.eventbg { background-color: #6699CC; } + +.calborder { background-color: #fff; border: 1px #A1A5A9 solid; } +.dateback { background-color: #eee; } +.weekborder { border-top: 1px dashed #A1A5A9; border-right: 1px solid #A1A5A9; } +.weekborder2 { border-right: 1px solid #A1A5A9; } +.timeborder { border-right: 2px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); } +.timeborder2 { border-right: 2px solid #A1A5A9; border-top: 1px solid #A1A5A9; background-image: url(images/time_bg.gif); } +.navback { background-image: url(images/time_bg.gif); } +.sideback { background-image: url(images/side_bg.gif); } + + +/* Link colors and attributes */ +/* This is the main link style */ +a.psf { text-decoration: none; } +a.psf:link { color: #a01010; } +a.psf:visited { color: #a01010; } +a.psf:active { color: #3366CC; } +a.psf:hover { color: #000099; text-decoration: underline; } + +/* This is the link style for the mini-cals */ +a.ps2 { text-decoration: underline; } +a.ps2:link { color: #a01010; } +a.ps2:visited { color: #a01010; } +a.ps2:active { color: #3366CC; } +a.ps2:hover { color: #000099; } + +/* This is the link style for year months */ +a.ps3 { text-decoration: none; } +a.ps3:link { color: #000; } +a.ps3:visited { color: #000; } +a.ps3:active { color: #000; } +a.ps3:hover { color: #000; text-decoration: underline; } + +/* This is the link style for events */ +a.ps { text-decoration: none; } +a.ps:link { color: #fff; } +a.ps:visited { color: #fff; } +a.ps:active { color: #fff; } +a.ps:hover { color: #fff; text-decoration: underline; } + +/* Body attributes */ + +body { background-color: #ffd0e0; } + +/* CSS definitions for fonts */ + +.V9 { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; color: #000000; } +.V10W { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 10px; color: #FFFFFF; text-decoration: none;} +.V9W { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; color: #FFFFFF; text-decoration: none;} +.V10WB { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 10px; color: #FFFFFF; font-weight: 900; } +.V9G { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; color: #666666; } +.V10 { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 10px; color: #000000; } +.V9BOLD { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; font-weight: 900; } +.G10 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #0066FF; } +.G10B { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #000000; } +.G10BOLD { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; font-weight: 900; } +.G10G { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #A1A5A9; } +.V12 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; color: #000000; } +/*h1 { font-family: Helvetica, sans-serif; font-size: 18px; color: #000000; }*/ +.eventfont { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #FFFFFF; } + + +/* Length of the form drop downs */ + +.query_style { font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; } +.search_style { font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; } +.login_style { font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 80px; margin-bottom: 0; } diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/error.tpl newcal/templates/red/error.tpl --- oldcal/templates/red/error.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/error.tpl 2004-10-26 15:12:31.000000000 -0400 @@ -0,0 +1,43 @@ +{HEADER} +
+ + + + +
+ + + + + + + +
+ + + + + + +
{L_ERROR_WINDOW}
+
+ + + + +
+ {ERROR_MSG}
+ [What does this mean?] +
+
+ {ERROR_CALENDAR} +
+
+ {L_ERROR_BACK} +
+ +
+
+
+
+{FOOTER} \ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/event.tpl newcal/templates/red/event.tpl --- oldcal/templates/red/event.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/event.tpl 2005-05-16 15:15:01.000000000 -0400 @@ -0,0 +1,43 @@ + + + + + {CAL} + + + +
+ + + + + + + +
{CAL_TITLE_FULL}
+
+

{EVENT_TEXT} - ({EVENT_TIMES})

+ +

{DESCRIPTION}

+ +

+ + {L_ORGANIZER}: {ORGANIZER}
+ + + {L_ATTENDEE}: {ATTENDEE}
+ + + {L_STATUS}: {STATUS}
+ + + {L_LOCATION}: {LOCATION}
+ +

+
+
+
+ + + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/footer.tpl newcal/templates/red/footer.tpl --- oldcal/templates/red/footer.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/footer.tpl 2006-04-09 21:18:29.000000000 -0400 @@ -0,0 +1,15 @@ +

{L_POWERED_BY} PHP iCalendar {VERSION}
+ +

+ +[Valid RSS] +

+ + +{L_THIS_SITE_IS} RSS-Enabled
+ + +
+ + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/header.tpl newcal/templates/red/header.tpl --- oldcal/templates/red/header.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/header.tpl 2006-04-02 05:29:39.000000000 -0400 @@ -0,0 +1,20 @@ + + + + + {CALENDAR_NAME} - {DISPLAY_DATE} + + + + + {EVENT_JS} + + + Binary files oldcal/templates/red/images/allday_1.gif and newcal/templates/red/images/allday_1.gif differ Binary files oldcal/templates/red/images/allday_2.gif and newcal/templates/red/images/allday_2.gif differ Binary files oldcal/templates/red/images/allday_3.gif and newcal/templates/red/images/allday_3.gif differ Binary files oldcal/templates/red/images/allday_4.gif and newcal/templates/red/images/allday_4.gif differ Binary files oldcal/templates/red/images/allday_5.gif and newcal/templates/red/images/allday_5.gif differ Binary files oldcal/templates/red/images/allday_6.gif and newcal/templates/red/images/allday_6.gif differ Binary files oldcal/templates/red/images/allday_7.gif and newcal/templates/red/images/allday_7.gif differ Binary files oldcal/templates/red/images/allday_bg.gif and newcal/templates/red/images/allday_bg.gif differ Binary files oldcal/templates/red/images/allday_dot.gif and newcal/templates/red/images/allday_dot.gif differ Binary files oldcal/templates/red/images/back.gif and newcal/templates/red/images/back.gif differ Binary files oldcal/templates/red/images/day_on.gif and newcal/templates/red/images/day_on.gif differ Binary files oldcal/templates/red/images/day_title.gif and newcal/templates/red/images/day_title.gif differ Binary files oldcal/templates/red/images/download_arrow.gif and newcal/templates/red/images/download_arrow.gif differ Binary files oldcal/templates/red/images/event_dot.gif and newcal/templates/red/images/event_dot.gif differ Binary files oldcal/templates/red/images/left_arrows.gif and newcal/templates/red/images/left_arrows.gif differ Binary files oldcal/templates/red/images/left_day.gif and newcal/templates/red/images/left_day.gif differ Binary files oldcal/templates/red/images/month_on.gif and newcal/templates/red/images/month_on.gif differ Binary files oldcal/templates/red/images/monthdot_1.gif and newcal/templates/red/images/monthdot_1.gif differ Binary files oldcal/templates/red/images/monthdot_2.gif and newcal/templates/red/images/monthdot_2.gif differ Binary files oldcal/templates/red/images/monthdot_3.gif and newcal/templates/red/images/monthdot_3.gif differ Binary files oldcal/templates/red/images/monthdot_4.gif and newcal/templates/red/images/monthdot_4.gif differ Binary files oldcal/templates/red/images/monthdot_5.gif and newcal/templates/red/images/monthdot_5.gif differ Binary files oldcal/templates/red/images/monthdot_6.gif and newcal/templates/red/images/monthdot_6.gif differ Binary files oldcal/templates/red/images/monthdot_7.gif and newcal/templates/red/images/monthdot_7.gif differ Binary files oldcal/templates/red/images/printer.gif and newcal/templates/red/images/printer.gif differ Binary files oldcal/templates/red/images/right_arrows.gif and newcal/templates/red/images/right_arrows.gif differ Binary files oldcal/templates/red/images/right_day.gif and newcal/templates/red/images/right_day.gif differ Binary files oldcal/templates/red/images/search.gif and newcal/templates/red/images/search.gif differ Binary files oldcal/templates/red/images/shadow_l.gif and newcal/templates/red/images/shadow_l.gif differ Binary files oldcal/templates/red/images/shadow_m.gif and newcal/templates/red/images/shadow_m.gif differ Binary files oldcal/templates/red/images/shadow_r.gif and newcal/templates/red/images/shadow_r.gif differ Binary files oldcal/templates/red/images/side_bg.gif and newcal/templates/red/images/side_bg.gif differ Binary files oldcal/templates/red/images/smallicon.gif and newcal/templates/red/images/smallicon.gif differ Binary files oldcal/templates/red/images/spacer.gif and newcal/templates/red/images/spacer.gif differ Binary files oldcal/templates/red/images/time_bg.gif and newcal/templates/red/images/time_bg.gif differ Binary files oldcal/templates/red/images/week_on.gif and newcal/templates/red/images/week_on.gif differ Binary files oldcal/templates/red/images/year_on.gif and newcal/templates/red/images/year_on.gif differ diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/month.tpl newcal/templates/red/month.tpl --- oldcal/templates/red/month.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/month.tpl 2005-11-23 01:07:56.000000000 -0500 @@ -0,0 +1,88 @@ +{HEADER} +
+ + + + +
+ + + + + +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ {MONTH_LARGE|+0} + + + + + + +
+
+ {CALENDAR_NAV} + +
+ + + + + + + +
+ + + + + + +
{L_PREV}

{L_THIS_MONTHS}

{L_NEXT}
+
+ + + + + + + + + + + + + +
+ {START_DATE}
+ {START_TIME} + 		+ {EVENT_TEXT}
{CALNAME} +
+ {START_DATE}
+ {START_TIME} + 		+ {EVENT_TEXT}
{CALNAME} +
+
+ + + + + + +
+ +
+{FOOTER} diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/month_large.tpl newcal/templates/red/month_large.tpl --- oldcal/templates/red/month_large.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/month_large.tpl 2004-05-19 23:59:37.000000000 -0400 @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + +
+
{LOOP_WEEKDAY}
+
+
+ {DAY} +
+ {ALLDAY} + {EVENT} + 		+
+ {DAY} +
+ {ALLDAY} + {EVENT} + 		+
+ {DAY} +
+ {ALLDAY} + {EVENT} +
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/month_medium.tpl newcal/templates/red/month_medium.tpl --- oldcal/templates/red/month_medium.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/month_medium.tpl 2006-02-08 03:07:54.000000000 -0500 @@ -0,0 +1,45 @@ + + + + + + + +
{MONTH_TITLE}
+ + + + + + + + + + + + + + + + + + + + + +
{LOOP_WEEKDAY}
+ {DAY} + + {DAY} +
+ {ALLDAY} + {EVENT} +
+ 		+ {DAY} +
+ {ALLDAY} + {EVENT} +
+
+
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/month_small.tpl newcal/templates/red/month_small.tpl --- oldcal/templates/red/month_small.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/month_small.tpl 2004-09-12 14:29:07.000000000 -0400 @@ -0,0 +1,38 @@ + + + + + + + +
{MONTH_TITLE}
+ + + + + + + + + + + + + + + + + + + + + +
{LOOP_WEEKDAY}
+ {DAY} + + {DAY} + + {DAY} +
+
+
\ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/preferences.tpl newcal/templates/red/preferences.tpl --- oldcal/templates/red/preferences.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/preferences.tpl 2006-02-08 03:07:54.000000000 -0500 @@ -0,0 +1,102 @@ +{HEADER} +
+ + + + + + + + + + +
+ + + + + +

{L_PREFERENCES}

{L_PREFS_SUBHEAD}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + + + + + + +
{MESSAGE}
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_SELECT_LANG}:
{L_SELECT_CAL}: +
{L_SELECT_VIEW}:
{L_SELECT_TIME}:
{L_SELECT_DAY}:
{L_SELECT_STYLE}:
{L_UNSET_PREFS}:
 
+
+
+
+ + + + + + +
+ +
+{FOOTER} diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/print.tpl newcal/templates/red/print.tpl --- oldcal/templates/red/print.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/print.tpl 2006-03-20 03:18:22.000000000 -0500 @@ -0,0 +1,80 @@ +{HEADER} +
+ + + + + + + + + + +
+ + + + + +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + +
+ +
{DAYOFMONTH}
+ +
+ + + + + + + + + + + + + + + + + + + + + +
{L_TIME}:{EVENT_START}
{L_LOCATION}:{LOCATION}
{L_SUMMARY}:{EVENT_TEXT}
{L_DESCRIPTION}:{DESCRIPTION}
+
+ + + + +
{L_NO_RESULTS}
+ +
+
+ + + + + + +
+
+{FOOTER} \ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/rss_index.tpl newcal/templates/red/rss_index.tpl --- oldcal/templates/red/rss_index.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/rss_index.tpl 2006-04-05 02:45:23.000000000 -0400 @@ -0,0 +1,61 @@ +{HEADER} +
+ + + + +
+ + + + + + + + + + +
+ + + + + +

{L_RSS_INFO}

{L_RSS_SUBHEAD}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + + +
+
+
+
+ {RSS_LIST} +
+

{RSS_DOCINFO}

+
+
+
+ + + + + + +
+
+ +{FOOTER} \ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/search.tpl newcal/templates/red/search.tpl --- oldcal/templates/red/search.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/search.tpl 2005-09-13 17:57:28.000000000 -0400 @@ -0,0 +1,115 @@ +{HEADER} +
+ + + + + + + + + + +
+ + + + + +

{L_RESULTS}

{CALENDAR_NAME} {L_CALENDAR}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+
+

{L_QUERY}: {FORMATTED_SEARCH}

+ + {DAYOFMONTH}
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
{L_TIME}:{EVENT_START}
{L_LOCATION}:{LOCATION}
{L_SUMMARY}:{EVENT_TEXT}
{L_RECURRING_EVENT}:{RECUR}
{L_DESCRIPTION}:{DESCRIPTION}
+
+ + {L_EXCEPTION}: {DAYOFMONTH}
+
+ + + + + + + + + + + + + + + + + + + + + +
{L_TIME}:{EVENT_START}
{L_SUMMARY}:{EVENT_TEXT}
{L_RECURRING_EVENT}:{EXCEPT_RECUR}
{L_DESCRIPTION}:{EXCEPT_DESCRIPTION}
+
+ +
+ + + +
+

{L_NO_RESULTS}

+
+ + +
+ {SEARCH_BOX} +
+
+
+
+ + + + + + +
+
+ +{FOOTER} + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/search_box.tpl newcal/templates/red/search_box.tpl --- oldcal/templates/red/search_box.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/search_box.tpl 2006-02-08 03:07:54.000000000 -0500 @@ -0,0 +1,9 @@ +
+
{L_SEARCH}:
+
+ + + + + +
\ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/sidebar.tpl newcal/templates/red/sidebar.tpl --- oldcal/templates/red/sidebar.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/sidebar.tpl 2006-03-16 01:04:45.000000000 -0500 @@ -0,0 +1,225 @@ + +
+ + + + + + + + + + + + + + + + + + + + + +
{L_LOGIN}
+
+ {L_INVALID_LOGIN} +
+
{L_USERNAME}:
{L_PASSWORD}:
+
+ + + + + + +
+
+ + + + + + + + + + +
{L_PREV}{SIDEBAR_DATE}{L_NEXT}
+
+ {L_LEGEND}:
+ {LEGEND} + {L_GOPRINT}
+ + {L_PREFERENCES}
+ + + {L_SUBSCRIBE} | {L_DOWNLOAD}
+ + + {L_LOGOUT} {USERNAME} + +
+
+ + + + + + +
+
+ + + + + + + + +
{L_JUMP}
+
+
+
+
+
+
+
+ + +
+ + {SEARCH_BOX} + + +
+ + + +
+ +
+
{L_PICK_MULTIPLE}:
+
+ + +
+ +
+
+
+ + + + + + +
+
+ + + + + + + + + + +
{L_TOMORROWS}
+
+ + {T_ALLDAY}
+ + + • {T_EVENT}
+ +
+
+ + + + + + +
+
+ + + + + + + + + + + + +
{L_TODO}
+
+ + + + + + + + + + + + + + + + + + + + + + +
{VTODO_TEXT}
{VTODO_TEXT}
{VTODO_TEXT}
+
+
+ + + + + + +
+
+ + + + +{MONTH_SMALL|-1} + + + + + + +
+
+ +{MONTH_SMALL|+0} + + + + + + +
+
+ +{MONTH_SMALL|+1} + + + + + + +
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/sidebar_year.tpl newcal/templates/red/sidebar_year.tpl --- oldcal/templates/red/sidebar_year.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/sidebar_year.tpl 2006-03-20 03:18:55.000000000 -0500 @@ -0,0 +1,196 @@ + +
+ + + + + + + + + + + + + + + + + + + + + +
{L_LOGIN}
+
+ {L_INVALID_LOGIN} +
+
{L_USERNAME}:
{L_PASSWORD}:
+
+ + + + + + +
+
+ + + + + + + + + + +
{L_PREV}{SIDEBAR_DATE}{L_NEXT}
+
+ {L_LEGEND}:
+ {LEGEND} + {L_GOPRINT}
+ + {L_PREFERENCES}
+ + + {L_SUBSCRIBE} | {L_DOWNLOAD}
+ + + {L_LOGOUT} {USERNAME} + +
+
+ + + + + + +
+
+ + + + + + + + +
{L_JUMP}
+
+
+
+
+
+
+
+ + +
+ + {SEARCH_BOX} + + +
+ + + +
+ +
+
{L_PICK_MULTIPLE}:
+
+ + +
+ +
+
+
+ + + + + + +
+
+ + + + + + + + + + +
{L_TOMORROWS}
+
+ + {T_ALLDAY}
+ + + • {T_EVENT}
+ +
+
+ + + + + + +
+
+ + + + + + + + + + + + +
{L_TODO}
+
+ + + + + + + + + + + + + + + + + + + + + + +
{VTODO_TEXT}
{VTODO_TEXT}
{VTODO_TEXT}
+
+
+ + + + + + +
+
+ + + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/todo.tpl newcal/templates/red/todo.tpl --- oldcal/templates/red/todo.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/todo.tpl 2004-10-31 14:50:15.000000000 -0500 @@ -0,0 +1,42 @@ + + + + + {CAL} + + + +
+ + + + + + + +
{CAL_TITLE_FULL}
+
+

{VTODO_TEXT}

+ +

{DESCRIPTION}

+ +

+ + {L_STATUS}: {STATUS}
+ + + {L_PRIORITY}: {PRIORITY}
+ + + {L_CREATED}: {START_DATE}
+ + + {L_DUE}: {DUE_DATE}
+ +

+
+
+
+ + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/week.tpl newcal/templates/red/week.tpl --- oldcal/templates/red/week.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/week.tpl 2005-11-23 01:07:56.000000000 -0500 @@ -0,0 +1,117 @@ +{HEADER} +
+ + + + + + +
+ + + + + + + +
+ + + + + +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
{CONFIRMED}{EVENT_START}
+
{EVENT}
+
+ +
+
 «
+ 		+
 ‹
+ 		+
› 
+ 		+
» 
+ 		+ {DAY} +
+ +
+ {ALLDAY} + +
+ +
9:00 AM 
 
 
 
+
+
+ + + + + + +
+ 		+ + + {SIDEBAR} +
+
+{FOOTER} diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/red/year.tpl newcal/templates/red/year.tpl --- oldcal/templates/red/year.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/red/year.tpl 2006-03-20 03:20:08.000000000 -0500 @@ -0,0 +1,132 @@ +{HEADER} +
+ + + + +
+ + + + + + +
+   + + + + + + + +
+ [Previous Year] + +

{THIS_YEAR}

+ 		+ [Next Year] +
+ 		+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {MONTH_MEDIUM|01} + + + + {MONTH_MEDIUM|02} + + + + {MONTH_MEDIUM|03} + + + {SIDEBAR}
+ +
+ {MONTH_MEDIUM|04} + + + + {MONTH_MEDIUM|05} + + + + {MONTH_MEDIUM|06} +
+ +
+ {MONTH_MEDIUM|07} + + + + {MONTH_MEDIUM|08} + + + + {MONTH_MEDIUM|09} +
+ +
+ {MONTH_MEDIUM|10} + + + + {MONTH_MEDIUM|11} + + + + {MONTH_MEDIUM|12} +
+
+{FOOTER} Binary files oldcal/templates/tan/.DS_Store and newcal/templates/tan/.DS_Store differ diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/admin.tpl newcal/templates/tan/admin.tpl --- oldcal/templates/tan/admin.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/admin.tpl 2005-07-11 04:01:16.000000000 -0400 @@ -0,0 +1,132 @@ +{HEADER} +
+ + + + + + + + + + + + + +
+ + + + + +

{L_ADMIN_HEADER}

{L_ADMIN_SUBHEAD}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + {L_LOGOUT}  + +
+ + + + + +
+ + {L_INVALID_LOGIN}

+ + + +
+ + + + + + + + + + + + + + +
{L_USERNAME}:
{L_PASSWORD}:
 
+
+ + + + + {L_ADDUPDATE_CAL}
+ {L_ADDUPDATE_DESC}

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_CAL_FILE} 1:
{L_CAL_FILE} 2:
{L_CAL_FILE} 3:
{L_CAL_FILE} 4:
{L_CAL_FILE} 5:
 
{ADDUPDATE_MSG}  
+
+ + {L_DELETE_CAL} +
+ + {DELETE_TABLE} +
+ +

+

{DELETE_MSG}  

+
+ + +
+
+ + + + + + +
+{FOOTER} + + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/calendar_nav.tpl newcal/templates/tan/calendar_nav.tpl --- oldcal/templates/tan/calendar_nav.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/calendar_nav.tpl 2006-03-23 19:57:09.000000000 -0500 @@ -0,0 +1,113 @@ + + + + + + +
+ {MONTH_SMALL|-1} + + + + + + +
+ 		+ + + + + + +
+ + + + + + + +
{L_JUMP}
+
+
+
+
+
+
+
+ + +
+ + {SEARCH_BOX} + + +
+ + + + +
+ +
+
{L_PICK_MULTIPLE}:
+
+ + +
+ +
+
+
+ + + + + + +
+ 		+ + + + + + + + + +
{SIDEBAR_DATE}
+
+ {L_LEGEND}:
+ {LEGEND} + {L_GOPRINT}
+ + {L_PREFERENCES}
+ + + {L_SUBSCRIBE} | {L_DOWNLOAD}
+ + + Logout {USERNAME} + +
+
+ + + + + + +
+
+ 		+ {MONTH_SMALL|+1} + + + + + + +
+
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/day.tpl newcal/templates/tan/day.tpl --- oldcal/templates/tan/day.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/day.tpl 2005-11-19 01:55:40.000000000 -0500 @@ -0,0 +1,104 @@ +{HEADER} +
+ + + + + + +
+ + + + + + + + + + +
+ + + + + + + + +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+ + + + + + + + +
+ « + + {DAY} + + » +
+
+
+ +
+ {ALLDAY} +
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+
{CONFIRMED}{EVENT_START} - {EVENT_END}
+
{EVENT}
+
+ +
9:00 AM 
 
 
 
+
+ + + + + + +
+ 		+ {SIDEBAR} +
+
+{FOOTER} + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/default.css newcal/templates/tan/default.css --- oldcal/templates/tan/default.css 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/default.css 2006-03-23 21:45:19.000000000 -0500 @@ -0,0 +1,158 @@ +/* Style sheet for the grey calendar */ + +table, td {font: 11px Verdana, Arial, sans-serif; color: #000;} + +/* Background images for tables */ +.tbll {background: url(images/shadow_l.gif) no-repeat; width:8px} +.tblbot {background: url(images/shadow_m.gif) repeat-x; width:100%} +.tblr {background: url(images/shadow_r.gif) no-repeat; width:8px} + +.alldaybg_1 {background: url(images/allday_1.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_2 {background: url(images/allday_2.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_3 {background: url(images/allday_3.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_4 {background: url(images/allday_4.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_5 {background: url(images/allday_5.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_6 {background: url(images/allday_6.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.alldaybg_7 {background: url(images/allday_7.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} + +.rowOn { background-color: #cfc; border-top: 1px solid #fff; border-left: 1px solid #fff; } +.rowOn2 { background-color: #cfc; border-top: 1px solid #fff; } +.rowOff { background-color: #E1E8F1; border-top: 1px solid #fff; border-left: 1px solid #fff; } +.rowOff2 { background-color: #E1E8F1; border-top: 1px solid #fff; } +.rowToday { background-color: #cff; border-top: 1px solid #fff; border-left: 1px solid #fff; } + +.padd { padding: 2px; } + +/* Styles for day and week events (varies)*/ +.eventbg_1 { background-color: #A6A978; padding: 2px;} +.eventbg_2 { background-color: #CC8B00; padding: 2px;} +.eventbg_3 { background-color: #CC9966; padding: 2px;} +.eventbg_4 { background-color: #999900; padding: 2px;} +.eventbg_5 { background-color: #CC6600; padding: 2px;} +.eventbg_6 { background-color: #CCCC99; padding: 2px;} +.eventbg_7 { background-color: #666666; padding: 2px;} + +#allday a { font-size: 9px; color: #fff; font-weight: 900; text-decoration:none;} +#allday a:hover { text-decoration:underline;} +/*varies*/ +.eventbg2_1 { background-color: #A6A978; border: 1px solid #FFFFFF; } +.eventbg2_2 { background-color: #CC8B00; border: 1px solid #FFFFFF; } +.eventbg2_3 { background-color: #CC9966; border: 1px solid #FFFFFF; } +.eventbg2_4 { background-color: #999900; border: 1px solid #FFFFFF; } +.eventbg2_5 { background-color: #CC6600; border: 1px solid #FFFFFF; } +.eventbg2_6 { background-color: #CCCC99; border: 1px solid #FFFFFF; } +.eventbg2_7 { background-color: #666666; border: 1px solid #FFFFFF; } + +.alldaybg_8 {background: url(images/allday_8.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.eventbg_8 { background-color: #008888; padding: 2px;} +.eventbg2_8 { background-color: #00AAAA; border: 1px solid #73738C; } + +.alldaybg_9 {background: url(images/allday_9.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.eventbg_9 { background-color: #DDDD00; padding: 2px;} +.eventbg2_9 { background-color: #FFFF00; border: 1px solid #73738C; } + +.alldaybg_10 {background: url(images/allday_10.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.eventbg_10 { background-color: #000068; padding: 2px;} +.eventbg2_10 { background-color: #000089; border: 1px solid #73738C; } + +.alldaybg_11 {background: url(images/allday_11.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;} +.eventbg_11 { background-color: #009A78; padding: 2px;} +.eventbg2_11 { background-color: #00AA88; border: 1px solid #73738C; } + + +.dayborder { background-color: #fff; border-top: 1px solid #A1A5A9; } +.dayborder2 { background-color: #fff; border-top: 1px dashed #ccc; } + +.title { background-image: url(images/time_bg.gif); padding: 5px; } +.title h1 { font-family: Helvetica, sans-serif; font-size: 18px; color: #000; margin: 0px;} + +/* Month View */ + +.monthback { background-color: #A1A5A9; } +.monthreg { background-color: #fff; height: 105px; width: 105px; text-align: left; vertical-align: top; } +.monthoff { background-color: #F2F2F2; height: 105px; width: 105px; text-align: left; vertical-align: top; } +.monthon { background-color: #F2F9FF; height: 105px; width: 105px; text-align: left; vertical-align: top; } +.montheventtop { background-image: url(images/side_bg.gif); border-top: 1px solid #A1A5A9; } +.montheventline { border-right: 1px dotted #A1A5A9; } + +/* Year View */ + +.medtitle { background-image: url(images/side_bg.gif); height: 20px; margin-top: 3px; font-weight: 900; } +.yearreg { background-color: #fff; height: 30px; width: 30px; text-align: right; vertical-align: top; font-size: 9px; } +.yearoff { background-color: #F2F2F2; height: 30px; width: 30px; text-align: right; vertical-align: top; font-size: 9px; } +.yearon { background-color: #F2F9FF; height: 30px; width: 30px; text-align: right; vertical-align: top; font-size: 9px; } +.yearmonth { background-color: #ccc; } +.yearweek { background-color: #eee; width: 30px; font-size: 9px; font-weight: 900; text-align: center; height: 15px; } + + +/* older styles */ + +.eventborder { background-image: url(images/day_title.gif); border: 1px #006699 solid; } +.eventbg { background-color: #6699CC; } + +.calborder { background-color: #fff; border: 1px #A1A5A9 solid; } +.dateback { background-color: #eee; } +.weekborder { border-top: 1px dashed #A1A5A9; border-right: 1px solid #A1A5A9; } +.weekborder2 { border-right: 1px solid #A1A5A9; } +.timeborder { border-right: 2px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); } +.timeborder2 { border-right: 2px solid #A1A5A9; border-top: 1px solid #A1A5A9; background-image: url(images/time_bg.gif); } +.navback { background-image: url(images/time_bg.gif); } +.sideback { background-image: url(images/side_bg.gif); } + + +/* Link colors and attributes */ +/* This is the main link style (varies) */ +a.psf { text-decoration: none; } +a.psf:link { color: #666; } +a.psf:visited { color: #888; } +a.psf:active { color: #666; } +a.psf:hover { color: #333; text-decoration: underline; } + +/* This is the link style for the mini-cals (varies)*/ +a.ps2 { text-decoration: underline; } +a.ps2:link { color: #0066FF; } +a.ps2:visited { color: #0066FF; } +a.ps2:active { color: #3366CC; } +a.ps2:hover { color: #000099; } + +/* This is the link style for year months */ +a.ps3 { text-decoration: none; } +a.ps3:link { color: #000; } +a.ps3:visited { color: #000; } +a.ps3:active { color: #000; } +a.ps3:hover { color: #000; text-decoration: underline; } + +/* This is the link style for events */ +a.ps { text-decoration: none; } +a.ps:link { color: #fff; } +a.ps:visited { color: #fff; } +a.ps:active { color: #fff; } +a.ps:hover { color: #fff; text-decoration: underline; } + +/* Body attributes */ + +body { background-image: url(images/background.gif); } + +/* CSS definitions for fonts */ + +.V9 { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; color: #000000; } +.V10W { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 10px; color: #FFFFFF; text-decoration: none;} +.V9W { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; color: #FFFFFF; text-decoration: none;} +.V10WB { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 10px; color: #FFFFFF; font-weight: 900; } +.V9G { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; color: #666666; } +.V10 { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 10px; color: #000000; } +.V9BOLD { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; font-weight: 900; } +.G10 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #0066FF; } +.G10B { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #000000; } +.G10BOLD { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; font-weight: 900; } +.G10G { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #A1A5A9; } +.V12 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; color: #000000; } +/*h1 { font-family: Helvetica, sans-serif; font-size: 18px; color: #000000; }*/ +.eventfont { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #FFFFFF; } + + +/* Length of the form drop downs */ + +.query_style { font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; } +.search_style { font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; } +.login_style { font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 80px; margin-bottom: 0; } diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/error.tpl newcal/templates/tan/error.tpl --- oldcal/templates/tan/error.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/error.tpl 2004-12-18 13:37:52.000000000 -0500 @@ -0,0 +1,43 @@ +{HEADER} +
+ + + + +
+ + + + + + + +
+ + + + + + +
{L_ERROR_WINDOW}
+
+ + + + +
+ {ERROR_MSG}
+ [What does this mean?] +
+
+ {ERROR_CALENDAR} +
+
+ {L_ERROR_BACK} +
+ +
+
+
+
+{FOOTER} \ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/event.tpl newcal/templates/tan/event.tpl --- oldcal/templates/tan/event.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/event.tpl 2005-09-06 22:52:07.000000000 -0400 @@ -0,0 +1,43 @@ + + + + + {CAL} + + + +
+ + + + + + + +
{CAL_TITLE_FULL}
+
+

{EVENT_TEXT} - ({EVENT_TIMES})

+ +

{DESCRIPTION}

+ +

+ + {L_ORGANIZER}: {ORGANIZER}
+ + + {L_ATTENDEE}: {ATTENDEE}
+ + + {L_STATUS}: {STATUS}
+ + + {L_LOCATION}: {LOCATION}
+ +

+
+
+
+ + + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/footer.tpl newcal/templates/tan/footer.tpl --- oldcal/templates/tan/footer.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/footer.tpl 2006-04-09 21:18:56.000000000 -0400 @@ -0,0 +1,15 @@ +

{L_POWERED_BY} PHP iCalendar {VERSION}
+ +

+ +[Valid RSS] +

+ + +{L_THIS_SITE_IS} RSS-Enabled
+ + +
+ + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/header.tpl newcal/templates/tan/header.tpl --- oldcal/templates/tan/header.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/header.tpl 2006-03-23 19:59:10.000000000 -0500 @@ -0,0 +1,19 @@ + + + + + {CALENDAR_NAME} - {DISPLAY_DATE} + + + + + {EVENT_JS} + + + Binary files oldcal/templates/tan/images/.DS_Store and newcal/templates/tan/images/.DS_Store differ Binary files oldcal/templates/tan/images/allday_1.gif and newcal/templates/tan/images/allday_1.gif differ Binary files oldcal/templates/tan/images/allday_2.gif and newcal/templates/tan/images/allday_2.gif differ Binary files oldcal/templates/tan/images/allday_3.gif and newcal/templates/tan/images/allday_3.gif differ Binary files oldcal/templates/tan/images/allday_4.gif and newcal/templates/tan/images/allday_4.gif differ Binary files oldcal/templates/tan/images/allday_5.gif and newcal/templates/tan/images/allday_5.gif differ Binary files oldcal/templates/tan/images/allday_6.gif and newcal/templates/tan/images/allday_6.gif differ Binary files oldcal/templates/tan/images/allday_7.gif and newcal/templates/tan/images/allday_7.gif differ Binary files oldcal/templates/tan/images/allday_bg.gif and newcal/templates/tan/images/allday_bg.gif differ Binary files oldcal/templates/tan/images/allday_dot.gif and newcal/templates/tan/images/allday_dot.gif differ Binary files oldcal/templates/tan/images/back.gif and newcal/templates/tan/images/back.gif differ Binary files oldcal/templates/tan/images/background.gif and newcal/templates/tan/images/background.gif differ Binary files oldcal/templates/tan/images/day_on.gif and newcal/templates/tan/images/day_on.gif differ Binary files oldcal/templates/tan/images/day_title.gif and newcal/templates/tan/images/day_title.gif differ diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/images/default.css newcal/templates/tan/images/default.css --- oldcal/templates/tan/images/default.css 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/images/default.css 2003-11-22 16:16:11.000000000 -0500 @@ -0,0 +1,99 @@ +/* Style sheet for the green calendar */ + +.eventborder { background-color: #979A65; border: 1px #616339 solid; } +.eventbg { background-color: #A6A978; } + +.eventbg_1 { background-color: #A6A978; } +.eventbg_2 { background-color: #CC8B00; } +.eventbg_3 { background-color: #CC9966; } +.eventbg_4 { background-color: #999900; } +.eventbg_5 { background-color: #CC6600; } +.eventbg_6 { background-color: #CCCC99; } +.eventbg_7 { background-color: #666666; } + +.eventbg2 { background-color: #A6A978; border-right: 1px solid #FFFFFF; } + +.eventbg2_1 { background-color: #A6A978; border-right: 1px solid #FFFFFF; } +.eventbg2_2 { background-color: #CC8B00; border-right: 1px solid #FFFFFF; } +.eventbg2_3 { background-color: #CC9966; border-right: 1px solid #FFFFFF; } +.eventbg2_4 { background-color: #999900; border-right: 1px solid #FFFFFF; } +.eventbg2_5 { background-color: #CC6600; border-right: 1px solid #FFFFFF; } +.eventbg2_6 { background-color: #CCCC99; border-right: 1px solid #FFFFFF; } +.eventbg2_7 { background-color: #666666; border-right: 1px solid #FFFFFF; } +.eventbg2week { background-color: #A6A978; border-right: 1px solid #A1A5A9; } + +.eventbg2week_1 { background-color: #A6A978; border-right: 1px solid #A1A5A9; } +.eventbg2week_2 { background-color: #CC8B00; border-right: 1px solid #A1A5A9; } +.eventbg2week_3 { background-color: #CC9966; border-right: 1px solid #A1A5A9; } +.eventbg2week_4 { background-color: #999900; border-right: 1px solid #A1A5A9; } +.eventbg2week_5 { background-color: #CC6600; border-right: 1px solid #A1A5A9; } +.eventbg2week_6 { background-color: #CCCC99; border-right: 1px solid #A1A5A9; } +.eventbg2week_7 { background-color: #666666; border-right: 1px solid #A1A5A9; } + +.calborder { background-color: #FFFFFF; border: 1px #A1A5A9 solid; } +.dateback { background-color: #EEEEEE; } +.dayborder { border-top: 1px solid #A1A5A9; } +.dayborder2 { border-top: 1px dashed #CCCCCC; } +.weekborder { border-top: 1px dashed #A1A5A9; border-right: 1px solid #A1A5A9; } +.weekborder2 { border-right: 1px solid #A1A5A9; } +.timeborder { border-right: 2px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(time_bg.gif); } +.timeborder2 { border-right: 2px solid #A1A5A9; border-top: 1px solid #A1A5A9; background-image: url(time_bg.gif); } +.navback { background-image: url(time_bg.gif); } +.sideback { background-image: url(side_bg.gif); } +.monthback { background-color: #A1A5A9; } +.monthreg { background-color: #FFFFFF; } +.monthoff { background-color: #F2F2F2; } +.monthon { background-color: #F1F3D8; } +.montheventtop { background-image: url(side_bg.gif); border-top: 1px solid #A1A5A9; } +.montheventline { border-right: 1px dotted #A1A5A9; } +.yearmonth { background: #CCCCCC; } + +/* Link colors and attributes */ +/* This is the main link style */ +a.psf { text-decoration: none; } +a.psf:link { color: #999933; background-color: transparent; } +a.psf:visited { color: #999933; background-color: transparent; } +a.psf:active { color: #999933; background-color: transparent; } +a.psf:hover { color: #333300; background-color: transparent; } + +/* This is the link style for the mini-cals */ +a.ps2 { text-decoration: underline; } +a.ps2:link { color: #999933; background-color: transparent; } +a.ps2:visited { color: #999933; background-color: transparent; } +a.ps2:active { color: #999933; background-color: transparent; } +a.ps2:hover { color: #333300; background-color: transparent; } + +/* This is the link style for year months */ +a.ps3 { text-decoration: none; } +a.ps3:link { color: #000000; background-color: transparent; } +a.ps3:visited { color: #000000; background-color: transparent; } +a.ps3:active { color: #000000; background-color: transparent; } +a.ps3:hover { color: #000000; background-color: transparent; text-decoration: underline;} + +/* Body attributes */ + +body { background-image: url(background.gif); } + +/* CSS definitions for fonts */ + +.V9 { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; color: #000000; } +.V10W { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 10px; color: #FFFFFF; } +.V10WB { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 10px; color: #FFFFFF; font-weight: 900; } +.V9G { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; color: #666666; } +.V10 { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 10px; color: #000000; } +.V9BOLD { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-size: 9px; font-weight: 900; } +.G10 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #0066FF; } +.G10B { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #000000; } +.G10BOLD { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; font-weight: 900; } +.G10G { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #A1A5A9; } +.V12 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; color: #000000; } +.H20 { font-family: Helvetica, sans-serif; font-size: 18px; color: #000000; } +.eventfont { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #FFFFFF; } + + +/* Length of the form drop downs */ + +.query_style { font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; } +.search_style { font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; } +.login_style { font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 80px; margin-bottom: 0; } + Binary files oldcal/templates/tan/images/download_arrow.gif and newcal/templates/tan/images/download_arrow.gif differ Binary files oldcal/templates/tan/images/event_dot.gif and newcal/templates/tan/images/event_dot.gif differ Binary files oldcal/templates/tan/images/left_arrows.gif and newcal/templates/tan/images/left_arrows.gif differ Binary files oldcal/templates/tan/images/left_day.gif and newcal/templates/tan/images/left_day.gif differ Binary files oldcal/templates/tan/images/month_on.gif and newcal/templates/tan/images/month_on.gif differ Binary files oldcal/templates/tan/images/monthdot_1.gif and newcal/templates/tan/images/monthdot_1.gif differ Binary files oldcal/templates/tan/images/monthdot_2.gif and newcal/templates/tan/images/monthdot_2.gif differ Binary files oldcal/templates/tan/images/monthdot_3.gif and newcal/templates/tan/images/monthdot_3.gif differ Binary files oldcal/templates/tan/images/monthdot_4.gif and newcal/templates/tan/images/monthdot_4.gif differ Binary files oldcal/templates/tan/images/monthdot_5.gif and newcal/templates/tan/images/monthdot_5.gif differ Binary files oldcal/templates/tan/images/monthdot_6.gif and newcal/templates/tan/images/monthdot_6.gif differ Binary files oldcal/templates/tan/images/monthdot_7.gif and newcal/templates/tan/images/monthdot_7.gif differ Binary files oldcal/templates/tan/images/printer.gif and newcal/templates/tan/images/printer.gif differ Binary files oldcal/templates/tan/images/right_arrows.gif and newcal/templates/tan/images/right_arrows.gif differ Binary files oldcal/templates/tan/images/right_day.gif and newcal/templates/tan/images/right_day.gif differ Binary files oldcal/templates/tan/images/search.gif and newcal/templates/tan/images/search.gif differ Binary files oldcal/templates/tan/images/shadow_l.gif and newcal/templates/tan/images/shadow_l.gif differ Binary files oldcal/templates/tan/images/shadow_m.gif and newcal/templates/tan/images/shadow_m.gif differ Binary files oldcal/templates/tan/images/shadow_r.gif and newcal/templates/tan/images/shadow_r.gif differ Binary files oldcal/templates/tan/images/side_bg.gif and newcal/templates/tan/images/side_bg.gif differ Binary files oldcal/templates/tan/images/smallicon.gif and newcal/templates/tan/images/smallicon.gif differ Binary files oldcal/templates/tan/images/spacer.gif and newcal/templates/tan/images/spacer.gif differ Binary files oldcal/templates/tan/images/time_bg.gif and newcal/templates/tan/images/time_bg.gif differ Binary files oldcal/templates/tan/images/week_on.gif and newcal/templates/tan/images/week_on.gif differ Binary files oldcal/templates/tan/images/year_on.gif and newcal/templates/tan/images/year_on.gif differ diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/month.tpl newcal/templates/tan/month.tpl --- oldcal/templates/tan/month.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/month.tpl 2005-11-19 01:56:27.000000000 -0500 @@ -0,0 +1,88 @@ +{HEADER} +
+ + + + +
+ + + + + +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ {MONTH_LARGE|+0} + + + + + + +
+
+ {CALENDAR_NAV} + +
+ + + + + + + +
+ + + + + + +
{L_PREV}

{L_THIS_MONTHS}

{L_NEXT}
+
+ + + + + + + + + + + + + +
+ {START_DATE}
+ {START_TIME} + 		+ {EVENT_TEXT}
{CALNAME} +
+ {START_DATE}
+ {START_TIME} + 		+ {EVENT_TEXT}
{CALNAME} +
+
+ + + + + + +
+ +
+{FOOTER} diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/month_large.tpl newcal/templates/tan/month_large.tpl --- oldcal/templates/tan/month_large.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/month_large.tpl 2004-05-19 23:59:37.000000000 -0400 @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + +
+
{LOOP_WEEKDAY}
+
+
+ {DAY} +
+ {ALLDAY} + {EVENT} + 		+
+ {DAY} +
+ {ALLDAY} + {EVENT} + 		+
+ {DAY} +
+ {ALLDAY} + {EVENT} +
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/month_medium.tpl newcal/templates/tan/month_medium.tpl --- oldcal/templates/tan/month_medium.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/month_medium.tpl 2006-03-23 19:59:55.000000000 -0500 @@ -0,0 +1,45 @@ + + + + + + + +
{MONTH_TITLE}
+ + + + + + + + + + + + + + + + + + + + + +
{LOOP_WEEKDAY}
+ {DAY} + + {DAY} +
+ {ALLDAY} + {EVENT} +
+ 		+ {DAY} +
+ {ALLDAY} + {EVENT} +
+
+
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/month_small.tpl newcal/templates/tan/month_small.tpl --- oldcal/templates/tan/month_small.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/month_small.tpl 2004-09-13 15:35:23.000000000 -0400 @@ -0,0 +1,38 @@ + + + + + + + +
{MONTH_TITLE}
+ + + + + + + + + + + + + + + + + + + + + +
{LOOP_WEEKDAY}
+ {DAY} + + {DAY} + + {DAY} +
+
+
\ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/preferences.tpl newcal/templates/tan/preferences.tpl --- oldcal/templates/tan/preferences.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/preferences.tpl 2006-03-23 20:00:10.000000000 -0500 @@ -0,0 +1,102 @@ +{HEADER} +
+ + + + + + + + + + +
+ + + + + +

{L_PREFERENCES}

{L_PREFS_SUBHEAD}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + + + + + + +
{MESSAGE}
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_SELECT_LANG}:
{L_SELECT_CAL}: +
{L_SELECT_VIEW}:
{L_SELECT_TIME}:
{L_SELECT_DAY}:
{L_SELECT_STYLE}:
{L_UNSET_PREFS}:
 
+
+
+
+ + + + + + +
+ +
+{FOOTER} diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/print.tpl newcal/templates/tan/print.tpl --- oldcal/templates/tan/print.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/print.tpl 2006-03-23 20:00:58.000000000 -0500 @@ -0,0 +1,81 @@ +{HEADER} +
+ + + + + + + + + + +
+ + + + + +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}
+ Calendar view		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + +
+ +
{DAYOFMONTH}
+ +
+ + + + + + + + + + + + + + + + + + + + + +
{L_TIME}:{EVENT_START}
{L_LOCATION}:{LOCATION}
{L_SUMMARY}:{EVENT_TEXT}
{L_DESCRIPTION}:{DESCRIPTION}
+
+ + + + +
{L_NO_RESULTS}
+ +
+
+ + + + + + +
+
+{FOOTER} \ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/rss_index.tpl newcal/templates/tan/rss_index.tpl --- oldcal/templates/tan/rss_index.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/rss_index.tpl 2006-03-23 20:01:18.000000000 -0500 @@ -0,0 +1,61 @@ +{HEADER} +
+ + + + +
+ + + + + + + + + + +
+ + + + + +

{L_RSS_INFO}

{L_RSS_SUBHEAD}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + + +
+
+ {L_THIS_SITE_IS} RSS 0.91 enabled.
+
+ {RSS_LIST} +
+

RSS feeds can also be set up for a specified number of days before or after a given date, or between two dates. See the documentation for how to set up the URLs

+
+
+
+ + + + + + +
+
+ +{FOOTER} \ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/search.tpl newcal/templates/tan/search.tpl --- oldcal/templates/tan/search.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/search.tpl 2005-10-30 01:15:47.000000000 -0500 @@ -0,0 +1,115 @@ +{HEADER} +
+ + + + + + + + + + +
+ + + + + +

{L_RESULTS}

{CALENDAR_NAME} {L_CALENDAR}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+
+

{L_QUERY}: {FORMATTED_SEARCH}

+ + {DAYOFMONTH}
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
{L_TIME}:{EVENT_START}
{L_LOCATION}:{LOCATION}
{L_SUMMARY}:{EVENT_TEXT}
{L_RECURRING_EVENT}:{RECUR}
{L_DESCRIPTION}:{DESCRIPTION}
+
+ + {L_EXCEPTION}: {DAYOFMONTH}
+
+ + + + + + + + + + + + + + + + + + + + + +
{L_TIME}:{EVENT_START}
{L_SUMMARY}:{EVENT_TEXT}
{L_RECURRING_EVENT}:{EXCEPT_RECUR}
{L_DESCRIPTION}:{EXCEPT_DESCRIPTION}
+
+ +
+ + + +
+

{L_NO_RESULTS}

+
+ + +
+ {SEARCH_BOX} +
+
+
+
+ + + + + + +
+
+ +{FOOTER} + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/search_box.tpl newcal/templates/tan/search_box.tpl --- oldcal/templates/tan/search_box.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/search_box.tpl 2006-03-23 20:01:37.000000000 -0500 @@ -0,0 +1,9 @@ +
+
{L_SEARCH}:
+
+ + + + + +
\ No newline at end of file diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/seminar.tpl newcal/templates/tan/seminar.tpl --- oldcal/templates/tan/seminar.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/seminar.tpl 2004-09-27 12:31:30.000000000 -0400 @@ -0,0 +1,43 @@ + + + + + {CAL} + + + +
+ + + + + + + +
{CAL_TITLE_FULL}
+
+

{EVENT} - ({EVENT_TIMES})

+ +

{DESCRIPTION}

+ +

+ + + Host:: {ATTENDEE}
+ + + {L_STATUS}: {STATUS}
+ + + {L_LOCATION}: {LOCATION}
+ +

+
+
+
+ + + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/sidebar.tpl newcal/templates/tan/sidebar.tpl --- oldcal/templates/tan/sidebar.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/sidebar.tpl 2006-03-23 20:02:15.000000000 -0500 @@ -0,0 +1,225 @@ + +
+ + + + + + + + + + + + + + + + + + + + + +
{L_LOGIN}
+
+ {L_INVALID_LOGIN} +
+
{L_USERNAME}:
{L_PASSWORD}:
+
+ + + + + + +
+
+ + + + + + + + + + +
{L_PREV}{SIDEBAR_DATE}{L_NEXT}
+
+ {L_LEGEND}:
+ {LEGEND} + {L_GOPRINT}
+ + {L_PREFERENCES}
+ + + {L_SUBSCRIBE} | {L_DOWNLOAD}
+ + + {L_LOGOUT} {USERNAME} + +
+
+ + + + + + +
+
+ + + + + + + + +
{L_JUMP}
+
+
+
+
+
+
+
+ + +
+ + {SEARCH_BOX} + + +
+ + + +
+ +
+
{L_PICK_MULTIPLE}:
+
+ + +
+ +
+
+
+ + + + + + +
+
+ + + + + + + + + + +
{L_TOMORROWS}
+
+ + {T_ALLDAY}
+ + + • {T_EVENT}
+ +
+
+ + + + + + +
+
+ + + + + + + + + + + + +
{L_TODO}
+
+ + + + + + + + + + + + + + + + + + + + + + +
{VTODO_TEXT}
{VTODO_TEXT}
{VTODO_TEXT}
+
+
+ + + + + + +
+
+ + + + +{MONTH_SMALL|-1} + + + + + + +
+
+ +{MONTH_SMALL|+0} + + + + + + +
+
+ +{MONTH_SMALL|+1} + + + + + + +
diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/todo.tpl newcal/templates/tan/todo.tpl --- oldcal/templates/tan/todo.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/todo.tpl 2004-12-18 13:35:39.000000000 -0500 @@ -0,0 +1,42 @@ + + + + + {CAL} + + + +
+ + + + + + + +
{CAL_TITLE_FULL}
+
+

{VTODO_TEXT}

+ +

{DESCRIPTION}

+ +

+ + {L_STATUS}: {STATUS}
+ + + {L_PRIORITY}: {PRIORITY}
+ + + {L_CREATED}: {START_DATE}
+ + + {L_DUE}: {DUE_DATE}
+ +

+
+
+
+ + diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/week.tpl newcal/templates/tan/week.tpl --- oldcal/templates/tan/week.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/week.tpl 2005-11-19 01:59:28.000000000 -0500 @@ -0,0 +1,117 @@ +{HEADER} +
+ + + + + + +
+ + + + + + + +
+ + + + + +

{DISPLAY_DATE}

{CALENDAR_NAME} {L_CALENDAR}		 +
+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
{CONFIRMED}{EVENT_START}
+
{EVENT}
+
+ +
+
 «
+ 		+
 ‹
+ 		+
› 
+ 		+
» 
+ 		+ {DAY} +
+ +
+ {ALLDAY} + +
+ +
9:00 AM 
 
 
 
+
+
+ + + + + + +
+ 		+ + + {SIDEBAR} +
+
+{FOOTER} diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/templates/tan/year.tpl newcal/templates/tan/year.tpl --- oldcal/templates/tan/year.tpl 1969-12-31 19:00:00.000000000 -0500 +++ newcal/templates/tan/year.tpl 2006-03-23 20:02:32.000000000 -0500 @@ -0,0 +1,132 @@ +{HEADER} +
+ + + + +
+ + + + + + +
+   + + + + + + + +
+ [Previous Year] + +

{THIS_YEAR}

+ 		+ [Next Year] +
+ 		+ + + + + + + +
{L_DAY}{L_WEEK}{L_MONTH}{L_YEAR}
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {MONTH_MEDIUM|01} + + + + {MONTH_MEDIUM|02} + + + + {MONTH_MEDIUM|03} + + + {SIDEBAR}
+ +
+ {MONTH_MEDIUM|04} + + + + {MONTH_MEDIUM|05} + + + + {MONTH_MEDIUM|06} +
+ +
+ {MONTH_MEDIUM|07} + + + + {MONTH_MEDIUM|08} + + + + {MONTH_MEDIUM|09} +
+ +
+ {MONTH_MEDIUM|10} + + + + {MONTH_MEDIUM|11} + + + + {MONTH_MEDIUM|12} +
+
+{FOOTER} diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/week.php newcal/week.php --- oldcal/week.php 2005-12-01 01:15:28.000000000 -0500 +++ newcal/week.php 2006-04-09 21:23:15.000000000 -0400 @@ -50,18 +50,19 @@ 'header' => BASE.'templates/'.$template.'/header.tpl', 'event_js' => BASE.'functions/event.js', 'footer' => BASE.'templates/'.$template.'/footer.tpl', - 'sidebar' => BASE.'templates/'.$template.'/sidebar.tpl', - 'search_box' => BASE.'templates/'.$template.'/search_box.tpl' + 'sidebar' => BASE.'templates/'.$template.'/sidebar.tpl', + 'search_box' => BASE.'templates/'.$template.'/search_box.tpl' )); $page->replace_tags(array( + 'version' => $phpicalendar_version, 'charset' => $charset, 'default_path' => '', 'template' => $template, 'cal' => $cal, 'getdate' => $getdate, 'getcpath' => "&cpath=$cpath", - 'cpath' => $cpath, + 'cpath' => $cpath, 'calendar_name' => $cal_displayname, 'display_date' => $display_date, 'current_view' => $current_view, @@ -69,7 +70,7 @@ 'rss_powered' => $rss_powered, 'rss_available' => '', 'rss_valid' => '', - 'show_search' => $show_search, + 'show_search' => $show_search, 'next_day' => $next_day, 'next_week' => $next_week, 'prev_day' => $prev_day, @@ -103,6 +104,7 @@ 'l_subscribe' => $lang['l_subscribe'], 'l_download' => $lang['l_download'], 'l_search' => $lang['l_search'], + 'l_pick_multiple' => $lang['l_pick_multiple'], 'l_powered_by' => $lang['l_powered_by'], 'l_this_site_is' => $lang['l_this_site_is'] )); diff -ruN --exclude php.ini --exclude config.inc.php --exclude .scripts-version --exclude config.inc.php oldcal/year.php newcal/year.php --- oldcal/year.php 2005-12-07 02:26:14.000000000 -0500 +++ newcal/year.php 2006-04-09 21:23:30.000000000 -0400 @@ -3,6 +3,7 @@ define('BASE', './'); $current_view = 'year'; require_once(BASE.'functions/ical_parser.php'); +require_once(BASE.'functions/list_functions.php'); require_once(BASE.'functions/template.php'); header("Content-Type: text/html; charset=$charset"); @@ -15,41 +16,116 @@ $prev_year = strtotime ("-1 year", strtotime($getdate)); $prev_year = date ("Ymd", $prev_year); +$sidebar_date = localizeDate($dateFormat_day, strtotime($getdate)); + +// For the side months +ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2); +$this_day = $day_array2[3]; +$this_month = $day_array2[2]; +$this_year = $day_array2[1]; + +// select for calendars +$list_icals = display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED)); +$list_years = list_years(); +$list_months = list_months(); +$list_weeks = list_weeks(); +$list_jumps = list_jumps(); +$list_calcolors = ' '.$lang['l_all_day'].'
+ '.$lang['l_event']."
"; +; +$list_icals_pick = display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED), TRUE); + +// login/logout +$is_logged_in = ($username != '' && !$invalid_login) ? true : false; +$show_user_login = (!$is_logged_in && $allow_login == 'yes'); +$login_querys = login_querys(); +$logout_querys = logout_querys(); + + + $page = new Page(BASE.'templates/'.$template.'/year.tpl'); $page->replace_files(array( 'header' => BASE.'templates/'.$template.'/header.tpl', - 'footer' => BASE.'templates/'.$template.'/footer.tpl' + 'footer' => BASE.'templates/'.$template.'/footer.tpl', + 'sidebar' => BASE.'templates/'.$template.'/sidebar_year.tpl', + 'search_box' => BASE.'templates/'.$template.'/search_box.tpl' )); $page->replace_tags(array( + 'version' => $phpicalendar_version, 'event_js' => '', + 'current_view' => $current_view, 'template' => $template, 'charset' => $charset, 'default_path' => '', 'cal' => $cal, - 'getcpath' => "&cpath=$cpath", - 'cpath' => $cpath, + 'getcpath' => "&cpath=$cpath", + 'cpath' => $cpath, 'getdate' => $getdate, 'calendar_name' => $cal_displayname, 'display_date' => $this_year, + 'sidebar_date' => $sidebar_date, 'rss_powered' => $rss_powered, 'rss_available' => '', 'rss_valid' => '', 'todo_available' => '', 'event_js' => '', 'this_year' => $this_year, + 'next_day' => $next_day, + 'next_week' => $next_week, + 'prev_day' => $prev_day, + 'prev_week' => $prev_week, 'next_year' => $next_year, 'prev_year' => $prev_year, + 'show_goto' => '', + 'show_user_login' => $show_user_login, + 'invalid_login' => $invalid_login, + 'login_querys' => $login_querys, + 'is_logged_in' => $is_logged_in, + 'username' => $username, + 'logout_querys' => $logout_querys, + 'list_icals' => $list_icals, + 'list_icals_pick' => $list_icals_pick, + 'list_years' => $list_years, + 'list_months' => $list_months, + 'list_weeks' => $list_weeks, + 'list_jumps' => $list_jumps, + 'legend' => $list_calcolors, + 'style_select' => $style_select, + 'l_goprint' => $lang['l_goprint'], + 'l_preferences' => $lang['l_preferences'], + 'l_calendar' => $lang['l_calendar'], + 'l_legend' => $lang['l_legend'], + 'l_tomorrows' => $lang['l_tomorrows'], + 'l_jump' => $lang['l_jump'], + 'l_todo' => $lang['l_todo'], 'l_day' => $lang['l_day'], 'l_week' => $lang['l_week'], 'l_month' => $lang['l_month'], 'l_year' => $lang['l_year'], + 'l_search' => $lang['l_search'], + 'l_subscribe' => $lang['l_subscribe'], + 'l_download' => $lang['l_download'], + 'l_pick_multiple' => $lang['l_pick_multiple'], 'l_powered_by' => $lang['l_powered_by'], 'l_this_site_is' => $lang['l_this_site_is'] )); - + +if ($allow_login == 'yes') { + $page->replace_tags(array( + 'l_invalid_login' => $lang['l_invalid_login'], + 'l_password' => $lang['l_password'], + 'l_username' => $lang['l_username'], + 'l_login' => $lang['l_login'], + 'l_logout' => $lang['l_logout'] + )); +} + +$page->tomorrows_events($page); +$page->get_vtodo($page); +$page->draw_subscribe($page); $page->output(); ?>