- new : HTML BODY identifier to let CSS stylesheets manage specific

  behaviour.

- deletion : admin/search useless

- improvement : in admin/user_list, special behaviour for true/false fields
  (expand, show_comments)

- new : gallery_title and gallery_description are displayed at the top of
  each page.

- improvement : simplification in HTML for categories menu.

- improvement : standardization of presentation in all public pages
  (identification, registration, search, profile, notification, comments,
  etc.)

(not in ChangeLog, below this line)

- add forgotten notification.php (should have been added in a previous
  commit)

- [template cclear] deletion of useless class .bouton

- [template cclear] for test purpose, new presentation of register page
  (using FORM.filter)

- [template cclear] adaptation of admin/group_list from template default

- [template cclear] deletion of obsolete admin/infos_images

- [template cclear] deletion of obsolete admin/search_username

- [template cclear] new icon register.png


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

1 files changed, 22 insertions, 11 deletions

diff --git a/admin/user_list.php b/admin/user_list.php
index aa1bbff22..e4a4c6d7e 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -124,17 +124,29 @@ DELETE FROM '.USER_GROUP_TABLE.'
     
     $formfields =
       array('nb_image_line', 'nb_line_page', 'template', 'language',
-            'recent_period', 'expand', 'show_nb_comments', 'maxwidth',
+            'recent_period', 'maxwidth', 'expand', 'show_nb_comments',
             'maxheight', 'status');
-  
+
+    $true_false_fields = array('expand', 'show_nb_comments');
+    
     foreach ($formfields as $formfield)
     {
-      if ($_POST[$formfield.'_action'] != 'leave')
+      // special for true/false fields
+      if (in_array($formfield, $true_false_fields))
+      {
+        $test = $formfield;
+      }
+      else
+      {
+        $test = $formfield.'_action';
+      }
+               
+      if ($_POST[$test] != 'leave')
       {
         array_push($dbfields['update'], $formfield);
       }
     }
-    
+
     // updating elements is useful only if needed...
     if (count($dbfields['update']) > 0)
     {
@@ -150,7 +162,8 @@ DELETE FROM '.USER_GROUP_TABLE.'
         {
           // if the action is 'unset', the key won't be in row and
           // mass_updates function will set this field to NULL
-          if ('set' == $_POST[$dbfield.'_action'])
+          if (in_array($dbfield, $true_false_fields)
+              or 'set' == $_POST[$dbfield.'_action'])
           {
             $data[$dbfield] = $_POST[$dbfield];
           }
@@ -165,6 +178,10 @@ DELETE FROM '.USER_GROUP_TABLE.'
         array_push($datas, $data);
       }
 
+//       echo '<pre>';
+//       print_r($datas);
+//       echo '</pre>';
+
       mass_updates(USER_INFOS_TABLE, $dbfields, $datas);
     }
   }
@@ -366,12 +383,6 @@ else
       'MAXWIDTH' => @$conf['default_maxwidth'],
       'MAXHEIGHT' => @$conf['default_maxheight'],
       'RECENT_PERIOD' => $conf['recent_period'],
-      'EXPAND_YES' => $conf['auto_expand'] ? 'checked="checked"' : '',
-      'EXPAND_NO' => !$conf['auto_expand'] ? 'checked="checked"' : '',
-      'SHOW_NB_COMMENTS_YES' =>
-        $conf['show_nb_comments'] ? 'checked="checked"' : '',
-      'SHOW_NB_COMMENTS_NO' =>
-        !$conf['show_nb_comments'] ? 'checked="checked"' : ''
       ));
 }