Comment registration goodness. Hat tip to Jason at noprequisite.com for user_identity code.

git-svn-id: https://develop.svn.wordpress.org/trunk@2166 602fd350-edb4-49c9-b593-d223f7449a82

wp-admin/options-discussion.php

@@ -60,8 +60,8 @@ if ($action == 'retrospam') {
 </fieldset>
 <fieldset class="options">
         <legend><?php _e('Before a comment appears:') ?></legend> 
-		<ul> 
-			<li> 
+		<ul>
+			<li>
 				<label for="comment_moderation"> 
 				<input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_settings('comment_moderation')); ?> /> 
 				<?php _e('An administrator must approve the comment (regardless of any matches below)') ?> </label> 

wp-admin/options-general.php

@@ -11,7 +11,7 @@ include('admin-header.php');
   <h2><?php _e('General Options') ?></h2> 
   <form name="form1" method="post" action="options.php"> 
     <input type="hidden" name="action" value="update" /> 
-	<input type="hidden" name="action" value="update" /> <input type="hidden" name="page_options" value="'blogname','blogdescription','siteurl','admin_email','users_can_register','gmt_offset','date_format','time_format','home','start_of_week'" /> 
+	<input type="hidden" name="action" value="update" /> <input type="hidden" name="page_options" value="'blogname','blogdescription','siteurl','admin_email','users_can_register','gmt_offset','date_format','time_format','home','start_of_week','comment_registration'" /> 
     <table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
       <tr valign="top"> 
         <th width="33%" scope="row"><?php _e('Weblog title:') ?></th> 
@@ -41,7 +41,11 @@ include('admin-header.php');
         <th scope="row"><?php _e('Membership:') ?></th> 
         <td> <label for="users_can_register"> 
           <input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked('1', get_settings('users_can_register')); ?> /> 
-          <?php _e('Anyone can register') ?></label> 
+          <?php _e('Anyone can register') ?></label><br />
+		  <label for="comment_registration">
+			<input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_settings('comment_registration')); ?> /> 
+				<?php _e('Users must be registered and logged in to comment') ?>
+			</label>
 </td> 
       </tr> 
     </table> 

wp-admin/profile.php

@@ -138,7 +138,7 @@ if (isset($updated)) { ?>
     <input type="hidden" name="checkuser_id" value="<?php echo $user_ID ?>" />
   </p>
 
-  <table width="99%"  border="0" cellspacing="2" cellpadding="3">
+  <table width="99%"  border="0" cellspacing="2" cellpadding="3" class="editform">
     <tr>
       <th width="33%" scope="row"><?php _e('Login:') ?></th>
       <td width="67%"><?php echo $profiledata->user_login; ?></td>
@@ -162,14 +162,41 @@ if (isset($updated)) { ?>
       <th scope="row"><?php _e('Last name:') ?></th>
       <td><input type="text" name="newuser_lastname" id="newuser_lastname2" value="<?php echo $profiledata->user_lastname ?>" /></td>
     </tr>
-    <tr>
-      <th scope="row"><?php _e('Profile:') ?></th>
-      <td><textarea name="user_description" rows="5" id="textarea2" style="width: 99%; "><?php echo $profiledata->user_description ?></textarea></td>
-    </tr>
     <tr>
       <th scope="row"><?php _e('Nickname:') ?></th>
       <td><input type="text" name="newuser_nickname" id="newuser_nickname2" value="<?php echo $profiledata->user_nickname ?>" /></td>
     </tr>
+    <tr>
+      <th scope="row"><?php _e('How to display name:') ?> </th>
+      <td><select name="newuser_idmode">
+        <option value="nickname"<?php
+	if ($profiledata->user_idmode == 'nickname')
+	echo ' selected="selected"'; ?>><?php echo $profiledata->user_nickname ?></option>
+        <option value="login"<?php
+	if ($profiledata->user_idmode=="login")
+	echo ' selected="selected"'; ?>><?php echo $profiledata->user_login ?></option>
+	<?php if ( !empty( $profiledata->user_firstname ) ) : ?>
+        <option value="firstname"<?php
+	if ($profiledata->user_idmode=="firstname")
+	echo ' selected="selected"'; ?>><?php echo $profiledata->user_firstname ?></option>
+	<?php endif; ?>
+	<?php if ( !empty( $profiledata->user_lastname ) ) : ?>
+        <option value="lastname"<?php
+	if ($profiledata->user_idmode=="lastname")
+	echo ' selected="selected"'; ?>><?php echo $profiledata->user_lastname ?></option>
+	<?php endif; ?>
+	<?php if ( !empty( $profiledata->user_firstname ) && !empty( $profiledata->user_lastname ) ) : ?>
+        <option value="namefl"<?php
+	if ($profiledata->user_idmode=="namefl")
+	echo ' selected="selected"'; ?>><?php echo $profiledata->user_firstname." ".$profiledata->user_lastname ?></option>
+	<?php endif; ?>
+	<?php if ( !empty( $profiledata->user_firstname ) && !empty( $profiledata->user_lastname ) ) : ?>
+        <option value="namelf"<?php
+	if ($profiledata->user_idmode=="namelf")
+	echo ' selected="selected"'; ?>><?php echo $profiledata->user_lastname." ".$profiledata->user_firstname ?></option>
+	<?php endif; ?>
+      </select>        </td>
+    </tr>
     <tr>
       <th scope="row"><?php _e('E-mail:') ?></th>
       <td><input type="text" name="newuser_email" id="newuser_email2" value="<?php echo $profiledata->user_email ?>" /></td>
@@ -195,27 +222,8 @@ if (isset($updated)) { ?>
       <td>        <input type="text" name="newuser_yim" id="newuser_yim2" value="<?php echo $profiledata->user_yim ?>" />      </td>
     </tr>
     <tr>
-      <th scope="row"><?php _e('Identity on blog:') ?> </th>
-      <td><select name="newuser_idmode">
-        <option value="nickname"<?php
-	if ($profiledata->user_idmode == 'nickname')
-	echo ' selected="selected"'; ?>><?php echo $profiledata->user_nickname ?></option>
-        <option value="login"<?php
-	if ($profiledata->user_idmode=="login")
-	echo ' selected="selected"'; ?>><?php echo $profiledata->user_login ?></option>
-        <option value="firstname"<?php
-	if ($profiledata->user_idmode=="firstname")
-	echo ' selected="selected"'; ?>><?php echo $profiledata->user_firstname ?></option>
-        <option value="lastname"<?php
-	if ($profiledata->user_idmode=="lastname")
-	echo ' selected="selected"'; ?>><?php echo $profiledata->user_lastname ?></option>
-        <option value="namefl"<?php
-	if ($profiledata->user_idmode=="namefl")
-	echo ' selected="selected"'; ?>><?php echo $profiledata->user_firstname." ".$profiledata->user_lastname ?></option>
-        <option value="namelf"<?php
-	if ($profiledata->user_idmode=="namelf")
-	echo ' selected="selected"'; ?>><?php echo $profiledata->user_lastname." ".$profiledata->user_firstname ?></option>
-      </select>        </td>
+      <th scope="row"><?php _e('Profile:') ?></th>
+      <td><textarea name="user_description" rows="5" id="textarea2" style="width: 99%; "><?php echo $profiledata->user_description ?></textarea></td>
     </tr>
     <tr>
       <th scope="row"><?php _e('New <strong>Password</strong> (Leave blank to stay the same.)') ?></th>

wp-admin/upgrade-schema.php

@@ -204,7 +204,7 @@ function populate_options() {
 	add_option('ping_sites', 'http://rpc.pingomatic.com/');
 	add_option('advanced_edit', 0);
 	add_option('comment_max_links', 2);
-	// 1.3
+	// 1.5
 	add_option('default_email_category', 1, 'Posts by email go to this category');
 	add_option('recently_edited');
 	add_option('use_linksupdate', 0);
@@ -213,6 +213,7 @@ function populate_options() {
 	add_option('comment_whitelist', 1);
 	add_option('page_uris');
 	add_option('blacklist_keys');
+	add_option('comment_registration', 0);
 
 	// Delete unused options
 	$unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'rss_language', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl');