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>';