URL rewriting: capable of fully working with urls without ?

URL rewriting: works with image file instead of image id (change
make_picture_url to generate urls with file name instead of image id)

URL rewriting: completely works with category/best_rated and
picture/best_rated/534 (change 'category.php?' to 'category' in make_index_url
and 'picture.php?' to 'picture' in make_picture_url to see it)

fix: picture category display in upper bar

fix: function rate_picture variables and use of the new user type

fix: caddie icon appears now on category page

fix: admin element_set sql query was using storage_category_id column
(column has moved to #image_categories)

fix: replaced some old $_GET[xxx] with $page[xxx]

fix: pictures have metadata url (use ? parameter - might change later)

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

3 files changed, 44 insertions, 41 deletions

diff --git a/admin/element_set_global.php b/admin/element_set_global.php
index 40b5ac6cb..61ef2d6ee 100644
--- a/admin/element_set_global.php
+++ b/admin/element_set_global.php
@@ -28,9 +28,9 @@
 /**
  * Management of elements set. Elements can belong to a category or to the
  * user caddie.
- * 
+ *
  */
- 
+
 if (!defined('PHPWG_ROOT_PATH'))
 {
   die('Hacking attempt!');
@@ -58,9 +58,9 @@ function get_elements_keywords($element_ids)
   {
     return array();
   }
-  
+
   $keywords = array();
-  
+
   $query = '
 SELECT keywords
   FROM '.IMAGES_TABLE.'
@@ -84,7 +84,7 @@ SELECT keywords
 if (isset($_POST['submit']))
 {
   $collection = array();
-  
+
 //   echo '<pre>';
 //   print_r($_POST);
 //   echo '</pre>';
@@ -136,7 +136,7 @@ SELECT image_id
             )
           );
       }
-  
+
       mass_inserts(
         IMAGE_CATEGORY_TABLE,
         array('image_id', 'category_id'),
@@ -170,7 +170,7 @@ SELECT image_id
       array($_POST['dissociate']),
       $destinations_of[ $_POST['dissociate'] ]
       );
-    
+
     // Eventually, deletion of associations
     $query = '
 DELETE
@@ -185,7 +185,7 @@ DELETE
     // have deleted the link between C and 1, while it should be kept due to
     // B. Who said "complicated"?
     check_links();
-    
+
     update_category($associated_categories);
   }
 
@@ -205,7 +205,7 @@ DELETE
       array_push($dbfields['update'], $formfield);
     }
   }
-  
+
   // updating elements is useful only if needed...
   if (count($dbfields['update']) > 0 and count($collection) > 0)
   {
@@ -220,7 +220,7 @@ SELECT id, keywords
     {
       $data = array();
       $data['id'] = $row['id'];
-      
+
       if (!empty($_POST['add_keywords']))
       {
         $data['keywords'] =
@@ -241,7 +241,7 @@ SELECT id, keywords
         {
           $data['keywords'] = empty($row['keywords']) ? '' : $row['keywords'];
         }
-        
+
         $data['keywords'] =
           implode(
             ',',
@@ -287,7 +287,7 @@ SELECT id, keywords
           .'-'.$_POST['date_creation_day']
           ;
       }
-      
+
       array_push($datas, $data);
     }
     // echo '<pre>'; print_r($datas); echo '</pre>';
@@ -308,18 +308,18 @@ $base_url = PHPWG_ROOT_PATH.'admin.php';
 $template->assign_vars(
   array(
     'CATEGORIES_NAV'=>$page['title'],
-    
+
     'L_SUBMIT'=>$lang['submit'],
 
     'U_COLS'=>$base_url.get_query_string_diff(array('cols')),
     'U_DISPLAY'=>$base_url.get_query_string_diff(array('display')),
-    
+
     'U_UNIT_MODE'
     =>
     $base_url
     .get_query_string_diff(array('mode','display'))
     .'&amp;mode=unit',
-    
+
     'F_ACTION'=>$base_url.get_query_string_diff(array()),
    )
  );
@@ -379,7 +379,7 @@ SELECT DISTINCT(category_id) AS id, c.name, uppercats, global_rank
   WHERE ic.image_id IN ('.implode(',', $page['cat_elements_id']).')
     AND ic.category_id = c.id
     AND ic.image_id = i.id
-    AND ic.category_id != i.storage_category_id
+    AND ic.is_storage = \'false\'
 ;';
   display_select_cat_wrapper($query, array(), $blockname, true);
 }
@@ -484,7 +484,7 @@ SELECT id,path,tn_ext
   while ($row = mysql_fetch_array($result))
   {
     $src = get_thumbnail_src($row['path'], @$row['tn_ext']);
-    
+
     $template->assign_block_vars(
       'thumbnails.line.thumbnail',
       array(
@@ -494,7 +494,7 @@ SELECT id,path,tn_ext
         'TITLE' => 'TODO'
         )
       );
-    
+
     // create a new line ?
     if (++$row_number == $page['cols'])
     {
diff --git a/admin/picture_modify.php b/admin/picture_modify.php
index 05412492c..be7497a07 100644
--- a/admin/picture_modify.php
+++ b/admin/picture_modify.php
@@ -127,7 +127,7 @@ if (isset($_POST['associate'])
     and count($_POST['cat_dissociated']) > 0)
 {
   $datas = array();
-  
+
   foreach ($_POST['cat_dissociated'] as $category_id)
   {
     array_push(
@@ -138,7 +138,7 @@ if (isset($_POST['associate'])
         )
       );
   }
-  
+
   mass_inserts(
     IMAGE_CATEGORY_TABLE,
     array('image_id', 'category_id'),
@@ -166,7 +166,7 @@ if (isset($_POST['dissociate'])
       $destinations
       );
   }
-  
+
   $query = '
 DELETE FROM '.IMAGE_CATEGORY_TABLE.'
   WHERE image_id = '.$_GET['image_id'].'
@@ -213,6 +213,7 @@ SELECT *
 $row = mysql_fetch_array(pwg_query($query));
 
 $storage_category_id = $row['category_id'];
+$image_file = $row['file'];
 
 // Navigation path
 
@@ -236,34 +237,34 @@ $template->assign_vars(
         '&amp;image_id='.$_GET['image_id'].
         (isset($_GET['cat_id']) ? '&amp;cat_id='.$_GET['cat_id'] : '').
         '&amp;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'],
-  
+
     'F_ACTION' =>
         PHPWG_ROOT_PATH.'admin.php'
         .get_query_string_diff(array('sync_metadata'))
@@ -292,7 +293,7 @@ else
 get_day_list('date_creation_day', $day);
 get_month_list('date_creation_month', $month);
 $template->assign_vars(array('DATE_CREATION_YEAR_VALUE' => $year));
-  
+
 $query = '
 SELECT category_id, uppercats
   FROM '.IMAGE_CATEGORY_TABLE.' AS ic
@@ -315,7 +316,7 @@ while ($row = mysql_fetch_array($result))
       PHPWG_ROOT_PATH.'admin.php?page=cat_modify&amp;cat_id=',
       false
       );
-    
+
   if ($row['category_id'] == $storage_category_id)
   {
     $template->assign_vars(array('STORAGE_CATEGORY' => $name));
@@ -354,6 +355,7 @@ if (isset($_GET['cat_id'])
   $url_img = make_picture_URL(
     array(
       'image_id' => $_GET['image_id'],
+      'image_file' => $image_file,
       'category' => $_GET['cat_id'],
       )
     );
@@ -365,6 +367,7 @@ else
     $url_img = make_picture_URL(
       array(
         'image_id' => $_GET['image_id'],
+        'image_file' => $image_file,
         'category' => $category,
         )
       );
@@ -381,7 +384,7 @@ if (isset($url_img))
       )
     );
 }
-  
+
 // associate to another category ?
 $query = '
 SELECT id,name,uppercats,global_rank
diff --git a/admin/user_perm.php b/admin/user_perm.php
index fdd4be7eb..78409965e 100644
--- a/admin/user_perm.php
+++ b/admin/user_perm.php
@@ -92,19 +92,19 @@ SELECT id
   // an error (in SQL statement), so we need to know which categories are
   // accesible
   $authorized_ids = array();
-    
+
   $query = '
 SELECT cat_id
   FROM '.USER_ACCESS_TABLE.'
   WHERE user_id = '.$page['user'].'
 ;';
   $result = pwg_query($query);
-  
+
   while ($row = mysql_fetch_array($result))
   {
     array_push($authorized_ids, $row['cat_id']);
   }
-  
+
   $inserts = array();
   $to_autorize_ids = array_diff($private_uppercats, $authorized_ids);
   foreach ($to_autorize_ids as $to_autorize_id)
@@ -137,7 +137,7 @@ $template->assign_vars(
         ),
     'L_CAT_OPTIONS_TRUE'=>$lang['authorized'],
     'L_CAT_OPTIONS_FALSE'=>$lang['forbidden'],
-    
+
     'F_ACTION' =>
         PHPWG_ROOT_PATH.
         'admin.php?page=user_perm'.
@@ -177,7 +177,7 @@ if (mysql_num_rows($result) > 0)
     $template->assign_block_vars(
       'groups.category',
       array(
-        'NAME' => get_cat_display_name_cache($category['uppercats'], '', false)
+        'NAME' => get_cat_display_name_cache($category['uppercats'], null, false)
         )
       );
   }
@@ -197,7 +197,7 @@ if (count($group_authorized) > 0)
 $query_true.= '
 ;';
 display_select_cat_wrapper($query_true,array(),'category_option_true');
-  
+
 $result = pwg_query($query_true);
 $authorized_ids = array();
 while ($row = mysql_fetch_array($result))