Menu
▾
▴
phpicalendar-commits — Mailing list ONLY for CVS commits. This is a listen-only list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(5) |
Feb
(25) |
Mar
(18) |
Apr
|
May
(26) |
Jun
(14) |
Jul
(1) |
Aug
(5) |
Sep
(82) |
Oct
(3) |
Nov
(130) |
Dec
(9) |
| 2004 |
Jan
(4) |
Feb
(62) |
Mar
|
Apr
(3) |
May
(100) |
Jun
|
Jul
(6) |
Aug
(49) |
Sep
(33) |
Oct
(47) |
Nov
(2) |
Dec
(1) |
| 2005 |
Jan
|
Feb
(4) |
Mar
(1) |
Apr
(8) |
May
(17) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(26) |
Oct
(18) |
Nov
(37) |
Dec
(14) |
| 2006 |
Jan
(2) |
Feb
(18) |
Mar
(34) |
Apr
(52) |
May
(7) |
Jun
(3) |
Jul
(2) |
Aug
(10) |
Sep
|
Oct
|
Nov
(18) |
Dec
(4) |
| 2007 |
Jan
|
Feb
(7) |
Mar
(7) |
Apr
(6) |
May
(52) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(15) |
Nov
|
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(250) |
| 2009 |
Jan
(35) |
Feb
(45) |
Mar
|
Apr
(4) |
May
(35) |
Jun
(13) |
Jul
(49) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(11) |
| 2010 |
Jan
(3) |
Feb
(30) |
Mar
|
Apr
(35) |
May
(12) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
|
From: <da...@us...> - 2005-05-06 19:04:31
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2275/functions Modified Files: template.php Log Message: Minor feature addition that makes the minical titles links to the month/year calendar as appropriate. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** template.php 5 May 2005 07:07:50 -0000 1.68 --- template.php 6 May 2005 19:04:06 -0000 1.69 *************** *** 846,849 **** --- 846,858 ---- } + $minical_month = date("m", $fake_getdate_time); + $minical_year = date("Y", $fake_getdate_time); + $first_of_month = $minical_year.$minical_month."01"; + $first_of_year = $minical_year."0101"; + + // Add links in to the month/year views. + $dateFormat_month = str_replace("%B", "<a class=\"ps3\" href=\"month.php?cal=$cal&getdate=$first_of_month\">%B</a>", $dateFormat_month); + $dateFormat_month = str_replace("%Y", "<a class=\"ps3\" href=\"year.php?cal=$cal&getdate=$first_of_year\">%Y</a>", $dateFormat_month); + //$start_day = strtotime($week_start_day); $start_day = strtotime(dateOfWeek($getdate, $week_start_day)); *************** *** 867,873 **** } - $minical_month = date("m", $fake_getdate_time); - $minical_year = date("Y", $fake_getdate_time); - $first_of_month = $minical_year.$minical_month."01"; $start_day = strtotime(dateOfWeek($first_of_month, $week_start_day)); $i = 0; --- 876,879 ---- |
|
From: <da...@us...> - 2005-05-06 19:02:16
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31543/functions Modified Files: ical_parser.php Log Message: Fixed SF Bug #1064410 The bug was when generating $recur_array, the code assumes for each pass, you're filling in $recur_array from $next_range_time to $next_range_time + $interval $freq_type, in this case $next_range_time to $next_range_time + 1 year. However, the previous code used the fixed year of $next_range time, making the range filled into $recur_event per pass (jan 01, year of $next_range_time) to (dec 31st, year of $next_range_time). There was a hack that tried to fix this by saying "assume next year if it's jan/feb", trying to compensate, but it just semi-papered over the issue since the ranges still didn't match up. The fix was to make sure the ranges actually did match up, by adjusting the year used each month. This also meant that a bunch of events outside of start/end_range are no longer rendered. Since the window now matches on a monthly basis, it will still generate events slightly outside of start/end_range, but it should now render correctly in all cases (the extra events are just slightly wasted space, but less wasted space than before). Note that this fixes a bunch of problems w/ rendering yearly events in dec/jan/feb (the year border), beyond the SF bug. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.186 retrieving revision 1.187 diff -C2 -d -r1.186 -r1.187 *** ical_parser.php 9 Nov 2004 20:53:11 -0000 1.186 --- ical_parser.php 6 May 2005 19:02:05 -0000 1.187 *************** *** 592,601 **** $bymonth = array("$m"); } foreach($bymonth as $month) { ! // FIXME: Jan 1 does not display in December ! $year = date('Y', $next_range_time); ! if (($year != $this_year) && ($month < 3)) { ! $year = $this_year; } if ((isset($byday)) && (is_array($byday))) { $checkdate_time = mktime(0,0,0,$month,1,$year); --- 592,604 ---- $bymonth = array("$m"); } + foreach($bymonth as $month) { ! // Make sure the month & year used is within the start/end_range. ! if ($month < date('m', $next_range_time)) { ! $year = date('Y', strtotime('+1 years', $next_range_time)); ! } else { ! $year = date('Y', $next_range_time); } + if ((isset($byday)) && (is_array($byday))) { $checkdate_time = mktime(0,0,0,$month,1,$year); |
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22432/languages Modified Files: afrikaans.inc.php brazilian.inc.php catalan.inc.php czech.inc.php danish.inc.php dutch.inc.php english.inc.php esperanto.inc.php finnish.inc.php french.inc.php german.inc.php italian.inc.php japanese.inc.php korean.inc.php norwegian.inc.php polish.inc.php portuguese.inc.php spanish.inc.php swedish.inc.php traditional_chinese.inc.php Log Message: Removed duplicate l_status translation, and cleaned up the german translation (no <CR>s). Index: afrikaans.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/afrikaans.inc.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** afrikaans.inc.php 25 Oct 2004 16:41:36 -0000 1.1 --- afrikaans.inc.php 6 May 2005 02:08:26 -0000 1.2 *************** *** 92,96 **** $lang['l_organizer'] = 'Organiseerder'; $lang['l_attendee'] = 'Bywoner'; - $lang['l_status'] = 'Status'; $lang['l_location'] = 'Plek'; $lang['l_admin_header'] = 'PHP iCalendar Administrasie'; --- 92,95 ---- *************** *** 207,209 **** $lang['l_error_cache'] = 'Daar kon nie na die wegsteekgids (\'cache\') geskryf word nie. Kontroleer asseblief u konfigurasie.'; ! ?> \ No newline at end of file --- 206,208 ---- $lang['l_error_cache'] = 'Daar kon nie na die wegsteekgids (\'cache\') geskryf word nie. Kontroleer asseblief u konfigurasie.'; ! ?> Index: brazilian.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/brazilian.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** brazilian.inc.php 16 May 2004 04:47:42 -0000 1.8 --- brazilian.inc.php 6 May 2005 02:08:26 -0000 1.9 *************** *** 80,84 **** $lang['l_priority_medium'] = 'Medium'; $lang['l_priority_none'] = 'None'; ! $lang['l_status'] = 'Status:'; $lang['l_todo'] = 'To do items'; $lang['l_unfinished'] = 'Unfinished'; --- 80,84 ---- $lang['l_priority_medium'] = 'Medium'; $lang['l_priority_none'] = 'None'; ! $lang['l_status'] = 'Status'; $lang['l_todo'] = 'To do items'; $lang['l_unfinished'] = 'Unfinished'; *************** *** 88,92 **** $lang['l_organizer'] = 'Organizer'; $lang['l_attendee'] = 'Attendee'; - $lang['l_status'] = 'Status'; $lang['l_location'] = 'Location'; $lang['l_admin_header'] = 'PHP iCalendar Administration'; --- 88,91 ---- Index: catalan.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/catalan.inc.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** catalan.inc.php 20 May 2004 20:04:13 -0000 1.9 --- catalan.inc.php 6 May 2005 02:08:26 -0000 1.10 *************** *** 80,84 **** $lang['l_priority_medium'] = 'Mitjana'; $lang['l_priority_none'] = 'Cap'; ! $lang['l_status'] = 'Estat:'; $lang['l_todo'] = 'Pendent'; $lang['l_unfinished'] = 'Sense acabar'; --- 80,84 ---- $lang['l_priority_medium'] = 'Mitjana'; $lang['l_priority_none'] = 'Cap'; ! $lang['l_status'] = 'Estat'; $lang['l_todo'] = 'Pendent'; $lang['l_unfinished'] = 'Sense acabar'; *************** *** 88,92 **** $lang['l_organizer'] = 'Organitzador'; $lang['l_attendee'] = 'Persones presents'; - $lang['l_status'] = 'Estat'; $lang['l_location'] = 'Lloc'; $lang['l_admin_header'] = 'Administració PHP iCalendar'; --- 88,91 ---- Index: czech.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/czech.inc.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** czech.inc.php 22 Nov 2003 03:45:33 -0000 1.7 --- czech.inc.php 6 May 2005 02:08:26 -0000 1.8 *************** *** 80,84 **** $priority_medium_lang = 'StÅednÃ'; $priority_none_lang = 'Žádná'; ! $status_lang = 'Status:'; $todo_lang = 'Seznam úkolů'; $unfinished_lang = 'NedokonÄeno'; --- 80,84 ---- $priority_medium_lang = 'StÅednÃ'; $priority_none_lang = 'Žádná'; ! $status_lang = 'Status'; $todo_lang = 'Seznam úkolů'; $unfinished_lang = 'NedokonÄeno'; *************** *** 91,95 **** $organizer_lang = 'Organizer'; $attendee_lang = 'Attendee'; - $status_lang = 'Status'; $location_lang = 'Location'; $admin_header_lang = 'PHP iCalendar Administration'; --- 91,94 ---- Index: danish.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/danish.inc.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** danish.inc.php 22 Nov 2003 03:45:33 -0000 1.25 --- danish.inc.php 6 May 2005 02:08:26 -0000 1.26 *************** *** 80,84 **** $priority_medium_lang = 'Medium'; $priority_none_lang = 'Ingen'; ! $status_lang = 'Status:'; $todo_lang = 'Ting der skal gøres'; $unfinished_lang = 'Uafsluttet'; --- 80,84 ---- $priority_medium_lang = 'Medium'; $priority_none_lang = 'Ingen'; ! $status_lang = 'Status'; $todo_lang = 'Ting der skal gøres'; $unfinished_lang = 'Uafsluttet'; *************** *** 88,92 **** $organizer_lang = 'Organizer'; $attendee_lang = 'Attendee'; - $status_lang = 'Status'; $location_lang = 'Location'; $admin_header_lang = 'PHP iCalendar Administration'; --- 88,91 ---- Index: dutch.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/dutch.inc.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** dutch.inc.php 2 Oct 2004 00:09:39 -0000 1.24 --- dutch.inc.php 6 May 2005 02:08:26 -0000 1.25 *************** *** 88,92 **** $lang['l_organizer'] = 'Organisator'; $lang['l_attendee'] = 'Aanwezige'; - $lang['l_status'] = 'Status'; $lang['l_location'] = 'Locatie'; $lang['l_admin_header'] = 'PHP iCalendar Administratie'; --- 88,91 ---- *************** *** 203,205 **** $lang['l_error_cache'] = 'Onmogelijk om naar cache directory te schrijven. Controleer uw configuratie.'; ! ?> \ No newline at end of file --- 202,204 ---- $lang['l_error_cache'] = 'Onmogelijk om naar cache directory te schrijven. Controleer uw configuratie.'; ! ?> Index: english.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** english.inc.php 8 Aug 2004 05:55:19 -0000 1.59 --- english.inc.php 6 May 2005 02:08:26 -0000 1.60 *************** *** 88,92 **** $lang['l_organizer'] = 'Organizer'; $lang['l_attendee'] = 'Attendee'; - $lang['l_status'] = 'Status'; $lang['l_location'] = 'Location'; $lang['l_admin_header'] = 'PHP iCalendar Administration'; --- 88,91 ---- Index: esperanto.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/esperanto.inc.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** esperanto.inc.php 12 Apr 2005 04:59:11 -0000 1.5 --- esperanto.inc.php 6 May 2005 02:08:26 -0000 1.6 *************** *** 80,84 **** $priority_medium_lang = 'Meza'; $priority_none_lang = 'Nenia'; ! $status_lang = 'Stato:'; $todo_lang = 'Farendaĵoj'; $unfinished_lang = 'Nekompletigita'; --- 80,84 ---- $priority_medium_lang = 'Meza'; $priority_none_lang = 'Nenia'; ! $status_lang = 'Stato'; $todo_lang = 'Farendaĵoj'; $unfinished_lang = 'Nekompletigita'; *************** *** 88,92 **** $organizer_lang = 'Organizanto:'; $attendee_lang = 'Ĉeestanto:'; - $status_lang = 'Stato:'; $location_lang = 'Ejo:'; $admin_header_lang = 'PHP iCalendar Administrado'; --- 88,91 ---- Index: finnish.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/finnish.inc.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** finnish.inc.php 25 Nov 2003 20:27:48 -0000 1.11 --- finnish.inc.php 6 May 2005 02:08:26 -0000 1.12 *************** *** 80,84 **** $priority_medium_lang = 'Keski'; $priority_none_lang = 'Ei mitään'; ! $status_lang = 'Tila:'; $todo_lang = 'Tehtävät:'; $unfinished_lang = 'Päättymättömät'; --- 80,84 ---- $priority_medium_lang = 'Keski'; $priority_none_lang = 'Ei mitään'; ! $status_lang = 'Tila'; $todo_lang = 'Tehtävät:'; $unfinished_lang = 'Päättymättömät'; *************** *** 88,92 **** $organizer_lang = 'Organisoija'; $attendee_lang = 'Osanottajat'; - $status_lang = 'Status'; $location_lang = 'Paikka'; $admin_header_lang = 'PHP iCalendar Hallinta'; --- 88,91 ---- Index: french.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/french.inc.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** french.inc.php 19 Aug 2004 22:12:10 -0000 1.26 --- french.inc.php 6 May 2005 02:08:26 -0000 1.27 *************** *** 81,85 **** $lang['l_priority_medium'] = 'Moyenne'; $lang['l_priority_none'] = 'Aucune'; ! $lang['l_status'] = 'Status:'; $lang['l_todo'] = 'Tâches à réaliser'; $lang['l_unfinished'] = 'Non faites'; --- 81,85 ---- $lang['l_priority_medium'] = 'Moyenne'; $lang['l_priority_none'] = 'Aucune'; ! $lang['l_status'] = 'Status'; $lang['l_todo'] = 'Tâches à réaliser'; $lang['l_unfinished'] = 'Non faites'; *************** *** 89,93 **** $lang['l_organizer'] = 'Organizer'; $lang['l_attendee'] = 'Attendee'; - $lang['l_status'] = 'Status'; $lang['l_location'] = 'Location'; $lang['l_admin_header'] = 'Administration de PHP iCalendar'; --- 89,92 ---- Index: german.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/german.inc.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** german.inc.php 5 Aug 2004 20:38:27 -0000 1.26 --- german.inc.php 6 May 2005 02:08:26 -0000 1.27 *************** *** 1 **** ! <?php // German language include // For version 2.0 PHP iCalendar // // Translation by David Reindl (dr...@an...) // Corrected by whippersnapper slomo (ma...@sl...) // Revised for version 2.0 by Holger Schleicher (ho...@vc...) // // Submit new translations to ch...@ch... $lang['l_day'] = 'Tag'; $lang['l_week'] = 'Woche'; $lang['l_month'] = 'Monat'; $lang['l_year'] = 'Jahr'; $lang['l_calendar'] = 'Kalender'; $lang['l_next_day'] = 'Folgender Tag'; $lang['l_next_month'] = 'Folgender Monat'; $lang['l_next_week'] = 'Folgende Woche'; $lang['l_next_year'] = 'Folgendes Jahr'; $lang['l_last_day'] = 'Vorheriger Tag'; $lang['l_last_month'] = 'Vorheriger Monat'; $lang['l_last_week'] = 'Vorherige Woche'; $lang['l_last_year'] = 'Vorheriges Jahr'; $lang['l_subscribe'] = 'Abbonieren'; $lang['l_download'] = 'Herunterladen'; $lang['l_powered_by'] = 'Powered by'; $lang['l_event'] = 'Eintrag'; $lang['l_event_start'] = 'Beginn'; $lang['l_event_end'] = 'Ende'; $lang['l_this_months'] = 'Einträge in diesem Monat'; $lang['l_date'] = 'Datum'; $lang['l_summary'] = 'Beschreibung'; $lang['l_all_day'] = 'Tagesereignis'; $lang['l_notes'] = 'Notiz'; $lang['l_this_years'] = 'Einträge für dieses Jahr'; $lang['l_today'] = 'Heute'; $lang['l_this_week'] = 'Diese Woche'; $lang['l_this_month'] = 'Diesen Monat'; $lang['l_jump'] = 'Gehe zu'; $lang['l_tomorrows'] = 'Morgige Einträge'; $lang['l_goday'] = 'Gehe zum heutigen Tag'; $lang['l_goweek'] = 'Gehe zur aktuellen Woche'; $lang['l_gomonth'] = 'Gehe zum aktuellen Monat'; $lang['l_goyear'] = 'Gehe zum aktuellen Jahr'; $lang['l_search'] = 'Suchen'; // the verb $lang['l_results'] = 'Suchergebnisse'; $lang['l_query'] = 'Suche'; // will be followed by the search query $lang['l_no_results'] = 'Keine Einträge gefunden'; $lang['l_goprint'] = 'Druckversion'; $lang['l_time'] = 'Zeit'; $lang['l_summary'] = 'Zusammenfassung'; $lang['l_description'] = 'Beschreibung'; $lang['l_this_site_is'] = 'Diese Site ist'; $lang['l_no_events_day'] = 'Keine Einträge für heute.'; $lang['l_no_events_week'] = 'Keine Einträge in dieser Woche.'; $lang['l_no_events_month'] = 'Keine Einträge in diesem Monat.'; $lang['l_rss_day_date'] = 'H:i'; // Lists just the time $lang['l_rss_week_date '] = '%e. %b'; // Lists just the day $lang['l_rss_month_date '] = '%e. %b'; // Lists just the day $lang['l_rss_language'] = 'de-de'; $lang['l_search_took'] = 'Suche dauerte %s Sekunden'; $lang['l_recurring_event'] = 'Wiederkehrender Eintrag'; $lang['l_exception'] = 'Ausnahme'; $lang['l_no_query'] = 'Kein Suchbegriff'; $lang['l_preferences'] = 'Einstellungen'; $lang['l_printer'] = 'Drucker'; $lang['l_select_lang'] = 'Standardsprache wählen:'; $lang['l_select_cal'] = 'Standardkalender wählen:'; $lang['l_select_view'] = 'Standardansicht wählen:'; $lang['l_select_time'] = 'Tag beginnt um:'; $lang['l_select_day'] = 'Woche beginnt mit:'; $lang['l_select_style'] = 'Standardstil wählen:'; $lang['l_set_prefs'] = 'Einstellungen speichern'; $lang['l_completed_date'] = 'Erledigt am'; $lang['l_completed'] = 'Erledigt'; $lang['l_created'] = 'Erstellt'; $lang['l_due'] = 'Fällig:'; $lang['l_priority'] = 'Priorität:'; $lang['l_priority_high'] = 'hoch'; $lang['l_priority_low'] = 'niedrig'; $lang['l_priority_medium'] = 'mittel'; $lang['l_priority_none'] = 'keine'; $lang['l_status'] = 'Status'; $lang['l_todo'] = 'Aufgaben'; $lang['l_unfinished'] = 'Andauernd'; $lang['l_prefs_set'] = 'Einstellungen wurden gespeichert.'; $lang['l_prefs_unset'] = 'Einstellungen gelöscht. Änderungen werden beim Aufruf der nächsten Seite aktiv.'; $lang['l_unset_prefs'] = 'Einstellungen löschen:'; $lang['l_organizer'] = 'Organisator'; $lang['l_attendee'] = 'Teilnehmer'; $lang['l_status'] = 'Status'; $lang['l_location'] = 'Ort'; $lang['l_admin_header'] = 'PHP iCalendar Administration'; $lang['l_username'] = 'Benutzername'; $lang['l_password'] = 'Passwort'; $lang['l_login'] = 'Anmelden'; $lang['l_invalid_login'] = 'Falscher Benutzername oder Passwort.'; $lang['l_addupdate_cal'] = 'Kalender aktualisieren oder hochladen'; $lang['l_addupdate_desc'] = 'Um einen Kalendar hinzuzufügen, laden Sie ein neues Kalender Dokument hoch. Um einen Kalender zu aktualisieren, laden Sie ein Kalender Dokument mit dem selben Namen hoch.'; $lang['l_delete_cal'] = 'Einen Kalender löschen'; $lang['l_logout'] = 'Abmelden'; $lang['l_cal_file'] = 'Kalender Dokument'; $lang['l_php_error'] = 'PHP Fehler'; $upload_error_gen_lang = 'Es ist ein Problem beim Hochladen aufgetreten.'; $upload_error_lang[0] = 'Fehler beim Hochladen des Dokuments.'; $upload_error_lang[1] = 'Das hochzuladende Dokument ist zu gross.'; $upload_error_lang[2] = 'Das Dokument, welches Sie versuchen hochzuladen, ist zu gross.'; $upload_error_lang[3] = 'Das Dokument, welches Sie versuchen hochzuladen wurde nur teilweise empfangen.'; $upload_error_lang[4] = 'Sie müssen ein Dokument zum Hochladen auswählen.'; $lang['l_upload_error_type'] = 'Nur Dokumente mit der Suffix .ics dürfen hochgeladen werden.'; $lang['l_copy_error'] = 'Kopieren des Dokuments nicht erfolgreich'; $lang['l_delete_error'] = 'Löschen des Dokuments nicht erfolgreich'; $lang['l_delete_success'] = 'wurde gelöscht.'; $lang['l_action_success'] = 'Die Aktion war erfolgreich.'; $lang['l_submit'] = 'Absenden'; $lang['l_delete'] = 'Löschen'; $all_cal_comb_lang = 'Alle Kalender zusammen'; // New for 2.0 $lang['l_legend'] = 'Legende'; $lang['l_admin_subhead'] = 'Verwalten Sie Ihre Kalender mit dieser Seite'; $lang['l_prefs_subhead'] = 'Sets a cookie for visiting this site'; $lang['l_rss_info'] = 'RSS Information'; $lang['l_rss_subhead'] = 'Basic RSS feeds available for each calendar'; $lang['l_rss_notenabled'] = 'RSS is not enabled on this site'; // - navigation $lang['l_back'] = 'Zurück'; $lang['l_next'] = 'Nächste'; $lang['l_prev'] = 'Vorherige'; $lang['l_day_view'] = 'Tagesansicht'; $lang['l_week_view'] = 'Wochenansicht'; $lang['l_month_view'] = 'Monatsansicht'; $lang['l_year_view'] = 'Jahresansicht'; // --------------------------------- // $format_recur, items enclosed in % will be substituted with variables $format_recur_lang['delimiter'] = ', '; // ie, 'one, two, three' $format_recur_lang['yearly'] = array('Jahr','Jahre'); // for these, put singular $format_recur_lang['monthly'] = array('Monat','Monate'); // and plural forms $format_recur_lang['weekly'] = array('Woche','Wochen'); // these will be %freq% $format_recur_lang['daily'] = array('Tag','Tage'); // in the replacement below $format_recur_lang['hourly'] = array('Stunde','Stunden'); $format_recur_lang['minutely'] = array('Minute','Minuten'); $format_recur_lang['secondly'] = array('Sekunde','Sekunden'); $format_recur_lang['start'] = 'Jeden %int% %freq% %for%'; // ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5' $format_recur_lang['until'] = 'bis %date%'; // ie, 'until January 4' $format_recur_lang['count'] = 'für %int% Mal'; // ie, 'for 5 times' $format_recur_lang['bymonth'] = 'In den Monaten: %list%'; // ie, 'In months: January, February, March' $format_recur_lang['bymonthday'] = 'An den Daten: %list%'; // ie, 'On dates: 1, 2, 3, 4' $format_recur_lang['byday'] = 'An den Tagen: %list%'; // ie, 'On days: Mon, Tues, Wed, Thurs' // --------------------------------- $daysofweek_lang = array ('Sonntag','Montag','Dienstag','Mittwoch','Donerstag','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'); $monthsofyearshort_lang = array ('Jan','Feb','Mär','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez'); // For time formatting, check out: http://www.php.net/manual/en/function.date.php $timeFormat = 'H:i'; $timeFormat_small = 'H:i'; // For date formatting, see note below $dateFormat_day = '%A, %e. %B'; $dateFormat_week = '%B %e'; $dateFormat_week_list = '%a, %e. %b'; $dateFormat_week_jump = ' %e. %b'; $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %e. %B'; /* Notes about dateFormat_* The pieces are similar to that of the PHP function strftime(), however only the following is supported at this time: %A - the full week day name as specified in $daysofweek_lang %a - the shortened week day name as specified in $daysofweekshort_lang %B - the full month name as specified in $monthsofyear_lang %b - the shortened month name as specified in $monthsofyearshort_lang %e - the day of the month as a decimal number (1 to 31) %Y - the 4-digit year If this causes problems with representing your language accurately, let us know. We will be happy to modify this if needed. */ // Error messages - %s will be replaced with a variable $lang['l_error_title'] = 'Fehler!'; $lang['l_error_window'] = 'Es ist ein Fehler aufgetreten!'; $lang['l_error_calendar'] = 'Der Kalender "%s" wurde bearbeitet, als dieser Fehler auftrat.'; $lang['l_error_path'] = 'Der Pfad "%s" kann nicht geöffnet werden.'; $lang['l_error_back'] = 'Bitte klicken Sie die "Zurück" Schaltfläche des Browsers um zurückzuspringen.'; $lang['l_error_remotecal'] = 'Dieser Server blockiert entfernte Kalender, welche nicht freigegeben wurden.'; $lang['l_error_restrictedcal'] = 'Sie haben versucht einen Kalender mit eingeschränktem Zugriff auf diesem Server aufzurufen.'; $lang['l_error_invalidcal'] = 'Dieser Kalender enthält Fehler. Bitte wählen Sie einen anderen aus.'; ?> \ No newline at end of file --- 1,204 ---- ! <?php ! ! // German language include ! // For version 2.0 PHP iCalendar ! // ! // Translation by David Reindl (dr...@an...) ! // Corrected by whippersnapper slomo (ma...@sl...) ! // Revised for version 2.0 by Holger Schleicher (ho...@vc...) ! // ! // Submit new translations to ch...@ch... ! ! $lang['l_day'] = 'Tag'; ! $lang['l_week'] = 'Woche'; ! $lang['l_month'] = 'Monat'; ! $lang['l_year'] = 'Jahr'; ! $lang['l_calendar'] = 'Kalender'; ! $lang['l_next_day'] = 'Folgender Tag'; ! $lang['l_next_month'] = 'Folgender Monat'; ! $lang['l_next_week'] = 'Folgende Woche'; ! $lang['l_next_year'] = 'Folgendes Jahr'; ! $lang['l_last_day'] = 'Vorheriger Tag'; ! $lang['l_last_month'] = 'Vorheriger Monat'; ! $lang['l_last_week'] = 'Vorherige Woche'; ! $lang['l_last_year'] = 'Vorheriges Jahr'; ! $lang['l_subscribe'] = 'Abbonieren'; ! $lang['l_download'] = 'Herunterladen'; ! $lang['l_powered_by'] = 'Powered by'; ! $lang['l_event'] = 'Eintrag'; ! $lang['l_event_start'] = 'Beginn'; ! $lang['l_event_end'] = 'Ende'; ! $lang['l_this_months'] = 'Einträge in diesem Monat'; ! $lang['l_date'] = 'Datum'; ! $lang['l_summary'] = 'Beschreibung'; ! $lang['l_all_day'] = 'Tagesereignis'; ! $lang['l_notes'] = 'Notiz'; ! $lang['l_this_years'] = 'Einträge für dieses Jahr'; ! $lang['l_today'] = 'Heute'; ! $lang['l_this_week'] = 'Diese Woche'; ! $lang['l_this_month'] = 'Diesen Monat'; ! $lang['l_jump'] = 'Gehe zu'; ! $lang['l_tomorrows'] = 'Morgige Einträge'; ! $lang['l_goday'] = 'Gehe zum heutigen Tag'; ! $lang['l_goweek'] = 'Gehe zur aktuellen Woche'; ! $lang['l_gomonth'] = 'Gehe zum aktuellen Monat'; ! $lang['l_goyear'] = 'Gehe zum aktuellen Jahr'; ! $lang['l_search'] = 'Suchen'; // the verb ! $lang['l_results'] = 'Suchergebnisse'; ! $lang['l_query'] = 'Suche'; // will be followed by the search query ! $lang['l_no_results'] = 'Keine Einträge gefunden'; ! $lang['l_goprint'] = 'Druckversion'; ! $lang['l_time'] = 'Zeit'; ! $lang['l_summary'] = 'Zusammenfassung'; ! $lang['l_description'] = 'Beschreibung'; ! $lang['l_this_site_is'] = 'Diese Site ist'; ! $lang['l_no_events_day'] = 'Keine Einträge für heute.'; ! $lang['l_no_events_week'] = 'Keine Einträge in dieser Woche.'; ! $lang['l_no_events_month'] = 'Keine Einträge in diesem Monat.'; ! $lang['l_rss_day_date'] = 'H:i'; // Lists just the time ! $lang['l_rss_week_date '] = '%e. %b'; // Lists just the day ! $lang['l_rss_month_date '] = '%e. %b'; // Lists just the day ! $lang['l_rss_language'] = 'de-de'; ! $lang['l_search_took'] = 'Suche dauerte %s Sekunden'; ! $lang['l_recurring_event'] = 'Wiederkehrender Eintrag'; ! $lang['l_exception'] = 'Ausnahme'; ! $lang['l_no_query'] = 'Kein Suchbegriff'; ! $lang['l_preferences'] = 'Einstellungen'; ! $lang['l_printer'] = 'Drucker'; ! $lang['l_select_lang'] = 'Standardsprache wählen:'; ! $lang['l_select_cal'] = 'Standardkalender wählen:'; ! $lang['l_select_view'] = 'Standardansicht wählen:'; ! $lang['l_select_time'] = 'Tag beginnt um:'; ! $lang['l_select_day'] = 'Woche beginnt mit:'; ! $lang['l_select_style'] = 'Standardstil wählen:'; ! $lang['l_set_prefs'] = 'Einstellungen speichern'; ! $lang['l_completed_date'] = 'Erledigt am'; ! $lang['l_completed'] = 'Erledigt'; ! $lang['l_created'] = 'Erstellt'; ! $lang['l_due'] = 'Fällig:'; ! $lang['l_priority'] = 'Priorität:'; ! $lang['l_priority_high'] = 'hoch'; ! $lang['l_priority_low'] = 'niedrig'; ! $lang['l_priority_medium'] = 'mittel'; ! $lang['l_priority_none'] = 'keine'; ! $lang['l_status'] = 'Status'; ! $lang['l_todo'] = 'Aufgaben'; ! $lang['l_unfinished'] = 'Andauernd'; ! $lang['l_prefs_set'] = 'Einstellungen wurden gespeichert.'; ! $lang['l_prefs_unset'] = 'Einstellungen gelöscht. Änderungen werden beim Aufruf der nächsten Seite aktiv.'; ! $lang['l_unset_prefs'] = 'Einstellungen löschen:'; ! $lang['l_organizer'] = 'Organisator'; ! $lang['l_attendee'] = 'Teilnehmer'; ! $lang['l_location'] = 'Ort'; ! $lang['l_admin_header'] = 'PHP iCalendar Administration'; ! $lang['l_username'] = 'Benutzername'; ! $lang['l_password'] = 'Passwort'; ! $lang['l_login'] = 'Anmelden'; ! $lang['l_invalid_login'] = 'Falscher Benutzername oder Passwort.'; ! $lang['l_addupdate_cal'] = 'Kalender aktualisieren oder hochladen'; ! $lang['l_addupdate_desc'] = 'Um einen Kalendar hinzuzufügen, laden Sie ein neues Kalender Dokument hoch. Um einen Kalender zu aktualisieren, laden Sie ein Kalender Dokument mit dem selben Namen hoch.'; ! $lang['l_delete_cal'] = 'Einen Kalender löschen'; ! $lang['l_logout'] = 'Abmelden'; ! $lang['l_cal_file'] = 'Kalender Dokument'; ! $lang['l_php_error'] = 'PHP Fehler'; ! $upload_error_gen_lang = 'Es ist ein Problem beim Hochladen aufgetreten.'; ! $upload_error_lang[0] = 'Fehler beim Hochladen des Dokuments.'; ! $upload_error_lang[1] = 'Das hochzuladende Dokument ist zu gross.'; ! $upload_error_lang[2] = 'Das Dokument, welches Sie versuchen hochzuladen, ist zu gross.'; ! $upload_error_lang[3] = 'Das Dokument, welches Sie versuchen hochzuladen wurde nur teilweise empfangen.'; ! $upload_error_lang[4] = 'Sie müssen ein Dokument zum Hochladen auswählen.'; ! $lang['l_upload_error_type'] = 'Nur Dokumente mit der Suffix .ics dürfen hochgeladen werden.'; ! $lang['l_copy_error'] = 'Kopieren des Dokuments nicht erfolgreich'; ! $lang['l_delete_error'] = 'Löschen des Dokuments nicht erfolgreich'; ! $lang['l_delete_success'] = 'wurde gelöscht.'; ! $lang['l_action_success'] = 'Die Aktion war erfolgreich.'; ! $lang['l_submit'] = 'Absenden'; ! $lang['l_delete'] = 'Löschen'; ! $all_cal_comb_lang = 'Alle Kalender zusammen'; ! ! // New for 2.0 ! $lang['l_legend'] = 'Legende'; ! $lang['l_admin_subhead'] = 'Verwalten Sie Ihre Kalender mit dieser Seite'; ! $lang['l_prefs_subhead'] = 'Sets a cookie for visiting this site'; ! $lang['l_rss_info'] = 'RSS Information'; ! $lang['l_rss_subhead'] = 'Basic RSS feeds available for each calendar'; ! $lang['l_rss_notenabled'] = 'RSS is not enabled on this site'; ! ! // - navigation ! $lang['l_back'] = 'Zurück'; ! $lang['l_next'] = 'Nächste'; ! $lang['l_prev'] = 'Vorherige'; ! $lang['l_day_view'] = 'Tagesansicht'; ! $lang['l_week_view'] = 'Wochenansicht'; ! $lang['l_month_view'] = 'Monatsansicht'; ! $lang['l_year_view'] = 'Jahresansicht'; ! ! // --------------------------------- ! ! ! // $format_recur, items enclosed in % will be substituted with variables ! $format_recur_lang['delimiter'] = ', '; // ie, 'one, two, three' ! ! $format_recur_lang['yearly'] = array('Jahr','Jahre'); // for these, put singular ! $format_recur_lang['monthly'] = array('Monat','Monate'); // and plural forms ! $format_recur_lang['weekly'] = array('Woche','Wochen'); // these will be %freq% ! $format_recur_lang['daily'] = array('Tag','Tage'); // in the replacement below ! $format_recur_lang['hourly'] = array('Stunde','Stunden'); ! $format_recur_lang['minutely'] = array('Minute','Minuten'); ! $format_recur_lang['secondly'] = array('Sekunde','Sekunden'); ! ! $format_recur_lang['start'] = 'Jeden %int% %freq% %for%'; // ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5' ! $format_recur_lang['until'] = 'bis %date%'; // ie, 'until January 4' ! $format_recur_lang['count'] = 'für %int% Mal'; // ie, 'for 5 times' ! ! $format_recur_lang['bymonth'] = 'In den Monaten: %list%'; // ie, 'In months: January, February, March' ! $format_recur_lang['bymonthday'] = 'An den Daten: %list%'; // ie, 'On dates: 1, 2, 3, 4' ! $format_recur_lang['byday'] = 'An den Tagen: %list%'; // ie, 'On days: Mon, Tues, Wed, Thurs' ! ! // --------------------------------- ! ! $daysofweek_lang = array ('Sonntag','Montag','Dienstag','Mittwoch','Donerstag','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'); ! $monthsofyearshort_lang = array ('Jan','Feb','Mär','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez'); ! ! // For time formatting, check out: http://www.php.net/manual/en/function.date.php ! $timeFormat = 'H:i'; ! $timeFormat_small = 'H:i'; ! ! // For date formatting, see note below ! $dateFormat_day = '%A, %e. %B'; ! $dateFormat_week = '%B %e'; ! $dateFormat_week_list = '%a, %e. %b'; ! $dateFormat_week_jump = ' %e. %b'; ! $dateFormat_month = '%B %Y'; ! $dateFormat_month_list = '%A, %e. %B'; ! ! /* ! Notes about dateFormat_* ! The pieces are similar to that of the PHP function strftime(), ! however only the following is supported at this time: ! ! %A - the full week day name as specified in $daysofweek_lang ! %a - the shortened week day name as specified in $daysofweekshort_lang ! %B - the full month name as specified in $monthsofyear_lang ! %b - the shortened month name as specified in $monthsofyearshort_lang ! %e - the day of the month as a decimal number (1 to 31) ! %Y - the 4-digit year ! ! If this causes problems with representing your language accurately, let ! us know. We will be happy to modify this if needed. ! */ ! ! // Error messages - %s will be replaced with a variable ! $lang['l_error_title'] = 'Fehler!'; ! $lang['l_error_window'] = 'Es ist ein Fehler aufgetreten!'; ! $lang['l_error_calendar'] = 'Der Kalender "%s" wurde bearbeitet, als dieser Fehler auftrat.'; ! $lang['l_error_path'] = 'Der Pfad "%s" kann nicht geöffnet werden.'; ! $lang['l_error_back'] = 'Bitte klicken Sie die "Zurück" Schaltfläche des Browsers um zurückzuspringen.'; ! $lang['l_error_remotecal'] = 'Dieser Server blockiert entfernte Kalender, welche nicht freigegeben wurden.'; ! $lang['l_error_restrictedcal'] = 'Sie haben versucht einen Kalender mit eingeschränktem Zugriff auf diesem Server aufzurufen.'; ! $lang['l_error_invalidcal'] = 'Dieser Kalender enthält Fehler. Bitte wählen Sie einen anderen aus.'; ! ! ?> Index: italian.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/italian.inc.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** italian.inc.php 9 Aug 2004 23:21:04 -0000 1.27 --- italian.inc.php 6 May 2005 02:08:26 -0000 1.28 *************** *** 90,94 **** $lang['l_organizer'] = 'Organizzatore'; $lang['l_attendee'] = 'Invitato'; - $lang['l_status'] = 'Stato'; $lang['l_location'] = 'Luogo'; $lang['l_admin_header'] = 'Amministrazione PHP iCalendar'; --- 90,93 ---- Index: japanese.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/japanese.inc.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** japanese.inc.php 2 Oct 2004 00:09:39 -0000 1.32 --- japanese.inc.php 6 May 2005 02:08:27 -0000 1.33 *************** *** 81,85 **** $lang['l_priority_medium'] = 'æ®é'; $lang['l_priority_none'] = 'ãªã'; ! $lang['l_status'] = 'ç¶æ :'; $lang['l_todo'] = 'åå¿é²'; $lang['l_unfinished'] = 'å®æããã¦ããªã'; --- 81,85 ---- $lang['l_priority_medium'] = 'æ®é'; $lang['l_priority_none'] = 'ãªã'; ! $lang['l_status'] = 'ç¶æ '; $lang['l_todo'] = 'åå¿é²'; $lang['l_unfinished'] = 'å®æããã¦ããªã'; *************** *** 89,93 **** $lang['l_organizer'] = 'Organizer'; $lang['l_attendee'] = 'Attendee'; - $lang['l_status'] = 'Status'; $lang['l_location'] = 'Location'; $lang['l_admin_header'] = 'PHP iCalendar Administration'; --- 89,92 ---- *************** *** 204,206 **** $lang['l_error_cache'] = 'Unable to write to cache directory. Please check your config.'; ! ?> \ No newline at end of file --- 203,205 ---- $lang['l_error_cache'] = 'Unable to write to cache directory. Please check your config.'; ! ?> Index: korean.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/korean.inc.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** korean.inc.php 22 Nov 2003 03:45:33 -0000 1.4 --- korean.inc.php 6 May 2005 02:08:27 -0000 1.5 *************** *** 80,84 **** $priority_medium_lang = 'ì¤ê°'; $priority_none_lang = 'ìì'; ! $status_lang = 'ìí:'; $todo_lang = 'í´ì¼í ì¼'; $unfinished_lang = 'ë§ë¬´ë¦¬ ìë¨'; --- 80,84 ---- $priority_medium_lang = 'ì¤ê°'; $priority_none_lang = 'ìì'; ! $status_lang = 'ìí'; $todo_lang = 'í´ì¼í ì¼'; $unfinished_lang = 'ë§ë¬´ë¦¬ ìë¨'; *************** *** 88,92 **** $organizer_lang = '주ì ì'; $attendee_lang = 'ì°¸ìì'; - $status_lang = 'ìí'; $location_lang = 'ìì¹'; $admin_header_lang = 'PHP iCalendar ê´ë¦¬'; --- 88,91 ---- Index: norwegian.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/norwegian.inc.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** norwegian.inc.php 22 Nov 2003 03:45:33 -0000 1.27 --- norwegian.inc.php 6 May 2005 02:08:27 -0000 1.28 *************** *** 79,83 **** $priority_medium_lang = 'Middels'; $priority_none_lang = 'Ingen'; ! $status_lang = 'Status:'; $todo_lang = 'Gjøremålsliste'; $unfinished_lang = 'Uferdig'; --- 79,83 ---- $priority_medium_lang = 'Middels'; $priority_none_lang = 'Ingen'; ! $status_lang = 'Status'; $todo_lang = 'Gjøremålsliste'; $unfinished_lang = 'Uferdig'; *************** *** 87,91 **** $organizer_lang = 'Organisator'; $attendee_lang = 'Deltaker'; - $status_lang = 'Status'; $location_lang = 'Sted'; $admin_header_lang = 'PHP iCalendar Administrasjon'; --- 87,90 ---- Index: polish.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/polish.inc.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** polish.inc.php 22 Nov 2003 03:45:33 -0000 1.26 --- polish.inc.php 6 May 2005 02:08:27 -0000 1.27 *************** *** 80,84 **** $priority_medium_lang = 'Åredni'; $priority_none_lang = 'Å»aden'; ! $status_lang = 'Status:'; $todo_lang = 'Do zrobienia'; $unfinished_lang = 'Niewykonane'; --- 80,84 ---- $priority_medium_lang = 'Åredni'; $priority_none_lang = 'Å»aden'; ! $status_lang = 'Status'; $todo_lang = 'Do zrobienia'; $unfinished_lang = 'Niewykonane'; *************** *** 88,92 **** $organizer_lang = 'Organizer'; $attendee_lang = 'Attendee'; - $status_lang = 'Status'; $location_lang = 'PoÅożenie'; $admin_header_lang = 'Administracja PHP iCalendara'; --- 88,91 ---- *************** *** 191,193 **** $error_invalidcal_lang = 'ZÅy plik kalendarza. Spróbuj innego.'; ! ?> \ No newline at end of file --- 190,192 ---- $error_invalidcal_lang = 'ZÅy plik kalendarza. Spróbuj innego.'; ! ?> Index: portuguese.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/portuguese.inc.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** portuguese.inc.php 2 Oct 2004 01:23:53 -0000 1.14 --- portuguese.inc.php 6 May 2005 02:08:27 -0000 1.15 *************** *** 80,84 **** $lang['l_priority_medium'] = 'Medium'; $lang['l_priority_none'] = 'None'; ! $lang['l_status'] = 'Estado:'; $lang['l_todo'] = 'To do items'; $lang['l_unfinished'] = 'Unfinished'; --- 80,84 ---- $lang['l_priority_medium'] = 'Medium'; $lang['l_priority_none'] = 'None'; ! $lang['l_status'] = 'Estado'; $lang['l_todo'] = 'To do items'; $lang['l_unfinished'] = 'Unfinished'; *************** *** 88,92 **** $lang['l_organizer'] = 'Organizer'; $lang['l_attendee'] = 'Attendee'; - $lang['l_status'] = 'Estado'; $lang['l_location'] = 'Local'; $lang['l_admin_header'] = 'PHP iCalendar Administration'; --- 88,91 ---- Index: spanish.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/spanish.inc.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** spanish.inc.php 9 Aug 2004 21:58:12 -0000 1.16 --- spanish.inc.php 6 May 2005 02:08:27 -0000 1.17 *************** *** 79,83 **** $lang['l_priority_medium'] = 'Media'; $lang['l_priority_none'] = 'Ninguna'; ! $lang['l_status'] = 'Estado:'; $lang['l_todo'] = 'Por hacer'; $lang['l_unfinished'] = 'Sin terminar'; --- 79,83 ---- $lang['l_priority_medium'] = 'Media'; $lang['l_priority_none'] = 'Ninguna'; ! $lang['l_status'] = 'Estado'; $lang['l_todo'] = 'Por hacer'; $lang['l_unfinished'] = 'Sin terminar'; *************** *** 87,91 **** $lang['l_organizer'] = 'Organizador'; $lang['l_attendee'] = 'Participante'; - $lang['l_status'] = 'Estado'; $lang['l_location'] = 'Lugar'; $lang['l_admin_header'] = 'Administración de PHP iCalendar'; --- 87,90 ---- Index: swedish.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/swedish.inc.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** swedish.inc.php 2 Oct 2004 00:09:39 -0000 1.16 --- swedish.inc.php 6 May 2005 02:08:27 -0000 1.17 *************** *** 88,92 **** $lang['l_organizer'] = 'Organizer'; $lang['l_attendee'] = 'Närvarande'; - $lang['l_status'] = 'Status'; $lang['l_location'] = 'Plats'; $lang['l_admin_header'] = 'PHP iCalendar Administration'; --- 88,91 ---- *************** *** 203,205 **** $lang['l_error_cache'] = 'Unable to write to cache directory. Please check your config.'; ! ?> \ No newline at end of file --- 202,204 ---- $lang['l_error_cache'] = 'Unable to write to cache directory. Please check your config.'; ! ?> Index: traditional_chinese.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/traditional_chinese.inc.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** traditional_chinese.inc.php 1 Oct 2004 23:34:08 -0000 1.9 --- traditional_chinese.inc.php 6 May 2005 02:08:27 -0000 1.10 *************** *** 82,86 **** $priority_medium_lang = 'éè¦'; $priority_none_lang = 'ç¡'; ! $status_lang = 'çæ :'; $todo_lang = 'å¾ è¾¦äºé '; $unfinished_lang = 'å°æªå®æ'; --- 82,86 ---- $priority_medium_lang = 'éè¦'; $priority_none_lang = 'ç¡'; ! $status_lang = 'çæ '; $todo_lang = 'å¾ è¾¦äºé '; $unfinished_lang = 'å°æªå®æ'; *************** *** 90,94 **** $organizer_lang = 'è¬ç¨è¡äºæ'; $attendee_lang = 'åºå¸è '; - $status_lang = 'çæ '; $location_lang = 'ä½ç½®'; $admin_header_lang = 'PHP iCalendar 管çå'; --- 90,93 ---- *************** *** 194,196 **** $error_invalidcal_lang = 'é¯èª¤çè¡äºææªæ¡ãè«æä¸åè¡äºæ試試ã'; ! ?> \ No newline at end of file --- 193,195 ---- $error_invalidcal_lang = 'é¯èª¤çè¡äºææªæ¡ãè«æä¸åè¡äºæ試試ã'; ! ?> |
|
From: <ji...@us...> - 2005-05-05 20:23:28
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4258/phpicalendar/templates/default Modified Files: default.css Log Message: From Dave Fallon - fix for css validation Index: default.css =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/default.css,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** default.css 23 May 2004 23:31:22 -0000 1.22 --- default.css 5 May 2005 20:23:18 -0000 1.23 *************** *** 19,23 **** .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; border-left: } .rowToday { background-color: #cff; border-top: 1px solid #fff; border-left: 1px solid #fff; } --- 19,23 ---- .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; } |
|
From: <ji...@us...> - 2005-05-05 07:07:58
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29767/phpicalendar/functions Modified Files: template.php Log Message: Dave Fallon's fix to display problem Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** template.php 5 May 2005 00:36:53 -0000 1.67 --- template.php 5 May 2005 07:07:50 -0000 1.68 *************** *** 369,383 **** if ($day_start == $cal_time && isset($master_array[$thisday]) && is_array($master_array[$thisday])) { foreach($master_array[$thisday] as $time_key => $time_arr) { ! if ((int)$time_key <= (int)$cal_time && is_array($time_arr) && $time_key != '-1') { ! foreach($time_arr as $event_tmp) { ! if ((int)$event_tmp['event_end'] > (int)$cal_time) { ! $this_time_arr[] = $event_tmp; } } } else { ! #break; } } ! }else{ if (isset($master_array[$thisday][$cal_time]) && sizeof($master_array[$thisday][$cal_time]) > 0) { $this_time_arr = $master_array[$thisday][$cal_time]; --- 369,385 ---- if ($day_start == $cal_time && isset($master_array[$thisday]) && is_array($master_array[$thisday])) { foreach($master_array[$thisday] as $time_key => $time_arr) { ! if ((int)$time_key <= (int)$cal_time) { ! if (is_array($time_arr) && $time_key != '-1') { ! foreach($time_arr as $uid => $event_tmp) { ! if ((int)$event_tmp['event_end'] > (int)$cal_time) { ! $this_time_arr[$uid] = $event_tmp; ! } } } } else { ! break; } } ! } else { if (isset($master_array[$thisday][$cal_time]) && sizeof($master_array[$thisday][$cal_time]) > 0) { $this_time_arr = $master_array[$thisday][$cal_time]; *************** *** 571,589 **** unset($this_time_arr); - // add events that overlap $day_start instead of cutting them out completely if (($day_start == $cal_time) && (isset($master_array[$getdate]))) { foreach($master_array[$getdate] as $time_key => $time_arr) { ! if ((int)$time_key <= (int)$cal_time && is_array($time_arr) && $time_key != '-1') { ! foreach($time_arr as $event_tmp) { ! if ((int)$event_tmp['event_end'] > (int)$cal_time) { ! $this_time_arr[] = $event_tmp; } } } else { ! #break; } } ! }else{ // add events that overlap the start time if (isset($master_array[$getdate][$cal_time]) && sizeof($master_array[$getdate][$cal_time]) > 0) { --- 573,592 ---- unset($this_time_arr); // add events that overlap $day_start instead of cutting them out completely if (($day_start == $cal_time) && (isset($master_array[$getdate]))) { foreach($master_array[$getdate] as $time_key => $time_arr) { ! if ((int)$time_key <= (int)$cal_time) { ! if (is_array($time_arr) && $time_key != '-1') { ! foreach($time_arr as $uid => $event_tmp) { ! if ((int)$event_tmp['event_end'] > (int)$cal_time) { ! $this_time_arr[$uid] = $event_tmp; ! } } } } else { ! break; } } ! } else { // add events that overlap the start time if (isset($master_array[$getdate][$cal_time]) && sizeof($master_array[$getdate][$cal_time]) > 0) { |
|
From: <ji...@us...> - 2005-05-05 00:37:12
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10551/phpicalendar/functions Modified Files: template.php Log Message: Bug fixes for previous patch of draw_week and draw_day. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** template.php 4 May 2005 05:36:31 -0000 1.66 --- template.php 5 May 2005 00:36:53 -0000 1.67 *************** *** 376,386 **** } } else { ! break; } } }else{ ! if (isset($master_array[$thisday][$cal_time]) && sizeof($master_array[$thisday][$cal_time]) > 0) { ! $this_time_arr = $master_array[$thisday][$cal_time]; ! } } --- 376,386 ---- } } else { ! #break; } } }else{ ! if (isset($master_array[$thisday][$cal_time]) && sizeof($master_array[$thisday][$cal_time]) > 0) { ! $this_time_arr = $master_array[$thisday][$cal_time]; ! } } *************** *** 582,586 **** } } else { ! break; } } --- 582,586 ---- } } else { ! #break; } } |
|
From: <ji...@us...> - 2005-05-04 05:36:46
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8208/phpicalendar/functions Modified Files: template.php Log Message: Bug fixes for draw_search (exceptions), draw_week and draw_day(fix display order for events starting before day start) Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** template.php 16 Apr 2005 20:39:00 -0000 1.65 --- template.php 4 May 2005 05:36:31 -0000 1.66 *************** *** 142,145 **** --- 142,146 ---- $event_text = stripslashes(urldecode($val['event_text'])); $description = stripslashes(urldecode($val['description'])); + $location = stripslashes(urldecode($val['location'])); $event_start = $val['event_start']; $event_end = $val['event_end']; *************** *** 159,163 **** $events_tmp = preg_replace('!<\!-- switch description_events on -->(.*)<\!-- switch description_events off -->!is', '', $events_tmp); } ! if (!$val['exception'] || !isset($val['exceptions'])) { $events_tmp = preg_replace('!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!is', '', $events_tmp); }else{ --- 160,164 ---- $events_tmp = preg_replace('!<\!-- switch description_events on -->(.*)<\!-- switch description_events off -->!is', '', $events_tmp); } ! if (!isset($val['exceptions'])) { $events_tmp = preg_replace('!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!is', '', $events_tmp); }else{ *************** *** 165,173 **** foreach ($val['exceptions'] as $except_val){ $except_tmp = $loop_except; $except_date = strtotime($except_val['date']); $except_date = localizeDate ('%A, %B %e %Y', $except_date); - $except_tmp = str_replace('{DAYOFMONTH}', $except_date, $except_tmp); ! $except_tmp = str_replace('{EXCEPT_DESCRIPTION}', stripslashes(urldecode($except_val['event_text'])), $except_tmp); if (!$except_val['recur']) { $except_tmp = preg_replace('!<\!-- switch except_recur on -->(.*)<\!-- switch except_recur off -->!is', '', $except_tmp); --- 166,184 ---- foreach ($val['exceptions'] as $except_val){ $except_tmp = $loop_except; + $except_date = strtotime($except_val['date']); $except_date = localizeDate ('%A, %B %e %Y', $except_date); $except_tmp = str_replace('{DAYOFMONTH}', $except_date, $except_tmp); ! ! $except_event_start = date ($timeFormat, strtotime ($except_val['event_start'])); ! $except_event_end = date ($timeFormat, strtotime ($except_val['event_end'])); ! $except_event_start = $except_event_start .' - '.$except_event_end; ! ! $except_tmp = str_replace('{EVENT_START}', $except_event_start, $except_tmp); ! ! $except_event_text = stripslashes(urldecode($except_val['event_text'])); ! $except_tmp = str_replace('{EVENT_TEXT}', $except_event_text, $except_tmp); ! ! #is there a recur in the exception? if (!$except_val['recur']) { $except_tmp = preg_replace('!<\!-- switch except_recur on -->(.*)<\!-- switch except_recur off -->!is', '', $except_tmp); *************** *** 175,178 **** --- 186,196 ---- $except_tmp = str_replace('{EXCEPT_RECUR}', $except_val['recur'], $except_tmp); } + #is there a description in the exception? + if (!$except_val['description']) { + $except_tmp = preg_replace('!<\!-- switch except_description on -->(.*)<\!-- switch except_description off -->!is', '', $except_tmp); + }else{ + $except_description = stripslashes(urldecode($except_val['description'])); + $except_tmp = str_replace('{EXCEPT_DESCRIPTION}', $except_description, $except_tmp); + } $some_exceptions .= $except_tmp; *************** *** 189,194 **** } ! $search = array('{EVENT_START}', '{EVENT_TEXT}', '{DESCRIPTION}'); ! $replace = array($event_start, $event_text, $description); $events_tmp = str_replace($search, $replace, $events_tmp); $some_events .= $events_tmp; --- 207,212 ---- } ! $search = array('{EVENT_START}', '{EVENT_TEXT}', '{DESCRIPTION}','{LOCATION}'); ! $replace = array($event_start, $event_text, $description, $location); $events_tmp = str_replace($search, $replace, $events_tmp); $some_events .= $events_tmp; *************** *** 348,358 **** $dayborder = 0; unset($this_time_arr); - if (isset($master_array[$thisday][$cal_time]) && sizeof($master_array[$thisday][$cal_time]) > 0) { - $this_time_arr = $master_array[$thisday][$cal_time]; - } if ($day_start == $cal_time && isset($master_array[$thisday]) && is_array($master_array[$thisday])) { foreach($master_array[$thisday] as $time_key => $time_arr) { ! if ((int)$time_key < (int)$cal_time && is_array($time_arr) && $time_key != '-1') { foreach($time_arr as $event_tmp) { if ((int)$event_tmp['event_end'] > (int)$cal_time) { --- 366,373 ---- $dayborder = 0; unset($this_time_arr); if ($day_start == $cal_time && isset($master_array[$thisday]) && is_array($master_array[$thisday])) { foreach($master_array[$thisday] as $time_key => $time_arr) { ! if ((int)$time_key <= (int)$cal_time && is_array($time_arr) && $time_key != '-1') { foreach($time_arr as $event_tmp) { if ((int)$event_tmp['event_end'] > (int)$cal_time) { *************** *** 364,372 **** } } } - // check for eventstart if (isset($this_time_arr) && sizeof($this_time_arr) > 0) { foreach ($this_time_arr as $eventKey => $loopevent) { $drawEvent = drawEventTimes ($cal_time, $loopevent["event_end"]); --- 379,394 ---- } } + }else{ + if (isset($master_array[$thisday][$cal_time]) && sizeof($master_array[$thisday][$cal_time]) > 0) { + $this_time_arr = $master_array[$thisday][$cal_time]; + } } // check for eventstart if (isset($this_time_arr) && sizeof($this_time_arr) > 0) { + #print "<pre>"; + #print_r ($this_time_arr); + #print "</pre>"; + foreach ($this_time_arr as $eventKey => $loopevent) { $drawEvent = drawEventTimes ($cal_time, $loopevent["event_end"]); *************** *** 549,561 **** unset($this_time_arr); - // add events that overlap the start time - if (isset($master_array[$getdate][$cal_time]) && sizeof($master_array[$getdate][$cal_time]) > 0) { - $this_time_arr = $master_array[$getdate][$cal_time]; - } // add events that overlap $day_start instead of cutting them out completely if (($day_start == $cal_time) && (isset($master_array[$getdate]))) { foreach($master_array[$getdate] as $time_key => $time_arr) { ! if ((int)$time_key < (int)$cal_time && is_array($time_arr) && $time_key != '-1') { foreach($time_arr as $event_tmp) { if ((int)$event_tmp['event_end'] > (int)$cal_time) { --- 571,579 ---- unset($this_time_arr); // add events that overlap $day_start instead of cutting them out completely if (($day_start == $cal_time) && (isset($master_array[$getdate]))) { foreach($master_array[$getdate] as $time_key => $time_arr) { ! if ((int)$time_key <= (int)$cal_time && is_array($time_arr) && $time_key != '-1') { foreach($time_arr as $event_tmp) { if ((int)$event_tmp['event_end'] > (int)$cal_time) { *************** *** 567,570 **** --- 585,593 ---- } } + }else{ + // add events that overlap the start time + if (isset($master_array[$getdate][$cal_time]) && sizeof($master_array[$getdate][$cal_time]) > 0) { + $this_time_arr = $master_array[$getdate][$cal_time]; + } } |
|
From: <ji...@us...> - 2005-04-16 20:39:09
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8500/functions Modified Files: template.php Log Message: enable exceptions. bug fixes Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** template.php 8 Apr 2005 06:40:52 -0000 1.64 --- template.php 16 Apr 2005 20:39:00 -0000 1.65 *************** *** 128,131 **** --- 128,133 ---- $parse_month = date ("Ym", strtotime($getdate)); + if (isset($the_arr)){ + // Pull out each event foreach($the_arr as $key => $val) { *************** *** 157,165 **** $events_tmp = preg_replace('!<\!-- switch description_events on -->(.*)<\!-- switch description_events off -->!is', '', $events_tmp); } ! if (!$val['exception']) { $events_tmp = preg_replace('!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!is', '', $events_tmp); }else{ ! foreach ($val['exception'] as $except_val){ ! } } --- 159,184 ---- $events_tmp = preg_replace('!<\!-- switch description_events on -->(.*)<\!-- switch description_events off -->!is', '', $events_tmp); } ! if (!$val['exception'] || !isset($val['exceptions'])) { $events_tmp = preg_replace('!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!is', '', $events_tmp); }else{ ! $some_exceptions = ""; ! foreach ($val['exceptions'] as $except_val){ ! $except_tmp = $loop_except; ! $except_date = strtotime($except_val['date']); ! $except_date = localizeDate ('%A, %B %e %Y', $except_date); ! ! $except_tmp = str_replace('{DAYOFMONTH}', $except_date, $except_tmp); ! $except_tmp = str_replace('{EXCEPT_DESCRIPTION}', stripslashes(urldecode($except_val['event_text'])), $except_tmp); ! if (!$except_val['recur']) { ! $except_tmp = preg_replace('!<\!-- switch except_recur on -->(.*)<\!-- switch except_recur off -->!is', '', $except_tmp); ! }else{ ! $except_tmp = str_replace('{EXCEPT_RECUR}', $except_val['recur'], $except_tmp); ! } ! $some_exceptions .= $except_tmp; ! ! } ! $events_tmp = preg_replace('!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!is', $some_exceptions,$events_tmp ); ! ! } *************** *** 182,186 **** } ! if ($events_found < 1) { $this->page = preg_replace('!<\!-- switch results on -->(.*)<\!-- switch results off -->!is', '', $this->page); --- 201,205 ---- } ! } if ($events_found < 1) { $this->page = preg_replace('!<\!-- switch results on -->(.*)<\!-- switch results off -->!is', '', $this->page); |
|
From: <ji...@us...> - 2005-04-16 20:25:31
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2110 Modified Files: print.php Log Message: fix bug for return to calendar view Index: print.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** print.php 2 Sep 2004 21:15:30 -0000 1.33 --- print.php 16 Apr 2005 20:25:23 -0000 1.34 *************** *** 54,57 **** --- 54,58 ---- 'calendar_name' => $calendar_name, 'current_view' => $current_view, + 'printview' => $printview, 'display_date' => $display_date, 'sidebar_date' => $sidebar_date, |
|
From: <ji...@us...> - 2005-04-13 15:04:05
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22539 Modified Files: month.php week.php Log Message: enable search box requires search.php update and search_box.tpl Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.129 retrieving revision 1.130 diff -C2 -d -r1.129 -r1.130 *** month.php 25 Oct 2004 17:43:31 -0000 1.129 --- month.php 13 Apr 2005 15:03:50 -0000 1.130 *************** *** 56,60 **** 'event_js' => BASE.'functions/event.js', 'footer' => BASE.'templates/'.$template.'/footer.tpl', ! 'calendar_nav' => BASE.'templates/'.$template.'/calendar_nav.tpl' )); --- 56,61 ---- 'event_js' => BASE.'functions/event.js', 'footer' => BASE.'templates/'.$template.'/footer.tpl', ! 'calendar_nav' => BASE.'templates/'.$template.'/calendar_nav.tpl', ! 'search_box' => BASE.'templates/'.$template.'/search_box.tpl' )); *************** *** 64,67 **** --- 65,69 ---- 'cal' => $cal, 'getdate' => $getdate, + 'cpath' => $cpath, 'calendar_name' => $calendar_name, 'display_date' => $display_date, *************** *** 70,74 **** 'rss_available' => '', 'rss_valid' => '', ! 'show_search' => '', 'next_month' => $next_month, 'prev_month' => $prev_month, --- 72,77 ---- 'rss_available' => '', 'rss_valid' => '', ! 'show_search' => $show_search, ! 'show_search' => $show_search, 'next_month' => $next_month, 'prev_month' => $prev_month, *************** *** 98,101 **** --- 101,105 ---- 'l_download' => $lang['l_download'], 'l_this_months' => $lang['l_this_months'], + 'l_search' => $lang['l_search'], 'l_powered_by' => $lang['l_powered_by'], 'l_this_site_is' => $lang['l_this_site_is'] Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.120 retrieving revision 1.121 diff -C2 -d -r1.120 -r1.121 *** week.php 2 Oct 2004 00:09:38 -0000 1.120 --- week.php 13 Apr 2005 15:03:53 -0000 1.121 *************** *** 50,54 **** 'event_js' => BASE.'functions/event.js', 'footer' => BASE.'templates/'.$template.'/footer.tpl', ! 'sidebar' => BASE.'templates/'.$template.'/sidebar.tpl' )); --- 50,55 ---- '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' )); *************** *** 59,62 **** --- 60,64 ---- 'cal' => $cal, 'getdate' => $getdate, + 'cpath' => $cpath, 'calendar_name' => $calendar_name, 'display_date' => $display_date, *************** *** 66,70 **** 'rss_available' => '', 'rss_valid' => '', ! 'show_search' => '', 'next_day' => $next_day, 'next_week' => $next_week, --- 68,72 ---- 'rss_available' => '', 'rss_valid' => '', ! 'show_search' => $show_search, 'next_day' => $next_day, 'next_week' => $next_week, *************** *** 98,101 **** --- 100,104 ---- 'l_subscribe' => $lang['l_subscribe'], 'l_download' => $lang['l_download'], + 'l_search' => $lang['l_search'], 'l_powered_by' => $lang['l_powered_by'], 'l_this_site_is' => $lang['l_this_site_is'] |
|
From: <ji...@us...> - 2005-04-13 15:00:59
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21034 Modified Files: day.php Log Message: enable search box requires search.php update and search_box.tpl Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.122 retrieving revision 1.123 diff -C2 -d -r1.122 -r1.123 *** day.php 2 Oct 2004 00:09:38 -0000 1.122 --- day.php 13 Apr 2005 15:00:49 -0000 1.123 *************** *** 48,52 **** 'event_js' => BASE.'functions/event.js', 'footer' => BASE.'templates/'.$template.'/footer.tpl', ! 'sidebar' => BASE.'templates/'.$template.'/sidebar.tpl' )); --- 48,53 ---- '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' )); *************** *** 57,60 **** --- 58,62 ---- 'cal' => $cal, 'getdate' => $getdate, + 'cpath' => $cpath, 'calendar_name' => $calendar_name, 'current_view' => $current_view, *************** *** 64,68 **** 'rss_available' => '', 'rss_valid' => '', ! 'show_search' => '', 'next_day' => $next_day, 'prev_day' => $prev_day, --- 66,70 ---- 'rss_available' => '', 'rss_valid' => '', ! 'show_search' => $show_search, 'next_day' => $next_day, 'prev_day' => $prev_day, *************** *** 95,98 **** --- 97,101 ---- 'l_subscribe' => $lang['l_subscribe'], 'l_download' => $lang['l_download'], + 'l_search' => $lang['l_search'], 'l_this_site_is' => $lang['l_this_site_is'] )); |
|
From: <ji...@us...> - 2005-04-13 14:58:09
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19804/templates/default Added Files: search_box.tpl Log Message: search box module --- NEW FILE: search_box.tpl --- <hr> <div class = 'G10BOLD'>{L_SEARCH}:</div> <form action="search.php" method="GET"> <input type="hidden" name="cpath" value="{CPATH}"> <input type="hidden" name="cal" value="{CAL}"> <input type="hidden" name="getdate" value="{GETDATE}"> <input type="text" size="15" name="query" value=""> <INPUT type="image" src="templates/{TEMPLATE}/images/search.gif" border=0 height="19" width="18" name="submit" value="Search"> </form> |
|
From: <ji...@us...> - 2005-04-12 04:59:23
|
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14062 Modified Files: esperanto.inc.php Log Message: changed execute flags Index: esperanto.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/esperanto.inc.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** esperanto.inc.php 22 Nov 2003 03:45:33 -0000 1.4 --- esperanto.inc.php 12 Apr 2005 04:59:11 -0000 1.5 *************** *** 2,6 **** // Esperanto language include ! // For version 1.0 PHP iCalendar // // Translation by Sjoerd Bosga (sj...@es...) --- 2,6 ---- // Esperanto language include ! // For version 1.0 PHP iCalendar // // Translation by Sjoerd Bosga (sj...@es...) |
|
From: <ji...@us...> - 2005-04-08 06:41:12
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19212/phpicalendar/functions Modified Files: template.php Log Message: added function draw_search to work with search.php 1.35 Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** template.php 13 Feb 2005 17:52:52 -0000 1.63 --- template.php 8 Apr 2005 06:40:52 -0000 1.64 *************** *** 117,120 **** --- 117,196 ---- } + function draw_search($template_p) { + global $template, $getdate, $cal, $the_arr, $daysofweek_lang, $week_start_day, $printview, $dateFormat_day, $timeFormat, $week_start, $week_end, $lang; + + preg_match("!<\!-- switch results on -->(.*)<\!-- switch results off -->!is", $this->page, $match1); + preg_match("!<\!-- switch recur on -->(.*)<\!-- loop recur off -->!is", $this->page, $match2); + preg_match("!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!is", $this->page, $match3); + $loop_event = trim($match1[1]); + $loop_recur = trim($match2[1]); + $loop_except = trim($match3[1]); + $parse_month = date ("Ym", strtotime($getdate)); + + // Pull out each event + foreach($the_arr as $key => $val) { + + $events_found++; + $dayofmonth = strtotime($val['date']); + $dayofmonth = localizeDate ('%A, %B %e %Y', $dayofmonth); + $events_tmp = $loop_event; + $recur_tmp = $loop_recur; + + if ($val['event_text']) { + $event_text = stripslashes(urldecode($val['event_text'])); + $description = stripslashes(urldecode($val['description'])); + $event_start = $val['event_start']; + $event_end = $val['event_end']; + if (isset($val['display_end'])) $event_end = $val['display_end']; + if (!$val['event_start']) { + $event_start = $lang['l_all_day']; + $event_start2 = ''; + $event_end = ''; + } else { + $event_start = date ($timeFormat, strtotime ($event_start)); + $event_end = date ($timeFormat, strtotime ($event_end)); + $event_start = $event_start .' - '.$event_end; + } + } + + if ($description == '') { + $events_tmp = preg_replace('!<\!-- switch description_events on -->(.*)<\!-- switch description_events off -->!is', '', $events_tmp); + } + if (!$val['exception']) { + $events_tmp = preg_replace('!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!is', '', $events_tmp); + }else{ + foreach ($val['exception'] as $except_val){ + } + } + + if (!$val['recur']) { + $events_tmp = preg_replace('!<\!-- switch recur on -->(.*)<\!-- switch recur off -->!is', '', $events_tmp); + }else{ + $events_tmp = str_replace('{RECUR}', $val['recur'], $events_tmp); + } + + $search = array('{EVENT_START}', '{EVENT_TEXT}', '{DESCRIPTION}'); + $replace = array($event_start, $event_text, $description); + $events_tmp = str_replace($search, $replace, $events_tmp); + $some_events .= $events_tmp; + $events_tmp = $loop_event; + + + $some_events = str_replace('{DAYOFMONTH}', $dayofmonth, $some_events); + $final .= $day_tmp.$some_events; + unset ($day_tmp, $some_events); + + } + + if ($events_found < 1) { + $this->page = preg_replace('!<\!-- switch results on -->(.*)<\!-- switch results off -->!is', '', $this->page); + } else { + $this->page = preg_replace('!<\!-- switch results on -->(.*)<\!-- switch results off -->!is', $final, $this->page); + $this->page = preg_replace('!<\!-- switch no_results on -->(.*)<\!-- switch no_results off -->!is', '', $this->page); + #echo "<hr>this->page: $this->page<br><hr>"; + + } + }#end draw_search + function draw_week($template_p) { global $unique_colors, $start_week_time, $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day, $dateFormat_week_list, $current_view, $day_array, $timeFormat, $gridLength, $timeFormat_small, $day_start; |
|
From: <ji...@us...> - 2005-04-08 06:38:52
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17618/phpicalendar Modified Files: search.php Log Message: Modifications search.php. Requires updated functions/template.php Index: search.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/search.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** search.php 2 Sep 2004 18:44:43 -0000 1.34 --- search.php 8 Apr 2005 06:38:38 -0000 1.35 *************** *** 24,31 **** $search_box .= '<form action="search.php" method="GET">'."\n". '<input type="hidden" name="cal" value="'.$cal.'">'."\n". '<input type="hidden" name="getdate" value="'.$getdate.'">'."\n". '<input type="text" size="15" name="query" value="'.$query.'">'."\n". ! '<INPUT type="image" src="styles/'.$style_sheet.'/search.gif" border=0 height="19" width="18" name="submit" value="Search">'."\n". '</form>'; --- 24,32 ---- $search_box .= '<form action="search.php" method="GET">'."\n". + '<input type="hidden" name="cpath" value="'.$cpath.'">'."\n". '<input type="hidden" name="cal" value="'.$cal.'">'."\n". '<input type="hidden" name="getdate" value="'.$getdate.'">'."\n". '<input type="text" size="15" name="query" value="'.$query.'">'."\n". ! '<INPUT type="image" src="templates/'.$template.'/images/search.gif" border=0 height="19" width="18" name="submit" value="Search">'."\n". '</form>'; *************** *** 46,50 **** --- 47,54 ---- if (is_array($event_tmp)) { if (!isset($the_arr[$uid_tmp]) || isset($event_tmp['exception'])) { + #print_r($format_search_arr); + #echo "<br>this event:".$event_tmp['event_text']."<br>"; $results1 = search_boolean($format_search_arr,$event_tmp['event_text']); + if (!$results1) { $results2 = search_boolean($format_search_arr,$event_tmp['description']); *************** *** 182,185 **** --- 186,190 ---- // check against the AND foreach($and_arr as $s) { + #echo "haystack: $haystack<br>needle: $s<br>"; if (is_string(strstr($haystack,$s)) == false) { return false; *************** *** 204,207 **** --- 209,213 ---- } // if we haven't returned false, then we return true + # echo "return true<br>"; return true; } *************** *** 271,277 **** } $page = new Page(BASE.'templates/'.$template.'/search.tpl'); ! $page->replace_tags(array( 'header' => BASE.'templates/'.$template.'/header.tpl', 'footer' => BASE.'templates/'.$template.'/footer.tpl', --- 277,287 ---- } + $page = new Page(BASE.'templates/'.$template.'/search.tpl'); ! $page->draw_search($page); ! ! ! $page->replace_files(array( 'header' => BASE.'templates/'.$template.'/header.tpl', 'footer' => BASE.'templates/'.$template.'/footer.tpl', *************** *** 293,297 **** )); - $page->output(); ?> --- 303,365 ---- )); + $page->replace_tags(array( + 'formatted_search' => $formatted_search, + 'l_results' => $lang['l_results'], + 'l_query' => $lang['l_query'], + 'l_time' => $lang['l_time'], + 'l_summary' => $lang['l_summary'], + 'l_description' => $lang['l_description'], + 'l_recurring_event' => $lang['l_recurring_event'], + 'l_exception' => $lang['l_exception'], + 'l_no_results' => $lang['l_no_results'], + 'search_box' => $search_box, + 'charset' => $charset, + 'template' => $template, + 'cal' => $cal, + 'getdate' => $getdate, + 'calendar_name' => $calendar_name, + 'display_date' => $display_date, + 'rss_powered' => $rss_powered, + 'default_path' => '', + 'rss_available' => '', + 'rss_valid' => '', + 'show_search' => '', + 'next_month' => $next_month, + 'prev_month' => $prev_month, + 'show_goto' => '', + 'is_logged_in' => '', + 'list_jumps' => $list_jumps, + 'list_icals' => $list_icals, + 'list_years' => $list_years, + 'list_months' => $list_months, + 'list_weeks' => $list_weeks, + 'legend' => $list_calcolors, + 'current_view' => $current_view, + 'style_select' => $style_select, + 'sidebar_date' => $sidebar_date, + '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_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(); + #echo "<pre>"; + #print_r($the_arr); + #echo "</pre>"; ?> |
|
From: <ji...@us...> - 2005-03-01 05:39:04
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30436/phpicalendar/rss Modified Files: rss.php Log Message: Fix bug for rss at end of month. Index: rss.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** rss.php 13 Feb 2005 17:48:50 -0000 1.24 --- rss.php 1 Mar 2005 05:38:55 -0000 1.25 *************** *** 113,116 **** --- 113,118 ---- 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) { |
|
From: <ji...@us...> - 2005-02-13 18:01:38
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31042/phpicalendar/rss Modified Files: index.php Log Message: changes to rss/index.php to work with cpath variable (alternate calendar directories selected by REQUEST). Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** index.php 17 Dec 2004 18:34:34 -0000 1.35 --- index.php 13 Feb 2005 18:01:26 -0000 1.36 *************** *** 29,35 **** $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); $rss_list .= '<font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $calendar_lang.'</b></font><br />'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=day<br />'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=week<br />'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=month<br /><br />'; $footer_check = $default_path.'/rss/rss.php?cal='.$default_cal.'&rssview='.$default_view; } --- 29,35 ---- $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); $rss_list .= '<font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $calendar_lang.'</b></font><br />'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&cpath='.$cpath.'&rssview=day<br />'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&cpath='.$cpath.'&rssview=week<br />'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&cpath='.$cpath.'&rssview=month<br /><br />'; $footer_check = $default_path.'/rss/rss.php?cal='.$default_cal.'&rssview='.$default_view; } *************** *** 76,79 **** ! ?> ! \ No newline at end of file --- 76,78 ---- ! ?> \ No newline at end of file |
|
From: <ji...@us...> - 2005-02-13 17:53:01
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26898/phpicalendar/functions Modified Files: template.php Log Message: changes to template.php to work with cpath variable (alternate calendar directories selected by REQUEST). Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** template.php 29 Nov 2004 23:36:37 -0000 1.62 --- template.php 13 Feb 2005 17:52:52 -0000 1.63 *************** *** 177,181 **** $loop_dof = trim($match1[1]); $start_wt = strtotime(dateOfWeek($getdate, $week_start_day)); ! $start_wt = strtotime(dateOfWeek($getdate, $week_start_day)); for ($i=0; $i<7; $i++) { $day_num = date("w", $start_day); --- 177,181 ---- $loop_dof = trim($match1[1]); $start_wt = strtotime(dateOfWeek($getdate, $week_start_day)); ! $start_day = strtotime($week_start_day); for ($i=0; $i<7; $i++) { $day_num = date("w", $start_day); *************** *** 942,946 **** function output() { ! global $template, $php_started, $lang, $enable_rss, $template_started; // Looks for {MONTH} before sending page out --- 942,946 ---- function output() { ! global $template, $php_started, $lang, $enable_rss, $template_started, $cpath; // Looks for {MONTH} before sending page out *************** *** 978,981 **** --- 978,984 ---- $this->page = str_replace('{BASE}', BASE, $this->page); } + if ($cpath){ + $this->page = str_replace('&getdate', "&cpath=$cpath&getdate", $this->page); + } print($this->page); } |
|
From: <ji...@us...> - 2005-02-13 17:48:59
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24926/phpicalendar/rss Modified Files: rss.php Log Message: changes to rss.php to allow feeding a range of dates, and to use a single XML generation routine for all feeds. XML generation needs work, but it works for me. Index: rss.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** rss.php 26 Oct 2004 19:12:30 -0000 1.23 --- rss.php 13 Feb 2005 17:48:50 -0000 1.24 *************** *** 1,35 **** <?php define('BASE', '../'); include(BASE.'functions/ical_parser.php'); if ($enable_rss != 'yes') { ! exit(error('RSS is not available for this installation.', $cal, '../')); } ! if (empty($default_path)) { ! if (isset($_SERVER['HTTPS']) || strtolower($_SERVER['HTTPS']) == 'on' ) { ! $default_path = 'https://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/rss/')); ! } else { ! $default_path = 'http://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/rss/')); ! } ! } else { ! $default_path = $default_path.'rss/'; ! } ! $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day)); ! $end_week_time = $start_week_time + (6 * 25 * 60 * 60); ! $start_week = localizeDate($dateFormat_week, $start_week_time); ! $end_week = localizeDate($dateFormat_week, $end_week_time); $parse_month = date ("Ym", strtotime($getdate)); ! $rssview = $_GET['rssview']; $cal_displayname = str_replace("32", " ", $cal); ! $events_week = 0; ! $view_path = $default_path.$rss_view.'.php'; // calculate a value for Last Modified and ETag ! $cal = urldecode($cal); ! $filemod = @filemtime("$calendar_path/$cal.ics"); ! $filemodtime = @date("r", $filemod); //send relevant headers --- 1,83 ---- <?php + /******************************************************************************** + * Modified from phpicalendar 2.0a distribution by Jim Hu + * philosophical changes + * - instead of having separate generators, use a date range for all views (done) + * - change the rss generation method to conform to standards(not done) + * PHP note: #@ is error control operator to suppress execution halt on error + * - used below to deal with undef? + *********************************************************************************/ define('BASE', '../'); include(BASE.'functions/ical_parser.php'); if ($enable_rss != 'yes') { ! die ("RSS feeds are not enabled on this site."); } ! $default_path = 'http://'.$HTTP_SERVER_VARS['SERVER_NAME'].':'.$HTTP_SERVER_VARS['SERVER_PORT'].substr($HTTP_SERVER_VARS['PHP_SELF'],0,strpos($HTTP_SERVER_VARS['PHP_SELF'],'/rss/')); ! ! //set the range of days to return based on the view chosen ! $rssview = $_GET['rssview']; ! ! if (!$getdate){$getdate = date("Ymd");} ! ! switch ($rssview){ ! case 'day': ! $fromdate = $getdate; ! $todate = $getdate; ! $theview = $day_lang; ! break; ! case 'month': $parse_month = date ("Ym", strtotime($getdate)); ! $fromdate = ($parse_month *100) + 1; ! $nextmonth = ($parse_month +1) * 100; #should give the 0th day of following month ! $todate = date('Ymd',strtotime($nextmonth)); ! $theview = date('M Y',strtotime($fromdate)); ! break; ! case 'daysfrom': ! $fromdate = $getdate; ! $todate = $getdate + $_GET['days']; ! #print "from:$fromdate to: $todate<br>"; ! $theview = $_GET['days']." days from ".date('n/d/Y',strtotime($fromdate)); ! break; ! case 'daysto': ! $todate = $getdate; ! $fromdate = $getdate - $_GET['days']; ! #print "from:$fromdate to: $todate<br>"; ! $theview = $_GET['days']." days before ".date('n/d/Y',strtotime($todate)); ! break; ! case 'range': ! $fromdate = $_GET['from']; ! $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 = $lang['l_week']." of ".date('n/d/Y',strtotime($fromdate)); ! ! } ! //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 = str_replace("32", " ", $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 *************** *** 46,58 **** } ! if ($rssview == "day") { ! $theview = $lang['l_day']; ! } elseif ($rssview == "week") { ! $theview = $lang['l_week']; ! } elseif ($rssview == "month") { ! $theview = $lang['l_month']; ! } ! ! $rss = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"."\n"; $rss .= '<!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN" "http://my.netscape.com/publish/formats/rss-0.91.dtd">'."\n"; --- 94,98 ---- } ! //If client needs new feed - make the header $rss = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"."\n"; $rss .= '<!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN" "http://my.netscape.com/publish/formats/rss-0.91.dtd">'."\n"; *************** *** 60,186 **** $rss .= '<channel>'."\n"; $rss .= '<title>'.$cal_displayname.' - '.$theview.'</title>'."\n"; ! $rss .= '<link>'.htmlspecialchars ($view_path).'</link>'."\n"; $rss .= '<description>'.$cal_displayname.' '.$lang['l_calendar'].' - '.$theview.'</description>'."\n"; $rss .= '<language>'.$rss_language.'</language>'."\n"; ! $rss .= '<copyright>Copyright 2004, '.htmlspecialchars ("$default_path").'</copyright>'."\n"; ! if ($rssview == 'day') { ! if (isset($master_array[($getdate)]) && sizeof($master_array[($getdate)]) > 0) { ! foreach ($master_array[("$getdate")] as $event_times) { foreach ($event_times as $val) { ! $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, '<b><i><u>'); ! $event_text = word_wrap($event_text, 21, $tomorrows_events_lines); ! $description = stripslashes(urldecode($val["description"])); ! $description = strip_tags($description, '<b><i><u>'); ! $rss_title = htmlspecialchars ("$event_start $event_text"); ! $rss_link = htmlspecialchars ("$default_path/day.php?getdate=$getdate&cal=$cal"); ! $rss_description = htmlspecialchars ("$description"); $rss .= '<item>'."\n"; $rss .= '<title>'.$rss_title.'</title>'."\n"; $rss .= '<link>'.$rss_link.'</link>'."\n"; $rss .= '<description>'.$rss_description.'</description>'."\n"; $rss .= '</item>'."\n"; ! $events_week++; } } } ! if ($events_week < 1) { $rss .= '<item>'."\n"; ! $rss .= '<title>'.$lang['l_no_events_day'].'</title>'."\n"; $rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n"; $rss .= '</item>'."\n"; } ! } ! ! $thisdate = $start_week_time; ! $i = 0; ! if ($rssview == "week") { ! do { ! $getdate = date("Ymd", $thisdate); ! $dayofweek = strtotime ($getdate); ! $dayofweek = localizeDate ($dateFormat_day, $dayofweek); ! if (isset($master_array[($getdate)]) && sizeof($master_array[($getdate)]) > 0) { ! foreach ($master_array[("$getdate")] as $event_times) { ! foreach ($event_times as $val) { ! $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, '<b><i><u>'); ! $event_text = word_wrap($event_text, 21, $tomorrows_events_lines); ! $description = stripslashes(urldecode($val["description"])); ! $description = strip_tags($description, '<b><i><u>'); ! $rss_title = htmlspecialchars ("$dayofweek: $event_text"); ! $rss_link = htmlspecialchars ("$default_path/day.php?getdate=$getdate&cal=$cal"); ! $rss_description = htmlspecialchars ("$dayofweek $event_start: $event_text - $description"); ! $rss .= '<item>'."\n"; ! $rss .= '<title>'.$rss_title.'</title>'."\n"; ! $rss .= '<link>'.$rss_link.'</link>'."\n"; ! $rss .= '<description>'.$rss_description.'</description>'."\n"; ! $rss .= '</item>'."\n"; ! $events_week++; ! } ! } ! } ! if (($events_week < 1) && ($i == 6)) { ! $rss .= '<item>'."\n"; ! $rss .= '<title>'.$lang['l_no_events_week'].'</title>'."\n"; ! $rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n"; ! $rss .= '</item>'."\n"; ! } ! $thisdate = ($thisdate + (25 * 60 * 60)); $i++; ! } while ($i < 7); ! } ! ! if ($rssview == "month") { ! foreach($master_array as $key => $new_val2) { ! ! // Pull out only this months ! ereg ("([0-9]{6})([0-9]{2})", $key, $regs); ! if ($regs[1] == $parse_month) { ! $getdate = $key; ! $dayofmonth = strtotime ($getdate); ! $dayofmonth = localizeDate ($dateFormat_day, $dayofmonth); ! ! // Pull out each day ! foreach ($new_val2 as $new_val) { ! ! // Pull out each time ! foreach ($new_val as $new_key2 => $val) { ! if ($val["event_text"]) { ! $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, '<b><i><u>'); ! $event_text = word_wrap($event_text, 21, $tomorrows_events_lines); ! $description = stripslashes(urldecode($val["description"])); ! $description = strip_tags($description, '<b><i><u>'); ! $rss_title = htmlspecialchars ("$dayofmonth: $event_text"); ! $rss_link = htmlspecialchars ("$default_path/day.php?getdate=$getdate&cal=$cal"); ! $rss_description = htmlspecialchars ("$dayofmonth $event_start: $event_text - $description"); ! $rss .= '<item>'."\n"; ! $rss .= '<title>'.$rss_title.'</title>'."\n"; ! $rss .= '<link>'.$rss_link.'</link>'."\n"; ! $rss .= '<description>'.$rss_description.'</description>'."\n"; ! $rss .= '</item>'."\n"; ! $events_week++; ! } ! ! if ($events_week < 1) { ! $rss .= '<item>'."\n"; ! $rss .= '<title>'.$lang['no_events_month'].'</title>'."\n"; ! $rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n"; ! $rss .= '</item>'."\n"; ! } ! } ! } ! } ! } ! } ! $rss .= '</channel>'."\n"; --- 100,166 ---- $rss .= '<channel>'."\n"; $rss .= '<title>'.$cal_displayname.' - '.$theview.'</title>'."\n"; ! $rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n"; $rss .= '<description>'.$cal_displayname.' '.$lang['l_calendar'].' - '.$theview.'</description>'."\n"; $rss .= '<language>'.$rss_language.'</language>'."\n"; ! $rss .= '<copyright>Copyright '.date(Y).', '.htmlspecialchars ("$default_path").'</copyright>'."\n"; + //generate the items + $numdays = $todate - $fromdate; + $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 ! do { ! $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 $val) { ! if(!$val["event_start"]){ ! $event_start = "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, '<b><i><u>'); ! $event_text = str_replace("& ","&", $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, '<b><i><u>'); ! $rss_title = htmlspecialchars ("$dayofweek: $event_text"); ! $rss_link = htmlspecialchars ("$default_path/day.php?getdate=$getdate&cal=$cal&cpath=$cpath"); ! $rss_description = htmlspecialchars ("$dayofweek $event_start: $description"); ! $rss .= '<item>'."\n"; + $rss .= '<event_start>'.$event_start.'</event_start>'."\n"; $rss .= '<title>'.$rss_title.'</title>'."\n"; + + $rss .= '<seminardate>'.$dayofweek.'</seminardate>'."\n"; + $rss .= '<seminarspeaker>'.$event_text.'</seminarspeaker>'."\n"; + $rss .= '<seminartitle>'.$description.'</seminartitle>'."\n"; + $rss .= '<tagged>'.$val["description"].'</tagged>'."\n"; + $rss .= '<seminarhost>'.$val['attendee'].'</seminarhost>'."\n"; + $rss .= '<organizer>'.$val['organizer'].'</organizer>'."\n"; + $rss .= '<status>'.$val['status'].'</status>'."\n"; + $rss .= '<link>'.$rss_link.'</link>'."\n"; $rss .= '<description>'.$rss_description.'</description>'."\n"; + $rss .= '<location>'.$val['location'].'</location>'; $rss .= '</item>'."\n"; ! $events_count++; } } } ! if (($events_count < 1) && ($i == $numdays)) { $rss .= '<item>'."\n"; ! $rss .= '<title>No events found</title>'."\n"; $rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n"; $rss .= '</item>'."\n"; } ! $thisdate++; $i++; ! } while ($i <= $numdays); $rss .= '</channel>'."\n"; |
|
From: <ji...@us...> - 2005-02-13 17:40:18
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21255/phpicalendar/functions Modified Files: init.inc.php Log Message: Modifications init.inc.php to enable multiple calendar paths chosen via REQUEST. Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** init.inc.php 25 Oct 2004 02:21:27 -0000 1.71 --- init.inc.php 13 Feb 2005 17:40:08 -0000 1.72 *************** *** 70,73 **** --- 70,79 ---- } + if($_REQUEST['cpath']){ + $cpath = $_REQUEST['cpath']; + $calendar_path .= "/$cpath"; + $tmp_dir .= "/$cpath"; + } + if ($calendar_path == '') { $calendar_path = BASE.'calendars'; *************** *** 130,142 **** if (isset($filename)) { if (($download_uri == '') && (preg_match('/(^\/|\.\.\/)/', $filename) == 0)) { ! $subscribe_path = 'webcal://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['PHP_SELF']).'/'.$filename; $download_filename = $filename; } elseif ($download_uri != '') { $newurl = eregi_replace("^(http://)", "", $download_uri); ! $subscribe_path = 'webcal://'.$newurl.'/'.$cal_filename.'.ics'; ! $download_filename = $download_uri.'/'.$cal_filename.'.ics'; } else { ! $subscribe_path = ''; ! $download_filename = ''; } } --- 136,148 ---- if (isset($filename)) { if (($download_uri == '') && (preg_match('/(^\/|\.\.\/)/', $filename) == 0)) { ! $subscribe_path = 'webcal://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['PHP_SELF']).'/'."$cpath/".$filename; $download_filename = $filename; } elseif ($download_uri != '') { $newurl = eregi_replace("^(http://)", "", $download_uri); ! $subscribe_path = 'webcal://'.$newurl.'/'."$cpath/".$cal_filename.'.ics'; ! $download_filename = $download_uri.'/'."$cpath/".$cal_filename.'.ics'; } else { ! $subscribe_path = "$cpath/"; ! $download_filename = "$cpath/"; } } |
|
From: <cl...@us...> - 2004-12-17 18:34:47
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8281/rss Modified Files: index.php Log Message: Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** index.php 25 Oct 2004 17:43:32 -0000 1.34 --- index.php 17 Dec 2004 18:34:34 -0000 1.35 *************** *** 41,45 **** 'header' => BASE.'templates/'.$template.'/header.tpl', 'footer' => BASE.'templates/'.$template.'/footer.tpl', ! 'event_js' => BASE.'functions/event.js' )); --- 41,45 ---- 'header' => BASE.'templates/'.$template.'/header.tpl', 'footer' => BASE.'templates/'.$template.'/footer.tpl', ! 'event_js' => '' )); |
|
From: <we...@us...> - 2004-11-29 23:36:46
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29604/functions Modified Files: template.php Log Message: Removing slashes from todo descriptions so that things like semicolons display correctly. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** template.php 30 Oct 2004 01:06:26 -0000 1.61 --- template.php 29 Nov 2004 23:36:37 -0000 1.62 *************** *** 642,646 **** if ($vtodo_text != "") { if (isset($val["description"])) { ! $description = urldecode($val["description"]); } else { $description = ""; --- 642,646 ---- if ($vtodo_text != "") { if (isset($val["description"])) { ! $description = stripslashes(urldecode($val["description"])); } else { $description = ""; |
|
From: <cl...@us...> - 2004-11-09 20:53:20
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv868/functions Modified Files: ical_parser.php Log Message: Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.185 retrieving revision 1.186 diff -C2 -d -r1.185 -r1.186 *** ical_parser.php 2 Oct 2004 00:09:39 -0000 1.185 --- ical_parser.php 9 Nov 2004 20:53:11 -0000 1.186 *************** *** 535,538 **** --- 535,539 ---- if ((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); $month = date('m', $next_range_time); |
|
From: <cl...@us...> - 2004-10-31 19:50:26
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3806/templates/default Modified Files: event.tpl todo.tpl Log Message: added charset Index: event.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/event.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** event.tpl 15 May 2004 02:42:17 -0000 1.7 --- event.tpl 31 Oct 2004 19:50:15 -0000 1.8 *************** *** 3,7 **** <html> <head> ! <meta http-equiv="content-type" content="text/html;charset=UTF-8"> <title>{CAL}</title> <link rel="stylesheet" type="text/css" href="../templates/{TEMPLATE}/default.css"> --- 3,7 ---- <html> <head> ! <meta http-equiv="content-type" content="text/html;charset={CHARSET}"> <title>{CAL}</title> <link rel="stylesheet" type="text/css" href="../templates/{TEMPLATE}/default.css"> Index: todo.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/todo.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** todo.tpl 15 May 2004 02:42:17 -0000 1.4 --- todo.tpl 31 Oct 2004 19:50:15 -0000 1.5 *************** *** 3,7 **** <html> <head> ! <meta http-equiv="content-type" content="text/html;charset=UTF-8"> <title>{CAL}</title> <link rel="stylesheet" type="text/css" href="../templates/{TEMPLATE}/default.css"> --- 3,7 ---- <html> <head> ! <meta http-equiv="content-type" content="text/html;charset={CHARSET}"> <title>{CAL}</title> <link rel="stylesheet" type="text/css" href="../templates/{TEMPLATE}/default.css"> |
|
From: <cl...@us...> - 2004-10-31 19:50:26
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3806 Modified Files: config.inc.php Log Message: added charset Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.163 retrieving revision 1.164 diff -C2 -d -r1.163 -r1.164 *** config.inc.php 30 Oct 2004 01:06:23 -0000 1.163 --- config.inc.php 31 Oct 2004 19:50:11 -0000 1.164 *************** *** 20,25 **** $allday_week_lines = '1'; // Number of lines to wrap each event title in all-day events in week view, 0 means display all lines. $week_events_lines = '1'; // Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines. ! $timezone = ''; // Set timezone. Read TIMEZONES file for more information ! $calendar_path = ''; // Leave this blank on most installs, place your FULL FILE PATH to calendars if they are outside the phpicalendar folder. $second_offset = ''; // The time in seconds between your time and your server's time. $bleed_time = ''; // This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359', or '-1' for no bleed time. Is automatically set to $day_start if left blank. --- 20,25 ---- $allday_week_lines = '1'; // Number of lines to wrap each event title in all-day events in week view, 0 means display all lines. $week_events_lines = '1'; // Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines. ! $timezone = ''; // Set timezone. Read TIMEZONES file for more information ! $calendar_path = ''; // Leave this blank on most installs, place your full FILE SYSTEM PATH to calendars if they are outside the phpicalendar folder. $second_offset = ''; // The time in seconds between your time and your server's time. $bleed_time = ''; // This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359', or '-1' for no bleed time. Is automatically set to $day_start if left blank. |
