Update of /cvsroot/webnotes/webnotes
In directory usw-pr-cvs1:/tmp/cvs-serv9166
Modified Files:
admin_manage_notes.php admin_manage_users.php
admin_manage_users_delete.php
admin_manage_users_delete_page.php admin_manage_users_edit.php
admin_manage_users_update.php
Log Message:
comments.txt
Index: admin_manage_notes.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/admin_manage_notes.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- admin_manage_notes.php 26 Sep 2002 03:41:46 -0000 1.18
+++ admin_manage_notes.php 3 Oct 2002 03:47:50 -0000 1.19
@@ -35,7 +35,7 @@
$result = db_query($query);
echo <<<EOT
- <p><strong>Following are the documents that have notes pending approval:</strong></p>
+ <p><strong>Following are the pages that have notes pending approval:</strong></p>
<table class="box" summary="">
<tr><th>Page</th><th>URL</th><th>Pending Notes</th></tr>\n
EOT;
@@ -48,10 +48,10 @@
echo <<<EOT
</table>
- <p>There are $count document(s) to be moderated.</p>\n
+ <p>There are $count page(s) to be moderated.</p>\n
<hr>
<div class="spacer"></div>
- <p><strong>Following are all the documents that use phpWebNotes:</strong></p>
+ <p><strong>Following are all the pages that use phpWebNotes:</strong></p>
<table class="box" summary="">
<tr><th>Page</th><th>URL</th></tr>\n
EOT;
@@ -66,7 +66,7 @@
echo <<<EOT
</table>
- <p>There are $count document(s) that are indexed.</p>\n
+ <p>There are $count page(s) that are indexed.</p>\n
EOT;
print_footer( __FILE__ );
Index: admin_manage_users.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/admin_manage_users.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- admin_manage_users.php 3 Oct 2002 01:20:45 -0000 1.9
+++ admin_manage_users.php 3 Oct 2002 03:47:50 -0000 1.10
@@ -27,20 +27,18 @@
$t_users_array = user_get_all();
- echo '<table class="box">';
+ echo '<table class="box" summary="">';
echo '<thead><tr><th>Username</th><th>Email</th><th>Access Level</th><th>Enabled</th></tr></thead><tbody>';
$i = 0;
foreach ( $t_users_array as $user ) {
- $t_class = ( $i % 2 == 0 ) ? 'row-1' : 'row-2';
-
extract( $user, EXTR_PREFIX_ALL, 'v' );
$v_enabled = $v_enabled ? 'x' : ' ';
- $t_color = util_alternate_colors( $i++ );
+ $t_class = util_alternate_class( $i++ );
$t_access_level = enum_get_element( 'access_levels', $v_access_level );
echo "<tr class=\"$t_class\"><td><a href=\"$g_admin_manage_users_edit?f_user_id=$v_id\">$v_username</a></td><td>$v_email</td><td>$t_access_level</td><td>$v_enabled</td></tr>";
}
echo '</tbody></table>';
- echo '<br />';
+ echo '<div class="spacer"></div>';
echo link_create( $g_admin_manage_users_add_page, 'Add User' );
# @@@ LOCALIZE
Index: admin_manage_users_delete.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/admin_manage_users_delete.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- admin_manage_users_delete.php 1 Oct 2002 00:17:56 -0000 1.3
+++ admin_manage_users_delete.php 3 Oct 2002 03:47:50 -0000 1.4
@@ -14,7 +14,7 @@
access_ensure_check_action( ACTION_USERS_DELETE );
- $f_user_id = gpc_get( 'f_user_id' );
+ $f_user_id = gpc_get_int( 'f_user_id' );
user_delete( $f_user_id );
util_header_redirect( $g_admin_manage_users );
Index: admin_manage_users_delete_page.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/admin_manage_users_delete_page.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- admin_manage_users_delete_page.php 1 Oct 2002 02:21:54 -0000 1.3
+++ admin_manage_users_delete_page.php 3 Oct 2002 03:47:50 -0000 1.4
@@ -25,12 +25,13 @@
print_admin_menu();
- $f_user_id = gpc_get( 'f_user_id' );
+ $f_user_id = gpc_get_int( 'f_user_id' );
+
+ $t_user_info = user_get_info( user_where_id_equals( $f_user_id ) );
?>
<div align="center">
-Are you sure you want to delete this user?
-<br />
-<br />
+Are you sure you want to delete user '<?php echo $t_user_info['username'] ?>'?<br />
+<div class="spacer"></div>
<form method="post" action="<?php echo $g_admin_manage_users_delete ?>">
<input type="hidden" name="f_user_id" value="<?php echo $f_user_id ?>" />
<input type="submit" value="Delete User" />
Index: admin_manage_users_edit.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/admin_manage_users_edit.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- admin_manage_users_edit.php 3 Oct 2002 01:20:45 -0000 1.6
+++ admin_manage_users_edit.php 3 Oct 2002 03:47:50 -0000 1.7
@@ -94,17 +94,16 @@
<tr class="buttons">
<td colspan="2">
<input type="submit" value="Update User" />
- <form method="post" action="<?php echo $g_admin_manage_users_delete_page ?>">
- <input type="hidden" name="f_user_id" value="<?php echo $f_user_id ?>" />
- <input type="submit" value="Delete User" />
- </form>
<?php # @@@ LOCALIZE ?>
</td>
</tr>
</table>
</form>
-<br />
-<br />
+<div class="spacer"></div>
+ <form method="post" action="<?php echo $g_admin_manage_users_delete_page ?>">
+ <input type="hidden" name="f_user_id" value="<?php echo $f_user_id ?>" />
+ <input type="submit" value="Delete User" />
+ </form>
</div>
<?php
Index: admin_manage_users_update.php
===================================================================
RCS file: /cvsroot/webnotes/webnotes/admin_manage_users_update.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- admin_manage_users_update.php 1 Oct 2002 02:20:43 -0000 1.4
+++ admin_manage_users_update.php 3 Oct 2002 03:47:50 -0000 1.5
@@ -19,12 +19,10 @@
$f_password = gpc_get( 'f_password' );
$f_password_confirm = gpc_get( 'f_password_confirm' );
$f_access_level = gpc_get( 'f_access_level' );
- $f_enabled = gpc_get( 'f_enabled' );
if ( $f_password != $f_password_confirm ) {
util_header_redirect( $g_admin_manage_users_edit.'?f_user_id='.$f_user_id );
}
-
if ( isset( $f_enabled ) ) {
$f_enabled = 1;
|
