- 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

3 files changed, 24 insertions, 119 deletions

diff --git a/admin.php b/admin.php
index 28c7dc992..b2113b22a 100644
--- a/admin.php
+++ b/admin.php
@@ -57,6 +57,8 @@ $conf_link = $link_start.'configuration&section=';
 $opt_link = $link_start.'cat_options&section=';
 //----------------------------------------------------- template initialization
 $title = l10n('PhpWebGallery administration'); // for include/page_header.php
+$page['gallery_title'] = l10n('PhpWebGallery Administration');
+$page['body_id'] = 'theAdminPage';
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 
 $template->set_filenames(array('admin' => 'admin.tpl'));
diff --git a/admin/search.php b/admin/search.php
deleted file mode 100644
index 482d6afbc..000000000
--- a/admin/search.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
-
-define('PHPWG_ROOT_PATH','../');
-include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
-include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
-
-//----------------------------------------------------- template initialization
-$title = $lang['Find_username'];
-include(PHPWG_ROOT_PATH.'include/page_header.php');
-
-$template->set_filenames( array('search'=>'admin/search_username.tpl') );
-$template->assign_vars(array(
-  'USERNAME'=>( !empty($search_match) ) ? strip_tags($search_match) : '',
-  
-  'L_SEARCH_USERNAME'=>$lang['Find_username'],
-  'L_SEARCH'=>$lang['search'],
-  'L_SEARCH_EXPLAIN'=>$lang['search_explain'],
-  'L_SELECT'=>$lang['Select'],
-  'L_UPDATE_USERNAME'=>$lang['Look_up_user'],
-  'L_CLOSE_WINDOW'=>$lang['Close'],
-
-  'F_SEARCH_ACTION' => add_session_id($_SERVER['PHP_SELF']),
-  ));
-
-//----------------------------------------------------------------- form action
-//
-// Define initial vars
-//
-if ( isset($_POST['mode']) || isset($_GET['mode']) )
-{
-  $mode = ( isset($_POST['mode']) ) ? $_POST['mode'] : $_GET['mode'];
-}
-else
-{
-  $mode = '';
-}
-$search_match = ''; 
-if ( isset($_POST['search_username']) )
-{
-  $search_match = $_POST['search_username'];
-}
-  
-$username_list = '';
-if ( !empty($search_match) )
-{
-  $username_search = preg_replace('/\*/', '%', trim(strip_tags($search_match)));
-  
-  $sql = "SELECT username 
-    FROM " . USERS_TABLE . " 
-    WHERE username LIKE '" . str_replace("\'", "''", $username_search) . "' 
-    AND id <> ".$conf['guest_id']."
-		ORDER BY username";
-  if ( !($result = pwg_query($sql)) )
-  {
-    die('Could not obtain search results');
-  }
-  
-  if ( $row = mysql_fetch_array($result) )
-  {
-    do
-    {
-    $username_list .= '<option value="' . $row['username'] . '">' . $row['username'] . '</option>';
-    }
-    while ( $row = mysql_fetch_array($result) );
-  }
-  else
-  {
-    $username_list .= '<option>' . $lang['No_match']. '</option>';
-  }
-  mysql_free_result($result);
-}
-  
-//------------------------------------------------------------------ users list
-if ( !empty($username_list))
-{
-  $template->assign_block_vars('switch_select_name', array(
-    'F_USERNAME_OPTIONS'=>$username_list
-    ));
-}
-
-$template->parse('search');
-include(PHPWG_ROOT_PATH.'include/page_tail.php');
-?>
\ No newline at end of file
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"' : ''
       ));
 }