<!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>[2830] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-capabilities.php: Plugin Directory: Capability improvements.</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/2830">2830</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/2830","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-03-28 19:06:41 +0000 (Mon, 28 Mar 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'>Plugin Directory: Capability improvements.
* Fill built-in roles with custom caps.
* Let Plugin Reviewers be able to manage their own plugins like regular authors.
See <a href="http://meta.trac.wordpress.org/ticket/1570">#1570</a>, <a href="http://meta.trac.wordpress.org/ticket/1571">#1571</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasscapabilitiesphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-capabilities.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasscapabilitiesphp"></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/plugin-directory/class-capabilities.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/plugin-directory/class-capabilities.php 2016-03-28 18:59:07 UTC (rev 2829)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-capabilities.php 2016-03-28 19:06:41 UTC (rev 2830)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,43 +8,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Capabilities {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Filters a user's capabilities depending on specific context and/or privilege.
+ *
+ * @param array $required_caps Returns the user's actual capabilities.
+ * @param string $cap Capability name.
+ * @param int $user_id The user ID.
+ * @param array $context Adds the context to the cap. Typically the object ID.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public static function map_meta_cap( $required_caps, $cap, $user_id, $context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> switch( $cap ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'plugin_edit':
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'plugin_add_committer':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'plugin_remove_committer':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'plugin_edit':
</del><span class="cx" style="display: block; padding: 0 10px"> $required_caps = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = self::get_post_from_context( $context );
- if ( ! $post ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( $context[0] );
+ if ( ! $post instanceof \WP_Post ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $required_caps[] = 'do_not_allow';
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</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">- $user = new \WP_User( $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = new \WP_User( $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $committers = Tools::get_plugin_committers( $post->post_name );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post->post_author === $user_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $post->post_author === $user_id || in_array( $user->user_login, $committers, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $required_caps[] = 'plugin_edit_own';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( in_array( $user->user_login, $committers, true ) ) {
- $required_caps[] = 'plugin_edit_own';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'pending' == $post->post_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $required_caps[] = 'plugin_edit_pending';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $required_caps[] = 'plugin_edit_others';
</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"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Don't allow any users to alter the post meta for plugins
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't allow any users to alter the post meta for plugins.
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'add_post_meta':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'edit_post_meta':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'delete_post_meta':
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $context );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post && 'plugin' == $post->post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $required_caps[] = 'do_not_allow';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- break;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,26 +69,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $required_caps;
</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">- protected static function get_post_from_context( $context ) {
- if ( ! $context ) {
- return false;
- }
- $context = $context[0];
-
- $post = false;
- if ( is_int( $context ) ) {
- $post = get_post( $context );
- } elseif ( $context instanceof \WP_Post ) {
- $post = $context;
- } elseif ( is_string( $context ) ) {
- $post = Plugin_Directory::get_plugin_post( $context );
- }
- if ( ! $post || 'plugin' != $post->post_type ) {
- return false;
- }
- return $post;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> public static function add_roles() {
</span><span class="cx" style="display: block; padding: 0 10px"> $committer = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'read' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,13 +78,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin_add_committer' => 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">- $reviewer = array(
- 'read' => true,
- 'plugin_dashboard_access' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $reviewer = array_merge( $committer, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plugin_edit_pending' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin_approve' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin_reject' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $admin = array_merge( $reviewer, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin_add_committer' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,6 +99,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_role( 'plugin_committer', 'Plugin Committer', $committer );
</span><span class="cx" style="display: block; padding: 0 10px"> add_role( 'plugin_reviewer', 'Plugin Reviewer', $reviewer );
</span><span class="cx" style="display: block; padding: 0 10px"> add_role( 'plugin_admin', 'Plugin Admin', $admin );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ foreach( array( 'contributor', 'author', 'editor', 'administrator' ) as $role ) {
+ $wp_role = get_role( $role );
+
+ foreach ( $committer as $committer_cap ) {
+ $wp_role->add_cap( $committer_cap );
+ }
+
+ if ( in_array( $role, array( 'editor', 'administrator' ) ) ) {
+ foreach ( $admin as $admin_cap ) {
+ $wp_role->add_cap( $admin_cap );
+ }
+ }
+ }
</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></pre>
</div>
</div>
</body>
</html>