- new special category : random pictures

- reorganisation of special categories menu : template is used only for
  template. A special category is presented as the template tells to do so.

- favorites becomes just another special category

- bug correction for best rated category : wrong MySQL query if user has
  forbidden categories (see include/functions_category.inc.php diff)


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

include/category_default.inc.php

@@ -38,7 +38,7 @@
 $array_cat_directories = array();
   
 $query = '
-SELECT DISTINCT(id),file,date_available
+SELECT DISTINCT(id),file,date_available,category_id
        ,tn_ext,name,filesize,storage_category_id,average_rate
   FROM '.IMAGES_TABLE.' AS i
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id=ic.image_id
@@ -113,7 +113,15 @@ while ($row = mysql_fetch_array($result))
   }
   $thumbnail_title .= ' : '.$filesize.' KB';
   // url link on picture.php page
-  $url_link = PHPWG_ROOT_PATH.'picture.php?cat='.$page['cat'];
+  $url_link = PHPWG_ROOT_PATH.'picture.php?';
+  if ($page['cat'] == 'random')
+  {
+    $url_link.= 'cat='.$row['category_id'];
+  }
+  else
+  {
+   $url_link.= 'cat='.$page['cat'];
+  }
   $url_link.= '&image_id='.$row['id'];
   if ($page['cat'] == 'search')
   {