<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[480] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-api/classes/ics.php: WordCamp Calendar: Explicitly send a full CRLF.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://meta.trac.wordpress.org/changeset/480">480</a></dd>
<dt>Author</dt> <dd>iandunn</dd>
<dt>Date</dt> <dd>2014-03-28 15:59:02 +0000 (Fri, 28 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WordCamp Calendar: Explicitly send a full CRLF.
RFC 2445 requires a full CRLF, but previously we were just sending \\n. That may not have mattered at all in the real world, but I've gotten reproducable reports of Google Calendar failing to import any of the events from the feed. This didn't end up fixing the problem, but I'm committing it anyway since the work is already done and it brings the output in line with the RFC.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampapiclassesicsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-api/classes/ics.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampapiclassesicsphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-api/classes/ics.php (479 => 480)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-api/classes/ics.php 2014-03-26 16:28:56 UTC (rev 479)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-api/classes/ics.php 2014-03-28 15:59:02 UTC (rev 480)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx">
</span><span class="cx"> class WordCamp_API_ICS {
</span><span class="cx"> public $ttl = 1; // seconds to live
</span><ins>+ const CLRF = "\r\n";
</ins><span class="cx">
</span><span class="cx"> function __construct() {
</span><span class="cx"> add_filter( 'query_vars', array( $this, 'query_vars' ) );
</span><span class="lines">@@ -46,10 +47,9 @@
</span><span class="cx"> if ( ! defined( 'WPCT_POST_TYPE_ID' ) )
</span><span class="cx"> define( 'WPCT_POST_TYPE_ID', 'wordcamp' );
</span><span class="cx">
</span><del>- $ical = 'BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//hacksw/handcal//NONSGML v1.0//EN
-';
</del><ins>+ $ical = 'BEGIN:VCALENDAR' . self::CLRF;
+ $ical .= 'VERSION:2.0' . self::CLRF;
+ $ical .= 'PRODID:-//hacksw/handcal//NONSGML v1.0//EN' . self::CLRF;
</ins><span class="cx">
</span><span class="cx"> $query = new WP_Query( array(
</span><span class="cx"> 'post_type' => WCPT_POST_TYPE_ID,
</span><span class="lines">@@ -78,15 +78,13 @@
</span><span class="cx"> $start = date( 'Ymd', $start );
</span><span class="cx"> $end = date( 'Ymd', $end );
</span><span class="cx">
</span><del>- $ical .= "BEGIN:VEVENT
-UID:$uid
-DTSTAMP;VALUE=DATE:$start
-DTSTART;VALUE=DATE:$start
-DTEND;VALUE=DATE:$end
-SUMMARY:$title
-END:VEVENT
-";
-
</del><ins>+ $ical .= "BEGIN:VEVENT" . self::CLRF;
+ $ical .= "UID:$uid" . self::CLRF;
+ $ical .= "DTSTAMP;VALUE=DATE:$start" . self::CLRF;
+ $ical .= "DTSTART;VALUE=DATE:$start" . self::CLRF;
+ $ical .= "DTEND;VALUE=DATE:$end" . self::CLRF;
+ $ical .= "SUMMARY:$title" . self::CLRF;
+ $ical .= "END:VEVENT" . self::CLRF;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $ical .= 'END:VCALENDAR';
</span></span></pre>
</div>
</div>
</body>
</html>