[wp-cvs] wordpress/wp-admin options-discussion.php, 1.25,
1.26 options-general.php, 1.33, 1.34 profile.php, 1.39,
1.40 upgrade-schema.php, 1.19, 1.20
Matthew Mullenweg
saxmatt at users.sourceforge.net
Mon Jan 31 06:38:13 GMT 2005
Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12524/wp-admin
Modified Files:
options-discussion.php options-general.php profile.php
upgrade-schema.php
Log Message:
Comment registration goodness. Hat tip to Jason at noprequisite.com for user_identity code.
Index: options-general.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-general.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** options-general.php 13 Dec 2004 16:46:34 -0000 1.33
--- options-general.php 31 Jan 2005 06:38:10 -0000 1.34
***************
*** 12,16 ****
<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'" />
<table width="100%" cellspacing="2" cellpadding="5" class="editform">
<tr valign="top">
--- 12,16 ----
<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','comment_registration'" />
<table width="100%" cellspacing="2" cellpadding="5" class="editform">
<tr valign="top">
***************
*** 42,46 ****
<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>
</td>
</tr>
--- 42,50 ----
<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><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>
Index: profile.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/profile.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** profile.php 20 Jan 2005 04:56:24 -0000 1.39
--- profile.php 31 Jan 2005 06:38:10 -0000 1.40
***************
*** 139,143 ****
</p>
! <table width="99%" border="0" cellspacing="2" cellpadding="3">
<tr>
<th width="33%" scope="row"><?php _e('Login:') ?></th>
--- 139,143 ----
</p>
! <table width="99%" border="0" cellspacing="2" cellpadding="3" class="editform">
<tr>
<th width="33%" scope="row"><?php _e('Login:') ?></th>
***************
*** 164,175 ****
</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('E-mail:') ?></th>
<td><input type="text" name="newuser_email" id="newuser_email2" value="<?php echo $profiledata->user_email ?>" /></td>
--- 164,202 ----
</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>
***************
*** 196,220 ****
</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>
</tr>
<tr>
--- 223,228 ----
</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>
Index: upgrade-schema.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/upgrade-schema.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** upgrade-schema.php 27 Jan 2005 05:55:07 -0000 1.19
--- upgrade-schema.php 31 Jan 2005 06:38:11 -0000 1.20
***************
*** 205,209 ****
add_option('advanced_edit', 0);
add_option('comment_max_links', 2);
! // 1.3
add_option('default_email_category', 1, 'Posts by email go to this category');
add_option('recently_edited');
--- 205,209 ----
add_option('advanced_edit', 0);
add_option('comment_max_links', 2);
! // 1.5
add_option('default_email_category', 1, 'Posts by email go to this category');
add_option('recently_edited');
***************
*** 214,217 ****
--- 214,218 ----
add_option('page_uris');
add_option('blacklist_keys');
+ add_option('comment_registration', 0);
// Delete unused options
Index: options-discussion.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-discussion.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** options-discussion.php 10 Jan 2005 20:21:04 -0000 1.25
--- options-discussion.php 31 Jan 2005 06:38:05 -0000 1.26
***************
*** 61,66 ****
<fieldset class="options">
<legend><?php _e('Before a comment appears:') ?></legend>
! <ul>
! <li>
<label for="comment_moderation">
<input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_settings('comment_moderation')); ?> />
--- 61,66 ----
<fieldset class="options">
<legend><?php _e('Before a comment appears:') ?></legend>
! <ul>
! <li>
<label for="comment_moderation">
<input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_settings('comment_moderation')); ?> />
More information about the cvs
mailing list