- new : external authentication in another users table. Previous users table

  is divided between users (common properties with any web application) and
  user_infos (phpwebgallery specific informations). External table and
  fields can be configured.

- modification : profile.php is not reachable through administration anymore
  (not useful).

- modification : in profile.php, current password is mandatory only if user
  tries to change his password. Username can't be changed.

- deletion : of obsolete functions get_user_restrictions,
  update_user_restrictions, get_user_all_restrictions, is_user_allowed,
  update_user

- modification : $user['forbidden_categories'] equals at least "-1" so that
  category_id NOT IN ($user['forbidden_categories']) can always be used.

- modification : user_forbidden table becomes user_cache so that not only
  restriction informations can be stored in this table.


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

2 files changed, 28 insertions, 27 deletions

diff --git a/template/default/admin/user_list.tpl b/template/default/admin/user_list.tpl
index 51c1185cf..2c8a6cc9f 100644
--- a/template/default/admin/user_list.tpl
+++ b/template/default/admin/user_list.tpl
@@ -94,13 +94,21 @@
 </table>
 <div class="navigationBar">{NAVBAR}</div>
 
+<!-- delete the selected users ? -->
+<fieldset>
+  <legend>{lang:Deletions}</legend>
+  <input type="checkbox" name="confirm_deletion" value="1" /> {lang:confirm}
+  <input type="submit" value="{lang:Delete selected users}" name="delete" class="bouton" />
+</fieldset>
+
 <!-- form to set properties for many users at once -->
-<div class="admin">Preferences</div>
+<fieldset>
+  <legend>{lang:Groups}</legend>
 
 <table>
 
   <tr>
-    <td>associate to groupe</td>
+    <td>{lang:associate to group}</td>
     <td>
       <select name="associate" size="1">
         <!-- BEGIN associate_option -->
@@ -111,7 +119,7 @@
   </tr>
 
   <tr>
-    <td>dissociate from groupe</td>
+    <td>{lang:dissociate from group}</td>
     <td>
       <select name="dissociate" size="1">
         <!-- BEGIN dissociate_option -->
@@ -121,6 +129,15 @@
     </td>
   </tr>
 
+</table>
+
+</fieldset>
+
+<fieldset>
+  <legend>{lang:Preferences}</legend>
+
+<table>
+
   <tr>
     <td>{L_NB_IMAGE_LINE}</td>
     <td>
@@ -239,6 +256,8 @@
 
 </table>
 
+</fieldset>
+
 <p style="text-align:center;">
   target  
   <input type="radio" name="target" value="all" /> all
diff --git a/template/default/profile.tpl b/template/default/profile.tpl
index 7d435304f..6bb881891 100644
--- a/template/default/profile.tpl
+++ b/template/default/profile.tpl
@@ -8,29 +8,28 @@
 </div>
 <!-- END errors -->
 
-<!-- BEGIN profile -->
 <div class="titrePage">{L_TITLE}</div>
-<!-- END profile -->
+
 <form method="post" name="profile" action="{F_ACTION}">
+
+<input type="hidden" name="userid" value="{USERID}" />
+
 <table width="70%" align="center">
   <tr class="admin">
     <th colspan="2">{L_REGISTRATION_INFO}</th>
   </tr>
 	<tr>
 	  <td width="50%">{L_USERNAME}</td>
-	  <td><input type="text" name="username" value="{USERNAME}" />
-		<input type="hidden" name="userid" value="{USERID}" /></td>
+	  <td>{USERNAME}</td>
   </tr>
 	<tr>
 	  <td>{L_EMAIL}</td>
 	  <td><input type="text" name="mail_address" value="{EMAIL}" /></td>
   </tr>
-	<!-- BEGIN profile -->
   <tr>
 	<td>{L_CURRENT_PASSWORD} : <br /><span class="small">{L_CURRENT_PASSWORD_HINT}</span></td>
 	<td><input type="password" name="password" value="" /></td>
   </tr>
-	<!-- END profile -->
 	<tr>
 	<td>{L_NEW_PASSWORD} : <br /><span class="small">{L_NEW_PASSWORD_HINT}</span></td>
 	<td><input type="password" name="use_new_pwd" value="" /></td>
@@ -82,22 +81,6 @@
     <td><input type="text" size="4" maxlength="4" name="maxheight" value="{MAXHEIGHT}" />
     </td>
   </tr>
-<!-- BEGIN admin -->
-	<tr class="admin">
-    <th colspan="2">{modify.admin.L_ADMIN_USER}</th>
-  </tr>
-  <tr>
-    <td>{modify.admin.L_STATUS}</td>
-	<td>{modify.admin.STATUS}
-	</td>
-  </tr>
-  <tr>
-    <td>{modify.admin.L_DELETE}<br />
-	<span class="small">{modify.admin.L_DELETE_HINT}</span></td>
-	<td><input name="user_delete" type="checkbox" value="1">
-	</td>
-  </tr>
-<!-- END admin -->
   <tr>
 	<td colspan="2" align="center">
 	  <input type="submit" name="validate" value="{L_SUBMIT}" class="bouton" />
@@ -106,8 +89,7 @@
   </tr>
 </table>
 </form>
-<!-- BEGIN profile -->
+
 <div style="text-align:center;margin:5px;">
 <a href="{U_RETURN}" title="{L_RETURN_HINT}">[{L_RETURN}]</a>
 </div>
-<!-- END profile -->