- elements batch management : in addition to global mode, a unit mode is

  added : ability to manage a set of elements, element by element. This
  screen is very close to the existing "infos_images" (which will soon
  disappear).

* elements batch management : in screen element_set_global, the display
  options are displayed at the top as in element_set_unit


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

6 files changed, 348 insertions, 17 deletions

diff --git a/admin.php b/admin.php
index c744201a6..b8427258f 100644
--- a/admin.php
+++ b/admin.php
@@ -155,6 +155,12 @@ switch ( $_GET['page'] )
    $page_valide = true;
    break;
  }
+ case 'element_set_unit' :
+ {
+   $title = 'batch management';
+   $page_valide = true;
+   break;
+ }
  default:
    $title = $lang['title_default']; break;
 }
diff --git a/admin/element_set_global.php b/admin/element_set_global.php
index 720ab0c13..cf95c1d1f 100644
--- a/admin/element_set_global.php
+++ b/admin/element_set_global.php
@@ -303,7 +303,7 @@ SELECT id, keywords
       
       array_push($datas, $data);
     }
-    echo '<pre>'; print_r($datas); echo '</pre>';
+    // echo '<pre>'; print_r($datas); echo '</pre>';
     mass_updates(IMAGES_TABLE, $dbfields, $datas);
   }
 }
@@ -323,6 +323,7 @@ $template->assign_vars(
     'L_SUBMIT'=>$lang['submit'],
 
     'U_ELEMENTS_LINE'=>$base_url.get_query_string_diff(array('display')),
+    'U_UNIT_MODE'=>add_session_id($base_url.'?page=element_set_unit'),
     
     'F_ACTION'=>$base_url.get_query_string_diff(array()),
    )
diff --git a/admin/element_set_unit.php b/admin/element_set_unit.php
new file mode 100644
index 000000000..0006bf919
--- /dev/null
+++ b/admin/element_set_unit.php
@@ -0,0 +1,222 @@
+<?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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+/**
+ * Management of elements set. Elements can belong to a category or to the
+ * user caddie.
+ * 
+ */
+ 
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+include_once(PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php');
+
+// +-----------------------------------------------------------------------+
+// |                        unit mode form submission                      |
+// +-----------------------------------------------------------------------+
+$errors = array();
+
+if (isset($_POST['submit']))
+{
+  $collection = explode(',', $_POST['list']);
+  
+//   echo '<pre>';
+//   print_r($_POST);
+//   echo '</pre>';
+//   exit();
+
+  $datas = array();
+  $dbfields =
+    array(
+      'primary' => array('id'),
+      'update' => array('name','author','comment','date_creation','keywords')
+      );
+  
+  $query = '
+SELECT id, date_creation
+  FROM '.IMAGES_TABLE.'
+  WHERE id IN ('.implode(',', $collection).')
+;';
+  $result = pwg_query($query);
+
+  while ($row = mysql_fetch_array($result))
+  {
+    $data = array();
+    $data['id'] = $row['id'];
+    
+    foreach (array_diff($dbfields['update'], array('date_creation')) as $field)
+    {
+      if (!empty($_POST[$field.'-'.$row['id']]))
+      {
+        $data[$field] = $_POST[$field.'-'.$row['id']];
+      }
+    }
+
+    if ('set' == $_POST['date_creation_action-'.$row['id']])
+    {
+      $data['date_creation'] =
+        $_POST['date_creation_year-'.$row['id']]
+        .'-'.$_POST['date_creation_month-'.$row['id']]
+        .'-'.$_POST['date_creation_day-'.$row['id']]
+        ;
+    }
+    else if ('leave' == $_POST['date_creation_action-'.$row['id']]
+             and !empty($row['date_creation']))
+    {
+      $data['date_creation'] = $row['date_creation'];
+    }
+
+    array_push($datas, $data);
+  }
+  // echo '<pre>'; print_r($datas); echo '</pre>';
+  mass_updates(IMAGES_TABLE, $dbfields, $datas);
+}
+
+// +-----------------------------------------------------------------------+
+// |                         page information init                         |
+// +-----------------------------------------------------------------------+
+
+// $page['start'] contains the number of the first element in its
+// category. For exampe, $page['start'] = 12 means we must show elements #12
+// and $page['nb_images'] next elements
+if (!isset($_GET['start'])
+    or !is_numeric($_GET['start'])
+    or $_GET['start'] < 0)
+{
+  $page['start'] = 0;
+}
+else
+{
+  $page['start'] = $_GET['start'];
+}
+
+// $page['nb_images'] is the number of elements to show in the page
+$page['nb_images'] = !empty($_GET['display']) ? $_GET['display'] : 5;
+
+// $page['cat_nb_images'] is the total number of elements to show in the
+// category
+$query = '
+SELECT COUNT(*)
+  FROM '.CADDIE_TABLE.'
+  WHERE user_id = '.$user['id'].'
+;';
+list($page['cat_nb_images']) = mysql_fetch_row(pwg_query($query));
+
+// +-----------------------------------------------------------------------+
+// |                             template init                             |
+// +-----------------------------------------------------------------------+
+
+$template->set_filenames(
+  array('element_set_unit' => 'admin/element_set_unit.tpl'));
+
+$base_url = PHPWG_ROOT_PATH.'admin.php';
+
+// $form_action = $base_url.'?page=element_set_global';
+
+$template->assign_vars(
+  array(
+    'L_SUBMIT'=>$lang['submit'],
+    
+    'U_ELEMENTS_PAGE'
+    =>$base_url.get_query_string_diff(array('display','start')),
+    
+    'U_GLOBAL_MODE'
+//    =>$base_url.get_query_string_diff(array('mode','display','start')),
+    =>add_session_id($base_url.'?page=element_set_global'),
+    
+    'F_ACTION'=>$base_url.get_query_string_diff(array()),
+    )
+  );
+
+// +-----------------------------------------------------------------------+
+// |                        global mode thumbnails                         |
+// +-----------------------------------------------------------------------+
+
+$element_ids = array();
+
+$query = '
+SELECT element_id,path,tn_ext,name,date_creation,comment,keywords,author
+  FROM '.IMAGES_TABLE.' INNER JOIN '.CADDIE_TABLE.' ON id=element_id
+  WHERE user_id = '.$user['id'].'
+  '.$conf['order_by'].'
+  LIMIT '.$page['start'].', '.$page['nb_images'].'
+;';
+$result = pwg_query($query);
+
+while ($row = mysql_fetch_array($result))
+{
+  // echo '<pre>'; print_r($row); echo '</pre>';
+  array_push($element_ids, $row['element_id']);
+  
+  $src = get_thumbnail_src($row['path'], @$row['tn_ext']);
+
+  // creation date
+  if (!empty($row['date_creation']))
+  {
+    list($year,$month,$day) = explode('-', $row['date_creation']);
+  }
+  else
+  {
+    list($year,$month,$day) = array('','','');
+  }
+
+  $template->assign_block_vars(
+    'element',
+    array(
+      'ID' => $row['element_id'],
+      'FILENAME' => $row['path'],
+      'TN_SRC' => $src,
+      'NAME' => @$row['name'],
+      'AUTHOR' => @$row['author'],
+      'COMMENT' => @$row['comment'],
+      'DATE_CREATION_YEAR' => $year,
+      'KEYWORDS' => @$row['keywords']
+      )
+    );
+  
+  get_day_list('element.date_creation_day', $day);
+  get_month_list('element.date_creation_month', $month);
+}
+
+$template->assign_vars(array('IDS_LIST' => implode(',', $element_ids)));
+
+$nav_bar = create_navigation_bar(
+  $base_url.get_query_string_diff(array('start')),
+  $page['cat_nb_images'],
+  $page['start'],
+  $page['nb_images'],
+  '');
+$template->assign_vars(array('NAV_BAR' => $nav_bar));
+
+// +-----------------------------------------------------------------------+
+// |                           sending html code                           |
+// +-----------------------------------------------------------------------+
+
+$template->assign_var_from_handle('ADMIN_CONTENT', 'element_set_unit');
+?>
\ No newline at end of file
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 399723591..45e9dd236 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,13 @@
+2005-04-16 Pierrick LE GALL <pierrick /at/ phpwebgallery {dot} net>
+
+	* elements batch management : in addition to global mode, a unit
+	mode is added : ability to manage a set of elements, element by
+	element. This screen is very close to the existing "infos_images"
+	(which will soon disappear).
+
+	* elements batch management : in screen element_set_global, the
+	display options are displayed at the top as in element_set_unit
+	
 2005-04-11 Pierrick LE GALL <pierrick /at/ phpwebgallery {dot} net>
 
 	* functions get_day_list and get_month_list moved from search.php
diff --git a/template/default/admin/element_set_global.tpl b/template/default/admin/element_set_global.tpl
index 9af80caac..d3abb16ad 100644
--- a/template/default/admin/element_set_global.tpl
+++ b/template/default/admin/element_set_global.tpl
@@ -1,3 +1,8 @@
+<p style="text-align:center;">
+  global mode 
+  | <a href="{U_UNIT_MODE}">unit mode</a>
+</p>
+
 <form action="{F_ACTION}" method="post">
 
 <fieldset>
@@ -15,6 +20,22 @@
 
 <fieldset>
 
+  <legend>Display options</legend>
+
+  <p>elements per line :
+      <a href="{U_ELEMENTS_LINE}&amp;display=4">4</a>
+    | <a href="{U_ELEMENTS_LINE}&amp;display=5">5</a>
+    | <a href="{U_ELEMENTS_LINE}&amp;display=6">6</a>
+    | <a href="{U_ELEMENTS_LINE}&amp;display=7">7</a>
+    | <a href="{U_ELEMENTS_LINE}&amp;display=8">8</a>
+    | <a href="{U_ELEMENTS_LINE}&amp;display=9">9</a>
+    | <a href="{U_ELEMENTS_LINE}&amp;display=10">10</a>
+  </p>
+
+</fieldset>
+
+<fieldset>
+
   <legend>Form</legend>
 
   <table>
@@ -140,20 +161,4 @@
 
 </fieldset>
 
-<fieldset>
-
-  <legend>Display options</legend>
-
-  <p>elements per line :
-      <a href="{U_ELEMENTS_LINE}&amp;display=4">4</a>
-    | <a href="{U_ELEMENTS_LINE}&amp;display=5">5</a>
-    | <a href="{U_ELEMENTS_LINE}&amp;display=6">6</a>
-    | <a href="{U_ELEMENTS_LINE}&amp;display=7">7</a>
-    | <a href="{U_ELEMENTS_LINE}&amp;display=8">8</a>
-    | <a href="{U_ELEMENTS_LINE}&amp;display=9">9</a>
-    | <a href="{U_ELEMENTS_LINE}&amp;display=10">10</a>
-  </p>
-
-</fieldset>
-
 </form>
diff --git a/template/default/admin/element_set_unit.tpl b/template/default/admin/element_set_unit.tpl
new file mode 100644
index 000000000..28ada6196
--- /dev/null
+++ b/template/default/admin/element_set_unit.tpl
@@ -0,0 +1,87 @@
+<p style="text-align:center;">
+  <a href="{U_GLOBAL_MODE}">global mode</a>
+  | unit mode
+</p>
+
+<form action="{F_ACTION}" method="POST">
+
+<input type="hidden" name="list" value="{IDS_LIST}" />
+
+<fieldset>
+
+  <legend>Display options</legend>
+
+  <p>elements per page :
+      <a href="{U_ELEMENTS_PAGE}&amp;display=5">5</a>
+    | <a href="{U_ELEMENTS_PAGE}&amp;display=10">10</a>
+    | <a href="{U_ELEMENTS_PAGE}&amp;display=50">50</a>
+    | <a href="{U_ELEMENTS_PAGE}&amp;display=all">all</a>
+  </p>
+
+</fieldset>
+
+<fieldset>
+
+  <legend>Elements</legend>
+
+  <div class="navigationBar">{NAV_BAR}</div>
+
+  <table width="100%">
+
+    <tr>
+      <th class="row2" style="text-align:center;">&nbsp;</td>
+      <th class="row2" style="text-align:center;">name</td>
+      <th class="row2" style="text-align:center;">author</td>
+      <th class="row2" style="text-align:center;">description</td>
+      <th class="row2" style="text-align:center;">creation date</td>
+      <th class="row2" style="text-align:center;">keywords</td>
+    </tr>
+
+    <!-- BEGIN element -->
+    <tr>
+
+      <td style="text-align:center;"><img src="{element.TN_SRC}" alt="" class="miniature" title="{element.FILENAME}" /></td>
+
+      <td style="text-align:center;"><input type="text" name="name-{element.ID}" value="{element.NAME}" maxlength="255"/></td>
+
+      <td style="text-align:center;"><input type="text" name="author-{element.ID}" value="{element.AUTHOR}" maxlength="255" size="12" /></td>
+
+      <td style="text-align:center;"><textarea name="comment-{element.ID}" rows="5" cols="30" style="overflow:auto">{element.COMMENT}</textarea></td>
+
+      <td style="text-align:left;">
+        <input type="radio" name="date_creation_action-{element.ID}" value="leave" checked="checked" /> leave unchanged
+        <br /><input type="radio" name="date_creation_action-{element.ID}" value="unset" /> unset
+        <br /><input type="radio" name="date_creation_action-{element.ID}" value="set" id="date_creation_action_set-{element.ID}" />
+
+        <select onmousedown="document.getElementById('date_creation_action_set-{element.ID}').checked = true;" name="date_creation_day-{element.ID}">
+          <!-- BEGIN date_creation_day -->
+          <option {element.date_creation_day.SELECTED} value="{element.date_creation_day.VALUE}">{element.date_creation_day.OPTION}</option>
+          <!-- END date_creation_day -->
+        </select>
+        <select onmousedown="document.getElementById('date_creation_action_set-{element.ID}').checked = true;" name="date_creation_month-{element.ID}">
+          <!-- BEGIN date_creation_month -->
+          <option {element.date_creation_month.SELECTED} value="{element.date_creation_month.VALUE}">{element.date_creation_month.OPTION}</option>
+          <!-- END date_creation_month -->
+        </select>
+        <input onmousedown="document.getElementById('date_creation_action_set-{element.ID}').checked = true;"
+               name="date_creation_year-{element.ID}"
+               type="text"
+               size="4"
+               maxlength="4"
+               value="{element.DATE_CREATION_YEAR}" />
+      </td>
+
+      <td style="text-align:center;"><input type="text" name="keywords-{element.ID}" value="{element.KEYWORDS}" length="255" /></td>
+
+    </tr>
+    <!-- END element -->
+
+  </table>
+
+  <p style="text-align:center;">
+    <input type="submit" value="{L_SUBMIT}" name="submit" class="bouton" />
+  </p>
+
+</fieldset>
+
+</form>