10 files changed, 235 insertions, 334 deletions

diff --git a/admin/admin_upload.php b/admin/admin_upload.php
deleted file mode 100644
index 596e5c97c..000000000
--- a/admin/admin_upload.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2004 PhpWebGallery Team - http://phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
-
-if( !defined("PHPWG_ROOT_PATH") )
-{
-	die ("Hacking attempt!");
-}
-
-include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
-$uploadable = '';
-$categories = '';
-
-if (isset($_POST['submit']) || isset($_POST['delete']))
-{
-  $query = 'UPDATE '.CATEGORIES_TABLE;
-  $query.= ' SET uploadable = ';
-  if (isset($_POST['submit'])) 
-    $query.="'true'";
-  else 
-    $query.="'false'";
-  $query.= ' WHERE id IN (';
-  $nb=count($cat_data);
-  foreach($cat_data as $i=>$id)
- {
-   $query.= $id;
-   if ($i+1<$nb) $query.=',';
- } 
- $query.=');';
- pwg_query ($query);
-}
-
-// Cache management
-$query = 'SELECT id, name, uploadable FROM '.CATEGORIES_TABLE;
-$query.= ' WHERE dir IS NOT NULL';
-$query.= ' ORDER BY name ASC';
-$query.= ';';
-$result = pwg_query( $query );
-while ( $row = mysql_fetch_assoc( $result ) )
-{
-  if ($row['uploadable'] == 'false')
-  {
-    $categories.='<option value="'.$row['id'].'">'.$row['name'].'</option>';
-  }
-  else 
-  {
-    $uploadable.='<option value="'.$row['id'].'">'.$row['name'].'</option>';
-  }
-}
-
-//----------------------------------------------------- template initialization
-$template->set_filenames( array('upload'=>'admin/admin_upload.tpl') );
-
-$template->assign_vars(array(
-  'PRIVATE_CATEGORIES'=>$categories,
-  'UPLOADABLE_CATEGORIES'=>$uploadable,
-  
-  'L_UPLOAD_TITLE'=>$lang['cat_upload'],
-  'L_SUBMIT'=>$lang['submit'],
-  'L_DELETE'=>$lang['delete'],
-  'L_RESET'=>$lang['reset'],
-  'L_UPLOAD_INFO'=>$lang['cat_upload_info'],
-  'L_AUTHORIZED'=>$lang['authorized'],
-  'L_FORBIDDEN'=>$lang['forbidden']
-  ));
-
-//----------------------------------------------------------- sending html code
-$template->assign_var_from_handle('ADMIN_CONTENT', 'upload');
-
-?>
\ No newline at end of file
diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index ca133d79c..98ea0b287 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -170,40 +170,6 @@ if ( $category['site_id'] != 1 )
   $template->assign_block_vars('storage' ,array());
 }
 
-/*
-// can the parent category be changed ? (is the category virtual ?)
-if ( $row['dir'] == '' )
-{
-  $vtp->addSession( $sub, 'parent' );
-  // We only show a List Of Values if the number of categories is less than
-  // $conf['max_LOV_categories']
-  $query = 'SELECT COUNT(id) AS nb_total_categories';
-  $query.= ' FROM '.CATEGORIES_TABLE;
-  $query.= ';';
-  $countrow = mysql_fetch_array( pwg_query( $query ) );
-  if ( $countrow['nb_total_categories'] < $conf['max_LOV_categories'] )
-  {
-    $vtp->addSession( $sub, 'associate_LOV' );
-    $vtp->addSession( $sub, 'associate_cat' );
-    $vtp->setVar( $sub, 'associate_cat.value', '-1' );
-    $vtp->setVar( $sub, 'associate_cat.content', '' );
-    $vtp->closeSession( $sub, 'associate_cat' );
-    $page['plain_structure'] = get_plain_structure( true );
-    $structure = create_structure( '', array() );
-    display_categories( $structure, '&nbsp;', $row['id_uppercat'],$row['id'] );
-    $vtp->closeSession( $sub, 'associate_LOV' );
-  }
-  // else, we only display a small text field, we suppose the administrator
-  // knows the id of its category
-  else
-  {
-    $vtp->addSession( $sub, 'associate_text' );
-    $vtp->setVar( $sub, 'associate_text.value', $row['id_uppercat'] );
-    $vtp->closeSession( $sub, 'associate_text' );
-  }
-  $vtp->closeSession( $sub, 'parent' );
-}
-*/
 //----------------------------------------------------------- sending html code
 $template->assign_var_from_handle('ADMIN_CONTENT', 'categories');
 ?>
diff --git a/admin/group_list.php b/admin/group_list.php
index 6af820eab..3fbec59de 100644
--- a/admin/group_list.php
+++ b/admin/group_list.php
@@ -24,72 +24,38 @@
 // | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
-include_once( './admin/include/isadmin.inc.php' );
-//----------------------------------------------------- template initialization
-$sub = $vtp->Open( './template/'.$user['template'].'/admin/group_list.vtp' );
-$tpl = array( 'group_add','add','listuser_permission','delete',
-              'group_confirm','yes','no','group_list_title' );
-templatize_array( $tpl, 'lang', $sub );
-$vtp->setGlobalVar( $sub, 'user_template', $user['template'] );
+if( !defined("PHPWG_ROOT_PATH") )
+{
+	die ("Hacking attempt!");
+}
+include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
+
 //-------------------------------------------------------------- delete a group
 $error = array();
-if ( isset ( $_GET['delete'] ) and is_numeric( $_GET['delete'] ) )
+if ( isset( $_POST['delete'] ) && isset( $_POST['confirm_delete'] )  )
 {
-  $query = 'SELECT name';
-  $query.= ' FROM '.PREFIX_TABLE.'groups';
-  $query.= ' WHERE id = '.$_GET['delete'];
-  $query.= ';';
-  $row = mysql_fetch_array( pwg_query( $query ) );
-  // confirm group deletion ?
-  if ( !isset( $_GET['confirm'] ) or $_GET['confirm'] != 1 )
-  {
-    $vtp->addSession( $sub, 'deletion' );
-    $vtp->setVar( $sub, 'deletion.name', $row['name'] );
-    $yes_url = './admin.php?page=group_list&amp;delete='.$_GET['delete'];
-    $yes_url.= '&amp;confirm=1';
-    $vtp->setVar( $sub, 'deletion.yes_url', add_session_id( $yes_url ) );
-    $no_url = './admin.php?page=group_list';
-    $vtp->setVar( $sub, 'deletion.no_url', add_session_id( $no_url ) );
-    $vtp->closeSession( $sub, 'deletion' );
-  }
-  // group deletion confirmed
-  else
-  {
-    $vtp->addSession( $sub, 'confirmation' );
-    $query = 'SELECT COUNT(*) AS nb_result';
-    $query.= ' FROM '.PREFIX_TABLE.'groups';
-    $query.= ' WHERE id = '.$_GET['delete'];
-    $query.= ';';
-    $row2 = mysql_fetch_array( pwg_query( $query ) );
-    if ( $row2['nb_result'] > 0 )
-    {
-      delete_group( $_GET['delete'] );
-      $vtp->setVar( $sub, 'confirmation.class', 'info' );
-      $info = '"'.$row['name'].'" '.$lang['listuser_info_deletion'];
-      $vtp->setVar( $sub, 'confirmation.info', $info );
-    }
-    else
-    {
-      $vtp->setVar( $sub, 'confirmation.class', 'erreur' );
-      $vtp->setVar( $sub, 'confirmation.info', $lang['group_err_unknown'] );
-    }
-    $vtp->closeSession( $sub, 'confirmation' );
-  }
+  $query = 'DELETE FROM ' . USER_GROUP_TABLE; 
+  $query.= ' WHERE group_id = '.$_POST['group_id'];
+	pwg_query( $query );
+	
+	$query = 'DELETE FROM ' . GROUPS_TABLE; 
+  $query.= ' WHERE id = '.$_POST['group_id'];
+	$query.= ';';
+	pwg_query( $query );
 }
 //----------------------------------------------------------------- add a group
-if ( isset( $_POST['submit'] ) )
+elseif ( isset( $_POST['new'] ) )
 {
-  if ( preg_match( "/'/", $_POST['name'] )
-       or preg_match( '/"/', $_POST['name'] ) )
+  if ( empty($_POST['newgroup']) || preg_match( "/'/", $_POST['newgroup'] )
+       or preg_match( '/"/', $_POST['newgroup'] ) )
   {
     array_push( $error, $lang['group_add_error1'] );
   }
   if ( count( $error ) == 0 )
   {
     // is the group not already existing ?
-    $query = 'SELECT id';
-    $query.= ' FROM '.PREFIX_TABLE.'groups';
-    $query.= " WHERE name = '".$_POST['name']."'";
+    $query = 'SELECT id FROM '.GROUPS_TABLE;
+    $query.= " WHERE name = '".$_POST['newgroup']."'";
     $query.= ';';
     $result = pwg_query( $query );
     if ( mysql_num_rows( $result ) > 0 )
@@ -100,47 +66,127 @@ if ( isset( $_POST['submit'] ) )
   if ( count( $error ) == 0 )
   {
     // creating the group
-    $query = ' INSERT INTO '.PREFIX_TABLE.'groups';
-    $query.= " (name) VALUES ('".$_POST['name']."')";
+    $query = ' INSERT INTO '.GROUPS_TABLE;
+    $query.= " (name) VALUES ('".$_POST['newgroup']."')";
     $query.= ';';
     pwg_query( $query );
   }
 }
+//--------------------------------------------------------------- user management
+elseif ( isset( $_POST['add'] ) )
+{
+  $userdata = getuserdata($_POST['username']);
+  if (!$userdata) echo "Utilisateur inexistant";
+	
+	// create a new association between the user and a group
+  $query = 'INSERT INTO '.USER_GROUP_TABLE;
+  $query.= ' (user_id,group_id) VALUES';
+  $query.= ' ('.$userdata['id'].','.$_POST['edit_group_id'].')';
+  $query.= ';';
+  pwg_query( $query );
+}
+elseif (isset( $_POST['deny_user'] ))
+{
+  $sql_in = '';
+	$members = $_POST['members'];
+	for($i = 0; $i < count($members); $i++)
+  {
+    $sql_in .= ( ( $sql_in != '' ) ? ', ' : '' ) . intval($members[$i]);
+  }
+  $query = 'DELETE FROM ' . USER_GROUP_TABLE; 
+  $query.= ' WHERE user_id IN ('.$sql_in;
+	$query.= ') AND group_id = '.$_POST['edit_group_id'];
+	pwg_query( $query );
+}
 //-------------------------------------------------------------- errors display
 if ( sizeof( $error ) != 0 )
 {
-  $vtp->addSession( $sub, 'errors' );
+  $template->assign_block_vars('errors',array());
   for ( $i = 0; $i < sizeof( $error ); $i++ )
   {
-    $vtp->addSession( $sub, 'li' );
-    $vtp->setVar( $sub, 'li.li', $error[$i] );
-    $vtp->closeSession( $sub, 'li' );
+    $template->assign_block_vars('errors.error',array('ERROR'=>$error[$i]));
   }
-  $vtp->closeSession( $sub, 'errors' );
 }
 //----------------------------------------------------------------- groups list
-$vtp->addSession( $sub, 'groups' );
 
-$query = 'SELECT id,name';
-$query.= ' FROM '.PREFIX_TABLE.'groups';
-$query.= ' ORDER BY id ASC';
-$query.= ';';
+$query = 'SELECT id,name FROM '.GROUPS_TABLE;
+$query.= ' ORDER BY id ASC;';
 $result = pwg_query( $query );
+$groups_display = '<select name="group_id">';
+$groups_nb=0;
 while ( $row = mysql_fetch_array( $result ) )
 {
-  $vtp->addSession( $sub, 'group' );
-  $vtp->setVar( $sub, 'group.name', $row['name'] );
-  $url = './admin.php?page=group_perm&amp;group_id='.$row['id'];
-  $vtp->setVar( $sub, 'group.permission_url', add_session_id( $url ) );
-  $url = './admin.php?page=group_list&amp;delete='.$row['id'];
-  $vtp->setVar( $sub, 'group.deletion_url', add_session_id( $url ) );
-  $vtp->closeSession( $sub, 'group' );
+  $groups_nb++;
+	$selected = '';
+	if (isset($_POST['group_id']) && $_POST['group_id']==$row['id'])
+		$selected = 'selected';
+  $groups_display .= '<option value="' . $row['id'] . '" '.$selected.'>' . $row['name']  . '</option>';
+}
+$groups_display .= '</select>';
+
+$action = PHPWG_ROOT_PATH.'admin.php?page=group_list';
+//----------------------------------------------------- template initialization
+$template->set_filenames( array('groups'=>'admin/group_list.tpl') );
+$tpl = array( 'group_add','add','listuser_permission','delete',
+              'group_confirm','yes','no','group_list_title' );
+
+$template->assign_vars(array(
+  'S_GROUP_SELECT'=>$groups_display,
+	
+  'L_GROUP_SELECT'=>$lang['group_list_title'],
+	'L_GROUP_CONFIRM'=>$lang['group_confirm_delete'],
+	'L_LOOK_UP'=>$lang['edit'],
+	'L_GROUP_DELETE'=>$lang['delete'],
+  'L_CREATE_NEW_GROUP'=>$lang['group_add'],
+  'L_GROUP_EDIT'=>$lang['group_edit'],
+	'L_USER_NAME'=>$lang['login'],
+	'L_USER_EMAIL'=>$lang['mail_address'],
+	'L_USER_SELECT'=>$lang['Select'],
+	'L_DENY_SELECTED'=>$lang['group_deny_user'],
+	'L_ADD_MEMBER'=>$lang['group_add_user'],
+  'L_FIND_USERNAME'=>$lang['Find_username'],
+	
+	'S_GROUP_ACTION'=>add_session_id($action),
+	'U_SEARCH_USER' => add_session_id(PHPWG_ROOT_PATH.'admin/search.php')
+	));
+
+if ($groups_nb) 
+{
+  $template->assign_block_vars('select_box',array());
+}
+
+//----------------------------------------------------------------- add a group
+if ( isset( $_POST['edit']) || isset( $_POST['add']) || isset( $_POST['deny_user'] ))
+{
+  // Retrieving the group name
+	$query = 'SELECT id, name FROM '.GROUPS_TABLE;
+  $query.= " WHERE id = '".$_POST['group_id']."'";
+  $query.= ';';
+  $result = mysql_fetch_array(pwg_query( $query ));
+  $template->assign_block_vars('edit_group',array(
+	  'GROUP_NAME'=>$result['name'],
+		'GROUP_ID'=>$result['id']
+		));
+		
+  // Retrieving all the users
+	$query = 'SELECT id, username, mail_address';
+	$query.= ' FROM ('.USERS_TABLE.' as u';
+	$query.= ' LEFT JOIN '.USER_GROUP_TABLE.' as ug ON ug.user_id=u.id)';
+  $query.= " WHERE ug.group_id = '".$_POST['group_id']."';";
+	$result = pwg_query( $query );
+	$i=0;
+	while ( $row = mysql_fetch_array( $result ) )
+	{
+	  $class = ($i % 2)? 'row1':'row2'; $i++;
+	  $template->assign_block_vars('edit_group.user',array(
+		  'ID'=>$row['id'],
+			'NAME'=>$row['username'],
+			'EMAIL'=>$row['mail_address'],
+			'T_CLASS'=>$class
+		));
+	}
 }
 
-$vtp->closeSession( $sub, 'groups' );
-//------------------------------------------------------- create new group form
-$action = './admin.php?'.$_SERVER['QUERY_STRING'];
-$vtp->setVar( $sub, 'form_action', $action );
 //----------------------------------------------------------- sending html code
-$vtp->Parse( $handle , 'sub', $sub );
+$template->assign_var_from_handle('ADMIN_CONTENT', 'groups');
 ?>
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 841254bf5..46d385f98 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -119,6 +119,7 @@ $lang['title_thumbnails_2'] = 'for';
 $lang['title_default'] = 'PhpWebGallery administration';
 $lang['title_waiting'] = 'Pictures waiting for validation';
 $lang['title_cat_options'] = 'Categories options';
+$lang['title_groups'] = 'Groups management';
 
 //Error messages
 $lang['cat_error_name'] = 'The name of a category mustn\'t be empty';
@@ -239,6 +240,18 @@ $lang['stats_empty'] = 'empty history';
 $lang['stats_global_graph_title'] = 'Pages seen by month';
 $lang['stats_visitors_graph_title'] = 'Nombre de visiteurs par jour';
 
+// Users
+
+// Groups
+$lang['group_confirm_delete']= 'Confirm group deletion';
+$lang['group_add'] = 'Add a group';
+$lang['group_add_error1'] = 'The name of a group must not contain " or \' or be empty.';
+$lang['group_add_error2'] = 'This name is already used by another group.';
+$lang['group_list_title'] = 'List of existing groups';
+$lang['group_edit'] = 'Manage users of the group';
+$lang['group_deny_user'] = 'Deny selected';
+$lang['group_add_user']= 'Add user';
+
 $lang['menu_add_user'] = 'add';
 $lang['menu_list_user'] = 'list';
 $lang['user_err_modify'] = 'This user can\'t be modified or deleted';
@@ -302,18 +315,11 @@ $lang['tn_dirs_alone'] = 'pictures without thumbnail';
 
 $lang['title_add'] = 'Add a user';
 $lang['title_modify'] = 'Modify a user';
-$lang['title_groups'] = 'Groups management';
 $lang['title_user_perm'] = 'Modify permission for user';
 $lang['title_cat_perm'] = 'Modify permissions for category';
 $lang['title_group_perm'] = 'Modify permissions for group';
 $lang['title_picmod'] = 'Modify informations about a picture';
-$lang['adduser_associate'] = 'Associate to group';
-$lang['group_add'] = 'Add a group';
-$lang['group_add_error1'] = 'The name of a group must not contain " or \'';
-$lang['group_add_error2'] = 'This name is already used by another group';
-$lang['group_confirm'] = 'Are you sure you want to remove this group ?';
-$lang['group_list_title'] = 'List of existing groups';
-$lang['group_err_unknown'] = 'This group doesn\'t exist in the database';
+
 $lang['stats_pages_seen'] = 'pages seen';
 $lang['stats_visitors'] = 'guests';
 $lang['stats_empty'] = 'empty history';
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index fade5b2e8..6c6bcef7d 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -121,6 +121,7 @@ $lang['title_default'] = 'Administration de PhpWebGallery';
 $lang['title_waiting'] = 'Images en attente de validation';
 $lang['title_upload'] = 'Sélectionner les catégories pour lesquelles l\'ajout d\'image est autorisé';
 $lang['title_cat_options'] = 'Options relatives aux catégories';
+$lang['title_groups'] = 'Gestion des groupes';
 
 //Error messages
 $lang['conf_confirmation'] = 'Informations enregistrées dans la base de données';
@@ -213,22 +214,24 @@ $lang['infoimage_associate'] = 'Associer à la catégorie';
 
 //Update
 $lang['update_missing_tn'] = 'Il manque la miniature pour';
-$lang['update_disappeared_tn'] = 'La miniature a disparu';
-$lang['update_disappeared'] = 'a disparu';
+$lang['update_disappeared_tn'] = 'La miniature n\'existe pas';
+$lang['update_disappeared'] = 'n\'existe pas';
 $lang['update_part_deletion'] = 'Suppression des images de la base qui n\'ont pas de thumbnail ou qui n\'existent pas';
-$lang['update_deletion_conclusion'] = 'images supprimées de la base de données';
 $lang['update_part_research'] = 'Recherche des nouvelles images dans les répertoires';
 $lang['update_research_added'] = 'ajouté';
 $lang['update_research_tn_ext'] = 'miniature en';
-$lang['update_research_conclusion'] = 'images ajoutées à la base de données';
-$lang['update_default_title'] = 'Choisir une option';
-$lang['update_only_cat'] = 'mettre à jour les catégories, mais pas les images';
-$lang['update_all'] = 'mettre tout à jour';
-$lang['update_sync_metadata_question'] = 'Utiliser les métadonnées des images pour la mise à jour';
+$lang['update_default_title'] = 'Type de mise à jour';
 $lang['update_nb_new_elements'] = 'élément(s) ajouté(s)';
 $lang['update_nb_del_elements'] = 'élément(s) effacé(s)';
 $lang['update_nb_new_categories'] = 'catégorie(s) ajoutée(s)';
 $lang['update_nb_del_categories'] = 'catégorie(s) effacée(s)';
+$lang['update_sync_files'] = 'Synchroniser la structure';
+$lang['update_sync_dirs'] = 'Seulement les catégories';
+$lang['update_sync_all'] = 'Catégories et fichiers';
+$lang['update_sync_metadata'] = 'Synchroniser les méta-donnnées';
+$lang['update_sync_metadata_new'] = 'Seulement sur les nouveaux éléments';
+$lang['update_sync_metadata_all'] = 'Sur tous les éléments';
+$lang['update_cats_subset'] = 'Limiter la synchronisation aux catégories suivantes';
 
 // History
 $lang['stats_title'] = 'Historique de l\'année écoulée';
@@ -238,7 +241,18 @@ $lang['stats_empty'] = 'vider l\'historique';
 $lang['stats_global_graph_title'] = 'Nombre de pages vues par mois';
 $lang['stats_visitors_graph_title'] = 'Nombre de visiteurs par jour';
 
-//Users
+// Users
+
+
+// Groups
+$lang['group_list_title'] = 'Liste des groupes existants';
+$lang['group_confirm_delete']= 'Confirmer la destruction du groupe';
+$lang['group_add'] = 'Ajouter un groupe';
+$lang['group_add_error1'] = 'Le nom du groupe ne doit pas comporter de " ou de \' et ne pas être vide.';
+$lang['group_add_error2'] = 'Ce nom de groupe est déjà utilisé.';
+$lang['group_edit'] = 'Edition des utilisateurs appartenant au groupe';
+$lang['group_deny_user'] = 'Supprimer la sélection';
+$lang['group_add_user']= 'Ajouter le membre';
 
 
 // To be done
@@ -305,19 +319,12 @@ $lang['tn_dirs_alone'] = 'images sans miniatures';
 
 $lang['title_add'] = 'Ajouter un utilisateur';
 $lang['title_modify'] = 'Modifier un utilisateur';
-$lang['title_groups'] = 'Gestion des groupes';
+
 $lang['title_user_perm'] = 'Modifier les permissions pour l\'utilisateur';
 $lang['title_cat_perm'] = 'Modifier les permissions pour la catégorie';
 $lang['title_group_perm'] = 'Modifier les permissions pour le groupe';
 $lang['title_picmod'] = 'Modifier les informations d\'une image';
 $lang['waiting_update'] = 'Les images validées ne seront visibles qu\'après mise à jour de la base d\'images.';
-$lang['adduser_associate'] = 'Associer au groupe';
-$lang['group_add'] = 'Ajouter un groupe';
-$lang['group_add_error1'] = 'Le nom du groupe ne doit pas comporter de " ou de \'';
-$lang['group_add_error2'] = 'Ce nom de groupe est déjà utilisé';
-$lang['group_confirm'] = 'Etes-vous sûr de vouloir supprimer le groupe';
-$lang['group_list_title'] = 'Liste des groupes existants';
-$lang['group_err_unknown'] = 'Ce groupe n\'existe pas dans la base de données';
 $lang['permuser_only_private'] = 'Seules les catégories privées sont représentées';
 
 $lang['comments_last_title'] = 'Derniers commentaires';
diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php
index 715abe53c..f72d0f0f2 100644
--- a/language/fr_FR.iso-8859-1/common.lang.php
+++ b/language/fr_FR.iso-8859-1/common.lang.php
@@ -135,6 +135,7 @@ $lang['show_nb_comments'] = 'Montrer le nombre de commentaires';
 $lang['recent_period'] = 'Durée de nouveauté';
 $lang['create_cookie'] = 'Créer un cookie';
 $lang['theme'] = 'Thème de l\'interface';
+$lang['mail_address'] = 'Adresse mail';
 $lang['periods_error'] = 'La période doit être entière.';
 $lang['maxwidth_error'] = 'La largeur maximum des images doit être un entier supérieur à 50';
 $lang['maxheight_error'] = 'La hauteur maximum des images doit être un entier supérieur à 50';
@@ -251,7 +252,6 @@ $lang['upload_successful'] = 'Image uploadée avec succès, un administrateur vali
 // new or modified in release 1.3
 
 $lang['guest'] = 'visiteur';
-$lang['mail_address'] = 'adresse mail';
 $lang['add'] = 'ajouter';
 $lang['dissociate'] = 'dissocier';
 $lang['mandatory'] = 'obligatoire';
diff --git a/template/default/admin/admin_upload.tpl b/template/default/admin/admin_upload.tpl
deleted file mode 100644
index 045324455..000000000
--- a/template/default/admin/admin_upload.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="admin">{L_UPLOAD_TITLE}</div>
-<form name="form1" method="post" action="" style="text-align:center;width:80%;">
-<div style="clear:both;"></div>
-  <div style="float:left;padding:10px;">
-  {L_AUTHORIZED}<br />
-  <select style="width:280px" name="cat_data[]" multiple="multiple" size="5">
-    {UPLOADABLE_CATEGORIES}
-  </select><br />
-  <input type="submit" name="delete" value="{L_DELETE}" class="bouton" />
-  </div>
-  <div style="float:right;padding:10px;">
-  {L_FORBIDDEN}<BR />
-  <select style="width:280px" name="cat_data[]" multiple="multiple" size="5">
-    {PRIVATE_CATEGORIES}
-  </select>
-  <br>
-  <input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" /> &nbsp;
-  <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
-  </div>
-<div style="clear:both;"></div>
-</form>
-<div class="infoCat">{L_UPLOAD_INFO}</div>
\ No newline at end of file
diff --git a/template/default/admin/group_list.tpl b/template/default/admin/group_list.tpl
new file mode 100644
index 000000000..3a5688af0
--- /dev/null
+++ b/template/default/admin/group_list.tpl
@@ -0,0 +1,52 @@
+<!-- BEGIN errors -->
+<div class="errors">
+<ul>
+  <!-- BEGIN error -->
+  <li>{errors.error.ERROR}</li>
+  <!-- END error -->
+</ul>
+</div>
+<!-- END errors -->
+<form method="post" name="post" action="{S_GROUP_ACTION}">
+<div class="admin">{L_GROUP_SELECT}</div>
+<!-- BEGIN select_box -->
+{S_GROUP_SELECT}&nbsp;&nbsp;<input type="submit" name="edit" value="{L_LOOK_UP}" class="bouton" />
+<input type="submit" name="delete" value="{L_GROUP_DELETE}" class="bouton" />
+<div style="vertical-align:middle;">
+<input type="checkbox" name="confirm_delete" value="1">{L_GROUP_CONFIRM}
+</div>
+<!-- END select_box -->
+<input type="text" name="newgroup">
+<input type="submit" class="bouton" name="new" value="{L_CREATE_NEW_GROUP}" />
+<br />
+<br />
+<!-- BEGIN edit_group -->
+<div class="admin">{L_GROUP_EDIT} [{edit_group.GROUP_NAME}]</div>
+<table class="table2" width="60%" style="margin-left:20%;">
+<tr class="throw">
+    <th width="25%">{L_USER_NAME}</th>
+	  <th width="25%">{L_USER_EMAIL}</th>
+    <th width="10%">{L_USER_SELECT}</th>
+</tr>
+<!-- BEGIN user -->
+  <tr class="{edit_group.user.T_CLASS}">
+    <td>{edit_group.user.NAME}</td>
+    <td>{edit_group.user.EMAIL}</td>
+	  <td align="center"><input name="members[]" type="checkbox" value="{edit_group.user.ID}"></td>
+  </tr>
+<!-- END user -->
+<tr>
+  <td colspan="3" align="right" valign="middle">
+    <input type="submit" name="deny_user" value="{L_DENY_SELECTED}" class="bouton" />
+  </td>
+</tr>
+</table>
+<div align="left" style="margin-left:20%;">
+<input type="text" name="username" maxlength="50" size="20" />
+<input type="submit" name="add" value="{L_ADD_MEMBER}" class="bouton" />
+<input name="edit_group_id" type="hidden" value="{edit_group.GROUP_ID}">
+<input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="bouton" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" />
+</div>
+<br />
+<!-- END edit_group -->
+</form>
\ No newline at end of file
diff --git a/template/default/admin/group_list.vtp b/template/default/admin/group_list.vtp
deleted file mode 100644
index 7c4520747..000000000
--- a/template/default/admin/group_list.vtp
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--VTP_errors-->
-<div class="errors">
-  <ul>
-    <!--VTP_li-->
-    <li>{#li}</li>
-    <!--/VTP_li-->
-  </ul>
-</div>
-<!--/VTP_errors-->
-
-<!--VTP_deletion-->
-<table style="width:100%;">
-  <tr>
-    <th colspan="2">{#group_confirm} "{#name}"</th>
-  </tr>
-  <tr>
-    <td align="center"><a href="{#yes_url}">{#yes}</a></td>
-    <td align="center" class="row2"><a href="{#no_url}">{#no}</a></td>
-  </tr>
-</table>
-<!--/VTP_deletion-->
-
-<!--VTP_confirmation-->
-<div class="{#class}">{#info}</div>
-<!--/VTP_confirmation-->
-
-<form method="post" action="{#form_action}">
-  <div style="text-align:center;margin:10px;">
-    {#group_add} <input type="text" name="name" />
-    <input type="submit" value="{#add}" name="submit" />
-  </div>
-</form>
-
-<!--VTP_groups-->
-<table width="100%">
-  <tr>
-    <th colspan="3">{#group_list_title}</th>
-  </tr>
-  <!--VTP_group-->
-  <tr>
-    <td style="width:25%;">
-      <div style="margin-left:10px;color:{#color}"><img src="./template/{#user_template}/admin/images/puce.gif" alt="&gt;" /> {#name}</div>
-    </td>
-    <td class="row2" style="text-align:center;width:25%;">
-      <a href="{#permission_url}">{#listuser_permission}</a>
-    </td>
-    <td class="row2" style="text-align:center;width:25%;">
-      <a href="{#deletion_url}">{#delete}</a>
-    </td>
-  </tr>
-  <!--/VTP_group-->
-</table>
-<!--/VTP_groups-->
\ No newline at end of file
diff --git a/template/default/default.css b/template/default/default.css
index fe0092477..07b079206 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -1,4 +1,5 @@
 /* BACKGROUND */
+
 body { background-color:#000000;}
 .main, .throw, .admin {	background-color:#3F3F3F;}
 .row1,input,select,textarea, .table1, .home { background-color:#5F5F5F;}
@@ -8,6 +9,22 @@ body { background-color:#000000;}
 .titreMenu,.titrePage,.imgMenu a:hover { background-image: url(theme/tableh1_bg.gif);}
 .bouton, .imgMenu a, #imgBarMenu { background-image: url(theme/button_bg.gif);}
 
+/* FONT COLORS */
+
+.titreMenu, .titreMenu a, .info, .admin{ color:#FFF48E;}
+.titrePage, .titreMenu a:hover { color:#E0E0E0;}
+.comment{ color:#C6B78E;}
+.commentDate { color:#999999;}
+input,select,textarea { color:#FFFFCC;}
+
+/* ANCHORS */
+
+a { text-decoration:none; color:#FFFFFF;}
+a:hover { text-decoration:none; color:#FFF48E;}
+a.none:hover { text-decoration:none;}
+a.image:hover { text-decoration:none;}
+a.thumbLink:hover { text-decoration:none;}
+
 /* POSITION */
 #gauche,#droite
 {
@@ -23,20 +40,9 @@ body { background-color:#000000;}
   text-align:center;
 }
 
-#droite
-{
-  text-align:right;
-}
-
-#left
-{
-  float:left; 
-}
-
-#right
-{
-  float:right; 
-}
+#droite{text-align:right;}
+#left {float:left; }
+#right{float:right; }
 
 /* MAIN STYLES */
 
@@ -59,13 +65,7 @@ h2 {
 	line-height:	120%; 
 }
 
-/* ANCHORS */
 
-a { text-decoration:none; color:#FFFFFF;}
-a:hover { text-decoration:none; color:#FFF48E;}
-a.none:hover { text-decoration:none;}
-a.image:hover { text-decoration:none;}
-a.thumbLink:hover { text-decoration:none;}
 
 /* LAYOUT STYLE */
 
@@ -92,7 +92,6 @@ a.thumbLink:hover { text-decoration:none;}
   height: 25px;
   line-height: 25px;
   font-size:12px;
-  color:#E0E0E0;
   font-weight:600;
   text-align:center;
 }
@@ -265,14 +264,10 @@ table.thumbnail {
 .commentDate {
   font-weight:lighter;
   text-align:right;
-  color:#999999;
   border-top: 1px solid #000000; 
   border-bottom: 1px solid #000000;
 }
 
-.comment{
-  color:#C6B78E; 
-}
 /* Form styles */
 
 form{
@@ -294,7 +289,6 @@ input,select,textarea {
  text-indent:2px;
  border: 1px solid #797979;
  padding: 0;
- color:#FFFFCC;
 }
 
 .radio{
@@ -316,12 +310,10 @@ font-weight:bold;
 margin:0px 0px 12px 0px;
 text-align: center;
 padding:0px;
-color : #FFF48E;
 }
 
 /* Other styles */
 .info {
-  color:#FFF48E;
   margin:5px 0px 5px 0px;
   white-space:nowrap;
   text-align:center;