From edd9a9fd1a3451f7868400fcf9d2ebe0cf563c51 Mon Sep 17 00:00:00 2001 From: Jim Hu Date: Sat, 20 Dec 2008 00:11:55 +0000 Subject: fix rss link and dates --- AUTHORS | 70 +++++--- README | 5 + functions/ical_parser.php | 5 +- functions/init/cpaths.php | 3 +- languages/danish.inc.php | 304 +++++++++++++++++---------------- languages/spanish.inc.php | 417 +++++++++++++++++++++++----------------------- rss/rss1.0.php | 4 +- rss/rss2.0.php | 4 +- rss/rss_common.php | 4 +- 9 files changed, 428 insertions(+), 388 deletions(-) diff --git a/AUTHORS b/AUTHORS index 2d9070f..bff1ef3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,41 +1,59 @@ AUTHORS ------- This file is a list of all people who have contributed their time to the -PHP iCalendar project. Each section is sorted alphabetically. Thanks to -all who are listed here. +PHP iCalendar project. Each section is sorted alphabetically dot Thanks to +all who are listed here. + +PHP iCalendar was originally written and administered by Chad Little dot Jim Hu has been the main project admin since PROJECT ADMINS -------------- -Chad Little -Patrick Crowley +Jim Hu DEVELOPERS ---------- -Patrick Berry -Bill Fenner -David Reindl -Jared Wangen +Patrick Berry +Patrick Crowley +Bill Fenner +Jim Hu +Chad Little +David Reindl +Jared Wangen CODE CONTRIBUTORS ----------------- -Greg Westin -Blaine Cook -Mike Traum +Greg Westin +Blaine Cook +Mike Traum TRANSLATORS ----------- -Braz. Port. Bennet Wilton -Danish Henrik Højmark - Jakob Peterhänsel -Dutch Lieven Gekiere -English Chad Little -Finnish Kari Somby -French La Shampouineuse -German David Reindl -Italian Luca Cacciagrano -Japanese Jared Wangen -Norwegian Geir Kielland -Polish Stanislaw Cieslicki -Portuguese Rui Costa -Spanish Javier Navarro -Swedish Jonas Hjelm +Braz.Port. Bennet Wilton +Bulgarian Georgi Kodinov +Danish Henrik Højmark + Jakob Peterhänsel + Franck +Dutch Lieven Gekiere +English Chad Little +English (UK) Markus Kuhn +Estonian Mikk Lainvoo +Finnish Kari Somby +French La Shampouineuse +Galego Manel Rives + Markus Kuhn +Hungarian Gyula +Italian Luca Cacciagrano +Indonesian Ronny as-Salafi +Japanese Jared Wangen +Korean Sang-un Chan +Norwegian Geir Kielland +Polish Stanislaw Cieslicki +Portuguese Rui Costa + Luciano Antonio Costa +Slovak Jan Michalicka contact@jimi.sk +Spanish Javier Navarro + Luis Fernando Rocha +Russian Sergey <1c@3555686 dot com> +Swedish Jonas Hjelm diff --git a/README b/README index 805034b..1602ffe 100644 --- a/README +++ b/README @@ -88,6 +88,11 @@ COPYING for more information about our license. Changes: -------- +2.3 Major changes to recurrence handling + Added more languages + Added login to month view + Consolidated common rss functions + 2.24 Fix bug 1681711 - change how todo popups are handled Fix bug 1632649 - year display diff --git a/functions/ical_parser.php b/functions/ical_parser.php index ce1f6b6..c52594d 100644 --- a/functions/ical_parser.php +++ b/functions/ical_parser.php @@ -463,7 +463,8 @@ $cal_displayname = urldecode(implode(', ', $cal_displaynames)); #reset this with $template_started = getmicrotime(); //If you want to see the values in the arrays, uncomment below. -//print '
';
+#print '
';
+#var_dump($phpiCal_config);
 //print_r($master_array);
 //print_r($overlap_array);
 //print_r($day_array);
@@ -473,5 +474,5 @@ $template_started = getmicrotime();
 //print_r($cal_displaynames);
 //print_r($cal_filelist);
 //print_r($tz_array);
-//print '
';
+#print '
'; ?> \ No newline at end of file diff --git a/functions/init/cpaths.php b/functions/init/cpaths.php index dd6ae45..c1ab50b 100644 --- a/functions/init/cpaths.php +++ b/functions/init/cpaths.php @@ -1,7 +1,8 @@ default_path == '') { - $phpiCal_config->setProperty('default_path', BASE); + $p = str_replace("/rss","","http://".$_SERVER['SERVER_NAME'].dirname($_SERVER['PHP_SELF']) ); + $phpiCal_config->setProperty('default_path', $p); } #cpath modifies the calendar path based on the url or cookie values. This allows you to run multiple calendar subsets from a single phpicalendar installation. Operations on cpath are largely hidden from the end user. diff --git a/languages/danish.inc.php b/languages/danish.inc.php index 4503f3c..b017785 100644 --- a/languages/danish.inc.php +++ b/languages/danish.inc.php @@ -1,150 +1,161 @@ diff --git a/languages/spanish.inc.php b/languages/spanish.inc.php index 6d8a239..3d6f3e9 100644 --- a/languages/spanish.inc.php +++ b/languages/spanish.inc.php @@ -1,208 +1,209 @@ - + diff --git a/rss/rss1.0.php b/rss/rss1.0.php index 265c8ab..78c5491 100755 --- a/rss/rss1.0.php +++ b/rss/rss1.0.php @@ -48,8 +48,8 @@ function rss_item(){ # $rss .= ''.$rss_link.$uid.''."\n"; /* End guid modification */ $rss_item .= ''.$rss_title.''."\n"; - $rss_item .= ''.date("Y-m-d", strtotime($thisdate)).'T'.date("h:m:s",$val["event_start"]).''."\n"; - $rss_item .= ''.date("Y-m-d", strtotime($thisdate)).'T'.date("h:m:s",$val["event_start"]).''."\n"; + $rss .= ''.date("Y-m-d\TH:i:s", $val["start_unixtime"]).''."\n"; + $rss .= ''.date("Y-m-d\TH:i:s", $val["end_unixtime"]).''."\n"; $rss_item .= ''.$rss_link.''."\n"; $rss_item .= ''.$rss_description.''."\n"; diff --git a/rss/rss2.0.php b/rss/rss2.0.php index cd63ad0..05ac5ba 100644 --- a/rss/rss2.0.php +++ b/rss/rss2.0.php @@ -60,8 +60,8 @@ function rss_item(){ $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 .= ''.date("Y-m-d\TH:i:s", $val["start_unixtime"]).''."\n"; + $rss .= ''.date("Y-m-d\TH:i:s", $val["end_unixtime"]).''."\n"; $rss .= ''.$rss_link.''."\n"; $rss .= ''.$rss_description.''."\n"; diff --git a/rss/rss_common.php b/rss/rss_common.php index 0860f92..9a7fd4f 100644 --- a/rss/rss_common.php +++ b/rss/rss_common.php @@ -181,9 +181,9 @@ do { $urlcal = rawurlencode ("$cal"); if (isset($rss_link_to_event) && $rss_link_to_event == 'yes'){ $event_data = urlencode(serialize($val)); - $rss_link = "$default_path/includes/event.php?getdate=$thisdate&cal=$cal&event_data=$event_data"; + $rss_link = $phpiCal_config->default_path."/includes/event.php?getdate=$thisdate&cal=$cal&event_data=$event_data"; }else{ - $rss_link = ("$default_path/day.php?getdate=$thisdate&cal=$urlcal"); + $rss_link = ($phpiCal_config->default_path."/day.php?getdate=$thisdate&cal=$urlcal"); } if (isset($cpath) && $cpath !='') $rss_link.="&cpath=$cpath"; -- cgit v1.2.3