<!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>[49127] trunk/src: Networks and Sites: Extract into a new function the email that gets sent to the network administrator when a new site is created, and introduce filters to disable and modify its</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="https://core.trac.wordpress.org/changeset/49127">49127</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/49127","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-10-11 19:27:21 +0000 (Sun, 11 Oct 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'>Networks and Sites: Extract into a new function the email that gets sent to the network administrator when a new site is created, and introduce filters to disable and modify its
contents.
* The `send_new_site_email` filter can be used to disable this email.
* The `new_site_email` filter can be used to modify its contents.
Props Dhruvin, Dharm1025, dharmin16, jipmoors
Fixes <a href="https://core.trac.wordpress.org/ticket/42134">#42134</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminnetworksitenewphp">trunk/src/wp-admin/network/site-new.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminnetworksitenewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-new.php 2020-10-11 15:49:30 UTC (rev 49126)
+++ trunk/src/wp-admin/network/site-new.php 2020-10-11 19:27:21 UTC (rev 49127)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,31 +145,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_option( $user_id, 'primary_blog', $id, true );
</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">- wp_mail(
- get_site_option( 'admin_email' ),
- sprintf(
- /* translators: New site notification email subject. %s: Network title. */
- __( '[%s] New Site Created' ),
- get_network()->site_name
- ),
- sprintf(
- /* translators: New site notification email. 1: User login, 2: Site URL, 3: Site title. */
- __(
- 'New site created by %1$s
-
-Address: %2$s
-Name: %3$s'
- ),
- $current_user->user_login,
- get_site_url( $id ),
- wp_unslash( $title )
- ),
- sprintf(
- 'From: "%1$s" <%2$s>',
- _x( 'Site Admin', 'email "From" field' ),
- get_site_option( 'admin_email' )
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wpmu_new_site_admin_notification( $id, $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect(
</span><span class="cx" style="display: block; padding: 0 10px"> add_query_arg(
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2020-10-11 15:49:30 UTC (rev 49126)
+++ trunk/src/wp-includes/ms-functions.php 2020-10-11 19:27:21 UTC (rev 49127)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1696,6 +1696,120 @@
</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">+ * Notifies the Multisite network administrator that a new site was created.
+ *
+ * Filter {@see 'send_new_site_email'} to disable or bypass.
+ *
+ * Filter {@see 'new_site_email'} to filter the contents.
+ *
+ * @since 5.6.0
+ *
+ * @param int $site_id Site ID of the new site.
+ * @param int $user_id User ID of the administrator of the new site.
+ * @return bool Whether the email notification was sent.
+ */
+function wpmu_new_site_admin_notification( $site_id, $user_id ) {
+ $site = get_site( $site_id );
+ $user = get_userdata( $user_id );
+ $email = get_site_option( 'admin_email' );
+
+ if ( ! $site || ! $user || ! $email ) {
+ return false;
+ }
+
+ /**
+ * Filters whether to send an email to the Multisite network administrator when a new site is created.
+ *
+ * Return false to disable sending the email.
+ *
+ * @since 5.6.0
+ *
+ * @param bool $send Whether to send the email.
+ * @param WP_Site $site Site object of the new site.
+ * @param WP_User $user User object of the administrator of the new site.
+ */
+ if ( ! apply_filters( 'send_new_site_email', true, $site, $user ) ) {
+ return false;
+ }
+
+ $switched_locale = false;
+ $network_admin = get_user_by( 'email', $email );
+
+ if ( $network_admin ) {
+ // If the network admin email address corresponds to a user, switch to their locale
+ $switched_locale = switch_to_locale( get_user_locale( $network_admin ) );
+ } else {
+ // Otherwise switch to the locale of the current site
+ $switched_locale = switch_to_locale( get_locale() );
+ }
+
+ $subject = sprintf(
+ /* translators: New site notification email subject. %s: Network title. */
+ __( '[%s] New Site Created' ),
+ get_network()->site_name
+ );
+
+ $message = sprintf(
+ /* translators: New site notification email. 1: User login, 2: Site URL, 3: Site title. */
+ __(
+ 'New site created by %1$s
+
+Address: %2$s
+Name: %3$s'
+ ),
+ $user->user_login,
+ get_site_url( $site->id ),
+ get_blog_option( $site->id, 'blogname' )
+ );
+
+ $header = sprintf(
+ 'From: "%1$s" <%2$s>',
+ _x( 'Site Admin', 'email "From" field' ),
+ $email
+ );
+
+ $new_site_email = array(
+ 'to' => $email,
+ 'subject' => $subject,
+ 'message' => $message,
+ 'headers' => $header,
+ );
+
+ /**
+ * Filters the content of the email sent to the Multisite network administrator when a new site is created.
+ *
+ * Content should be formatted for transmission via wp_mail().
+ *
+ * @since 5.6.0
+ *
+ * @param array $new_site_email {
+ * Used to build wp_mail().
+ *
+ * @type string $to The email address of the recipient.
+ * @type string $subject The subject of the email.
+ * @type string $message The content of the email.
+ * @type string $headers Headers.
+ * }
+ * @param WP_Site $site Site object of the new site.
+ * @param WP_User $user User object of the administrator of the new site.
+ */
+ $new_site_email = apply_filters( 'new_site_email', $new_site_email, $site, $user );
+
+ wp_mail(
+ $new_site_email['to'],
+ wp_specialchars_decode( $new_site_email['subject'] ),
+ $new_site_email['message'],
+ $new_site_email['headers']
+ );
+
+ if ( $switched_locale ) {
+ restore_previous_locale();
+ }
+
+ return true;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Notify a user that their account activation has been successful.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter {@see 'wpmu_welcome_user_notification'} to disable or bypass.
</span></span></pre>
</div>
</div>
</body>
</html>