- security fix (profile)

- les langues a la hache
- fix some copy/paste errors

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

6 files changed, 33 insertions, 34 deletions

diff --git a/template/yoga/admin/cat_list.tpl b/template/yoga/admin/cat_list.tpl
index c7a83f8d7..b408a5a50 100644
--- a/template/yoga/admin/cat_list.tpl
+++ b/template/yoga/admin/cat_list.tpl
@@ -6,9 +6,9 @@
 <form id="addVirtual" action="{$F_ACTION}" method="post">
   <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>
 </form>
diff --git a/template/yoga/admin/check_integrity.tpl b/template/yoga/admin/check_integrity.tpl
index 7bbd1183f..1e8c65db3 100644
--- a/template/yoga/admin/check_integrity.tpl
+++ b/template/yoga/admin/check_integrity.tpl
@@ -56,8 +56,8 @@
 
         <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)}
             / <a href="#" onclick="DeselectAll(document.getElementById('c13y'));
diff --git a/template/yoga/admin/notification_by_mail.tpl b/template/yoga/admin/notification_by_mail.tpl
index ec04852cb..3afa4161b 100644
--- a/template/yoga/admin/notification_by_mail.tpl
+++ b/template/yoga/admin/notification_by_mail.tpl
@@ -24,8 +24,8 @@
       <tr>
         <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>
       <tr>
@@ -38,8 +38,8 @@
       <tr>
         <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>
      <tr>
@@ -52,8 +52,8 @@
           <br><i><small>{lang:nbm_info_send_recent_post_dates}</small></i>
         </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>
     </table>
@@ -101,8 +101,8 @@
         <!-- END user_send_mail -->
       </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>
 
diff --git a/template/yoga/admin/user_list.tpl b/template/yoga/admin/user_list.tpl
index ffb0d651e..25b0e705e 100644
--- a/template/yoga/admin/user_list.tpl
+++ b/template/yoga/admin/user_list.tpl
@@ -34,7 +34,7 @@
   </label>
 
   <label>
-  {'Order by'|@translate}
+  {'Sort by'|@translate}
   {html_options name=order_by options=$order_options selected=$order_selected}
   </label>
 
@@ -62,7 +62,7 @@
     {foreach from=$cpl_title_user item=title}
     <th>{$title}</th>
     {/foreach}
-    <th>{'actions'|@translate}</th>
+    <th>{'Actions'|@translate}</th>
   </tr>
   {foreach from=$users item=user name=users_loop}
   <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
@@ -116,8 +116,8 @@
       <td>
         <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>
     {/if}
@@ -160,8 +160,8 @@
       <td>
         <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>
 
@@ -243,8 +243,8 @@
     <td>
       <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>
 
@@ -253,8 +253,8 @@
     <td>
       <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>
 
@@ -263,8 +263,8 @@
     <td>
       <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>
 
@@ -303,8 +303,8 @@
 </p>
 
 <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>
 
 </form>
diff --git a/template/yoga/index.tpl b/template/yoga/index.tpl
index 081344925..b2ebef958 100644
--- a/template/yoga/index.tpl
+++ b/template/yoga/index.tpl
@@ -28,7 +28,7 @@
       {/if}
 
       {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}
 
       {if isset($U_MODE_FLAT) }
@@ -68,7 +68,7 @@
 
   </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) }
 <div style="font-size:16px;text-align:left;margin:10px">{'Category results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
diff --git a/template/yoga/profile_content.tpl b/template/yoga/profile_content.tpl
index 2be70857b..9cabf0a51 100644
--- a/template/yoga/profile_content.tpl
+++ b/template/yoga/profile_content.tpl
@@ -2,22 +2,21 @@
 <form method="post" name="profile" action="{$F_ACTION}" id="profile" class="properties">
 
   <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>
       <li>
         <span class="property">{'Username'|@translate}</span>
         {$USERNAME}
       </li>
-{if isset($not_special_user)}
+{if not $SPECIAL_USER} {* can modify password + email*}
       <li>
         <span class="property">
           <label for="mail_address">{'Email address'|@translate}</label>
         </span>
         <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">
           <label for="password">{'Password'|@translate}</label>
@@ -103,8 +102,8 @@
   </fieldset>
 
   <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>
 
 </form>