[geeklog-cvs] geeklog-1.3/public_html/admin moderation.php,1.46,1.47 user.php,1.67,1.68
dhaun at geeklog.net
dhaun at geeklog.net
Sat Jan 31 04:22:50 EST 2004
Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin
In directory geeklog_prod:/tmp/cvs-serv6532/admin
Modified Files:
moderation.php user.php
Log Message:
Moved code to delete a user's account to system/lib-user.php
Index: moderation.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/moderation.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** moderation.php 27 Sep 2003 18:31:48 -0000 1.46
--- moderation.php 31 Jan 2004 09:22:48 -0000 1.47
***************
*** 9,13 ****
// | Geeklog main administration page. |
// +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors: |
// | |
// | Authors: Tony Bibbs - tony at tonybibbs.com |
--- 9,13 ----
// | Geeklog main administration page. |
// +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2004 by the following authors: |
// | |
// | Authors: Tony Bibbs - tony at tonybibbs.com |
***************
*** 37,40 ****
--- 37,41 ----
require_once('../lib-common.php');
require_once('auth.inc.php');
+ require_once($_CONF['path_system'] . 'lib-user.php');
// Uncomment the line below if you need to debug the HTTP variables being passed
***************
*** 326,331 ****
global $_CONF, $_TABLES, $LANG29;
! $retval .= COM_startBlock ($LANG29[40], '',
! COM_getBlockTemplate ('_admin_block', 'header'));
$emptypwd = md5('');
$result = DB_query ("SELECT uid,username,fullname,email FROM {$_TABLES['users']} WHERE passwd = '$emptypwd'");
--- 327,332 ----
global $_CONF, $_TABLES, $LANG29;
! $retval = COM_startBlock ($LANG29[40], '',
! COM_getBlockTemplate ('_admin_block', 'header'));
$emptypwd = md5('');
$result = DB_query ("SELECT uid,username,fullname,email FROM {$_TABLES['users']} WHERE passwd = '$emptypwd'");
***************
*** 596,608 ****
switch ($action[$i]) {
case 'delete': // Ok, delete everything related to this user
! // first, remove from all security groups
! DB_delete($_TABLES['group_assignments'],'ug_uid',$uid[$i]);
! DB_delete($_TABLES['userprefs'],'uid',$uid[$i]);
! DB_delete($_TABLES['userindex'],'uid',$uid[$i]);
! DB_delete($_TABLES['usercomment'],'uid',$uid[$i]);
! DB_delete($_TABLES['userinfo'],'uid',$uid[$i]);
!
! // now delete the user itself
! DB_delete($_TABLES['users'],'uid',$uid[$i]);
break;
case 'approve':
--- 597,603 ----
switch ($action[$i]) {
case 'delete': // Ok, delete everything related to this user
! if ($uid[$i] > 1) {
! USER_deleteAccount ($uid[$i]);
! }
break;
case 'approve':
Index: user.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/user.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** user.php 24 Jan 2004 16:33:48 -0000 1.67
--- user.php 31 Jan 2004 09:22:48 -0000 1.68
***************
*** 38,43 ****
$_USER_VERBOSE = false;
! require_once('../lib-common.php');
! require_once('auth.inc.php');
$display = '';
--- 38,44 ----
$_USER_VERBOSE = false;
! require_once ('../lib-common.php');
! require_once ('auth.inc.php');
! require_once ($_CONF['path_system'] . 'lib-user.php');
$display = '';
***************
*** 586,624 ****
function deleteUser ($uid)
{
! global $_CONF, $_TABLES;
! if (!SEC_inGroup ('Root')) {
! if (SEC_inGroup ('Root', $uid)) {
! COM_accessLog ("User {$_USER['username']} just tried to delete Root user $uid.");
! return COM_refresh ($_CONF['site_admin_url'] . '/user.php');
! }
}
- // Ok, delete everything related to this user
-
- // first, remove from all security groups
- DB_delete ($_TABLES['group_assignments'], 'ug_uid', $uid);
-
- // remove user information and preferences
- DB_delete ($_TABLES['userprefs'], 'uid', $uid);
- DB_delete ($_TABLES['userindex'], 'uid', $uid);
- DB_delete ($_TABLES['usercomment'], 'uid', $uid);
- DB_delete ($_TABLES['userinfo'], 'uid', $uid);
-
- // Call custom account profile delete function if enabled and exists
- if ($_CONF['custom_registration'] AND function_exists (custom_userdelete)) {
- custom_userdelete ($uid);
- }
-
- // let plugins update their data for this user
- PLG_deleteUser ($uid);
-
- // avoid having orphand stories/comments by making them anonymous posts
- DB_query ("UPDATE {$_TABLES['comments']} SET uid = 1 WHERE uid = $uid");
- DB_query ("UPDATE {$_TABLES['stories']} SET uid = 1 WHERE uid = $uid");
-
- // now delete the user itself
- DB_delete ($_TABLES['users'], 'uid', $uid);
-
return COM_refresh ($_CONF['site_admin_url'] . '/user.php?msg=22');
}
--- 587,596 ----
function deleteUser ($uid)
{
! global $_CONF;
! if (!USER_deleteAccount ($uid)) {
! return COM_refresh ($_CONF['site_admin_url'] . '/user.php');
}
return COM_refresh ($_CONF['site_admin_url'] . '/user.php?msg=22');
}
***************
*** 626,634 ****
// MAIN
if (($mode == $LANG28[19]) && !empty ($LANG28[19])) { // delete
! if (!isset ($uid) || empty ($uid) || ($uid == 0)) {
COM_errorLog ('Attempted to delete user uid=' . $uid);
$display .= COM_refresh ($_CONF['site_admin_url'] . '/user.php');
- } else {
- $display .= deleteUser ($uid);
}
} else if (($mode == $LANG28[20]) && !empty ($LANG28[20])) { // save
--- 598,607 ----
// MAIN
if (($mode == $LANG28[19]) && !empty ($LANG28[19])) { // delete
! $uid = COM_applyFilter ($HTTP_POST_VARS['uid'], true);
! if ($uid > 1) {
! $display .= deleteUser ($uid);
! } else {
COM_errorLog ('Attempted to delete user uid=' . $uid);
$display .= COM_refresh ($_CONF['site_admin_url'] . '/user.php');
}
} else if (($mode == $LANG28[20]) && !empty ($LANG28[20])) { // save
More information about the geeklog-cvs
mailing list