- improvement : screen admin/picture_modify rewritten. Presentation copied

  from admin/cat_modify : fieldsets regroup fields. Ability to synchronize
  metadata for the displayed item.

- bug 110 fixed : "return to element view from element edition fails
  depending on permissions". If a reachable (for the connected admin)
  category is available, a "jump to" link is displayed, by default, using
  the category given in URL.

- bug fixed : in mass_updates function, the first item of $fields['update']
  has not always 0 for id (as in any array).

- modification : get_keywords function understands spaces as separator,
  allow less than 3 chars keywords, allow quotes.

- new : ability to allow HTML in picture or category description (false by
  default)


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

5 files changed, 291 insertions, 154 deletions

diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index 700b6fe5f..1215b4e73 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -39,39 +39,29 @@ if ( !isset( $_GET['cat_id'] ) || !is_numeric( $_GET['cat_id'] ) )
 $template->set_filenames( array('categories'=>'admin/cat_modify.tpl') );
 
 //--------------------------------------------------------- form criteria check
-if ( isset( $_POST['submit'] ) )
+if (isset($_POST['submit']))
 {
-  $query = 'UPDATE '.CATEGORIES_TABLE;
-  $query.= ' SET name = ';
-  if ( empty($_POST['name']))
-    $query.= 'NULL';
-  else
-    $query.= "'".htmlentities( $_POST['name'], ENT_QUOTES)."'";
-
-  $query.= ', comment = ';
-  if ( empty($_POST['comment']))
-    $query.= 'NULL';
-  else
-    $query.= "'".htmlentities( $_POST['comment'], ENT_QUOTES )."'";
-
-  if ( isset( $_POST['uploadable'] ) )
-    $query.= ", uploadable = '".$_POST['uploadable']."'";
-
-  if ( isset( $_POST['commentable'] ) )
-    $query.= ", commentable = '".$_POST['commentable']."'";
-
-  if ( isset( $_POST['associate'] ) )
-  {
-    $query.= ', id_uppercat = ';
-    if ( $_POST['associate'] == -1 or $_POST['associate'] == '' )
-      $query.= 'NULL';
-    else
-      $query.= $_POST['associate'];
-  }
-  $query.= ' WHERE id = '.$_GET['cat_id'];
-  $query.= ';';
-  pwg_query( $query );
+  $data =
+    array(
+      'id' => $_GET['cat_id'],
+      'name' => @$_POST['name'],
+      'commentable' => $_POST['commentable'],
+      'uploadable' =>
+        isset($_POST['uploadable']) ? $_POST['uploadable'] : 'false',
+      'comment' =>
+        $conf['allow_html_descriptions'] ?
+          @$_POST['comment'] : strip_tags(@$_POST['comment'])
+      );
 
+  mass_updates(
+    CATEGORIES_TABLE,
+    array(
+      'primary' => array('id'),
+      'update' => array_diff(array_keys($data), array('id'))
+      ),
+    array($data)
+    );
+  
   set_cat_visible(array($_GET['cat_id']), $_POST['visible']);
   set_cat_status(array($_GET['cat_id']), $_POST['status']);
 
diff --git a/admin/cat_perm.php b/admin/cat_perm.php
index ca6baf86c..2c6420ae1 100644
--- a/admin/cat_perm.php
+++ b/admin/cat_perm.php
@@ -201,11 +201,11 @@ $template->set_filenames(array('cat_perm'=>'admin/cat_perm.tpl'));
 
 $template->assign_vars(
   array(
-    'TITLE' =>
-      sprintf(
-        l10n('Manage permissions for category "%s"'),
-        get_cat_display_name_from_id($page['cat'])
-        )
+    'CATEGORIES_NAV' =>
+      get_cat_display_name_from_id(
+        $page['cat'],
+        'admin.php?page=cat_modify&cat_id='
+        ),
     'F_ACTION' =>
       add_session_id(
         PHPWG_ROOT_PATH.'admin.php?page=cat_perm&cat='.$page['cat']
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 5811da226..b787d8a21 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -582,23 +582,23 @@ function date_convert_back( $date )
   }
 }
 
-// get_keywords returns an array with relevant keywords found in the string
-// given in argument. Keywords must be separated by comma in this string.
-// keywords must :
-//   - be longer or equal to 3 characters
-//   - not contain ', " or blank characters
-//   - unique in the string ("test,test" -> "test")
-function get_keywords( $keywords_string )
+/**
+ * returns an array with relevant keywords found in the given string.
+ *
+ * Keywords must be separated by comma or space characters.
+ *
+ * @param string keywords_string
+ * @return array
+ */
+function get_keywords($keywords_string)
 {
-  $keywords = array();
-
-  $candidates = explode( ',', $keywords_string );
-  foreach ( $candidates as $candidate ) {
-    if ( strlen($candidate) >= 3 and !preg_match( '/(\'|"|\s)/', $candidate ) )
-      array_push( $keywords, $candidate );
-  }
-
-  return array_unique( $keywords );
+  return
+    array_unique(
+      preg_split(
+        '/[\s,]+/',
+        $keywords_string
+        )
+      );
 }
 
 /**
@@ -742,14 +742,15 @@ function mass_updates($tablename, $dbfields, $datas)
       $query = '
 UPDATE '.$tablename.'
   SET ';
+      $is_first = true;
       foreach ($dbfields['update'] as $num => $key)
       {
-        if ($num >= 1)
+        if (!$is_first)
         {
           $query.= ",\n      ";
         }
         $query.= $key.' = ';
-        if (isset($data[$key]))
+        if (isset($data[$key]) and $data[$key] != '')
         {
           $query.= '\''.$data[$key].'\'';
         }
@@ -757,6 +758,7 @@ UPDATE '.$tablename.'
         {
           $query.= 'NULL';
         }
+        $is_first = false;
       }
       $query.= '
   WHERE ';
diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php
index ad45aca12..23b04833c 100644
--- a/admin/include/functions_metadata.php
+++ b/admin/include/functions_metadata.php
@@ -204,4 +204,28 @@ SELECT id, path
   
   return $files;
 }
+
+// used_metadata string is displayed to inform admin which metadata will be
+// used from files for synchronization
+function get_used_metadata_list()
+{
+  global $conf;
+  
+  $used_metadata = array('filesize', 'width', 'height');
+
+  if ($conf['use_exif'])
+  {
+    array_push($used_metadata, 'date_creation');
+  }
+
+  if ($conf['use_iptc'])
+  {
+    foreach (array_keys($conf['use_iptc_mapping']) as $key)
+    {
+      array_push($used_metadata, $key);
+    }
+  }
+
+  return array_unique($used_metadata);
+}
 ?>
\ No newline at end of file
diff --git a/admin/picture_modify.php b/admin/picture_modify.php
index a07cfbd75..a8fa2b953 100644
--- a/admin/picture_modify.php
+++ b/admin/picture_modify.php
@@ -27,61 +27,93 @@
 
 if(!defined("PHPWG_ROOT_PATH"))
 {
-  die ("Hacking attempt!");
+  die('Hacking attempt!');
 }
 include_once(PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php');
+
+// +-----------------------------------------------------------------------+
+// |                          synchronize metadata                         |
+// +-----------------------------------------------------------------------+
+
+if (isset($_GET['sync_metadata']))
+{
+  $query = '
+SELECT path
+  FROM '.IMAGES_TABLE.'
+  WHERE id = '.$_GET['image_id'].'
+;';
+  list($path) = mysql_fetch_row(pwg_query($query));
+  update_metadata(array($_GET['image_id'] => $path));
+
+  array_push($page['infos'], l10n('Metadata synchronized from file'));
+}
+
 //--------------------------------------------------------- update informations
+
 // first, we verify whether there is a mistake on the given creation date
-if (isset($_POST['date_creation']) and !empty($_POST['date_creation']))
+if (isset($_POST['date_creation_action'])
+    and 'set' == $_POST['date_creation_action'])
 {
-  if (!check_date_format($_POST['date_creation']))
+  if (!checkdate(
+        $_POST['date_creation_month'],
+        $_POST['date_creation_day'],
+        $_POST['date_creation_year'])
+    )
   {
     array_push($page['errors'], $lang['err_date']);
   }
 }
+
 if (isset($_POST['submit']) and count($page['errors']) == 0)
 {
-  $query = 'UPDATE '.IMAGES_TABLE.' SET name = ';
-  if ($_POST['name'] == '')
-    $query.= 'NULL';
-  else
-    $query.= "'".htmlentities($_POST['name'], ENT_QUOTES)."'";
-  
-  $query.= ', author = ';
-  if ($_POST['author'] == '')
-    $query.= 'NULL';
-  else
-    $query.= "'".htmlentities($_POST['author'],ENT_QUOTES)."'";
+  $data = array();
+  $data{'id'} = $_GET['image_id'];
+  $data{'name'} = $_POST['name'];
+  $data{'author'} = $_POST['author'];
 
-  $query.= ', comment = ';
-  if ($_POST['comment'] == '')
-    $query.= 'NULL';
-  else
-    $query.= "'".htmlentities($_POST['comment'],ENT_QUOTES)."'";
-
-  $query.= ', date_creation = ';
-  if (!empty($_POST['date_creation']))
-    $query.= "'".date_convert($_POST['date_creation'])."'";
-  else if ($_POST['date_creation'] == '')
-    $query.= 'NULL';
-
-  $query.= ', keywords = ';
-  $keywords_array = get_keywords($_POST['keywords']);
-  if (count($keywords_array) == 0)
-    $query.= 'NULL';
+  if ($conf['allow_html_descriptions'])
+  {
+    $data{'comment'} = @$_POST['description'];
+  }
   else
   {
-    $query.= "'";
-    foreach ($keywords_array as $i => $keyword) {
-      if ($i > 0) $query.= ',';
-      $query.= $keyword;
+    $data{'comment'} = strip_tags(@$_POST['description']);
+  }
+
+  if (isset($_POST['date_creation_action']))
+  {
+    if ('set' == $_POST['date_creation_action'])
+    {
+      $data{'date_creation'} = $_POST['date_creation_year']
+                                 .'-'.$_POST['date_creation_month']
+                                 .'-'.$_POST['date_creation_day'];
+    }
+    else if ('unset' == $_POST['date_creation_action'])
+    {
+      $data{'date_creation'} = '';
     }
-    $query.= "'";
   }
 
-  $query.= ' WHERE id = '.$_GET['image_id'];
-  $query.= ';';
-  pwg_query($query);
+  $keywords = get_keywords($_POST['keywords']);
+  if (count($keywords) > 0)
+  {
+    $data{'keywords'} = implode(',', $keywords);
+  }
+  else
+  {
+    $data{'keywords'} = '';
+  }
+
+  mass_updates(
+    IMAGES_TABLE,
+    array(
+      'primary' => array('id'),
+      'update' => array_diff(array_keys($data), array('id'))
+      ),
+    array($data)
+    );
+
+  array_push($page['infos'], l10n('Picture informations updated'));
 }
 // associate the element to other categories than its storage category
 if (isset($_POST['associate'])
@@ -137,85 +169,175 @@ if (isset($_POST['dismiss'])
 
 // retrieving direct information about picture
 $query = '
-SELECT i.*, c.uppercats
-  FROM '.IMAGES_TABLE.' AS i
-   INNER JOIN '.CATEGORIES_TABLE.' AS c ON i.storage_category_id = c.id
-  WHERE i.id = '.$_GET['image_id'].'
+SELECT *
+  FROM '.IMAGES_TABLE.'
+  WHERE id = '.$_GET['image_id'].'
 ;';
 $row = mysql_fetch_array(pwg_query($query));
 
 $storage_category_id = $row['storage_category_id'];
 
-if (empty($row['name']))
-{
-  $title = str_replace('_', ' ',get_filename_wo_extension($row['file']));
-}
-else
-{
-  $title = $row['name'];
-}
 // Navigation path
-$thumbnail_url = get_thumbnail_src($row['path'], @$row['tn_ext']);
 
-$url_img = PHPWG_ROOT_PATH.'picture.php?image_id='.$_GET['image_id'];
-$url_img .= '&cat='.$row['storage_category_id'];
 $date = isset($_POST['date_creation']) && empty($page['errors'])
 ?$_POST['date_creation']:date_convert_back(@$row['date_creation']);
 
-$url = PHPWG_ROOT_PATH.'admin.php?page=cat_modify&cat_id=';
-$storage_category = get_cat_display_name_cache($row['uppercats'],
-                                               $url,
-                                               false);
-//----------------------------------------------------- template initialization
+// +-----------------------------------------------------------------------+
+// |                             template init                             |
+// +-----------------------------------------------------------------------+
+
 $template->set_filenames(
   array(
     'picture_modify' => 'admin/picture_modify.tpl'
     )
   );
 
-$template->assign_vars(array(
-  'TITLE_IMG'=>$title,
-  'STORAGE_CATEGORY_IMG'=>$storage_category,
-  'PATH_IMG'=>$row['path'],
-  'FILE_IMG'=>$row['file'],
-  'TN_URL_IMG'=>$thumbnail_url,
-  'URL_IMG'=>add_session_id($url_img),
-  'DEFAULT_NAME_IMG'=>str_replace('_',' ',get_filename_wo_extension($row['file'])),
-  'FILE_IMG'=>$row['file'],
-  'NAME_IMG'=>isset($_POST['name'])?$_POST['name']:@$row['name'],
-  'SIZE_IMG'=>@$row['width'].' * '.@$row['height'],
-  'FILESIZE_IMG'=>@$row['filesize'].' KB',
-  'REGISTRATION_DATE_IMG'
-  => format_date($row['date_available'], 'mysql_datetime', true),
-  'AUTHOR_IMG'=>isset($_POST['author'])?$_POST['author']:@$row['author'],
-  'CREATION_DATE_IMG'=>$date,
-  'KEYWORDS_IMG'=>isset($_POST['keywords'])?$_POST['keywords']:@$row['keywords'],
-  'COMMENT_IMG'=>isset($_POST['comment'])?$_POST['comment']:@$row['comment'],
+$template->assign_vars(
+  array(
+    'U_SYNC' =>
+      add_session_id(
+        PHPWG_ROOT_PATH.'admin.php?page=picture_modify'.
+        '&image_id='.$_GET['image_id'].
+        (isset($_GET['cat_id']) ? '&cat_id='.$_GET['cat_id'] : '').
+        '&sync_metadata=1'
+        ),
+    
+    'PATH'=>$row['path'],
+    
+    'TN_SRC' => get_thumbnail_src($row['path'], @$row['tn_ext']),
+    
+    'NAME' =>
+      isset($_POST['name']) ?
+        stripslashes($_POST['name']) : @$row['name'],
+    
+    'DIMENSIONS' => @$row['width'].' * '.@$row['height'],
+    
+    'FILESIZE' => @$row['filesize'].' KB',
+    
+    'REGISTRATION_DATE' =>
+      format_date($row['date_available'], 'mysql_datetime', false),
+    
+    'AUTHOR' => isset($_POST['author']) ? $_POST['author'] : @$row['author'],
+    
+    'CREATION_DATE' => $date,
+    
+    'KEYWORDS' =>
+      isset($_POST['keywords']) ?
+        stripslashes($_POST['keywords']) : @$row['keywords'],
+    
+    'DESCRIPTION' =>
+      isset($_POST['description']) ?
+        stripslashes($_POST['description']) : @$row['comment'],
   
-  'L_UPLOAD_NAME'=>$lang['upload_name'],
-  'L_DEFAULT'=>$lang['default'],
-  'L_FILE'=>$lang['file'],
-  'L_SIZE'=>$lang['size'],
-  'L_FILESIZE'=>$lang['filesize'],
-  'L_REGISTRATION_DATE'=>$lang['registration_date'],
-  'L_AUTHOR'=>$lang['author'],
-  'L_CREATION_DATE'=>$lang['creation_date'],
-  'L_KEYWORDS'=>$lang['keywords'],
-  'L_COMMENT'=>$lang['description'],
-  'L_CATEGORIES'=>$lang['categories'],
-  'L_DISSOCIATE'=>$lang['dissociate'],
-  'L_INFOIMAGE_ASSOCIATE'=>$lang['infoimage_associate'],
-  'L_SUBMIT'=>$lang['submit'],
-  'L_RESET'=>$lang['reset'],
-  'L_CAT_ASSOCIATED'=>$lang['infoimage_associated'],
-  'L_CAT_DISSOCIATED'=>$lang['infoimage_dissociated'],
-  'L_PATH'=>$lang['path'],
-  'L_STORAGE_CATEGORY'=>$lang['storage_category'],
-  'L_REPRESENTS'=>$lang['represents'],
-  'L_DOESNT_REPRESENT'=>$lang['doesnt_represent'],
+    'F_ACTION' =>
+      add_session_id(
+        PHPWG_ROOT_PATH.'admin.php'
+        .get_query_string_diff(array('sync_metadata'))
+        )
+    )
+  );
+
+// creation date
+unset($day, $month, $year);
+
+if (isset($_POST['date_creation_action'])
+    and 'set' == $_POST['date_creation_action'])
+{
+  foreach (array('day', 'month', 'year') as $varname)
+  {
+    $$varname = $_POST['date_creation_'.$varname];
+  }
+}
+else if (isset($row['date_creation']) and !empty($row['date_creation']))
+{
+  list($year, $month, $day) = explode('-', $row['date_creation']);
+}
+else
+{
+  list($year, $month, $day) = array('', 0, 0);
+}
+get_day_list('date_creation_day', $day);
+get_month_list('date_creation_month', $month);
+$template->assign_vars(array('DATE_CREATION_YEAR_VALUE' => $year));
   
-  'F_ACTION'=>add_session_id(PHPWG_ROOT_PATH.'admin.php?'.$_SERVER['QUERY_STRING'])
- ));
+$query = '
+SELECT category_id, uppercats
+  FROM '.IMAGE_CATEGORY_TABLE.' AS ic
+    INNER JOIN '.CATEGORIES_TABLE.' AS c
+      ON c.id = ic.category_id
+  WHERE image_id = '.$_GET['image_id'].'
+;';
+$result = pwg_query($query);
+
+if (mysql_num_rows($result) > 1)
+{
+  $template->assign_block_vars('links', array());
+}
+
+while ($row = mysql_fetch_array($result))
+{
+  $name =
+    get_cat_display_name_cache(
+      $row['uppercats'],
+      PHPWG_ROOT_PATH.'admin.php?page=cat_modify&cat_id=',
+      false
+      );
+    
+  if ($row['category_id'] == $storage_category_id)
+  {
+    $template->assign_vars(array('STORAGE_CATEGORY' => $name));
+  }
+  else
+  {
+    $template->assign_block_vars('links.category', array('NAME' => $name));
+  }
+}
+
+// jump to link
+//
+// 1. find all linked categories that are reachable for the current user.
+// 2. if a category is available in the URL, use it if reachable
+// 3. if URL category not available or reachable, use the first reachable
+//    linked category
+// 4. if no category reachable, no jumpto link
+$base_url_img = PHPWG_ROOT_PATH.'picture.php';
+$base_url_img.= '?image_id='.$_GET['image_id'];
+$base_url_img.= '&cat=';
+unset($url_img);
+
+$query = '
+SELECT category_id
+  FROM '.IMAGE_CATEGORY_TABLE.'
+  WHERE image_id = '.$_GET['image_id'].'
+;';
+$authorizeds = array_diff(
+  array_from_query($query, 'category_id'),
+  explode(',', calculate_permissions($user['id'], $user['status']))
+  );
+
+if (isset($_GET['cat_id'])
+    and in_array($_GET['cat_id'], $authorizeds))
+{
+  $url_img = $base_url_img.$_GET['cat_id'];
+}
+else
+{
+  foreach ($authorizeds as $category)
+  {
+    $url_img = $base_url_img.$category;
+    break;
+  }
+}
+
+if (isset($url_img))
+{
+  $template->assign_block_vars(
+    'jumpto',
+    array(
+      'URL' => $url_img
+      )
+    );
+}
   
 // associate to another category ?
 $query = '
@@ -258,6 +380,5 @@ display_select_cat_wrapper($query, array(), 'dismissed_option');
 
 //----------------------------------------------------------- sending html code
 
-
 $template->assign_var_from_handle('ADMIN_CONTENT', 'picture_modify');
 ?>