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: <cl...@us...> - 2003-11-17 19:49:09
|
Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv18923
Modified Files:
month.php
Log Message:
Closed a missing </div> tag.
Index: month.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** month.php 16 Nov 2003 06:09:09 -0000 1.100
--- month.php 17 Nov 2003 19:48:05 -0000 1.101
***************
*** 145,148 ****
--- 145,149 ----
}
}
+ echo '</div>';
echo '</td>';
} else {
|
|
From: <cl...@us...> - 2003-11-17 19:41:29
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv16003 Modified Files: search.php Log Message: Fixed odd s line Index: search.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/search.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** search.php 26 Sep 2003 16:10:42 -0000 1.23 --- search.php 17 Nov 2003 19:40:30 -0000 1.24 *************** *** 19,23 **** $search_box = ''; - s $search_box .= '<form action="search.php" method="GET">'."\n". --- 19,22 ---- |
|
From: <cl...@us...> - 2003-11-17 18:03:20
|
Update of /cvsroot/phpicalendar/phpicalendar/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv28600/languages
Modified Files:
french.inc.php korean.inc.php
Log Message:
Additional Languages.
Index: french.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/french.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** french.inc.php 13 Nov 2003 17:33:23 -0000 1.23
--- french.inc.php 17 Nov 2003 18:02:34 -0000 1.24
***************
*** 2,6 ****
// French language include
! // For version 0.9.2 PHP iCalendar
//
// Translation by La Shampouineuse (in...@la...)
--- 2,6 ----
// French language include
! // For version 0.9.5 PHP iCalendar
//
// Translation by La Shampouineuse (in...@la...)
***************
*** 11,79 ****
$week_lang = 'Semaine';
$month_lang = 'Mois';
! $year_lang = 'Année';
$calendar_lang = 'Calendrier';
$next_day_lang = 'Jour suivant';
$next_month_lang = 'Mois suivant';
$next_week_lang = 'Semaine suivante';
! $next_year_lang = 'Année suivante';
! $last_day_lang = 'Jour précédent';
! $last_month_lang = 'Mois précédent';
! $last_week_lang = 'Semaine précédente';
! $last_year_lang = 'Année précédente';
$subscribe_lang = 'Souscrire';
! $download_lang = 'Télécharger';
$powered_by_lang = 'Produit avec';
! $event_lang = 'Événement';
! $event_start_lang = 'Début';
$event_end_lang = 'Fin';
! $this_months_lang = 'Événements de ce mois';
$date_lang = 'Date';
! $summary_lang = 'Résumé';
! $all_day_lang = 'Événement quotidien';
$notes_lang = 'Notes';
! $this_years_lang = 'Événements de cette anné';
$today_lang = 'Aujourd\'hui';
$this_week_lang = 'Cette semaine';
$this_month_lang = 'Ce mois';
$jump_lang = 'Voir';
! $tomorrows_lang = 'Événements de demain';
$goday_lang = 'Voir aujourd\'hui';
$goweek_lang = 'Voir cette semaine';
$gomonth_lang = 'Voir ce mois';
! $goyear_lang = 'Voir cette année';
$search_lang = 'Recherche'; // the verb
! $results_lang = 'Résultats de la recherche';
! $query_lang = 'Requête: '; // will be followed by the search query
! $no_results_lang = 'Aucun événement trouvé';
$goprint_lang = 'Version imprimable';
$time_lang = 'Heure';
! $summary_lang = 'Résumé';
$description_lang = 'Description';
$this_site_is_lang = 'Ce site est';
! $no_events_day_lang = 'Pas d\'événement aujourd\'hui.';
! $no_events_week_lang = 'Pas d\'événement cette semaine.';
! $no_events_month_lang = 'Pas d\'événement ce mois-ci.';
$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 = 'en-us';
$search_took_lang = 'La recherche a pris %s secondes';
! $recurring_event_lang = 'Événement récurent';
$exception_lang = 'Exception';
! $no_query_lang = 'Aucune requête';
! $preferences_lang = 'Préférences';
$printer_lang = 'Imprimante';
! $select_lang_lang = 'Choisissez votre language par défaut:';
! $select_cal_lang = 'Choisissez votre calendrier par défaut:';
! $select_view_lang = 'Choisissez votre vue par défaut:';
! $select_time_lang = 'Choisissez votre heure de début par défaut:';
! $select_day_lang = 'Choisissez votre jour de début de semaine:';
! $select_style_lang = 'Choisissez votre style par défaut:';
! $set_prefs_lang = 'Enregistrer les préférences';
! $completed_date_lang = 'Terminé le';
! $completed_lang = 'Terminé';
! $created_lang = 'Créé:';
$due_lang = 'Fin:';
! $priority_lang = 'Priorité:';
$priority_high_lang = 'Haute';
$priority_low_lang = 'Basse';
--- 11,79 ----
$week_lang = 'Semaine';
$month_lang = 'Mois';
! $year_lang = 'Année';
$calendar_lang = 'Calendrier';
$next_day_lang = 'Jour suivant';
$next_month_lang = 'Mois suivant';
$next_week_lang = 'Semaine suivante';
! $next_year_lang = 'Année suivante';
! $last_day_lang = 'Jour précédent';
! $last_month_lang = 'Mois précédent';
! $last_week_lang = 'Semaine précédente';
! $last_year_lang = 'Année précédente';
$subscribe_lang = 'Souscrire';
! $download_lang = 'Télécharger';
$powered_by_lang = 'Produit avec';
! $event_lang = 'Ãvénement';
! $event_start_lang = 'Début';
$event_end_lang = 'Fin';
! $this_months_lang = 'Ãvénements de ce mois';
$date_lang = 'Date';
! $summary_lang = 'Résumé';
! $all_day_lang = 'Ãvénement quotidien';
$notes_lang = 'Notes';
! $this_years_lang = 'Ãvénements de cette anné';
$today_lang = 'Aujourd\'hui';
$this_week_lang = 'Cette semaine';
$this_month_lang = 'Ce mois';
$jump_lang = 'Voir';
! $tomorrows_lang = 'Ãvénements de demain';
$goday_lang = 'Voir aujourd\'hui';
$goweek_lang = 'Voir cette semaine';
$gomonth_lang = 'Voir ce mois';
! $goyear_lang = 'Voir cette année';
$search_lang = 'Recherche'; // the verb
! $results_lang = 'Résultats de la recherche';
! $query_lang = 'Requête: '; // will be followed by the search query
! $no_results_lang = 'Aucun événement trouvé';
$goprint_lang = 'Version imprimable';
$time_lang = 'Heure';
! $summary_lang = 'Résumé';
$description_lang = 'Description';
$this_site_is_lang = 'Ce site est';
! $no_events_day_lang = 'Pas d\'événement aujourd\'hui.';
! $no_events_week_lang = 'Pas d\'événement cette semaine.';
! $no_events_month_lang = 'Pas d\'événement ce mois-ci.';
$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 = 'fr-fr';
$search_took_lang = 'La recherche a pris %s secondes';
! $recurring_event_lang = 'Ãvénement récurent';
$exception_lang = 'Exception';
! $no_query_lang = 'Aucune requête';
! $preferences_lang = 'Préférences';
$printer_lang = 'Imprimante';
! $select_lang_lang = 'Choisissez votre language par défaut:';
! $select_cal_lang = 'Choisissez votre calendrier par défaut:';
! $select_view_lang = 'Choisissez votre vue par défaut:';
! $select_time_lang = 'Choisissez votre heure de début par défaut:';
! $select_day_lang = 'Choisissez votre jour de début de semaine:';
! $select_style_lang = 'Choisissez votre style par défaut:';
! $set_prefs_lang = 'Enregistrer les préférences';
! $completed_date_lang = 'Terminé le';
! $completed_lang = 'Terminé';
! $created_lang = 'Créé:';
$due_lang = 'Fin:';
! $priority_lang = 'Priorité:';
$priority_high_lang = 'Haute';
$priority_low_lang = 'Basse';
***************
*** 81,85 ****
$priority_none_lang = 'Aucune';
$status_lang = 'Status:';
! $todo_lang = 'Tâches à faire';
$unfinished_lang = 'Non faites';
$organizer_lang = 'Organizer';
--- 81,85 ----
$priority_none_lang = 'Aucune';
$status_lang = 'Status:';
! $todo_lang = 'Tâches à faire';
$unfinished_lang = 'Non faites';
$organizer_lang = 'Organizer';
***************
*** 87,129 ****
$status_lang = 'Status';
$location_lang = 'Location';
! $admin_header_lang = 'PHP iCalendar Administration';
! $username_lang = 'Username';
! $password_lang = 'Password';
! $login_lang = 'Login';
! $invalid_login_lang = 'Wrong username or password.';
! $addupdate_cal_lang = 'Add or Update a Calendar';
! $addupdate_desc_lang = 'Add a calendar by uploading a new file. Update a calendar by uploading a file of the same name.';
! $delete_cal_lang = 'Delete a Calendar';
! $logout_lang = 'Logout';
! $cal_file_lang = 'Calendar File';
! $php_error_lang = 'PHP Error';
! $upload_error_gen_lang = 'There was a problem with your upload.';
! $upload_error_lang[0] = 'There was a problem with your upload.';
! $upload_error_lang[1] = 'The file you are trying to upload is too big.';
! $upload_error_lang[2] = 'The file you are trying to upload is too big.';
! $upload_error_lang[3] = 'The file you are trying upload was only partially uploaded.';
! $upload_error_lang[4] = 'You must select a file for upload.';
! $upload_error_type_lang = 'Only .ics files may be uploaded.';
! $copy_error_lang = 'Failed to copy file';
! $delete_error_lang = 'Failed to delete file';
! $delete_success_lang = 'was deleted successfully.';
! $action_success_lang = 'Your action was successful.';
! $submit_lang = 'Submit';
! $delete_lang = 'Delete';
! // ----- New for 0.9.5
! $all_cal_comb_lang = 'All calendars combined';
// - navigation
$back_lang = 'Retour';
$next_lang = 'Suivant';
! $prev_lang = 'Précédent';
$day_view_lang = 'Vue Journaliere';
$week_view_lang = 'Vue Hebdomadaire';
$month_view_lang = 'Vue Mensuelle';
$year_view_lang = 'Vue Annuelle';
! $prefs_set_lang = 'Vos préférences ont été enregistrées';
! $prefs_unset_lang = 'Préférences non définies. Les Changements seront pris en compte au prochain chargement de la page.';
! $unset_prefs_lang = 'Préférences non définies:';
--- 87,129 ----
$status_lang = 'Status';
$location_lang = 'Location';
! $admin_header_lang = 'Administration de PHP iCalendar';
! $username_lang = 'Utilisateur';
! $password_lang = 'Mot de passe';
! $login_lang = 'Connexion';
! $invalid_login_lang = 'Mauvais utilisateur ou mot de passe.';
! $addupdate_cal_lang = 'Ajouter ou mettre à jour un calendrier';
! $addupdate_desc_lang = 'Ajout d\'un calendrier en téléchargeant un nouveau fichier. Mettre à jour un calendrier en téléchargeant un fichier du même nom.';
! $delete_cal_lang = 'Effacer un calendrier';
! $logout_lang = 'Deconnexion';
! $cal_file_lang = 'Fichier calendrier';
! $php_error_lang = 'Erreur PHP';
! $upload_error_gen_lang = 'Il y a eut un problème avec votre téléchargement.';
! $upload_error_lang[0] = 'Il y a eut un problème avec votre téléchargement.';
! $upload_error_lang[1] = 'Le fichier que vous envoyez est trop gros.';
! $upload_error_lang[2] = 'Le fichier que vous envoyez est trop gros.';
! $upload_error_lang[3] = 'Le fichier que vous envoyez a été partiellement envoyé.';
! $upload_error_lang[4] = 'Vous devez selectionner un fichier à envoyer.';
! $upload_error_type_lang = 'Seuls les fichiers en .ics peuvent être ajoutés.';
! $copy_error_lang = 'La copie du fichier a échoué';
! $delete_error_lang = 'La suppression du fichier a échoué';
! $delete_success_lang = 'a été effacé avec succès.';
! $action_success_lang = 'Action effectuée avec succès.';
! $submit_lang = 'Envoyer';
! $delete_lang = 'Supprimer';
! // ----- New for 0.9.4
! $all_cal_comb_lang = 'Tous les calendriers';
// - navigation
$back_lang = 'Retour';
$next_lang = 'Suivant';
! $prev_lang = 'Précédent';
$day_view_lang = 'Vue Journaliere';
$week_view_lang = 'Vue Hebdomadaire';
$month_view_lang = 'Vue Mensuelle';
$year_view_lang = 'Vue Annuelle';
! $prefs_set_lang = 'Vos préférences ont été enregistrées';
! $prefs_unset_lang = 'Préférences non définies. Les Changements seront pris en compte au prochain chargement de la page.';
! $unset_prefs_lang = 'Préférences non définies:';
***************
*** 154,159 ****
$daysofweekshort_lang = array ('Dim','Lun','Mar','Mer','Jeu','Ven','Sam');
$daysofweekreallyshort_lang = array ('D','L','M','M','J','V','S');
! $monthsofyear_lang = array ('Janvier','Février','Mars','Avril','Mai','Juin','Juillet','Août','Septembre','Octobre','Novembre','Décembre');
! $monthsofyearshort_lang = array ('jan','fév','mar','avr','mai','juin','juil','aoû','sep','oct','nov','déc');
--- 154,159 ----
$daysofweekshort_lang = array ('Dim','Lun','Mar','Mer','Jeu','Ven','Sam');
$daysofweekreallyshort_lang = array ('D','L','M','M','J','V','S');
! $monthsofyear_lang = array ('Janvier','Février','Mars','Avril','Mai','Juin','Juillet','Août','Septembre','Octobre','Novembre','Décembre');
! $monthsofyearshort_lang = array ('jan','fév','mar','avr','mai','juin','juil','aoû','sep','oct','nov','déc');
***************
*** 192,198 ****
$error_calendar_lang = 'L\'erreur s\'est produite lors du traitement du calendrier "%s".';
$error_path_lang = 'Impossible d\'ouvrir le chemin: "%s"';
! $error_back_lang = 'Veuillez utiliser le bouton "Retour" pour revenir en arrière.';
! $error_remotecal_lang = 'Ce serveur refuse les calendriers distants non approuvés.';
! $error_restrictedcal_lang = 'Vous avez essayé d\'utiliser un calendrier dont les permissions sont restreintes sur ce serveur.';
$error_invalidcal_lang = 'Fichier calendrier invalide. Veuillez utiliser un autre calendrier.';
--- 192,198 ----
$error_calendar_lang = 'L\'erreur s\'est produite lors du traitement du calendrier "%s".';
$error_path_lang = 'Impossible d\'ouvrir le chemin: "%s"';
! $error_back_lang = 'Veuillez utiliser le bouton "Retour" pour revenir en arrière.';
! $error_remotecal_lang = 'Ce serveur refuse les calendriers distants non approuvés.';
! $error_restrictedcal_lang = 'Vous avez essayé d\'utiliser un calendrier dont les permissions sont restreintes sur ce serveur.';
$error_invalidcal_lang = 'Fichier calendrier invalide. Veuillez utiliser un autre calendrier.';
Index: korean.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/korean.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** korean.inc.php 13 Nov 2003 17:33:23 -0000 1.2
--- korean.inc.php 17 Nov 2003 18:02:34 -0000 1.3
***************
*** 1,6 ****
! <?php
// Korean language include
! // For version 0.9.1 PHP iCalendar
//
// Translation by TaeYoung Oh (sp...@hy...)
--- 1,6 ----
! <?php
// Korean language include
! // For version 0.9.5 PHP iCalendar
//
// Translation by TaeYoung Oh (sp...@hy...)
***************
*** 115,120 ****
$delete_lang = 'ìì ';
! // ----- New for 0.9.5
! $all_cal_comb_lang = '모ë ë¬ë ¥ì´ íµí©ëììµëë¤';
// - navigation
--- 115,120 ----
$delete_lang = 'ìì ';
! // ----- New for 0.9.4
! $all_cal_comb_lang = '모ë ë¬ë ¥ í©ì³ë³´ê¸°';
// - navigation
***************
*** 133,143 ****
$format_recur_lang['delimiter'] = ', '; // ie, 'one, two, three'
! $format_recur_lang['yearly'] = array('ë
','ë
'); // for these, put singular
! $format_recur_lang['monthly'] = array('ì','ì'); // and plural forms
! $format_recur_lang['weekly'] = array('주','주'); // these will be %freq%
! $format_recur_lang['daily'] = array('ì¼','ì¼'); // in the replacement below
! $format_recur_lang['hourly'] = array('ìê°','ìê°');
! $format_recur_lang['minutely'] = array('ë¶','ë¶');
! $format_recur_lang['secondly'] = array('ì´','ì´');
$format_recur_lang['start'] = '매 %int% %freq% %for%'; // ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
--- 133,143 ----
$format_recur_lang['delimiter'] = ', '; // ie, 'one, two, three'
! $format_recur_lang['yearly'] = array('year','years'); // for these, put singular
! $format_recur_lang['monthly'] = array('month','months'); // and plural forms
! $format_recur_lang['weekly'] = array('week','weeks'); // these will be %freq%
! $format_recur_lang['daily'] = array('day','days'); // in the replacement below
! $format_recur_lang['hourly'] = array('hour','hours');
! $format_recur_lang['minutely'] = array('minute','minutes');
! $format_recur_lang['secondly'] = array('second','seconds');
$format_recur_lang['start'] = '매 %int% %freq% %for%'; // ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
|
|
From: <cl...@us...> - 2003-11-17 18:03:20
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv28600 Modified Files: config.inc.php Log Message: Additional Languages. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.120 retrieving revision 1.121 diff -C2 -d -r1.120 -r1.121 *** config.inc.php 16 Nov 2003 07:02:37 -0000 1.120 --- config.inc.php 17 Nov 2003 18:02:34 -0000 1.121 *************** *** 10,14 **** $minical_view = 'current'; // Where do the mini-calendars go when clicked? = 'day', 'week', 'month', 'current' $default_cal = $ALL_CALENDARS_COMBINED; // Exact filename of calendar without .ics. Or set to $ALL_CALENDARS_COMBINED to open all calenders combined into one. ! $language = 'English'; // Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto' $week_start_day = 'Sunday'; // Day of the week your week starts on $day_start = '0700'; // Start time for day grid --- 10,14 ---- $minical_view = 'current'; // Where do the mini-calendars go when clicked? = 'day', 'week', 'month', 'current' $default_cal = $ALL_CALENDARS_COMBINED; // Exact filename of calendar without .ics. Or set to $ALL_CALENDARS_COMBINED to open all calenders combined into one. ! $language = 'English'; // Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto', 'Korean' $week_start_day = 'Sunday'; // Day of the week your week starts on $day_start = '0700'; // Start time for day grid |
|
From: <cl...@us...> - 2003-11-16 07:20:27
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv28502a/functions Modified Files: ical_parser.php Log Message: Added some unset vars. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.127 retrieving revision 1.128 diff -C2 -d -r1.127 -r1.128 *** ical_parser.php 16 Nov 2003 06:20:08 -0000 1.127 --- ical_parser.php 16 Nov 2003 07:19:43 -0000 1.128 *************** *** 97,101 **** $allday_start, $allday_end, $start, $end, $the_duration, $beginning, $rrule_array, $start_of_vevent, $description, ! $valarm_description, $start_unixtime, $end_unixtime, $recurrence_id, $uid, $class, $location, $rrule, $abs_until, $until_check ); --- 97,101 ---- $allday_start, $allday_end, $start, $end, $the_duration, $beginning, $rrule_array, $start_of_vevent, $description, ! $valarm_description, $start_unixtime, $end_unixtime, $display_end_tmp, $end_time_tmp1, $recurrence_id, $uid, $class, $location, $rrule, $abs_until, $until_check ); |
|
From: <cl...@us...> - 2003-11-16 07:05:17
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory sc8-pr-cvs1:/tmp/cvs-serv27065 Removed Files: LACW.ics Log Message: Cal removal --- LACW.ics DELETED --- |
|
From: <cl...@us...> - 2003-11-16 07:03:22
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory sc8-pr-cvs1:/tmp/cvs-serv26903/calendars Removed Files: 831527.ics Log Message: Getting ready for 0.9.5 --- 831527.ics DELETED --- |
|
From: <cl...@us...> - 2003-11-16 07:03:22
|
Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv26903
Modified Files:
config.inc.php print.php
Log Message:
Getting ready for 0.9.5
Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -d -r1.119 -r1.120
*** config.inc.php 16 Nov 2003 06:13:57 -0000 1.119
--- config.inc.php 16 Nov 2003 07:02:37 -0000 1.120
***************
*** 33,37 ****
// Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
! $save_parsed_cals = 'no'; // Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
$use_sessions = 'no'; // This has not yet been implemented.
$display_custom_goto = 'no'; // In the 'Jump To' box, display the custom 'go to day' box.
--- 33,37 ----
// 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.
$use_sessions = 'no'; // This has not yet been implemented.
$display_custom_goto = 'no'; // In the 'Jump To' box, display the custom 'go to day' box.
Index: print.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** print.php 20 Sep 2003 21:46:17 -0000 1.19
--- print.php 16 Nov 2003 07:02:37 -0000 1.20
***************
*** 116,119 ****
--- 116,120 ----
$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"));
|
|
From: <cl...@us...> - 2003-11-16 06:20:52
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv22015/functions
Modified Files:
ical_parser.php
Log Message:
Corrected a mistake with overlaps and newly installed bleed time.
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** ical_parser.php 16 Nov 2003 06:12:39 -0000 1.126
--- ical_parser.php 16 Nov 2003 06:20:08 -0000 1.127
***************
*** 273,277 ****
// This if statement should prevent writing of an excluded date if its the first recurrance - CL
if (!in_array($start_date, $except_dates)) {
! $nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time, $uid);
$master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber );
if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true;
--- 273,277 ----
// This if statement should prevent writing of an excluded date if its the first recurrance - CL
if (!in_array($start_date, $except_dates)) {
! $nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time_tmp1, $uid);
$master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber );
if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true;
***************
*** 617,621 ****
$until_check = $recur_data_date.$hour.$minute.'00';
if ($abs_until > $until_check) {
! $nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time, $uid);
$master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber);
}
--- 617,621 ----
$until_check = $recur_data_date.$hour.$minute.'00';
if ($abs_until > $until_check) {
! $nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time_tmp1, $uid);
$master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber);
}
|
|
From: <cl...@us...> - 2003-11-16 06:14:38
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv21085 Modified Files: config.inc.php Log Message: changed default bleed time to 0200. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.118 retrieving revision 1.119 diff -C2 -d -r1.118 -r1.119 *** config.inc.php 16 Nov 2003 06:09:09 -0000 1.118 --- config.inc.php 16 Nov 2003 06:13:57 -0000 1.119 *************** *** 25,29 **** $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. ! $bleed_time = '0000'; // This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359' // Advanced settings for custom installs, cookies, etc. --- 25,29 ---- $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. ! $bleed_time = '0200'; // This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359' // Advanced settings for custom installs, cookies, etc. |
|
From: <cl...@us...> - 2003-11-16 06:13:22
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv20963/functions
Modified Files:
ical_parser.php
Log Message:
Initial bleed time checkin
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** ical_parser.php 15 Nov 2003 19:22:07 -0000 1.125
--- ical_parser.php 16 Nov 2003 06:12:39 -0000 1.126
***************
*** 108,112 ****
$count = 1000000;
$valarm_set = FALSE;
- $firstday = FALSE;
$attendee = array();
$organizer = array();
--- 108,111 ----
***************
*** 185,190 ****
--- 184,191 ----
if (isset($start_unixtime,$end_unixtime) && date('d',$start_unixtime) != date('d',$end_unixtime)) {
$spans_day = true;
+ $bleed_check = ((date('d',$start_unixtime)) - (date('d',$end_unixtime)));
} else {
$spans_day = false;
+ $bleed_check = 0;
}
if (isset($start_time) && $start_time != '') {
***************
*** 240,244 ****
// Handling regular events
if ((isset($start_time) && $start_time != '') && (!isset($allday_start) || $allday_start == '')) {
! if ($spans_day) {
$start_tmp = strtotime(date('Ymd',$start_unixtime));
$end_date_tmp = date('Ymd',$end_unixtime);
--- 241,245 ----
// Handling regular events
if ((isset($start_time) && $start_time != '') && (!isset($allday_start) || $allday_start == '')) {
! if (($end_time > $bleed_time) && ($bleed_check == '-1')) {
$start_tmp = strtotime(date('Ymd',$start_unixtime));
$end_date_tmp = date('Ymd',$end_unixtime);
***************
*** 248,268 ****
$time_tmp = $hour.$minute;
$start_time_tmp = $start_time;
- $end_time_tmp = '0000';
} else {
$time_tmp = '0000';
$start_time_tmp = '0000';
$end_time_tmp = $end_time;
}
-
$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
! $master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee) );
$start_tmp = strtotime('+1 day',$start_tmp);
}
if (!$write_processed) $master_array[$start_date][($hour.$minute)][$uid]['exception'] = true;
} else {
// This if statement should prevent writing of an excluded date if its the first recurrance - CL
if (!in_array($start_date, $except_dates)) {
$nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time, $uid);
! $master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber );
if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true;
}
--- 249,278 ----
$time_tmp = $hour.$minute;
$start_time_tmp = $start_time;
} else {
$time_tmp = '0000';
$start_time_tmp = '0000';
+ }
+ if ($start_date_tmp == $end_date_tmp) {
$end_time_tmp = $end_time;
+ } else {
+ $end_time_tmp = '0000';
}
$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
! $master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee) );
$start_tmp = strtotime('+1 day',$start_tmp);
}
if (!$write_processed) $master_array[$start_date][($hour.$minute)][$uid]['exception'] = true;
} else {
+ if ($bleed_check == '-1') {
+ $display_end_tmp = $end_time;
+ $end_time_tmp1 = '2400';
+ }
+
+ if (!isset($end_time_tmp1)) $end_time_tmp1 = $end_time;
+
// This if statement should prevent writing of an excluded date if its the first recurrance - CL
if (!in_array($start_date, $except_dates)) {
$nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time, $uid);
! $master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber );
if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true;
}
***************
*** 575,606 ****
$end_unixtime_tmp = $start_unixtime_tmp + $length;
! if ($spans_day) {
$start_tmp = strtotime(date('Ymd',$start_unixtime_tmp));
$end_date_tmp = date('Ymd',$end_unixtime_tmp);
while ($start_tmp < $end_unixtime_tmp) {
$start_date_tmp = date('Ymd',$start_tmp);
! if (($start_date_tmp == $start_date) || ($firstday == FALSE)) {
$time_tmp = $hour.$minute;
$start_time_tmp = $start_time;
- $end_time_tmp = '0000';
- $firstday = TRUE;
} else {
$time_tmp = '0000';
$start_time_tmp = '0000';
$end_time_tmp = $end_time;
! $firstday = FALSE;
}
-
$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
! $master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber);
$start_tmp = strtotime('+1 day',$start_tmp);
}
} else {
// Let's double check the until to not write past it
$until_check = $recur_data_date.$hour.$minute.'00';
if ($abs_until > $until_check) {
$nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time, $uid);
! $master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber);
}
}
--- 585,622 ----
$end_unixtime_tmp = $start_unixtime_tmp + $length;
! if (($end_time > $bleed_time) && ($bleed_check == '-1')) {
$start_tmp = strtotime(date('Ymd',$start_unixtime_tmp));
$end_date_tmp = date('Ymd',$end_unixtime_tmp);
while ($start_tmp < $end_unixtime_tmp) {
$start_date_tmp = date('Ymd',$start_tmp);
! if ($start_date_tmp == $recur_data_year.$recur_data_month.$recur_data_day) {
$time_tmp = $hour.$minute;
$start_time_tmp = $start_time;
} else {
$time_tmp = '0000';
$start_time_tmp = '0000';
+ }
+ if ($start_date_tmp == $end_date_tmp) {
$end_time_tmp = $end_time;
! } else {
! $end_time_tmp = '0000';
}
$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
! $master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber);
$start_tmp = strtotime('+1 day',$start_tmp);
}
} else {
+ if ($bleed_check == '-1') {
+ $display_end_tmp = $end_time;
+ $end_time_tmp1 = '2400';
+ }
+ if (!isset($end_time_tmp1)) $end_time_tmp1 = $end_time;
+
// Let's double check the until to not write past it
$until_check = $recur_data_date.$hour.$minute.'00';
if ($abs_until > $until_check) {
$nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time, $uid);
! $master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber);
}
}
***************
*** 632,636 ****
// Clear event data now that it's been saved.
! unset($time_tmp, $start_time, $start_time_tmp, $end_time, $end_time_tmp, $start_unixtime, $start_unixtime_tmp, $end_unixtime, $end_unixtime_tmp, $summary, $length, $nbrOfOverlaps, $description, $status, $class, $location, $organizer, $attendee);
--- 648,652 ----
// Clear event data now that it's been saved.
! unset($start_time, $start_time_tmp, $end_time, $end_time_tmp, $start_unixtime, $start_unixtime_tmp, $end_unixtime, $end_unixtime_tmp, $summary, $length, $nbrOfOverlaps, $description, $status, $class, $location, $organizer, $attendee);
|
|
From: <cl...@us...> - 2003-11-16 06:09:53
|
Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv20435
Modified Files:
README config.inc.php day.php month.php week.php
Log Message:
Initial bleed time and display end checkin.
Index: README
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/README,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** README 13 Nov 2003 17:33:22 -0000 1.51
--- README 16 Nov 2003 06:09:09 -0000 1.52
***************
*** 79,83 ****
Older Browser Support:
----------------------
! Starting with 0.9.5, PHP iCalendar is moving away from supporting 4.x browsers.
If you still need support for these browers, 0.9.3 is still available for
download. To get the latest ical support, simply download the latest version
--- 79,83 ----
Older Browser Support:
----------------------
! Starting with 0.9.4, PHP iCalendar is moving away from supporting 4.x browsers.
If you still need support for these browers, 0.9.3 is still available for
download. To get the latest ical support, simply download the latest version
***************
*** 88,93 ****
--------
0.9.5
! -Fixed many bugs.
-Added a method to publish without Webdav in iCal. calendars/publish.php
0.9.4
--- 88,94 ----
--------
0.9.5
! -Fixed all reported bugs.
-Added a method to publish without Webdav in iCal. calendars/publish.php
+ -Added ability to set 'bleed time' for events that run past midnight.
0.9.4
Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** config.inc.php 15 Nov 2003 19:22:07 -0000 1.117
--- config.inc.php 16 Nov 2003 06:09:09 -0000 1.118
***************
*** 12,17 ****
$language = 'English'; // Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto'
$week_start_day = 'Sunday'; // Day of the week your week starts on
! $day_start = '0800'; // Start time for day grid
! $day_end = '2400'; // 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'
--- 12,17 ----
$language = 'English'; // Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto'
$week_start_day = 'Sunday'; // Day of the week your week starts on
! $day_start = '0700'; // Start time for day grid
! $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'
***************
*** 25,28 ****
--- 25,29 ----
$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.
+ $bleed_time = '0000'; // This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359'
// Advanced settings for custom installs, cookies, etc.
***************
*** 32,36 ****
// 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.
$use_sessions = 'no'; // This has not yet been implemented.
$display_custom_goto = 'no'; // In the 'Jump To' box, display the custom 'go to day' box.
--- 33,37 ----
// Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
! $save_parsed_cals = 'no'; // Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
$use_sessions = 'no'; // This has not yet been implemented.
$display_custom_goto = 'no'; // In the 'Jump To' box, display the custom 'go to day' box.
Index: day.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** day.php 20 Sep 2003 21:46:17 -0000 1.99
--- day.php 16 Nov 2003 06:09:09 -0000 1.100
***************
*** 230,233 ****
--- 230,234 ----
$event_start = strtotime ($this_time_arr[($event_length[$i]['key'])]['event_start']);
$event_end = strtotime ($this_time_arr[($event_length[$i]['key'])]['event_end']);
+ if (isset($this_time_arr[($event_length[$i]['key'])]['display_end'])) $event_end = strtotime ($this_time_arr[($event_length[$i]['key'])]['display_end']);
$event_start = date ($timeFormat, $event_start);
$event_end = date ($timeFormat, $event_end);
Index: month.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** month.php 20 Sep 2003 21:46:17 -0000 1.99
--- month.php 16 Nov 2003 06:09:09 -0000 1.100
***************
*** 127,130 ****
--- 127,131 ----
$event_start = @$val["event_start"];
$event_end = @$val["event_end"];
+ if (isset($val['display_end'])) $event_end = $val['display_end'];
$event_start = date($timeFormat, @strtotime ("$event_start"));
$start2 = date($timeFormat_small,@strtotime("$event_start"));
***************
*** 197,200 ****
--- 198,202 ----
$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"));
Index: week.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** week.php 20 Sep 2003 21:46:17 -0000 1.100
--- week.php 16 Nov 2003 06:09:09 -0000 1.101
***************
*** 305,309 ****
echo '<td class="eventbg_'.$event_calno.'">';
$event_end = $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"];
! $event_end = date ($timeFormat, $event_end);
// Todo: keep track of where the event comes from, and indicate that to openevent instead of $ALL_CALENDARS_COMBINED
if ($cal == $ALL_CALENDARS_COMBINED) $calendar_name2=$cal; else $calendar_name2=$calendar_name;
--- 305,310 ----
echo '<td class="eventbg_'.$event_calno.'">';
$event_end = $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"];
! if (isset($this_time_arr[($event_length[$thisday][$i]["key"])]['display_end'])) $event_end = strtotime ($this_time_arr[($event_length[$thisday][$i]["key"])]['display_end']);
! $event_end = date ($timeFormat, $event_end);
// Todo: keep track of where the event comes from, and indicate that to openevent instead of $ALL_CALENDARS_COMBINED
if ($cal == $ALL_CALENDARS_COMBINED) $calendar_name2=$cal; else $calendar_name2=$calendar_name;
|
|
From: <we...@us...> - 2003-11-15 21:54:45
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv15020 Modified Files: AUTHORS Log Message: I hope nobody minds, but I took the liberty of obfuscating, if only slightly, the e-mail addresses in the AUTHORS file, in hopes of reducing any spam from the fact that this file is archived on the web. Unfortunately, the old CVS copy is still archived... but oh well. Index: AUTHORS =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/AUTHORS,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AUTHORS 15 Sep 2003 03:18:23 -0000 1.5 --- AUTHORS 15 Nov 2003 21:54:40 -0000 1.6 *************** *** 7,41 **** PROJECT ADMINS -------------- ! Chad Little <ch...@ch...> ! Patrick Crowley <pa...@ic...> DEVELOPERS ---------- ! Patrick Berry <pb...@ma...> ! Bill Fenner <fe...@re...> ! David Reindl <dr...@an...> ! Jared Wangen <xe...@si...> CODE CONTRIBUTORS ----------------- ! Greg Westin <php...@gr...> ! Blaine Cook <la...@re...> ! Mike Traum <mt...@ya...> TRANSLATORS ----------- ! Braz. Port. Bennet Wilton <su...@be...> ! Danish Henrik Højmark <st...@wo...> ! Jakob Peterhänsel <ma...@cr...> ! Dutch Lieven Gekiere <Li...@ge...> ! English Chad Little <ch...@ch...> ! Finnish Kari Somby <kar...@ra...> ! French La Shampouineuse <in...@la...> ! German David Reindl <dr...@an...> ! Italian Luca Cacciagrano <cl...@cl...> ! Japanese Jared Wangen <ja...@si...> ! Norwegian Geir Kielland <gei...@ju...> ! Polish Stanislaw Cieslicki <st...@po...> ! Portuguese Rui Costa <rui...@ub...> ! Spanish Javier Navarro <jna...@xi...> ! Swedish Jonas Hjelm <jo...@hn...> --- 7,41 ---- PROJECT ADMINS -------------- ! Chad Little <chad at chadsdomain dot com> ! Patrick Crowley <patrick at icalshare dot com> DEVELOPERS ---------- ! Patrick Berry <pberry at mac dot com> ! Bill Fenner <fenner at research dot att dot com> ! David Reindl <dre at andare dot ch> ! Jared Wangen <xeo at silter dot org> CODE CONTRIBUTORS ----------------- ! Greg Westin <phpicalendar at gregwestin dot com> ! Blaine Cook <lattice at resist dot ca> ! Mike Traum <mtraum at yahoo dot com> TRANSLATORS ----------- ! Braz. Port. Bennet Wilton <suporte at bennetworks dot com dot br> ! Danish Henrik Højmark <styxx at worldonline dot dk> ! Jakob Peterhänsel <marook at creepers dot org> ! Dutch Lieven Gekiere <Lieven at gekiere dot com> ! English Chad Little <chad at chadsdomain dot com> ! Finnish Kari Somby <kari dot somby at ramk dot fi> ! French La Shampouineuse <info at lashampoo dot com> ! German David Reindl <dre at andare dot ch> ! Italian Luca Cacciagrano <clooka at clac dot it> ! Japanese Jared Wangen <jared at silter dot org> ! Norwegian Geir Kielland <geir dot kielland at jus dot uio dot no> ! Polish Stanislaw Cieslicki <stahoo at poczta dot onet dot pl> ! Portuguese Rui Costa <ruicosta at ubi dot pt> ! Spanish Javier Navarro <jnavarro at xips dot es> ! Swedish Jonas Hjelm <jonas at hnet dot se> |
|
From: <cl...@us...> - 2003-11-15 19:22:13
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv21281 Modified Files: config.inc.php Log Message: Fix for [ phpicalendar-Bugs-822211 ] repeating calendar event displays wrong Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.116 retrieving revision 1.117 diff -C2 -d -r1.116 -r1.117 *** config.inc.php 14 Nov 2003 22:33:10 -0000 1.116 --- config.inc.php 15 Nov 2003 19:22:07 -0000 1.117 *************** *** 13,17 **** $week_start_day = 'Sunday'; // Day of the week your week starts on $day_start = '0800'; // Start time for day grid ! $day_end = '2000'; // 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' --- 13,17 ---- $week_start_day = 'Sunday'; // Day of the week your week starts on $day_start = '0800'; // Start time for day grid ! $day_end = '2400'; // 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' |
|
From: <cl...@us...> - 2003-11-15 19:22:13
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv21281/functions
Modified Files:
ical_parser.php
Log Message:
Fix for [ phpicalendar-Bugs-822211 ] repeating calendar event
displays wrong
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** ical_parser.php 14 Nov 2003 22:33:11 -0000 1.124
--- ical_parser.php 15 Nov 2003 19:22:07 -0000 1.125
***************
*** 108,111 ****
--- 108,112 ----
$count = 1000000;
$valarm_set = FALSE;
+ $firstday = FALSE;
$attendee = array();
$organizer = array();
***************
*** 247,259 ****
$time_tmp = $hour.$minute;
$start_time_tmp = $start_time;
} else {
$time_tmp = '0000';
$start_time_tmp = '0000';
- }
- if ($start_date_tmp == $end_date_tmp) {
$end_time_tmp = $end_time;
- } else {
- $end_time_tmp = '2400';
}
$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
$master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee) );
--- 248,258 ----
$time_tmp = $hour.$minute;
$start_time_tmp = $start_time;
+ $end_time_tmp = '0000';
} else {
$time_tmp = '0000';
$start_time_tmp = '0000';
$end_time_tmp = $end_time;
}
+
$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
$master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee) );
***************
*** 581,596 ****
while ($start_tmp < $end_unixtime_tmp) {
$start_date_tmp = date('Ymd',$start_tmp);
! if ($start_date_tmp == $start_date) {
$time_tmp = $hour.$minute;
$start_time_tmp = $start_time;
} else {
$time_tmp = '0000';
$start_time_tmp = '0000';
- }
- if ($start_date_tmp == $end_date_tmp) {
$end_time_tmp = $end_time;
! } else {
! $end_time_tmp = '2400';
}
$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
$master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber);
--- 580,595 ----
while ($start_tmp < $end_unixtime_tmp) {
$start_date_tmp = date('Ymd',$start_tmp);
! if (($start_date_tmp == $start_date) || ($firstday == FALSE)) {
$time_tmp = $hour.$minute;
$start_time_tmp = $start_time;
+ $end_time_tmp = '0000';
+ $firstday = TRUE;
} else {
$time_tmp = '0000';
$start_time_tmp = '0000';
$end_time_tmp = $end_time;
! $firstday = FALSE;
}
+
$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
$master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber);
***************
*** 598,601 ****
--- 597,601 ----
}
} else {
+
// Let's double check the until to not write past it
$until_check = $recur_data_date.$hour.$minute.'00';
***************
*** 632,636 ****
// Clear event data now that it's been saved.
! unset($start_time, $start_time_tmp, $end_time, $end_time_tmp, $start_unixtime, $start_unixtime_tmp, $end_unixtime, $end_unixtime_tmp, $summary, $length, $nbrOfOverlaps, $description, $status, $class, $location, $organizer, $attendee);
--- 632,636 ----
// Clear event data now that it's been saved.
! unset($time_tmp, $start_time, $start_time_tmp, $end_time, $end_time_tmp, $start_unixtime, $start_unixtime_tmp, $end_unixtime, $end_unixtime_tmp, $summary, $length, $nbrOfOverlaps, $description, $status, $class, $location, $organizer, $attendee);
|
|
From: <cl...@us...> - 2003-11-14 22:36:57
|
Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv851/includes
Modified Files:
calendar_nav.php
Log Message:
Fixed month pulldowns for IE 6.
Index: calendar_nav.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/calendar_nav.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** calendar_nav.php 5 Nov 2003 06:17:25 -0000 1.13
--- calendar_nav.php 14 Nov 2003 22:36:54 -0000 1.14
***************
*** 106,114 ****
echo '<b>'.$jump_lang.'</b><br>';
echo '<img src="images/spacer.gif" width="1" height="6" alt=" "><br>';
! echo "<form style=\"margin-bottom:0;\" action=\"month.php\" method=\"GET\"><select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">";
include('./functions/list_icals.php');
include('./functions/list_years.php');
include('./functions/list_months.php');
include('./functions/list_weeks.php');
echo "</form>";
echo '<img src="images/spacer.gif" width="1" height="6" alt=" "><br>';
--- 106,118 ----
echo '<b>'.$jump_lang.'</b><br>';
echo '<img src="images/spacer.gif" width="1" height="6" alt=" "><br>';
! echo "<form style=\"margin-bottom:0;\" action=\"month.php\" method=\"GET\">";
include('./functions/list_icals.php');
+ echo '<br>';
include('./functions/list_years.php');
+ echo '<br>';
include('./functions/list_months.php');
+ echo '<br>';
include('./functions/list_weeks.php');
+ echo '<br>';
echo "</form>";
echo '<img src="images/spacer.gif" width="1" height="6" alt=" "><br>';
|
|
From: <cl...@us...> - 2003-11-14 22:33:16
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv32557 Modified Files: config.inc.php Log Message: Settings placed back to default for 0.9.5 release. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.115 retrieving revision 1.116 diff -C2 -d -r1.115 -r1.116 *** config.inc.php 14 Nov 2003 04:59:15 -0000 1.115 --- config.inc.php 14 Nov 2003 22:33:10 -0000 1.116 *************** *** 32,36 **** // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase. ! $save_parsed_cals = 'no'; // Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence. $use_sessions = 'no'; // This has not yet been implemented. $display_custom_goto = 'no'; // In the 'Jump To' box, display the custom 'go to day' box. --- 32,36 ---- // 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. $use_sessions = 'no'; // This has not yet been implemented. $display_custom_goto = 'no'; // In the 'Jump To' box, display the custom 'go to day' box. |
|
From: <cl...@us...> - 2003-11-14 22:33:16
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv32557/functions
Modified Files:
ical_parser.php init.inc.php
Log Message:
Settings placed back to default for 0.9.5 release.
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** ical_parser.php 14 Nov 2003 22:29:50 -0000 1.123
--- ical_parser.php 14 Nov 2003 22:33:11 -0000 1.124
***************
*** 656,661 ****
unset ($field, $data, $prop_pos, $property);
- $field = '';
- $data = '';
ereg ("([^:]+):(.*)", $line, $line);
$field = $line[1];
--- 656,659 ----
Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** init.inc.php 5 Nov 2003 05:40:15 -0000 1.40
--- init.inc.php 14 Nov 2003 22:33:11 -0000 1.41
***************
*** 7,11 ****
// uncomment when developing, comment for shipping version
! error_reporting (E_ALL);
$ALL_CALENDARS_COMBINED = 'all_calendars_combined971';
--- 7,11 ----
// uncomment when developing, comment for shipping version
! error_reporting (0);
$ALL_CALENDARS_COMBINED = 'all_calendars_combined971';
|
|
From: <cl...@us...> - 2003-11-14 22:29:53
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv31983/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.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** ical_parser.php 14 Nov 2003 22:27:06 -0000 1.122
--- ical_parser.php 14 Nov 2003 22:29:50 -0000 1.123
***************
*** 656,659 ****
--- 656,661 ----
unset ($field, $data, $prop_pos, $property);
+ $field = '';
+ $data = '';
ereg ("([^:]+):(.*)", $line, $line);
$field = $line[1];
|
|
From: <cl...@us...> - 2003-11-14 22:27:09
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv31582/functions
Modified Files:
ical_parser.php
Log Message:
Added a check for abs_until, setting it if not set.
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** ical_parser.php 14 Nov 2003 22:15:44 -0000 1.121
--- ical_parser.php 14 Nov 2003 22:27:06 -0000 1.122
***************
*** 109,113 ****
$valarm_set = FALSE;
$attendee = array();
! $organizer = array();
unset(
--- 109,113 ----
$valarm_set = FALSE;
$attendee = array();
! $organizer = array();
unset(
***************
*** 389,392 ****
--- 389,393 ----
if (!isset($until)) $until = $end_range_time;
+ if (!isset($abs_until)) $abs_until = date('YmdHis', $end_range_time);
$end_date_time = $until;
$start_range_time_tmp = $start_range_time;
***************
*** 469,473 ****
$recur_data[] = $next_date_time;
}
! } elseif (is_array($bymonthday)) {
// This supports MONTHLY where BYDAY and BYMONTH are both set
foreach($bymonthday as $day) {
--- 470,474 ----
$recur_data[] = $next_date_time;
}
! } elseif (isset($bymonthday)) {
// This supports MONTHLY where BYDAY and BYMONTH are both set
foreach($bymonthday as $day) {
|
|
From: <cl...@us...> - 2003-11-14 22:15:48
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv29530/functions
Modified Files:
ical_parser.php
Log Message:
Declared bymonth and bymonthday
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** ical_parser.php 14 Nov 2003 22:11:21 -0000 1.120
--- ical_parser.php 14 Nov 2003 22:15:44 -0000 1.121
***************
*** 103,106 ****
--- 103,108 ----
$except_dates = array();
$except_times = array();
+ $bymonth = array();
+ $bymonthday = array();
$first_duration = TRUE;
$count = 1000000;
***************
*** 440,444 ****
$next_range_time = strtotime(date('Y-m-01', $next_range_time));
// month has two cases, either $bymonthday or $byday
! if ((is_array($bymonthday)) && (!is_array($byday))) {
// loop through the days on which this event happens
foreach($bymonthday as $day) {
--- 442,446 ----
$next_range_time = strtotime(date('Y-m-01', $next_range_time));
// month has two cases, either $bymonthday or $byday
! if ((isset($bymonthday)) && (!isset($byday))) {
// loop through the days on which this event happens
foreach($bymonthday as $day) {
|
|
From: <cl...@us...> - 2003-11-14 22:11:24
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv28463/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.119
retrieving revision 1.120
diff -C2 -d -r1.119 -r1.120
*** ical_parser.php 14 Nov 2003 10:05:46 -0000 1.119
--- ical_parser.php 14 Nov 2003 22:11:21 -0000 1.120
***************
*** 552,557 ****
// use the same code to write the data instead of always changing it 5 times
if (isset($recur_data) && is_array($recur_data)) {
! $recur_data_hour = substr($start_time,0,2);
! $recur_data_minute = substr($start_time,2,2);
foreach($recur_data as $recur_data_time) {
$recur_data_year = date('Y', $recur_data_time);
--- 552,557 ----
// use the same code to write the data instead of always changing it 5 times
if (isset($recur_data) && is_array($recur_data)) {
! $recur_data_hour = @substr($start_time,0,2);
! $recur_data_minute = @substr($start_time,2,2);
foreach($recur_data as $recur_data_time) {
$recur_data_year = date('Y', $recur_data_time);
|
|
From: <cl...@us...> - 2003-11-14 22:03:50
|
Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv26877/includes
Modified Files:
sidebar.php
Log Message:
Added BRs to sidebar, fix for IE6.
Index: sidebar.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** sidebar.php 13 Nov 2003 06:02:47 -0000 1.24
--- sidebar.php 14 Nov 2003 22:03:47 -0000 1.25
***************
*** 53,59 ****
--- 53,63 ----
echo '<form style="margin-bottom:0;" action="day.php" method="GET">';
include('./functions/list_icals.php');
+ echo '<br>';
include('./functions/list_years.php');
+ echo '<br>';
include('./functions/list_months.php');
+ echo '<br>';
include('./functions/list_weeks.php');
+ echo '<br>';
echo '</form>';
if ($show_search == 'yes') {
|
|
From: <cl...@us...> - 2003-11-14 21:46:50
|
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory sc8-pr-cvs1:/tmp/cvs-serv23089/languages Modified Files: finnish.inc.php Log Message: Corrected Finnish timeformat_small Index: finnish.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/finnish.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** finnish.inc.php 13 Nov 2003 17:33:23 -0000 1.8 --- finnish.inc.php 14 Nov 2003 21:46:47 -0000 1.9 *************** *** 160,164 **** //$timeFormat = 'g:i A'; $timeFormat = 'H:i'; ! $timeFormat_small = 'g:i'; // For date formatting, see note below --- 160,164 ---- //$timeFormat = 'g:i A'; $timeFormat = 'H:i'; ! $timeFormat_small = 'H:i'; // For date formatting, see note below |
|
From: <cl...@us...> - 2003-11-14 10:05:54
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv13453/functions
Modified Files:
ical_parser.php
Log Message:
Interesting change to the parser. I check the until date to the second
just before I write to the array. This prevents any event from getting
written that is beyond the until date+time.
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** ical_parser.php 14 Nov 2003 09:30:38 -0000 1.118
--- ical_parser.php 14 Nov 2003 10:05:46 -0000 1.119
***************
*** 98,102 ****
$beginning, $rrule_array, $start_of_vevent, $description,
$valarm_description, $start_unixtime, $end_unixtime,
! $recurrence_id, $uid, $class, $location, $rrule
);
--- 98,102 ----
$beginning, $rrule_array, $start_of_vevent, $description,
$valarm_description, $start_unixtime, $end_unixtime,
! $recurrence_id, $uid, $class, $location, $rrule, $abs_until, $until_check
);
***************
*** 322,344 ****
$until = ereg_replace('T', '', $val);
$until = ereg_replace('Z', '', $until);
! ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})', $until, $regs);
! $year = $regs[1];
! $month = $regs[2];
! $day = $regs[3];
! $until = mktime(0,0,0,$month,$day,$year);
! if (ereg('^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})$', $val)) {
! // RFC 2445 says that if an UNTIL has a date-time value,
! // it MUST be in UTC (i.e. trailing Z). iCal tends to
! // put an end date on the next day early in the morning,
! // not in UTC time, so we try to correct for it.
! //
! // Bill's guess: iCal stores the UNTIL internally as
! // 23:59:59 UTC, then accidentally converts that to local
! // time when exporting the event. Thus, if the UNTIL time
! // is before noon, it is a day ahead; if it's after noon
! // it's the right day.
! if ($regs[4] < 12)
! $until = strtotime('-1 day', $until);
! }
$master_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = localizeDate($dateFormat_week,$until);
break;
--- 322,328 ----
$until = ereg_replace('T', '', $val);
$until = ereg_replace('Z', '', $until);
! $abs_until = $until;
! ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})', $until, $regs);
! $until = mktime($regs[4],$regs[5],$regs[6],$regs[2],$regs[3],$regs[1]);
$master_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = localizeDate($dateFormat_week,$until);
break;
***************
*** 611,616 ****
}
} else {
! $nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time, $uid);
! $master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber);
}
}
--- 595,604 ----
}
} else {
! // Let's double check the until to not write past it
! $until_check = $recur_data_date.$hour.$minute.'00';
! if ($abs_until > $until_check) {
! $nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time, $uid);
! $master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber);
! }
}
}
|
