From ff7727d2fb1122d20a2b5f8538b913c344f6e460 Mon Sep 17 00:00:00 2001
From: Dion Hulse <dion@wordpress.org>
Date: Thu, 25 Jul 2024 11:01:44 +1000
Subject: [PATCH 1/5] Allow doaction.org URLs for events

---
 .../plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php b/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php
index 93bfa41fcc..ddafa7b9fe 100644
--- a/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php
+++ b/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php
@@ -53,9 +53,10 @@ public function render_site_url_field( $key, $field_type, $object_name ) {
 				$valid_url  = isset( $url['host'], $url['path'] );
 				$tld        = get_top_level_domain();
 				$network_id = $valid_url && "events.wordpress.$tld" === $url['host'] ? EVENTS_NETWORK_ID : WORDCAMP_NETWORK_ID;
+				$doaction   = ( 'doaction.org' === $url['host'] );
 				?>
 
-				<?php if ( $valid_url && domain_exists( $url['host'], $url['path'], $network_id ) ) : ?>
+				<?php if ( $valid_url && ! $doaction && domain_exists( $url['host'], $url['path'], $network_id ) ) : ?>
 					<?php
 						$blog_details = get_blog_details(
 							array(
@@ -75,7 +76,7 @@ public function render_site_url_field( $key, $field_type, $object_name ) {
 					<a target="_blank" href="<?php echo esc_url( $blog_details->siteurl ); ?>/wp-admin/">Dashboard</a> |
 					<a target="_blank" href="<?php echo esc_url( $blog_details->siteurl ); ?>">Visit</a>
 
-				<?php else : ?>
+				<?php else if ( ! $doaction ) : ?>
 					<?php $checkbox_id = wcpt_key_to_str( 'create-site-in-network', 'wcpt_' ); ?>
 
 					<label for="<?php echo esc_attr( $checkbox_id ); ?>">
@@ -170,6 +171,11 @@ public static function url_matches_expected_format( $domain, $path, $wordcamp_id
 		$is_external_domain             = ! preg_match( "@ \.wordcamp\.$tld | \.buddycamp\.$tld | events\.wordpress\.$tld @ix", $domain );
 		$can_have_external_domain       = $wordcamp_id <= $last_permitted_external_domain || in_array( $wordcamp_id, $external_domain_exceptions );
 
+		// DoAction is not hosted within the WordCamp infrastructure, so we don't need to validate it.
+		if ( 'doaction.org' === $domain ) {
+			return true;
+		}
+		
 		if ( $is_external_domain && $can_have_external_domain ) {
 			// Many old camps had external websites.
 			return true;

From 64741f5467ac68487a07940e7601ebd1343ef8f0 Mon Sep 17 00:00:00 2001
From: Dion Hulse <dion@wordpress.org>
Date: Thu, 25 Jul 2024 11:07:49 +1000
Subject: [PATCH 2/5] Update wordcamp-new-site.php

---
 .../plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php b/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php
index ddafa7b9fe..eb40076ce0 100644
--- a/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php
+++ b/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php
@@ -53,10 +53,10 @@ public function render_site_url_field( $key, $field_type, $object_name ) {
 				$valid_url  = isset( $url['host'], $url['path'] );
 				$tld        = get_top_level_domain();
 				$network_id = $valid_url && "events.wordpress.$tld" === $url['host'] ? EVENTS_NETWORK_ID : WORDCAMP_NETWORK_ID;
-				$doaction   = ( 'doaction.org' === $url['host'] );
+				$we_host_it = ( 'doaction.org' !== $url['host'] );
 				?>
 
-				<?php if ( $valid_url && ! $doaction && domain_exists( $url['host'], $url['path'], $network_id ) ) : ?>
+				<?php if ( $valid_url && $we_host_it && domain_exists( $url['host'], $url['path'], $network_id ) ) : ?>
 					<?php
 						$blog_details = get_blog_details(
 							array(
@@ -76,7 +76,7 @@ public function render_site_url_field( $key, $field_type, $object_name ) {
 					<a target="_blank" href="<?php echo esc_url( $blog_details->siteurl ); ?>/wp-admin/">Dashboard</a> |
 					<a target="_blank" href="<?php echo esc_url( $blog_details->siteurl ); ?>">Visit</a>
 
-				<?php else if ( ! $doaction ) : ?>
+				<?php else if ( $we_host_it ) : ?>
 					<?php $checkbox_id = wcpt_key_to_str( 'create-site-in-network', 'wcpt_' ); ?>
 
 					<label for="<?php echo esc_attr( $checkbox_id ); ?>">
@@ -171,9 +171,9 @@ public static function url_matches_expected_format( $domain, $path, $wordcamp_id
 		$is_external_domain             = ! preg_match( "@ \.wordcamp\.$tld | \.buddycamp\.$tld | events\.wordpress\.$tld @ix", $domain );
 		$can_have_external_domain       = $wordcamp_id <= $last_permitted_external_domain || in_array( $wordcamp_id, $external_domain_exceptions );
 
-		// DoAction is not hosted within the WordCamp infrastructure, so we don't need to validate it.
+		// DoAction is not hosted within the WordCamp infrastructure, so can have an external domain.
 		if ( 'doaction.org' === $domain ) {
-			return true;
+			$can_have_external_domain = true;
 		}
 		
 		if ( $is_external_domain && $can_have_external_domain ) {

From 1a51043dcf3e333231c575d5e8fd178e67b71ea8 Mon Sep 17 00:00:00 2001
From: Paul Kevan <2290623+pkevan@users.noreply.github.com>
Date: Mon, 12 Aug 2024 13:30:32 +0100
Subject: [PATCH 3/5] Update wordcamp-new-site.php

Fix else if/elseif to avoid compile error.
---
 .../wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php b/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php
index eb40076ce0..7a6435ff4f 100644
--- a/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php
+++ b/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php
@@ -76,7 +76,7 @@ public function render_site_url_field( $key, $field_type, $object_name ) {
 					<a target="_blank" href="<?php echo esc_url( $blog_details->siteurl ); ?>/wp-admin/">Dashboard</a> |
 					<a target="_blank" href="<?php echo esc_url( $blog_details->siteurl ); ?>">Visit</a>
 
-				<?php else if ( $we_host_it ) : ?>
+				<?php elseif ( $we_host_it ) : ?>
 					<?php $checkbox_id = wcpt_key_to_str( 'create-site-in-network', 'wcpt_' ); ?>
 
 					<label for="<?php echo esc_attr( $checkbox_id ); ?>">

From 26f3d896d9504127d0c3b2b4d440ba47af8154ed Mon Sep 17 00:00:00 2001
From: Paul Kevan <2290623+pkevan@users.noreply.github.com>
Date: Mon, 12 Aug 2024 13:35:32 +0100
Subject: [PATCH 4/5] Update wordcamp-new-site.php

remove whitespace
---
 .../wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php b/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php
index 7a6435ff4f..cc32196f56 100644
--- a/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php
+++ b/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php
@@ -175,7 +175,7 @@ public static function url_matches_expected_format( $domain, $path, $wordcamp_id
 		if ( 'doaction.org' === $domain ) {
 			$can_have_external_domain = true;
 		}
-		
+
 		if ( $is_external_domain && $can_have_external_domain ) {
 			// Many old camps had external websites.
 			return true;

From 05b2f2321529ee438c439cd185d67c05aef75d9e Mon Sep 17 00:00:00 2001
From: ren <18050944+renintw@users.noreply.github.com>
Date: Mon, 26 Aug 2024 20:58:46 +0200
Subject: [PATCH 5/5] Fix warning.

---
 .../wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php b/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php
index cc32196f56..08977a99e8 100644
--- a/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php
+++ b/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php
@@ -53,7 +53,7 @@ public function render_site_url_field( $key, $field_type, $object_name ) {
 				$valid_url  = isset( $url['host'], $url['path'] );
 				$tld        = get_top_level_domain();
 				$network_id = $valid_url && "events.wordpress.$tld" === $url['host'] ? EVENTS_NETWORK_ID : WORDCAMP_NETWORK_ID;
-				$we_host_it = ( 'doaction.org' !== $url['host'] );
+				$we_host_it = $valid_url && 'doaction.org' !== $url['host'];
 				?>
 
 				<?php if ( $valid_url && $we_host_it && domain_exists( $url['host'], $url['path'], $network_id ) ) : ?>