<!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>[9751] sites/trunk/api.wordpress.org/public_html/events/1.0: Events: Apply coding standards.</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/9751">9751</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/9751","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-04-20 22:28:24 +0000 (Mon, 20 Apr 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Events: Apply coding standards.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlevents10indexphp">sites/trunk/api.wordpress.org/public_html/events/1.0/index.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlevents10teststestindexphp">sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmlevents10indexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/events/1.0/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2020-04-20 22:28:21 UTC (rev 9750)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/index.php 2020-04-20 22:28:24 UTC (rev 9751)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -814,6 +814,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'meetup_url' => $event->meetup_url,
</span><span class="cx" style="display: block; padding: 0 10px"> 'date' => $event->date_utc, // TODO: DB stores a local date, not UTC.
</span><span class="cx" style="display: block; padding: 0 10px"> 'end_date' => $event->end_date,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 'location' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'location' => $event->location,
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => $event->country,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -957,8 +958,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // WordCamp Asia.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'asia' => array(
- 'promo_start' => strtotime( '2019-12-20 00:00:00' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'asia' => array(
+ 'promo_start' => strtotime( '2019-12-20 00:00:00' ),
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'regional_countries' => array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> get_iso_3166_2_country_codes( 'asia' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -967,7 +968,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Russia is often considered to be part of Asia geographically, and part of Europe politically.
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'RU' )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'event' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'event' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'wordcamp',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'WordCamp Asia',
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'https://2020.asia.wordcamp.org/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -975,7 +977,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'meetup_url' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'date' => '2020-02-21 00:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> 'end_date' => '2020-02-23 00:00:00',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'location' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'location' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'location' => 'Bangkok, Thailand',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'TH',
</span><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => 13.7248934,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -983,14 +986,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // WordCamp Europe.
</span><span class="cx" style="display: block; padding: 0 10px"> 'europe' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'promo_start' => strtotime( '2020-04-04 00:00:00' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'promo_start' => strtotime( '2020-04-04 00:00:00' ),
+
</ins><span class="cx" style="display: block; padding: 0 10px"> 'regional_countries' => array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> get_iso_3166_2_country_codes( 'africa' ),
</span><span class="cx" style="display: block; padding: 0 10px"> get_iso_3166_2_country_codes( 'europe' )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'event' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'event' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'wordcamp',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'WordCamp Europe',
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'https://2020.europe.wordcamp.org/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -998,6 +1004,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'meetup_url' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'date' => '2020-06-04 00:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> 'end_date' => '2020-06-06 00:00:00',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 'location' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'location' => 'Porto, Portugal',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'PT',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1006,15 +1013,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // WordCamp US.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'us' => array(
- 'promo_start' => strtotime( '2020-08-27 00:00:00' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'us' => array(
+ 'promo_start' => strtotime( '2020-08-27 00:00:00' ),
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'regional_countries' => array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> get_iso_3166_2_country_codes( 'south america' ),
</span><span class="cx" style="display: block; padding: 0 10px"> get_iso_3166_2_country_codes( 'north america' )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'event' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'event' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'wordcamp',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'WordCamp US',
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'https://2020.us.wordcamp.org/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1023,7 +1032,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'date' => '2020-10-27 00:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> 'end_date' => '2020-10-29 00:00:00',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'location' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'location' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'location' => 'St. Louis, MO, USA',
</span><span class="cx" style="display: block; padding: 0 10px"> 'country' => 'US',
</span><span class="cx" style="display: block; padding: 0 10px"> 'latitude' => 38.6532135,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1126,11 +1135,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_within_date_range( $current_time, $start, strtotime( '+ 2 weeks', $start ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Phase 1: Show worldwide for first two weeks.
</span><span class="cx" style="display: block; padding: 0 10px"> $regional_wordcamps[] = $data['event'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_within_date_range( $current_time, strtotime( '+ 2 weeks', $start ), strtotime( '+ 4 weeks', $start ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Phase 2: Show within regional countries for next two weeks.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $location['country'] ) && in_array( strtoupper( $location['country'] ), $data['regional_countries'], true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $regional_wordcamps[] = $data['event'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_within_date_range( $current_time, strtotime( '+ 4 weeks', $start ), strtotime( '+ 6 weeks', $start ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Phase 3: Show only within the event country for the last two weeks.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $location['country'] ) && strtoupper( $data['event']['location']['country'] ) === strtoupper( $location['country'] ) ) {
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmlevents10teststestindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php 2020-04-20 22:28:21 UTC (rev 9750)
+++ sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php 2020-04-20 22:28:24 UTC (rev 9751)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1182,13 +1182,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $region_data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'us' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'promo_start' => strtotime( '2019-08-16 00:00:00' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'promo_start' => strtotime( '2019-08-16 00:00:00' ),
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'regional_countries' => array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> get_iso_3166_2_country_codes( 'south america' ),
</span><span class="cx" style="display: block; padding: 0 10px"> get_iso_3166_2_country_codes( 'north america' )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'event' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'event' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'wordcamp',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'WordCamp US',
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'https://2019.us.wordcamp.org/',
</span></span></pre>
</div>
</div>
</body>
</html>