<!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>[41164] trunk/src: Options, Meta APIs: Send a notification to the old admin email address when the site admin email or network admin email address is changed.</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="https://core.trac.wordpress.org/changeset/41164">41164</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/41164","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>2017-07-27 02:23:26 +0000 (Thu, 27 Jul 2017)</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'>Options, Meta APIs: Send a notification to the old admin email address when the site admin email or network admin email address is changed.
This reduces the chances of a site compromise going unnoticed, in the same way that the same notifications for user account email address changes reduces the chances of a user account compromise going unnoticed.
Props MatheusGimenez, johnbillion
Fixes <a href="https://core.trac.wordpress.org/ticket/39117">#39117</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesadminfiltersphp">trunk/src/wp-admin/includes/admin-filters.php</a></li>
<li><a href="#trunksrcwpadminincludesmsadminfiltersphp">trunk/src/wp-admin/includes/ms-admin-filters.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.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="trunksrcwpadminincludesadminfiltersphp"></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/includes/admin-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/admin-filters.php 2017-07-27 02:09:51 UTC (rev 41163)
+++ trunk/src/wp-admin/includes/admin-filters.php 2017-07-27 02:23:26 UTC (rev 41164)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,6 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'update_option_home', 'update_home_siteurl', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'update_option_siteurl', 'update_home_siteurl', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'update_option_page_on_front', 'update_home_siteurl', 10, 2 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'update_option_admin_email', 'wp_site_admin_email_change_notification', 10, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'heartbeat_received', 'wp_check_locked_posts', 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'heartbeat_received', 'wp_refresh_post_lock', 10, 3 );
</span></span></pre></div>
<a id="trunksrcwpadminincludesmsadminfiltersphp"></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/includes/ms-admin-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ms-admin-filters.php 2017-07-27 02:09:51 UTC (rev 41163)
+++ trunk/src/wp-admin/includes/ms-admin-filters.php 2017-07-27 02:23:26 UTC (rev 41164)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,6 +22,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Site Hooks.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wpmueditblogaction', 'upload_space_setting' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Network hooks
+add_action( 'update_site_option_admin_email', 'wp_network_admin_email_change_notification', 10, 4 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Taxonomy Hooks
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'get_term', 'sync_category_tag_slugs', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2017-07-27 02:09:51 UTC (rev 41163)
+++ trunk/src/wp-includes/functions.php 2017-07-27 02:23:26 UTC (rev 41164)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5649,3 +5649,85 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $last_changed;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Send an email to the old site admin email address when the site admin email address changes.
+ *
+ * @since 4.9.0
+ *
+ * @param string $old_email The old site admin email address.
+ * @param string $new_email The new site admin email address.
+ * @param string $option_name The relevant database option name.
+ */
+function wp_site_admin_email_change_notification( $old_email, $new_email, $option_name ) {
+ /**
+ * Filters whether to send the site admin email change notification email.
+ *
+ * @since 4.9.0
+ *
+ * @param bool $send Whether to send the email notification.
+ * @param string $old_email The old site admin email address.
+ * @param string $new_email The new site admin email address.
+ */
+ $send = apply_filters( 'send_site_admin_email_change_email', true, $old_email, $new_email );
+
+ if ( ! $send ) {
+ return;
+ }
+
+ /* translators: Do not translate OLD_EMAIL, NEW_EMAIL, SITENAME, SITEURL: those are placeholders. */
+ $email_change_text = __( 'Hi,
+
+This notice confirms that the admin email address was changed on ###SITENAME###.
+
+The new admin email address is ###NEW_EMAIL###.
+
+This email has been sent to ###OLD_EMAIL###
+
+Regards,
+All at ###SITENAME###
+###SITEURL###' );
+
+ $email_change_email = array(
+ 'to' => $old_email,
+ /* translators: Site admin email change notification email subject. %s: Site title */
+ 'subject' => __( '[%s] Notice of Admin Email Change' ),
+ 'message' => $email_change_text,
+ 'headers' => '',
+ );
+ // get site name
+ $site_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+
+ /**
+ * Filters the contents of the email notification sent when the site admin email address is changed.
+ *
+ * @since 4.9.0
+ *
+ * @param array $email_change_email {
+ * Used to build wp_mail().
+ *
+ * @type string $to The intended recipient.
+ * @type string $subject The subject of the email.
+ * @type string $message The content of the email.
+ * The following strings have a special meaning and will get replaced dynamically:
+ * - ###OLD_EMAIL### The old site admin email address.
+ * - ###NEW_EMAIL### The new site admin email address.
+ * - ###SITENAME### The name of the site.
+ * - ###SITEURL### The URL to the site.
+ * @type string $headers Headers.
+ * }
+ * @param string $old_email The old site admin email address.
+ * @param string $new_email The new site admin email address.
+ */
+ $email_change_email = apply_filters( 'site_admin_email_change_email', $email_change_email, $old_email, $new_email );
+
+ $email_change_email['message'] = str_replace( '###OLD_EMAIL###', $old_email, $email_change_email['message'] );
+ $email_change_email['message'] = str_replace( '###NEW_EMAIL###', $new_email, $email_change_email['message'] );
+ $email_change_email['message'] = str_replace( '###SITENAME###', $site_name, $email_change_email['message'] );
+ $email_change_email['message'] = str_replace( '###SITEURL###', home_url(), $email_change_email['message'] );
+
+ wp_mail( $email_change_email['to'], sprintf(
+ $email_change_email['subject'],
+ $blog_name
+ ), $email_change_email['message'], $email_change_email['headers'] );
+}
</ins></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 2017-07-27 02:09:51 UTC (rev 41163)
+++ trunk/src/wp-includes/ms-functions.php 2017-07-27 02:23:26 UTC (rev 41164)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2557,3 +2557,88 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'subdirectory_reserved_names', $names );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Send an email to the old network admin email address when the network admin email address changes.
+ *
+ * @since 4.9.0
+ *
+ * @param string $option_name The relevant database option name.
+ * @param string $new_email The new network admin email address.
+ * @param string $old_email The old network admin email address.
+ * @param int $network_id ID of the network.
+ */
+function wp_network_admin_email_change_notification( $option_name, $new_email, $old_email, $network_id ) {
+ /**
+ * Filters whether to send the network admin email change notification email.
+ *
+ * @since 4.9.0
+ *
+ * @param bool $send Whether to send the email notification.
+ * @param string $old_email The old network admin email address.
+ * @param string $new_email The new network admin email address.
+ * @param int $network_id ID of the network.
+ */
+ $send = apply_filters( 'send_network_admin_email_change_email', true, $old_email, $new_email, $network_id );
+
+ if ( ! $send ) {
+ return;
+ }
+
+ /* translators: Do not translate OLD_EMAIL, NEW_EMAIL, SITENAME, SITEURL: those are placeholders. */
+ $email_change_text = __( 'Hi,
+
+This notice confirms that the network admin email address was changed on ###SITENAME###.
+
+The new network admin email address is ###NEW_EMAIL###.
+
+This email has been sent to ###OLD_EMAIL###
+
+Regards,
+All at ###SITENAME###
+###SITEURL###' );
+
+ $email_change_email = array(
+ 'to' => $old_email,
+ /* translators: Network admin email change notification email subject. %s: Network title */
+ 'subject' => __( '[%s] Notice of Network Admin Email Change' ),
+ 'message' => $email_change_text,
+ 'headers' => '',
+ );
+ // get network name
+ $network_name = wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES );
+
+ /**
+ * Filters the contents of the email notification sent when the network admin email address is changed.
+ *
+ * @since 4.9.0
+ *
+ * @param array $email_change_email {
+ * Used to build wp_mail().
+ *
+ * @type string $to The intended recipient.
+ * @type string $subject The subject of the email.
+ * @type string $message The content of the email.
+ * The following strings have a special meaning and will get replaced dynamically:
+ * - ###OLD_EMAIL### The old network admin email address.
+ * - ###NEW_EMAIL### The new network admin email address.
+ * - ###SITENAME### The name of the network.
+ * - ###SITEURL### The URL to the site.
+ * @type string $headers Headers.
+ * }
+ * @param string $old_email The old network admin email address.
+ * @param string $new_email The new network admin email address.
+ * @param int $network_id ID of the network.
+ */
+ $email_change_email = apply_filters( 'network_admin_email_change_email', $email_change_email, $old_email, $new_email, $network_id );
+
+ $email_change_email['message'] = str_replace( '###OLD_EMAIL###', $old_email, $email_change_email['message'] );
+ $email_change_email['message'] = str_replace( '###NEW_EMAIL###', $new_email, $email_change_email['message'] );
+ $email_change_email['message'] = str_replace( '###SITENAME###', $network_name, $email_change_email['message'] );
+ $email_change_email['message'] = str_replace( '###SITEURL###', home_url(), $email_change_email['message'] );
+
+ wp_mail( $email_change_email['to'], sprintf(
+ $email_change_email['subject'],
+ $network_name
+ ), $email_change_email['message'], $email_change_email['headers'] );
+}
</ins></span></pre>
</div>
</div>
</body>
</html>