- French translation

- Deletion of the eCard template entry


git-svn-id: http://piwigo.org/svn/trunk@670 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 5 insertions, 33 deletions

diff --git a/admin.php b/admin.php
index 22bb2d28a..6a0ad7091 100644
--- a/admin.php
+++ b/admin.php
@@ -50,21 +50,21 @@ switch ( $_GET['page'] )
  case 'group_list' :
    $title = $lang['title_groups'];        $page_valide = true; break;
  case 'group_perm' :
-   if ( !is_numeric( $_GET['group_id'] ) ) $_GET['group_id'] = -1;
+   /*if ( !is_numeric( $_GET['group_id'] ) ) $_GET['group_id'] = -1;
    $query = 'SELECT name FROM '.GROUPS_TABLE;
    $query.= ' WHERE id = '.$_GET['group_id'];
    $query.= ';';
    $result = pwg_query( $query );
    if ( mysql_num_rows( $result ) > 0 )
    {
-     $row = mysql_fetch_array( $result );
-     $title = $lang['title_group_perm'].' "'.$row['name'].'"';
+     $row = mysql_fetch_array( $result );*/
+     $title = $lang['title_group_perm'];//.' "'.$row['name'].'"';
      $page_valide = true;
-   }
+   /*}
    else
    {
      $page_valide = false;
-   }
+   }*/
    break;
  case 'stats':
    $title = $lang['title_history'];       $page_valide = true; break;
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 41d3f0c8b..d8aa31cc9 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -360,34 +360,6 @@ DELETE FROM '.USERS_TABLE.'
   pwg_query($query);
 }
 
-// delete_group deletes a group identified by its $group_id.
-// It also deletes :
-//     - all the access linked to this group
-//     - all the links between this group and any user
-function delete_group( $group_id )
-{
-  // destruction of the access linked to the group
-  $query = 'DELETE FROM '.PREFIX_TABLE.'group_access';
-  $query.= ' WHERE group_id = '.$group_id;
-  $query.= ';';
-  pwg_query( $query );
-
-  // synchronize all users linked to the group
-  synchronize_group( $group_id );
-
-  // destruction of the users links for this group
-  $query = 'DELETE FROM '.PREFIX_TABLE.'user_group';
-  $query.= ' WHERE group_id = '.$group_id;
-  $query.= ';';
-  pwg_query( $query );
-
-  // destruction of the group
-  $query = 'DELETE FROM '.PREFIX_TABLE.'groups';
-  $query.= ' WHERE id = '.$group_id;
-  $query.= ';';
-  pwg_query( $query );
-}
-
 /**
  * updates calculated informations about a set of categories : date_last and
  * nb_images. It also verifies that the representative picture is really