- global categories' options : instead of N horizontal tabs on a single

  page, N options in the left menu (but the same backend)

- categories.global_rank : new calculated field. It gives a global rank of
  the category among all others (updated during ordering)

- category.php page : menu is generated faster thanks to
  categories.global_rank, recursivity becomes useless :-)

- new function to display select box with a set of categories :
  display_select_cat_wrapper

- cat_options : instead of using 1 multiselect for true/false items, using 1
  multiselect for true, and another one for false. The form provides buttons
  with arrows to switch categories from one multiselect to another

- deletion of obsolete function display_categories (working with the old
  template system)

- deletion of obsolete functions get_user_plain_structure,
  create_user_structure, get_user_subcat_ids, update_structure, count_images
  : useless thanks to global_rank


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

2 files changed, 1 insertions, 22 deletions

diff --git a/admin/include/functions.php b/admin/include/functions.php
index 2b28f6784..c78df307e 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -580,27 +580,6 @@ function get_keywords( $keywords_string )
   return array_unique( $keywords );
 }
 
-function display_categories( $categories, $indent,
-                             $selected = -1, $forbidden = -1 )
-{
-  global $vtp,$sub;
-
-  foreach ( $categories as $category ) {
-    if ( $category['id'] != $forbidden )
-    {
-      $vtp->addSession( $sub, 'associate_cat' );
-      $vtp->setVar( $sub, 'associate_cat.value',   $category['id'] );
-      $content = $indent.'- '.$category['name'];
-      $vtp->setVar( $sub, 'associate_cat.content', $content );
-      if ( $category['id'] == $selected )
-        $vtp->setVar( $sub, 'associate_cat.selected', ' selected="selected"' );
-      $vtp->closeSession( $sub, 'associate_cat' );
-      display_categories( $category['subcats'], $indent.str_repeat(' ',3),
-                          $selected, $forbidden );
-    }
-  }
-}
-
 /**
  * returns an array with the ids of the restricted categories for the user
  *
diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php
index 3872718fa..0e11d4d10 100644
--- a/admin/include/functions_metadata.php
+++ b/admin/include/functions_metadata.php
@@ -40,7 +40,7 @@ function get_sync_iptc_data($file)
   {
     if (in_array($pwg_key, $datefields))
     {
-      if ( preg_match('/(\d{4})(\d{2})(\d{2})/', $value, $matches))
+      if (preg_match('/(\d{4})(\d{2})(\d{2})/', $value, $matches))
       {
         $iptc[$pwg_key] = $matches[1].'-'.$matches[2].'-'.$matches[3];
       }