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...> - 2004-05-23 08:23:56
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20922/functions Modified Files: ical_parser.php Log Message: Added cache for All Combined. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.167 retrieving revision 1.168 diff -C2 -d -r1.167 -r1.168 *** ical_parser.php 23 May 2004 05:36:30 -0000 1.167 --- ical_parser.php 23 May 2004 08:23:45 -0000 1.168 *************** *** 34,51 **** // reading the file if it's allowed $parse_file = true; ! if (($is_webcal == false) && ($save_parsed_cals == 'yes') && ($cal != $ALL_CALENDARS_COMBINED)) { ! $realcal_mtime = filemtime($filename); ! $parsedcal = $tmp_dir.'/parsedcal-'.$cal_filename.'-'.$this_year; ! if (file_exists($parsedcal)) { ! $parsedcal_mtime = filemtime($parsedcal); ! if ($realcal_mtime == $parsedcal_mtime) { $fd = fopen($parsedcal, 'r'); $contents = fread($fd, filesize($parsedcal)); fclose($fd); $master_array = unserialize($contents); ! if ($master_array['-1'] == 'valid cal file') { ! $parse_file = false; ! $calendar_name = $master_array['calendar_name']; ! $calendar_tz = $master_array['calendar_tz']; } } --- 34,84 ---- // reading the file if it's allowed $parse_file = true; ! if (($is_webcal == false) && ($save_parsed_cals == 'yes')) { ! if (sizeof ($cal_filelist) > 1) { ! $parsedcal = $tmp_dir.'/parsedcal-'.$cal_filename.'-'.$this_year; ! if (file_exists($parsedcal)) { $fd = fopen($parsedcal, 'r'); $contents = fread($fd, filesize($parsedcal)); fclose($fd); $master_array = unserialize($contents); ! $z=1; ! $y=0; ! if (sizeof($master_array['-4']) == (sizeof($cal_filelist))) { ! foreach ($master_array['-4'] as $temp_array) { ! $mtime = $master_array['-4'][$z]['mtime']; ! $fname = $master_array['-4'][$z]['filename']; ! $realcal_mtime = filemtime($fname); ! if ($mtime == $realcal_mtime) { ! $y++; ! } ! $z++; ! } ! if ($y == sizeof($cal_filelist)) { ! if ($master_array['-1'] == 'valid cal file') { ! $parse_file = false; ! $calendar_name = $master_array['calendar_name']; ! $calendar_tz = $master_array['calendar_tz']; ! } ! } ! } ! } ! if ($parse_file == true) unset($master_array); ! } else { ! foreach ($cal_filelist as $filename) { ! $realcal_mtime = filemtime($filename); ! $parsedcal = $tmp_dir.'/parsedcal-'.$cal_filename.'-'.$this_year; ! if (file_exists($parsedcal)) { ! $parsedcal_mtime = filemtime($parsedcal); ! if ($realcal_mtime == $parsedcal_mtime) { ! $fd = fopen($parsedcal, 'r'); ! $contents = fread($fd, filesize($parsedcal)); ! fclose($fd); ! $master_array = unserialize($contents); ! if ($master_array['-1'] == 'valid cal file') { ! $parse_file = false; ! $calendar_name = $master_array['calendar_name']; ! $calendar_tz = $master_array['calendar_tz']; ! } ! } } } *************** *** 72,75 **** --- 105,111 ---- if (trim($nextline) != 'BEGIN:VCALENDAR') exit(error($error_invalidcal_lang, $filename)); + //Mod time + $actual_mtime = filemtime($filename); + // Set a value so we can check to make sure $master_array contains valid data $master_array['-1'] = 'valid cal file'; *************** *** 121,124 **** --- 157,162 ---- 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; // Handle DURATION *************** *** 1094,1098 **** // write the new master array to the file ! if (isset($master_array) && is_array($master_array) && $save_parsed_cals == 'yes' && $is_webcal == FALSE && $cal != $ALL_CALENDARS_COMBINED) { $write_me = serialize($master_array); $fd = fopen($parsedcal, 'w'); --- 1132,1136 ---- // write the new master array to the file ! if (isset($master_array) && is_array($master_array) && $save_parsed_cals == 'yes' && $is_webcal == FALSE) { $write_me = serialize($master_array); $fd = fopen($parsedcal, 'w'); *************** *** 1106,1110 **** //print '<pre>'; ! //print_r($master_array[20040529]); //print_r($overlap_array); //print_r($day_array); --- 1144,1148 ---- //print '<pre>'; ! //print_r($master_array['-4']); //print_r($overlap_array); //print_r($day_array); |
|
From: <cl...@us...> - 2004-05-23 05:36:39
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28302/functions Modified Files: ical_parser.php template.php Log Message: Fix for day_start missing, week not listed cals. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.166 retrieving revision 1.167 diff -C2 -d -r1.166 -r1.167 *** ical_parser.php 20 May 2004 20:47:58 -0000 1.166 --- ical_parser.php 23 May 2004 05:36:30 -0000 1.167 *************** *** 1106,1110 **** //print '<pre>'; ! //print_r($master_array); //print_r($overlap_array); //print_r($day_array); --- 1106,1110 ---- //print '<pre>'; ! //print_r($master_array[20040529]); //print_r($overlap_array); //print_r($day_array); Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** template.php 20 May 2004 04:15:19 -0000 1.45 --- template.php 23 May 2004 05:36:30 -0000 1.46 *************** *** 77,81 **** function draw_week($template_p) { ! global $start_week_time, $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day, $dateFormat_week_list, $current_view, $day_array, $timeFormat, $gridLength, $timeFormat_small; // Figure out colspans --- 77,81 ---- function draw_week($template_p) { ! global $start_week_time, $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day, $dateFormat_week_list, $current_view, $day_array, $timeFormat, $gridLength, $timeFormat_small, $day_start; // Figure out colspans *************** *** 252,259 **** if (sizeof($event_length[$thisday]) == 0) { if ($dayborder == 0) { ! $class = " class=\"weekborder\""; $dayborder++; } else { ! $class = ""; $dayborder = 0; } --- 252,259 ---- if (sizeof($event_length[$thisday]) == 0) { if ($dayborder == 0) { ! $class = ' class="weekborder"'; $dayborder++; } else { ! $class = ''; $dayborder = 0; } *************** *** 261,265 **** $drawWidth = 1; $colspan_width = round((80 / $nbrGridCols[$thisday]) * $drawWidth); ! $weekdisplay .= "<td width=\"$colspan_width\" colspan=\"" . $nbrGridCols[$thisday] . "\" $class> </td>\n"; } else { --- 261,265 ---- $drawWidth = 1; $colspan_width = round((80 / $nbrGridCols[$thisday]) * $drawWidth); ! $weekdisplay .= '<td width="' . $colspan_width . '" colspan="' . $nbrGridCols[$thisday] . '" ' . $class . '> </td>'."\n"; } else { *************** *** 272,278 **** case "begin": $event_length[$thisday][$i]["state"] = "started"; ! $event_start = $this_time_arr[($event_length[$thisday][$i]["key"])]["start_unixtime"]; $event_start = date ($timeFormat_small, $event_start); ! $event_calno = $this_time_arr[($event_length[$thisday][$i]['key'])]['calnumber']; $event_status = strtolower($this_time_arr[($event_length[$thisday][$i]['key'])]['status']); if ($event_calno < 1) $event_calno = 1; --- 272,280 ---- case "begin": $event_length[$thisday][$i]["state"] = "started"; ! $event_start = $this_time_arr[($event_length[$thisday][$i]["key"])]['start_unixtime']; $event_start = date ($timeFormat_small, $event_start); ! $event_calno = $this_time_arr[($event_length[$thisday][$i]['key'])]['calnumber']; ! $event_calna = $this_time_arr[($event_length[$thisday][$i]['key'])]['calname']; ! $event_url = $this_time_arr[($event_length[$thisday][$i]['key'])]['url']; $event_status = strtolower($this_time_arr[($event_length[$thisday][$i]['key'])]['status']); if ($event_calno < 1) $event_calno = 1; *************** *** 290,295 **** // Start drawing the event $event_temp = $loop_event; - $event_calna = $this_time_arr[($event_length[$i]['key'])]['calname']; - $event_url = $this_time_arr[($event_length[$i]['key'])]['url']; $event = openevent($event_calna, $event_start, $event_end, $this_time_arr[($event_length[$thisday][$i]["key"])], $week_events_lines, 25, '', '', 'ps', $event_url); $event_temp = str_replace('{EVENT}', $event, $event_temp); --- 292,295 ---- *************** *** 333,337 **** function draw_day($template_p) { ! global $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day, $dateFormat_week_list, $current_view, $day_array, $timeFormat, $gridLength; // Replaces the allday events --- 333,337 ---- function draw_day($template_p) { ! global $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day, $dateFormat_week_list, $current_view, $day_array, $timeFormat, $gridLength, $day_start; // Replaces the allday events *************** *** 422,426 **** // add events that overlap $day_start instead of cutting them out completely ! if ("$day_start" == "$cal_time" && isset($master_array[$getdate])) { foreach($master_array[$getdate] as $time_key => $time_arr) { if ((int)$time_key < (int)$cal_time && is_array($time_arr) && $time_key != '-1') { --- 422,426 ---- // add events that overlap $day_start instead of cutting them out completely ! if (($day_start == $cal_time) && (isset($master_array[$getdate]))) { foreach($master_array[$getdate] as $time_key => $time_arr) { if ((int)$time_key < (int)$cal_time && is_array($time_arr) && $time_key != '-1') { |
|
From: <cl...@us...> - 2004-05-22 23:51:12
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5182/functions Modified Files: init.inc.php Log Message: Fix for: [ 958694 ] '"english" is not a supported language.' bug continues Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** init.inc.php 14 May 2004 21:09:16 -0000 1.60 --- init.inc.php 22 May 2004 23:51:03 -0000 1.61 *************** *** 1,8 **** <?php - // jared-2002.10.30, I want to make sure my published calendars are world-read/writeable - // so I have this making sure they all are. This should be commented out/deleted - // for shipping versions. This is a convenience so when I commit, changes are made and - // I don't get errors. - //chmod(BASE.'calendars/School.ics',0666); // uncomment when developing, comment for shipping version --- 1,3 ---- *************** *** 56,60 **** $lang_file = BASE.'/languages/'.$language.'.inc.php'; ! if (file_exists($lang_file)) { include($lang_file); } else { --- 51,55 ---- $lang_file = BASE.'/languages/'.$language.'.inc.php'; ! if (file_exists(realpath($lang_file))) { include($lang_file); } else { |
|
From: <cl...@us...> - 2004-05-20 20:48:09
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3440/functions Modified Files: error.php ical_parser.php Log Message: Minor error fixes. Index: error.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/error.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** error.php 31 Jan 2004 22:59:29 -0000 1.11 --- error.php 20 May 2004 20:47:58 -0000 1.12 *************** *** 27,30 **** --- 27,31 ---- 'footer' => BASE.'templates/'.$template.'/footer.tpl', 'calendar_nav' => BASE.'templates/'.$template.'/calendar_nav.tpl', + 'default_path' => '', 'template' => $template, 'cal' => $cal, *************** *** 34,42 **** 'rss_powered' => $rss_powered, 'rss_available' => '', 'todo_available' => '', 'rss_valid' => '', 'error_msg' => $error_msg, 'error_calendar' => $error_calendar, ! 'generated' => $generated )); --- 35,48 ---- 'rss_powered' => $rss_powered, 'rss_available' => '', + 'event_js' => '', + 'todo_js' => '', 'todo_available' => '', 'rss_valid' => '', 'error_msg' => $error_msg, 'error_calendar' => $error_calendar, ! 'generated' => $generated, ! 'l_powered_by' => $lang['l_powered_by'], ! 'l_error_back' => $lang['l_error_back'], ! 'l_error_window' => $lang['l_error_window'] )); Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.165 retrieving revision 1.166 diff -C2 -d -r1.165 -r1.166 *** ical_parser.php 20 May 2004 06:04:14 -0000 1.165 --- ical_parser.php 20 May 2004 20:47:58 -0000 1.166 *************** *** 67,71 **** if ($parse_file) { ! $ifile = fopen($filename, "r"); if ($ifile == FALSE) exit(error($error_invalidcal_lang, $filename)); $nextline = fgets($ifile, 1024); --- 67,71 ---- if ($parse_file) { ! $ifile = @fopen($filename, "r"); if ($ifile == FALSE) exit(error($error_invalidcal_lang, $filename)); $nextline = fgets($ifile, 1024); |
|
From: <cl...@us...> - 2004-05-20 20:04:24
|
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26370/languages Modified Files: catalan.inc.php english.inc.php Log Message: Language checkin, removed unneeded config options. Index: catalan.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/catalan.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** catalan.inc.php 23 Nov 2003 18:21:41 -0000 1.8 --- catalan.inc.php 20 May 2004 20:04:13 -0000 1.9 *************** *** 2,6 **** // Catalan language include ! // For version 1.0 PHP iCalendar // // Translation by Oriol Ferrer Mesia; (tm...@sa...) --- 2,6 ---- // Catalan language include ! // For version 2.0 PHP iCalendar // // Translation by Oriol Ferrer Mesia; (tm...@sa...) *************** *** 8,105 **** // Submit new translations to ch...@ch... ! $day_lang = "Dia"; ! $week_lang = "Setmana"; ! $month_lang = "Mes"; ! $year_lang = "Any"; ! $calendar_lang = "Calendari"; ! $next_day_lang = "Dia següent"; ! $next_month_lang = "Mes següent"; ! $next_week_lang = "Setmana següent"; ! $next_year_lang = "Any següent"; ! $last_day_lang = "Dia anterior"; ! $last_month_lang = "Mes anterior"; ! $last_week_lang = "Setmana anterior"; ! $last_year_lang = "Any anterior"; ! $subscribe_lang = "Subscriure"; ! $download_lang = "Descarregar"; ! $powered_by_lang = "Gràcies a"; ! $event_lang = 'Event'; ! $event_start_lang = 'Inici'; ! $event_end_lang = 'Fi'; ! $this_months_lang = 'Events d\'aquest mes'; ! $date_lang = 'Data'; ! $summary_lang = 'Descripció'; ! $all_day_lang = 'Event diario'; ! $notes_lang = 'Notes'; ! $this_years_lang = 'Events d\'aquest any'; ! $today_lang = 'Avui'; ! $this_week_lang = 'Aquesta setmana'; ! $this_month_lang = 'Aquesta mes'; ! $jump_lang = 'Anar a'; ! $tomorrows_lang = 'Events de demà'; ! $goday_lang = 'Anar a Avui'; ! $goweek_lang = 'Anar a aquesta Setmana'; ! $gomonth_lang = 'Anar a aquest Mes'; ! $goyear_lang = 'Anar a aquest Any'; ! $search_lang = 'Buscar'; // the verb ! $results_lang = 'Resultats de la cerca'; ! $query_lang = 'Consulta: '; // will be followed by the search query ! $no_results_lang = 'No s\'ha trobat cap event'; ! $goprint_lang = 'Format d\'impressió'; ! $time_lang = 'Hora'; ! $summary_lang = 'Resum'; ! $description_lang = 'Descripció'; ! $this_site_is_lang = 'Aquesta pàgina és'; ! $no_events_day_lang = 'No hi ha events per a avui.'; ! $no_events_week_lang = 'No hi ha events per a aquesta setmana.'; ! $no_events_month_lang = 'No hi ha events per a aquest mes.'; ! $rss_day_date = 'g:i A'; // Lists just the time ! $rss_week_date = '%e de %b'; // Lists just the day ! $rss_month_date = '%e de %b'; // Lists just the day ! $rss_language = 'en-us'; ! $search_took_lang = 'La cerca ha trigat %s segons'; ! $recurring_event_lang = 'Event periòdic'; ! $exception_lang = 'Excepció'; ! $no_query_lang = 'Sense consulta'; ! $preferences_lang = 'Preferències'; ! $printer_lang = 'Impressora'; ! $select_lang_lang = 'Esculli el seu idioma per defecte:'; ! $select_cal_lang = 'Esculli el seu calendari per defecte:'; ! $select_view_lang = 'Esculli la seva vista per defecte:'; ! $select_time_lang = 'Esculli la seva hora d\'inici per defecte:'; ! $select_day_lang = 'Esculli el seu dia inicial de la setmana:'; ! $select_style_lang = 'Esculli el seu estil per defecte:'; ! $set_prefs_lang = 'Guardar preferències'; ! $completed_date_lang = 'Finalitzat a'; ! $completed_lang = 'Finalitzat'; ! $created_lang = 'Creat:'; ! $due_lang = 'Fins:'; ! $priority_lang = 'Prioritat:'; ! $priority_high_lang = 'Alta'; ! $priority_low_lang = 'Baixa'; ! $priority_medium_lang = 'Mitjana'; ! $priority_none_lang = 'Cap'; ! $status_lang = 'Estat:'; ! $todo_lang = 'Pendent'; ! $unfinished_lang = 'Sense acabar'; ! $prefs_set_lang = 'Les teves preferències s\'han guardat.'; ! $prefs_unset_lang = 'Les preferències s\'han esborat. Els canvis seràn visibles quan es recarregui la pàgina'; ! $unset_prefs_lang = 'Esborra les preferències:'; ! $organizer_lang = 'Organitzador'; ! $attendee_lang = 'Persones presents'; ! $status_lang = 'Estat'; ! $location_lang = 'Lloc'; ! $admin_header_lang = 'Administració PHP iCalendar'; ! $username_lang = 'Nom d\'usuari'; ! $password_lang = 'contrasenya'; ! $login_lang = 'Login'; ! $invalid_login_lang = 'Nom d\'usuari o contrasenya incorrectes.'; ! $addupdate_cal_lang = 'Afegeix o actualitza un Calendari'; ! $addupdate_desc_lang = 'Afegeix un Calendari enviant un fitxer. Actualitza un Calendari enviant un fitxer amb el mateix nom.'; ! $delete_cal_lang = 'Esborra un Calendari'; ! $logout_lang = 'Desconnexió'; ! $cal_file_lang = 'Fitxer de Calendari'; ! $php_error_lang = 'Error de PHP '; ! $upload_error_gen_lang = 'Hi ha hagut un error en el procés d\'enviament.'; $upload_error_lang[0] = 'Hi ha hagut un error en el procés d\'enviament.'; $upload_error_lang[1] = 'El fitxer enviat és massa gran.'; --- 8,105 ---- // Submit new translations to ch...@ch... ! $lang['l_day'] = "Dia"; ! $lang['l_week'] = "Setmana"; ! $lang['l_month'] = "Mes"; ! $lang['l_year'] = "Any"; ! $lang['l_calendar'] = "Calendari"; ! $lang['l_next_day'] = "Dia següent"; ! $lang['l_next_month'] = "Mes següent"; ! $lang['l_next_week'] = "Setmana següent"; ! $lang['l_next_year'] = "Any següent"; ! $lang['l_last_day'] = "Dia anterior"; ! $lang['l_last_month'] = "Mes anterior"; ! $lang['l_last_week'] = "Setmana anterior"; ! $lang['l_last_year'] = "Any anterior"; ! $lang['l_subscribe'] = "Subscriure"; ! $lang['l_download'] = "Descarregar"; ! $lang['l_powered_by'] = "Gràcies a"; ! $lang['l_event'] = 'Event'; ! $lang['l_event_start'] = 'Inici'; ! $lang['l_event_end'] = 'Fi'; ! $lang['l_this_months'] = 'Events d\'aquest mes'; ! $lang['l_date'] = 'Data'; ! $lang['l_summary'] = 'Descripció'; ! $lang['l_all_day'] = 'Event diario'; ! $lang['l_notes'] = 'Notes'; ! $lang['l_this_years'] = 'Events d\'aquest any'; ! $lang['l_today'] = 'Avui'; ! $lang['l_this_week'] = 'Aquesta setmana'; ! $lang['l_this_month'] = 'Aquesta mes'; ! $lang['l_jump'] = 'Anar a'; ! $lang['l_tomorrows'] = 'Events de demà'; ! $lang['l_goday'] = 'Anar a Avui'; ! $lang['l_goweek'] = 'Anar a aquesta Setmana'; ! $lang['l_gomonth'] = 'Anar a aquest Mes'; ! $lang['l_goyear'] = 'Anar a aquest Any'; ! $lang['l_search'] = 'Buscar'; // the verb ! $lang['l_results'] = 'Resultats de la cerca'; ! $lang['l_query'] = 'Consulta: '; // will be followed by the search query ! $lang['l_no_results'] = 'No s\'ha trobat cap event'; ! $lang['l_goprint'] = 'Format d\'impressió'; ! $lang['l_time'] = 'Hora'; ! $lang['l_summary'] = 'Resum'; ! $lang['l_description'] = 'Descripció'; ! $lang['l_this_site_is'] = 'Aquesta pàgina és'; ! $lang['l_no_events_day'] = 'No hi ha events per a avui.'; ! $lang['l_no_events_week'] = 'No hi ha events per a aquesta setmana.'; ! $lang['l_no_events_month'] = 'No hi ha events per a aquest mes.'; ! $lang['l_rss_day_date'] = 'g:i A'; // Lists just the time ! $lang['l_rss_week_date'] = '%e de %b'; // Lists just the day ! $lang['l_rss_month_date'] = '%e de %b'; // Lists just the day ! $lang['l_rss_language'] = 'en-us'; ! $lang['l_search_took'] = 'La cerca ha trigat %s segons'; ! $lang['l_recurring_event'] = 'Event periòdic'; ! $lang['l_exception'] = 'Excepció'; ! $lang['l_no_query'] = 'Sense consulta'; ! $lang['l_preferences'] = 'Preferències'; ! $lang['l_printer'] = 'Impressora'; ! $lang['l_select_lang'] = 'Esculli el seu idioma per defecte:'; ! $lang['l_select_cal'] = 'Esculli el seu calendari per defecte:'; ! $lang['l_select_view'] = 'Esculli la seva vista per defecte:'; ! $lang['l_select_time'] = 'Esculli la seva hora d\'inici per defecte:'; ! $lang['l_select_day'] = 'Esculli el seu dia inicial de la setmana:'; ! $lang['l_select_style'] = 'Esculli el seu estil per defecte:'; ! $lang['l_set_prefs'] = 'Guardar preferències'; ! $lang['l_completed_date'] = 'Finalitzat a'; ! $lang['l_completed'] = 'Finalitzat'; ! $lang['l_created'] = 'Creat:'; ! $lang['l_due'] = 'Fins:'; ! $lang['l_priority'] = 'Prioritat:'; ! $lang['l_priority_high'] = 'Alta'; ! $lang['l_priority_low'] = 'Baixa'; ! $lang['l_priority_medium'] = 'Mitjana'; ! $lang['l_priority_none'] = 'Cap'; ! $lang['l_status'] = 'Estat:'; ! $lang['l_todo'] = 'Pendent'; ! $lang['l_unfinished'] = 'Sense acabar'; ! $lang['l_prefs_set'] = 'Les teves preferències s\'han guardat.'; ! $lang['l_prefs_unset'] = 'Les preferències s\'han esborat. Els canvis seràn visibles quan es recarregui la pàgina'; ! $lang['l_unset_prefs'] = 'Esborra les preferències:'; ! $lang['l_organizer'] = 'Organitzador'; ! $lang['l_attendee'] = 'Persones presents'; ! $lang['l_status'] = 'Estat'; ! $lang['l_location'] = 'Lloc'; ! $lang['l_admin_header'] = 'Administració PHP iCalendar'; ! $lang['l_username'] = 'Nom d\'usuari'; ! $lang['l_password'] = 'contrasenya'; ! $lang['l_login'] = 'Login'; ! $lang['l_invalid_login'] = 'Nom d\'usuari o contrasenya incorrectes.'; ! $lang['l_addupdate_cal'] = 'Afegeix o actualitza un Calendari'; ! $lang['l_addupdate_desc'] = 'Afegeix un Calendari enviant un fitxer. Actualitza un Calendari enviant un fitxer amb el mateix nom.'; ! $lang['l_delete_cal'] = 'Esborra un Calendari'; ! $lang['l_logout'] = 'Desconnexió'; ! $lang['l_cal_file'] = 'Fitxer de Calendari'; ! $lang['l_php_error'] = 'Error de PHP '; ! $lang['l_upload_error_gen'] = 'Hi ha hagut un error en el procés d\'enviament.'; $upload_error_lang[0] = 'Hi ha hagut un error en el procés d\'enviament.'; $upload_error_lang[1] = 'El fitxer enviat és massa gran.'; *************** *** 107,129 **** $upload_error_lang[3] = 'El fitxer ha estat enviat només parcialment.'; $upload_error_lang[4] = 'Cal sel·leccionar un fitxer a enviar.'; ! $upload_error_type_lang = 'Nomes es poden enviar fitxers del tipus .ics.'; ! $copy_error_lang = 'Error durant la còpia del fitxer.'; ! $delete_error_lang = 'Error al esborrar el fitxer.'; ! $delete_success_lang = 'ha estat eliminat.'; ! $action_success_lang = 'L\'acció ha acabat satisfactòriament.'; ! $submit_lang = 'Envia'; ! $delete_lang = 'Esborra'; ! // ----- New for 0.9.5 ! $all_cal_comb_lang = 'Tots els calendaris alhora'; // - navigation ! $back_lang = 'Endarrera'; ! $next_lang = 'Següent'; ! $prev_lang = 'Anterior'; ! $day_view_lang = 'Vista Diària'; ! $week_view_lang = 'Vista Setmanal'; ! $month_view_lang = 'Vista Mensual'; ! $year_view_lang = 'Vista Anual'; // --------------------------------- --- 107,135 ---- $upload_error_lang[3] = 'El fitxer ha estat enviat només parcialment.'; $upload_error_lang[4] = 'Cal sel·leccionar un fitxer a enviar.'; ! $lang['l_upload_error_type'] = 'Nomes es poden enviar fitxers del tipus .ics.'; ! $lang['l_copy_error'] = 'Error durant la còpia del fitxer.'; ! $lang['l_delete_error'] = 'Error al esborrar el fitxer.'; ! $lang['l_delete_success'] = 'ha estat eliminat.'; ! $lang['l_action_success'] = 'L\'acció ha acabat satisfactòriament.'; ! $lang['l_submit'] = 'Envia'; ! $lang['l_delete'] = 'Esborra'; ! $lang['l_all_cal_comb'] = 'Tots els calendaris alhora'; ! // New for 2.0 ! $lang['l_legend'] = 'Legend'; ! $lang['l_admin_subhead'] = 'Manage your calendars from this page'; ! $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'] = 'Endarrera'; ! $lang['l_next'] = 'Següent'; ! $lang['l_prev'] = 'Anterior'; ! $lang['l_day_view'] = 'Vista Diària'; ! $lang['l_week_view'] = 'Vista Setmanal'; ! $lang['l_month_view'] = 'Vista Mensual'; ! $lang['l_year_view'] = 'Vista Anual'; // --------------------------------- *************** *** 185,196 **** // Error messages - %s will be replaced with a variable ! $error_title_lang = 'Error!'; ! $error_window_lang = 'Hi ha hagut error!'; ! $error_calendar_lang = 'L\'error s\'ha produït mentre es processava el calendari "%s".'; ! $error_path_lang = 'Incapaç d\'obrir: "%s"'; ! $error_back_lang = 'Per favor, utilitzi el botó "endarrera" per a tornar.'; ! $error_remotecal_lang = 'Aquest servidor bloqueja calendaris remots que no han estat acceptats.'; ! $error_restrictedcal_lang = 'Ha intentat arribar a un calendari que té l\'accés restringit.'; ! $error_invalidcal_lang = 'Fitxer de calendari invàlid. Per favor, provi un altre calendari.'; --- 191,202 ---- // Error messages - %s will be replaced with a variable ! $lang['l_error_title'] = 'Error!'; ! $lang['l_error_window'] = 'Hi ha hagut error!'; ! $lang['l_error_calendar'] = 'L\'error s\'ha produït mentre es processava el calendari "%s".'; ! $lang['l_error_path'] = 'Incapaç d\'obrir: "%s"'; ! $lang['l_error_back'] = 'Per favor, utilitzi el botó "endarrera" per a tornar.'; ! $lang['l_error_remotecal'] = 'Aquest servidor bloqueja calendaris remots que no han estat acceptats.'; ! $lang['l_error_restrictedcal'] = 'Ha intentat arribar a un calendari que té l\'accés restringit.'; ! $lang['l_error_invalidcal'] = 'Fitxer de calendari invàlid. Per favor, provi un altre calendari.'; Index: english.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** english.inc.php 16 May 2004 04:47:42 -0000 1.56 --- english.inc.php 20 May 2004 20:04:13 -0000 1.57 *************** *** 154,157 **** --- 154,160 ---- $format_recur_lang['bymonthday'] = 'On dates: %list%'; // ie, 'On dates: 1, 2, 3, 4' $format_recur_lang['byday'] = 'On days: %list%'; // ie, 'On days: Mon, Tues, Wed, Thurs' + + // --------------------------------- + $daysofweek_lang = array ('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'); $daysofweekshort_lang = array ('Sun','Mon','Tue','Wed','Thu','Fri','Sat'); |
|
From: <cl...@us...> - 2004-05-20 20:04:24
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26370 Modified Files: README config.inc.php Log Message: Language checkin, removed unneeded config options. Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** README 16 May 2004 19:58:06 -0000 1.64 --- README 20 May 2004 20:04:09 -0000 1.65 *************** *** 100,103 **** --- 100,104 ---- -RSS supports ports other than 80. -RSS respects $calendar_path. + -YEARLY repeating events display better. -Various bug fixes. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.141 retrieving revision 1.142 diff -C2 -d -r1.141 -r1.142 *** config.inc.php 14 May 2004 21:09:16 -0000 1.141 --- config.inc.php 20 May 2004 20:04:12 -0000 1.142 *************** *** 21,25 **** $allday_week_lines = '1'; // Number of lines to wrap each event title in all-day events in week view, 0 means display all lines. $week_events_lines = '1'; // Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines. ! $timezone = ''; // Set timezone. Read TIMEZONES file for more information $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. --- 21,25 ---- $allday_week_lines = '1'; // Number of lines to wrap each event title in all-day events in week view, 0 means display all lines. $week_events_lines = '1'; // Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines. ! $timezone = '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. *************** *** 36,41 **** $allow_webcals = 'no'; // Allow http:// and webcal:// prefixed URLs to be used as the $cal for remote viewing of "subscribe-able" calendars. This does not have to be enabled to allow specific ones below. $this_months_events = 'yes'; // Display "This month's events" at the bottom off the month page. - $use_color_cals = 'yes'; // Display each calendar in the pop-up as a different color. - $daysofweek_dayview = 'no'; // Display the days of the week in day.php view. $enable_rss = 'yes'; // Enable RSS access to your calendars (good thing). $show_search = 'yes'; // Show the search box in the sidebar. --- 36,39 ---- |
|
From: <cl...@us...> - 2004-05-20 06:04:24
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28312/functions Modified Files: draw_functions.php ical_parser.php Log Message: More ereg to preg_match speed tweeks. Index: draw_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/draw_functions.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** draw_functions.php 8 Dec 2002 09:45:59 -0000 1.4 --- draw_functions.php 20 May 2004 06:04:14 -0000 1.5 *************** *** 5,9 **** global $gridLength; ! ereg ("([0-9]{2})([0-9]{2})", $start, $time); $sta_h = $time[1]; $sta_min = $time[2]; --- 5,9 ---- global $gridLength; ! preg_match ('/([0-9]{2})([0-9]{2})/', $start, $time); $sta_h = $time[1]; $sta_min = $time[2]; *************** *** 14,18 **** } ! ereg ("([0-9]{2})([0-9]{2})", $end, $time); $end_h = $time[1]; $end_min = $time[2]; --- 14,18 ---- } ! preg_match ('/([0-9]{2})([0-9]{2})/', $end, $time); $end_h = $time[1]; $end_min = $time[2]; Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.164 retrieving revision 1.165 diff -C2 -d -r1.164 -r1.165 *** ical_parser.php 20 May 2004 05:46:23 -0000 1.164 --- ical_parser.php 20 May 2004 06:04:14 -0000 1.165 *************** *** 205,209 **** if (isset($start_time) && $start_time != '') { preg_match ('/([0-9]{2})([0-9]{2})/', $start_time, $time); ! preg_match ('([0-9]{2})([0-9]{2})', $end_time, $time2); if (isset($start_unixtime) && isset($end_unixtime)) { $length = $end_unixtime - $start_unixtime; --- 205,209 ---- if (isset($start_time) && $start_time != '') { preg_match ('/([0-9]{2})([0-9]{2})/', $start_time, $time); ! preg_match ('/([0-9]{2})([0-9]{2})/', $end_time, $time2); if (isset($start_unixtime) && isset($end_unixtime)) { $length = $end_unixtime - $start_unixtime; *************** *** 213,217 **** $drawKey = drawEventTimes($start_time, $end_time); ! ereg ('([0-9]{2})([0-9]{2})', $drawKey['draw_start'], $time3); $hour = $time3[1]; $minute = $time3[2]; --- 213,217 ---- $drawKey = drawEventTimes($start_time, $end_time); ! preg_match ('/([0-9]{2})([0-9]{2})/', $drawKey['draw_start'], $time3); $hour = $time3[1]; $minute = $time3[2]; *************** *** 950,954 **** $exdata = str_replace('T', '', $exdata); $exdata = str_replace('Z', '', $exdata); ! ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})', $exdata, $regs); $except_dates[] = $regs[1] . $regs[2] . $regs[3]; $except_times[] = $regs[4] . $regs[5]; --- 950,954 ---- $exdata = str_replace('T', '', $exdata); $exdata = str_replace('Z', '', $exdata); ! preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})/', $exdata, $regs); $except_dates[] = $regs[1] . $regs[2] . $regs[3]; $except_times[] = $regs[4] . $regs[5]; |
|
From: <cl...@us...> - 2004-05-20 05:46:33
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25095/functions Modified Files: ical_parser.php Log Message: Optimizations: Moved more eregs to preg_match, changed if statements to case and switch. Seems ok on my calendars. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.163 retrieving revision 1.164 diff -C2 -d -r1.163 -r1.164 *** ical_parser.php 20 May 2004 04:15:19 -0000 1.163 --- ical_parser.php 20 May 2004 05:46:23 -0000 1.164 *************** *** 14,18 **** while ($fillTime < $day_end) { array_push ($day_array, $fillTime); ! ereg ('([0-9]{2})([0-9]{2})', $fillTime, $dTime); $fill_h = $dTime[1]; $fill_min = $dTime[2]; --- 14,18 ---- while ($fillTime < $day_end) { array_push ($day_array, $fillTime); ! preg_match ('/([0-9]{2})([0-9]{2})/', $fillTime, $dTime); $fill_h = $dTime[1]; $fill_min = $dTime[2]; *************** *** 27,31 **** // what date we want to get data for (for day calendar) if (!isset($getdate) || $getdate == '') $getdate = date('Ymd'); ! ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $getdate, $day_array2); $this_day = $day_array2[3]; $this_month = $day_array2[2]; --- 27,31 ---- // what date we want to get data for (for day calendar) if (!isset($getdate) || $getdate == '') $getdate = date('Ymd'); ! preg_match ("/([0-9]{4})([0-9]{2})([0-9]{2})/", $getdate, $day_array2); $this_day = $day_array2[3]; $this_month = $day_array2[2]; *************** *** 84,95 **** $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); ! if ($line == 'BEGIN:VEVENT') { // each of these vars were being set to an empty string unset ( --- 84,97 ---- $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); ! ! switch ($line) { ! case 'BEGIN:VEVENT': // each of these vars were being set to an empty string unset ( *************** *** 98,102 **** $beginning, $rrule_array, $start_of_vevent, $description, $bd, $url, $valarm_description, $start_unixtime, $end_unixtime, $display_end_tmp, $end_time_tmp1, ! $recurrence_id, $uid, $class, $location, $rrule, $abs_until, $until_check ); --- 100,107 ---- $beginning, $rrule_array, $start_of_vevent, $description, $bd, $url, $valarm_description, $start_unixtime, $end_unixtime, $display_end_tmp, $end_time_tmp1, ! $recurrence_id, $uid, $class, $location, $rrule, $abs_until, $until_check, ! $until, $bymonth, $byday, $bymonthday, $byweek, $byweekno, ! $byminute, $byhour, $bysecond, $byyearday, $bysetpos, $wkst, ! $interval, $number ); *************** *** 111,121 **** $organizer = array(); ! unset( ! $until, $bymonth, $byday, $bymonthday, $byweek, $byweekno, ! $byminute, $byhour, $bysecond, $byyearday, $bysetpos, $wkst, ! $interval, $number ! ); ! ! } elseif ($line == 'END:VEVENT') { if (!isset($master_array[-3][$calnumber])) $master_array[-3][$calnumber] = $actual_calname; --- 116,122 ---- $organizer = array(); ! break; ! ! case 'END:VEVENT': if (!isset($master_array[-3][$calnumber])) $master_array[-3][$calnumber] = $actual_calname; *************** *** 203,208 **** } if (isset($start_time) && $start_time != '') { ! ereg ('([0-9]{2})([0-9]{2})', $start_time, $time); ! ereg ('([0-9]{2})([0-9]{2})', $end_time, $time2); if (isset($start_unixtime) && isset($end_unixtime)) { $length = $end_unixtime - $start_unixtime; --- 204,209 ---- } if (isset($start_time) && $start_time != '') { ! preg_match ('/([0-9]{2})([0-9]{2})/', $start_time, $time); ! preg_match ('([0-9]{2})([0-9]{2})', $end_time, $time2); if (isset($start_unixtime) && isset($end_unixtime)) { $length = $end_unixtime - $start_unixtime; *************** *** 692,698 **** 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); ! ! // Begin VTODO Support ! } elseif ($line == 'END:VTODO') { if ((!$vtodo_priority) && ($status == 'COMPLETED')) { $vtodo_sort = 11; --- 693,698 ---- 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); ! break; ! case 'END:VTODO': if ((!$vtodo_priority) && ($status == 'COMPLETED')) { $vtodo_sort = 11; *************** *** 705,715 **** unset ($start_date, $start_time, $due_date, $due_time, $completed_date, $completed_time, $vtodo_priority, $status, $class, $vtodo_categories, $summary, $description); $vtodo_set = FALSE; ! } elseif ($line == 'BEGIN:VTODO') { $vtodo_set = TRUE; ! } elseif ($line == 'BEGIN:VALARM') { $valarm_set = TRUE; ! } elseif ($line == 'END:VALARM') { $valarm_set = FALSE; ! } else { unset ($field, $data, $prop_pos, $property); --- 705,722 ---- unset ($start_date, $start_time, $due_date, $due_time, $completed_date, $completed_time, $vtodo_priority, $status, $class, $vtodo_categories, $summary, $description); $vtodo_set = FALSE; ! ! break; ! ! case 'BEGIN:VTODO': $vtodo_set = TRUE; ! break; ! case 'BEGIN:VALARM': $valarm_set = TRUE; ! break; ! case 'END:VALARM': $valarm_set = FALSE; ! break; ! ! default: unset ($field, $data, $prop_pos, $property); *************** *** 865,869 **** } ! ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})', $data, $regs); $start_date = $regs[1] . $regs[2] . $regs[3]; $start_time = $regs[4] . $regs[5]; --- 872,876 ---- } ! preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})/', $data, $regs); $start_date = $regs[1] . $regs[2] . $regs[3]; $start_time = $regs[4] . $regs[5]; *************** *** 902,906 **** $field = str_replace(';VALUE=DATE-TIME', '', $field); if (preg_match("/^DTEND;VALUE=DATE/i", $field)) { ! ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $data, $dtend_check); if ($dtend_check[1] < 1970) { $data = '1971'.$dtend_check[2].$dtend_check[3]; --- 909,913 ---- $field = str_replace(';VALUE=DATE-TIME', '', $field); if (preg_match("/^DTEND;VALUE=DATE/i", $field)) { ! preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})/', $data, $dtend_check); if ($dtend_check[1] < 1970) { $data = '1971'.$dtend_check[2].$dtend_check[3]; *************** *** 916,920 **** } ! ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})', $data, $regs); $end_date = $regs[1] . $regs[2] . $regs[3]; $end_time = $regs[4] . $regs[5]; --- 923,927 ---- } ! preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})/', $data, $regs); $end_date = $regs[1] . $regs[2] . $regs[3]; $end_time = $regs[4] . $regs[5]; |
|
From: <cl...@us...> - 2004-05-20 04:15:30
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11494/functions Modified Files: ical_parser.php template.php Log Message: Added template generation time. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.162 retrieving revision 1.163 diff -C2 -d -r1.162 -r1.163 *** ical_parser.php 19 May 2004 07:51:58 -0000 1.162 --- ical_parser.php 20 May 2004 04:15:19 -0000 1.163 *************** *** 1110,1113 **** --- 1110,1115 ---- $calendar_name = $all_cal_comb_lang; } + + $template_started = getmicrotime(); ?> Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** template.php 19 May 2004 05:50:09 -0000 1.44 --- template.php 20 May 2004 04:15:19 -0000 1.45 *************** *** 882,886 **** function output() { ! global $template, $php_started, $lang, $enable_rss; // Looks for {MONTH} before sending page out --- 882,886 ---- function output() { ! global $template, $php_started, $lang, $enable_rss, $template_started; // Looks for {MONTH} before sending page out *************** *** 909,914 **** $php_ended = @getmicrotime(); ! $generated = number_format(($php_ended-$php_started),3); ! $this->page = str_replace('{GENERATED}', $generated, $this->page); if ($enable_rss != 'yes') { $this->page = preg_replace('!<\!-- switch rss_powered on -->(.*)<\!-- switch rss_powered off -->!is', '', $this->page); --- 909,916 ---- $php_ended = @getmicrotime(); ! $generated1 = number_format(($php_ended-$php_started),3); ! $generated2 = number_format(($php_ended-$template_started),3); ! $this->page = str_replace('{GENERATED1}', $generated1, $this->page); ! $this->page = str_replace('{GENERATED2}', $generated2, $this->page); if ($enable_rss != 'yes') { $this->page = preg_replace('!<\!-- switch rss_powered on -->(.*)<\!-- switch rss_powered off -->!is', '', $this->page); |
|
From: <cl...@us...> - 2004-05-20 04:15:30
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11494/templates/default Modified Files: footer.tpl Log Message: Added template generation time. Index: footer.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/footer.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** footer.tpl 15 May 2004 02:42:17 -0000 1.5 --- footer.tpl 20 May 2004 04:15:20 -0000 1.6 *************** *** 9,13 **** {L_THIS_SITE_IS} <a class="psf" href="{BASE}rss/index.php?cal={CAL}&getdate={GETDATE}">RSS-Enabled</a><br /> <!-- switch rss_powered off --> ! Page generated in {GENERATED} seconds. </center> </body> --- 9,14 ---- {L_THIS_SITE_IS} <a class="psf" href="{BASE}rss/index.php?cal={CAL}&getdate={GETDATE}">RSS-Enabled</a><br /> <!-- switch rss_powered off --> ! Page generated in {GENERATED1} seconds.<br /> ! Template generated in {GENERATED2} seconds. </center> </body> |
|
From: <cl...@us...> - 2004-05-20 03:59:52
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8863/templates/default Modified Files: default.css month.tpl month_large.tpl week.tpl Log Message: Misc HTML fixes. Index: default.css =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/default.css,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** default.css 20 May 2004 03:37:05 -0000 1.20 --- default.css 20 May 2004 03:59:37 -0000 1.21 *************** *** 47,50 **** --- 47,61 ---- .title h1 { font-family: Helvetica, sans-serif; font-size: 18px; color: #000; margin: 0px;} + /* Month View */ + + .monthback { background-color: #A1A5A9; } + .monthreg { background-color: #fff; height: 105px; width: 105px; text-align: left; vertical-align: top; } + .monthoff { background-color: #F2F2F2; height: 105px; width: 105px; text-align: left; vertical-align: top; } + .monthon { background-color: #F2F9FF; height: 105px; width: 105px; text-align: left; vertical-align: top; } + .montheventtop { background-image: url(images/side_bg.gif); border-top: 1px solid #A1A5A9; } + .montheventline { border-right: 1px dotted #A1A5A9; } + + /* Year View */ + .medtitle { background-image: url(images/side_bg.gif); height: 20px; margin-top: 3px; font-weight: 900; } .yearreg { background-color: #fff; height: 30px; width: 30px; text-align: right; vertical-align: top; font-size: 9px; } *************** *** 68,77 **** .navback { background-image: url(images/time_bg.gif); } .sideback { background-image: url(images/side_bg.gif); } ! .monthback { background-color: #A1A5A9; } ! .monthreg { background-color: #fff; height: 105px; width: 105px; text-align: left; vertical-align: top; } ! .monthoff { background-color: #F2F2F2; height: 105px; width: 105px; text-align: left; vertical-align: top; } ! .monthon { background-color: #F2F9FF; height: 105px; width: 105px; text-align: left; vertical-align: top; } ! .montheventtop { background-image: url(images/side_bg.gif); border-top: 1px solid #A1A5A9; } ! .montheventline { border-right: 1px dotted #A1A5A9; } /* Link colors and attributes */ --- 79,83 ---- .navback { background-image: url(images/time_bg.gif); } .sideback { background-image: url(images/side_bg.gif); } ! /* Link colors and attributes */ Index: month.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/month.tpl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** month.tpl 19 May 2004 18:26:10 -0000 1.14 --- month.tpl 20 May 2004 03:59:37 -0000 1.15 *************** *** 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 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="615" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></td> <td align="right" width="120" class="navback"> <div style="padding-top: 3px;"> Index: month_large.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/month_large.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** month_large.tpl 16 May 2004 05:39:26 -0000 1.7 --- month_large.tpl 20 May 2004 03:59:37 -0000 1.8 *************** *** 13,17 **** <td class="monthoff"> <div align="right"> ! <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}"><font class="G10G">{DAY}</font></a> </div> {ALLDAY} --- 13,17 ---- <td class="monthoff"> <div align="right"> ! <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a> </div> {ALLDAY} Index: week.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/week.tpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** week.tpl 19 May 2004 18:26:11 -0000 1.8 --- week.tpl 20 May 2004 03:59:37 -0000 1.9 *************** *** 9,13 **** <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;"> --- 9,13 ---- <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr valign="top"> ! <td align="left" width="490" 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;"> |
|
From: <cl...@us...> - 2004-05-20 03:37:20
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5018/templates/default Modified Files: default.css month_medium.tpl Log Message: Shaved 120k off of year template. Index: default.css =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/default.css,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** default.css 19 May 2004 18:26:10 -0000 1.19 --- default.css 20 May 2004 03:37:05 -0000 1.20 *************** *** 47,50 **** --- 47,57 ---- .title h1 { font-family: Helvetica, sans-serif; font-size: 18px; color: #000; margin: 0px;} + .medtitle { background-image: url(images/side_bg.gif); height: 20px; margin-top: 3px; font-weight: 900; } + .yearreg { background-color: #fff; height: 30px; width: 30px; text-align: right; vertical-align: top; font-size: 9px; } + .yearoff { background-color: #F2F2F2; height: 30px; width: 30px; text-align: right; vertical-align: top; font-size: 9px; } + .yearon { background-color: #F2F9FF; height: 30px; width: 30px; text-align: right; vertical-align: top; font-size: 9px; } + .yearmonth { background-color: #ccc; } + .yearweek { background-color: #eee; width: 30px; font-size: 9px; font-weight: 900; text-align: center; height: 15px; } + /* older styles */ *************** *** 65,74 **** .monthoff { background-color: #F2F2F2; height: 105px; width: 105px; text-align: left; vertical-align: top; } .monthon { background-color: #F2F9FF; height: 105px; width: 105px; text-align: left; vertical-align: top; } - .yearreg { background-color: #fff; height: 30px; width: 30px; text-align: left; vertical-align: top; } - .yearoff { background-color: #F2F2F2; height: 30px; width: 30px; text-align: left; vertical-align: top; } - .yearon { background-color: #F2F9FF; height: 30px; width: 30px; text-align: left; vertical-align: top; } .montheventtop { background-image: url(images/side_bg.gif); border-top: 1px solid #A1A5A9; } .montheventline { border-right: 1px dotted #A1A5A9; } - .yearmonth { background: #CCCCCC; } /* Link colors and attributes */ --- 72,77 ---- Index: month_medium.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/month_medium.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** month_medium.tpl 16 May 2004 07:05:41 -0000 1.5 --- month_medium.tpl 20 May 2004 03:37:06 -0000 1.6 *************** *** 1,5 **** <table border="0" width="210" cellspacing="0" cellpadding="0" class="calborder"> <tr> ! <td align="center" class="sideback"><div style="height: 16px; margin-top: 3px;" class="G10BOLD"><a class="ps3" href="month.php?cal={CAL}&getdate={MONTH_DATE}">{MONTH_TITLE}</a></div></td> </tr> <tr> --- 1,5 ---- <table border="0" width="210" cellspacing="0" cellpadding="0" class="calborder"> <tr> ! <td align="center" class="medtitle"><a class="ps3" href="month.php?cal={CAL}&getdate={MONTH_DATE}">{MONTH_TITLE}</a></td> </tr> <tr> *************** *** 8,12 **** <tr> <!-- loop weekday on --> ! <td width="30" height="14" class="dateback" align="center"><font class="V9BOLD">{LOOP_WEEKDAY}</font></td> <!-- loop weekday off --> </tr> --- 8,12 ---- <tr> <!-- loop weekday on --> ! <td class="yearweek">{LOOP_WEEKDAY}</td> <!-- loop weekday off --> </tr> *************** *** 15,25 **** <!-- loop monthdays on --> <!-- switch notthismonth on --> ! <td class="yearoff" onmouseover="this.style.backgroundColor='#DDDDDD'" onmouseout="this.style.backgroundColor='#F2F2F2'" onclick="window.location.href='day.php?cal=all_calendars_combined971&getdate={DAYLINK}'"> ! <div align="right" class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a></div> </td> <!-- switch notthismonth off --> <!-- switch istoday on --> ! <td class="yearreg" onmouseover="this.style.backgroundColor='#DDDDDD'" onmouseout="this.style.backgroundColor='#FFFFFF'" onclick="window.location.href='day.php?cal=all_calendars_combined971&getdate={DAYLINK}'"> ! <div align="right" class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a></div> <div align="center"> {ALLDAY} --- 15,25 ---- <!-- loop monthdays on --> <!-- switch notthismonth on --> ! <td class="yearoff"> ! <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a> </td> <!-- switch notthismonth off --> <!-- switch istoday on --> ! <td class="yearon"> ! <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a> <div align="center"> {ALLDAY} *************** *** 29,34 **** <!-- switch istoday off --> <!-- switch ismonth on --> ! <td class="yearreg" onmouseover="this.style.backgroundColor='#DDDDDD'" onmouseout="this.style.backgroundColor='#FFFFFF'" onclick="window.location.href='day.php?cal=all_calendars_combined971&getdate={DAYLINK}'"> ! <div align="right" class="V9"><a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a></div> <div align="center"> {ALLDAY} --- 29,34 ---- <!-- switch istoday off --> <!-- switch ismonth on --> ! <td class="yearreg"> ! <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{DAY}</a> <div align="center"> {ALLDAY} |
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2205/templates/default Modified Files: admin.tpl day.tpl default.css month.tpl preferences.tpl print.tpl rss_index.tpl search.tpl week.tpl year.tpl Log Message: Added <h1> and title class. Index: admin.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/admin.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** admin.tpl 19 May 2004 04:09:12 -0000 1.7 --- admin.tpl 19 May 2004 18:26:10 -0000 1.8 *************** *** 6,11 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr valign="top"> ! <td align="left" width="400" class="navback"><div style="padding: 5px;"><span class="H20">{L_ADMIN_HEADER}</span><br /><span class="V9G">{L_ADMIN_SUBHEAD}</span></div></td> ! <td valign="top" align="right" width="120" class="navback"> <div style="padding-top: 3px;"> <table width="120" border="0" cellpadding="0" cellspacing="0"> --- 6,11 ---- <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr valign="top"> ! <td align="left" width="400" class="title"><h1>{L_ADMIN_HEADER}</h1><span class="V9G">{L_ADMIN_SUBHEAD}</span></td> ! <td align="right" width="120" class="navback"> <div style="padding-top: 3px;"> <table width="120" border="0" cellpadding="0" cellspacing="0"> Index: day.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/day.tpl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** day.tpl 13 May 2004 06:24:40 -0000 1.13 --- day.tpl 19 May 2004 18:26:10 -0000 1.14 *************** *** 9,14 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr valign="top"> ! <td align="left" width="400" class="navback"><div style="padding: 5px;"><span class="H20">{DISPLAY_DATE}</span><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;"> <table width="120" border="0" cellpadding="0" cellspacing="0"> --- 9,14 ---- <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 align="right" width="120" class="navback"> <div style="padding-top: 3px;"> <table width="120" border="0" cellpadding="0" cellspacing="0"> Index: default.css =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/default.css,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** default.css 16 May 2004 07:05:41 -0000 1.18 --- default.css 19 May 2004 18:26:10 -0000 1.19 *************** *** 44,47 **** --- 44,50 ---- .dayborder2 { background-color: #fff; border-top: 1px dashed #ccc; } + .title { background-image: url(images/time_bg.gif); padding: 5px; } + .title h1 { font-family: Helvetica, sans-serif; font-size: 18px; color: #000; margin: 0px;} + /* older styles */ *************** *** 116,120 **** .G10G { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #A1A5A9; } .V12 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; color: #000000; } ! .H20 { font-family: Helvetica, sans-serif; font-size: 18px; color: #000000; } .eventfont { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #FFFFFF; } --- 119,123 ---- .G10G { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #A1A5A9; } .V12 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; color: #000000; } ! /*h1 { font-family: Helvetica, sans-serif; font-size: 18px; color: #000000; }*/ .eventfont { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #FFFFFF; } Index: month.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/month.tpl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** month.tpl 16 May 2004 05:39:26 -0000 1.13 --- month.tpl 19 May 2004 18:26:10 -0000 1.14 *************** *** 6,11 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr valign="top"> ! <td align="left" width="400" class="navback"><div style="padding: 5px;"><span class="H20">{DISPLAY_DATE}</span><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;"> <table width="120" border="0" cellpadding="0" cellspacing="0"> --- 6,11 ---- <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 align="right" width="120" class="navback"> <div style="padding-top: 3px;"> <table width="120" border="0" cellpadding="0" cellspacing="0"> *************** *** 42,46 **** <tr> <td align="right" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&getdate={PREV_MONTH}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="{L_PREV}" border="0" align="right" /></a></td> ! <td align="center" width="20%" class="navback" nowrap="nowrap" valign="middle"><font class="H20">{L_THIS_MONTHS}</font></td> <td align="left" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&getdate={NEXT_MONTH}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left" /></a></td> </tr> --- 42,46 ---- <tr> <td align="right" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&getdate={PREV_MONTH}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="{L_PREV}" border="0" align="right" /></a></td> ! <td align="center" width="20%" class="title" nowrap="nowrap" valign="middle"><h1>{L_THIS_MONTHS}</h1></td> <td align="left" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&getdate={NEXT_MONTH}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left" /></a></td> </tr> Index: preferences.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/preferences.tpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** preferences.tpl 16 May 2004 17:09:01 -0000 1.9 --- preferences.tpl 19 May 2004 18:26:10 -0000 1.10 *************** *** 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;"><span class="H20">{L_PREFERENCES}</span><br /><span class="V9G">{L_PREFS_SUBHEAD}</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>{L_PREFERENCES}</h1><span class="V9G">{L_PREFS_SUBHEAD}</span></td> <td valign="top" align="right" width="120" class="navback"> <div style="padding-top: 3px;"> Index: print.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/print.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** print.tpl 16 May 2004 19:39:14 -0000 1.3 --- print.tpl 19 May 2004 18:26:10 -0000 1.4 *************** *** 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;"><span class="H20">{DISPLAY_DATE}</span><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="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;"> Index: rss_index.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/rss_index.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** rss_index.tpl 16 May 2004 17:38:56 -0000 1.3 --- rss_index.tpl 19 May 2004 18:26:10 -0000 1.4 *************** *** 9,13 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr valign="top"> ! <td align="left" width="400" class="navback"><div style="padding: 5px;"><span class="H20">{L_RSS_INFO}</span><br /><span class="V9G">{L_RSS_SUBHEAD}</span></div></td> <td valign="top" align="right" width="120" class="navback"> <div style="padding-top: 3px;"> --- 9,13 ---- <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr valign="top"> ! <td align="left" width="400" class="title"><h1>{L_RSS_INFO}</h1><span class="V9G">{L_RSS_SUBHEAD}</span></div></td> <td valign="top" align="right" width="120" class="navback"> <div style="padding-top: 3px;"> Index: search.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/search.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** search.tpl 15 May 2004 02:42:17 -0000 1.3 --- search.tpl 19 May 2004 18:26:11 -0000 1.4 *************** *** 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;"><span class="H20">{L_RESULTS}</span><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="navback"><div style="padding: 5px;"><h1>{L_RESULTS}</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;"> Index: week.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/week.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** week.tpl 16 May 2004 04:13:28 -0000 1.7 --- week.tpl 19 May 2004 18:26:11 -0000 1.8 *************** *** 9,13 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr valign="top"> ! <td align="left" width="400" class="navback"><div style="padding: 5px;"><span class="H20">{DISPLAY_DATE}</span><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;"> --- 9,13 ---- <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;"> Index: year.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/year.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** year.tpl 16 May 2004 07:05:41 -0000 1.6 --- year.tpl 19 May 2004 18:26:11 -0000 1.7 *************** *** 15,20 **** <a class="psf" href="year.php?cal={CAL}&getdate={PREV_YEAR}"><img src="styles/silver/left_day.gif" alt="[Previous Year]" border="0" align="right" /></a> </td> ! <td align="center" width="10%" class="navback" nowrap="nowrap" valign="middle"> ! <font class="H20">{THIS_YEAR}</font> </td> <td align="left" width="45%" class="navback"> --- 15,20 ---- <a class="psf" href="year.php?cal={CAL}&getdate={PREV_YEAR}"><img src="styles/silver/left_day.gif" alt="[Previous Year]" border="0" align="right" /></a> </td> ! <td align="center" width="10%" class="title" nowrap="nowrap" valign="middle"> ! <h1>{THIS_YEAR}</h1> </td> <td align="left" width="45%" class="navback"> |
|
From: <cl...@us...> - 2004-05-19 07:52:07
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4759/functions Modified Files: ical_parser.php Log Message: Fixed more yearly events, but Jan 1 does not display in december. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.161 retrieving revision 1.162 diff -C2 -d -r1.161 -r1.162 *** ical_parser.php 19 May 2004 06:50:57 -0000 1.161 --- ical_parser.php 19 May 2004 07:51:58 -0000 1.162 *************** *** 321,326 **** $this_month_start_time = strtotime($this_year.$this_month.'01'); if ($save_parsed_cals == 'yes' && !$is_webcal) { ! $start_range_time = strtotime($this_year.'-01-01 -1 month -2 days'); ! $end_range_time = strtotime($this_year.'-12-31 +1 month +2 days'); } else { $start_range_time = strtotime('-1 month -2 day', $this_month_start_time); --- 321,326 ---- $this_month_start_time = strtotime($this_year.$this_month.'01'); if ($save_parsed_cals == 'yes' && !$is_webcal) { ! $start_range_time = strtotime($this_year.'-01-01 -2 weeks'); ! $end_range_time = strtotime($this_year.'-12-31 +2 weeks'); } else { $start_range_time = strtotime('-1 month -2 day', $this_month_start_time); *************** *** 537,542 **** } foreach($bymonth as $month) { ! // Something is wrong with this range $year = date('Y', $next_range_time); if ((isset($byday)) && (is_array($byday))) { $checkdate_time = mktime(0,0,0,$month,1,$year); --- 537,545 ---- } foreach($bymonth as $month) { ! // FIXME: Jan 1 does not display in December $year = date('Y', $next_range_time); + if (($year != $this_year) && ($month < 3)) { + $year = $this_year; + } if ((isset($byday)) && (is_array($byday))) { $checkdate_time = mktime(0,0,0,$month,1,$year); |
|
From: <cl...@us...> - 2004-05-19 06:51:09
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26244/functions Modified Files: ical_parser.php Log Message: Fixed Memorial Day for ical holidays. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.160 retrieving revision 1.161 diff -C2 -d -r1.160 -r1.161 *** ical_parser.php 19 May 2004 05:50:09 -0000 1.160 --- ical_parser.php 19 May 2004 06:50:57 -0000 1.161 *************** *** 527,531 **** } $next_date = date('Ymd', $next_date_time); - //$recur_data[] = $next_date_time; } } --- 527,530 ---- *************** *** 538,541 **** --- 537,541 ---- } foreach($bymonth as $month) { + // Something is wrong with this range $year = date('Y', $next_range_time); if ((isset($byday)) && (is_array($byday))) { *************** *** 543,548 **** foreach($byday as $day) { ereg ('([-\+]{0,1})?([0-9]{1})?([A-Z]{2})', $day, $byday_arr); ! $nth = $byday_arr[2]-1; $on_day = two2threeCharDays($byday_arr[3]); if ($byday_arr[1] == '-') { $last_day_tmp = date('t',$checkdate_time); --- 543,553 ---- foreach($byday as $day) { ereg ('([-\+]{0,1})?([0-9]{1})?([A-Z]{2})', $day, $byday_arr); ! if ($byday_arr[2] != '') { ! $nth = $byday_arr[2]-1; ! } else { ! $nth = 0; ! } $on_day = two2threeCharDays($byday_arr[3]); + $on_day_num = two2threeCharDays($byday_arr[3],false); if ($byday_arr[1] == '-') { $last_day_tmp = date('t',$checkdate_time); *************** *** 557,560 **** --- 562,566 ---- $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; *************** *** 574,578 **** $recur_data[] = $next_date_time; } ! } break; default: --- 580,584 ---- $recur_data[] = $next_date_time; } ! } break; default: |
|
From: <cl...@us...> - 2004-05-19 05:50:19
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16323/functions Modified Files: ical_parser.php template.php Log Message: Replaced ereg_replace with str_replace for speed. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.159 retrieving revision 1.160 diff -C2 -d -r1.159 -r1.160 *** ical_parser.php 16 May 2004 20:30:19 -0000 1.159 --- ical_parser.php 19 May 2004 05:50:09 -0000 1.160 *************** *** 347,352 **** break; case 'UNTIL': ! $until = ereg_replace('T', '', $val); ! $until = ereg_replace('Z', '', $until); if (strlen($until) == 8) $until = $until.'235959'; $abs_until = $until; --- 347,352 ---- break; case 'UNTIL': ! $until = str_replace('T', '', $val); ! $until = str_replace('Z', '', $until); if (strlen($until) == 8) $until = $until.'235959'; $abs_until = $until; *************** *** 722,727 **** $zulu_time = false; if (substr($data,-1) == 'Z') $zulu_time = true; ! $data = ereg_replace('T', '', $data); ! $data = ereg_replace('Z', '', $data); if (preg_match("/^DUE;VALUE=DATE/i", $field)) { $allday_start = $data; --- 722,727 ---- $zulu_time = false; if (substr($data,-1) == 'Z') $zulu_time = true; ! $data = str_replace('T', '', $data); ! $data = str_replace('Z', '', $data); if (preg_match("/^DUE;VALUE=DATE/i", $field)) { $allday_start = $data; *************** *** 771,776 **** $zulu_time = false; if (substr($data,-1) == 'Z') $zulu_time = true; ! $data = ereg_replace('T', '', $data); ! $data = ereg_replace('Z', '', $data); if (preg_match("/^COMPLETED;VALUE=DATE/i", $field)) { $allday_start = $data; --- 771,776 ---- $zulu_time = false; if (substr($data,-1) == 'Z') $zulu_time = true; ! $data = str_replace('T', '', $data); ! $data = str_replace('Z', '', $data); if (preg_match("/^COMPLETED;VALUE=DATE/i", $field)) { $allday_start = $data; *************** *** 836,842 **** $zulu_time = false; if (substr($data,-1) == 'Z') $zulu_time = true; ! $data = ereg_replace('T', '', $data); ! $data = ereg_replace('Z', '', $data); ! $field = ereg_replace(';VALUE=DATE-TIME', '', $field); if ((preg_match("/^DTSTART;VALUE=DATE/i", $field)) || (ereg ('^([0-9]{4})([0-9]{2})([0-9]{2})$', $data))) { ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $data, $dtstart_check); --- 836,842 ---- $zulu_time = false; if (substr($data,-1) == 'Z') $zulu_time = true; ! $data = str_replace('T', '', $data); ! $data = str_replace('Z', '', $data); ! $field = str_replace(';VALUE=DATE-TIME', '', $field); if ((preg_match("/^DTSTART;VALUE=DATE/i", $field)) || (ereg ('^([0-9]{4})([0-9]{2})([0-9]{2})$', $data))) { ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $data, $dtstart_check); *************** *** 889,895 **** $zulu_time = false; if (substr($data,-1) == 'Z') $zulu_time = true; ! $data = ereg_replace('T', '', $data); ! $data = ereg_replace('Z', '', $data); ! $field = ereg_replace(';VALUE=DATE-TIME', '', $field); if (preg_match("/^DTEND;VALUE=DATE/i", $field)) { ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $data, $dtend_check); --- 889,895 ---- $zulu_time = false; if (substr($data,-1) == 'Z') $zulu_time = true; ! $data = str_replace('T', '', $data); ! $data = str_replace('Z', '', $data); ! $field = str_replace(';VALUE=DATE-TIME', '', $field); if (preg_match("/^DTEND;VALUE=DATE/i", $field)) { ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $data, $dtend_check); *************** *** 932,937 **** $data = split(",", $data); foreach ($data as $exdata) { ! $exdata = ereg_replace('T', '', $exdata); ! $exdata = ereg_replace('Z', '', $exdata); ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})', $exdata, $regs); $except_dates[] = $regs[1] . $regs[2] . $regs[3]; --- 932,937 ---- $data = split(",", $data); foreach ($data as $exdata) { ! $exdata = str_replace('T', '', $exdata); ! $exdata = str_replace('Z', '', $exdata); ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})', $exdata, $regs); $except_dates[] = $regs[1] . $regs[2] . $regs[3]; *************** *** 980,985 **** unset($parts, $part, $eachval); ! $data = ereg_replace('T', '', $data); ! $data = ereg_replace('Z', '', $data); ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})', $data, $regs); $recurrence_id['date'] = $regs[1] . $regs[2] . $regs[3]; --- 980,985 ---- unset($parts, $part, $eachval); ! $data = str_replace('T', '', $data); ! $data = str_replace('Z', '', $data); ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})', $data, $regs); $recurrence_id['date'] = $regs[1] . $regs[2] . $regs[3]; *************** *** 1020,1028 **** if (($first_duration == TRUE) && (!stristr($field, '=DURATION'))) { ereg ('^P([0-9]{1,2}[W])?([0-9]{1,2}[D])?([T]{0,1})?([0-9]{1,2}[H])?([0-9]{1,2}[M])?([0-9]{1,2}[S])?', $data, $duration); ! $weeks = ereg_replace('W', '', $duration[1]); ! $days = ereg_replace('D', '', $duration[2]); ! $hours = ereg_replace('H', '', $duration[4]); ! $minutes = ereg_replace('M', '', $duration[5]); ! $seconds = ereg_replace('S', '', $duration[6]); $the_duration = ($weeks * 60 * 60 * 24 * 7) + ($days * 60 * 60 * 24) + ($hours * 60 * 60) + ($minutes * 60) + ($seconds); $first_duration = FALSE; --- 1020,1028 ---- if (($first_duration == TRUE) && (!stristr($field, '=DURATION'))) { ereg ('^P([0-9]{1,2}[W])?([0-9]{1,2}[D])?([T]{0,1})?([0-9]{1,2}[H])?([0-9]{1,2}[M])?([0-9]{1,2}[S])?', $data, $duration); ! $weeks = str_replace('W', '', $duration[1]); ! $days = str_replace('D', '', $duration[2]); ! $hours = str_replace('H', '', $duration[4]); ! $minutes = str_replace('M', '', $duration[5]); ! $seconds = str_replace('S', '', $duration[6]); $the_duration = ($weeks * 60 * 60 * 24 * 7) + ($days * 60 * 60 * 24) + ($hours * 60 * 60) + ($minutes * 60) + ($seconds); $first_duration = FALSE; *************** *** 1030,1034 **** break; case 'RRULE': ! $data = ereg_replace ('RRULE:', '', $data); $rrule = split (';', $data); foreach ($rrule as $recur) { --- 1030,1034 ---- break; case 'RRULE': ! $data = str_replace ('RRULE:', '', $data); $rrule = split (';', $data); foreach ($rrule as $recur) { *************** *** 1038,1048 **** break; case 'ATTENDEE': ! $field = ereg_replace("ATTENDEE;CN=", "", $field); ! $data = ereg_replace ("mailto:", "", $data); $attendee[] = array ('name' => $field, 'email' => $data); break; case 'ORGANIZER': ! $field = ereg_replace("ORGANIZER;CN=", "", $field); ! $data = ereg_replace ("mailto:", "", $data); $organizer[] = array ('name' => $field, 'email' => $data); break; --- 1038,1048 ---- break; case 'ATTENDEE': ! $field = str_replace("ATTENDEE;CN=", "", $field); ! $data = str_replace ("mailto:", "", $data); $attendee[] = array ('name' => $field, 'email' => $data); break; case 'ORGANIZER': ! $field = str_replace("ORGANIZER;CN=", "", $field); ! $data = str_replace ("mailto:", "", $data); $organizer[] = array ('name' => $field, 'email' => $data); break; Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** template.php 19 May 2004 03:45:09 -0000 1.43 --- template.php 19 May 2004 05:50:09 -0000 1.44 *************** *** 7,12 **** function draw_subscribe($template_p) { global $template, $getdate, $cal, $ALL_CALENDARS_COMBINED, $subscribe_path, $download_filename; - preg_match("!<\!-- switch display_download on -->(.*)<\!-- switch display_download off -->!is", $this->page, $match1); - $subscribe = trim($match2[1]); if ($cal != $ALL_CALENDARS_COMBINED && $subscribe_path != '' && $download_filename != '') { $this->page = str_replace('{SUBSCRIBE_PATH}', $subscribe_path, $this->page); --- 7,10 ---- |
|
From: <cl...@us...> - 2004-05-19 04:20:05
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29410 Modified Files: print.php Log Message: Print language checkin. Index: print.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** print.php 16 May 2004 19:39:13 -0000 1.23 --- print.php 19 May 2004 04:19:53 -0000 1.24 *************** *** 80,84 **** 'list_jumps' => $list_jumps, 'legend' => $list_calcolors, ! 'style_select' => $style_select )); --- 80,95 ---- 'list_jumps' => $list_jumps, 'legend' => $list_calcolors, ! 'style_select' => $style_select, ! 'l_time' => $lang['l_time'], ! 'l_summary' => $lang['l_summary'], ! 'l_calendar' => $lang['l_calendar'], ! 'l_day' => $lang['l_day'], ! 'l_week' => $lang['l_week'], ! 'l_month' => $lang['l_month'], ! 'l_year' => $lang['l_year'], ! 'l_subscribe' => $lang['l_subscribe'], ! 'l_download' => $lang['l_download'], ! 'l_powered_by' => $lang['l_powered_by'], ! 'l_this_site_is' => $lang['l_this_site_is'] )); |
|
From: <cl...@us...> - 2004-05-19 04:16:57
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28835/rss Modified Files: index.php Log Message: Prefs Language checkin. Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** index.php 19 May 2004 04:09:12 -0000 1.27 --- index.php 19 May 2004 04:16:48 -0000 1.28 *************** *** 8,12 **** $current_view = "rssindex"; ! $display_date = "$calendar_lang - RSS Info"; $filelist = availableCalendarNames($username, $password, $ALL_CALENDARS_COMBINED); --- 8,12 ---- $current_view = "rssindex"; ! $display_date = "RSS Info"; $filelist = availableCalendarNames($username, $password, $ALL_CALENDARS_COMBINED); |
|
From: <cl...@us...> - 2004-05-19 04:16:57
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28835 Modified Files: preferences.php Log Message: Prefs Language checkin. Index: preferences.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** preferences.php 16 May 2004 17:09:01 -0000 1.45 --- preferences.php 19 May 2004 04:16:48 -0000 1.46 *************** *** 155,159 **** 'display_date' => $lang['l_preferences'], 'generated' => $generated, ! 'message' => $message )); --- 155,177 ---- 'display_date' => $lang['l_preferences'], 'generated' => $generated, ! 'message' => $message, ! 'l_preferences' => $lang['l_preferences'], ! 'l_prefs_subhead' => $lang['l_prefs_subhead'], ! 'l_select_lang' => $lang['l_select_lang'], ! 'l_select_view' => $lang['l_select_view'], ! 'l_select_time' => $lang['l_select_time'], ! 'l_select_day' => $lang['l_select_day'], ! 'l_select_cal' => $lang['l_select_cal'], ! 'l_select_style' => $lang['l_select_style'], ! 'l_unset_prefs' => $lang['l_unset_prefs'], ! 'l_set_prefs' => $lang['l_set_prefs'], ! 'l_day' => $lang['l_day'], ! 'l_week' => $lang['l_week'], ! 'l_month' => $lang['l_month'], ! 'l_year' => $lang['l_year'], ! 'l_subscribe' => $lang['l_subscribe'], ! 'l_download' => $lang['l_download'], ! 'l_powered_by' => $lang['l_powered_by'], ! 'l_this_site_is' => $lang['l_this_site_is'] )); |
|
From: <cl...@us...> - 2004-05-19 04:09:29
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27268 Modified Files: admin.php Log Message: RSS languages added. Index: admin.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/admin.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** admin.php 19 May 2004 04:03:33 -0000 1.14 --- admin.php 19 May 2004 04:09:11 -0000 1.15 *************** *** 79,82 **** --- 79,84 ---- 'l_logout' => $lang['l_logout'], 'l_submit' => $lang['l_submit'], + 'l_addupdate_cal' => $lang['l_addupdate_cal'], + 'l_addupdate_desc' => $lang['l_addupdate_desc'], 'l_powered_by' => $lang['l_powered_by'], 'l_this_site_is' => $lang['l_this_site_is'] |
|
From: <cl...@us...> - 2004-05-19 04:09:29
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27268/templates/default Modified Files: admin.tpl Log Message: RSS languages added. Index: admin.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/admin.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** admin.tpl 19 May 2004 04:03:34 -0000 1.6 --- admin.tpl 19 May 2004 04:09:12 -0000 1.7 *************** *** 76,80 **** <form action="admin.php" method="post" enctype="multipart/form-data"> <input type="hidden" name="action" value="addupdate"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B"> <tr> <td nowrap>{L_CAL_FILE} 1: </td> --- 76,80 ---- <form action="admin.php" method="post" enctype="multipart/form-data"> <input type="hidden" name="action" value="addupdate"> ! <table width="100%" border="0" cellspacing="0" cellpadding="2" class="G10B"> <tr> <td nowrap>{L_CAL_FILE} 1: </td> |
|
From: <cl...@us...> - 2004-05-19 04:09:29
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27268/rss Modified Files: index.php Log Message: RSS languages added. Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** index.php 16 May 2004 17:38:56 -0000 1.26 --- index.php 19 May 2004 04:09:12 -0000 1.27 *************** *** 46,50 **** 'rss_valid' => '', 'todo_js' => '', ! 'show_search' => '' )); --- 46,61 ---- 'rss_valid' => '', 'todo_js' => '', ! 'show_search' => '', ! 'l_rss_info' => $lang['l_rss_info'], ! 'l_rss_subhead' => $lang['l_rss_subhead'], ! 'l_day' => $lang['l_day'], ! 'l_week' => $lang['l_week'], ! 'l_month' => $lang['l_month'], ! 'l_year' => $lang['l_year'], ! 'l_subscribe' => $lang['l_subscribe'], ! 'l_download' => $lang['l_download'], ! 'l_this_months' => $lang['l_this_months'], ! 'l_powered_by' => $lang['l_powered_by'], ! 'l_this_site_is' => $lang['l_this_site_is'] )); |
|
From: <cl...@us...> - 2004-05-19 04:03:43
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26381 Modified Files: admin.php Log Message: Admin language replacements. Index: admin.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/admin.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** admin.php 9 Feb 2004 00:51:48 -0000 1.13 --- admin.php 19 May 2004 04:03:33 -0000 1.14 *************** *** 64,68 **** 'rss_valid' => '', 'todo_js' => '', ! 'show_search' => '' )); --- 64,84 ---- 'rss_valid' => '', 'todo_js' => '', ! 'show_search' => '', ! 'l_day' => $lang['l_day'], ! 'l_week' => $lang['l_week'], ! 'l_month' => $lang['l_month'], ! 'l_year' => $lang['l_year'], ! 'l_admin_header' => $lang['l_admin_header'], ! 'l_admin_subhead' => $lang['l_admin_subhead'], ! 'l_invalid_login' => $lang['l_invalid_login'], ! 'l_username' => $lang['l_username'], ! 'l_password' => $lang['l_password'], ! 'l_cal_file' => $lang['l_cal_file'], ! 'l_delete_cal' => $lang['l_delete_cal'], ! 'l_delete' => $lang['l_delete'], ! 'l_logout' => $lang['l_logout'], ! 'l_submit' => $lang['l_submit'], ! 'l_powered_by' => $lang['l_powered_by'], ! 'l_this_site_is' => $lang['l_this_site_is'] )); |
|
From: <cl...@us...> - 2004-05-19 04:03:43
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26381/templates/default Modified Files: admin.tpl Log Message: Admin language replacements. Index: admin.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/admin.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin.tpl 15 May 2004 02:42:17 -0000 1.5 --- admin.tpl 19 May 2004 04:03:34 -0000 1.6 *************** *** 1,5 **** {HEADER} <center> ! <table border="0" width="520" cellspacing="0" cellpadding="0" class="calborder"> <tr> <td> --- 1,5 ---- {HEADER} <center> ! <table border="0" width="600" cellspacing="0" cellpadding="0" class="calborder"> <tr> <td> *************** *** 24,28 **** </tr> <tr> ! <td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td> </tr> <tr> --- 24,28 ---- </tr> <tr> ! <td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" " /></td> </tr> <tr> *************** *** 122,126 **** </tr> </table> ! <table width="520" border="0" cellpadding="0" cellspacing="0"> <tr> <td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> --- 122,126 ---- </tr> </table> ! <table width="600" border="0" cellpadding="0" cellspacing="0"> <tr> <td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> |
|
From: <cl...@us...> - 2004-05-19 03:45:20
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22817/templates/default Modified Files: sidebar.tpl Log Message: Code optimization: Specifically replace each language variable instead of looking for any. Index: sidebar.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/sidebar.tpl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** sidebar.tpl 15 May 2004 03:22:56 -0000 1.13 --- sidebar.tpl 19 May 2004 03:45:09 -0000 1.14 *************** *** 16,24 **** <!-- switch invalid_login off --> <tr> ! <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">Username:</div></td> <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td> </tr> <tr> ! <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">Password:</div></td> <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td> </tr> --- 16,24 ---- <!-- switch invalid_login off --> <tr> ! <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td> <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td> </tr> <tr> ! <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td> <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td> </tr> |
