<!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>[10368] sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-notifications-db.php: Trac: API: Better error handling for the case where the destination user exists when renaming users.</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/10368">10368</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/10368","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-10-13 03:24:02 +0000 (Tue, 13 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'>Trac: API: Better error handling for the case where the destination user exists when renaming users. Renaming to a user that exists is OK, just don't transfer the profile data in that case.
Additionally, add profile data to the user output - see <a href="http://meta.trac.wordpress.org/changeset/10364">r10364</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginstracnotificationstracnotificationsdbphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-notifications-db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginstracnotificationstracnotificationsdbphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-notifications-db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-notifications-db.php 2020-10-13 01:50:10 UTC (rev 10367)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-notifications-db.php 2020-10-13 03:24:02 UTC (rev 10368)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,6 +217,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $username
</span><span class="cx" style="display: block; padding: 0 10px"> ), ARRAY_A );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $profile_data = $this->db->get_results( $this->db->prepare(
+ "SELECT name, value FROM session_attribute WHERE sid = %s",
+ $username
+ ), ARRAY_A );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return compact(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ticket_subscriptions',
</span><span class="cx" style="display: block; padding: 0 10px"> 'ticket_notifications',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,6 +229,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'ticket_owner',
</span><span class="cx" style="display: block; padding: 0 10px"> 'attachments',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comments',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'profile_data',
</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">@@ -233,8 +239,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * - Removes Subscriptions & notification prefs
</span><span class="cx" style="display: block; padding: 0 10px"> * - Removes user Trac preferences
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The $to user doesn't have to be unique, but associated user-data (NOT content) of that user will be lost.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $from The user login of the user to anonymize.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $to The new user login placeholder for the user, must be unique.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $to The new user login placeholder for the user, should be unique.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function anonymize_user( $from, $to ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $from = trim( $from );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,7 +252,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">- // Perform rename
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Perform rename first.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->rename_user( $from, $to ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,6 +298,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"> // If the user has (or will have) specific permissions on the trac instance, bail.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If this needs to be bypassed, remove the user permissions first before migration.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $this->db->get_var( $wpdb->prepare(
</span><span class="cx" style="display: block; padding: 0 10px"> "SELECT action FROM permission WHERE username IN( %s, %s )",
</span><span class="cx" style="display: block; padding: 0 10px"> $from,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -298,23 +307,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">- // Trac Sessions & Prefs
- $this->db->get_var( $this->db->prepare(
- "UPDATE session SET sid = %s WHERE sid = %s",
- $to,
- $from
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check for the user existing. If exists, delete old user prefs, else, migrate.
+ $dest_user_exists = (bool) $this->db->get_var( $this->db->prepare(
+ "SELECT sid FROM session WHERE sid = %s",
+ $to
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->db->get_var( $this->db->prepare(
- "UPDATE auth_cookie SET name = %s WHERE name = %s",
- $to,
- $from
- ) );
- $this->db->get_var( $this->db->prepare(
- "UPDATE session_attribute SET sid = %s WHERE sid = %s",
- $to,
- $from
- ) );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Trac Sessions & Prefs. If the $to user doesn't exist, migrate prefs, otherwise delete old prefs.
+ if ( ! $dest_user_exists ) {
+ $this->db->get_var( $this->db->prepare(
+ "UPDATE session SET sid = %s WHERE sid = %s",
+ $to,
+ $from
+ ) );
+ $this->db->get_var( $this->db->prepare(
+ "UPDATE auth_cookie SET name = %s WHERE name = %s",
+ $to,
+ $from
+ ) );
+ $this->db->get_var( $this->db->prepare(
+ "UPDATE session_attribute SET sid = %s WHERE sid = %s",
+ $to,
+ $from
+ ) );
+ } else {
+ // Dest user existed, delete those data values instead.
+ $this->db->delete( 'session', array( 'sid' => $from ) );
+ $this->db->delete( 'auth_cookie', array( 'name' => $from ) );
+ $this->db->delete( 'session_attribute', array( 'sid' => $from ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Tickets, Attachments, and Comments.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->db->get_var( $this->db->prepare(
</span><span class="cx" style="display: block; padding: 0 10px"> "UPDATE ticket SET reporter = %s WHERE reporter = %s",
</span></span></pre>
</div>
</div>
</body>
</html>