<!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>[8463] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wordcamp-coming-soon-page.php: Coming soon mode: Also support jetpack/contact-form block</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/8463">8463</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/8463","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>vedjain</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-03-15 09:21:25 +0000 (Fri, 15 Mar 2019)</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'>Coming soon mode: Also support jetpack/contact-form block
We already support contact-form shortcode which is used to render contact us form when Coming Soon mode is enabled for a site.
This patch also adds support for jetpack/contact-form block which can also be used to create a contact-us form.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageclasseswordcampcomingsoonpagephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wordcamp-coming-soon-page.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageclasseswordcampcomingsoonpagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wordcamp-coming-soon-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wordcamp-coming-soon-page.php 2019-03-15 04:47:53 UTC (rev 8462)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wordcamp-coming-soon-page.php 2019-03-15 09:21:25 UTC (rev 8463)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'open-sans',
</span><span class="cx" style="display: block; padding: 0 10px"> 'https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,300,400,600',
</span><span class="cx" style="display: block; padding: 0 10px"> array(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- null
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2
</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"> wp_enqueue_style(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,6 +92,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">+ // TODO: Figure out an alternative here.
+ //phpcs:ignore WordPress.PHP.DontExtract.extract_extract -- Not sure whats the alternative to this could be.
</ins><span class="cx" style="display: block; padding: 0 10px"> extract( $GLOBALS['WordCamp_Coming_Soon_Page']->get_template_variables() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( __DIR__ ) . '/css/template-coming-soon-dynamic.php' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,17 +180,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $color = new Jetpack_Color( $background, 'hex' );
</span><span class="cx" style="display: block; padding: 0 10px"> $color_hsl = $color->toHsl();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $lighter_color = new Jetpack_Color( array(
- $color_hsl['h'],
- $color_hsl['s'],
- ( $color_hsl['l'] >= 85 ) ? 100 : $color_hsl['l'] + 15,
- ), 'hsl' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $lighter_color = new Jetpack_Color(
+ array(
+ $color_hsl['h'],
+ $color_hsl['s'],
+ ( $color_hsl['l'] >= 85 ) ? 100 : $color_hsl['l'] + 15,
+ ),
+ 'hsl'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $darker_color = new Jetpack_Color( array(
- $color_hsl['h'],
- $color_hsl['s'],
- ( $color_hsl['l'] < 10 ) ? 0 : $color_hsl['l'] - 10,
- ), 'hsl' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $darker_color = new Jetpack_Color(
+ array(
+ $color_hsl['h'],
+ $color_hsl['s'],
+ ( $color_hsl['l'] < 10 ) ? 0 : $color_hsl['l'] - 10,
+ ),
+ 'hsl'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $background_lighter = '#' . $lighter_color->toHex();
</span><span class="cx" style="display: block; padding: 0 10px"> $background_darker = '#' . $darker_color->toHex();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,7 +271,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Retrieve the contact form shortcode string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Loop through all pages and renders first contact-us form or contact-us block.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * We can't just create an arbitrary shortcode because of https://github.com/Automattic/jetpack/issues/102. Instead we have to use a form that's tied to a page.
</span><span class="cx" style="display: block; padding: 0 10px"> * This is somewhat fragile, though. It should work in most cases because the first $page that contains [contact-form] will be the one we automatically create
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,8 +282,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_contact_form_shortcode() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $contact_form_shortcode = false;
- $shortcode_regex = get_shortcode_regex();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $contact_form_content = false;
+ $shortcode_regex = get_shortcode_regex();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $all_pages = get_posts( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'page',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,25 +291,46 @@
</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"> foreach ( $all_pages as $page ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- preg_match_all( '/' . $shortcode_regex . '/s', $page->post_content, $matches, PREG_SET_ORDER );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $matches as $shortcode ) {
- if ( 'contact-form' === $shortcode[2] ) {
- global $post;
- $post = $page;
- setup_postdata( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( has_shortcode( $page->post_content, 'contact-form' ) ) {
+ preg_match_all( '/' . $shortcode_regex . '/s', $page->post_content, $matches, PREG_SET_ORDER );
+ foreach ( $matches as $shortcode ) {
+ if ( 'contact-form' === $shortcode[2] ) {
+ global $post;
+ //phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited -- We need this because of jetpack bug #102
+ $post = $page;
+ setup_postdata( $post );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ob_start();
- echo do_shortcode( $shortcode[0] );
- $contact_form_shortcode = ob_get_clean();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ob_start();
+ echo do_shortcode( $shortcode[0] );
+ $contact_form_content = ob_get_clean();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_reset_postdata();
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_reset_postdata();
+ break;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( has_block( 'jetpack/contact-form', $page->post_content ) ) {
+ // Along with shortcodes, also check for blocks.
+ $blocks = parse_blocks( $page->post_content );
+ foreach ( $blocks as $block ) {
+ if ( 'jetpack/contact-form' === $block['blockName'] ) {
+ global $post;
+ //phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited -- We need this because of jetpack bug #102
+ $post = $page;
+ setup_postdata( $post );
+ $contact_form_content = render_block( $block );
+ wp_reset_postdata();
+ break;
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $contact_form_content ) {
+ break;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $contact_form_shortcode;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $contact_form_content;
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,7 +466,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * post, we will see a message that post has been cross posted in social media accounts. That message is incorrect,
</span><span class="cx" style="display: block; padding: 0 10px"> * but can only be fixed in JetPack, not here.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $should_publicize Whether this post can be publicized or not
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $should_publicize Whether this post can be publicized or not.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>