<!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>[2262] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-rosetta-roles/wporg-gp-rosetta-roles.php: Translate: Update roles plugin (WP version) to use the new `translation_editors` table.</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="http://meta.trac.wordpress.org/changeset/2262">2262</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/2262","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-01-10 00:16:28 +0000 (Sun, 10 Jan 2016)</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'>Translate: Update roles plugin (WP version) to use the new `translation_editors` table.
See <a href="http://meta.trac.wordpress.org/ticket/1240">#1240</a>, <a href="http://meta.trac.wordpress.org/ticket/1352">#1352</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggprosettaroleswporggprosettarolesphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-rosetta-roles/wporg-gp-rosetta-roles.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggprosettaroleswporggprosettarolesphp"></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/wporg-gp-rosetta-roles/wporg-gp-rosetta-roles.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/wporg-gp-rosetta-roles/wporg-gp-rosetta-roles.php 2016-01-08 23:30:10 UTC (rev 2261)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-rosetta-roles/wporg-gp-rosetta-roles.php 2016-01-10 00:16:28 UTC (rev 2262)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,16 +28,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $approver_role = 'translation_editor';
</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">- * Holds the meta key of the project access list.
- *
- * @var string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Database table for translation editors.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $project_access_meta_key = 'translation_editor_project_access_list';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const TRANSLATION_EDITORS_TABLE = 'translate_translation_editors';
</ins><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">+ * Role of a per project translation editor.
+ */
+ const TRANSLATION_EDITOR_ROLE = 'translation_editor';
+
+ /**
+ * Role of a general translation editor.
+ */
+ const GENERAL_TRANSLATION_EDITOR_ROLE = 'general_translation_editor';
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Contructor.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $GLOBALS['wpdb']->wporg_translation_editors = self::TRANSLATION_EDITORS_TABLE;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'gp_pre_can_user', array( $this, 'pre_can_user' ), 9 , 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'gp_project_created', array( $this, 'project_created' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'gp_project_saved', array( $this, 'project_saved' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,22 +153,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function is_approver_for_locale( $user_id, $locale_slug ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static $cache = null;
+
+ if ( null === $cache ) {
+ $cache = array();
+ }
+
+ if ( isset( $cache[ $user_id ][ $locale_slug ] ) ) {
+ return $cache[ $user_id ][ $locale_slug ];
+ }
+
+ if ( ! isset( $cache[ $user_id ] ) ) {
+ $cache[ $user_id ] = array();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Get blog prefix of the associated Rosetta site.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $blog_prefix = $this->get_blog_prefix( $locale_slug ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cache[ $user_id ][ $locale_slug ] = false;
</ins><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><span class="cx" style="display: block; padding: 0 10px"> $user = get_user_by( 'id', $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Check if current user has the approver role.
- $user->cap_key = $blog_prefix . 'capabilities';
- $user->caps = &$user->{$user->cap_key};
- if ( ! is_array( $user->caps ) ) {
- $user->caps = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cap_key = $blog_prefix . 'capabilities';
+ if ( ! isset( $user->{$cap_key} ) ) {
+ $cache[ $user_id ][ $locale_slug ] = false;
+ return false;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user->get_role_caps();
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $user->has_cap( $this->approver_role );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_approver = in_array( self::TRANSLATION_EDITOR_ROLE, $user->$cap_key ) || in_array( self::GENERAL_TRANSLATION_EDITOR_ROLE, $user->$cap_key );
+ $cache[ $user_id ][ $locale_slug ] = $is_approver;
+
+ return $is_approver;
</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">@@ -174,20 +200,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array A list of the Project ID's for which the current user can approve translations for.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_project_id_access_list( $user_id, $locale_slug, $include_children = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = get_user_by( 'id', $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+ static $cache = null;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Get blog prefix of the associated Rosetta site.
- if ( ! $blog_prefix = $this->get_blog_prefix( $locale_slug ) ) {
- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null === $cache ) {
+ $cache = array();
</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">- // Get IDs of projects which the user can approve.
- $meta_key = $blog_prefix . $this->project_access_meta_key;
- if ( empty( $user->$meta_key ) || ! is_array( $user->$meta_key ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $cache[ $user_id ][ $locale_slug ] ) ) {
+ $project_access_list = $cache[ $user_id ][ $locale_slug ];
+ } else {
+ $project_access_list = $wpdb->get_col( $wpdb->prepare( "
+ SELECT project_id FROM
+ {$wpdb->wporg_translation_editors}
+ WHERE user_id = %d AND locale = %s
+ ", $user_id, $locale_slug ) );
+
+ if ( ! isset( $cache[ $user_id ] ) ) {
+ $cache[ $user_id ] = array();
+ }
+
+ $cache[ $user_id ][ $locale_slug ] = $project_access_list;
+ }
+
+ if ( ! $project_access_list ) {
</ins><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">- $project_access_list = $user->$meta_key;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( '0', $project_access_list, true ) ) {
+ $project_access_list = array( 'all' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If we don't want the children, or the user has access to all projects.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $include_children || in_array( 'all', $project_access_list ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>