<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16440] trunk/wp-admin/network/site-users.php:
  Add existing user to site form.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16440">16440</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-11-17 19:45:10 +0000 (Wed, 17 Nov 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add existing user to site form. Props PeteMall, ocean90. see <a href="http://trac.wordpress.org/ticket/15342">#15342</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworksiteusersphp">trunk/wp-admin/network/site-users.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-users.php (16439 => 16440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-users.php        2010-11-17 18:48:27 UTC (rev 16439)
+++ trunk/wp-admin/network/site-users.php        2010-11-17 19:45:10 UTC (rev 16440)
</span><span class="lines">@@ -27,14 +27,22 @@
</span><span class="cx"> 
</span><span class="cx"> $is_main_site = is_main_site( $id );
</span><span class="cx"> 
</span><ins>+// get blog prefix
+$blog_prefix = $wpdb-&gt;get_blog_prefix( $id );
+
+// @todo This is a hack. Eventually, add API to WP_Roles allowing retrieval of roles for a particular blog.
+if ( ! empty($wp_roles-&gt;use_db) ) {
+        $editblog_roles = get_blog_option( $id, &quot;{$blog_prefix}user_roles&quot; );
+} else {
+        // Roles are stored in memory, not the DB.
+        $editblog_roles = $wp_roles-&gt;roles;
+}
+
</ins><span class="cx"> if ( isset($_REQUEST['action']) &amp;&amp; 'update-site' == $_REQUEST['action'] ) {
</span><span class="cx">         check_admin_referer( 'edit-site' );
</span><span class="cx"> 
</span><span class="cx">         switch_to_blog( $id );
</span><span class="cx"> 
</span><del>-        // get blog prefix
-        $blog_prefix = $wpdb-&gt;get_blog_prefix( $id );
-
</del><span class="cx">         // user roles
</span><span class="cx">         if ( isset( $_POST['role'] ) &amp;&amp; is_array( $_POST['role'] ) == true ) {
</span><span class="cx">                 $newroles = $_POST['role'];
</span><span class="lines">@@ -130,19 +138,11 @@
</span><span class="cx">         &lt;input type=&quot;hidden&quot; name=&quot;id&quot; value=&quot;&lt;?php echo esc_attr( $id ) ?&gt;&quot; /&gt;
</span><span class="cx"> &lt;?php
</span><span class="cx"> $blogusers = get_users( array( 'blog_id' =&gt; $id, 'number' =&gt; 20 ) );
</span><ins>+
</ins><span class="cx"> if ( is_array( $blogusers ) ) {
</span><span class="cx">         echo '&lt;table class=&quot;form-table&quot;&gt;';
</span><span class="cx">         echo &quot;&lt;tr&gt;&lt;th&gt;&quot; . __( 'User' ) . &quot;&lt;/th&gt;&lt;th&gt;&quot; . __( 'Role' ) . &quot;&lt;/th&gt;&lt;th&gt;&quot; . __( 'Password' ) . &quot;&lt;/th&gt;&lt;th&gt;&quot; . __( 'Remove' ) . &quot;&lt;/th&gt;&lt;/tr&gt;&quot;;
</span><span class="cx">         $user_count = 0;
</span><del>-        // @todo This is a hack. Eventually, add API to WP_Roles allowing retrieval of roles for a particular blog.
-        if ( ! empty($wp_roles-&gt;use_db) ) {
-                // If using the DB to store roles, consult the user_roles option.
-                $blog_prefix = $wpdb-&gt;get_blog_prefix( $id );
-                $editblog_roles = get_blog_option( $id, &quot;{$blog_prefix}user_roles&quot; );
-        } else {
-                // Roles are stored in memory, not the DB.
-                $editblog_roles = $wp_roles-&gt;roles;
-        }
</del><span class="cx"> 
</span><span class="cx">         foreach ( $blogusers as $user_id =&gt; $user_object ) {
</span><span class="cx">                 $user_count++;
</span><span class="lines">@@ -180,6 +180,34 @@
</span><span class="cx"> ?&gt;
</span><span class="cx"> &lt;/form&gt;
</span><span class="cx"> 
</span><ins>+&lt;h3 id=&quot;add-new-user&quot;&gt;&lt;?php _e('Add Existing User') ?&gt;&lt;/h3&gt;
+&lt;p class=&quot;description&quot;&gt;&lt;?php _e( 'Enter the username of an existing user.' ) ?&gt;&lt;/p&gt;
+        &lt;form action=&quot;site-users.php?action=update-site&quot; id=&quot;adduser&quot; method=&quot;post&quot;&gt;
+        &lt;?php wp_nonce_field( 'edit-site' ); ?&gt;
+        &lt;input type=&quot;hidden&quot; name=&quot;id&quot; value=&quot;&lt;?php echo esc_attr( $id ) ?&gt;&quot; /&gt;
+        &lt;table class=&quot;form-table&quot;&gt;
+                &lt;tr&gt;
+                        &lt;th scope=&quot;row&quot;&gt;&lt;?php _e( 'Username' ); ?&gt;&lt;/th&gt;
+                        &lt;td&gt;&lt;input type=&quot;text&quot; name=&quot;newuser&quot; id=&quot;newuser&quot; /&gt;&lt;/td&gt;
+                &lt;/tr&gt;
+                &lt;tr&gt;
+                        &lt;th scope=&quot;row&quot;&gt;&lt;?php _e( 'Role'); ?&gt;&lt;/th&gt;
+                        &lt;td&gt;&lt;select name=&quot;new_role&quot; id=&quot;new_role_0&quot;&gt;
+                        &lt;?php
+                        $default_role = $wpdb-&gt;get_var( &quot;SELECT `option_value` FROM {$blog_prefix}options WHERE option_name = 'default_role'&quot; );
+                        var_dump( $default_role );
+                        reset( $editblog_roles );
+                        foreach ( $editblog_roles as $role =&gt; $role_assoc ){
+                                $name = translate_user_role( $role_assoc['name'] );
+                                $selected = ( $role == $default_role ) ? 'selected=&quot;selected&quot;' : '';
+                                echo '&lt;option ' . $selected . ' value=&quot;' . esc_attr( $role ) . '&quot;&gt;' . esc_html( $name ) . '&lt;/option&gt;';
+                        }
+                        ?&gt;
+                        &lt;/select&gt;&lt;/td&gt;
+                &lt;/tr&gt;
+        &lt;/table&gt;
+        &lt;?php submit_button( __('Add User'), 'primary', 'add-user' ); ?&gt;
+        &lt;/form&gt;
</ins><span class="cx"> &lt;/div&gt;
</span><span class="cx"> &lt;?php
</span><span class="cx"> require('../admin-footer.php');
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>

</body>
</html>