aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2004-12-20 19:26:43 +0000
committerplegall <plg@piwigo.org>2004-12-20 19:26:43 +0000
commitc19f01d77c990962baef1906ac0ed60280324b77 (patch)
tree3adbc0c836875d77d06feb987773030e36646c86 /admin/include
parent1d46ea86e9d3925a60f1d126d4b1bd642630741a (diff)
- replacement of PREFIX_TABLE constant in delete_user function
- deletion of $isadmin variable, replaced by constant IN_ADMIN - small refactoring - in include/common.inc.php, deletion of useless part "Obtain and encode users IP" and corresponding functions encode_ip and decode_ip - definition of $conf['default_language'] deleted from include/config.inc.php : it is already present in database table config - function init_userprefs deleted (useless), all its content moved to include/user.inc.php - admin.lang.php and faq.lang.php are loaded only if current user is in administrative section git-svn-id: http://piwigo.org/svn/trunk@650 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/include')
-rw-r--r--admin/include/functions.php47
-rw-r--r--admin/include/isadmin.inc.php3
2 files changed, 27 insertions, 23 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 1e8926aee..fdf1da91c 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -330,37 +330,42 @@ DELETE FROM '.IMAGES_TABLE.'
// - all the favorites linked to this user
// - all sessions linked to this user
// - all categories informations linked to this user
-function delete_user( $user_id )
+function delete_user($user_id)
{
// destruction of the access linked to the user
- $query = 'DELETE FROM '.PREFIX_TABLE.'user_access';
- $query.= ' WHERE user_id = '.$user_id;
- $query.= ';';
- pwg_query( $query );
+ $query = '
+DELETE FROM '.USER_ACCESS_TABLE.'
+ WHERE user_id = '.$user_id.'
+;';
+ pwg_query($query);
// destruction of the group links for this user
- $query = 'DELETE FROM '.PREFIX_TABLE.'user_group';
- $query.= ' WHERE user_id = '.$user_id;
- $query.= ';';
- pwg_query( $query );
+ $query = '
+DELETE FROM '.USER_GROUP_TABLE.'
+ WHERE user_id = '.$user_id.'
+;';
+ pwg_query($query);
// destruction of the favorites associated with the user
- $query = 'DELETE FROM '.PREFIX_TABLE.'favorites';
- $query.= ' WHERE user_id = '.$user_id;
- $query.= ';';
- pwg_query( $query );
+ $query = '
+DELETE FROM '.FAVORITES_TABLE.'
+ WHERE user_id = '.$user_id.'
+;';
+ pwg_query($query);
// destruction of the sessions linked with the user
- $query = 'DELETE FROM '.PREFIX_TABLE.'sessions';
- $query.= ' WHERE user_id = '.$user_id;
- $query.= ';';
- pwg_query( $query );
+ $query = '
+DELETE FROM '.SESSIONS_TABLE.'
+ WHERE user_id = '.$user_id.'
+;';
+ pwg_query($query);
// destruction of the user
- $query = 'DELETE FROM '.USERS_TABLE;
- $query.= ' WHERE id = '.$user_id;
- $query.= ';';
- pwg_query( $query );
+ $query = '
+DELETE FROM '.USERS_TABLE.'
+ WHERE id = '.$user_id.'
+;';
+ pwg_query($query);
}
// delete_group deletes a group identified by its $group_id.
diff --git a/admin/include/isadmin.inc.php b/admin/include/isadmin.inc.php
index 90398702b..9b71cb900 100644
--- a/admin/include/isadmin.inc.php
+++ b/admin/include/isadmin.inc.php
@@ -27,8 +27,7 @@
include( PHPWG_ROOT_PATH.'admin/include/functions.php' );
-$isadmin = true;
-if ( $user['status'] != 'admin' )
+if ($user['status'] != 'admin')
{
echo '<div style="text-align:center;">'.$lang['access_forbiden'].'<br />';
echo '<a href="'.PHPWG_ROOT_PATH.'identification.php">'.$lang['ident_title'].'</a></div>';