Changeset 2268

Timestamp:

Mar 8, 2008, 1:38:09 PM (16 years ago)

Author:

rvelices

Message:

• security fix (profile)
• les langues a la hache
• fix some copy/paste errors

Location:

trunk

Files:

• admin/group_perm.php (modified) (5 diffs)
• comments.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (3 diffs)
• language/en_UK/admin.lang.php (modified) (18 diffs)
• language/en_UK/common.lang.php (modified) (3 diffs)
• language/es_ES/admin.lang.php (modified) (14 diffs)
• language/es_ES/common.lang.php (modified) (3 diffs)
• language/fr_FR/admin.lang.php (modified) (15 diffs)
• language/fr_FR/common.lang.php (modified) (3 diffs)
• language/nl_NL/admin.lang.php (modified) (14 diffs)
• language/nl_NL/common.lang.php (modified) (3 diffs)
• plugins/event_tracer/tracer_admin.tpl (modified) (1 diff)
• profile.php (modified) (8 diffs)
• register.php (modified) (1 diff)
• template/yoga/admin/cat_list.tpl (modified) (1 diff)
• template/yoga/admin/check_integrity.tpl (modified) (1 diff)
• template/yoga/admin/notification_by_mail.tpl (modified) (4 diffs)
• template/yoga/admin/user_list.tpl (modified) (8 diffs)
• template/yoga/index.tpl (modified) (2 diffs)
• template/yoga/profile_content.tpl (modified) (4 diffs)

trunk/admin/group_perm.php

@@ -48 +48 @@
 else
 {
-  echo l10n('group_id URL parameter is missing');
-  exit();
+  die('group_id URL parameter is missing');
 }
 
@@ -94 +93 @@
   // accesible
   $authorized_ids = array();
-    
+
   $query = '
 SELECT cat_id
@@ -101 +100 @@
 ;';
   $result = pwg_query($query);
-  
+
   while ($row = mysql_fetch_array($result))
   {
     array_push($authorized_ids, $row['cat_id']);
   }
-  
+
   $inserts = array();
   $to_autorize_ids = array_diff($private_uppercats, $authorized_ids);
@@ -145 +144 @@
     'L_CAT_OPTIONS_FALSE'=>l10n('forbidden'),
     'L_CAT_OPTIONS_INFO'=>l10n('permuser_info'),
-    
+
     'F_ACTION' =>
         PHPWG_ROOT_PATH.
@@ -152 +151 @@
     )
   );
-  
+
 // only private categories are listed
 $query_true = '

trunk/comments.php

@@ -173 +173 @@
 // +-----------------------------------------------------------------------+
 
-$title= l10n('title_comments');
+$title= l10n('User comments');
 $page['body_id'] = 'theCommentsPage';
 

trunk/include/functions_user.inc.php

@@ -97 +97 @@
               $errors,
               array(
-                'login'=>$login,
+                'username'=>$login,
                 'password'=>$password,
                 'email'=>$mail_address,
@@ -160 +160 @@
     {
       include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
-      $username = $_POST['login'];
       $admin_url = get_absolute_root_url()
-                   .'admin.php?page=user_list&username='.$username;
+                   .'admin.php?page=user_list&username='.$login;
 
       $keyargs_content = array
       (
-        get_l10n_args('User: %s', $username),
+        get_l10n_args('User: %s', $login),
         get_l10n_args('Email: %s', $_POST['mail_address']),
         get_l10n_args('', ''),
@@ -174 +173 @@
       pwg_mail_notification_admins
       (
-        get_l10n_args('Registration of %s', $username),
+        get_l10n_args('Registration of %s', $login),
         $keyargs_content
       );

trunk/language/en_UK/admin.lang.php

@@ -138 +138 @@
 $lang['Options'] = 'Options';
 $lang['Order alphanumerically'] = 'Order alphanumerically';
-$lang['Order by'] = 'Order by';
 $lang['Other private categories'] = 'Other private categories';
 $lang['Page banner'] = 'Page banner';
@@ -204 +203 @@
 $lang['You cannot move a category in its own sub category'] = 'You cannot move a category in its own sub category';
 $lang['You need to confirm deletion'] = 'You need to confirm deletion';
-$lang['actions'] = 'Actions';
-$lang['add keywords'] = 'add keywords';
 $lang['add tags'] = 'add tags';
 $lang['adviser'] = 'Adviser';
@@ -240 +237 @@
 $lang['dissociate from group'] = 'dissociate from group';
 $lang['edit category permissions'] = 'edit category permissions';
-$lang['edit'] = 'Edit';
 $lang['editcat_confirm'] = 'Category informations updated successfully.';
 $lang['editcat_uploadable'] = 'Authorize upload';
-$lang['elements per line'] = 'elements per line';
 $lang['elements per page'] = 'elements per page';
 $lang['elements'] = 'elements';
@@ -259 +254 @@
 $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_id URL parameter is missing'] = 'group_id URL parameter is missing';
 $lang['groups'] = 'Groups';
 $lang['history'] = 'History';
@@ -275 +269 @@
 $lang['maximum height'] = 'maximum height';
 $lang['maximum width'] = 'maximum width';
-$lang['metadata_basic'] = 'basic';
-$lang['metadata_exif'] = 'EXIF';
-$lang['metadata_iptc'] = 'IPTC';
 $lang['name'] = 'name';
 $lang['nbm_background_treatment_redirect_second'] = 'Execution time is out, treatment must be continue [Estmated time: %d second].';
@@ -325 +316 @@
 $lang['nbm_redirect_msg'] = 'Processing treatment.'."\n\n".'Please wait...';
 $lang['nbm_repost_submit'] = 'Continue processing treatment';
-$lang['nbm_send_check_all'] = 'Check All';
 $lang['nbm_send_complementary_mail_content'] = 'Complementary mail content';
 $lang['nbm_send_detailed_content'] = 'Add detailed content';
@@ -333 +323 @@
 $lang['nbm_send_options'] = 'Options';
 $lang['nbm_send_submit'] = 'Send';
-$lang['nbm_send_uncheck_all'] = 'Uncheck All';
 $lang['nbm_subscribe_col'] = 'Subscribed';
 $lang['nbm_subscribe_mode'] = 'Subscribe';
@@ -377 +366 @@
 $lang['remote_site_test_hint'] = 'test this remote site';
 $lang['remote_site_uncorrect_url'] = 'Remote site url must start by http or https and must only contain characters among "/", "a-zA-Z0-9", "-" or "_"';
-$lang['remove keyword'] = 'remove keyword';
 $lang['remove tags'] = 'remove tags';
 $lang['repair and optimize database'] = 'Repair and optimize database';
@@ -407 +395 @@
 $lang['title_default'] = 'PhpWebGallery administration';
 $lang['title_edit_cat'] = 'Edit a category';
-$lang['title_groups'] = 'Groups management';
-$lang['title_history'] = 'History';
-$lang['title_liste_users'] = 'Users list';
+$lang['title_groups'] = 'Group management';
+$lang['title_liste_users'] = 'User list';
 $lang['title_picmod'] = 'Modify informations about a picture';
 $lang['title_thumbnails'] = 'Thumbnail creation';
@@ -488 +475 @@
 $lang['users'] = 'Users';
 $lang['virtual_category'] = 'Virtual category';
-$lang['visitors'] = 'Visitors';
-$lang['w_day'] = 'Day';
 $lang['waiting'] = 'Waiting';
 $lang['is_default_group'] = 'default';
@@ -497 +482 @@
 $lang['web_services'] = 'Web services ';
 $lang['title_wscheck'] = ' Access management ';
-$lang['ws_set_status'] = ' Environment ';
-$lang['ws_enable'] = ' Enable ';
-$lang['ws_disable'] = ' Disable ';
-$lang['ws set to'] = ' Environment temporary set ';
 $lang['ws_failed_upd'] = ' -> <strong>Uncompleted demand</strong> ';
 $lang['ws_success_upd'] = ' -> Successfully completed ';
@@ -515 +496 @@
 $lang['ws_Comment'] = ' Comment ';
 $lang['Modify End from Now +'] = 'Modify End from Now + ';
-$lang['Confirmation'] = ' Confirmation ';
 $lang['Delete'] = ' Remove ';
 $lang['Confidential partner key'] = 'Confidential partner key';
@@ -546 +526 @@
 $lang['Pages seen'] = 'Pages seen';
 $lang['Pictures'] = 'Pictures';
-$lang['High quality'] = 'High quality';
 $lang['time'] = 'time';
 $lang['user'] = 'user';
 $lang['IP'] = 'IP';
 $lang['image'] = '';
-$lang['high quality'] = 'high quality';
 $lang['section'] = 'section';
 $lang['tags'] = 'tags';
@@ -594 +572 @@
 $lang['c13y_Correction_applied_error'] = 'Correction applied with error';
 $lang['c13y_anomaly_count'] = '%d anomaly has been detected.';
-$lang['c13y_anomalies_count'] = '%d anomalies has been detected.';
+$lang['c13y_anomalies_count'] = '%d anomalies have been detected.';
 $lang['c13y_anomaly_corrected_count'] = '%d anomaly has been corrected.';
-$lang['c13y_anomalies_corrected_count'] = '%d anomalies has been detected corrected.';
-$lang['c13y_anomaly_not_corrected_count'] = '%d anomaly hasn\'t been corrected.';
-$lang['c13y_anomalies_not_corrected_count'] = '%d anomalies hasn\'t been corrected.';
+$lang['c13y_anomalies_corrected_count'] = '%d anomalies have been detected corrected.';
+$lang['c13y_anomaly_not_corrected_count'] = '%d anomaly has not been corrected.';
+$lang['c13y_anomalies_not_corrected_count'] = '%d anomalies have not been corrected.';
 $lang['c13y_more_info'] = 'Go to %s or %s for more informations';
 $lang['c13y_more_info_forum'] = 'the forum';
@@ -604 +582 @@
 $lang['c13y_exif_anomaly'] = '%s value is not correct file because exif are not supported';
 $lang['c13y_exif_correction'] = '%s must be to set to false in your config_local.inc.php file';
-$lang['c13y_guest_non_existent'] = 'Main "guest" user don\'t exist any more';
+$lang['c13y_guest_non_existent'] = 'Main "guest" user does not exist';
 $lang['c13y_bad_guest_status'] = 'Main "guest" user status is incorrect';
-$lang['c13y_default_non_existent'] = 'Default user don\'t exist any more';
-$lang['c13y_webmaster_non_existent'] = 'Main "webmaster" user don\'t exist any more';
+$lang['c13y_default_non_existent'] = 'Default user does not exist';
+$lang['c13y_webmaster_non_existent'] = 'Main "webmaster" user does not exist';
 $lang['c13y_bad_webmaster_status'] = 'Main "webmaster" user status is incorrect';
 $lang['c13y_user_created'] = 'User "%s" created with "%s" like password';
@@ -626 +604 @@
 $lang['Level 8'] = 'Admins';
 $lang['c13y_maintenance'] = 'Reinitialize check integrity';
-$lang['c13y_check_all'] = 'Check all';
-$lang['c13y_uncheck_all'] = 'Uncheck all';
+$lang['Check all'] = 'Check all';
+$lang['Uncheck all'] = 'Uncheck all';
 $lang['c13y_check_auto'] = 'Check automatic corrections';
 $lang['c13y_submit_correction'] = 'Apply selected corrections';
@@ -635 +613 @@
 $lang['c13y_ignore_msg2'] = 'Correction the anomaly will cancel the fact that it\'s ignored';
 $lang['c13y_anomaly_ignored_count'] = '%d anomaly has been ignored.';
-$lang['c13y_anomalies_ignored_count'] = '%d anomalies has been ignored.';
+$lang['c13y_anomalies_ignored_count'] = '%d anomalies have been ignored.';
 
 $lang['plugins_need_update'] = 'Plugins which need upgrade';
@@ -646 +624 @@
 $lang['plugins_download'] = 'Download file';
 $lang['plugins_description'] = '<b>Version:</b> %s<br><br><b>Date:</b> %s<br><br>%s';
-$lang['plugins_tab_list'] = 'Plugins list';
+$lang['plugins_tab_list'] = 'Plugin list';
 $lang['plugins_tab_update'] = 'Check for updates';
 $lang['plugins_tab_new'] = 'Other plugins';

trunk/language/en_UK/common.lang.php

@@ -276 +276 @@
 $lang['reg_err_pass'] = 'please enter your password again';
 $lang['register'] = 'register';
-$lang['register_page_title'] = 'Registration';
-$lang['register_title'] = 'Registration';
 $lang['remember_me'] = 'Auto login';
 $lang['remove this tag'] = 'remove this tag from the list';
@@ -313 +311 @@
 $lang['theme'] = 'Interface theme';
 $lang['thumbnails'] = 'Thumbnails';
-$lang['title_comments'] = 'Users comments';
 $lang['title_menu'] = 'Menu';
 $lang['title_send_mail'] = 'A comment on your site';
@@ -337 +334 @@
 $lang['useful when password forgotten'] = 'useful when password forgotten';
 /* DEPRECATED TO REMOVE AFTER ALL TEMPLATE CHANGE USE 'Yes' */ $lang['yes'] = 'yes';
-$lang['page_end'] = 'Page bottom';
 $lang['qsearch'] = 'Quick search';
 $lang['Connected user: %s'] = 'Connected user: %s';

trunk/language/es_ES/admin.lang.php

@@ -137 +137 @@
 $lang['Options'] = 'Opciones';
 $lang['Order alphanumerically'] = 'Ordenar alfabético - numéricamente';
-$lang['Order by'] = 'Clasificar según';
 $lang['Other private categories'] = 'Otras categorías particulares';
 $lang['Page banner'] = 'Bandera de las páginas';
@@ -203 +202 @@
 $lang['You cannot move a category in its own sub category'] = 'Usted no puede desplazar una categoría en su propia subcategoría';
 $lang['You need to confirm deletion'] = 'Usted debe confirmar la supresión';
-$lang['actions'] = 'Acciones';
-$lang['add keywords'] = 'Añadir palabras-llaves';
 $lang['add tags'] = 'Añadir los tags';
 $lang['adviser'] = 'Consejero';
@@ -239 +236 @@
 $lang['dissociate from group'] = 'Disociar el grupo';
 $lang['edit category permissions'] = 'Modificar los permisos de la categoría';
-$lang['edit'] = 'Modificar';
 $lang['editcat_confirm'] = 'Las informaciones de la categoría han sido puestas al día con éxito.';
 $lang['editcat_uploadable'] = 'Autorizar el añadido de imágenes';
-$lang['elements per line'] = 'Elementos por línea';
 $lang['elements per page'] = 'Elementos por página';
 $lang['elements'] = 'Elementos';
@@ -258 +253 @@
 $lang['group_add_error1'] = 'El nombre del grupo no debe contener "or \' y no debe estar vacío.';
 $lang['group_add_error2'] = 'Este nombre es ya utilizado por otro grupo.';
-$lang['group_id URL parameter is missing'] = 'Falta el parámetro de URL "group_id" ';
 $lang['groups'] = 'Grupos';
 $lang['history'] = 'Reseña histórica';
@@ -274 +268 @@
 $lang['maximum height'] = 'Altura máxima';
 $lang['maximum width'] = 'Anchura máxima';
-$lang['metadata_basic'] = 'básico';
-$lang['metadata_exif'] = 'EXIF';
-$lang['metadata_iptc'] = 'IPTC';
 $lang['name'] = 'nombre';
 $lang['nbm_background_treatment_redirect_second'] = 'Ser sobrepasado el tiempo de ejecución, el tratamiento debe continuar [el Tiempo estimado: %d el segundo].';
@@ -324 +315 @@
 $lang['nbm_redirect_msg'] = 'Tratamiento corriente.'."\n".'Por favor, espere...';
 $lang['nbm_repost_submit'] = 'Continuar el tratamiento corriente...';
-$lang['nbm_send_check_all'] = 'Todo verificado';
 $lang['nbm_send_complementary_mail_content'] = 'Contenido complementario del mail';
 $lang['nbm_send_detailed_content'] = 'Añadido de un contenido detallado';
@@ -332 +322 @@
 $lang['nbm_send_options'] = 'Opciones';
 $lang['nbm_send_submit'] = 'Enviar';
-$lang['nbm_send_uncheck_all'] = 'Soltar todo';
 $lang['nbm_subscribe_col'] = 'Inscritos';
 $lang['nbm_subscribe_mode'] = 'Inscripción';
@@ -377 +366 @@
 $lang['remote_site_test_hint'] = 'testar este sitio distante';
 $lang['remote_site_uncorrect_url'] = 'EL URL del sitio distante debe comenzar por "http " o "https" y debe contener carácteres sólo entre "/", " a- zA-Z0-9 ", "-" o "_"';
-$lang['remove keyword'] = 'suprimir palabra-clave';
 $lang['remove tags'] = 'suprimir los tags';
 $lang['repair and optimize database'] = 'Reparar y optimizar la base de datos';
@@ -408 +396 @@
 $lang['title_edit_cat'] = 'Modificar una categoría';
 $lang['title_groups'] = 'Gestión de los grupos';
-$lang['title_history'] = 'Reseña histórica';
 $lang['title_liste_users'] = 'Lista utilizadores';
 $lang['title_picmod'] = 'Modificar las informaciones de una imagen';
@@ -488 +475 @@
 $lang['users'] = 'Utilizadores';
 $lang['virtual_category'] = 'Categoría virtual';
-$lang['visitors'] = 'Visitadores';
-$lang['w_day'] = 'Día';
 $lang['waiting'] = 'En espera';
 $lang['is_default_group'] = 'por defecto';
@@ -497 +482 @@
 $lang['web_services'] = 'Servicios Web ';
 $lang['title_wscheck'] = ' Gestión de los accesos ';
-$lang['ws_set_status'] = ' Medio ambiente ';
-$lang['ws_enable'] = ' Activo ';
-$lang['ws_disable'] = ' Inactivo ';
-$lang['ws set to'] = ' Modificar temporalmente el medio ambiente ';
 $lang['ws_failed_upd'] = ' -> <strong>Operación no realizada</strong> ';
 $lang['ws_success_upd'] = ' -> Acción realizada correctamente ';
@@ -515 +496 @@
 $lang['ws_Comment'] = ' Comentario ';
 $lang['Modify End from Now +'] = 'Modificar el Fin por este instante + ';
-$lang['Confirmation'] = ' Confirmación ';
 $lang['Delete'] = ' Retirada ';
 $lang['Confidential partner key'] = 'Llave confidencial';
@@ -550 +530 @@
 $lang['Pages seen'] = 'Páginas vistas';
 $lang['Pictures'] = 'Imágenes';
-$lang['High quality'] = 'Alta resolución';
 $lang['time'] = 'Hora';
 $lang['user'] = 'utilizador';
 $lang['IP'] = 'IP';
 $lang['image'] = 'Imágenes';
-$lang['high quality'] = 'alta resolución';
 $lang['section'] = 'sección';
 $lang['tags'] = 'tags';
@@ -630 +608 @@
 $lang['Level 8'] = 'Admins';
 $lang['c13y_maintenance'] = 'Reinicializar los controles de integridad';
-$lang['c13y_check_all'] = 'Todo verificado';
-$lang['c13y_uncheck_all'] = 'Soltar todo';
+$lang['Check all'] = 'Todo verificado';
+$lang['Uncheck all'] = 'Soltar todo';
 $lang['c13y_check_auto'] = 'Puntear las correcciones automáticas';
 $lang['c13y_submit_correction'] = 'Aplicar las correcciones seleccionadas';

trunk/language/es_ES/common.lang.php

@@ -276 +276 @@
 $lang['reg_err_pass'] = 'Por favor, escriba nuevamente su contraseña';
 $lang['register'] = 'Inscríbase';
-$lang['register_page_title'] = 'Inscripción';
-$lang['register_title'] = 'Inscripción';
 $lang['remember_me'] = 'Conexión automática';
 $lang['remove this tag'] = 'quitar este tag de la lista';
@@ -313 +311 @@
 $lang['theme'] = 'Tema';
 $lang['thumbnails'] = 'Miniaturas';
-$lang['title_comments'] = 'Comentarios usuarios';
 $lang['title_menu'] = 'Menú';
 $lang['title_send_mail'] = 'Una opinión sobre esta pagina';
@@ -337 +334 @@
 $lang['useful when password forgotten'] = 'Útil en caso de perdida de contraseña';
 $lang['yes'] = 'Si';
-$lang['page_end'] = 'Por la bajura de página';
 $lang['qsearch'] = 'Búsqueda rápida';
 $lang['Connected user: %s'] = 'Utilizador conectado: %s';

trunk/language/fr_FR/admin.lang.php

@@ -138 +138 @@
 $lang['Options'] = 'Options';
 $lang['Order alphanumerically'] = 'Ordonner alphabético-numériquement';
-$lang['Order by'] = 'Trier selon';
 $lang['Other private categories'] = 'Autres catégories privées';
 $lang['Page banner'] = 'Bannière des pages';
@@ -161 +160 @@
 $lang['Random picture'] = 'Au hasard';
 $lang['Rate date'] = 'Date de notation';
-$lang['Rating by guests'] = 'Notation par les visiteurs';
+$lang['Rating by guests'] = 'Notation par les invités';
 $lang['Rating'] = 'Notation';
 $lang['Reject All'] = 'Tout rejeter';
@@ -204 +203 @@
 $lang['You cannot move a category in its own sub category'] = 'Vous ne pouvez pas déplacer une catégorie dans sa propre sous-catégorie';
 $lang['You need to confirm deletion'] = 'Vous devez confirmer la suppression';
-$lang['actions'] = 'Actions';
-$lang['add keywords'] = 'ajouter des mots-clef';
 $lang['add tags'] = 'ajouter les tags';
 $lang['adviser'] = 'Conseiller';
@@ -240 +237 @@
 $lang['dissociate from group'] = 'dissocier du groupe';
 $lang['edit category permissions'] = 'Modifier les permissions de la catégorie';
-$lang['edit'] = 'Modifier';
 $lang['editcat_confirm'] = 'Les informations de la catégorie ont été mises à jour avec succès.';
 $lang['editcat_uploadable'] = 'Autoriser l\'ajout d\'images';
-$lang['elements per line'] = 'éléments par ligne';
 $lang['elements per page'] = 'éléments par page';
 $lang['elements'] = 'éléments';
@@ -259 +254 @@
 $lang['group_add_error1'] = 'Le nom du groupe ne doit pas contenir " or \' et ne doit pas être vide.';
 $lang['group_add_error2'] = 'Ce nom est déjà utilisé par un autre groupe.';
-$lang['group_id URL parameter is missing'] = 'Le paramètre d\'URL "group_id" est manquant';
 $lang['groups'] = 'Groupes';
 $lang['history'] = 'Historique';
@@ -275 +269 @@
 $lang['maximum height'] = 'hauteur maximum';
 $lang['maximum width'] = 'largeur maximum';
-$lang['metadata_basic'] = 'basique';
-$lang['metadata_exif'] = 'EXIF';
-$lang['metadata_iptc'] = 'IPTC';
 $lang['name'] = 'nom';
 $lang['nbm_background_treatment_redirect_second'] = 'Le temps d\'exécution étant dépassé, le traitement doit continuer [Temps estimé: %d second].';
@@ -325 +316 @@
 $lang['nbm_redirect_msg'] = 'Traitement en cours.'."\n".'Veuillez patienter...';
 $lang['nbm_repost_submit'] = 'Continuer le traitement en cours...';
-$lang['nbm_send_check_all'] = 'Tout cocher';
 $lang['nbm_send_complementary_mail_content'] = 'Contenu complémentaire du mail';
 $lang['nbm_send_detailed_content'] = 'Ajout d\'un contenu détaillé';
@@ -333 +323 @@
 $lang['nbm_send_options'] = 'Options';
 $lang['nbm_send_submit'] = 'Envoyer';
-$lang['nbm_send_uncheck_all'] = 'Tout décocher';
 $lang['nbm_subscribe_col'] = 'Inscrits';
 $lang['nbm_subscribe_mode'] = 'Inscription';
@@ -377 +366 @@
 $lang['remote_site_test_hint'] = 'tester ce site distant';
 $lang['remote_site_uncorrect_url'] = 'L\'URL d\'un site distant doit commencer par "http" ou "https" et ne doit contenir des caractères que parmi "/", "a-zA-Z0-9", "-" ou "_"';
-$lang['remove keyword'] = 'supprimer mot-clef';
 $lang['remove tags'] = 'supprimer les tags';
 $lang['repair and optimize database'] = 'Réparer et optimiser la base de données';
@@ -408 +396 @@
 $lang['title_edit_cat'] = 'Modifier une catégorie';
 $lang['title_groups'] = 'Gestion des groupes';
-$lang['title_history'] = 'Historique';
 $lang['title_liste_users'] = 'Liste des utilisateurs';
 $lang['title_picmod'] = 'Modifier les informations d\'une image';
@@ -488 +475 @@
 $lang['users'] = 'Utilisateurs';
 $lang['virtual_category'] = 'Catégorie virtuelle';
-$lang['visitors'] = 'Visiteurs';
-$lang['w_day'] = 'Jour';
 $lang['waiting'] = 'En attente';
 $lang['is_default_group'] = 'par défaut';
@@ -497 +482 @@
 $lang['web_services'] = 'Services Web ';
 $lang['title_wscheck'] = ' Gestion des accès ';
-$lang['ws_set_status'] = ' Environnement ';
-$lang['ws_enable'] = ' Actif ';
-$lang['ws_disable'] = ' Inactif ';
-$lang['ws set to'] = ' Modifier temporairement l\'environnement en ';
 $lang['ws_failed_upd'] = ' -> <strong>Opération non réalisée</strong> ';
 $lang['ws_success_upd'] = ' -> Action réalisée correctement ';
@@ -515 +496 @@
 $lang['ws_Comment'] = ' Commentaire ';
 $lang['Modify End from Now +'] = 'Modifier la Fin par cet instant + ';
-$lang['Confirmation'] = ' Confirmation ';
 $lang['Delete'] = ' Retrait ';
 $lang['Confidential partner key'] = 'Clé confidentielle';
@@ -546 +526 @@
 $lang['Pages seen'] = 'Pages vues';
 $lang['Pictures'] = 'Images';
-$lang['High quality'] = 'Haute résolution';
 $lang['time'] = 'heure';
 $lang['user'] = 'utilisateur';
 $lang['IP'] = 'IP';
 $lang['image'] = 'images';
-$lang['high quality'] = 'haute résolution';
 $lang['section'] = 'section';
 $lang['tags'] = 'tags';
@@ -626 +604 @@
 $lang['Level 8'] = 'Admins';
 $lang['c13y_maintenance'] = 'Réinitialiser les contrôles d\'intégrité';
-$lang['c13y_check_all'] = 'Tout cocher';
-$lang['c13y_uncheck_all'] = 'Tout décocher';
+$lang['Check all'] = 'Tout cocher';
+$lang['Uncheck all'] = 'Tout décocher';
 $lang['c13y_check_auto'] = 'Cocher les corrections automatiques';
 $lang['c13y_submit_correction'] = 'Appliquer les corrections sélectionnées';

trunk/language/fr_FR/common.lang.php

@@ -276 +276 @@
 $lang['reg_err_pass'] = 'S\'il vous plaît, entrez à nouveau votre mot de passe';
 $lang['register'] = 's\'enregistrer';
-$lang['register_page_title'] = 'Enregistrement';
-$lang['register_title'] = 'Enregistrement';
 $lang['remember_me'] = 'Connexion auto';
 $lang['remove this tag'] = 'enlever ce tag de la liste';
@@ -313 +311 @@
 $lang['theme'] = 'Thème de l\'interface';
 $lang['thumbnails'] = 'Miniatures';
-$lang['title_comments'] = 'Commentaires utilisateurs';
 $lang['title_menu'] = 'Menu';
 $lang['title_send_mail'] = 'Un commentaire sur le site';
@@ -337 +334 @@
 $lang['useful when password forgotten'] = 'utile en cas d\'oubli de mot de passe';
 $lang['yes'] = 'Oui';
-$lang['page_end'] = 'Bas de page';
 $lang['qsearch'] = 'Recherche rapide';
 $lang['Connected user: %s'] = 'Utilisateur connecté: %s';

trunk/language/nl_NL/admin.lang.php

@@ -138 +138 @@
 $lang['Options'] = 'Opties';
 $lang['Order alphanumerically'] = 'sorteer alphanumeriek';
-$lang['Order by'] = 'sorteer op';
 $lang['Other private categories'] = 'Andere private categorieën';
 $lang['Page banner'] = 'Pagina banner';
@@ -204 +203 @@
 $lang['You cannot move a category in its own sub category'] = 'Je kan een categorie niet verplaatsen in zijn eigen sub categorie';
 $lang['You need to confirm deletion'] = 'Je moet de verwijdering bevestigen';
-$lang['actions'] = 'Acties';
-$lang['add keywords'] = 'Toevoegen sleutelwoorden';
 $lang['add tags'] = 'Toevoegen tags';
 $lang['adviser'] = 'Adviseer';
@@ -240 +237 @@
 $lang['dissociate from group'] = 'verwijder link naar groep';
 $lang['edit category permissions'] = 'bewerk categorie rechten';
-$lang['edit'] = 'Bewerk(en)';
 $lang['editcat_confirm'] = 'Categorie informatie is met succes bijgewerkt.';
 $lang['editcat_uploadable'] = 'Toestaan van upload';
-$lang['elements per line'] = 'elementen per regel';
 $lang['elements per page'] = 'elementen per pagina';
 $lang['elements'] = 'elementen';
@@ -259 +254 @@
 $lang['group_add_error1'] = 'De naam van de groep mag geen spatie bevatten of leeg zijn.';
 $lang['group_add_error2'] = 'Deze naam is al in gebruik door een andere groep.';
-$lang['group_id URL parameter is missing'] = 'group_id URL parameter is onbekend';
 $lang['groups'] = 'Groepen';
 $lang['history'] = 'Geschiedenis';
@@ -275 +269 @@
 $lang['maximum height'] = 'maximale hoogte';
 $lang['maximum width'] = 'maximale breedte';
-$lang['metadata_basic'] = 'basis';
-$lang['metadata_exif'] = 'EXIF';
-$lang['metadata_iptc'] = 'IPTC';
 $lang['name'] = 'naam';
 $lang['nbm_background_treatment_redirect_second'] = 'Executie tijd is om, treatment moet verder gaan [Verwachte tijd: %d seconden].';
@@ -325 +316 @@
 $lang['nbm_redirect_msg'] = 'Bezig met voltooien van de bewerking.'."\n\n".'Even wachten...';
 $lang['nbm_repost_submit'] = 'Verder gaan met de bewerking';
-$lang['nbm_send_check_all'] = 'Selecteer Alles';
 $lang['nbm_send_complementary_mail_content'] = 'Bijkomende mailinhoud';
 $lang['nbm_send_detailed_content'] = 'Toevoegen gedetaileerde inhoud';
@@ -333 +323 @@
 $lang['nbm_send_options'] = 'Opties';
 $lang['nbm_send_submit'] = 'Stuur';
-$lang['nbm_send_uncheck_all'] = 'Deselecteer Alles';
 $lang['nbm_subscribe_col'] = 'Ingeschreven';
 $lang['nbm_subscribe_mode'] = 'Inschrijven';
@@ -378 +367 @@
 $lang['remote_site_test_hint'] = 'test deze remote site';
 $lang['remote_site_uncorrect_url'] = 'Remote site url moet starten met http of https end moet allen bestaan uit characters met "/", "a-zA-Z0-9", "-" or "_"';
-$lang['remove keyword'] = 'verwijder sleutelwoord';
 $lang['remove tags'] = 'verwijder tags';
 $lang['repair and optimize database'] = 'repareer en optimaliseer de database';
@@ -409 +397 @@
 $lang['title_edit_cat'] = 'Bewerk een categorie';
 $lang['title_groups'] = 'Groepsbeheer';
-$lang['title_history'] = 'Geschiedenis';
 $lang['title_liste_users'] = 'Gebruikerslijst';
 $lang['title_picmod'] = 'Verander de informatie van een plaatje';
@@ -489 +476 @@
 $lang['users'] = 'Gebruikers';
 $lang['virtual_category'] = 'Virtuele categoriën';
-$lang['visitors'] = 'Bezoekers';
-$lang['w_day'] = 'Dag';
 $lang['waiting'] = 'Wachten';
 $lang['is_default_group'] = 'standaard';
@@ -498 +483 @@
 $lang['web_services'] = 'Web services ';
 $lang['title_wscheck'] = ' Toegangsbeheer';
-$lang['ws_set_status'] = ' Omgeving ';
-$lang['ws_enable'] = ' Inschakelen ';
-$lang['ws_disable'] = ' Uitschakelen ';
-$lang['ws set to'] = ' Tijdelijk ingesteld op';
 $lang['ws_failed_upd'] = ' -> <strong>Niet voltooide eis</strong> ';
 $lang['ws_success_upd'] = ' -> Succesvol afgerond ';
@@ -516 +497 @@
 $lang['ws_Comment'] = ' Commentaar ';
 $lang['Modify End from Now +'] = 'Verander eind vanaf hier + ';
-$lang['Confirmation'] = ' Bevestiging ';
 $lang['Delete'] = ' Verwijderen ';
 $lang['Confidential partner key'] = 'Vertrouwelijke partner sleutel';
@@ -551 +531 @@
 $lang['Pages seen'] = 'Pagina\'s bekeken';
 $lang['Pictures'] = 'Afbeeldingen';
-$lang['High quality'] = 'Hoge kwaliteit';
 $lang['time'] = 'tijd';
 $lang['user'] = 'gebruiker';
 $lang['IP'] = 'IP';
 $lang['image'] = '';
-$lang['high quality'] = 'hoge kwaliteit';
 $lang['section'] = 'sectie';
 $lang['tags'] = 'tags';
@@ -632 +610 @@
 $lang['Level 8'] = 'Admins';
 /* TODO */ $lang['c13y_maintenance'] = 'Reinitialize check integrity';
-$lang['c13y_check_all'] = 'Selecteer alles';
-$lang['c13y_uncheck_all'] = 'Deselecteer alles';
+$lang['Check all'] = 'Selecteer alles';
+$lang['Uncheck all'] = 'Deselecteer alles';
 /* TODO */ $lang['c13y_check_auto'] = 'Check automatic corrections';
 $lang['c13y_submit_correction'] = 'Pas geselecteerde correcties toe';

trunk/language/nl_NL/common.lang.php

@@ -276 +276 @@
 $lang['reg_err_pass'] = 'vul uw wachtwoord nogmaals in';
 $lang['register'] = 'registreer';
-$lang['register_page_title'] = 'Registratie';
-$lang['register_title'] = 'Registratie';
 $lang['remember_me'] = 'Auto login';
 $lang['remove this tag'] = 'verwijder de tag van de lijst';
@@ -313 +311 @@
 $lang['theme'] = 'thema';
 $lang['thumbnails'] = 'Thumbnails';
-$lang['title_comments'] = 'Gebruikers commentaar';
 $lang['title_menu'] = 'Menu';
 $lang['title_send_mail'] = 'commentaar op je site';
@@ -337 +334 @@
 $lang['useful when password forgotten'] = 'handig bij het vergeten van je wachtwoord';
 $lang['yes'] = 'Ja';
-$lang['page_end'] = 'Pagina eind';
 $lang['qsearch'] = 'Snel zoeken';
 $lang['Connected user: %s'] = 'Aangemeld als gebruiker: %s';

trunk/plugins/event_tracer/tracer_admin.tpl

@@ -9 +9 @@
 <b>Note that $conf['show_queries'] must be true.</b>
 </p>
-<form method="post" action="{$EVENT_TRACER_F_ACTION}" class="general">
+<form method="post" action="" class="general">
 <fieldset>
         <legend>Event Tracer</legend>

trunk/profile.php

@@ -3 +3 @@
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | file          : $Id$
@@ -55 +55 @@
     $userdata );
 
-  $template->assign('U_HOME', make_index_url());
-
   // +-----------------------------------------------------------------------+
   // |                             errors display                            |
@@ -71 +69 @@
 
 //------------------------------------------------------ update & customization
-function save_profile_from_post(&$userdata, &$errors)
+function save_profile_from_post($userdata, &$errors)
 {
   global $conf;
   $errors = array();
-  
+
   if (!isset($_POST['validate']))
   {
     return false;
+  }
+
+  $special_user = in_array($userdata['id'], array($conf['guest_id'], $conf['default_user_id']));
+  if ($special_user)
+  {
+    unset($_POST['mail_address'],
+          $_POST['password'],
+          $_POST['use_new_pwd'],
+          $_POST['passwordConf']
+          );
   }
 
@@ -159 +167 @@
 
       $data = array();
-      $data{$conf['user_fields']['id']} = $_POST['userid'];
+      $data{$conf['user_fields']['id']} = $userdata['id'];
       $data{$conf['user_fields']['email']} = $_POST['mail_address'];
 
@@ -183 +191 @@
 
     $data = array();
-    $data['user_id'] = $_POST['userid'];
+    $data['user_id'] = $userdata['id'];
 
     foreach ($fields as $field)
@@ -196 +204 @@
                  array($data));
 
-    trigger_action( 'loc_user_profile_updated', $_POST['userid'] );
+    trigger_action( 'save_profile_from_post', $userdata['id'] );
     
     if (!empty($_POST['redirect']))
@@ -215 +223 @@
   $template->assign('radio_options',
     array(
-      'true' => l10n('yes'),
-      'false' => l10n('no')));
+      'true' => l10n('Yes'),
+      'false' => l10n('No')));
 
   $template->assign(
     array(
       'USERNAME'=>$userdata['username'],
-      'USERID'=>$userdata['id'],
       'EMAIL'=>get_email_address_as_display_text(@$userdata['email']),
       'NB_IMAGE_LINE'=>$userdata['nb_image_line'],
@@ -256 +263 @@
   $template->assign('language_options', $language_options);
 
-  if (!(in_array($userdata['id'], array($conf['guest_id'], $conf['default_user_id']))))
-  {
-    $template->assign('not_special_user', true);
-    $template->assign('in_admin', defined('IN_ADMIN'));
-  }
-
+  $special_user = in_array($userdata['id'], array($conf['guest_id'], $conf['default_user_id']));
+  $template->assign('SPECIAL_USER', $special_user);
+  $template->assign('IN_ADMIN', defined('IN_ADMIN'));
+
+  // allow plugins to add their own form data to content
+  trigger_action( 'load_profile_in_template', $userdata );
+  
   $template->assign_var_from_handle('PROFILE_CONTENT', 'profile_content');
 }

trunk/register.php

@@ -71 +71 @@
 // Start output of page
 //
-$title= l10n('register_page_title');
+$title= l10n('Registration');
 $page['body_id'] = 'theRegisterPage';
 include(PHPWG_ROOT_PATH.'include/page_header.php');

trunk/template/yoga/admin/cat_list.tpl

@@ -7 +7 @@
   <p>
     {'cat_add'|@translate} : <input type="text" name="virtual_name" />
-    <input class="submit" type="submit" value="{'submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED} />
+    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED} />
     {if count($categories)>9 }
-    <a href="#EoP" class="button"><img src="{$themeconf.icon_dir}/page_end.png" class="button" alt="{'page_end'|@translate}" /></a>
+    <a href="#EoP" class="button"><img src="{$themeconf.icon_dir}/page_end.png" class="button" alt="page_end" /></a>
     {/if}
   </p>

trunk/template/yoga/admin/check_integrity.tpl

@@ -57 +57 @@
         <p>
           {if $c13y_show_submit_ignore}
-              <a href="#" onclick="SelectAll(document.getElementById('c13y')); return false;">{'c13y_check_all'|@translate}</a>
-            / <a href="#" onclick="DeselectAll(document.getElementById('c13y')); return false;">{'c13y_uncheck_all'|@translate}</a>
+              <a href="#" onclick="SelectAll(document.getElementById('c13y')); return false;">{'Check all'|@translate}</a>
+            / <a href="#" onclick="DeselectAll(document.getElementById('c13y')); return false;">{'Uncheck all'|@translate}</a>
           {/if}
           {if isset($c13y_do_check)}

trunk/template/yoga/admin/notification_by_mail.tpl

@@ -25 +25 @@
         <td><label>{lang:nbm_send_html_mail}</label></td>
         <td>
-          <label><input type="radio" name="nbm_send_html_mail" value="true"  {param.SEND_HTML_MAIL_YES}/>{lang:yes}</label>
-          <label><input type="radio" name="nbm_send_html_mail" value="false" {param.SEND_HTML_MAIL_NO}/>{lang:no}</label>
+          <label><input type="radio" name="nbm_send_html_mail" value="true"  {param.SEND_HTML_MAIL_YES}/>{lang:Yes}</label>
+          <label><input type="radio" name="nbm_send_html_mail" value="false" {param.SEND_HTML_MAIL_NO}/>{lang:No}</label>
         </td>
       </tr>
@@ -39 +39 @@
         <td><label>{lang:nbm_send_detailed_content}</label></td>
         <td>
-          <label><input type="radio" name="nbm_send_detailed_content" value="true"  {param.SEND_DETAILED_CONTENT_YES}/>{lang:yes}</label>
-          <label><input type="radio" name="nbm_send_detailed_content" value="false" {param.SEND_DETAILED_CONTENT_NO}/>{lang:no}</label>
+          <label><input type="radio" name="nbm_send_detailed_content" value="true"  {param.SEND_DETAILED_CONTENT_YES}/>{lang:Yes}</label>
+          <label><input type="radio" name="nbm_send_detailed_content" value="false" {param.SEND_DETAILED_CONTENT_NO}/>{lang:No}</label>
         </td>
       </tr>
@@ -53 +53 @@
         </td>
         <td>
-          <label><input type="radio" name="nbm_send_recent_post_dates" value="true"  {param.SEND_RECENT_POST_DATES_YES}/>{lang:yes}</label>
-          <label><input type="radio" name="nbm_send_recent_post_dates" value="false" {param.SEND_RECENT_POST_DATES_NO}/>{lang:no}</label>
+          <label><input type="radio" name="nbm_send_recent_post_dates" value="true"  {param.SEND_RECENT_POST_DATES_YES}/>{lang:Yes}</label>
+          <label><input type="radio" name="nbm_send_recent_post_dates" value="false" {param.SEND_RECENT_POST_DATES_NO}/>{lang:No}</label>
         </td>
       </tr>
@@ -102 +102 @@
       </table>
       <p>
-          <a href="#" onclick="SelectAll(document.getElementById('notification_by_mail')); return false;">{lang:nbm_send_check_all}</a>
-        / <a href="#" onclick="DeselectAll(document.getElementById('notification_by_mail')); return false;">{lang:nbm_send_uncheck_all}</a>
+          <a href="#" onclick="SelectAll(document.getElementById('notification_by_mail')); return false;">{lang:Check all}</a>
+        / <a href="#" onclick="DeselectAll(document.getElementById('notification_by_mail')); return false;">{lang:Uncheck all}</a>
       </p>
     </fieldset>

trunk/template/yoga/admin/user_list.tpl

@@ -35 +35 @@
 
   <label>
-  {'Order by'|@translate}
+  {'Sort by'|@translate}
   {html_options name=order_by options=$order_options selected=$order_selected}
   </label>
@@ -63 +63 @@
     <th>{$title}</th>
     {/foreach}
-    <th>{'actions'|@translate}</th>
+    <th>{'Actions'|@translate}</th>
   </tr>
   {foreach from=$users item=user name=users_loop}
@@ -117 +117 @@
         <label><input type="radio" name="adviser" value="leave" checked="checked" /> {'leave'|@translate}</label>
         / {'set to'|@translate}
-        <label><input type="radio" name="adviser" value="true"  {$ADVISER_YES} />{'yes'|@translate}</label>
-        <label><input type="radio" name="adviser" value="false" {$ADVISER_NO}  />{'no'|@translate}</label>
+        <label><input type="radio" name="adviser" value="true"  {$ADVISER_YES} />{'Yes'|@translate}</label>
+        <label><input type="radio" name="adviser" value="false" {$ADVISER_NO}  />{'No'|@translate}</label>
       </td>
     </tr>
@@ -161 +161 @@
         <label><input type="radio" name="enabled_high" value="leave" checked="checked" /> {'leave'|@translate}</label>
         / {'set to'|@translate}
-        <label><input type="radio" name="enabled_high" value="true"  {$ENABLED_HIGH_YES} />{'yes'|@translate}</label>
-        <label><input type="radio" name="enabled_high" value="false" {$ENABLED_HIGH_NO}  />{'no'|@translate}</label>
+        <label><input type="radio" name="enabled_high" value="true"  {$ENABLED_HIGH_YES} />{'Yes'|@translate}</label>
+        <label><input type="radio" name="enabled_high" value="false" {$ENABLED_HIGH_NO}  />{'No'|@translate}</label>
       </td>
     </tr>
@@ -244 +244 @@
       <label><input type="radio" name="expand" value="leave" checked="checked" /> {'leave'|@translate}</label>
       / {'set to'|@translate}
-      <label><input type="radio" name="expand" value="true"  {$EXPAND_YES} />{'yes'|@translate}</label>
-      <label><input type="radio" name="expand" value="false" {$EXPAND_NO}  />{'no'|@translate}</label>
+      <label><input type="radio" name="expand" value="true"  {$EXPAND_YES} />{'Yes'|@translate}</label>
+      <label><input type="radio" name="expand" value="false" {$EXPAND_NO}  />{'No'|@translate}</label>
     </td>
   </tr>
@@ -254 +254 @@
       <label><input type="radio" name="show_nb_comments" value="leave" checked="checked" /> {'leave'|@translate}</label>
       / {'set to'|@translate}
-      <label><input type="radio" name="show_nb_comments" value="true" {$SHOW_NB_COMMENTS_YES} />{'yes'|@translate}</label>
-      <label><input type="radio" name="show_nb_comments" value="false" {$SHOW_NB_COMMENTS_NO} />{'no'|@translate}</label>
+      <label><input type="radio" name="show_nb_comments" value="true" {$SHOW_NB_COMMENTS_YES} />{'Yes'|@translate}</label>
+      <label><input type="radio" name="show_nb_comments" value="false" {$SHOW_NB_COMMENTS_NO} />{'No'|@translate}</label>
     </td>
   </tr>
@@ -264 +264 @@
       <label><input type="radio" name="show_nb_hits" value="leave" checked="checked" /> {'leave'|@translate}</label>
       / {'set to'|@translate}
-      <label><input type="radio" name="show_nb_hits" value="true" {$SHOW_NB_HITS_YES} />{'yes'|@translate}</label>
-      <label><input type="radio" name="show_nb_hits" value="false" {$SHOW_NB_HITS_NO} />{'no'|@translate}</label>
+      <label><input type="radio" name="show_nb_hits" value="true" {$SHOW_NB_HITS_YES} />{'Yes'|@translate}</label>
+      <label><input type="radio" name="show_nb_hits" value="false" {$SHOW_NB_HITS_NO} />{'No'|@translate}</label>
     </td>
   </tr>
@@ -304 +304 @@
 
 <p>
-  <input class="submit" type="submit" value="{'submit'|@translate}" name="pref_submit" {$TAG_INPUT_ENABLED} />
-  <input class="submit" type="reset" value="{'reset'|@translate}" name="pref_reset" />
+  <input class="submit" type="submit" value="{'Submit'|@translate}" name="pref_submit" {$TAG_INPUT_ENABLED} />
+  <input class="submit" type="reset" value="{'Reset'|@translate}" name="pref_reset" />
 </p>
 

trunk/template/yoga/index.tpl

@@ -29 +29 @@
 
       {if isset($U_SLIDESHOW) }
-      <li><a href="{$U_SLIDESHOW}" title="{'slideshow'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_slideshow.png" class="button" alt="{'slideshow'|@translate}"/></a></li>
+      <li><a href="{$U_SLIDESHOW}" title="{'slideshow'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_slideshow.png" class="button" alt="{'slideshow'|@translate}"/></a></li>
       {/if}
 
@@ -69 +69 @@
   </div> <!-- titrePage -->
 
-{if !empty($PLUGIN_INDEX_CONTENT_END)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if}
+{if !empty($PLUGIN_INDEX_CONTENT_BEGIN)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if}
 
 {if !empty($category_search_results) }

trunk/template/yoga/profile_content.tpl

@@ -3 +3 @@
 
   <fieldset>
-    <legend>{'register_title'|@translate}</legend>
-    <input type="hidden" name="userid" value="{$USERID}" />
+    <legend>{'Registration'|@translate}</legend>
     <input type="hidden" name="redirect" value="{$REDIRECT}" />
     <ul>
@@ -11 +10 @@
         {$USERNAME}
       </li>
-{if isset($not_special_user)}
+{if not $SPECIAL_USER} {* can modify password + email*}
       <li>
         <span class="property">
@@ -18 +17 @@
         <input type="text" name="mail_address" id="mail_address" value="{$EMAIL}">
       </li>
-{if !$in_admin}
+{if not $IN_ADMIN} {* admins do not need old password*}
       <li>
         <span class="property">
@@ -104 +103 @@
 
   <p class="bottomButtons">
-    <input class="submit" type="submit" name="validate" value="{'submit'|@translate}">
-    <input class="submit" type="reset" name="reset" value="{'reset'|@translate}">
+    <input class="submit" type="submit" name="validate" value="{'Submit'|@translate}">
+    <input class="submit" type="reset" name="reset" value="{'Reset'|@translate}">
   </p>