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: <ji...@us...> - 2006-03-21 09:54:06
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26562/phpicalendar/templates/default Modified Files: footer.tpl print.tpl year.tpl Log Message: add year printview, fix misc bugs Index: footer.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/footer.tpl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** footer.tpl 16 Mar 2006 02:55:06 -0000 1.13 --- footer.tpl 21 Mar 2006 09:52:30 -0000 1.14 *************** *** 1,3 **** ! <center class="V9"><br />{L_POWERED_BY} <a class="psf" href="http://phpicalendar.net/">PHP iCalendar 2.21</a><br /> <!-- switch rss_valid on --> <p> --- 1,3 ---- ! <center class="V9"><br />{L_POWERED_BY} <a class="psf" href="http://phpicalendar.net/">PHP iCalendar 2.22rc1</a><br /> <!-- switch rss_valid on --> <p> Index: print.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/print.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** print.tpl 1 Dec 2005 06:25:09 -0000 1.6 --- print.tpl 21 Mar 2006 09:52:30 -0000 1.7 *************** *** 14,17 **** --- 14,18 ---- <td><a class="psf" href="print.php?cal={CAL}&getdate={GETDATE}&printview=week"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> <td><a class="psf" href="print.php?cal={CAL}&getdate={GETDATE}&printview=month"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> + <td><a class="psf" href="print.php?cal={CAL}&getdate={GETDATE}&printview=year"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> Index: year.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/year.tpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** year.tpl 23 Nov 2005 06:08:45 -0000 1.10 --- year.tpl 21 Mar 2006 09:52:30 -0000 1.11 *************** *** 57,60 **** --- 57,64 ---- {MONTH_MEDIUM|03} </td> + <td width="20" rowspan='8'> + <img src="images/spacer.gif" width="20" height="1" alt=" " /> + </td> + <td rowspan='8' valign='top'>{SIDEBAR}</td> </tr> <tr> |
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26562/phpicalendar/languages Modified Files: afrikaans.inc.php brazilian.inc.php catalan.inc.php czech.inc.php danish.inc.php english.inc.php esperanto.inc.php french.inc.php german.inc.php italian.inc.php japanese.inc.php korean.inc.php lithuanian.inc.php norwegian.inc.php polish.inc.php portuguese.inc.php spanish.inc.php swedish.inc.php traditional_chinese.inc.php Log Message: add year printview, fix misc bugs Index: afrikaans.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/afrikaans.inc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** afrikaans.inc.php 16 Mar 2006 02:17:58 -0000 1.3 --- afrikaans.inc.php 21 Mar 2006 09:52:29 -0000 1.4 *************** *** 181,184 **** --- 181,185 ---- $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %e %B'; + $dateFormat_year = '%Y'; /* Index: brazilian.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/brazilian.inc.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** brazilian.inc.php 16 Mar 2006 02:17:58 -0000 1.10 --- brazilian.inc.php 21 Mar 2006 09:52:29 -0000 1.11 *************** *** 176,179 **** --- 176,180 ---- $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %e %B'; + $dateFormat_year = '%Y'; /* Index: catalan.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/catalan.inc.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** catalan.inc.php 16 Mar 2006 02:17:58 -0000 1.11 --- catalan.inc.php 21 Mar 2006 09:52:29 -0000 1.12 *************** *** 176,179 **** --- 176,180 ---- $dateFormat_month = '%B de %Y'; $dateFormat_month_list = '%A, %e de %B'; + $dateFormat_year = '%Y'; /* Index: czech.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/czech.inc.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** czech.inc.php 16 Mar 2006 02:17:58 -0000 1.9 --- czech.inc.php 21 Mar 2006 09:52:29 -0000 1.10 *************** *** 175,178 **** --- 175,179 ---- $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %e. %B'; + $dateFormat_year = '%Y'; /* Index: danish.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/danish.inc.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** danish.inc.php 6 May 2005 02:08:26 -0000 1.26 --- danish.inc.php 21 Mar 2006 09:52:29 -0000 1.27 *************** *** 166,169 **** --- 166,170 ---- $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %e %B'; + $dateFormat_year = '%Y'; /* Index: english.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** english.inc.php 16 Mar 2006 02:17:58 -0000 1.62 --- english.inc.php 21 Mar 2006 09:52:29 -0000 1.63 *************** *** 177,180 **** --- 177,182 ---- $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %B %e'; + $dateFormat_year = '%Y'; + /* Index: esperanto.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/esperanto.inc.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** esperanto.inc.php 6 May 2005 02:08:26 -0000 1.6 --- esperanto.inc.php 21 Mar 2006 09:52:29 -0000 1.7 *************** *** 168,171 **** --- 168,172 ---- $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %B %e'; + $dateFormat_year = '%Y'; /* Index: french.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/french.inc.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** french.inc.php 16 Mar 2006 02:17:58 -0000 1.29 --- french.inc.php 21 Mar 2006 09:52:29 -0000 1.30 *************** *** 179,182 **** --- 179,183 ---- $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A %e %B'; + $dateFormat_year = '%Y'; /* Index: german.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/german.inc.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** german.inc.php 16 Mar 2006 06:15:12 -0000 1.30 --- german.inc.php 21 Mar 2006 09:52:29 -0000 1.31 *************** *** 179,182 **** --- 179,183 ---- $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %e. %B'; + $dateFormat_year = '%Y'; /* Index: italian.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/italian.inc.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** italian.inc.php 16 Mar 2006 06:15:12 -0000 1.30 --- italian.inc.php 21 Mar 2006 09:52:29 -0000 1.31 *************** *** 179,182 **** --- 179,183 ---- $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %e %B'; + $dateFormat_year = '%Y'; /* Index: japanese.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/japanese.inc.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** japanese.inc.php 16 Mar 2006 02:17:58 -0000 1.34 --- japanese.inc.php 21 Mar 2006 09:52:29 -0000 1.35 *************** *** 178,181 **** --- 178,182 ---- $dateFormat_month = '%Yå¹´%B'; $dateFormat_month_list = '%B%eæ¥ %A'; + $dateFormat_year = '%Y'; /* Index: korean.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/korean.inc.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** korean.inc.php 6 May 2005 02:08:27 -0000 1.5 --- korean.inc.php 21 Mar 2006 09:52:29 -0000 1.6 *************** *** 164,167 **** --- 164,168 ---- $dateFormat_month = '%Yë %B'; $dateFormat_month_list = '%B %eì¼, %A'; + $dateFormat_year = '%Y'; /* Index: lithuanian.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/lithuanian.inc.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lithuanian.inc.php 16 Mar 2006 02:17:58 -0000 1.2 --- lithuanian.inc.php 21 Mar 2006 09:52:29 -0000 1.3 *************** *** 177,180 **** --- 177,181 ---- $dateFormat_month = '%Y m. %b mÄn.'; $dateFormat_month_list = '%A, %B %e d.'; + $dateFormat_year = '%Y'; /* Index: norwegian.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/norwegian.inc.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** norwegian.inc.php 16 Mar 2006 02:17:58 -0000 1.30 --- norwegian.inc.php 21 Mar 2006 09:52:29 -0000 1.31 *************** *** 178,181 **** --- 178,182 ---- $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A %e. %B'; + $dateFormat_year = '%Y'; /* Index: polish.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/polish.inc.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** polish.inc.php 6 May 2005 02:08:27 -0000 1.27 --- polish.inc.php 21 Mar 2006 09:52:29 -0000 1.28 *************** *** 164,167 **** --- 164,168 ---- $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %e %B'; + $dateFormat_year = '%Y'; /* Index: portuguese.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/portuguese.inc.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** portuguese.inc.php 16 Mar 2006 02:17:58 -0000 1.16 --- portuguese.inc.php 21 Mar 2006 09:52:29 -0000 1.17 *************** *** 176,179 **** --- 176,180 ---- $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %e %B'; + $dateFormat_year = '%Y'; /* Index: spanish.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/spanish.inc.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** spanish.inc.php 16 Mar 2006 02:17:58 -0000 1.19 --- spanish.inc.php 21 Mar 2006 09:52:29 -0000 1.20 *************** *** 176,179 **** --- 176,180 ---- $dateFormat_month = '%B de %Y'; $dateFormat_month_list = '%A, %e de %B'; + $dateFormat_year = '%Y'; /* Index: swedish.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/swedish.inc.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** swedish.inc.php 16 Mar 2006 02:17:58 -0000 1.19 --- swedish.inc.php 21 Mar 2006 09:52:29 -0000 1.20 *************** *** 177,180 **** --- 177,181 ---- $dateFormat_month = '%B %Y'; $dateFormat_month_list = '%A, %B %e'; + $dateFormat_year = '%Y'; /* Index: traditional_chinese.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/traditional_chinese.inc.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** traditional_chinese.inc.php 6 May 2005 02:08:27 -0000 1.10 --- traditional_chinese.inc.php 21 Mar 2006 09:52:29 -0000 1.11 *************** *** 166,169 **** --- 166,170 ---- $dateFormat_month = '%Y å¹´ %B'; $dateFormat_month_list = '%A, %B %e æ¥'; + $dateFormat_year = '%Y'; /* |
|
From: <ji...@us...> - 2006-03-21 09:53:52
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26562/phpicalendar/rss Modified Files: rss.php Log Message: add year printview, fix misc bugs Index: rss.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** rss.php 15 Feb 2006 15:56:56 -0000 1.38 --- rss.php 21 Mar 2006 09:52:30 -0000 1.39 *************** *** 16,19 **** --- 16,22 ---- define('BASE', '../'); include(BASE.'functions/init.inc.php'); + if ($enable_rss != 'yes') { + die ("RSS feeds are not enabled on this site."); + } include_once(BASE.'functions/date_functions.php'); *************** *** 84,117 **** $getdate = $todate; #echo "from:$fromdate to:$todate"; - include(BASE.'functions/ical_parser.php'); - if ($enable_rss != 'yes') { - die ("RSS feeds are not enabled on this site."); - } - - //Set calendar or calendar directory name for feed - //Note that this depends on other modifications I've made to - //allow phpicalendar to use calendar subdirectories - see bbs ! $cal_displayname = urldecode($cal); ! if ($cal == $ALL_CALENDARS_COMBINED) { ! $temp = explode("/",$calendar_path); ! $cal_displayname = str_replace("32"," ",ucfirst(array_pop($temp))); ! } $events_count = 0; // calculate a value for Last Modified and ETag ! $filemod = time(); #default to now in case filemtime can't find the mod date ! $cal = str_replace("+"," ",$cal); ! $calendar_path = str_replace("+"," ",$calendar_path); ! $filemod = time(); #default to now in case filemtime can't find the mod date ! $cal = str_replace("+"," ",$cal); ! $calendar_path = str_replace("+"," ",$calendar_path); ! if ($cal == $ALL_CALENDARS_COMBINED) { ! $filemod = filemtime("$calendar_path"); ! }else{ ! if (is_file("$calendar_path/$cal.ics")){ ! $filemod = filemtime("$calendar_path/$cal.ics"); ! } } $filemodtime = date("r", $filemod); --- 87,103 ---- $getdate = $todate; #echo "from:$fromdate to:$todate"; ! #Note that ical_parser supplies cal_displayname. ! include(BASE.'functions/ical_parser.php'); $events_count = 0; // calculate a value for Last Modified and ETag ! $cal = implode(",",$cals); ! ! //get filemtime from master array ! $filemod = 0; #default to start of unix era, overwrite with most recent mtime from master array ! foreach ($master_array['-4'] as $calinfo){ ! if ($calinfo['mtime'] > $filemod) $filemod = $calinfo['mtime']; } $filemodtime = date("r", $filemod); *************** *** 138,142 **** if ($theview !=""){$rss .= ' - '.$theview;} $rss .= "</title>\n"; ! $rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n"; $rss .= '<description>'.$cal_displayname.' '.$lang['l_calendar'].' - '.$theview.'</description>'."\n"; $rss .= '<language>'.$language.'</language>'."\n"; --- 124,134 ---- if ($theview !=""){$rss .= ' - '.$theview;} $rss .= "</title>\n"; ! ! $views = array('day','week','month','year'); ! if (in_array($rssview, $views)) $default_path .= "/$rssview.php"; ! $rss_link = $default_path."/"; ! if (isset($cpath) && $cpath !='') $rss_link.="?cpath=$cpath"; ! $rss .= "<link>$rss_link</link>\n"; ! $rss .= '<description>'.$cal_displayname.' '.$lang['l_calendar'].' - '.$theview.'</description>'."\n"; $rss .= '<language>'.$language.'</language>'."\n"; *************** *** 184,188 **** $rss_title = urldecode ("$dayofweek: $event_text"); ! $rss_link = htmlspecialchars ("$default_path/day.php?getdate=$thisdate&cal=$cal&cpath=$cpath"); $rss_description = htmlspecialchars ("$dayofweek $event_start: $description"); --- 176,181 ---- $rss_title = urldecode ("$dayofweek: $event_text"); ! $rss_link = "$default_path/day.php?getdate=$thisdate&cal=$cal"; ! if (isset($cpath) && $cpath !='') $rss_link.="&cpath=$cpath"; $rss_description = htmlspecialchars ("$dayofweek $event_start: $description"); |
|
From: <ji...@us...> - 2006-03-20 01:36:02
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1633/phpicalendar/calendars Modified Files: publish.ical.php publish.mozilla.php Log Message: add trailing slashes to calendar_path if needed Index: publish.ical.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/publish.ical.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** publish.ical.php 30 Aug 2004 21:20:34 -0000 1.2 --- publish.ical.php 20 Mar 2006 01:35:56 -0000 1.3 *************** *** 50,55 **** include('../config.inc.php'); ! // set calendar path, or just use current directory ! $calendar_path = (isset($calendar_path) && $calendar_path != '') ? $calendar_path : ''; // allow/disallow publishing --- 50,58 ---- include('../config.inc.php'); ! // set calendar path, or just use current directory...make sure there's a trailing slash ! if(isset($calendar_path) && $calendar_path != ''){ ! if (substr($calendar_path, -1, 1) !='/') $calendar_path = $calendar_path.'/'; ! }else{ ! $calendar_path = ''; // allow/disallow publishing Index: publish.mozilla.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/publish.mozilla.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** publish.mozilla.php 19 Aug 2004 22:12:10 -0000 1.1 --- publish.mozilla.php 20 Mar 2006 01:35:56 -0000 1.2 *************** *** 61,66 **** include('../config.inc.php'); ! // set calendar path, or just use current directory ! $calendar_path = (isset($calendar_path) && $calendar_path != '') ? $calendar_path : ''; // allow/disallow publishing --- 61,69 ---- include('../config.inc.php'); ! // set calendar path, or just use current directory...make sure there's a trailing slash ! if(isset($calendar_path) && $calendar_path != ''){ ! if (substr($calendar_path, -1, 1) !='/') $calendar_path = $calendar_path.'/'; ! }else{ ! $calendar_path = ''; // allow/disallow publishing |
|
From: <ji...@us...> - 2006-03-20 01:08:37
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23648/phpicalendar/functions Modified Files: calendar_functions.php ical_parser.php init.inc.php Log Message: Display real calendar names where possible Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** calendar_functions.php 18 Mar 2006 01:04:15 -0000 1.21 --- calendar_functions.php 20 Mar 2006 01:08:29 -0000 1.22 *************** *** 206,211 **** // $cals = The calendars (entire path, e.g. from availableCalendars). function display_ical_list($cals, $pick=FALSE) { ! global $cal, $ALL_CALENDARS_COMBINED, $current_view, $getdate, $calendar_lang, $all_cal_comb_lang; ! // Print each calendar option. foreach ($cals as $cal_tmp) { --- 206,210 ---- // $cals = The calendars (entire path, e.g. from availableCalendars). function display_ical_list($cals, $pick=FALSE) { ! global $cal, $ALL_CALENDARS_COMBINED, $current_view, $getdate, $calendar_lang, $all_cal_comb_lang, $cal_filelist, $cal_displaynames; // Print each calendar option. foreach ($cals as $cal_tmp) { *************** *** 216,219 **** --- 215,246 ---- $cal_displayname_tmp = getCalendarName($cal_tmp); $cal_displayname_tmp = str_replace("32", " ", $cal_displayname_tmp); + #overwrite the display name if we already have a real name + if (is_numeric(array_search($cal_tmp, $cal_filelist))){ + $cal_displayname_tmp = $cal_displaynames[array_search($cal_tmp,$cal_filelist)]; + }else{ + # pull the name from the $cal_tmp file + $ifile = @fopen($cal_tmp, "r"); + if ($ifile == FALSE) exit(error($lang['l_error_cantopen'], $cal_tmp)); + while (!feof($ifile)) { + $line = fgets($ifile, 1024); + $line = trim($line); + if (ereg ("([^:]+):(.*)", $line, $regs)){ + $field = $regs[1]; + $data = $regs[2]; + $property = $field; + $prop_pos = strpos($property,';'); + if ($prop_pos !== false) $property = substr($property,0,$prop_pos); + $property = strtoupper($property); + if ($property == "X-WR-CALNAME"){ + $cal_displayname_tmp = $data; + break; + } + } + #stop reading if we find an event or timezone before there's a name + if ($line == "BEGIN:VTIMEZONE" ||$line == "BEGIN:VEVENT") break; + } + echo "</pre>"; + + } // If this is a webcal, add 'Webcal' to the display name. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.206 retrieving revision 1.207 diff -C2 -d -r1.206 -r1.207 *** ical_parser.php 19 Mar 2006 08:17:19 -0000 1.206 --- ical_parser.php 20 Mar 2006 01:08:29 -0000 1.207 *************** *** 1131,1134 **** --- 1131,1142 ---- } + + // Set a calender name for all calenders combined + if ($cal == $ALL_CALENDARS_COMBINED) { + $calendar_name = $all_cal_comb_lang; + } + $cal_displayname = implode(', ', $cal_displaynames); #reset this with the correct names + $template_started = getmicrotime(); + //If you want to see the values in the arrays, uncomment below. *************** *** 1139,1150 **** //print_r($rrule_array); //print_r($recurrence_delete); //print '</pre>'; - - // Set a calender name for all calenders combined - if ($cal == $ALL_CALENDARS_COMBINED) { - $calendar_name = $all_cal_comb_lang; - } - $cal_displayname = implode(', ', $cal_displaynames); #reset this with the correct names - $template_started = getmicrotime(); - ?> --- 1147,1152 ---- //print_r($rrule_array); //print_r($recurrence_delete); + //print_r($cal_displaynames); + //print_r($cal_filelist); //print '</pre>'; ?> Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** init.inc.php 18 Mar 2006 07:39:01 -0000 1.90 --- init.inc.php 20 Mar 2006 01:08:29 -0000 1.91 *************** *** 106,110 **** // Grab the calendar filenames off the cal value array. ! $cal_filenames = array_map("urldecode", $_GET['cal']); } else { if (isset($default_cal_check)) { --- 106,110 ---- // Grab the calendar filenames off the cal value array. ! $cal_filenames = $_GET['cal']; } else { if (isset($default_cal_check)) { |
|
From: <ji...@us...> - 2006-03-19 08:17:23
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9774/phpicalendar/functions Modified Files: date_functions.php ical_parser.php Log Message: fix bug [ 1362515 ] December Monthly View Corruption- shifting repeated events Index: date_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** date_functions.php 16 Mar 2006 00:28:54 -0000 1.33 --- date_functions.php 19 Mar 2006 08:17:18 -0000 1.34 *************** *** 50,63 **** function weekCompare($now, $then) { global $week_start_day; ! $sun_now = dateOfWeek($now, $week_start_day); ! $sun_then = dateOfWeek($then, $week_start_day); $seconds_now = strtotime($sun_now); $seconds_then = strtotime($sun_then); ! $diff_seconds = $seconds_now - $seconds_then; ! $diff_minutes = $diff_seconds/60; ! $diff_hours = $diff_minutes/60; ! $diff_days = round($diff_hours/24); ! $diff_weeks = $diff_days/7; ! return $diff_weeks; } --- 50,58 ---- function weekCompare($now, $then) { global $week_start_day; ! $sun_now = dateOfWeek($now, "Sunday"); ! $sun_then = dateOfWeek($then, "Sunday"); $seconds_now = strtotime($sun_now); $seconds_then = strtotime($sun_then); ! $diff_weeks = round(($seconds_now - $seconds_then)/(60*60*24*7)); return $diff_weeks; } Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.205 retrieving revision 1.206 diff -C2 -d -r1.205 -r1.206 *** ical_parser.php 18 Mar 2006 21:47:39 -0000 1.205 --- ical_parser.php 19 Mar 2006 08:17:19 -0000 1.206 *************** *** 300,304 **** while (($start != $end) && ($start < $mArray_end)) { $start_date2 = date('Ymd', $start); ! $master_array[($start_date2)][('-1')][$uid]= array ('event_text' => $summary, 'description' => $description, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url, 'status' => $status, 'class' => $class ); $start = strtotime('+1 day', $start); } --- 300,314 ---- while (($start != $end) && ($start < $mArray_end)) { $start_date2 = date('Ymd', $start); ! $master_array[($start_date2)][('-1')][$uid]= array ( ! 'event_text' => $summary, ! 'description' => $description, ! 'location' => $location, ! 'organizer' => serialize($organizer), ! 'attendee' => serialize($attendee), ! 'calnumber' => $calnumber, ! 'calname' => $actual_calname, ! 'url' => $url, ! 'status' => $status, ! 'class' => $class ); $start = strtotime('+1 day', $start); } *************** *** 528,532 **** // if the beginning of our range is less than the start of the item, we may as well set it equal to it ! if ($start_range_time_tmp < $start_date_time) $start_range_time_tmp = $start_date_time; if ($end_range_time_tmp > $end_date_time) $end_range_time_tmp = $end_date_time; --- 538,544 ---- // if the beginning of our range is less than the start of the item, we may as well set it equal to it ! if ($start_range_time_tmp < $start_date_time){ ! $start_range_time_tmp = $start_date_time; ! } if ($end_range_time_tmp > $end_date_time) $end_range_time_tmp = $end_date_time; *************** *** 558,562 **** foreach($byday as $day) { $day = two2threeCharDays($day); ! $next_date_time = strtotime($day,$next_range_time) + (12 * 60 * 60); // Since this renders events from $next_range_time to $next_range_time + 1 week, I need to handle intervals // as well. This checks to see if $next_date_time is after $day_start (i.e., "next week"), and thus --- 570,581 ---- foreach($byday as $day) { $day = two2threeCharDays($day); ! #need to find the first day of the appropriate week. ! $the_sunday = dateOfWeek(date("Ymd",$next_range_time), 'Sunday'); ! $next_date_time = strtotime($day,strtotime($the_sunday)) + (12 * 60 * 60); ! ! #reset $next_range_time to first instance in this week. ! if ($next_date_time < $next_range_time){ ! $next_range_time = $next_date_time; ! } // Since this renders events from $next_range_time to $next_range_time + 1 week, I need to handle intervals // as well. This checks to see if $next_date_time is after $day_start (i.e., "next week"), and thus |
|
From: <ji...@us...> - 2006-03-18 21:47:42
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19449/phpicalendar/functions Modified Files: ical_parser.php Log Message: fix bug with recur exception on first instance Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.204 retrieving revision 1.205 diff -C2 -d -r1.204 -r1.205 *** ical_parser.php 18 Mar 2006 01:27:30 -0000 1.204 --- ical_parser.php 18 Mar 2006 21:47:39 -0000 1.205 *************** *** 819,832 **** // This should remove any exdates that were missed. ! // Added for version 0.9.5 if (is_array($except_dates)) { foreach ($except_dates as $key => $value) { if (isset ($master_array[$value])){ ! $time = $except_times[$key]; unset($master_array[$value][$time][$uid]); - if (count($master_array[$value][$time]) < 1) { - unset($master_array[$value][$time]); - if (count($master_array[$value]) < 1) { - unset($master_array[$value]); } } --- 819,829 ---- // This should remove any exdates that were missed. ! // Added for version 0.9.5 modified in 2.22 remove anything that doesn't have an event_start if (is_array($except_dates)) { foreach ($except_dates as $key => $value) { if (isset ($master_array[$value])){ ! foreach ($master_array[$value] as $time => $value2){ ! if (!isset($value2[$uid]['event_start'])){ unset($master_array[$value][$time][$uid]); } } |
|
From: <ji...@us...> - 2006-03-18 08:02:35
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27886/phpicalendar Modified Files: README Log Message: update README Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** README 15 Feb 2006 08:28:17 -0000 1.98 --- README 18 Mar 2006 08:02:30 -0000 1.99 *************** *** 83,86 **** --- 83,94 ---- -------- cvs + allow image tags in events + use real calendar names instead of filenames + -bug fixes + Suppress lots of warnings and notices + all combined selection of webcals + passing of webcals in calendar links + More items controlled by language files + 2.21 -patched security hole -bug fixes from 2.2 |
|
From: <ji...@us...> - 2006-03-18 07:39:05
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18007/phpicalendar/functions Modified Files: init.inc.php Log Message: fix bug that doubles URL in subscribe and download URLs Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** init.inc.php 18 Mar 2006 01:27:30 -0000 1.89 --- init.inc.php 18 Mar 2006 07:39:01 -0000 1.90 *************** *** 213,218 **** } elseif ($download_uri != '') { $newurl = eregi_replace("^(http://)", "", $download_uri); ! $subscribe_path = 'webcal://'.$newurl.'/'."$cpath/".$filename.'.ics'; ! $download_filename = $download_uri.'/'."$cpath/".$filename.'.ics'; } else { $subscribe_path = "$cpath/"; --- 213,218 ---- } elseif ($download_uri != '') { $newurl = eregi_replace("^(http://)", "", $download_uri); ! $subscribe_path = 'webcal://'.$newurl.'/'."$cpath/".basename($filename); ! $download_filename = $download_uri.'/'."$cpath/".basename($filename); } else { $subscribe_path = "$cpath/"; |
|
From: <ji...@us...> - 2006-03-18 07:14:51
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9100/phpicalendar Modified Files: search.php Log Message: fix lang variable in search.php Index: search.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/search.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** search.php 8 Feb 2006 20:21:10 -0000 1.38 --- search.php 18 Mar 2006 07:14:31 -0000 1.39 *************** *** 3,7 **** define('BASE','./'); $current_view = 'search'; ! $display_date = $results_lang; require_once(BASE.'functions/ical_parser.php'); require_once(BASE.'functions/list_functions.php'); --- 3,7 ---- define('BASE','./'); $current_view = 'search'; ! $display_date = $lang['l_results']; require_once(BASE.'functions/ical_parser.php'); require_once(BASE.'functions/list_functions.php'); |
|
From: <ji...@us...> - 2006-03-18 01:27:35
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6793/phpicalendar/functions Modified Files: ical_parser.php init.inc.php Log Message: fix display_calendarnames to use names from ics files instead of filenames Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.203 retrieving revision 1.204 diff -C2 -d -r1.203 -r1.204 *** ical_parser.php 16 Mar 2006 00:28:54 -0000 1.203 --- ical_parser.php 18 Mar 2006 01:27:30 -0000 1.204 *************** *** 97,101 **** $calnumber = 1; ! foreach ($cal_filelist as $filename) { // Find the real name of the calendar. --- 97,101 ---- $calnumber = 1; ! foreach ($cal_filelist as $cal_key=>$filename) { // Find the real name of the calendar. *************** *** 1031,1034 **** --- 1031,1035 ---- $actual_calname = $data; $master_array['calendar_name'] = $actual_calname; + $cal_displaynames[$cal_key] = $actual_calname; #correct the default calname based on filename break; case 'X-WR-TIMEZONE': *************** *** 1128,1132 **** $calendar_name = $all_cal_comb_lang; } ! $template_started = getmicrotime(); --- 1129,1133 ---- $calendar_name = $all_cal_comb_lang; } ! $cal_displayname = implode(', ', $cal_displaynames); #reset this with the correct names $template_started = getmicrotime(); Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** init.inc.php 18 Mar 2006 01:04:15 -0000 1.88 --- init.inc.php 18 Mar 2006 01:27:30 -0000 1.89 *************** *** 31,39 **** } $cpath = ''; #initialize cpath to prevent later undef warnings. ! if(isset($_REQUEST['cpath'])){ $cpath = str_replace('..','',$_REQUEST['cpath']); $calendar_path .= "/$cpath"; $tmp_dir .= "/$cpath"; ! }elseif(isset($default_cpath_check)){ $cpath = str_replace('..','',$default_cpath_check); $calendar_path .= "/$cpath"; --- 31,39 ---- } $cpath = ''; #initialize cpath to prevent later undef warnings. ! if(isset($_REQUEST['cpath'])&& $_REQUEST['cpath'] !=''){ $cpath = str_replace('..','',$_REQUEST['cpath']); $calendar_path .= "/$cpath"; $tmp_dir .= "/$cpath"; ! }elseif(isset($default_cpath_check) && $default_cpath_check !='' ){ $cpath = str_replace('..','',$default_cpath_check); $calendar_path .= "/$cpath"; |
|
From: <ji...@us...> - 2006-03-18 01:04:22
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29756/phpicalendar/functions Modified Files: calendar_functions.php init.inc.php Log Message: should fix all_calendars_combined selection problems Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** calendar_functions.php 15 Dec 2005 03:26:31 -0000 1.20 --- calendar_functions.php 18 Mar 2006 01:04:15 -0000 1.21 *************** *** 197,201 **** // At this point, just pull the name off the file. ! return basename($cal_path, ".ics"); } --- 197,201 ---- // At this point, just pull the name off the file. ! return str_replace(".ics", '', basename($cal_path)); } *************** *** 242,246 **** // trying to figure out if this is the selected calendar. if($pick) { ! if (in_array($cal_encoded_tmp, explode(",", $cal))) { $return .= "<option value=\"$cal_encoded_tmp\" selected=\"selected\">$cal_displayname_tmp</option>\n"; } else { --- 242,246 ---- // trying to figure out if this is the selected calendar. if($pick) { ! if (in_array($cal_encoded_tmp, explode(",", $cal)) || count($cals) == count(explode(",", $cal))) { $return .= "<option value=\"$cal_encoded_tmp\" selected=\"selected\">$cal_displayname_tmp</option>\n"; } else { Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** init.inc.php 16 Mar 2006 00:28:54 -0000 1.87 --- init.inc.php 18 Mar 2006 01:04:15 -0000 1.88 *************** *** 5,12 **** error_reporting(0); // Older versions of PHP do not define $_SERVER. Define it here instead. ! if (!isset($_SERVER) && isset($_SERVER)) { ! $_SERVER = &$_SERVER; } ! // Define some magic strings. $ALL_CALENDARS_COMBINED = 'all_calendars_combined971'; --- 5,12 ---- error_reporting(0); // Older versions of PHP do not define $_SERVER. Define it here instead. ! if (!isset($_SERVER) && isset($HTTP_SERVER_VARS)) { ! $_SERVER = &$HTTP_SERVER_VARS; } ! #=================Initialize global variables================================= // Define some magic strings. $ALL_CALENDARS_COMBINED = 'all_calendars_combined971'; *************** *** 20,24 **** if (isset($phpicalendar['cookie_language'])) $language = $phpicalendar['cookie_language']; if (isset($phpicalendar['cookie_calendar'])) $default_cal_check = $phpicalendar['cookie_calendar']; ! if (isset($phpicalendar['cookie_cpath'])) $default_cpath_check = $phpicalendar['cookie_cpath']; if (isset($phpicalendar['cookie_view'])) $default_view = $phpicalendar['cookie_view']; if (isset($phpicalendar['cookie_style'])) $template = $phpicalendar['cookie_style']; --- 20,24 ---- if (isset($phpicalendar['cookie_language'])) $language = $phpicalendar['cookie_language']; if (isset($phpicalendar['cookie_calendar'])) $default_cal_check = $phpicalendar['cookie_calendar']; ! if (isset($phpicalendar['cookie_cpath'])) $default_cpath_check= $phpicalendar['cookie_cpath']; if (isset($phpicalendar['cookie_view'])) $default_view = $phpicalendar['cookie_view']; if (isset($phpicalendar['cookie_style'])) $template = $phpicalendar['cookie_style']; *************** *** 41,44 **** --- 41,45 ---- } #these need cpath to be set + #set up specific template folder for a particular cpath if (isset($user_template["$cpath"])){ $template = $user_template["$cpath"]; *************** *** 76,81 **** $lang_file = BASE.'languages/'.$language.'.inc.php'; ! unset($lang); ! if (include($lang_file)) { include($lang_file); } else { --- 77,82 ---- $lang_file = BASE.'languages/'.$language.'.inc.php'; ! unset($lang); #$lang is array of phrases in appropriate language ! if (is_file($lang_file)) { include($lang_file); } else { *************** *** 123,127 **** } } ! // Separate the calendar identifiers into web calendars and local // calendars. --- 124,131 ---- } } ! //load cal_filenames if $ALL_CALENDARS_COMBINED ! if ($cal_filenames[0] == $ALL_CALENDARS_COMBINED){ ! $cal_filenames = availableCalendars($username, $password, $ALL_CALENDARS_COMBINED); ! } // Separate the calendar identifiers into web calendars and local // calendars. *************** *** 144,148 **** exit(error($lang['l_error_restrictedcal'], $cal_filename)); } ! $local_cals[] = $cal_filename; } } --- 148,152 ---- exit(error($lang['l_error_restrictedcal'], $cal_filename)); } ! $local_cals[] = str_replace(".ics", '', basename($cal_filename)); } } *************** *** 239,242 **** --- 243,261 ---- return ((float)$usec + (float)$sec); } + #uncomment for diagnostics + #echo "after init.inc.ics<pre>"; + #echo "cals"; + #print_r($cals);echo"\n\n"; + #echo "cal_filenames"; + #print_r($cal_filenames);echo"\n\n"; + #echo "web_cals"; + #print_r($web_cals);echo"\n\n"; + #echo "local_cals"; + #print_r($local_cals);echo"\n\n"; + #echo "cal_filelist"; + #print_r($cal_filelist); + #echo "cal_displaynames"; + #print_r($cal_displaynames); + #echo "</pre><hr>"; ?> |
|
From: <ji...@us...> - 2006-03-16 06:15:18
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4031/phpicalendar/templates/default Modified Files: calendar_nav.tpl sidebar.tpl Log Message: control Pick Multiple label from language files Index: calendar_nav.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/calendar_nav.tpl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** calendar_nav.tpl 8 Feb 2006 08:07:54 -0000 1.15 --- calendar_nav.tpl 16 Mar 2006 06:15:12 -0000 1.16 *************** *** 43,47 **** <!-- switch show_goto off --> <hr /> ! <div class = 'G10BOLD'>Pick Multiple:</div> <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get"> <input type="hidden" name="getdate" value="{GETDATE}"/> --- 43,47 ---- <!-- switch show_goto off --> <hr /> ! <div class = 'G10BOLD'>{L_PICK_MULTIPLE}:</div> <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get"> <input type="hidden" name="getdate" value="{GETDATE}"/> Index: sidebar.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/sidebar.tpl,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** sidebar.tpl 8 Feb 2006 09:13:40 -0000 1.20 --- sidebar.tpl 16 Mar 2006 06:15:12 -0000 1.21 *************** *** 98,102 **** <!-- switch show_goto off --> <hr /> ! <div class = 'G10BOLD'>Pick Multiple:</div> <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get"> <input type="hidden" name="cpath" value="{CPATH}"/> --- 98,102 ---- <!-- switch show_goto off --> <hr /> ! <div class = 'G10BOLD'>{L_PICK_MULTIPLE}:</div> <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get"> <input type="hidden" name="cpath" value="{CPATH}"/> |
|
From: <ji...@us...> - 2006-03-16 06:15:15
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4031/phpicalendar Modified Files: day.php month.php week.php year.php Log Message: control Pick Multiple label from language files Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.128 retrieving revision 1.129 diff -C2 -d -r1.128 -r1.129 *** day.php 30 Nov 2005 02:20:32 -0000 1.128 --- day.php 16 Mar 2006 06:15:10 -0000 1.129 *************** *** 97,100 **** --- 97,101 ---- 'l_month' => $lang['l_month'], 'l_year' => $lang['l_year'], + 'l_pick_multiple' => $lang['l_pick_multiple'], 'l_powered_by' => $lang['l_powered_by'], 'l_subscribe' => $lang['l_subscribe'], Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.135 retrieving revision 1.136 diff -C2 -d -r1.135 -r1.136 *** month.php 30 Nov 2005 02:20:32 -0000 1.135 --- month.php 16 Mar 2006 06:15:10 -0000 1.136 *************** *** 104,107 **** --- 104,108 ---- 'l_this_months' => $lang['l_this_months'], 'l_search' => $lang['l_search'], + 'l_pick_multiple' => $lang['l_pick_multiple'], 'l_powered_by' => $lang['l_powered_by'], 'l_this_site_is' => $lang['l_this_site_is'] Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.127 retrieving revision 1.128 diff -C2 -d -r1.127 -r1.128 *** week.php 1 Dec 2005 06:15:28 -0000 1.127 --- week.php 16 Mar 2006 06:15:11 -0000 1.128 *************** *** 104,107 **** --- 104,108 ---- 'l_download' => $lang['l_download'], 'l_search' => $lang['l_search'], + 'l_pick_multiple' => $lang['l_pick_multiple'], 'l_powered_by' => $lang['l_powered_by'], 'l_this_site_is' => $lang['l_this_site_is'] Index: year.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/year.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** year.php 7 Dec 2005 07:26:14 -0000 1.39 --- year.php 16 Mar 2006 06:15:11 -0000 1.40 *************** *** 46,49 **** --- 46,50 ---- 'l_month' => $lang['l_month'], 'l_year' => $lang['l_year'], + 'l_pick_multiple' => $lang['l_pick_multiple'], 'l_powered_by' => $lang['l_powered_by'], 'l_this_site_is' => $lang['l_this_site_is'] |
|
From: <ji...@us...> - 2006-03-16 06:15:15
|
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4031/phpicalendar/languages Modified Files: german.inc.php italian.inc.php Log Message: control Pick Multiple label from language files Index: german.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/german.inc.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** german.inc.php 16 Mar 2006 02:17:58 -0000 1.29 --- german.inc.php 16 Mar 2006 06:15:12 -0000 1.30 *************** *** 46,50 **** $lang['l_search'] = 'Suchen'; // the verb $lang['l_results'] = 'Suchergebnisse'; ! $lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Suche'; // will be followed by the search query $lang['l_no_results'] = 'Keine Einträge gefunden'; --- 46,50 ---- $lang['l_search'] = 'Suchen'; // the verb $lang['l_results'] = 'Suchergebnisse'; ! $lang['l_pick_multiple'] = 'Mehrfachauswahl'; $lang['l_query'] = 'Suche'; // will be followed by the search query $lang['l_no_results'] = 'Keine Einträge gefunden'; Index: italian.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/italian.inc.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** italian.inc.php 16 Mar 2006 02:17:58 -0000 1.29 --- italian.inc.php 16 Mar 2006 06:15:12 -0000 1.30 *************** *** 46,50 **** $lang['l_search'] = 'Cerca'; // the verb $lang['l_results'] = 'Risultati Ricerca'; ! $lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Chiave di ricerca'; // will be followed by the search query $lang['l_no_results'] = 'Nessun evento trovato'; --- 46,50 ---- $lang['l_search'] = 'Cerca'; // the verb $lang['l_results'] = 'Risultati Ricerca'; ! $lang['l_pick_multiple'] = 'Selezione multipla'; $lang['l_query'] = 'Chiave di ricerca'; // will be followed by the search query $lang['l_no_results'] = 'Nessun evento trovato'; |
|
From: <ji...@us...> - 2006-03-16 02:55:11
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13602/phpicalendar/templates/default Modified Files: footer.tpl Log Message: footer to 2.21 Index: footer.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/footer.tpl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** footer.tpl 23 Nov 2005 08:05:30 -0000 1.12 --- footer.tpl 16 Mar 2006 02:55:06 -0000 1.13 *************** *** 1,3 **** ! <center class="V9"><br />{L_POWERED_BY} <a class="psf" href="http://phpicalendar.net/">PHP iCalendar 2.2</a><br /> <!-- switch rss_valid on --> <p> --- 1,3 ---- ! <center class="V9"><br />{L_POWERED_BY} <a class="psf" href="http://phpicalendar.net/">PHP iCalendar 2.21</a><br /> <!-- switch rss_valid on --> <p> |
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32427/phpicalendar/languages Modified Files: afrikaans.inc.php brazilian.inc.php catalan.inc.php czech.inc.php dutch.inc.php english.inc.php finnish.inc.php french.inc.php german.inc.php italian.inc.php japanese.inc.php lithuanian.inc.php norwegian.inc.php portuguese.inc.php spanish.inc.php swedish.inc.php Log Message: additions to language files Index: afrikaans.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/afrikaans.inc.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** afrikaans.inc.php 6 May 2005 02:08:26 -0000 1.2 --- afrikaans.inc.php 16 Mar 2006 02:17:58 -0000 1.3 *************** *** 48,51 **** --- 48,52 ---- $lang['l_search'] = 'Soek'; // the verb $lang['l_results'] = 'Soektog Resultate'; + $lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Soek vir'; // will be followed by the search query $lang['l_no_results'] = 'Geen aktiwiteite gevind nie'; *************** *** 85,88 **** --- 86,92 ---- $lang['l_priority_none'] = 'Geen'; $lang['l_status'] = 'Status'; + $lang['l_status_confirmed'] = 'CONFIRMED' ; + $lang['l_status_cancelled'] = 'CANCELLED'; + $lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'Hangende items'; $lang['l_unfinished'] = 'Onvoltooid'; Index: brazilian.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/brazilian.inc.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** brazilian.inc.php 6 May 2005 02:08:26 -0000 1.9 --- brazilian.inc.php 16 Mar 2006 02:17:58 -0000 1.10 *************** *** 44,47 **** --- 44,48 ---- $lang['l_search'] = 'Buscar'; // the verb $lang['l_results'] = 'Buscar Resultados'; + $lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Questão: '; // will be followed by the search query $lang['l_no_results'] = 'Eventos não encontrados'; *************** *** 81,84 **** --- 82,88 ---- $lang['l_priority_none'] = 'None'; $lang['l_status'] = 'Status'; + $lang['l_status_confirmed'] = 'CONFIRMED' ; + $lang['l_status_cancelled'] = 'CANCELLED'; + $lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'To do items'; $lang['l_unfinished'] = 'Unfinished'; Index: catalan.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/catalan.inc.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** catalan.inc.php 6 May 2005 02:08:26 -0000 1.10 --- catalan.inc.php 16 Mar 2006 02:17:58 -0000 1.11 *************** *** 44,47 **** --- 44,48 ---- $lang['l_search'] = 'Buscar'; // the verb $lang['l_results'] = 'Resultats de la cerca'; + $lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Consulta: '; // will be followed by the search query $lang['l_no_results'] = 'No s\'ha trobat cap event'; *************** *** 81,84 **** --- 82,88 ---- $lang['l_priority_none'] = 'Cap'; $lang['l_status'] = 'Estat'; + $lang['l_status_confirmed'] = 'CONFIRMED' ; + $lang['l_status_cancelled'] = 'CANCELLED'; + $lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'Pendent'; $lang['l_unfinished'] = 'Sense acabar'; Index: czech.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/czech.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** czech.inc.php 6 May 2005 02:08:26 -0000 1.8 --- czech.inc.php 16 Mar 2006 02:17:58 -0000 1.9 *************** *** 1,106 **** ! <?php // Czech language include ! // For version 1.0 PHP iCalendar // ! // Translation by Whit, studio jižák (wh...@st...) // // Submit new translations to ch...@ch... ! $day_lang = 'Den'; ! $week_lang = 'Týden'; ! $month_lang = 'MÄsÃc'; ! $year_lang = 'Rok'; ! $calendar_lang = 'KalendáÅ'; ! $next_day_lang = 'NásledujÃcà den'; ! $next_month_lang = 'NásledujÃcà mÄsÃc'; ! $next_week_lang = 'NásledujÃcà týden'; ! $next_year_lang = 'PÅÃÅ¡tà rok'; ! $last_day_lang = 'PÅedchozà den'; ! $last_month_lang = 'PÅedchozà mÄsÃc'; ! $last_week_lang = 'PÅedchozà týden'; ! $last_year_lang = 'PÅedchozà rok'; ! $subscribe_lang = 'PÅihlaÅ¡'; ! $download_lang = 'Stáhni'; ! $powered_by_lang = 'Powered by'; ! $event_lang = 'Událost'; ! $event_start_lang = 'ZaÄátek'; ! $event_end_lang = 'Konec'; ! $this_months_lang = 'Tento mÄsÃc'; ! $date_lang = 'Datum'; ! $summary_lang = 'Souhrn'; ! $all_day_lang = 'Celý den'; ! $notes_lang = 'Poznámky'; ! $this_years_lang = 'Tento rok'; ! $today_lang = 'Dnes'; ! $this_week_lang = 'Tento týden'; ! $this_month_lang = 'Tento mÄsÃc'; ! $jump_lang = 'Jdi'; ! $tomorrows_lang = 'ZÃtra'; ! $goday_lang = 'DneÅ¡ek'; ! $goweek_lang = 'Tento týden'; ! $gomonth_lang = 'Tento mÄsÃc'; ! $goyear_lang = 'Tento rok'; ! $search_lang = 'Hledej'; // the verb ! $results_lang = 'Výsledky hledánÃ'; ! $query_lang = 'Dotaz: '; // will be followed by the search query ! $no_results_lang = 'Žádné nalezené záznamy'; ! $goprint_lang = 'Tisk'; ! $time_lang = 'Äas'; ! $summary_lang = 'Souhrn'; ! $description_lang = 'Popis'; ! $this_site_is_lang = 'Tato stránka je'; ! $no_events_day_lang = 'Žádné záznamy v tomto dni.'; ! $no_events_week_lang = 'Žádné záznamy v tomto týdnu.'; ! $no_events_month_lang = 'Žádné záznamy v tomto mÄsÃci.'; ! $rss_day_date = 'G:i A'; // Lists just the time ! $rss_week_date = '%A, %e %B'; // Lists just the day ! $rss_month_date = '%A, %e %B'; // Lists just the day ! $rss_language = 'cs-cz'; ! $search_took_lang = 'Hledánà trvalo %s vteÅin'; ! $recurring_event_lang = 'OpakujÃcà se událost'; ! $exception_lang = 'Výjimka'; ! $no_query_lang = 'Nebyl zadán dotaz'; ! $preferences_lang = 'NastavenÃ'; ! $printer_lang = 'Tiskárna'; ! $select_lang_lang = 'Výchozà jazyk:'; ! $select_cal_lang = 'Výchozà kalendáÅ:'; ! $select_view_lang = 'Výchozà pohled:'; ! $select_time_lang = 'Výchozà startovnà Äas:'; ! $select_day_lang = 'Výchozà prvnà den týdne:'; ! $select_style_lang = 'Výchozà styl:'; ! $set_prefs_lang = 'Ulož nastavenÃ'; ! $completed_date_lang = 'Kompletnà v'; ! $completed_lang = 'KompletnÃ'; ! $created_lang = 'VytvoÅeno:'; ! $due_lang = 'Due:'; ! $priority_lang = 'Priorita:'; ! $priority_high_lang = 'Vysoká'; ! $priority_low_lang = 'NÃzká'; ! $priority_medium_lang = 'StÅednÃ'; ! $priority_none_lang = 'Žádná'; ! $status_lang = 'Status'; ! $todo_lang = 'Seznam úkolů'; ! $unfinished_lang = 'NedokonÄeno'; ! $prefs_set_lang = 'Your preferences have been set.'; ! $prefs_unset_lang = 'Preferences unset. Changes will take place next page load.'; ! $unset_prefs_lang = 'Unset preferences:'; ! ! // ----- New for 0.9.2 ! ! $organizer_lang = 'Organizer'; ! $attendee_lang = 'Attendee'; ! $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.'; --- 1,107 ---- ! <?php // Czech language include ! // For version 2.0 PHP iCalendar // ! // Translation by Whit, studio jiâæâ°k (wh...@st...) // // Submit new translations to ch...@ch... ! $lang['l_day'] = 'Den'; ! $lang['l_week'] = 'TâΩden'; ! $lang['l_month'] = 'MÆõsââ c'; ! $lang['l_year'] = 'Rok'; ! $lang['l_calendar'] = 'Kalendâ°âô'; ! $lang['l_next_day'] = 'Nâ°sledujââ cââ den'; ! $lang['l_next_month'] = 'Nâ°sledujââ cââ mÆõsââ c'; ! $lang['l_next_week'] = 'Nâ°sledujââ cââ tâΩden'; ! $lang['l_next_year'] = 'Pâôââ â°tââ rok'; ! $lang['l_last_day'] = 'Pâôedchozââ den'; ! $lang['l_last_month'] = 'Pâôedchozââ mÆõsââ c'; ! $lang['l_last_week'] = 'Pâôedchozââ tâΩden'; ! $lang['l_last_year'] = 'Pâôedchozââ rok'; ! $lang['l_subscribe'] = 'Pâôihlaâ°'; ! $lang['l_download'] = 'Stâ°hni'; ! $lang['l_powered_by'] = 'Powered by'; ! $lang['l_event'] = 'Udâ°lost'; ! $lang['l_event_start'] = 'ZaÆçâ°tek'; ! $lang['l_event_end'] = 'Konec'; ! $lang['l_this_months'] = 'Tento mÆõsââ c'; ! $lang['l_date'] = 'Datum'; ! $lang['l_summary'] = 'Souhrn'; ! $lang['l_all_day'] = 'CelâΩ den'; ! $lang['l_notes'] = 'Poznâ°mky'; ! $lang['l_this_years'] = 'Tento rok'; ! $lang['l_today'] = 'Dnes'; ! $lang['l_this_week'] = 'Tento tâΩden'; ! $lang['l_this_month'] = 'Tento mÆõsââ c'; ! $lang['l_jump'] = 'Jdi'; ! $lang['l_tomorrows'] = 'Zââ tra'; ! $lang['l_goday'] = 'Dneâ°ek'; ! $lang['l_goweek'] = 'Tento tâΩden'; ! $lang['l_gomonth'] = 'Tento mÆõsââ c'; ! $lang['l_goyear'] = 'Tento rok'; ! $lang['l_search'] = 'Hledej'; // the verb ! $lang['l_results'] = 'VâΩsledky hledâ°nââ '; ! $lang['l_pick_multiple'] = 'VâΩchozââ multiple'; ! $lang['l_query'] = 'Dotaz: '; // will be followed by the search query ! $lang['l_no_results'] = 'âΩâ°dnâ© nalezenâ© zâ°znamy'; ! $lang['l_goprint'] = 'Tisk'; ! $lang['l_time'] = 'ÆÃ¥as'; ! $lang['l_summary'] = 'Souhrn'; ! $lang['l_description'] = 'Popis'; ! $lang['l_this_site_is'] = 'Tato strâ°nka je'; ! $lang['l_no_events_day'] = 'âΩâ°dnâ© zâ°znamy v tomto dni.'; ! $lang['l_no_events_week'] = 'âΩâ°dnâ© zâ°znamy v tomto tâΩdnu.'; ! $lang['l_no_events_month'] = 'âΩâ°dnâ© zâ°znamy v tomto mÆõsââ ci.'; ! $lang['l_rss_day_date'] = 'G:i A'; // Lists just the time ! $lang['l_rss_week_date '] = '%A, %e %B'; // Lists just the day ! $lang['l_rss_month_date '] = '%A, %e %B'; // Lists just the day ! $lang['l_rss_language'] = 'cs-cz'; ! $lang['l_search_took'] = 'Hledâ°nââ trvalo %s vteâôin'; ! $lang['l_recurring_event'] = 'Opakujââ cââ se udâ°lost'; ! $lang['l_exception'] = 'VâΩjimka'; ! $lang['l_no_query'] = 'Nebyl zadâ°n dotaz'; ! $lang['l_preferences'] = 'Nastavenââ '; ! $lang['l_printer'] = 'Tiskâ°rna'; ! $lang['l_select_lang'] = 'VâΩchozââ jazyk:'; ! $lang['l_select_cal'] = 'VâΩchozââ kalendâ°âô:'; ! $lang['l_select_view'] = 'VâΩchozââ pohled:'; ! $lang['l_select_time'] = 'VâΩchozââ startovnââ Æças:'; ! $lang['l_select_day'] = 'VâΩchozââ prvnââ den tâΩdne:'; ! $lang['l_select_style'] = 'VâΩchozââ styl:'; ! $lang['l_set_prefs'] = 'Uloâæ nastavenââ '; ! $lang['l_completed_date'] = 'Kompletnââ v'; ! $lang['l_completed'] = 'Kompletnââ '; ! $lang['l_created'] = 'Vytvoâôeno:'; ! $lang['l_due'] = 'Due:'; ! $lang['l_priority'] = 'Priorita:'; ! $lang['l_priority_high'] = 'Vysokâ°'; ! $lang['l_priority_low'] = 'Nââ zkâ°'; ! $lang['l_priority_medium'] = 'Stâôednââ '; ! $lang['l_priority_none'] = 'âΩâ°dnâ°'; ! $lang['l_status'] = 'Status'; ! $lang['l_status_confirmed'] = 'Konfirmovaný ' ; ! $lang['l_status_cancelled'] = 'Odvolaný '; ! $lang['l_status_tentative'] = 'pÅedbÄžný '; ! $lang['l_todo'] = 'Seznam ââ«kolâÃ'; ! $lang['l_unfinished'] = 'NedokonÆçeno'; ! $lang['l_prefs_set'] = 'Your preferences have been set.'; ! $lang['l_prefs_unset'] = 'Preferences unset. Changes will take place next page load.'; ! $lang['l_unset_prefs'] = 'Unset preferences'; ! $lang['l_organizer'] = 'Organizer'; ! $lang['l_attendee'] = 'Attendee'; ! $lang['l_location'] = 'Location'; ! $lang['l_admin_header'] = 'PHP iCalendar Administration'; ! $lang['l_username'] = 'Username'; ! $lang['l_password'] = 'Password'; ! $lang['l_login'] = 'Login'; ! $lang['l_invalid_login'] = 'Wrong username or password.'; ! $lang['l_addupdate_cal'] = 'Add or Update a Calendar'; ! $lang['l_addupdate_desc'] = 'Add a calendar by uploading a new file. Update a calendar by uploading a file of the same name.'; ! $lang['l_delete_cal'] = 'Delete a Calendar'; ! $lang['l_logout'] = 'Logout'; ! $lang['l_cal_file'] = 'Calendar File'; ! $lang['l_php_error'] = 'PHP Error'; $upload_error_gen_lang = 'There was a problem with your upload.'; $upload_error_lang[0] = 'There was a problem with your upload.'; *************** *** 109,145 **** $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'; // - navigation ! $back_lang = 'ZpÄt'; ! $next_lang = 'DalÅ¡Ã'; ! $prev_lang = 'PÅedchozÃ'; ! $day_view_lang = 'Zobraz den'; ! $week_view_lang = 'Zobraz týden'; ! $month_view_lang = 'Zobraz mÄsÃc'; ! $year_view_lang = 'Zobraz rok'; // $format_recur, items enclosed in % will be substituted with variables $format_recur_lang['delimiter'] = ', '; // ie, 'one, two, three' $format_recur_lang['yearly'] = array('rok','roky'); // for these, put singular ! $format_recur_lang['monthly'] = array('mÄsÃc','mÄsÃce'); // and plural forms ! $format_recur_lang['weekly'] = array('týden','týdny'); // these will be %freq% $format_recur_lang['daily'] = array('den','dny'); // in the replacement below $format_recur_lang['hourly'] = array('hodina','hodiny'); $format_recur_lang['minutely'] = array('minuta','minuty'); ! $format_recur_lang['secondly'] = array('vtÅina','vteÅiny'); ! $format_recur_lang['start'] = 'Každý %int% %freq% %for%'; // ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5' ! $format_recur_lang['until'] = 'až do %date%'; // ie, 'until January 4' ! $format_recur_lang['count'] = '%int% krát'; // ie, 'for 5 times' ! $format_recur_lang['bymonth'] = 'V mÄsÃcÃch: %list%'; // ie, 'In months: January, February, March' $format_recur_lang['bymonthday'] = 'V datech: %list%'; // ie, 'On dates: 1, 2, 3, 4' $format_recur_lang['byday'] = 'Ve dnech: %list%'; // ie, 'On days: Mon, Tues, Wed, Thurs' --- 110,156 ---- $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.'; ! $lang['l_upload_error_type'] = 'Only .ics files may be uploaded.'; ! $lang['l_copy_error'] = 'Failed to copy file'; ! $lang['l_delete_error'] = 'Failed to delete file'; ! $lang['l_delete_success'] = 'was deleted successfully.'; ! $lang['l_action_success'] = 'Your action was successful.'; ! $lang['l_submit'] = 'Submit'; ! $lang['l_delete'] = 'Delete'; ! $all_cal_comb_lang = 'All Combined'; ! ! // 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'] = 'ZpÆõt'; ! $lang['l_next'] = 'Dalâ°ââ '; ! $lang['l_prev'] = 'Pâôedchozââ '; ! $lang['l_day_view'] = 'Zobraz den'; ! $lang['l_week_view'] = 'Zobraz tâΩden'; ! $lang['l_month_view'] = 'Zobraz mÆõsââ c'; ! $lang['l_year_view'] = 'Zobraz rok'; + // --------------------------------- // $format_recur, items enclosed in % will be substituted with variables $format_recur_lang['delimiter'] = ', '; // ie, 'one, two, three' $format_recur_lang['yearly'] = array('rok','roky'); // for these, put singular ! $format_recur_lang['monthly'] = array('mÆõsââ c','mÆõsââ ce'); // and plural forms ! $format_recur_lang['weekly'] = array('tâΩden','tâΩdny'); // these will be %freq% $format_recur_lang['daily'] = array('den','dny'); // in the replacement below $format_recur_lang['hourly'] = array('hodina','hodiny'); $format_recur_lang['minutely'] = array('minuta','minuty'); ! $format_recur_lang['secondly'] = array('vtâôina','vteâôiny'); ! $format_recur_lang['start'] = 'KaâædâΩ %int% %freq% %for%'; // ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5' ! $format_recur_lang['until'] = 'aâæ do %date%'; // ie, 'until January 4' ! $format_recur_lang['count'] = '%int% krâ°t'; // ie, 'for 5 times' ! $format_recur_lang['bymonth'] = 'V mÆõsââ cââ ch: %list%'; // ie, 'In months: January, February, March' $format_recur_lang['bymonthday'] = 'V datech: %list%'; // ie, 'On dates: 1, 2, 3, 4' $format_recur_lang['byday'] = 'Ve dnech: %list%'; // ie, 'On days: Mon, Tues, Wed, Thurs' *************** *** 147,158 **** // --------------------------------- ! $daysofweek_lang = array ('NedÄle','PondÄlÃ','Ãterý','StÅeda','Ätvrtek','Pátek','Sobota'); ! $daysofweekshort_lang = array ('Ne','Po','Ãt','St','Ät','Pá','So'); ! $daysofweekreallyshort_lang = array ('N','P','Ã','S','Ä','P','S'); ! $monthsofyear_lang = array ('Leden','Ãnor','BÅezen','Duben','KvÄten','Äerven','Äervenec','Srpen','ZáÅÃ','ÅÃjen','Listopad','Prosinec'); ! $monthsofyearshort_lang = array ('Led.','Ãno.','BÅe.','Dub.','KvÄ.','Äer.','Äec.','Srp.','ZáÅ.','ÅÃj.','List.','Pros.'); // For time formatting, check out: http://www.php.net/manual/en/function.date.php $timeFormat = 'G:i'; // For date formatting, see note below --- 158,170 ---- // --------------------------------- ! $daysofweek_lang = array ('NedÆõle','PondÆõlââ ','âöterâΩ','Stâôeda','ÆÃ¥tvrtek','Pâ°tek','Sobota'); ! $daysofweekshort_lang = array ('Ne','Po','âöt','St','ÆÃ¥t','Pâ°','So'); ! $daysofweekreallyshort_lang = array ('N','P','âö','S','ÆÃ¥','P','S'); ! $monthsofyear_lang = array ('Leden','âönor','Bâôezen','Duben','KvÆõten','ÆÃ¥erven','ÆÃ¥ervenec','Srpen','Zâ°âôââ ','âòââ jen','Listopad','Prosinec'); ! $monthsofyearshort_lang = array ('Led.','âöno.','Bâôe.','Dub.','KvÆõ.','ÆÃ¥er.','ÆÃ¥ec.','Srp.','Zâ°âô.','âòââ j.','List.','Pros.'); // For time formatting, check out: http://www.php.net/manual/en/function.date.php $timeFormat = 'G:i'; + $timeFormat_small = 'g:i'; // For date formatting, see note below *************** *** 181,192 **** // Error messages - %s will be replaced with a variable ! $error_title_lang = 'Chyba!'; ! $error_window_lang = 'Chybové okno!'; ! $error_calendar_lang = 'PÅi vytváÅenà kalendáÅe â%sâ se vyskytla chyba.'; ! $error_path_lang = 'Nelze otevÅÃt: "%s"'; ! $error_back_lang = 'Použij tlaÄÃtko "ZpÄt" pro návrat.'; ! $error_remotecal_lang = 'Tento server blokuje vzdálené kalendáÅe, které nejsou odsouhlaseny.'; ! $error_restrictedcal_lang = 'ZkouÅ¡ÃÅ¡ pÅistupovat k zamknutému kalendáÅi.'; ! $error_invalidcal_lang = 'Chybný soubor. Vyber jiný kalendáÅ.'; ?> --- 193,206 ---- // Error messages - %s will be replaced with a variable ! $lang['l_error_title'] = 'Chyba!'; ! $lang['l_error_window'] = 'Chybovâ© okno!'; ! $lang['l_error_calendar'] = 'Pâôi vytvâ°âôenââ kalendâ°âôe âÃû%sâÃù se vyskytla chyba.'; ! $lang['l_error_path'] = 'Nelze otevâôââ t: "%s"'; ! $lang['l_error_back'] = 'Pouâæij tlaÆçââ tko "ZpÆõt" pro nâ°vrat.'; ! $lang['l_error_remotecal'] = 'Tento server blokuje vzdâ°lenâ© kalendâ°âôe, kterâ© nejsou odsouhlaseny.'; ! $lang['l_error_restrictedcal'] = 'Zkouâ°ââ â° pâôistupovat k zamknutâ©mu kalendâ°âôi.'; ! $lang['l_error_invalidcal'] = 'ChybnâΩ soubor. Vyber jinâΩ kalendâ°âô.'; ! $lang['l_error_cantopen'] = 'Unable to open calendar.'; ! $lang['l_error_cache'] = 'Unable to write to cache directory. Please check your config.'; ?> Index: dutch.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/dutch.inc.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** dutch.inc.php 6 May 2005 02:08:26 -0000 1.25 --- dutch.inc.php 16 Mar 2006 02:17:58 -0000 1.26 *************** *** 44,47 **** --- 44,48 ---- $lang['l_search'] = 'Zoeken'; // the verb $lang['l_results'] = 'Zoekresultaten'; + $lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Zoekopdracht'; // will be followed by the search query $lang['l_no_results'] = 'Geen activiteiten gevonden'; *************** *** 81,84 **** --- 82,88 ---- $lang['l_priority_none'] = 'Geen'; $lang['l_status'] = 'Status'; + $lang['l_status_confirmed'] = 'CONFIRMED' ; + $lang['l_status_cancelled'] = 'CANCELLED'; + $lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'Af te werken items'; $lang['l_unfinished'] = 'Niet afgewerkt'; Index: english.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** english.inc.php 16 Mar 2006 00:20:54 -0000 1.61 --- english.inc.php 16 Mar 2006 02:17:58 -0000 1.62 *************** *** 6,10 **** // Translation by Chad Little (ch...@ch...) // ! // Submit new translations to ch...@ch... $lang['l_day'] = 'Day'; --- 6,10 ---- // Translation by Chad Little (ch...@ch...) // ! // Submit new translations to php...@gm... $lang['l_day'] = 'Day'; *************** *** 82,85 **** --- 82,88 ---- $lang['l_priority_none'] = 'None'; $lang['l_status'] = 'Status'; + $lang['l_status_confirmed'] = 'CONFIRMED' ; + $lang['l_status_cancelled'] = 'CANCELLED'; + $lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'To do items'; $lang['l_unfinished'] = 'Unfinished'; Index: finnish.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/finnish.inc.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** finnish.inc.php 2 Oct 2005 22:34:11 -0000 1.13 --- finnish.inc.php 16 Mar 2006 02:17:58 -0000 1.14 *************** *** 46,49 **** --- 46,50 ---- $lang['l_search'] = 'Etsi'; // the verb $lang['l_results'] = 'Etsinnän Tulokset'; + $lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Kysely'; // will be followed by the search query $lang['l_no_results'] = 'Tapahtumia ei löytynyt'; *************** *** 83,86 **** --- 84,90 ---- $lang['l_priority_none'] = 'Ei mitään'; $lang['l_status'] = 'Tila'; + $lang['l_status_confirmed'] = 'CONFIRMED' ; + $lang['l_status_cancelled'] = 'CANCELLED'; + $lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'Tehtävät:'; $lang['l_unfinished'] = 'Päättymättömät'; Index: french.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/french.inc.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** french.inc.php 5 Oct 2005 01:07:40 -0000 1.28 --- french.inc.php 16 Mar 2006 02:17:58 -0000 1.29 *************** *** 45,48 **** --- 45,49 ---- $lang['l_search'] = 'Rechercher'; // the verb $lang['l_results'] = 'Résultats de la recherche'; + $lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Requète'; // will be followed by the search query $lang['l_no_results'] = 'Aucun événement trouvé'; *************** *** 82,85 **** --- 83,89 ---- $lang['l_priority_none'] = 'Aucune'; $lang['l_status'] = 'Status:'; + $lang['l_status_confirmed'] = 'CONFIRMED' ; + $lang['l_status_cancelled'] = 'CANCELLED'; + $lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'Tâches à réaliser'; $lang['l_unfinished'] = 'Non faites'; Index: german.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/german.inc.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** german.inc.php 15 Feb 2006 08:17:55 -0000 1.28 --- german.inc.php 16 Mar 2006 02:17:58 -0000 1.29 *************** *** 46,49 **** --- 46,50 ---- $lang['l_search'] = 'Suchen'; // the verb $lang['l_results'] = 'Suchergebnisse'; + $lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Suche'; // will be followed by the search query $lang['l_no_results'] = 'Keine Einträge gefunden'; *************** *** 83,86 **** --- 84,90 ---- $lang['l_priority_none'] = 'keine'; $lang['l_status'] = 'Status'; + $lang['l_status_confirmed'] = 'Bestätigt' ; + $lang['l_status_cancelled'] = 'Vorläufig'; + $lang['l_status_tentative'] = 'Abgesagt'; $lang['l_todo'] = 'Aufgaben'; $lang['l_unfinished'] = 'Andauernd'; Index: italian.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/italian.inc.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** italian.inc.php 6 May 2005 02:08:26 -0000 1.28 --- italian.inc.php 16 Mar 2006 02:17:58 -0000 1.29 *************** *** 46,49 **** --- 46,50 ---- $lang['l_search'] = 'Cerca'; // the verb $lang['l_results'] = 'Risultati Ricerca'; + $lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Chiave di ricerca'; // will be followed by the search query $lang['l_no_results'] = 'Nessun evento trovato'; *************** *** 83,86 **** --- 84,90 ---- $lang['l_priority_none'] = 'Nessuna'; $lang['l_status'] = 'Stato'; + $lang['l_status_confirmed'] = 'Confermato' ; + $lang['l_status_cancelled'] = 'Annullato'; + $lang['l_status_tentative'] = 'Sperimentale'; $lang['l_todo'] = 'Attività'; $lang['l_unfinished'] = 'Non terminato'; Index: japanese.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/japanese.inc.php,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** japanese.inc.php 6 May 2005 02:08:27 -0000 1.33 --- japanese.inc.php 16 Mar 2006 02:17:58 -0000 1.34 *************** *** 45,48 **** --- 45,49 ---- $lang['l_search'] = 'æ¤ç´¢'; // the verb $lang['l_results'] = 'æ¤ç´¢çµæ'; + $lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'æ¤ç´¢ãã¼ã¯ã¼ã'; // will be followed by the search query $lang['l_no_results'] = 'ä¸è´ããäºå®ã¯ããã¾ããã§ããã'; *************** *** 82,85 **** --- 83,89 ---- $lang['l_priority_none'] = 'ãªã'; $lang['l_status'] = 'ç¶æ '; + $lang['l_status_confirmed'] = 'CONFIRMED' ; + $lang['l_status_cancelled'] = 'CANCELLED'; + $lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'åå¿é²'; $lang['l_unfinished'] = 'å®æããã¦ããªã'; Index: lithuanian.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/lithuanian.inc.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lithuanian.inc.php 6 Sep 2004 23:05:31 -0000 1.1 --- lithuanian.inc.php 16 Mar 2006 02:17:58 -0000 1.2 *************** *** 44,47 **** --- 44,48 ---- $lang['l_search'] = 'IeÅ¡koti'; // the verb $lang['l_results'] = 'PaieÅ¡kos rezultatai'; + $lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Užklausa'; // will be followed by the search query $lang['l_no_results'] = 'Neradome jokių renginių'; *************** *** 81,84 **** --- 82,88 ---- $lang['l_priority_none'] = 'Jokia'; $lang['l_status'] = 'BÅ«klÄ'; + $lang['l_status_confirmed'] = 'CONFIRMED' ; + $lang['l_status_cancelled'] = 'CANCELLED'; + $lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'Užduotys'; $lang['l_unfinished'] = 'Nebaigtos'; Index: norwegian.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/norwegian.inc.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** norwegian.inc.php 5 Oct 2005 01:07:40 -0000 1.29 --- norwegian.inc.php 16 Mar 2006 02:17:58 -0000 1.30 *************** *** 44,47 **** --- 44,48 ---- $lang['l_search'] = 'Søk'; // the verb $lang['l_results'] = 'Søkeresultater'; + $lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Forespørsel: '; // will be followed by the search query $lang['l_no_results'] = 'Ingen hendelser'; *************** *** 81,84 **** --- 82,88 ---- $lang['l_priority_none'] = 'Ingen'; $lang['l_status'] = 'Status'; + $lang['l_status_confirmed'] = 'CONFIRMED' ; + $lang['l_status_cancelled'] = 'CANCELLED'; + $lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'Oppgaver'; $lang['l_unfinished'] = 'Uferdig'; Index: portuguese.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/portuguese.inc.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** portuguese.inc.php 6 May 2005 02:08:27 -0000 1.15 --- portuguese.inc.php 16 Mar 2006 02:17:58 -0000 1.16 *************** *** 44,47 **** --- 44,48 ---- $lang['l_search'] = 'Buscar'; // the verb $lang['l_results'] = 'Buscar Resultados'; + $lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Questão: '; // will be followed by the search query $lang['l_no_results'] = 'Registos não encontrados'; *************** *** 81,84 **** --- 82,88 ---- $lang['l_priority_none'] = 'None'; $lang['l_status'] = 'Estado'; + $lang['l_status_confirmed'] = 'CONFIRMED' ; + $lang['l_status_cancelled'] = 'CANCELLED'; + $lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'To do items'; $lang['l_unfinished'] = 'Unfinished'; Index: spanish.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/spanish.inc.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** spanish.inc.php 16 Mar 2006 00:20:54 -0000 1.18 --- spanish.inc.php 16 Mar 2006 02:17:58 -0000 1.19 *************** *** 81,84 **** --- 81,87 ---- $lang['l_priority_none'] = 'Ninguna'; $lang['l_status'] = 'Estado'; + $lang['l_status_confirmed'] = 'CONFIRMED' ; + $lang['l_status_cancelled'] = 'CANCELLED'; + $lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'Por hacer'; $lang['l_unfinished'] = 'Sin terminar'; Index: swedish.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/swedish.inc.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** swedish.inc.php 16 Mar 2006 00:20:54 -0000 1.18 --- swedish.inc.php 16 Mar 2006 02:17:58 -0000 1.19 *************** *** 82,85 **** --- 82,88 ---- $lang['l_priority_none'] = 'Ingen'; $lang['l_status'] = 'Status'; + $lang['l_status_confirmed'] = 'CONFIRMED' ; + $lang['l_status_cancelled'] = 'CANCELLED'; + $lang['l_status_tentative'] = 'TENTATIVE'; $lang['l_todo'] = 'Att göra'; $lang['l_unfinished'] = 'Ouppklarade'; |
|
From: <ji...@us...> - 2006-03-16 02:18:15
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32427/phpicalendar/includes Modified Files: event.php Log Message: additions to language files Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** event.php 7 Dec 2005 07:26:14 -0000 1.36 --- event.php 16 Mar 2006 02:17:57 -0000 1.37 *************** *** 64,67 **** --- 64,79 ---- if (sizeof($organizer) == 0) $organizer = ''; + switch ($event['status']){ + case 'CONFIRMED': + $event['status'] = $lang['l_status_confirmed'] ; + break; + case 'CANCELLED': + $event['status'] = $lang['l_status_cancelled'] ; + break; + case 'TENTATIVE': + $event['status'] = $lang['l_status_tentative'] ; + break; + } + $page = new Page(BASE.'templates/'.$template.'/event.tpl'); |
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21007/phpicalendar/functions Modified Files: date_functions.php ical_parser.php init.inc.php overlapping_events.php template.php Log Message: changes to fix several warnings and notices Index: date_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** date_functions.php 23 Feb 2006 22:36:04 -0000 1.32 --- date_functions.php 16 Mar 2006 00:28:54 -0000 1.33 *************** *** 220,226 **** unset($unixtime, $date, $time, $allday); ! // What the heck is this doing in here? ! #$data = str_replace ('/softwarestudio.org/Olson_20011030_5/', '', $data); ! // Check for zulu time. $zulu_time = false; --- 220,224 ---- unset($unixtime, $date, $time, $allday); ! $allday =''; #suppress error on returning undef. // Check for zulu time. $zulu_time = false; Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.202 retrieving revision 1.203 diff -C2 -d -r1.202 -r1.203 *** ical_parser.php 8 Feb 2006 09:07:02 -0000 1.202 --- ical_parser.php 16 Mar 2006 00:28:54 -0000 1.203 *************** *** 105,111 **** // Let's see if we're doing a webcal ! $is_webcal == FALSE; if (substr($filename, 0, 7) == 'http://' || substr($filename, 0, 8) == 'https://' || substr($filename, 0, 9) == 'webcal://') { ! $is_webcal == TRUE; $cal_webcalPrefix = str_replace('http://','webcal://',$filename); $cal_httpPrefix = str_replace('webcal://','http://',$filename); --- 105,111 ---- // Let's see if we're doing a webcal ! $is_webcal = FALSE; if (substr($filename, 0, 7) == 'http://' || substr($filename, 0, 8) == 'https://' || substr($filename, 0, 9) == 'webcal://') { ! $is_webcal = TRUE; $cal_webcalPrefix = str_replace('http://','webcal://',$filename); $cal_httpPrefix = str_replace('webcal://','http://',$filename); *************** *** 328,332 **** } ! $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' => 0, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url ); checkOverlap($start_date_tmp, $time_tmp, $uid); $start_tmp = strtotime('+1 day',$start_tmp); --- 328,352 ---- } ! $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' => 0, ! 'description' => $description, ! 'status' => $status, ! 'class' => $class, ! 'spans_day' => true, ! 'location' => $location, ! 'organizer' => serialize($organizer), ! 'attendee' => serialize($attendee), ! 'calnumber' => $calnumber, ! 'calname' => $actual_calname, ! 'url' => $url ); ! if (isset($display_end_tmp)){ ! $master_array[$start_date_tmp][$time_tmp][$uid]['display_end'] = $display_end_tmp; ! } checkOverlap($start_date_tmp, $time_tmp, $uid); $start_tmp = strtotime('+1 day',$start_tmp); *************** *** 343,347 **** // This if statement should prevent writing of an excluded date if its the first recurrance - CL if (!in_array($start_date, $except_dates)) { ! $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' => 0, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url ); checkOverlap($start_date, ($hour.$minute), $uid); if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true; --- 363,387 ---- // This if statement should prevent writing of an excluded date if its the first recurrance - CL if (!in_array($start_date, $except_dates)) { ! $master_array[($start_date)][($hour.$minute)][$uid] = array ( ! 'event_start' => $start_time, ! 'event_end' => $end_time_tmp1, ! 'start_unixtime' => $start_unixtime, ! 'end_unixtime' => $end_unixtime, ! 'event_text' => $summary, ! 'event_length' => $length, ! 'event_overlap' => 0, ! 'description' => $description, ! 'status' => $status, ! 'class' => $class, ! 'spans_day' => false, ! 'location' => $location, ! 'organizer' => serialize($organizer), ! 'attendee' => serialize($attendee), ! 'calnumber' => $calnumber, ! 'calname' => $actual_calname, ! 'url' => $url ); ! if (isset($display_end_tmp)){ ! $master_array[($start_date)][($hour.$minute)][$uid]['display_end'] = $display_end_tmp; ! } checkOverlap($start_date, ($hour.$minute), $uid); if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true; *************** *** 705,709 **** $until_check = $start_date_tmp.$time_tmp.'00'; if ($abs_until > $until_check) { ! $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' => 0, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url, 'recur' => $recur); checkOverlap($start_date_tmp, $time_tmp, $uid); } --- 745,770 ---- $until_check = $start_date_tmp.$time_tmp.'00'; if ($abs_until > $until_check) { ! $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' => 0, ! 'description' => $description, ! 'status' => $status, ! 'class' => $class, ! 'spans_day' => true, ! 'location' => $location, ! 'organizer' => serialize($organizer), ! 'attendee' => serialize($attendee), ! 'calnumber' => $calnumber, ! 'calname' => $actual_calname, ! 'url' => $url, ! 'recur' => $recur); ! if (isset($display_end_tmp)){ ! $master_array[$start_date_tmp][$time_tmp][$uid]['display_end'] = $display_end_tmp; ! } checkOverlap($start_date_tmp, $time_tmp, $uid); } *************** *** 721,725 **** $until_check = $recur_data_date.$hour.$minute.'00'; if ($abs_until > $until_check) { ! $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' => 0, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url, 'recur' => $recur); checkOverlap($recur_data_date, ($hour.$minute), $uid); } --- 782,807 ---- $until_check = $recur_data_date.$hour.$minute.'00'; if ($abs_until > $until_check) { ! $master_array[($recur_data_date)][($hour.$minute)][$uid] = array ( ! 'event_start' => $start_time, ! 'event_end' => $end_time_tmp1, ! 'start_unixtime' => $start_unixtime_tmp, ! 'end_unixtime' => $end_unixtime_tmp, ! 'event_text' => $summary, ! 'event_length' => $length, ! 'event_overlap' => 0, ! 'description' => $description, ! 'status' => $status, ! 'class' => $class, ! 'spans_day' => false, ! 'location' => $location, ! 'organizer' => serialize($organizer), ! 'attendee' => serialize($attendee), ! 'calnumber' => $calnumber, ! 'calname' => $actual_calname, ! 'url' => $url, ! 'recur' => $recur); ! if (isset($display_end_tmp)){ ! $master_array[($recur_data_date)][($hour.$minute)][$uid]['display_end'] = $display_end_tmp; ! } checkOverlap($recur_data_date, ($hour.$minute), $uid); } *************** *** 740,743 **** --- 822,826 ---- if (is_array($except_dates)) { foreach ($except_dates as $key => $value) { + if (isset ($master_array[$value])){ $time = $except_times[$key]; unset($master_array[$value][$time][$uid]); *************** *** 750,753 **** --- 833,837 ---- } } + } // Clear event data now that it's been saved. *************** *** 794,798 **** unset ($field, $data, $prop_pos, $property); ! ereg ("([^:]+):(.*)", $line, $line); $field = $line[1]; $data = $line[2]; --- 878,882 ---- unset ($field, $data, $prop_pos, $property); ! if (ereg ("([^:]+):(.*)", $line, $line)){ $field = $line[1]; $data = $line[2]; *************** *** 996,999 **** --- 1080,1084 ---- } } + } 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; Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** init.inc.php 16 Mar 2006 00:20:53 -0000 1.86 --- init.inc.php 16 Mar 2006 00:28:54 -0000 1.87 *************** *** 31,35 **** } $cpath = ''; #initialize cpath to prevent later undef warnings. ! if($_REQUEST['cpath']){ $cpath = str_replace('..','',$_REQUEST['cpath']); $calendar_path .= "/$cpath"; --- 31,35 ---- } $cpath = ''; #initialize cpath to prevent later undef warnings. ! if(isset($_REQUEST['cpath'])){ $cpath = str_replace('..','',$_REQUEST['cpath']); $calendar_path .= "/$cpath"; Index: overlapping_events.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/overlapping_events.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** overlapping_events.php 16 May 2005 18:05:29 -0000 1.13 --- overlapping_events.php 16 Mar 2006 00:28:54 -0000 1.14 *************** *** 111,115 **** function checkOverlap($event_date, $event_time, $uid) { global $master_array, $overlap_array; ! $event = $master_array[$event_date][$event_time][$uid]; // Copy out the array - we replace this at the end. --- 111,115 ---- function checkOverlap($event_date, $event_time, $uid) { global $master_array, $overlap_array; ! if (!isset($event_date)) return; $event = $master_array[$event_date][$event_time][$uid]; // Copy out the array - we replace this at the end. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** template.php 15 Feb 2006 08:32:05 -0000 1.82 --- template.php 16 Mar 2006 00:28:55 -0000 1.83 *************** *** 908,912 **** $temp = $t_month[2]; } ! if ($master_array[$daylink]) { if ($type != 'small') { foreach ($master_array[$daylink] as $cal_time => $event_times) { --- 908,912 ---- $temp = $t_month[2]; } ! if (isset($master_array[$daylink])) { if ($type != 'small') { foreach ($master_array[$daylink] as $cal_time => $event_times) { |
|
From: <ji...@us...> - 2006-03-16 00:21:14
|
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15145/phpicalendar/languages Modified Files: english.inc.php spanish.inc.php swedish.inc.php Log Message: add Pick Multiple to lang files..other minor changes Index: english.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** english.inc.php 6 May 2005 02:08:26 -0000 1.60 --- english.inc.php 16 Mar 2006 00:20:54 -0000 1.61 *************** *** 44,47 **** --- 44,48 ---- $lang['l_search'] = 'Search'; // the verb $lang['l_results'] = 'Search Results'; + $lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Query'; // will be followed by the search query $lang['l_no_results'] = 'No events found'; Index: spanish.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/spanish.inc.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** spanish.inc.php 6 May 2005 02:08:27 -0000 1.17 --- spanish.inc.php 16 Mar 2006 00:20:54 -0000 1.18 *************** *** 43,46 **** --- 43,47 ---- $lang['l_search'] = 'Buscar'; // the verb $lang['l_results'] = 'Resultados de la búsqueda'; + $lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Consulta: '; // will be followed by the search query $lang['l_no_results'] = 'Ningún evento encontrado'; Index: swedish.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/swedish.inc.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** swedish.inc.php 6 May 2005 02:08:27 -0000 1.17 --- swedish.inc.php 16 Mar 2006 00:20:54 -0000 1.18 *************** *** 44,47 **** --- 44,48 ---- $lang['l_search'] = 'Sök'; // the verb $lang['l_results'] = 'Resultat av Sökning'; + $lang['l_pick_multiple'] = 'Pick multiple'; $lang['l_query'] = 'Sökord'; // will be followed by the search query $lang['l_no_results'] = 'Inga kalenderhändelser funna'; |
|
From: <ji...@us...> - 2006-03-16 00:21:05
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15145/phpicalendar Modified Files: config.inc.php Log Message: add Pick Multiple to lang files..other minor changes Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.174 retrieving revision 1.175 diff -C2 -d -r1.174 -r1.175 *** config.inc.php 17 Jan 2006 00:14:22 -0000 1.174 --- config.inc.php 16 Mar 2006 00:20:53 -0000 1.175 *************** *** 80,83 **** --- 80,85 ---- // add more lines as necessary + #$more_webcals['cpath'][] = '' //add webcals that will show up only for a particular cpath. + $locked_cals[] = ''; // Fill in-between the quotes the names of the calendars you wish to hide $locked_cals[] = ''; // unless unlocked by a username/password login. This should be the |
|
From: <ji...@us...> - 2006-03-16 00:21:03
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15145/phpicalendar/functions Modified Files: init.inc.php Log Message: add Pick Multiple to lang files..other minor changes Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** init.inc.php 23 Feb 2006 22:40:56 -0000 1.85 --- init.inc.php 16 Mar 2006 00:20:53 -0000 1.86 *************** *** 3,7 **** // uncomment when developing, comment for shipping version //error_reporting (E_ERROR | E_WARNING | E_PARSE); ! // Older versions of PHP do not define $_SERVER. Define it here instead. if (!isset($_SERVER) && isset($_SERVER)) { --- 3,7 ---- // uncomment when developing, comment for shipping version //error_reporting (E_ERROR | E_WARNING | E_PARSE); ! error_reporting(0); // Older versions of PHP do not define $_SERVER. Define it here instead. if (!isset($_SERVER) && isset($_SERVER)) { *************** *** 44,47 **** --- 44,51 ---- $template = $user_template["$cpath"]; } + #set up specific webcals for a particular cpath + if (is_array($more_webcals[$cpath])){ + array_merge($list_webcals, $more_webcals["$cpath"]); + } include_once(BASE.'error.php'); include_once(BASE.'functions/calendar_functions.php'); *************** *** 57,62 **** // Grab the action (login or logout). ! $action = ''; ! if (isset($_REQUEST['action'])) $action = $_REQUEST['action']; // Login and/or logout. --- 61,67 ---- // Grab the action (login or logout). ! if (isset($_GET['action'])) $action = $_GET['action']; ! else if (isset($_POST['action'])) $action = $_POST['action']; ! else $action = ''; // Login and/or logout. |
|
From: <ji...@us...> - 2006-02-23 22:41:07
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29563/phpicalendar/functions Modified Files: init.inc.php Log Message: accept action from request instead of just from get Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** init.inc.php 15 Feb 2006 15:41:24 -0000 1.84 --- init.inc.php 23 Feb 2006 22:40:56 -0000 1.85 *************** *** 30,34 **** $calendar_path = BASE.'calendars'; } ! if($_REQUEST['cpath']){ $cpath = str_replace('..','',$_REQUEST['cpath']); --- 30,34 ---- $calendar_path = BASE.'calendars'; } ! $cpath = ''; #initialize cpath to prevent later undef warnings. if($_REQUEST['cpath']){ $cpath = str_replace('..','',$_REQUEST['cpath']); *************** *** 58,62 **** // Grab the action (login or logout). $action = ''; ! if (isset($_REQUEST['action'])) $action = $_GET['action']; // Login and/or logout. --- 58,62 ---- // Grab the action (login or logout). $action = ''; ! if (isset($_REQUEST['action'])) $action = $_REQUEST['action']; // Login and/or logout. |
|
From: <ji...@us...> - 2006-02-23 22:36:14
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26905/phpicalendar/functions Modified Files: date_functions.php Log Message: allow image tags in event description Index: date_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** date_functions.php 2 Dec 2005 17:18:31 -0000 1.31 --- date_functions.php 23 Feb 2006 22:36:04 -0000 1.32 *************** *** 177,181 **** } else { $full_event_text = $event_text; ! $event_text = strip_tags($event_text, '<b><i><u>'); } --- 177,181 ---- } else { $full_event_text = $event_text; ! $event_text = strip_tags($event_text, '<b><i><u><img>'); } |
|
From: <ji...@us...> - 2006-02-15 15:57:09
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21299/phpicalendar/rss Modified Files: rss.php Log Message: fix date calculation problems (I hope) Index: rss.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** rss.php 15 Feb 2006 15:41:24 -0000 1.37 --- rss.php 15 Feb 2006 15:56:56 -0000 1.38 *************** *** 148,152 **** # note that usage of $thisdate is different from distribution # I use it as a date, dist uses it as a time ! $i = 0; #day counter $uid_arr = array(); do { --- 148,152 ---- # note that usage of $thisdate is different from distribution # I use it as a date, dist uses it as a time ! $i = 1; #day counter $uid_arr = array(); do { |
