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: <par...@us...> - 2009-06-22 15:02:18
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31508 Modified Files: AUTHORS Log Message: Replaced old Czech translation with a new one by Petr KleteÄka: bug #2807370 Index: AUTHORS =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/AUTHORS,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** AUTHORS 22 Jun 2009 14:34:53 -0000 1.9 --- AUTHORS 22 Jun 2009 15:02:14 -0000 1.10 *************** *** 33,36 **** --- 33,37 ---- Bulgarian Georgi Kodinov <kgeorge at progem dot bg Croation Tihomir Cvetkovic <tihomir dot cvetkovic at gmail dot com> + Czech Petr KleteÄka <kletecka at email dot cz> Danish Henrik Højmark <styxx at worldonline dot dk> Jakob Peterhänsel <marook at creepers dot org> |
|
From: <par...@us...> - 2009-06-22 14:34:57
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26714 Modified Files: AUTHORS Log Message: Updated AUTHORS Index: AUTHORS =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/AUTHORS,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** AUTHORS 28 Dec 2008 19:30:41 -0000 1.8 --- AUTHORS 22 Jun 2009 14:34:53 -0000 1.9 *************** *** 18,21 **** --- 18,22 ---- Jim Hu <phpicalendar at gmail dot com> Chad Little <chad at chadsdomain dot com> + Jason Oster <jason dot oster at camp navajo dot com> David Reindl <dre at andare dot ch> Jared Wangen <xeo at silter dot org> |
|
From: <par...@us...> - 2009-06-22 14:31:06
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25952 Modified Files: day.php month.php week.php Log Message: Fix minical_view config - Thanks Roberto: bug #2800880 Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.138 retrieving revision 1.139 diff -C2 -d -r1.138 -r1.139 *** day.php 15 May 2009 21:50:08 -0000 1.138 --- day.php 22 Jun 2009 14:31:03 -0000 1.139 *************** *** 16,20 **** require_once(BASE.'functions/template.php'); ! if ($phpiCal_config->minical_view == 'current') $minical_view = 'day'; $weekstart = 1; --- 16,27 ---- require_once(BASE.'functions/template.php'); ! $minical_view = $current_view; ! switch ($phpiCal_config->minical_view) { ! case 'day': ! case 'week': ! case 'month': ! $minical_view = $phpiCal_config->minical_view; ! break; ! } $weekstart = 1; Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.152 retrieving revision 1.153 diff -C2 -d -r1.152 -r1.153 *** month.php 7 Jan 2009 21:11:39 -0000 1.152 --- month.php 22 Jun 2009 14:31:03 -0000 1.153 *************** *** 6,10 **** require_once(BASE.'functions/template.php'); header("Content-Type: text/html; charset=$phpiCal_config->charset"); ! if ($phpiCal_config->minical_view == 'current') $minical_view = 'month'; $unix_time = strtotime($getdate); --- 6,18 ---- require_once(BASE.'functions/template.php'); header("Content-Type: text/html; charset=$phpiCal_config->charset"); ! ! $minical_view = $current_view; ! switch ($phpiCal_config->minical_view) { ! case 'day': ! case 'week': ! case 'month': ! $minical_view = $phpiCal_config->minical_view; ! break; ! } $unix_time = strtotime($getdate); Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.138 retrieving revision 1.139 diff -C2 -d -r1.138 -r1.139 *** week.php 15 May 2009 21:50:08 -0000 1.138 --- week.php 22 Jun 2009 14:31:03 -0000 1.139 *************** *** 6,10 **** require_once(BASE.'functions/template.php'); header("Content-Type: text/html; charset=$phpiCal_config->charset"); ! if ($phpiCal_config->minical_view == "current") $minical_view = "week"; $starttime = "0500"; --- 6,18 ---- require_once(BASE.'functions/template.php'); header("Content-Type: text/html; charset=$phpiCal_config->charset"); ! ! $minical_view = $current_view; ! switch ($phpiCal_config->minical_view) { ! case 'day': ! case 'week': ! case 'month': ! $minical_view = $phpiCal_config->minical_view; ! break; ! } $starttime = "0500"; |
|
From: <par...@us...> - 2009-06-19 20:39:55
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13633 Modified Files: default_config.php Log Message: Use http "last-modified" time on webcals and remove "webcals_hours" config setting Index: default_config.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** default_config.php 2 Feb 2009 04:11:59 -0000 1.21 --- default_config.php 19 Jun 2009 20:39:46 -0000 1.22 *************** *** 56,60 **** $this->save_parsed_cals = 'no'; // Saves a copy of the cal in /tmp after it's been parsed. Improves performance. $this->tmp_dir = '/tmp'; // The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X). Any php-writable folder works. - $this->webcal_hours = '24'; // Number of hours to cache webcals. Setting to '0' will always re-parse webcals. // Webdav style publishing --- 56,59 ---- |
|
From: <par...@us...> - 2009-06-19 20:39:49
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13633/functions Modified Files: date_functions.php ical_parser.php Log Message: Use http "last-modified" time on webcals and remove "webcals_hours" config setting Index: date_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** date_functions.php 21 May 2009 15:06:12 -0000 1.55 --- date_functions.php 19 Jun 2009 20:39:46 -0000 1.56 *************** *** 5,8 **** --- 5,32 ---- + // get remote file last modification date (returns unix timestamp) + function remote_filemtime($url) { + $fp = fopen($url, 'r'); + if (!$fp) return 0; + $metadata = stream_get_meta_data($fp); + fclose($fp); + + $unixtime = 0; + foreach ($metadata['wrapper_data'] as $response) { + // case: redirection + // WARNING: does not handle relative redirection + if (substr(strtolower($response), 0, 10) == 'location: ') { + return GetRemoteLastModified(substr($response, 10)); + } + // case: last-modified + else if (substr(strtolower($response), 0, 15) == 'last-modified: ') { + $unixtime = strtotime(substr($response, 15)); + break; + } + } + + return $unixtime; + } + // takes iCalendar 2 day format and makes it into 3 characters // if $txt is true, it returns the 3 letters, otherwise it returns the Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.253 retrieving revision 1.254 diff -C2 -d -r1.253 -r1.254 *** ical_parser.php 18 Jun 2009 16:21:45 -0000 1.253 --- ical_parser.php 19 Jun 2009 20:39:47 -0000 1.254 *************** *** 20,24 **** $z=1; $y=0; - $webcal_mtime = time() - ($phpiCal_config->webcal_hours * 3600); if (sizeof($master_array['-4']) == (sizeof($cal_filelist))) { foreach ($master_array['-4'] as $temp_array) { --- 20,23 ---- *************** *** 26,34 **** $fname = $master_array['-4'][$z]['filename']; $wcalc = $master_array['-4'][$z]['webcal']; if ($wcalc == 'no') $realcal_mtime = filemtime($fname); ! if (isset($realcal_mtime) && ($mtime == $realcal_mtime) && ($wcalc == 'no')) { ! $y++; ! } elseif (($wcalc == 'yes') && ($mtime > $webcal_mtime)) { ! //echo date('H:i',$mtime). ' > '. date('H:i',$webcal_mtime); $y++; } --- 25,33 ---- $fname = $master_array['-4'][$z]['filename']; $wcalc = $master_array['-4'][$z]['webcal']; + if ($wcalc == 'no') $realcal_mtime = filemtime($fname); ! else $realcal_mtime = remote_filemtime($fname); ! ! if ($mtime == $realcal_mtime) { $y++; } *************** *** 51,55 **** } else { foreach ($cal_filelist as $filename) { ! $realcal_mtime = filemtime($filename); $parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$cal_filename).'-'.$this_year; if (file_exists($parsedcal)) { --- 50,60 ---- } else { foreach ($cal_filelist as $filename) { ! if (substr($filename, 0, 7) == 'http://' || substr($filename, 0, 8) == 'https://' || substr($filename, 0, 9) == 'webcal://') { ! $realcal_mtime = remote_filemtime($filename); ! } ! else { ! $realcal_mtime = filemtime($filename); ! } ! $parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$cal_filename).'-'.$this_year; if (file_exists($parsedcal)) { *************** *** 85,91 **** // 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(array('http://', 'https://'), 'webcal://', $filename); $cal_httpPrefix = str_replace(array('webcal://', 'https://'), 'http://', $filename); --- 90,94 ---- *************** *** 93,97 **** $filename = $cal_httpPrefix; $master_array['-4'][$calnumber]['webcal'] = 'yes'; ! $actual_mtime = time(); } else { $actual_mtime = @filemtime($filename); --- 96,100 ---- $filename = $cal_httpPrefix; $master_array['-4'][$calnumber]['webcal'] = 'yes'; ! $actual_mtime = @remote_filemtime($filename); } else { $actual_mtime = @filemtime($filename); |
|
From: <par...@us...> - 2009-06-18 16:21:50
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29459/functions Modified Files: ical_parser.php init.inc.php Log Message: Fixed webcal protocol prefixes Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.252 retrieving revision 1.253 diff -C2 -d -r1.252 -r1.253 *** ical_parser.php 17 Jun 2009 17:35:10 -0000 1.252 --- ical_parser.php 18 Jun 2009 16:21:45 -0000 1.253 *************** *** 88,95 **** 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); ! $cal_httpsPrefix = str_replace('webcal://','https://',$filename); ! $cal_httpsPrefix = str_replace('http://','https://',$cal_httpsPrefix); $filename = $cal_httpPrefix; $master_array['-4'][$calnumber]['webcal'] = 'yes'; --- 88,94 ---- if (substr($filename, 0, 7) == 'http://' || substr($filename, 0, 8) == 'https://' || substr($filename, 0, 9) == 'webcal://') { $is_webcal = TRUE; ! $cal_webcalPrefix = str_replace(array('http://', 'https://'), 'webcal://', $filename); ! $cal_httpPrefix = str_replace(array('webcal://', 'https://'), 'http://', $filename); ! $cal_httpsPrefix = str_replace(array('http://', 'webcal://'), 'https://', $filename); $filename = $cal_httpPrefix; $master_array['-4'][$calnumber]['webcal'] = 'yes'; Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.122 retrieving revision 1.123 diff -C2 -d -r1.122 -r1.123 *** init.inc.php 4 Jan 2009 21:58:18 -0000 1.122 --- init.inc.php 18 Jun 2009 16:21:46 -0000 1.123 *************** *** 99,106 **** // Make some protocol alternatives, and set our real identifier to the // HTTP protocol. ! $cal_webcalPrefix = str_replace('http://','webcal://',$web_cal); ! $cal_httpPrefix = str_replace('webcal://','http://',$web_cal); ! $cal_httpsPrefix = str_replace('webcal://','https://',$web_cal); ! $cal_httpsPrefix = str_replace('http://','https://',$web_cal); // We can only include this web calendar if we allow all web calendars --- 99,105 ---- // Make some protocol alternatives, and set our real identifier to the // HTTP protocol. ! $cal_webcalPrefix = str_replace(array('http://', 'https://'), 'webcal://', $web_cal); ! $cal_httpPrefix = str_replace(array('webcal://', 'https://'), 'http://', $web_cal); ! $cal_httpsPrefix = str_replace(array('http://', 'webcal://'), 'https://', $web_cal); // We can only include this web calendar if we allow all web calendars *************** *** 123,132 **** } $cals[] = urlencode($web_cal); - //$filename = $cal_filename; $subscribe_path = $cal_webcalPrefix; // Add the webcal to the available calendars. ! $web_cal = $cal_httpPrefix; ! $cal_filelist[] = $web_cal; } --- 122,129 ---- } $cals[] = urlencode($web_cal); $subscribe_path = $cal_webcalPrefix; // Add the webcal to the available calendars. ! $cal_filelist[] = $cal_httpPrefix; } |
|
From: <par...@us...> - 2009-06-17 17:41:37
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16079/rss Modified Files: rss_common.php Log Message: Fixed RSS content type, Thanks Russe (Bug 2726888) Index: rss_common.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss_common.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** rss_common.php 1 Feb 2009 21:22:24 -0000 1.8 --- rss_common.php 17 Jun 2009 17:40:53 -0000 1.9 *************** *** 226,230 **** } ! header ("Content-Type: text/xml"); echo "$rss"; --- 226,230 ---- } ! header ("Content-Type: application/xml"); echo "$rss"; |
|
From: <par...@us...> - 2009-06-17 17:35:32
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15297/functions Modified Files: ical_parser.php template.php Log Message: Fixed bugs with ALL_CALENDARS_COMBINED and saving parsed calendars Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.251 retrieving revision 1.252 diff -C2 -d -r1.251 -r1.252 *** ical_parser.php 29 May 2009 16:04:23 -0000 1.251 --- ical_parser.php 17 Jun 2009 17:35:10 -0000 1.252 *************** *** 12,16 **** if ($phpiCal_config->save_parsed_cals == 'yes') { if (sizeof ($cal_filelist) > 1) { ! $parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$cal_filename).'-'.$this_year; if (file_exists($parsedcal)) { $fd = fopen($parsedcal, 'r'); --- 12,16 ---- if ($phpiCal_config->save_parsed_cals == 'yes') { if (sizeof ($cal_filelist) > 1) { ! $parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$phpiCal_config->ALL_CALENDARS_COMBINED).'-'.$this_year; if (file_exists($parsedcal)) { $fd = fopen($parsedcal, 'r'); Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.118 retrieving revision 1.119 diff -C2 -d -r1.118 -r1.119 *** template.php 29 May 2009 15:30:48 -0000 1.118 --- template.php 17 Jun 2009 17:35:10 -0000 1.119 *************** *** 6,11 **** var $page; function draw_subscribe($template_p) { ! global $phpiCal_config, $getdate, $cal, $ALL_CALENDARS_COMBINED, $subscribe_path, $download_filename; ! if ($cal != $ALL_CALENDARS_COMBINED && $subscribe_path != '' && $download_filename != '') { $this->page = str_replace('{SUBSCRIBE_PATH}', $subscribe_path, $this->page); $this->page = str_replace('{DOWNLOAD_FILENAME}', $download_filename, $this->page); --- 6,11 ---- var $page; function draw_subscribe($template_p) { ! global $phpiCal_config, $getdate, $cal, $subscribe_path, $download_filename; ! if ($cal != $phpiCal_config->ALL_CALENDARS_COMBINED && $subscribe_path != '' && $download_filename != '') { $this->page = str_replace('{SUBSCRIBE_PATH}', $subscribe_path, $this->page); $this->page = str_replace('{DOWNLOAD_FILENAME}', $download_filename, $this->page); |
|
From: <par...@us...> - 2009-06-05 14:21:16
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1143/functions Modified Files: calendar_functions.php Log Message: Fix default selections in display_ical_list() Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** calendar_functions.php 26 Jan 2009 03:27:30 -0000 1.36 --- calendar_functions.php 5 Jun 2009 14:20:40 -0000 1.37 *************** *** 188,191 **** --- 188,192 ---- // Print each calendar option. $return = ''; + $all_cals = true; foreach ($cals as $cal_tmp) { // Format the calendar path for display. *************** *** 245,248 **** --- 246,253 ---- $cal_encoded_tmp = md5($phpiCal_config->salt.$cal_tmp);; } + + // Try to detect unselected calendars + if (!in_array($cal_encoded_tmp, explode(",", $cal))) $all_cals = false; + // Display the option. // *************** *** 257,272 **** } } else { ! $cal_httpPrefix_tmp = str_replace('webcal://', 'http://', $cal_tmp); ! if ($cal_encoded_tmp == urldecode($cal)) { ! $return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&getdate=$getdate\" selected=\"selected\">$cal_displayname_tmp</option>"; ! } else { ! $return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&getdate=$getdate\">$cal_displayname_tmp</option>"; } - } } // option to open all (non-web) calenders together if (!$pick) { ! if ($cal == $phpiCal_config->ALL_CALENDARS_COMBINED) { $return .= "<option value=\"$current_view.php?cal=$phpiCal_config->ALL_CALENDARS_COMBINED&getdate=$getdate\" selected=\"selected\">$all_cal_comb_lang</option>"; } else { --- 262,277 ---- } } else { ! $cal_httpPrefix_tmp = str_replace('webcal://', 'http://', $cal_tmp); ! if ($cal_encoded_tmp == $cal || $cal_encoded_tmp == urldecode($cal)) { ! $return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&getdate=$getdate\" selected=\"selected\">$cal_displayname_tmp</option>"; ! } else { ! $return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&getdate=$getdate\">$cal_displayname_tmp</option>"; ! } } } // option to open all (non-web) calenders together if (!$pick) { ! if ($all_cals || $cal == $phpiCal_config->ALL_CALENDARS_COMBINED) { $return .= "<option value=\"$current_view.php?cal=$phpiCal_config->ALL_CALENDARS_COMBINED&getdate=$getdate\" selected=\"selected\">$all_cal_comb_lang</option>"; } else { *************** *** 274,277 **** --- 279,283 ---- } } + return $return; } \ No newline at end of file |
|
From: <par...@us...> - 2009-05-29 16:04:27
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2591/functions Modified Files: ical_parser.php Log Message: Attempt to parse attendees/organizers without a Common Name attribute and invalid email address Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.250 retrieving revision 1.251 diff -C2 -d -r1.250 -r1.251 *** ical_parser.php 27 May 2009 17:21:01 -0000 1.250 --- ical_parser.php 29 May 2009 16:04:23 -0000 1.251 *************** *** 421,434 **** break; case 'ATTENDEE': ! $name = preg_match("/CN=([^;]*)/i", $field, $matches1); ! $email = str_replace("mailto:", "", $data); ! $rsvp = preg_match("/RSVP=([^;]*)/i", $field, $matches2); ! $partstat = preg_match("/PARTSTAT=([^;]*)/i", $field, $matches3); ! $role = preg_match("/ROLE=([^;]*)/i", $field, $matches4); ! $name = ($name ? $matches1[1] : $email); ! $rsvp = ($rsvp ? $matches2[1] : ''); ! $partstat = ($partstat ? $matches3[1] : ''); ! $role = ($role ? $matches4[1] : ''); $attendee[] = array ('name' => stripslashes($name), --- 421,438 ---- break; case 'ATTENDEE': ! $email = preg_match("/mailto:(.*)/i", $data, $matches1); ! $name = preg_match("/CN=([^;]*)/i", $field, $matches2); ! $rsvp = preg_match("/RSVP=([^;]*)/i", $field, $matches3); ! $partstat = preg_match("/PARTSTAT=([^;]*)/i", $field, $matches4); ! $role = preg_match("/ROLE=([^;]*)/i", $field, $matches5); ! $email = ($email ? $matches1[1] : ''); ! $name = ($name ? $matches2[1] : $email); ! $rsvp = ($rsvp ? $matches3[1] : ''); ! $partstat = ($partstat ? $matches4[1] : ''); ! $role = ($role ? $matches5[1] : ''); ! ! // Emergency fallback ! if (empty($name) && empty($email)) $name = $data; $attendee[] = array ('name' => stripslashes($name), *************** *** 440,447 **** break; case 'ORGANIZER': ! $data = str_replace ("mailto:", "", $data); ! $field = preg_match("/CN=([^;]*)/i", $field, $matches); ! $field = ($field ? $matches[1] : $data); ! $organizer[] = array ('name' => stripslashes($field), 'email' => stripslashes($data)); break; case 'LOCATION': --- 444,457 ---- break; case 'ORGANIZER': ! $email = preg_match("/mailto:(.*)/i", $data, $matches1); ! $name = preg_match("/CN=([^;]*)/i", $field, $matches2); ! ! $email = ($email ? $matches1[1] : ''); ! $name = ($name ? $matches2[1] : $email); ! ! // Emergency fallback ! if (empty($name) && empty($email)) $name = $data; ! ! $organizer[] = array ('name' => stripslashes($name), 'email' => stripslashes($email)); break; case 'LOCATION': |
|
From: <par...@us...> - 2009-05-29 16:04:27
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2591/includes Modified Files: event.php Log Message: Attempt to parse attendees/organizers without a Common Name attribute and invalid email address Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** event.php 29 May 2009 15:30:49 -0000 1.56 --- event.php 29 May 2009 16:04:23 -0000 1.57 *************** *** 40,44 **** $organizers = array(); foreach ($organizer as $val) { ! $organizers[] .= "<a href=\"mailto:{$organizer[$i]["email"]}\">{$organizer[$i]["name"]}</a>"; $i++; } --- 40,48 ---- $organizers = array(); foreach ($organizer as $val) { ! if (!empty($organizer[$i]["email"])) { ! $organizers[] .= "<a href=\"mailto:{$organizer[$i]["email"]}\">{$organizer[$i]["name"]}</a>"; ! } else { ! $organizers[] .= $organizer[$i]["name"]; ! } $i++; } *************** *** 49,53 **** $attendees = array(); foreach ($attendee as $val) { ! $attendees[] .= "<a href=\"mailto:{$attendee[$i]["email"]}\">{$attendee[$i]["name"]}</a>"; $i++; } --- 53,61 ---- $attendees = array(); foreach ($attendee as $val) { ! if (!empty($attendee[$i]["email"])) { ! $attendees[] .= "<a href=\"mailto:{$attendee[$i]["email"]}\">{$attendee[$i]["name"]}</a>"; ! } else { ! $attendees[] .= $attendee[$i]["name"]; ! } $i++; } |
|
From: <par...@us...> - 2009-05-29 15:31:01
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28517/includes Modified Files: event.php Log Message: Better handling of URLs and email addresses in event descriptions (also strip "blocked" protocols, added by some mail servers) Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** event.php 26 May 2009 20:50:57 -0000 1.55 --- event.php 29 May 2009 15:30:49 -0000 1.56 *************** *** 32,37 **** $event['location'] = sanitizeForWeb(urldecode($event['location'])); if (isset($event['description'])) { ! $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", '<a target="_new" href="\0">\0</a>', $event['description']); ! $event['description'] = ereg_replace("[a-zA-Z0-9_.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}", '<a href="mailto:\0">\0</a>', $event['description']); } --- 32,37 ---- $event['location'] = sanitizeForWeb(urldecode($event['location'])); if (isset($event['description'])) { ! $event['description'] = ereg_replace("(blocked)?([[:alpha:]]+://([^<>&[:space:]]|&)+[[:alnum:]/])", '<a target="_new" href="\2">\2</a>', $event['description']); ! $event['description'] = ereg_replace("(blocked)?(mailto:)?([[:alnum:]_.%+-]+@[[:alnum:].-]+\.[[:alpha:]]{2,4})", '<a href="mailto:\3">\3</a>', $event['description']); } |
|
From: <par...@us...> - 2009-05-29 15:30:56
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28517/functions Modified Files: template.php Log Message: Better handling of URLs and email addresses in event descriptions (also strip "blocked" protocols, added by some mail servers) Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.117 retrieving revision 1.118 diff -C2 -d -r1.117 -r1.118 *** template.php 27 May 2009 16:47:40 -0000 1.117 --- template.php 29 May 2009 15:30:48 -0000 1.118 *************** *** 91,96 **** $description = sanitizeForWeb(stripslashes(urldecode($new_val2['description']))); if (!empty($description)) { ! $description = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>', $description); ! $description = ereg_replace("[a-zA-Z0-9_.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}", '<a href="mailto:\0">\0</a>', $description); } --- 91,96 ---- $description = sanitizeForWeb(stripslashes(urldecode($new_val2['description']))); if (!empty($description)) { ! $description = ereg_replace("(blocked)?([[:alpha:]]+://([^<>&[:space:]]|&)+[[:alnum:]/])", '<a target="_new" href="\2">\2</a>', $description); ! $description = ereg_replace("(blocked)?(mailto:)?([[:alnum:]_.%+-]+@[[:alnum:].-]+\.[[:alpha:]]{2,4})", '<a href="mailto:\3">\3</a>', $description); } |
|
From: <par...@us...> - 2009-05-27 17:21:08
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23515/functions Modified Files: ical_parser.php Log Message: Fix tab/newline parsing Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.249 retrieving revision 1.250 diff -C2 -d -r1.249 -r1.250 *** ical_parser.php 27 May 2009 16:06:58 -0000 1.249 --- ical_parser.php 27 May 2009 17:21:01 -0000 1.250 *************** *** 127,130 **** --- 127,131 ---- } $line = str_replace('\n',"\n",$line); + $line = str_replace('\t',"\t",$line); $line = trim(stripslashes($line)); switch ($line) { *************** *** 322,328 **** case 'SUMMARY': - $data = str_replace("\\n", "<br />", $data); - $data = str_replace("\\t", " ", $data); - $data = str_replace("\\r", "<br />", $data); $data = str_replace('$', '$', $data); $data = stripslashes($data); --- 323,326 ---- *************** *** 336,342 **** case 'DESCRIPTION': - $data = str_replace("\n", "<br />", $data); - $data = str_replace("\\t", " ", $data); - $data = str_replace("\r", "<br />", $data); $data = str_replace('$', '$', $data); $data = stripslashes($data); --- 334,337 ---- |
|
From: <par...@us...> - 2009-05-27 17:21:05
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/init In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23515/functions/init Modified Files: sanitize.php Log Message: Fix tab/newline parsing Index: sanitize.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/sanitize.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sanitize.php 20 May 2009 17:13:19 -0000 1.5 --- sanitize.php 27 May 2009 17:21:01 -0000 1.6 *************** *** 61,65 **** $string = str_replace("\n", '<br />', $string); ! return $string; } --- 61,66 ---- $string = str_replace("\n", '<br />', $string); ! $string = str_replace("\t", ' ', $string); ! return $string; } |
|
From: <par...@us...> - 2009-05-27 16:47:52
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/init In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15783/functions/init Modified Files: date_range.php Log Message: Fixes for print view Index: date_range.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/date_range.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** date_range.php 29 Dec 2008 06:00:42 -0000 1.10 --- date_range.php 27 May 2009 16:47:40 -0000 1.11 *************** *** 31,34 **** --- 31,35 ---- case 'week': case 'day': + case 'print': $mArray_begin = mktime (0,0,0,$start_month,1,($start_year)); $mArray_end = mktime (0,0,0,$end_month,31,($end_year)); |
|
From: <par...@us...> - 2009-05-27 16:47:52
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15783/functions Modified Files: template.php Log Message: Fixes for print view Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.116 retrieving revision 1.117 diff -C2 -d -r1.116 -r1.117 *** template.php 26 May 2009 20:50:57 -0000 1.116 --- template.php 27 May 2009 16:47:40 -0000 1.117 *************** *** 78,82 **** // Pull out each day $some_events = ''; ! foreach ($val as $new_val) { foreach ($new_val as $new_key2 => $new_val2) { if (isset($seen_events["$new_key2"]) && isset($new_val2['spans_day']) && $new_val2['spans_day'] == 1){ --- 78,82 ---- // Pull out each day $some_events = ''; ! foreach ($val as $cal_time => $new_val) { foreach ($new_val as $new_key2 => $new_val2) { if (isset($seen_events["$new_key2"]) && isset($new_val2['spans_day']) && $new_val2['spans_day'] == 1){ *************** *** 98,102 **** $event_end = $new_val2['event_end']; if (isset($new_val2['display_end'])) $event_end = $new_val2['display_end']; ! if (!isset($new_val2['event_start'])) { $event_start = $lang['l_all_day']; $event_start2 = ''; --- 98,102 ---- $event_end = $new_val2['event_end']; if (isset($new_val2['display_end'])) $event_end = $new_val2['display_end']; ! if ($cal_time == -1) { $event_start = $lang['l_all_day']; $event_start2 = ''; |
|
From: <par...@us...> - 2009-05-27 16:07:07
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10000/functions Modified Files: ical_parser.php Log Message: Handle attendee/organizer parsing better Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.248 retrieving revision 1.249 diff -C2 -d -r1.248 -r1.249 *** ical_parser.php 20 May 2009 17:59:12 -0000 1.248 --- ical_parser.php 27 May 2009 16:06:58 -0000 1.249 *************** *** 426,438 **** break; case 'ATTENDEE': ! $attendee[] = array ('name' => ereg_replace(".*;CN=([^;]*).*", "\\1", $field), ! 'email' => str_replace ("mailto:", "", $data), ! 'RSVP' => ereg_replace(".*;RSVP=([^;]*).*", "\\1", $field), ! 'PARTSTAT' => ereg_replace(".*;PARTSTAT=([^;]*).*", "\\1", $field), ! 'ROLE' => ereg_replace(".*;ROLE=([^;]*).*", "\\1", $field)); break; case 'ORGANIZER': ! $field = ereg_replace(".*;CN=([^;]*).*", "\\1", $field); ! $data = str_replace ("mailto:", "", $data); $organizer[] = array ('name' => stripslashes($field), 'email' => stripslashes($data)); break; --- 426,451 ---- break; case 'ATTENDEE': ! $name = preg_match("/CN=([^;]*)/i", $field, $matches1); ! $email = str_replace("mailto:", "", $data); ! $rsvp = preg_match("/RSVP=([^;]*)/i", $field, $matches2); ! $partstat = preg_match("/PARTSTAT=([^;]*)/i", $field, $matches3); ! $role = preg_match("/ROLE=([^;]*)/i", $field, $matches4); ! ! $name = ($name ? $matches1[1] : $email); ! $rsvp = ($rsvp ? $matches2[1] : ''); ! $partstat = ($partstat ? $matches3[1] : ''); ! $role = ($role ? $matches4[1] : ''); ! ! $attendee[] = array ('name' => stripslashes($name), ! 'email' => stripslashes($email), ! 'RSVP' => stripslashes($rsvp), ! 'PARTSTAT' => stripslashes($partstat), ! 'ROLE' => stripslashes($role) ! ); break; case 'ORGANIZER': ! $data = str_replace ("mailto:", "", $data); ! $field = preg_match("/CN=([^;]*)/i", $field, $matches); ! $field = ($field ? $matches[1] : $data); $organizer[] = array ('name' => stripslashes($field), 'email' => stripslashes($data)); break; |
|
From: <par...@us...> - 2009-05-26 20:51:08
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26029/functions Modified Files: template.php Log Message: Hyperlink email addresses Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.115 retrieving revision 1.116 diff -C2 -d -r1.115 -r1.116 *** template.php 26 May 2009 20:15:15 -0000 1.115 --- template.php 26 May 2009 20:50:57 -0000 1.116 *************** *** 90,94 **** $location = sanitizeForWeb(stripslashes(urldecode($new_val2['location']))); $description = sanitizeForWeb(stripslashes(urldecode($new_val2['description']))); ! if (!empty($description)) $description = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>', $description); $event_start = $new_val2['event_start']; --- 90,97 ---- $location = sanitizeForWeb(stripslashes(urldecode($new_val2['location']))); $description = sanitizeForWeb(stripslashes(urldecode($new_val2['description']))); ! if (!empty($description)) { ! $description = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>', $description); ! $description = ereg_replace("[a-zA-Z0-9_.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}", '<a href="mailto:\0">\0</a>', $description); ! } $event_start = $new_val2['event_start']; |
|
From: <par...@us...> - 2009-05-26 20:51:03
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26029/includes Modified Files: event.php Log Message: Hyperlink email addresses Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** event.php 20 May 2009 18:23:05 -0000 1.54 --- event.php 26 May 2009 20:50:57 -0000 1.55 *************** *** 31,35 **** $event['description'] = sanitizeForWeb(urldecode($event['description'])); $event['location'] = sanitizeForWeb(urldecode($event['location'])); ! if (isset($event['description'])) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']); if (isset($organizer) && is_array($organizer)) { --- 31,38 ---- $event['description'] = sanitizeForWeb(urldecode($event['description'])); $event['location'] = sanitizeForWeb(urldecode($event['location'])); ! if (isset($event['description'])) { ! $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", '<a target="_new" href="\0">\0</a>', $event['description']); ! $event['description'] = ereg_replace("[a-zA-Z0-9_.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}", '<a href="mailto:\0">\0</a>', $event['description']); ! } if (isset($organizer) && is_array($organizer)) { |
|
From: <par...@us...> - 2009-05-26 20:18:32
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18932/functions Modified Files: template.php Log Message: Sanitize print view and add URL links Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** template.php 14 May 2009 21:45:44 -0000 1.114 --- template.php 26 May 2009 20:15:15 -0000 1.115 *************** *** 86,96 **** $seen_events["$new_key2"] = 1; $day_events++; ! if (isset($new_val2['event_text'])) { ! $event_text = stripslashes(urldecode($new_val2['event_text'])); ! $location = stripslashes(urldecode($new_val2['location'])); ! $description = stripslashes(urldecode($new_val2['description'])); ! $event_start = $new_val2['event_start']; ! $event_end = $new_val2['event_end']; ! if (isset($new_val2['display_end'])) $event_end = $new_val2['display_end']; if (!isset($new_val2['event_start'])) { $event_start = $lang['l_all_day']; --- 86,98 ---- $seen_events["$new_key2"] = 1; $day_events++; ! if (isset($new_val2['event_text'])) { ! $event_text = sanitizeForWeb(stripslashes(urldecode($new_val2['event_text']))); ! $location = sanitizeForWeb(stripslashes(urldecode($new_val2['location']))); ! $description = sanitizeForWeb(stripslashes(urldecode($new_val2['description']))); ! if (!empty($description)) $description = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>', $description); ! ! $event_start = $new_val2['event_start']; ! $event_end = $new_val2['event_end']; ! if (isset($new_val2['display_end'])) $event_end = $new_val2['display_end']; if (!isset($new_val2['event_start'])) { $event_start = $lang['l_all_day']; |
|
From: <par...@us...> - 2009-05-21 15:06:20
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6120/functions Modified Files: date_functions.php Log Message: Make title generation more concise Index: date_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** date_functions.php 20 May 2009 17:10:09 -0000 1.54 --- date_functions.php 21 May 2009 15:06:12 -0000 1.55 *************** *** 164,168 **** global $timeFormat, $dateFormat_week; ! $event_text = chopToWordCount(sanitizeForWeb(urldecode($arr["event_text"])), 25); if ($time == -1) { $start = localizeDate($dateFormat_week, $arr['start_unixtime']); --- 164,168 ---- global $timeFormat, $dateFormat_week; ! $event_text = chopToWordCount(sanitizeForWeb(urldecode($arr["event_text"])), 20); if ($time == -1) { $start = localizeDate($dateFormat_week, $arr['start_unixtime']); *************** *** 177,185 **** } - if (!empty($arr['description'])) { - $title .= "\n\nDescription: " . chopToWordCount(sanitizeForWeb(urldecode($arr['description'])), 100); - } if (!empty($arr['location'])) { ! $title .= "\n\nLocation: " . chopToWordCount(sanitizeForWeb(urldecode($arr['location'])), 25); } $title = trim($title); --- 177,185 ---- } if (!empty($arr['location'])) { ! $title .= "\nLocation: " . chopToWordCount(sanitizeForWeb(urldecode($arr['location'])), 20); ! } ! if (!empty($arr['description'])) { ! $title .= "\n\n" . chopToWordCount(sanitizeForWeb(urldecode($arr['description'])), 80); } $title = trim($title); |
|
From: <par...@us...> - 2009-05-20 22:43:41
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8529 Modified Files: preferences.php Log Message: Fix setting time format in preferences page Index: preferences.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** preferences.php 7 Jan 2009 20:20:03 -0000 1.72 --- preferences.php 20 May 2009 22:43:33 -0000 1.73 *************** *** 23,27 **** if ($action == 'setcookie') { ! $cookie_language = $_POST['cookie_language']; $cookie_cpath = $_POST['cpath']; $cookie_calendar = $_POST['cookie_calendar']; --- 23,27 ---- if ($action == 'setcookie') { ! $cookie_language = urldecode($_POST['cookie_language']); $cookie_cpath = $_POST['cpath']; $cookie_calendar = $_POST['cookie_calendar']; *************** *** 30,34 **** $cookie_startday = $_POST['cookie_startday']; $cookie_time = $_POST['cookie_time']; ! $cookie_timeformat = $_POST['cookie_timeformat']; $cookie_endtime = $_POST['cookie_endtime']; $cookie_timezone = $_POST['cookie_timezone']; --- 30,34 ---- $cookie_startday = $_POST['cookie_startday']; $cookie_time = $_POST['cookie_time']; ! $cookie_timeformat = urldecode($_POST['cookie_timeformat']); $cookie_endtime = $_POST['cookie_endtime']; $cookie_timezone = $_POST['cookie_timezone']; *************** *** 129,133 **** // select for time $time_select = ''; ! for ($i = 000; $i <= 2400; $i += 100) { $s = sprintf("%04d", $i); $time_select .= '<option value="'.$s.'"'; --- 129,133 ---- // select for time $time_select = ''; ! for ($i = 0; $i <= 2400; $i += 100) { $s = sprintf("%04d", $i); $time_select .= '<option value="'.$s.'"'; *************** *** 139,143 **** $endtime_select = ''; ! for ($i = 000; $i <= 2400; $i += 100) { $s = sprintf("%04d", $i); $endtime_select .= '<option value="'.$s.'"'; --- 139,143 ---- $endtime_select = ''; ! for ($i = 0; $i <= 2400; $i += 100) { $s = sprintf("%04d", $i); $endtime_select .= '<option value="'.$s.'"'; |
|
From: <par...@us...> - 2009-05-20 18:23:16
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10942/includes Modified Files: event.php Log Message: Fix language issue with "full calendar name" in event popup Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** event.php 20 May 2009 18:07:25 -0000 1.53 --- event.php 20 May 2009 18:23:05 -0000 1.54 *************** *** 106,110 **** 'event_text' => $event['event_text'], 'event_times' => $event_times, ! 'description' => str_replace('\n',"<br />",$event['description']), 'organizer' => $organizer, 'attendee' => $attendee, --- 106,110 ---- 'event_text' => $event['event_text'], 'event_times' => $event_times, ! 'description' => $event['description'], 'organizer' => $organizer, 'attendee' => $attendee, *************** *** 113,117 **** 'event_download' => $event_download, 'url' => $event['url'], ! 'cal_title_full' => $event['calname'].' '.$lang['l_calendar'], 'template' => $phpiCal_config->template, 'l_summary' => $lang['l_summary'], --- 113,117 ---- 'event_download' => $event_download, 'url' => $event['url'], ! 'cal_title_full' => $event['calname'], 'template' => $phpiCal_config->template, 'l_summary' => $lang['l_summary'], |
|
From: <par...@us...> - 2009-05-20 18:07:35
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9321/includes Modified Files: event.php Log Message: Show organizer/attendee email addresses in events popup Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** event.php 13 Feb 2009 20:52:29 -0000 1.52 --- event.php 20 May 2009 18:07:25 -0000 1.53 *************** *** 31,43 **** $event['description'] = sanitizeForWeb(urldecode($event['description'])); $event['location'] = sanitizeForWeb(urldecode($event['location'])); - $display =''; if (isset($event['description'])) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']); if (isset($organizer) && is_array($organizer)) { $i=0; - $display .= $lang['l_organizer'] . ' - '; $organizers = array(); ! foreach ($organizer as $val) { ! $organizers[] = $organizer[$i]["name"]; $i++; } --- 31,41 ---- $event['description'] = sanitizeForWeb(urldecode($event['description'])); $event['location'] = sanitizeForWeb(urldecode($event['location'])); if (isset($event['description'])) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']); if (isset($organizer) && is_array($organizer)) { $i=0; $organizers = array(); ! foreach ($organizer as $val) { ! $organizers[] .= "<a href=\"mailto:{$organizer[$i]["email"]}\">{$organizer[$i]["name"]}</a>"; $i++; } *************** *** 46,53 **** if (isset($attendee) && is_array($attendee)) { $i=0; - $display .= $lang['l_attendee'] . ' - '; $attendees = array(); ! foreach ($attendee as $val) { ! $attendees[] .= $attendee[$i]["name"]; $i++; } --- 44,50 ---- if (isset($attendee) && is_array($attendee)) { $i=0; $attendees = array(); ! foreach ($attendee as $val) { ! $attendees[] .= "<a href=\"mailto:{$attendee[$i]["email"]}\">{$attendee[$i]["name"]}</a>"; $i++; } |
