<!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>[2890] sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt: WordCamp Post Type: Use ISO 3166 country list for WordCamp application.</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" 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/2890">2890</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/2890","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>2016-04-04 19:38:05 +0000 (Mon, 04 Apr 2016)</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'>WordCamp Post Type: Use ISO 3166 country list for WordCamp application.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptapplicationswordcampphp">sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/applications/wordcamp.php</a></li>
<li><a href="#sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptviewsapplicationswordcampshortcodeapplicationphp">sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/views/applications/wordcamp/shortcode-application.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptapplicationswordcampphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/applications/wordcamp.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/applications/wordcamp.php 2016-04-04 19:35:49 UTC (rev 2889)
+++ sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/applications/wordcamp.php 2016-04-04 19:38:05 UTC (rev 2890)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,6 +53,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require( dirname( __DIR__ ) . '/views/applications/common/submission-results.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $countries = wcorg_get_countries();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> require( dirname( __DIR__ ) . '/views/applications/wordcamp/shortcode-application.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,6 +156,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Create the post
</span><span class="cx" style="display: block; padding: 0 10px"> $user = wcorg_get_user_by_canonical_names( $data['q_4236565_wporg_username'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $statues = \WordCamp_Loader::get_post_statuses();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $countries = wcorg_get_countries();
+ // todo re-align
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'wordcamp',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +193,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data['q_1079060_city'] ? $data['q_1079060_city'] . ', ' : '',
</span><span class="cx" style="display: block; padding: 0 10px"> $data['q_1079060_state'],
</span><span class="cx" style="display: block; padding: 0 10px"> $data['q_1079060_zip'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data['q_1079060_country']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data['q_1079060_country'] ? $countries[ $data['q_1079060_country'] ]['name'] : ''
</ins><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"> add_post_meta( $post_id, '_status_change', array(
</span></span></pre></div>
<a id="sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptviewsapplicationswordcampshortcodeapplicationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/views/applications/wordcamp/shortcode-application.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/views/applications/wordcamp/shortcode-application.php 2016-04-04 19:35:49 UTC (rev 2889)
+++ sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/views/applications/wordcamp/shortcode-application.php 2016-04-04 19:38:05 UTC (rev 2890)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,20 +3,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPress_Community\Applications\WordCamp;
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) or die();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*
- * todo
- *
- * country use budgets iso. maybe create helper as wrapper
- * go through and make sure each field is being shown and saved, especially ones with branching logic
- * add post values back to form when errors? or browser validation enough?
- *
- * change q17 to individual fields?
- *
- * v2
- * maybe cleanup
- * accordion for the 3 parts
- */
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Modified from https://wordcampcentral.polldaddy.com/s/wordcamp-organizer-application
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,240 +117,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="q_1079060_country" id="q_1079060_country">
</span><span class="cx" style="display: block; padding: 0 10px"> <option value=""></option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value="AF">Afghanistan</option>
- <option value="AL">Albania</option>
- <option value="DZ">Algeria</option>
- <option value="AS">American Samoa</option>
- <option value="AD">Andorra</option>
- <option value="AO">Angola</option>
- <option value="AI">Anguilla</option>
- <option value="A1">Anonymous Proxy</option>
- <option value="AQ">Antarctica</option>
- <option value="AG">Antigua and Barbuda</option>
- <option value="AR">Argentina</option>
- <option value="AM">Armenia</option>
- <option value="AW">Aruba</option>
- <option value="AP">Asia/Pacific Region</option>
- <option value="AU">Australia</option>
- <option value="AT">Austria</option>
- <option value="AZ">Azerbaijan</option>
- <option value="BS">Bahamas</option>
- <option value="BH">Bahrain</option>
- <option value="BD">Bangladesh</option>
- <option value="BB">Barbados</option>
- <option value="BY">Belarus</option>
- <option value="BE">Belgium</option>
- <option value="BZ">Belize</option>
- <option value="BJ">Benin</option>
- <option value="BM">Bermuda</option>
- <option value="BT">Bhutan</option>
- <option value="BO">Bolivia</option>
- <option value="BA">Bosnia and Herzegovina</option>
- <option value="BW">Botswana</option>
- <option value="BV">Bouvet Island</option>
- <option value="BR">Brazil</option>
- <option value="IO">British Indian Ocean Territory</option>
- <option value="BN">Brunei Darussalam</option>
- <option value="BG">Bulgaria</option>
- <option value="BF">Burkina Faso</option>
- <option value="BI">Burundi</option>
- <option value="KH">Cambodia</option>
- <option value="CM">Cameroon</option>
- <option value="CA">Canada</option>
- <option value="CV">Cape Verde</option>
- <option value="KY">Cayman Islands</option>
- <option value="CF">Central African Republic</option>
- <option value="TD">Chad</option>
- <option value="CL">Chile</option>
- <option value="CN">China</option>
- <option value="CO">Colombia</option>
- <option value="KM">Comoros</option>
- <option value="CG">Congo</option>
- <option value="CD">Congo, The Democratic Republic of</option>
- <option value="CK">Cook Islands</option>
- <option value="CR">Costa Rica</option>
- <option value="CI">Cote D'Ivoire</option>
- <option value="HR">Croatia</option>
- <option value="CU">Cuba</option>
- <option value="CY">Cyprus</option>
- <option value="CZ">Czech Republic</option>
- <option value="DK">Denmark</option>
- <option value="DJ">Djibouti</option>
- <option value="DM">Dominica</option>
- <option value="DO">Dominican Republic</option>
- <option value="EC">Ecuador</option>
- <option value="EG">Egypt</option>
- <option value="SV">El Salvador</option>
- <option value="GQ">Equatorial Guinea</option>
- <option value="ER">Eritrea</option>
- <option value="EE">Estonia</option>
- <option value="ET">Ethiopia</option>
- <option value="EU">Europe</option>
- <option value="FK">Falkland Islands (Malvinas)</option>
- <option value="FO">Faroe Islands</option>
- <option value="FJ">Fiji</option>
- <option value="FI">Finland</option>
- <option value="FR">France</option>
- <option value="GF">French Guiana</option>
- <option value="PF">French Polynesia</option>
- <option value="GA">Gabon</option>
- <option value="GM">Gambia</option>
- <option value="GE">Georgia</option>
- <option value="DE">Germany</option>
- <option value="GH">Ghana</option>
- <option value="GI">Gibraltar</option>
- <option value="GR">Greece</option>
- <option value="GL">Greenland</option>
- <option value="GD">Grenada</option>
- <option value="GP">Guadeloupe</option>
- <option value="GU">Guam</option>
- <option value="GT">Guatemala</option>
- <option value="GN">Guinea</option>
- <option value="GW">Guinea-Bissau</option>
- <option value="GY">Guyana</option>
- <option value="HT">Haiti</option>
- <option value="HM">Heard Island and McDonald Islands</option>
- <option value="VA">Holy See (Vatican City State)</option>
- <option value="HN">Honduras</option>
- <option value="HK">Hong Kong</option>
- <option value="HU">Hungary</option>
- <option value="IS">Iceland</option>
- <option value="IN">India</option>
- <option value="ID">Indonesia</option>
- <option value="IR">Iran, Islamic Republic of</option>
- <option value="IQ">Iraq</option>
- <option value="IE">Ireland</option>
- <option value="IL">Israel</option>
- <option value="IT">Italy</option>
- <option value="JM">Jamaica</option>
- <option value="JP">Japan</option>
- <option value="JO">Jordan</option>
- <option value="KZ">Kazakstan</option>
- <option value="KE">Kenya</option>
- <option value="KI">Kiribati</option>
- <option value="KP">Korea, Democratic People's Republic of</option>
- <option value="KR">Korea, Republic of</option>
- <option value="KW">Kuwait</option>
- <option value="KG">Kyrgyzstan</option>
- <option value="LA">Lao People's Democratic Republic</option>
- <option value="LV">Latvia</option>
- <option value="LB">Lebanon</option>
- <option value="LS">Lesotho</option>
- <option value="LR">Liberia</option>
- <option value="LY">Libyan Arab Jamahiriya</option>
- <option value="LI">Liechtenstein</option>
- <option value="LT">Lithuania</option>
- <option value="LU">Luxembourg</option>
- <option value="MO">Macau</option>
- <option value="MK">Macedonia</option>
- <option value="MG">Madagascar</option>
- <option value="MW">Malawi</option>
- <option value="MY">Malaysia</option>
- <option value="MV">Maldives</option>
- <option value="ML">Mali</option>
- <option value="MT">Malta</option>
- <option value="MH">Marshall Islands</option>
- <option value="MQ">Martinique</option>
- <option value="MR">Mauritania</option>
- <option value="MU">Mauritius</option>
- <option value="YT">Mayotte</option>
- <option value="MX">Mexico</option>
- <option value="FM">Micronesia, Federated States of</option>
- <option value="MD">Moldova, Republic of</option>
- <option value="MC">Monaco</option>
- <option value="MN">Mongolia</option>
- <option value="ME">Montenegro</option>
- <option value="MS">Montserrat</option>
- <option value="MA">Morocco</option>
- <option value="MZ">Mozambique</option>
- <option value="MM">Myanmar</option>
- <option value="NA">Namibia</option>
- <option value="NR">Nauru</option>
- <option value="NP">Nepal</option>
- <option value="NL">Netherlands</option>
- <option value="AN">Netherlands Antilles</option>
- <option value="NC">New Caledonia</option>
- <option value="NZ">New Zealand</option>
- <option value="NI">Nicaragua</option>
- <option value="NE">Niger</option>
- <option value="NG">Nigeria</option>
- <option value="NU">Niue</option>
- <option value="NF">Norfolk Island</option>
- <option value="MP">Northern Mariana Islands</option>
- <option value="NO">Norway</option>
- <option value="OM">Oman</option>
- <option value="PK">Pakistan</option>
- <option value="PW">Palau</option>
- <option value="PS">Palestinian Territory, Occupied</option>
- <option value="PA">Panama</option>
- <option value="PG">Papua New Guinea</option>
- <option value="PY">Paraguay</option>
- <option value="PE">Peru</option>
- <option value="PH">Philippines</option>
- <option value="PL">Poland</option>
- <option value="PT">Portugal</option>
- <option value="PR">Puerto Rico</option>
- <option value="QA">Qatar</option>
- <option value="RE">Reunion</option>
- <option value="RO">Romania</option>
- <option value="RU">Russia</option>
- <option value="RW">Rwanda</option>
- <option value="KN">Saint Kitts and Nevis</option>
- <option value="LC">Saint Lucia</option>
- <option value="VC">Saint Vincent and the Grenadines</option>
- <option value="WS">Samoa</option>
- <option value="SM">San Marino</option>
- <option value="ST">Sao Tome and Principe</option>
- <option value="A2">Satellite Provider</option>
- <option value="SA">Saudi Arabia</option>
- <option value="SN">Senegal</option>
- <option value="RS">Serbia</option>
- <option value="SC">Seychelles</option>
- <option value="SL">Sierra Leone</option>
- <option value="SG">Singapore</option>
- <option value="SK">Slovakia</option>
- <option value="SI">Slovenia</option>
- <option value="SB">Solomon Islands</option>
- <option value="SO">Somalia</option>
- <option value="ZA">South Africa</option>
- <option value="ES">Spain</option>
- <option value="LK">Sri Lanka</option>
- <option value="SD">Sudan</option>
- <option value="SR">Suriname</option>
- <option value="SZ">Swaziland</option>
- <option value="SE">Sweden</option>
- <option value="CH">Switzerland</option>
- <option value="SY">Syrian Arab Republic</option>
- <option value="TW">Taiwan</option>
- <option value="TJ">Tajikistan</option>
- <option value="TZ">Tanzania, United Republic of</option>
- <option value="TH">Thailand</option>
- <option value="TG">Togo</option>
- <option value="TK">Tokelau</option>
- <option value="TO">Tonga</option>
- <option value="TT">Trinidad and Tobago</option>
- <option value="TN">Tunisia</option>
- <option value="TR">Turkey</option>
- <option value="TM">Turkmenistan</option>
- <option value="TC">Turks and Caicos Islands</option>
- <option value="TV">Tuvalu</option>
- <option value="UG">Uganda</option>
- <option value="UA">Ukraine</option>
- <option value="AE">United Arab Emirates</option>
- <option value="GB">United Kingdom</option>
- <option value="US">United States</option>
- <option value="UM">United States Minor Outlying Islands</option>
- <option value="UY">Uruguay</option>
- <option value="UZ">Uzbekistan</option>
- <option value="VU">Vanuatu</option>
- <option value="VE">Venezuela</option>
- <option value="VN">Vietnam</option>
- <option value="VG">Virgin Islands, British</option>
- <option value="VI">Virgin Islands, U.S.</option>
- <option value="WF">Wallis and Futuna</option>
- <option value="YE">Yemen</option>
- <option value="ZM">Zambia</option>
- <option value="ZW">Zimbabwe</option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <?php foreach ( $countries as $country ) : ?>
+ <option value="<?php echo esc_attr( $country['alpha2'] ); ?>">
+ <?php echo esc_html( $country['name'] ); ?>
+ </option>
+ <?php endforeach; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>