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-02-15 15:41:37
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16120/phpicalendar/functions Modified Files: init.inc.php Log Message: fix date calculation problems (I hope) Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** init.inc.php 8 Dec 2005 01:06:09 -0000 1.83 --- init.inc.php 15 Feb 2006 15:41:24 -0000 1.84 *************** *** 57,63 **** // 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. --- 57,62 ---- // Grab the action (login or logout). ! $action = ''; ! if (isset($_REQUEST['action'])) $action = $_GET['action']; // Login and/or logout. |
|
From: <ji...@us...> - 2006-02-15 15:41:37
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16120/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.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** rss.php 15 Feb 2006 08:28:17 -0000 1.36 --- rss.php 15 Feb 2006 15:41:24 -0000 1.37 *************** *** 27,31 **** $getdate = date("Ymd"); } ! switch ($rssview){ case 'day': --- 27,31 ---- $getdate = date("Ymd"); } ! # for all views, $fromdate is the first day to be shown and $todate should be the last day. switch ($rssview){ case 'day': *************** *** 49,56 **** $theyear = $_GET['year']; }else{ ! $theyear = date('Y'); } $fromdate = ($theyear*10000)+101; ! $todate = date("Ymd", strtotime($fromdate) + 365*60*60*24); $theview = $theyear; break; --- 49,56 ---- $theyear = $_GET['year']; }else{ ! $theyear = substr($getdate,0,4); } $fromdate = ($theyear*10000)+101; ! $todate = date("Ymd", strtotime($theyear*10000+1231)); $theview = $theyear; break; *************** *** 58,62 **** $fromdate = $getdate; $todate = date("Ymd", strtotime($getdate) + $_GET['days']*60*60*24); - #print "from:$fromdate to: $todate<br>"; $theview = $_GET['days']." days from ".date('n/d/Y',strtotime($fromdate)); break; --- 58,61 ---- *************** *** 64,68 **** $todate = $getdate; $fromdate = date("Ymd", strtotime($getdate) - $_GET['days']*60*60*24); - #print "from:$fromdate to: $todate<br>"; $theview = $_GET['days']." days before ".date('n/d/Y',strtotime($todate)); break; --- 63,66 ---- *************** *** 146,150 **** //generate the items ! $numdays = round((strtotime($todate) - strtotime($fromdate))/(60*60*24)+1); $thisdate = $fromdate; # start at beginning of date range, # note that usage of $thisdate is different from distribution --- 144,148 ---- //generate the items ! $numdays = round((strtotime($todate) - strtotime($fromdate))/(60*60*24))+1; $thisdate = $fromdate; # start at beginning of date range, # note that usage of $thisdate is different from distribution |
|
From: <ji...@us...> - 2006-02-15 08:32:14
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5429/phpicalendar/functions Modified Files: template.php Log Message: fix path bug introduced by security patch in 2.21 release Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** template.php 9 Feb 2006 04:37:12 -0000 1.81 --- template.php 15 Feb 2006 08:32:05 -0000 1.82 *************** *** 1037,1046 **** global $template; ob_start(); ! $file = str_replace("..","",$file); ! if (strpos($file, "$template") > 0 || $file =='./functions/event.js'){ ! include($file); ! $buffer = ob_get_contents(); ! ob_end_clean(); ! return $buffer; }else{ die('breakin attempt'); --- 1037,1045 ---- global $template; ob_start(); ! if (strpos($file, "$template") > 0 || $file =='./functions/event.js'){ ! include($file); ! $buffer = ob_get_contents(); ! ob_end_clean(); ! return $buffer; }else{ die('breakin attempt'); |
|
From: <ji...@us...> - 2006-02-15 08:28:26
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4323/phpicalendar Modified Files: README Log Message: improve date calcs Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.97 retrieving revision 1.98 diff -C2 -d -r1.97 -r1.98 *** README 24 Nov 2005 04:28:34 -0000 1.97 --- README 15 Feb 2006 08:28:17 -0000 1.98 *************** *** 82,85 **** --- 82,91 ---- Changes: -------- + cvs + -patched security hole + -bug fixes from 2.2 + Modified rss.php to improve compatibility + + -Modified templates to validate as XHTML 1.0 Transitional 2.2 -Added Apple iCal native repository support. |
|
From: <ji...@us...> - 2006-02-15 08:28:26
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4323/phpicalendar/rss Modified Files: rss.php Log Message: improve date calcs Index: rss.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** rss.php 8 Feb 2006 09:15:49 -0000 1.35 --- rss.php 15 Feb 2006 08:28:17 -0000 1.36 *************** *** 42,47 **** $parse_month = date ("Ym", strtotime($getdate)); $fromdate = ($parse_month *100) + 1; ! $nextmonth = ($parse_month +1) * 100; #should give the 0th day of following month ! $todate = date('Ymd',strtotime($nextmonth+1)); $theview = date('M Y',strtotime($fromdate)); break; --- 42,46 ---- $parse_month = date ("Ym", strtotime($getdate)); $fromdate = ($parse_month *100) + 1; ! $todate = ($parse_month *100) + date("t",strtotime($getdate)); $theview = date('M Y',strtotime($fromdate)); break; *************** *** 105,113 **** --- 104,120 ---- // 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); *************** *** 135,143 **** $rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n"; $rss .= '<description>'.$cal_displayname.' '.$lang['l_calendar'].' - '.$theview.'</description>'."\n"; ! $rss .= '<language>'.$rss_language.'</language>'."\n"; ! $rss .= '<copyright>Copyright '.date(Y).', '.htmlspecialchars ("$default_path").'</copyright>'."\n"; //generate the items ! $numdays = round((strtotime($todate) - strtotime($fromdate))/(60*60*24)-1); $thisdate = $fromdate; # start at beginning of date range, # note that usage of $thisdate is different from distribution --- 142,150 ---- $rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n"; $rss .= '<description>'.$cal_displayname.' '.$lang['l_calendar'].' - '.$theview.'</description>'."\n"; ! $rss .= '<language>'.$language.'</language>'."\n"; ! $rss .= '<copyright>Copyright '.date('Y').', '.htmlspecialchars ("$default_path").'</copyright>'."\n"; //generate the items ! $numdays = round((strtotime($todate) - strtotime($fromdate))/(60*60*24)+1); $thisdate = $fromdate; # start at beginning of date range, # note that usage of $thisdate is different from distribution *************** *** 178,182 **** ! $rss_title = htmlspecialchars ("$dayofweek: $event_text"); $rss_link = htmlspecialchars ("$default_path/day.php?getdate=$thisdate&cal=$cal&cpath=$cpath"); $rss_description = htmlspecialchars ("$dayofweek $event_start: $description"); --- 185,189 ---- ! $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"); |
|
From: <ji...@us...> - 2006-02-15 08:18:09
|
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv730/phpicalendar/languages Modified Files: german.inc.php Log Message: correct Donnerstag Index: german.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/german.inc.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** german.inc.php 6 May 2005 02:08:26 -0000 1.27 --- german.inc.php 15 Feb 2006 08:17:55 -0000 1.28 *************** *** 158,162 **** // --------------------------------- ! $daysofweek_lang = array ('Sonntag','Montag','Dienstag','Mittwoch','Donerstag','Freitag','Samstag'); $daysofweekshort_lang = array ('Son','Mon','Die','Mit','Don','Fre','Sam'); $daysofweekreallyshort_lang = array ('S','M','D','M','D','F','S'); --- 158,162 ---- // --------------------------------- ! $daysofweek_lang = array ('Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag'); $daysofweekshort_lang = array ('Son','Mon','Die','Mit','Don','Fre','Sam'); $daysofweekreallyshort_lang = array ('S','M','D','M','D','F','S'); |
|
From: <ji...@us...> - 2006-02-09 04:37:25
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6563/phpicalendar/functions Modified Files: template.php Log Message: Sanitize file in parse function Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** template.php 8 Feb 2006 08:07:54 -0000 1.80 --- template.php 9 Feb 2006 04:37:12 -0000 1.81 *************** *** 1035,1043 **** --- 1035,1049 ---- function parse($file) { + global $template; ob_start(); + $file = str_replace("..","",$file); + if (strpos($file, "$template") > 0 || $file =='./functions/event.js'){ include($file); $buffer = ob_get_contents(); ob_end_clean(); return $buffer; + }else{ + die('breakin attempt'); + } } |
|
From: <ji...@us...> - 2006-02-08 20:21:19
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28722/phpicalendar Modified Files: search.php Log Message: Security patch to search.php Index: search.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/search.php,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** search.php 24 Nov 2005 04:28:34 -0000 1.37 --- search.php 8 Feb 2006 20:21:10 -0000 1.38 *************** *** 288,304 **** 'sidebar' => BASE.'templates/'.$template.'/sidebar.tpl', 'event_js' => BASE.'functions/event.js', - 'charset' => $charset, - 'default_path' => '', - 'template' => $template, - 'cal' => $cal, - 'getdate' => $getdate, - 'calendar_name' => $cal_displayname, - 'display_date' => $display_date, - 'current_view' => $current_view, - 'sidebar_date' => $sidebar_date, - 'rss_powered' => $rss_powered, - 'rss_available' => '', - 'rss_valid' => '', - 'show_search' => '' )); --- 288,291 ---- |
|
From: <ji...@us...> - 2006-02-08 09:15:57
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24576/phpicalendar/rss Modified Files: rss.php Log Message: Changes to improve compatibility with some installations Index: rss.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** rss.php 30 Nov 2005 17:05:56 -0000 1.34 --- rss.php 8 Feb 2006 09:15:49 -0000 1.35 *************** *** 35,39 **** break; case 'week': ! $fromdate = dateOfWeek($getdate, $week_start_day); $todate = $fromdate + 6; $theview = $lang['l_week']." of ".date('n/d/Y',strtotime($fromdate)); --- 35,39 ---- break; case 'week': ! $fromdate = dateOfWeek($getdate, 'Sunday'); $todate = $fromdate + 6; $theview = $lang['l_week']." of ".date('n/d/Y',strtotime($fromdate)); *************** *** 43,47 **** $fromdate = ($parse_month *100) + 1; $nextmonth = ($parse_month +1) * 100; #should give the 0th day of following month ! $todate = date('Ymd',strtotime($nextmonth)); $theview = date('M Y',strtotime($fromdate)); break; --- 43,47 ---- $fromdate = ($parse_month *100) + 1; $nextmonth = ($parse_month +1) * 100; #should give the 0th day of following month ! $todate = date('Ymd',strtotime($nextmonth+1)); $theview = date('M Y',strtotime($fromdate)); break; *************** *** 79,83 **** default: #default to week ! $fromdate = dateOfWeek($getdate, $week_start_day); $todate = $fromdate + 6; $theview = ""; --- 79,83 ---- default: #default to week ! $fromdate = dateOfWeek($getdate, 'Sunday'); $todate = $fromdate + 6; $theview = ""; |
|
From: <ji...@us...> - 2006-02-08 09:14:57
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24037/phpicalendar/templates/default Modified Files: rss_index.tpl Log Message: add link to docs for additional feeds Index: rss_index.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/rss_index.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** rss_index.tpl 19 May 2004 18:26:10 -0000 1.4 --- rss_index.tpl 8 Feb 2006 09:14:48 -0000 1.5 *************** *** 40,43 **** --- 40,44 ---- {RSS_LIST} <br /> + <p>RSS feeds can also be set up for a specified number of days before or after a given date, or between two dates. See the <a href="http://phpicalendar.net/documentation/index.php/RSS_feeds">documentation</a> for how to set up the URLs</p> </td> </tr> |
|
From: <ji...@us...> - 2006-02-08 09:13:48
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23240/phpicalendar/templates/default Modified Files: sidebar.tpl Log Message: Multiple modifications to template.php and template files to give validated XHTML 1.0 Transitional Index: sidebar.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/sidebar.tpl,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** sidebar.tpl 8 Feb 2006 08:07:54 -0000 1.19 --- sidebar.tpl 8 Feb 2006 09:13:40 -0000 1.20 *************** *** 103,107 **** <input type="hidden" name="getdate" value="{GETDATE}"/> <select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br /> ! <input type="submit" value="go"> </form> </div> --- 103,107 ---- <input type="hidden" name="getdate" value="{GETDATE}"/> <select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br /> ! <input type="submit" value="Go"/> </form> </div> *************** *** 131,135 **** <!-- switch t_allday off --> <!-- switch t_event on --> ! • {T_EVENT}<br /> <!-- switch t_event off --> </div> --- 131,135 ---- <!-- switch t_allday off --> <!-- switch t_event on --> ! • {T_EVENT}<br /> <!-- switch t_event off --> </div> |
|
From: <ji...@us...> - 2006-02-08 09:08:13
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19857/phpicalendar/rss Modified Files: index.php Log Message: Make rss URLs links Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** index.php 23 Nov 2005 07:51:01 -0000 1.39 --- index.php 8 Feb 2006 09:07:59 -0000 1.40 *************** *** 32,39 **** } $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); $rss_list .= '<font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $calendar_lang.'</b></font><br />'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&cpath='.$cpath.'&rssview=day<br />'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&cpath='.$cpath.'&rssview=week<br />'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&cpath='.$cpath.'&rssview=month<br /><br />'; $footer_check = $default_path.'/rss/rss.php?cal='.$default_cal.'&rssview='.$default_view; } --- 32,41 ---- } $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); + $cal_tmp = str_replace(" ", "+", $cal_tmp); $rss_list .= '<font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $calendar_lang.'</b></font><br />'; ! $rss_list .= '<a href='. $default_path.'/rss/rss.php?cal='.$cal_tmp.'&cpath='.$cpath.'&rssview=day>'.$default_path.'/rss/rss.php?cal='.$cal_tmp.'&cpath='.$cpath.'&rssview=day</a><br />'; ! $rss_list .= '<a href='. $default_path.'/rss/rss.php?cal='.$cal_tmp.'&cpath='.$cpath.'&rssview=week>'.$default_path.'/rss/rss.php?cal='.$cal_tmp.'&cpath='.$cpath.'&rssview=week</a><br />'; ! $rss_list .= '<a href='. $default_path.'/rss/rss.php?cal='.$cal_tmp.'&cpath='.$cpath.'&rssview=month>'.$default_path.'/rss/rss.php?cal='.$cal_tmp.'&cpath='.$cpath.'&rssview=month</a><br />'; ! $rss_list .= '<a href='. $default_path.'/rss/rss.php?cal='.$cal_tmp.'&cpath='.$cpath.'&rssview=year>'.$default_path.'/rss/rss.php?cal='.$cal_tmp.'&cpath='.$cpath.'&rssview=year</a><br />'; $footer_check = $default_path.'/rss/rss.php?cal='.$default_cal.'&rssview='.$default_view; } |
|
From: <ji...@us...> - 2006-02-08 09:07:16
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19390/phpicalendar/functions Modified Files: ical_parser.php Log Message: Comment out section in ical_parser.php that seems to cause repeat problems for repeating events Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.201 retrieving revision 1.202 diff -C2 -d -r1.201 -r1.202 *** ical_parser.php 2 Dec 2005 17:18:31 -0000 1.201 --- ical_parser.php 8 Feb 2006 09:07:02 -0000 1.202 *************** *** 523,527 **** // if we need to add $interval weeks to $next_date_time. if ($next_date_time > strtotime($week_start_day, $next_range_time) && $interval > 1) { ! $next_date_time = strtotime('+'.($interval - 1).' '.$freq_type, $next_date_time); } $recur_data[] = $next_date_time; --- 523,527 ---- // if we need to add $interval weeks to $next_date_time. if ($next_date_time > strtotime($week_start_day, $next_range_time) && $interval > 1) { ! # $next_date_time = strtotime('+'.($interval - 1).' '.$freq_type, $next_date_time); } $recur_data[] = $next_date_time; |
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20576/phpicalendar/templates/default Modified Files: calendar_nav.tpl month_medium.tpl preferences.tpl search_box.tpl sidebar.tpl Log Message: Multiple modifications to template.php and template files to give validated XHTML 1.0 Transitional Index: calendar_nav.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/calendar_nav.tpl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** calendar_nav.tpl 11 Nov 2005 05:15:25 -0000 1.14 --- calendar_nav.tpl 8 Feb 2006 08:07:54 -0000 1.15 *************** *** 28,32 **** <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br /> <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br /> ! <input type="hidden" name="cpath" value="{CPATH}"> </form> --- 28,32 ---- <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br /> <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br /> ! <input type="hidden" name="cpath" value="{CPATH}"/> </form> *************** *** 35,52 **** <!-- switch show_search off --> <!-- switch show_goto on --> ! <form style="margin-bottom:0;" action="day.php" method="get"> ! <input type="hidden" name="cpath" value="{CPATH}"> ! <input type="hidden" name="cal" value="{URL_CAL}"> ! <input type="text" style="width:160px; font-size:10px" name="jumpto_day"> ! <input type="submit" value="Go"> </form> <!-- 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}"> ! <input type="hidden" name="cpath" value="{CPATH}"> <select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br /> ! <input type="submit" value="go"> </form> </div> --- 35,52 ---- <!-- switch show_search off --> <!-- switch show_goto on --> ! <form style="margin-bottom:0;" action="day.php" method="get"/> ! <input type="hidden" name="cpath" value="{CPATH}"/> ! <input type="hidden" name="cal" value="{URL_CAL}"/> ! <input type="text" style="width:160px; font-size:10px" name="jumpto_day"/> ! <input type="submit" value="Go"/> </form> <!-- 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}"/> ! <input type="hidden" name="cpath" value="{CPATH}"/> <select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br /> ! <input type="submit" value="Go"/> </form> </div> Index: month_medium.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/month_medium.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** month_medium.tpl 20 May 2004 03:37:06 -0000 1.6 --- month_medium.tpl 8 Feb 2006 08:07:54 -0000 1.7 *************** *** 1,5 **** <table border="0" width="210" cellspacing="0" cellpadding="0" class="calborder"> <tr> ! <td align="center" class="medtitle"><a class="ps3" href="month.php?cal={CAL}&getdate={MONTH_DATE}">{MONTH_TITLE}</a></td> </tr> <tr> --- 1,5 ---- <table border="0" width="210" cellspacing="0" cellpadding="0" class="calborder"> <tr> ! <td align="center" class="medtitle">{MONTH_TITLE}</td> </tr> <tr> Index: preferences.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/preferences.tpl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** preferences.tpl 27 Nov 2005 07:56:31 -0000 1.11 --- preferences.tpl 8 Feb 2006 08:07:54 -0000 1.12 *************** *** 47,51 **** <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> <td><select name="cookie_calendar" class="query_style">{CALENDAR_SELECT}</select> ! <input type="hidden" name="cpath" value="{CPATH}"></td> </tr> <tr align="left" valign="top"> --- 47,51 ---- <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> <td><select name="cookie_calendar" class="query_style">{CALENDAR_SELECT}</select> ! <input type="hidden" name="cpath" value="{CPATH}"/></td> </tr> <tr align="left" valign="top"> Index: search_box.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/search_box.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** search_box.tpl 13 Apr 2005 14:57:58 -0000 1.1 --- search_box.tpl 8 Feb 2006 08:07:54 -0000 1.2 *************** *** 1,9 **** ! <hr> <div class = 'G10BOLD'>{L_SEARCH}:</div> <form action="search.php" method="GET"> ! <input type="hidden" name="cpath" value="{CPATH}"> ! <input type="hidden" name="cal" value="{CAL}"> ! <input type="hidden" name="getdate" value="{GETDATE}"> ! <input type="text" size="15" name="query" value=""> ! <INPUT type="image" src="templates/{TEMPLATE}/images/search.gif" border=0 height="19" width="18" name="submit" value="Search"> </form> \ No newline at end of file --- 1,9 ---- ! <hr /> <div class = 'G10BOLD'>{L_SEARCH}:</div> <form action="search.php" method="GET"> ! <input type="hidden" name="cpath" value="{CPATH}"/> ! <input type="hidden" name="cal" value="{CAL}"/> ! <input type="hidden" name="getdate" value="{GETDATE}"/> ! <input type="text" size="15" name="query" value=""/> ! <input type="image" src="templates/{TEMPLATE}/images/search.gif" name="submit" value="Search"/> </form> \ No newline at end of file Index: sidebar.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/sidebar.tpl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** sidebar.tpl 13 Jan 2006 03:03:14 -0000 1.18 --- sidebar.tpl 8 Feb 2006 08:07:54 -0000 1.19 *************** *** 84,88 **** <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br /> <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br /> ! <input type="hidden" name="cpath" value="{CPATH}"> </form> --- 84,88 ---- <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br /> <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br /> ! <input type="hidden" name="cpath" value="{CPATH}"/> </form> *************** *** 94,105 **** <input type="hidden" name="cal" value="{URL_CAL}"> <input type="text" style="width:160px; font-size:10px" name="jumpto_day"> ! <input type="submit" value="Go"> </form> <!-- 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}"> ! <input type="hidden" name="getdate" value="{GETDATE}"> <select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br /> <input type="submit" value="go"> --- 94,105 ---- <input type="hidden" name="cal" value="{URL_CAL}"> <input type="text" style="width:160px; font-size:10px" name="jumpto_day"> ! <input type="submit" value="Go"/> </form> <!-- 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}"/> ! <input type="hidden" name="getdate" value="{GETDATE}"/> <select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br /> <input type="submit" value="go"> |
|
From: <ji...@us...> - 2006-02-08 08:08:03
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20576/phpicalendar/functions Modified Files: template.php Log Message: Multiple modifications to template.php and template files to give validated XHTML 1.0 Transitional Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** template.php 1 Dec 2005 06:25:09 -0000 1.79 --- template.php 8 Feb 2006 08:07:54 -0000 1.80 *************** *** 865,874 **** // Add links in to the month/year views. ! $dateFormat_month = str_replace("%B", "<a class=\"ps3\" href=\"month.php?cal=$cal&getdate=$first_of_month\">%B</a>", $dateFormat_month); ! $dateFormat_month = str_replace("%Y", "<a class=\"ps3\" href=\"year.php?cal=$cal&getdate=$first_of_year\">%Y</a>", $dateFormat_month); //$start_day = strtotime($week_start_day); $start_day = strtotime(dateOfWeek($getdate, $week_start_day)); ! $month_title = localizeDate ($dateFormat_month, $fake_getdate_time); $month_date = date ('Ymd', $fake_getdate_time); --- 865,874 ---- // Add links in to the month/year views. ! $dateFormat_month_local = str_replace("%B", "<a class=\"ps3\" href=\"month.php?cal=$cal&getdate=$first_of_month\">%B</a>", $dateFormat_month); ! $dateFormat_month_local = str_replace("%Y", "<a class=\"ps3\" href=\"year.php?cal=$cal&getdate=$first_of_year\">%Y</a>", $dateFormat_month_local); //$start_day = strtotime($week_start_day); $start_day = strtotime(dateOfWeek($getdate, $week_start_day)); ! $month_title = localizeDate ($dateFormat_month_local, $fake_getdate_time); $month_date = date ('Ymd', $fake_getdate_time); |
|
From: <cl...@us...> - 2006-01-17 00:14:35
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29473 Modified Files: config.inc.php Log Message: Removed space. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.173 retrieving revision 1.174 diff -C2 -d -r1.173 -r1.174 *** config.inc.php 4 Dec 2005 17:52:52 -0000 1.173 --- config.inc.php 17 Jan 2006 00:14:22 -0000 1.174 *************** *** 45,49 **** // Calendar Caching (decreases page load times) ! $save_parsed_cals = 'no'; // Saves a copy of the cal in /tmp after it's been parsed. Improves performence. $tmp_dir = '/tmp'; // The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X). Any php-writable folder works. $webcal_hours = '24'; // Number of hours to cache webcals. Setting to '0' will always re-parse webcals. --- 45,49 ---- // Calendar Caching (decreases page load times) ! $save_parsed_cals = 'no'; // Saves a copy of the cal in /tmp after it's been parsed. Improves performance. $tmp_dir = '/tmp'; // The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X). Any php-writable folder works. $webcal_hours = '24'; // Number of hours to cache webcals. Setting to '0' will always re-parse webcals. |
|
From: <jo...@us...> - 2006-01-13 03:03:25
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4539/templates/default Modified Files: sidebar.tpl Log Message: Added Login button to the sidebar login form. Index: sidebar.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/sidebar.tpl,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** sidebar.tpl 11 Nov 2005 01:39:37 -0000 1.17 --- sidebar.tpl 13 Jan 2006 03:03:14 -0000 1.18 *************** *** 23,26 **** --- 23,29 ---- <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td> </tr> + <tr> + <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td> + </tr> </table> </form> |
|
From: <jo...@us...> - 2005-12-15 03:26:40
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32134/functions Modified Files: calendar_functions.php list_functions.php Log Message: Fixed getCalendarName() return value so it removes .ics and not the last four characters arbitrarily. Fixed the list_jumps() method so it only passes in one calendar at a time to getCalendarName. Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** calendar_functions.php 2 Dec 2005 17:25:08 -0000 1.19 --- calendar_functions.php 15 Dec 2005 03:26:31 -0000 1.20 *************** *** 197,201 **** // At this point, just pull the name off the file. ! return substr(basename($cal_path),0,-4); } --- 197,201 ---- // At this point, just pull the name off the file. ! return basename($cal_path, ".ics"); } Index: list_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_functions.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** list_functions.php 30 Nov 2005 02:20:32 -0000 1.15 --- list_functions.php 15 Dec 2005 03:26:31 -0000 1.16 *************** *** 3,7 **** function list_jumps() { global $second_offset, $lang, $cal; ! $calName = getCalendarName($cal); $today = date('Ymd', time() + $second_offset); $return = '<option value="#">'.$lang['l_jump'].'</option>'; --- 3,7 ---- function list_jumps() { global $second_offset, $lang, $cal; ! $calName = join(',', array_map("getCalendarName", split(',', $cal))); $today = date('Ymd', time() + $second_offset); $return = '<option value="#">'.$lang['l_jump'].'</option>'; |
|
From: <ji...@us...> - 2005-12-08 01:06:21
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6951/phpicalendar/functions Modified Files: init.inc.php Log Message: zap file gremlin in init.inc.php Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** init.inc.php 4 Dec 2005 17:52:52 -0000 1.82 --- init.inc.php 8 Dec 2005 01:06:09 -0000 1.83 *************** *** 41,46 **** } #these need cpath to be set ! if (isset($user_template[$cpath])){ ! Ê Ê Ê$template = $user_template[$cpath]; } include_once(BASE.'error.php'); --- 41,46 ---- } #these need cpath to be set ! if (isset($user_template["$cpath"])){ ! $template = $user_template["$cpath"]; } include_once(BASE.'error.php'); |
|
From: <ji...@us...> - 2005-12-07 07:26:22
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15390/phpicalendar Modified Files: year.php Log Message: bug fixes for event.php and others Index: year.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/year.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** year.php 24 Nov 2005 04:28:34 -0000 1.38 --- year.php 7 Dec 2005 07:26:14 -0000 1.39 *************** *** 34,38 **** 'calendar_name' => $cal_displayname, 'display_date' => $this_year, - 'default_path' => '', 'rss_powered' => $rss_powered, 'rss_available' => '', --- 34,37 ---- |
|
From: <ji...@us...> - 2005-12-07 07:26:22
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15390/phpicalendar/includes Modified Files: event.php Log Message: bug fixes for event.php and others Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** event.php 11 Nov 2005 01:30:11 -0000 1.35 --- event.php 7 Dec 2005 07:26:14 -0000 1.36 *************** *** 51,55 **** if ($event['location']) { ! if ($event['url'] != '') $event['location'] = '<a href="'.$event['url'].'" target="_blank">'.$event['location'].'</a>'; } --- 51,57 ---- if ($event['location']) { ! if ($event['url'] != '') $event['location'] = '<a href="'.$event['url'].'" target="_blank">'.stripslashes($event['location']).'</a>'; ! }else{ ! $event['location'] = stripslashes($event['location']); } |
|
From: <ji...@us...> - 2005-12-04 17:53:00
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3997/phpicalendar Modified Files: config.inc.php Log Message: fix order of default path, cpath, and calling error.tpl in init.inc.php Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.172 retrieving revision 1.173 diff -C2 -d -r1.172 -r1.173 *** config.inc.php 1 Dec 2005 06:15:28 -0000 1.172 --- config.inc.php 4 Dec 2005 17:52:52 -0000 1.173 *************** *** 34,38 **** $this_months_events = 'yes'; // Display "This month's events" at the bottom off the month page. $enable_rss = 'yes'; // Enable RSS access to your calendars (good thing). ! $show_search = 'no'; // Show the search box in the sidebar. $allow_preferences = 'yes'; // Allow visitors to change various preferences via cookies. $printview_default = 'no'; // Set print view as the default view. day, week, and month only supported views for $default_view (listed well above). --- 34,38 ---- $this_months_events = 'yes'; // Display "This month's events" at the bottom off the month page. $enable_rss = 'yes'; // Enable RSS access to your calendars (good thing). ! $show_search = 'yes'; // Show the search box in the sidebar. $allow_preferences = 'yes'; // Allow visitors to change various preferences via cookies. $printview_default = 'no'; // Set print view as the default view. day, week, and month only supported views for $default_view (listed well above). |
|
From: <ji...@us...> - 2005-12-04 17:53:00
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3997/phpicalendar/functions Modified Files: init.inc.php Log Message: fix order of default path, cpath, and calling error.tpl in init.inc.php Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** init.inc.php 2 Dec 2005 17:24:01 -0000 1.81 --- init.inc.php 4 Dec 2005 17:52:52 -0000 1.82 *************** *** 15,19 **** if (!defined('BASE')) define('BASE', './'); include_once(BASE.'config.inc.php'); - include_once(BASE.'error.php'); if (isset($_COOKIE['phpicalendar'])) { --- 15,18 ---- *************** *** 42,45 **** --- 41,48 ---- } #these need cpath to be set + if (isset($user_template[$cpath])){ + Ê Ê Ê$template = $user_template[$cpath]; + } + include_once(BASE.'error.php'); include_once(BASE.'functions/calendar_functions.php'); include_once(BASE.'functions/userauth_functions.php'); *************** *** 88,92 **** } - // Pull the calendars off the GET line if provided. The $cal_filename // is always an array, because this makes it easier to deal with below. --- 91,94 ---- |
|
From: <ji...@us...> - 2005-12-02 17:25:19
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7510/phpicalendar/functions Modified Files: calendar_functions.php Log Message: fix typo in last revert..need the minus sign Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** calendar_functions.php 30 Nov 2005 16:47:53 -0000 1.18 --- calendar_functions.php 2 Dec 2005 17:25:08 -0000 1.19 *************** *** 197,201 **** // At this point, just pull the name off the file. ! return substr(basename($cal_path),0,4); } --- 197,201 ---- // At this point, just pull the name off the file. ! return substr(basename($cal_path),0,-4); } |
|
From: <ji...@us...> - 2005-12-02 17:24:08
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7287/phpicalendar/functions Modified Files: init.inc.php Log Message: set the default calendar_path before appending cpath Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** init.inc.php 29 Nov 2005 08:39:20 -0000 1.80 --- init.inc.php 2 Dec 2005 17:24:01 -0000 1.81 *************** *** 28,31 **** --- 28,35 ---- } #cpath modifies the calendar path based on the url or cookie values. This allows you to run multiple calendar subsets from a single phpicalendar installation. Operations on cpath are largely hidden from the end user. + if ($calendar_path == '') { + $calendar_path = BASE.'calendars'; + } + if($_REQUEST['cpath']){ $cpath = str_replace('..','',$_REQUEST['cpath']); *************** *** 85,92 **** - if ($calendar_path == '') { - $calendar_path = BASE.'calendars'; - } - // Pull the calendars off the GET line if provided. The $cal_filename // is always an array, because this makes it easier to deal with below. --- 89,92 ---- |
