diff options
| -rw-r--r-- | admin.php | 10 | ||||
| -rw-r--r-- | admin/include/functions.php | 28 | ||||
| -rw-r--r-- | language/en_UK.iso-8859-1/admin.lang.php | 3 | ||||
| -rw-r--r-- | language/en_UK.iso-8859-1/common.lang.php | 10 | ||||
| -rw-r--r-- | language/fr_FR.iso-8859-1/admin.lang.php | 15 | ||||
| -rw-r--r-- | language/fr_FR.iso-8859-1/common.lang.php | 6 | ||||
| -rw-r--r-- | template/default/picture.tpl | 7 |
7 files changed, 33 insertions, 46 deletions
@@ -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 diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php index df1c48cf8..31b5ec021 100644 --- a/language/en_UK.iso-8859-1/admin.lang.php +++ b/language/en_UK.iso-8859-1/admin.lang.php @@ -292,6 +292,9 @@ $lang['update_display_info'] = 'display maximum informations (added categories a $lang['update_simulate'] = 'only perform a simulation (no change in database will be made)'; $lang['update_infos_title'] = 'Detailed informations'; $lang['update_simulation_title'] = '[Simulation]'; +$lang['update_wrong_dirname'] = 'The name of directories and files must be composed of letters, figures, "-", "_" or "."'; +$lang['update_wrong_dirname_short'] = 'wrong filename'; +$lang['update_wrong_dirname_info'] = 'The name of directories and files must be composed of letters, figures, "-", "_" or "."'; // History $lang['stats_title'] = 'Last year statistics'; diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php index e81165688..9f240a593 100644 --- a/language/en_UK.iso-8859-1/common.lang.php +++ b/language/en_UK.iso-8859-1/common.lang.php @@ -188,6 +188,10 @@ $lang['search_descending'] = 'Descending'; $lang['search_one_clause_at_least'] = 'Empty query. No criteria has been entered.'; $lang['search_result'] = 'Search results'; +// Admin messages +$lang['gallery_locked_message'] = 'The gallery is locked for maintenance. Please, come back later or loggin as an administrator to enter the gallery : <a href="'.PHPWG_ROOT_PATH.'identification.php">Identification</a>'; +$lang['sql_queries_in'] = 'SQL queries in'; + $lang['Look_up_user'] = 'Seek user'; $lang['Find_username'] = 'Find a username'; $lang['No_match'] = 'No match'; @@ -299,9 +303,6 @@ $lang['title_comments'] = 'Users comments'; $lang['stats_last_days'] = 'last days'; $lang['hint_comments'] = 'See last users comments'; $lang['menu_login'] = 'login'; -$lang['update_wrong_dirname'] = 'The name of directories and files must be composed of letters, figures, "-", "_" or "."'; -$lang['update_wrong_dirname_short'] = 'wrong filename'; -$lang['update_wrong_dirname_info'] = 'The name of directories and files must be composed of letters, figures, "-", "_" or "."'; $lang['hello'] = 'Hello'; $lang['picture_show_metadata'] = 'Show file metadata ?'; @@ -318,6 +319,5 @@ $lang['random_cat'] = 'random pictures'; $lang['random_cat_hint'] = 'Displays a set of random pictures'; $lang['picture_high'] = 'Click on the picture to see it in high definition'; -$lang['gallery_locked_message'] = 'The gallery is locked for maintenance. Please, come back later or loggin as an administrator to enter the gallery : <a href="'.PHPWG_ROOT_PATH.'identification.php">Identification</a>'; -$lang['sql_queries_in'] = ' SQL queries in'; + ?>
\ No newline at end of file diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php index 7f49d4cd4..7cce1271e 100644 --- a/language/fr_FR.iso-8859-1/admin.lang.php +++ b/language/fr_FR.iso-8859-1/admin.lang.php @@ -269,11 +269,16 @@ $lang['tn_dirs_alone'] = 'images sans miniatures'; // Update $lang['update_missing_tn'] = 'Il manque la miniature pour'; +$lang['update_missing_tn_short'] = 'Miniature manquante'; +$lang['update_missing_tn_info'] = 'Une image nécessite une miniature. +Celle ci doit être présente dans le répertoire "thumbnail" du repertoire de la catégorie. +Le nom de la miniature doit commencer par le préfixe défini par la configuration de la galerie et doit être du type :'; $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_part_research'] = 'Recherche des nouvelles images dans les répertoires'; $lang['update_research_added'] = 'ajouté'; +$lang['update_research_deleted'] = 'détruit'; $lang['update_research_tn_ext'] = 'miniature en'; $lang['update_default_title'] = 'Type de mise à jour'; $lang['update_nb_new_elements'] = 'élément(s) ajouté(s)'; @@ -287,6 +292,16 @@ $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'; +$lang['update_nb_errors'] = 'erreurs durant la synchronisation'; +$lang['update_error_list_title'] = 'Liste d\'erreurs'; +$lang['update_errors_caption'] = 'Explications'; +$lang['update_display_info'] = 'Afficher des informations détaillées'; +$lang['update_simulate'] = 'Simuler (aucune opération ne sera sauvegardée)'; +$lang['update_infos_title'] = 'Informations détaillées'; +$lang['update_simulation_title'] = '[Simulation]'; +$lang['update_wrong_dirname'] = 'Le nom du répertoire peut être composé de lettres et des signes "-", "_" or "."'; +$lang['update_wrong_dirname_short'] = 'Nom incorrect'; +$lang['update_wrong_dirname_info'] = 'Le nom du répertoire peut être composé de lettres et des signes "-", "_" or "."'; // History $lang['stats_title'] = 'Historique de l\'année écoulée'; diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php index 32baa2b45..b52532f89 100644 --- a/language/fr_FR.iso-8859-1/common.lang.php +++ b/language/fr_FR.iso-8859-1/common.lang.php @@ -129,7 +129,6 @@ $lang['w_day']='Jour';; $lang['days']='Jours'; $lang['today']='Aujourd\'hui'; - // Customization $lang['customize_page_title'] = 'Personnalisation de votre galerie'; $lang['customize_title'] = 'Personnalisation'; @@ -191,6 +190,11 @@ $lang['search_one_clause_at_least'] = 'Recherche vide. Aucun critère n\'a été re $lang['search_result'] = 'Résultats de la recherche'; $lang['invalid_search'] = 'Les mots recherchés doivent comporter plus de 3 caractères et ne doivent pas inclure de caractères de ponctuation'; +// Admin messages +$lang['gallery_locked_message'] = 'Cette galerie est actuellement inaccessible pour cause de maintenance. +Revenez plus tard ou connectez vous en tant qu\'administrateur: <a href="'.PHPWG_ROOT_PATH.'identification.php">Identification</a>'; +$lang['sql_queries_in'] = 'requêtes SQL en'; + $lang['Look_up_user'] = 'Rechercher l\'utilisateur'; $lang['Find_username'] = 'Trouver un nom d\'utilisateur'; $lang['No_match'] = 'Aucun enregistrement trouvé.'; diff --git a/template/default/picture.tpl b/template/default/picture.tpl index fb26af582..4d4c5c374 100644 --- a/template/default/picture.tpl +++ b/template/default/picture.tpl @@ -37,13 +37,6 @@ </a> </div> <!-- END download --> -<!-- BEGIN ecard --> -<div class="imgMenu" id="right"> - <a href="{ecard.U_ECARD}" title="{L_DOWNLOAD}"> - <img src="template/default/theme/eCard.gif" alt="{L_DOWNLOAD}" /> - </a> -</div> -<!-- END ecard --> <!-- BEGIN admin --> <div class="imgMenu" id="right"> <a href="{U_ADMIN}" title="{L_ADMIN}"> |