phpicalendar-commits — Mailing list ONLY for CVS commits. This is a listen-only list.

[PHPiCalendar-Commits] phpicalendar/languages german.inc.php,1.25,1.26

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/languages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18215/languages

Modified Files:
	german.inc.php 
Log Message:
Added caching options, included german for 2.0



Index: german.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/german.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** german.inc.php	22 Nov 2003 03:45:33 -0000	1.25
--- german.inc.php	5 Aug 2004 20:38:27 -0000	1.26
***************
*** 1 ****
! <?php

// German language include
// For version 1.0 PHP iCalendar
//
// Translation by David Reindl (dr...@an...)
// Corrected by whippersnapper slomo (ma...@sl...)
//
// Submit new translations to ch...@ch...

$day_lang		= 'Tag';
$week_lang		= 'Woche';
$month_lang		= 'Monat';
$year_lang		= 'Jahr';
$calendar_lang		= 'Kalender';

$next_day_lang		= 'Folgender Tag';
$next_month_lang	= 'Folgender Monat';
$next_week_lang		= 'Folgende Woche';
$next_year_lang		= 'Folgendes Jahr';

$last_day_lang		= 'Vorhergehender Tag';
$last_month_lang	= 'Vorhergehender Monat';
$last_week_lang		= 'Vorhergehende Woche';
$last_year_lang		= 'Vorhergehendes Jahr';

$subscribe_lang		= 'Abonnieren';
$download_lang		= 'Herunterladen';
$powered_by_lang 	= 'Powered by';
$event_lang		= 'Eintrag';
$event_start_lang	= 'Beginn';
$event_end_lang		= 'Ende';

$this_months_lang	= 'Alle Eintr&auml;ge in diesem Monat';
$date_lang		= 'Datum';
$summary_lang		= 'Beschreibung';
$all_day_lang		= 'Tagesereignis';
$notes_lang		= 'Notiz';

$this_years_lang	= 'Eintr&auml;ge in diesem Jahr';
$today_lang		= 'Heute';
$this_week_lang		= 'Diese Woche';
$this_month_lang	= 'Diesen Monat';
$jump_lang		= 'Gehe zu';
$tomorrows_lang		= 'Morgige Eintr&auml;ge';

$goday_lang		= 'Gehe zum heutigen Tag';
$goweek_lang		= 'Gehe zur aktuellen Woche';
$gomonth_lang		= 'Gehe zum aktuellen Monat';
$goyear_lang		= 'Gehe zum aktuellen Jahr';

$search_lang		= 'Suchen'; // the verb
$results_lang		= 'Suchresultate';
$query_lang		= 'Suche: '; // will be followed by the search query
$no_results_lang	= 'Keine Eintr&auml;ge gefunden';
$goprint_lang		= 'Druckversion';
$time_lang		= 'Zeit';
$summary_lang		= 'Zusammenfassung';
$description_lang	= 'Beschreibung';
$this_site_is_lang	= 'Diese Site ist';

$no_events_day_lang	= 'Keine Eintr&auml;ge f&uuml;r heute.';
$no_events_week_lang	= 'Keine Eintr&auml;ge in dieser Woche.';
$no_events_month_lang	= 'Keine Eintr&auml;ge in diesem Monat.';

$rss_day_date		= 'H:i';  // Lists just the time
$rss_week_date		= '%e. %b';  // Lists just the day
$rss_month_date		= '%e. %b';  // Lists just the day
$rss_language		= 'de-de';

$search_took_lang	= 'Suche dauerte %s Sekunden';
$recurring_event_lang	= 'Wiederkehrender Eintrag';
$exception_lang		= 'Ausnahme';
$no_query_lang		= 'Kein Suchbegriff';
$preferences_lang	= 'Einstellungen';
$printer_lang		= 'Drucker';

$select_lang_lang	= 'Standardsprache w&auml;hlen:';
$select_cal_lang	= 'Standardkalender w&auml;hlen:';
$select_view_lang	= 'Standardansicht  w&auml;hlen:';
$select_time_lang	= 'Tag beginnt um:';
$select_day_lang	= 'Woche beginnt mit:';
$select_style_lang	= 'Standardstil w&auml;hlen:';

$set_prefs_lang		= 'Einstellungen speichern';

$completed_date_lang	= 'Erledigt am';
$completed_lang		= 'Erledigt';

$created_lang		= 'Erstellt:';
$due_lang		= 'F&auml;llig:';

$priority_lang		= 'Priorit&auml;t:';
$priority_high_lang	= 'hoch';
$priority_low_lang	= 'tief';
$priority_medium_lang	= 'mittel';
$priority_none_lang	= 'keine';

$status_lang		= 'Status:';
$todo_lang		= 'Aufgaben';
$unfinished_lang	= 'Pendent';

$prefs_set_lang 	= 'Einstellungen wurden gespeichert.';
$prefs_unset_lang 	= 'Einstellungen gel&ouml;scht. &Auml;nderungen werden beim Aufruf der n&auml;chsten Seite aktiv.';
$unset_prefs_lang 	= 'Einstellungen l&ouml;schen:';

$organizer_lang		= 'Organisator';
$attendee_lang		= 'Teilnehmer';
$status_lang		= 'Status';
$location_lang		= 'Ort';

$admin_header_lang	= 'PHP iCalendar Administration';
$username_lang		= 'Benutzername';
$password_lang		= 'Passwort';
$login_lang		= 'Anmelden';
$invalid_login_lang	= 'Falscher Benutzername oder Passwort.';
$addupdate_cal_lang	= 'Kalender aktualisieren oder hochladen';
$addupdate_desc_lang	= 'Um einen Kalendar hinzuzuf&uuml;gen, laden Sie ein neues Kalender Dokument hoch. Um einen Kalender zu aktualisieren, laden Sie ein Kalender Dokument mit dem selben Namen hoch.';
$delete_cal_lang	= 'Einen Kalender l&ouml;schen';
$logout_lang		= 'Abmelden';
$cal_file_lang		= 'Kalender Dokument';
$php_error_lang		= '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]	= 'The file you are trying upload was only partially uploaded.';
$upload_error_lang[4]	= 'Sie m&uuml;ssen ein Dokument zum Hochladen ausw&auml;hlen.';
$upload_error_type_lang = 'Nur Dokumente mit der Suffix .ics d&uuml;rfen hochgeladen werden.';

$copy_error_lang	= 'Kopieren des Dokuments nicht erfolgreich';
$delete_error_lang	= 'L&ouml;schen des Dokuments nicht erfolgreich';
$delete_success_lang	= 'wurde gel&ouml;scht.';
$action_success_lang	= 'Die Aktion war erfolgreich.';

$submit_lang		= 'Absenden';
$delete_lang		= 'L&ouml;schen';


// ----- New for 0.9.5

$all_cal_comb_lang	= 'Alle Kalender zusammen';

// - navigation

$back_lang              = 'Zur&uuml;ck';
$next_lang              = 'N&auml;chste';
$prev_lang              = 'Vorherige';

$day_view_lang          = 'Tagesansicht';
$week_view_lang         = 'Wochenansicht';
$month_view_lang        = 'Monatsansicht';
$year_view_lang         = '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&uuml;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','Donnerstag','Freitag','Samstag');
$daysofweekshort_lang		= array ('Son','Mon','Die','Mit','Don','Fre','Sam');
$daysofweekreallyshort_lang	= array ('S','M','D','M','D','F','S');

$monthsofyear_lang		= array ('Januar','Februar','M&auml;rz','April','Mai','Juni','Juli','August','September','Oktober','November','Dezember');
$monthsofyearshort_lang		= array ('Jan','Feb','M&auml;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

$error_title_lang       = 'Fehler!';
$error_window_lang      = 'Es ist ein Fehler aufgetreten!';
$error_calendar_lang    = 'Der Kalender "%s" wurde bearbeitet, als dieser Fehler auftrat.';
$error_path_lang        = 'Der Pfad "%s" kann nicht ge&ouml;ffnet werden.';
$error_back_lang        = 'Bitte klicken Sie die "Zur&uuml;ck" Schaltfl&auml;che des Browsers um zur&uuml;ckzuspringen.';
$error_remotecal_lang   = 'Dieser Server blockiert entfernte Kalender, welche nicht freigegeben wurden.';
$error_restrictedcal_lang   = 'Sie haben versucht einen Kalender mit eingeschr&auml;nktem Zugriff auf diesem Server aufzurufen.';
$error_invalidcal_lang  = 'Dieser Kalender enth&auml;lt Fehler. Bitte w&auml;hlen Sie einen anderen aus.';

?>
\ No newline at end of file
--- 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&auml;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&auml;ge f&uuml;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&auml;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&auml;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&auml;ge f&uuml;r heute.';
$lang['l_no_events_week']	= 'Keine Eintr&auml;ge in dieser Woche.';
$lang['l_no_events_month']	= 'Keine Eintr&auml;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&auml;hlen:';
$lang['l_select_cal']		= 'Standardkalender w&auml;hlen:';
$lang['l_select_view']		= 'Standardansicht  w&auml;hlen:';
$lang['l_select_time']		= 'Tag beginnt um:';
$lang['l_select_day']		= 'Woche beginnt mit:';
$lang['l_select_style']		= 'Standardstil w&auml;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&auml;llig:';
$lang['l_priority']			= 'Priorit&auml;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&ouml;scht. &Auml;nderungen werden beim Aufruf der n&auml;chsten Seite aktiv.';
$lang['l_unset_prefs'] 		= 'Einstellungen l&ouml;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&uuml;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&ouml;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&uuml;ssen ein Dokument zum Hochladen ausw&auml;hlen.';
$lang['l_upload_error_type'] = 'Nur Dokumente mit der Suffix .ics d&uuml;rfen hochgeladen werden.';
$lang['l_copy_error']			= 'Kopieren des Dokuments nicht erfolgreich';
$lang['l_delete_error']			= 'L&ouml;schen des Dokuments nicht erfolgreich';
$lang['l_delete_success']		= 'wurde gel&ouml;scht.';
$lang['l_action_success']		= 'Die Aktion war erfolgreich.';
$lang['l_submit']				= 'Absenden';
$lang['l_delete']				= 'L&ouml;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&uuml;ck';
$lang['l_next'] 		= 'N&auml;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&uuml;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&auml;rz','April','Mai','Juni','Juli','August','September','Oktober','November','Dezember');
$monthsofyearshort_lang		= array ('Jan','Feb','M&auml;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&ouml;ffnet werden.';
$lang['l_error_back'] 			= 'Bitte klicken Sie die "Zur&uuml;ck" Schaltfl&auml;che des Browsers um zur&uuml;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&auml;nktem Zugriff auf diesem Server aufzurufen.';
$lang['l_error_invalidcal'] 	= 'Dieser Kalender enth&auml;lt Fehler. Bitte w&auml;hlen Sie einen anderen aus.';

?>
\ No newline at end of file

[PHPiCalendar-Commits] phpicalendar config.inc.php,1.146,1.147

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18215

Modified Files:
	config.inc.php 
Log Message:
Added caching options, included german for 2.0



Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** config.inc.php	22 Jul 2004 02:25:41 -0000	1.146
--- config.inc.php	5 Aug 2004 20:38:26 -0000	1.147
***************
*** 21,25 ****
  $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
- $tmp_dir				= '/tmp';			// The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X)
  $calendar_path 			= '';				// Leave this blank on most installs, place your full path to calendars if they are outside the phpicalendar folder.
  $second_offset			= '0';				// The time in seconds between your time and your server's time.
--- 21,24 ----
***************
*** 30,34 ****
  
  // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
- $save_parsed_cals 		= 'no';			// Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
  $display_custom_goto 	= 'no';				// In the 'Jump To' box, display the custom 'go to day' box.
  $display_ical_list 		= 'yes';			// In the 'Jump To' box, display the pop-up menu with the list of all calendars in the $calendar_path directory.
--- 29,32 ----
***************
*** 44,51 ****
  $login_cookies			= 'no';			// Set to yes to store authentication information via (unencrypted) cookies. Set to no to use sessions.
  
  // Webdav style publishing
  $phpicalendar_publishing = '';				// Set to '1' to enable remote webdav style publish. See 'calendars/publish.php' for complete information;
  
! // Administration settings
  $allow_admin			= 'yes';				// Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $auth_method			
  $auth_method			= 'ftp';			// Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $auth_internal_username and $auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic.
--- 42,54 ----
  $login_cookies			= 'no';			// Set to yes to store authentication information via (unencrypted) cookies. Set to no to use sessions.
  
+ // Calendar Caching (decreases page load times)
+ $save_parsed_cals 		= 'no';				// Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
+ $tmp_dir				= '/tmp';			// The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X). Any php-writable folder works.
+ $webcal_hours			= '24';				// Number of hours to cache webcals.
+ 
  // Webdav style publishing
  $phpicalendar_publishing = '';				// Set to '1' to enable remote webdav style publish. See 'calendars/publish.php' for complete information;
  
! // Administration settings (admin.php)
  $allow_admin			= 'yes';				// Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $auth_method			
  $auth_method			= 'ftp';			// Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $auth_internal_username and $auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic.

[PHPiCalendar-Commits] phpicalendar/functions calendar_functions.php,1.6,1.7

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7869/functions

Modified Files:
	calendar_functions.php 
Log Message:
Fix for [ 999374 ] Slight authentication bug



Index: calendar_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** calendar_functions.php	15 May 2004 03:07:21 -0000	1.6
--- calendar_functions.php	30 Jul 2004 01:32:09 -0000	1.7
***************
*** 15,19 ****
  function availableCalendars($username, $password, $cal_filename, $admin = false) {
  	// Import globals.
! 	global $calendar_path, $blacklisted_cals, $list_webcals, $locked_cals, $locked_map, $apache_map, $error_path_lang, $error_restrictedcal_lang, $error_invalidcal_lang, $ALL_CALENDARS_COMBINED, $_SERVER;
  
  	// Create the list of available calendars.
--- 15,19 ----
  function availableCalendars($username, $password, $cal_filename, $admin = false) {
  	// Import globals.
! 	global $allow_login, $calendar_path, $blacklisted_cals, $list_webcals, $locked_cals, $locked_map, $apache_map, $error_path_lang, $error_restrictedcal_lang, $error_invalidcal_lang, $ALL_CALENDARS_COMBINED, $_SERVER;
  
  	// Create the list of available calendars.

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.172,1.173

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5408/functions

Modified Files:
	ical_parser.php 
Log Message:
Fix for [ 1000362 ] phpicalendar 2.0 beta problems.



Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.172
retrieving revision 1.173
diff -C2 -d -r1.172 -r1.173
*** ical_parser.php	29 Jul 2004 06:17:54 -0000	1.172
--- ical_parser.php	30 Jul 2004 01:16:26 -0000	1.173
***************
*** 122,130 ****
  			$line = $nextline;
  			$nextline = fgets($ifile, 1024);
! 			$nextline = str_replace("\r\n", "", $nextline);
  			while (substr($nextline, 0, 1) == " ") {
  				$line = $line . substr($nextline, 1);
  				$nextline = fgets($ifile, 1024);
! 				$nextline = str_replace("\r\n", "", $nextline);
  			}
  			$line = trim($line);
--- 122,130 ----
  			$line = $nextline;
  			$nextline = fgets($ifile, 1024);
! 			$nextline = ereg_replace("[\r\n]", "", $nextline);
  			while (substr($nextline, 0, 1) == " ") {
  				$line = $line . substr($nextline, 1);
  				$nextline = fgets($ifile, 1024);
! 				$nextline = ereg_replace("[\r\n]", "", $nextline);
  			}
  			$line = trim($line);

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.171,1.172

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6831/functions

Modified Files:
	ical_parser.php 
Log Message:
Doesn't try to get modtime of webcals.



Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.171
retrieving revision 1.172
diff -C2 -d -r1.171 -r1.172
*** ical_parser.php	22 Jul 2004 02:25:42 -0000	1.171
--- ical_parser.php	29 Jul 2004 06:17:54 -0000	1.172
***************
*** 106,110 ****
  		
  		//Mod time
! 		$actual_mtime = filemtime($filename);
  		
  		// Set a value so we can check to make sure $master_array contains valid data
--- 106,112 ----
  		
  		//Mod time
! 		if ($is_webcal == false) {
! 			$actual_mtime = filemtime($filename);
! 		}
  		
  		// Set a value so we can check to make sure $master_array contains valid data

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.170,1.171 userauth_functions.php,1.1,1.2

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19795/functions

Modified Files:
	ical_parser.php userauth_functions.php 
Log Message:
Changes.



Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.170
retrieving revision 1.171
diff -C2 -d -r1.170 -r1.171
*** ical_parser.php	28 May 2004 16:33:48 -0000	1.170
--- ical_parser.php	22 Jul 2004 02:25:42 -0000	1.171
***************
*** 284,288 ****
  					}
  					// Changed for 1.0, basically write out the entire event if it starts while the array is written.
! 					if ($start < $mArray_end) {
  						while (($start != $end) && ($start < $mArray_end)) {
  							$start_date2 = date('Ymd', $start);
--- 284,288 ----
  					}
  					// Changed for 1.0, basically write out the entire event if it starts while the array is written.
! 					if (($start < $mArray_end) && ($start < $end)) {
  						while (($start != $end) && ($start < $mArray_end)) {
  							$start_date2 = date('Ymd', $start);
***************
*** 573,578 ****
  													break;
  												case 'YEARLY':
! 												
! 													if (!isset($bymonth)) {
  														$m = date('m', $start_date_time);
  														$bymonth = array("$m");
--- 573,577 ----
  													break;
  												case 'YEARLY':
! 													if ((!isset($bymonth)) || (sizeof($bymonth) == 0)) {
  														$m = date('m', $start_date_time);
  														$bymonth = array("$m");
***************
*** 607,611 ****
  															$day 	= date('d', $start_date_time);
  															$next_date_time = mktime(0,0,0,$month,$day,$year);
! 															//echo date('Ymd',$next_range_time).$summary.'<br>';
  														}
  														$recur_data[] = $next_date_time;
--- 606,610 ----
  															$day 	= date('d', $start_date_time);
  															$next_date_time = mktime(0,0,0,$month,$day,$year);
! 															//echo date('Ymd',$next_date_time).$summary.'<br>';
  														}
  														$recur_data[] = $next_date_time;

Index: userauth_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/userauth_functions.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** userauth_functions.php	14 May 2004 21:09:16 -0000	1.1
--- userauth_functions.php	22 Jul 2004 02:25:42 -0000	1.2
***************
*** 97,101 ****
  	
  	// Check to make sure the username and password is valid.
! 	if (!key_exists("$username:$password", $locked_map)) {
  		// Remember the invalid login, because we may want to display
  		// a message elsewhere or check validity.
--- 97,101 ----
  	
  	// Check to make sure the username and password is valid.
! 	if (!array_key_exists("$username:$password", $locked_map)) {
  		// Remember the invalid login, because we may want to display
  		// a message elsewhere or check validity.

[PHPiCalendar-Commits] phpicalendar/templates/default footer.tpl,1.6,1.7

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19795/templates/default

Modified Files:
	footer.tpl 
Log Message:
Changes.



Index: footer.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/footer.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** footer.tpl	20 May 2004 04:15:20 -0000	1.6
--- footer.tpl	22 Jul 2004 02:25:42 -0000	1.7
***************
*** 1,3 ****
! <center class="V9"><br />{L_POWERED_BY} <a class="psf" href="http://phpicalendar.sourceforge.net/nuke/">PHP iCalendar 2.0</a><br />
  <!-- switch rss_valid on -->
  <p>
--- 1,3 ----
! <center class="V9"><br />{L_POWERED_BY} <a class="psf" href="http://phpicalendar.net/">PHP iCalendar 2.0</a><br />
  <!-- switch rss_valid on -->
  <p>

[PHPiCalendar-Commits] phpicalendar README,1.66,1.67 config.inc.php,1.145,1.146

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19795

Modified Files:
	README config.inc.php 
Log Message:
Changes.



Index: README
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/README,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** README	23 May 2004 08:23:44 -0000	1.66
--- README	22 Jul 2004 02:25:41 -0000	1.67
***************
*** 102,105 ****
--- 102,106 ----
  	-YEARLY repeating events display better.
  	-All Calendars Combined can now be cached for greater performance.
+ 	-Parsing engine now twice as fast.
  	-Various bug fixes.
  	

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** config.inc.php	28 May 2004 16:33:44 -0000	1.145
--- config.inc.php	22 Jul 2004 02:25:41 -0000	1.146
***************
*** 30,34 ****
  
  // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
! $save_parsed_cals 		= 'yes';			// Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
  $display_custom_goto 	= 'no';				// In the 'Jump To' box, display the custom 'go to day' box.
  $display_ical_list 		= 'yes';			// In the 'Jump To' box, display the pop-up menu with the list of all calendars in the $calendar_path directory.
--- 30,34 ----
  
  // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
! $save_parsed_cals 		= 'no';			// Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
  $display_custom_goto 	= 'no';				// In the 'Jump To' box, display the custom 'go to day' box.
  $display_ical_list 		= 'yes';			// In the 'Jump To' box, display the pop-up menu with the list of all calendars in the $calendar_path directory.

[PHPiCalendar-Commits] phpicalendar config.inc.php,1.144,1.145

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25886

Modified Files:
	config.inc.php 
Log Message:
FIxed a bug not allowing all combined to cache.



Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** config.inc.php	24 May 2004 05:26:40 -0000	1.144
--- config.inc.php	28 May 2004 16:33:44 -0000	1.145
***************
*** 6,10 ****
  // Follow instructions to the right for detailed information
  
- $style_sheet 			= 'silver';			// Themes support - silver, red, green, orange, grey, tan
  $template 				= 'default';		// Template support
  $default_view 			= 'day';			// Default view for calendars = 'day', 'week', 'month', 'year'
--- 6,9 ----

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.169,1.170 list_functions.php,1.7,1.8

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25886/functions

Modified Files:
	ical_parser.php list_functions.php 
Log Message:
FIxed a bug not allowing all combined to cache.



Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.169
retrieving revision 1.170
diff -C2 -d -r1.169 -r1.170
*** ical_parser.php	25 May 2004 23:29:49 -0000	1.169
--- ical_parser.php	28 May 2004 16:33:48 -0000	1.170
***************
*** 156,162 ****
  			case 'END:VEVENT':
  				
! 				if (!isset($master_array[-3][$calnumber])) $master_array[-3][$calnumber] = $actual_calname;
! 				if (!isset($master_array[-4][$calnumber]['mtime'])) $master_array[-4][$calnumber]['mtime'] = $actual_mtime;
! 				if (!isset($master_array[-4][$calnumber]['filename'])) $master_array[-4][$calnumber]['filename'] = $filename;
  				if (!isset($url)) $url = '';
  				if (!isset($type)) $type = '';
--- 156,162 ----
  			case 'END:VEVENT':
  				
! 				if (!isset($master_array['-3'][$calnumber])) $master_array['-3'][$calnumber] = $actual_calname;
! 				if (!isset($master_array['-4'][$calnumber]['mtime'])) $master_array['-4'][$calnumber]['mtime'] = $actual_mtime;
! 				if (!isset($master_array['-4'][$calnumber]['filename'])) $master_array['-4'][$calnumber]['filename'] = $filename;
  				if (!isset($url)) $url = '';
  				if (!isset($type)) $type = '';

Index: list_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_functions.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** list_functions.php	24 May 2004 05:26:41 -0000	1.7
--- list_functions.php	28 May 2004 16:33:48 -0000	1.8
***************
*** 13,17 ****
  function list_calcolors() {
  	global $template, $master_array;
! 	foreach ($master_array[-3] as $key => $val) {
  		$return .= '<img src="templates/'.$template.'/images/monthdot_'.$key.'.gif" alt="" /> '.$val.'<br />';
  	}
--- 13,17 ----
  function list_calcolors() {
  	global $template, $master_array;
! 	foreach ($master_array['-3'] as $key => $val) {
  		$return .= '<img src="templates/'.$template.'/images/monthdot_'.$key.'.gif" alt="" /> '.$val.'<br />';
  	}

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.168,1.169 init.inc.php,1.61,1.62

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21128/functions

Modified Files:
	ical_parser.php init.inc.php 
Log Message:
Minor E_NOTICE fixes.



Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.168
retrieving revision 1.169
diff -C2 -d -r1.168 -r1.169
*** ical_parser.php	23 May 2004 08:23:45 -0000	1.168
--- ical_parser.php	25 May 2004 23:29:49 -0000	1.169
***************
*** 159,162 ****
--- 159,164 ----
  				if (!isset($master_array[-4][$calnumber]['mtime'])) $master_array[-4][$calnumber]['mtime'] = $actual_mtime;
  				if (!isset($master_array[-4][$calnumber]['filename'])) $master_array[-4][$calnumber]['filename'] = $filename;
+ 				if (!isset($url)) $url = '';
+ 				if (!isset($type)) $type = '';
  				
  				// Handle DURATION
***************
*** 516,519 ****
--- 518,522 ----
  													if (!isset($bymonth)) $bymonth = array(1,2,3,4,5,6,7,8,9,10,11,12);
  													$next_range_time = strtotime(date('Y-m-01', $next_range_time));
+ 													$next_date_time = $next_date_time;
  													if ((isset($bymonthday)) && (!isset($byday))) {
  														foreach($bymonthday as $day) {

Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** init.inc.php	22 May 2004 23:51:03 -0000	1.61
--- init.inc.php	25 May 2004 23:29:49 -0000	1.62
***************
*** 129,142 ****
  		
  		// Sets the download and subscribe paths from the config if present.
! 		if ($download_uri == '' && preg_match('/(^\/|\.\.\/)/', $filename) == 0) {
! 			$subscribe_path = 'webcal://'.$HTTP_SERVER_VARS['SERVER_NAME'].dirname($HTTP_SERVER_VARS['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 = '';
  		}
  	}
--- 129,144 ----
  		
  		// Sets the download and subscribe paths from the config if present.
! 		if (isset($filename)) {
! 			if (($download_uri == '') && (preg_match('/(^\/|\.\.\/)/', $filename) == 0)) {
! 				$subscribe_path = 'webcal://'.$HTTP_SERVER_VARS['SERVER_NAME'].dirname($HTTP_SERVER_VARS['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 = '';
! 			}
  		}
  	}

[PHPiCalendar-Commits] phpicalendar/rss index.php,1.28,1.29

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/rss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21092/rss

Modified Files:
	index.php 
Log Message:
Minor bug fixes.



Index: index.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** index.php	19 May 2004 04:16:48 -0000	1.28
--- index.php	24 May 2004 05:26:41 -0000	1.29
***************
*** 20,24 ****
  	$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.'&amp;rssview=day<br />';
! 	$rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&amplrssview=week<br />';
  	$rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&amp;rssview=month<br /><br />';
  	$footer_check = $default_path.'/rss/rss.php?cal='.$default_cal.'&amp;rssview='.$default_view;
--- 20,24 ----
  	$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.'&amp;rssview=day<br />';
! 	$rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&amp;rssview=week<br />';
  	$rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&amp;rssview=month<br /><br />';
  	$footer_check = $default_path.'/rss/rss.php?cal='.$default_cal.'&amp;rssview='.$default_view;

[PHPiCalendar-Commits] phpicalendar config.inc.php,1.143,1.144

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21092

Modified Files:
	config.inc.php 
Log Message:
Minor bug fixes.



Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.143
retrieving revision 1.144
diff -C2 -d -r1.143 -r1.144
*** config.inc.php	23 May 2004 08:23:44 -0000	1.143
--- config.inc.php	24 May 2004 05:26:40 -0000	1.144
***************
*** 16,25 ****
  $day_end				= '2300';			// End time for day grid
  $gridLength 			= '15';				// Grid distance in minutes for day view, multiples of 15 preferred
! $num_years 				= '3';				// Number of years to display in 'Jump to'
  $month_event_lines 		= '1';				// Number of lines to wrap each event title in month view, 0 means display all lines.
  $tomorrows_events_lines = '1';				// Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines.
  $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 				= 'US/Pacific';				// Set timezone. Read TIMEZONES file for more information
  $tmp_dir				= '/tmp';			// The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X)
  $calendar_path 			= '';				// Leave this blank on most installs, place your full path to calendars if they are outside the phpicalendar folder.
--- 16,25 ----
  $day_end				= '2300';			// End time for day grid
  $gridLength 			= '15';				// Grid distance in minutes for day view, multiples of 15 preferred
! $num_years 				= '1';				// Number of years (up and back) to display in 'Jump to'
  $month_event_lines 		= '1';				// Number of lines to wrap each event title in month view, 0 means display all lines.
  $tomorrows_events_lines = '1';				// Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines.
  $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
  $tmp_dir				= '/tmp';			// The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X)
  $calendar_path 			= '';				// Leave this blank on most installs, place your full path to calendars if they are outside the phpicalendar folder.

[PHPiCalendar-Commits] phpicalendar/functions list_functions.php,1.6,1.7

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21092/functions

Modified Files:
	list_functions.php 
Log Message:
Minor bug fixes.



Index: list_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_functions.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** list_functions.php	15 May 2004 03:07:22 -0000	1.6
--- list_functions.php	24 May 2004 05:26:41 -0000	1.7
***************
*** 8,12 ****
  	$return .= '<option value="month.php?cal='.$cal.'&amp;getdate='.$today.'">'.$lang['l_gomonth'].'</option>';
  	$return .= '<option value="year.php?cal='.$cal.'&amp;getdate='.$today.'">'.$lang['l_goyear'].'</option>';
- 	
  	return $return;
  }
--- 8,11 ----
***************
*** 17,21 ****
  		$return .= '<img src="templates/'.$template.'/images/monthdot_'.$key.'.gif" alt="" /> '.$val.'<br />';
  	}
- 	
  	return $return;
  }
--- 16,19 ----
***************
*** 36,40 ****
  		$month_time = strtotime ("+1 month", $month_time);
  	}
- 	
  	return $return;
  }
--- 34,37 ----
***************
*** 42,46 ****
  
  function list_years() {
! 	global $getdate, $this_year, $cal;
  	$year_time = strtotime($getdate);
  	for ($i=0; $i < $num_years; $i++) {
--- 39,43 ----
  
  function list_years() {
! 	global $getdate, $this_year, $cal, $num_years;
  	$year_time = strtotime($getdate);
  	for ($i=0; $i < $num_years; $i++) {

[PHPiCalendar-Commits] phpicalendar/functions template.php,1.48,1.49

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12243/functions

Modified Files:
	template.php 
Log Message:
Start of admin wiring. Removed unneeded things from print.



Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** template.php	23 May 2004 23:54:42 -0000	1.48
--- template.php	24 May 2004 01:39:42 -0000	1.49
***************
*** 15,18 ****
--- 15,58 ----
  	}
  	
+ 	function draw_admin() {
+ 		global $template, $getdate, $cal, $master_array, $is_loged_in;
+ 		
+ 		if ($is_loged_in == TRUE) { 
+ 			// Print Calendar Checkboxes
+ 			$COLUMNS_TO_PRINT = 3;
+ 			$column = 1;
+ 			$filelist = availableCalendarNames('', '', '', true);
+ 			foreach ($filelist as $file) {
+ 				if ($column > $COLUMNS_TO_PRINT) {
+ 					$delete_table 	.= '</tr>';
+ 					$column 	= 1;
+ 				}
+ 				if ($column == 1) {
+ 					$delete_table .= '<tr>';
+ 				}
+ 				
+ 				$cal_filename_tmp = substr($file,0,-4);
+ 				$cal_tmp = urlencode($file);
+ 				$cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp);
+ 				
+ 				$delete_table .= '<td align="left"><input name="delete_calendar[]" value="'.$cal_tmp.'" type="checkbox" />'.$cal_displayname_tmp.'</td>';
+ 				
+ 				$column++;
+ 			}
+ 			// Print remaining empty columns if necessary
+ 			$number_of_columns = count($filelist);
+ 			while (gettype($number_of_columns/$COLUMNS_TO_PRINT) != "integer") {
+ 				$delete_table .= '<td>&nbsp;</td>';
+ 				$number_of_columns++;
+ 			}
+ 			
+ 			$this->page 	= str_replace('{DELETE_TABLE}', $delete_table, $this->page);
+ 		} else {
+ 			$this->page 	= preg_replace('!<\!-- switch logged_in on -->(.*)<\!-- switch logged_in off -->!is', '', $this->page);
+ 			$this->page 	= preg_replace('!<\!-- switch logged_in2 on -->(.*)<\!-- switch logged_in2 off -->!is', '', $this->page);
+ 		}
+ 	
+ 	}
+ 	
  	function draw_print($template_p) {
  		global $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day, $printview, $dateFormat_day, $timeFormat, $week_start, $week_end, $lang;

[PHPiCalendar-Commits] phpicalendar admin.php,1.15,1.16 print.php,1.25,1.26

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12243

Modified Files:
	admin.php print.php 
Log Message:
Start of admin wiring. Removed unneeded things from print.



Index: admin.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/admin.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** admin.php	19 May 2004 04:09:11 -0000	1.15
--- admin.php	24 May 2004 01:39:42 -0000	1.16
***************
*** 1,5 ****
  <?php
- session_start();
- 
  define('BASE', './');
  require_once(BASE.'functions/admin_functions.php');
--- 1,3 ----
***************
*** 21,27 ****
  // Logout by clearing session variables
  if ((isset($action)) && ($action == "logout")) {
! 	$HTTP_SESSION_VARS['phpical_loggedin'] = FALSE;
! 	unset($HTTP_SESSION_VARS['phpical_username']);
! 	unset($HTTP_SESSION_VARS['phpical_password']);
  }
  
--- 19,25 ----
  // Logout by clearing session variables
  if ((isset($action)) && ($action == "logout")) {
! 	$_SESSION['phpical_loggedin'] = FALSE;
! 	unset($_SESSION['phpical_username']);
! 	unset($_SESSION['phpical_password']);
  }
  
***************
*** 30,36 ****
  if ($auth_method == "none") {
  	$is_loged_in = TRUE;
! }
! // Check if The User is Identified
! else {
  	$is_loged_in = FALSE;
  	
--- 28,32 ----
  if ($auth_method == "none") {
  	$is_loged_in = TRUE;
! } else {
  	$is_loged_in = FALSE;
  	
***************
*** 78,81 ****
--- 74,78 ----
  	'l_delete'			=> $lang['l_delete'],
  	'l_logout'			=> $lang['l_logout'],
+ 	'l_login'			=> $lang['l_login'],
  	'l_submit'			=> $lang['l_submit'],
  	'l_addupdate_cal'	=> $lang['l_addupdate_cal'],
***************
*** 85,88 ****
--- 82,86 ----
  	));
  
+ $page->draw_admin();
  $page->output();
  

Index: print.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** print.php	23 May 2004 23:54:41 -0000	1.25
--- print.php	24 May 2004 01:39:42 -0000	1.26
***************
*** 5,13 ****
  require_once(BASE.'functions/list_functions.php');
  require_once(BASE.'functions/template.php');
- $cal_displayname2 = $calendar_name . " $calendar_lang";
- if (strlen($cal_displayname2) > 24) {
- 	$cal_displayname2 = substr("$cal_displayname2", 0, 21);
- 	$cal_displayname2 = $cal_displayname2 . "...";
- }
  
  $start_week_time 	= strtotime(dateOfWeek($getdate, $week_start_day));
--- 5,8 ----
***************
*** 17,21 ****
  $cal_displayname 	= str_replace("32", " ", $cal);
  $events_week 		= 0;
! $unix_time 			= strtotime("$getdate");
  
  if ($printview == 'day') {
--- 12,16 ----
  $cal_displayname 	= str_replace("32", " ", $cal);
  $events_week 		= 0;
! $unix_time 			= strtotime($getdate);
  
  if ($printview == 'day') {
***************
*** 23,29 ****
  	$next 			= date("Ymd", strtotime("+1 day", $unix_time));
  	$prev 			= date("Ymd", strtotime("-1 day", $unix_time));
- 	$zero_events 	= $no_events_day_lang;
- 	$print_next_nav = $next_day_lang;
- 	$print_prev_nav = $last_day_lang;
  	$week_start		= '';
  	$week_end		= '';
--- 18,21 ----
***************
*** 36,49 ****
  	$next 			= date("Ymd", strtotime("+1 week", $unix_time));
  	$prev 			= date("Ymd", strtotime("-1 week", $unix_time));
- 	$zero_events 	= $no_events_week_lang;
- 	$print_next_nav = $next_week_lang;
- 	$print_prev_nav = $last_week_lang;
  } elseif ($printview == 'month') {
  	$display_date 	= localizeDate ($dateFormat_month, strtotime($getdate));
  	$next 			= date("Ymd", strtotime("+1 month", $unix_time));
  	$prev 			= date("Ymd", strtotime("-1 month", $unix_time));
- 	$zero_events 	= $no_events_month_lang;
- 	$print_next_nav = $next_month_lang;
- 	$print_prev_nav = $last_month_lang;
  	$week_start		= '';
  	$week_end		= '';
--- 28,35 ----

[PHPiCalendar-Commits] phpicalendar/templates/default admin.tpl,1.8,1.9

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12243/templates/default

Modified Files:
	admin.tpl 
Log Message:
Start of admin wiring. Removed unneeded things from print.



Index: admin.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/admin.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin.tpl	19 May 2004 18:26:10 -0000	1.8
--- admin.tpl	24 May 2004 01:39:43 -0000	1.9
***************
*** 28,34 ****
  	<tr>
  		<td align="right">
! 			<!-- switch logged_in on -->
  			<a href="admin.php?action=logout\">{L_LOGOUT}</a>&nbsp;
! 			<!-- switch logged_in off -->
  		</td>
  	</tr>
--- 28,34 ----
  	<tr>
  		<td align="right">
! 			<!-- switch logged_in2 on -->
  			<a href="admin.php?action=logout\">{L_LOGOUT}</a>&nbsp;
! 			<!-- switch logged_in2 off -->
  		</td>
  	</tr>
***************
*** 109,113 ****
  						<b>{L_DELETE_CAL}</b>
  						<form action="admin.php" method="post">
! 							{DELETE_TABLE}
  							<input type="hidden" name="action" value="delete">
  							<p><input type="submit" value="{L_DELETE}"></p>
--- 109,115 ----
  						<b>{L_DELETE_CAL}</b>
  						<form action="admin.php" method="post">
! 							<table width="100%" border="0" cellspacing="0" cellpadding="2" class="G10B">
! 								{DELETE_TABLE}
! 							</table>
  							<input type="hidden" name="action" value="delete">
  							<p><input type="submit" value="{L_DELETE}"></p>

[PHPiCalendar-Commits] phpicalendar print.php,1.24,1.25

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22135

Modified Files:
	print.php 
Log Message:
Month view works in print.



Index: print.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** print.php	19 May 2004 04:19:53 -0000	1.24
--- print.php	23 May 2004 23:54:41 -0000	1.25
***************
*** 83,86 ****
--- 83,87 ----
  	'l_time'			=> $lang['l_time'],
  	'l_summary'			=> $lang['l_summary'],
+ 	'l_description'		=> $lang['l_description'],
  	'l_calendar'		=> $lang['l_calendar'],
  	'l_day'				=> $lang['l_day'],

[PHPiCalendar-Commits] phpicalendar/functions template.php,1.47,1.48

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22135/functions

Modified Files:
	template.php 
Log Message:
Month view works in print.



Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** template.php	23 May 2004 23:31:21 -0000	1.47
--- template.php	23 May 2004 23:54:42 -0000	1.48
***************
*** 19,24 ****
  		preg_match("!<\!-- loop events on -->(.*)<\!-- loop events off -->!is", $this->page, $match1);
  		preg_match("!<\!-- switch some_events on -->(.*)<\!-- loop events on -->!is", $this->page, $match3);
! 		$loop_event	= trim($match1[1]);
! 		$loop_day 	= trim($match3[1]);
  		
  		foreach($master_array as $key => $val) {
--- 19,25 ----
  		preg_match("!<\!-- loop events on -->(.*)<\!-- loop events off -->!is", $this->page, $match1);
  		preg_match("!<\!-- switch some_events on -->(.*)<\!-- loop events on -->!is", $this->page, $match3);
! 		$loop_event		= trim($match1[1]);
! 		$loop_day 		= trim($match3[1]);
! 		$parse_month 	= date ("Ym", strtotime($getdate));
  		
  		foreach($master_array as $key => $val) {
***************
*** 30,34 ****
  				$events_tmp = $loop_event;
  				$day_tmp	= $loop_day;
- 				//echo $dayofmonth;
  				
  				// Pull out each day
--- 31,34 ----

[PHPiCalendar-Commits] phpicalendar/templates/default print.tpl,1.4,1.5

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22135/templates/default

Modified Files:
	print.tpl 
Log Message:
Month view works in print.



Index: print.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/print.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** print.tpl	19 May 2004 18:26:10 -0000	1.4
--- print.tpl	23 May 2004 23:54:42 -0000	1.5
***************
*** 6,10 ****
  			<table width="100%" border="0" cellspacing="0" cellpadding="0">
  				<tr valign="top">
! 					<td align="left" width="400" class="navback"><div style="padding: 5px;"><h1>{DISPLAY_DATE}</h1><br /><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></div></td>
  					<td valign="top" align="right" width="120" class="navback">	
  						<div style="padding-top: 3px;">
--- 6,10 ----
  			<table width="100%" border="0" cellspacing="0" cellpadding="0">
  				<tr valign="top">
! 					<td align="left" width="400" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></td>
  					<td valign="top" align="right" width="120" class="navback">	
  						<div style="padding-top: 3px;">

[PHPiCalendar-Commits] phpicalendar/includes event.php,1.28,1.29

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17654/includes

Modified Files:
	event.php 
Log Message:
Added languages.



Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** event.php	19 May 2004 03:45:09 -0000	1.28
--- event.php	23 May 2004 23:37:38 -0000	1.29
***************
*** 71,75 ****
  	'location' 			=> $location,
  	'cal_title_full'	=> $cal_title_full,
! 	'template'			=> $template
  		
  	));
--- 71,79 ----
  	'location' 			=> $location,
  	'cal_title_full'	=> $cal_title_full,
! 	'template'			=> $template,
! 	'l_organizer'		=> $lang['l_organizer'],
! 	'l_attendee'		=> $lang['l_attendee'],
! 	'l_status'			=> $lang['l_status'],
! 	'l_location'		=> $lang['l_location']
  		
  	));

[PHPiCalendar-Commits] phpicalendar/templates/default day.tpl,1.14,1.15 default.css,1.21,1.22 week.tpl,1.9,1.10

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16355/templates/default

Modified Files:
	day.tpl default.css week.tpl 
Log Message:
Updates to CSS, speed tweeks to template.php



Index: day.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/day.tpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** day.tpl	19 May 2004 18:26:10 -0000	1.14
--- day.tpl	23 May 2004 23:31:22 -0000	1.15
***************
*** 45,53 ****
  					</td>
  				</tr>
! 				<tr>
  					<td>
  						<!-- loop allday on -->
  						<div class="alldaybg_{CALNO}">
! 							{EVENT}
  						</div>
  						<!-- loop allday off -->
--- 45,53 ----
  					</td>
  				</tr>
! 				<tr id="allday">
  					<td>
  						<!-- loop allday on -->
  						<div class="alldaybg_{CALNO}">
! 							{ALLDAY}
  						</div>
  						<!-- loop allday off -->

Index: default.css
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/default.css,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** default.css	20 May 2004 03:59:37 -0000	1.21
--- default.css	23 May 2004 23:31:22 -0000	1.22
***************
*** 30,35 ****
  .eventbg_4	 	{ background-color: #B257A2; padding: 2px;}
  .eventbg_5	 	{ background-color: #D42020; padding: 2px;}
! .eventbg_6	 	{ background-color: #CCB21F; padding: 2px;}
  .eventbg_7	 	{ background-color: #73738C; padding: 2px;}
  
  .eventbg2_1	 		{ background-color: #6699CC; border: 1px solid #557CA3; }
--- 30,37 ----
  .eventbg_4	 	{ background-color: #B257A2; padding: 2px;}
  .eventbg_5	 	{ background-color: #D42020; padding: 2px;}
! .eventbg_6	 	{ background-color: #B88F0B; padding: 2px;}
  .eventbg_7	 	{ background-color: #73738C; padding: 2px;}
+ #allday a		{ font-size: 9px; color: #fff; font-weight: 900; text-decoration:none;}
+ #allday a:hover	{ text-decoration:underline;}
  
  .eventbg2_1	 		{ background-color: #6699CC; border: 1px solid #557CA3; }
***************
*** 38,42 ****
  .eventbg2_4	 		{ background-color: #EA62D4; border: 1px solid #B257A2; }
  .eventbg2_5	 		{ background-color: #FF5E56; border: 1px solid #D42020; }
! .eventbg2_6	 		{ background-color: #FFEB4A; border: 1px solid #CCB21F; }
  .eventbg2_7	 		{ background-color: #9292A1; border: 1px solid #73738C; }
  
--- 40,44 ----
  .eventbg2_4	 		{ background-color: #EA62D4; border: 1px solid #B257A2; }
  .eventbg2_5	 		{ background-color: #FF5E56; border: 1px solid #D42020; }
! .eventbg2_6	 		{ background-color: #CCB21F; border: 1px solid #B88F0B; }
  .eventbg2_7	 		{ background-color: #9292A1; border: 1px solid #73738C; }
  

Index: week.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/week.tpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** week.tpl	20 May 2004 03:59:37 -0000	1.9
--- week.tpl	23 May 2004 23:31:22 -0000	1.10
***************
*** 52,56 ****
  												<!-- loop daysofweek off -->
  											</tr>
! 											<tr valign="top">
  												<td width="60" class="rowOff2" colspan="4"><img src="images/spacer.gif" width="60" height="1" alt=" " /></td>
  												<td width="1"></td>
--- 52,56 ----
  												<!-- loop daysofweek off -->
  											</tr>
! 											<tr valign="top" id="allday">
  												<td width="60" class="rowOff2" colspan="4"><img src="images/spacer.gif" width="60" height="1" alt=" " /></td>
  												<td width="1"></td>
***************
*** 59,63 ****
  													<!-- loop allday on -->
  													<div class="alldaybg_{CALNO}">
! 														<b>{EVENT}</b>
  														<img src="images/spacer.gif" width="80" height="1" alt=" " />
  													</div>
--- 59,63 ----
  													<!-- loop allday on -->
  													<div class="alldaybg_{CALNO}">
! 														{ALLDAY}
  														<img src="images/spacer.gif" width="80" height="1" alt=" " />
  													</div>

[PHPiCalendar-Commits] phpicalendar/templates/default/images allday_6.gif,1.1,1.2 monthdot_6.gif,1.1,1.2

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/templates/default/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16355/templates/default/images

Modified Files:
	allday_6.gif monthdot_6.gif 
Log Message:
Updates to CSS, speed tweeks to template.php



Index: allday_6.gif
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/images/allday_6.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsOxCscK and /tmp/cvsh2Qceh differ

Index: monthdot_6.gif
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/images/monthdot_6.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsCJMalM and /tmp/cvsjew5vj differ

[PHPiCalendar-Commits] phpicalendar/functions template.php,1.46,1.47

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16355/functions

Modified Files:
	template.php 
Log Message:
Updates to CSS, speed tweeks to template.php



Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** template.php	23 May 2004 05:36:30 -0000	1.46
--- template.php	23 May 2004 23:31:21 -0000	1.47
***************
*** 23,28 ****
  		
  		foreach($master_array as $key => $val) {
! 			ereg ("([0-9]{6})([0-9]{2})", $key, $regs);
! 			if ((($regs[1] == $parse_month) && ($printview == "month")) || (($key == $getdate) && ($printview == "day")) || ((($key >= $week_start) && ($key <= $week_end)) && ($printview == "week"))) {
  				$events_week++;
  				$dayofmonth = strtotime ($key);
--- 23,28 ----
  		
  		foreach($master_array as $key => $val) {
! 			preg_match ('/([0-9]{6})([0-9]{2})/', $key, $regs);
! 			if ((($regs[1] == $parse_month) && ($printview == 'month')) || (($key == $getdate) && ($printview == 'day')) || ((($key >= $week_start) && ($key <= $week_end)) && ($printview == 'week'))) {
  				$events_week++;
  				$dayofmonth = strtotime ($key);
***************
*** 35,48 ****
  				foreach ($val as $new_val) {
  					foreach ($new_val as $new_key2 => $new_val2) {
! 					if ($new_val2["event_text"]) {	
! 						$event_text 	= stripslashes(urldecode($new_val2["event_text"]));
! 						$description 	= stripslashes(urldecode($new_val2["description"]));
! 						$event_start 	= $new_val2["event_start"];
! 						$event_end 		= $new_val2["event_end"];
! 						if (isset($new_val2["display_end"])) $event_end = $new_val2["display_end"];
  							$event_start 	= date ($timeFormat, strtotime ($event_start));
  							$event_end 		= date ($timeFormat, strtotime ($event_end));
! 							$event_start 	= "$event_start - $event_end";
! 							if (!$new_val2["event_start"]) { 
  								$event_start = $lang['l_all_day'];
  								$event_start2 = '';
--- 35,48 ----
  				foreach ($val as $new_val) {
  					foreach ($new_val as $new_key2 => $new_val2) {
! 					if ($new_val2['event_text']) {	
! 						$event_text 	= stripslashes(urldecode($new_val2['event_text']));
! 						$description 	= stripslashes(urldecode($new_val2['description']));
! 						$event_start 	= $new_val2['event_start'];
! 						$event_end 		= $new_val2['event_end'];
! 						if (isset($new_val2['display_end'])) $event_end = $new_val2['display_end'];
  							$event_start 	= date ($timeFormat, strtotime ($event_start));
  							$event_end 		= date ($timeFormat, strtotime ($event_end));
! 							$event_start 	= $event_start .' - '.$event_end;
! 							if (!$new_val2['event_start']) { 
  								$event_start = $lang['l_all_day'];
  								$event_start2 = '';
***************
*** 122,127 ****
  					if ($event_calno < 1) $event_calno=1;
  					if ($event_calno > 7) $event_calno=7;
! 					$event 			= openevent($event_calna, '', '', $allday, 1, 11, '<span class="V9W">', '</span>', 'psf', $event_url);
! 					$loop_tmp 		= str_replace('{EVENT}', $event, $loop_ad);
  					$loop_tmp 		= str_replace('{CALNO}', $event_calno, $loop_tmp);
  					$replace		.= $loop_tmp;
--- 122,127 ----
  					if ($event_calno < 1) $event_calno=1;
  					if ($event_calno > 7) $event_calno=7;
! 					$event 			= openevent($event_calna, '', '', $allday, 1, 11, '', '', 'psf', $event_url);
! 					$loop_tmp 		= str_replace('{ALLDAY}', $event, $loop_ad);
  					$loop_tmp 		= str_replace('{CALNO}', $event_calno, $loop_tmp);
  					$replace		.= $loop_tmp;
***************
*** 174,178 ****
  		$event_length = array ();
  		$border = 0;
! 		ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $getdate, $day_array2);
  		$this_day = $day_array2[3]; 
  		$this_month = $day_array2[2];
--- 174,178 ----
  		$event_length = array ();
  		$border = 0;
! 		preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})/', $getdate, $day_array2);
  		$this_day = $day_array2[3]; 
  		$this_month = $day_array2[2];
***************
*** 186,190 ****
  		foreach ($day_array as $key) {
  			$cal_time = $key;	
! 			ereg('([0-9]{2})([0-9]{2})', $key, $regs_tmp);
  			$key = mktime($regs_tmp[1],$regs_tmp[2],0,$this_month,$this_day,$this_year);
  			$key = date ($timeFormat, $key);
--- 186,190 ----
  		foreach ($day_array as $key) {
  			$cal_time = $key;	
! 			preg_match('/([0-9]{2})([0-9]{2})/', $key, $regs_tmp);
  			$key = mktime($regs_tmp[1],$regs_tmp[2],0,$this_month,$this_day,$this_year);
  			$key = date ($timeFormat, $key);
***************
*** 217,221 ****
  				}
  					
! 				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') {
--- 217,221 ----
  				}
  					
! 				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') {
***************
*** 346,351 ****
  				if ($event_calno < 1) $event_calno=1;
  				if ($event_calno > 7) $event_calno=7;
! 				$event 			= openevent($event_calna, '', '', $allday, 0, '', '<span class="V10WB">', '</span>', 'psf', $event_url);
! 				$loop_tmp 		= str_replace('{EVENT}', $event, $loop_ad);
  				$loop_tmp 		= str_replace('{CALNO}', $event_calno, $loop_tmp);
  				$replace		.= $loop_tmp;
--- 346,351 ----
  				if ($event_calno < 1) $event_calno=1;
  				if ($event_calno > 7) $event_calno=7;
! 				$event 			= openevent($event_calna, '', '', $allday, 0, '', '', '', '', $event_url);
! 				$loop_tmp 		= str_replace('{ALLDAY}', $event, $loop_ad);
  				$loop_tmp 		= str_replace('{CALNO}', $event_calno, $loop_tmp);
  				$replace		.= $loop_tmp;
***************
*** 405,414 ****
  		$event_length = array ();
  		$border = 0;
! 		ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $getdate, $day_array2);
  		$this_day = $day_array2[3]; 
  		$this_month = $day_array2[2];
  		$this_year = $day_array2[1];
  		foreach ($day_array as $key) {
! 			ereg('([0-9]{2})([0-9]{2})', $key, $regs_tmp);
  			$cal_time = $key;
  			$key = mktime($regs_tmp[1],$regs_tmp[2],0,$this_month,$this_day,$this_year);
--- 405,414 ----
  		$event_length = array ();
  		$border = 0;
! 		preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})/', $getdate, $day_array2);
  		$this_day = $day_array2[3]; 
  		$this_month = $day_array2[2];
  		$this_year = $day_array2[1];
  		foreach ($day_array as $key) {
! 			preg_match('/([0-9]{2})([0-9]{2})/', $key, $regs_tmp);
  			$cal_time = $key;
  			$key = mktime($regs_tmp[1],$regs_tmp[2],0,$this_month,$this_day,$this_year);
***************
*** 453,461 ****
  				}
  			}
! 			if (ereg('([0-9]{1,2}):00', $key)) {
  				$daydisplay .= '<tr>'."\n";
  				$daydisplay .= '<td rowspan="' . (60 / $gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'."\n";
  				$daydisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $gridLength . '"></td>'."\n";
! 			} elseif("$cal_time" == "$day_start") {
  				$size_tmp = 60 - (int)substr($cal_time,2,2);
  				$daydisplay .= '<tr>'."\n";
--- 453,461 ----
  				}
  			}
! 			if (preg_match('/([0-9]{1,2}):00/', $key)) {
  				$daydisplay .= '<tr>'."\n";
  				$daydisplay .= '<td rowspan="' . (60 / $gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'."\n";
  				$daydisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $gridLength . '"></td>'."\n";
! 			} elseif($cal_time == $day_start) {
  				$size_tmp = 60 - (int)substr($cal_time,2,2);
  				$daydisplay .= '<tr>'."\n";

[PHPiCalendar-Commits] phpicalendar README,1.65,1.66 config.inc.php,1.142,1.143

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20922

Modified Files:
	README config.inc.php 
Log Message:
Added cache for All Combined.



Index: README
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/README,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** README	20 May 2004 20:04:09 -0000	1.65
--- README	23 May 2004 08:23:44 -0000	1.66
***************
*** 101,104 ****
--- 101,105 ----
  	-RSS respects $calendar_path.
  	-YEARLY repeating events display better.
+ 	-All Calendars Combined can now be cached for greater performance.
  	-Various bug fixes.
  	

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.142
retrieving revision 1.143
diff -C2 -d -r1.142 -r1.143
*** config.inc.php	20 May 2004 20:04:12 -0000	1.142
--- config.inc.php	23 May 2004 08:23:44 -0000	1.143
***************
*** 31,35 ****
  
  // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
! $save_parsed_cals 		= 'no';			// Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
  $display_custom_goto 	= 'no';				// In the 'Jump To' box, display the custom 'go to day' box.
  $display_ical_list 		= 'yes';			// In the 'Jump To' box, display the pop-up menu with the list of all calendars in the $calendar_path directory.
--- 31,35 ----
  
  // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
! $save_parsed_cals 		= 'yes';			// Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
  $display_custom_goto 	= 'no';				// In the 'Jump To' box, display the custom 'go to day' box.
  $display_ical_list 		= 'yes';			// In the 'Jump To' box, display the pop-up menu with the list of all calendars in the $calendar_path directory.