new: cleaner URL. Instead of category.php?cat=search&search=123&start=42,

you now have category.php?/search/123/start-42. Functions make_index_url and
make_picture_url build these new URLs. Functions duplicate_picture_url and
duplicate_index_url provide shortcuts to URL creation. The current main page
page is still category.php but this can be modified easily in make_index_url
function. In this first version, no backward compatibility. Calendar
definition in URL must be discussed with rvelices.

improvement: picture.php redesigned. First actions like "set as
representative" or "delete a comment" which all lead to a redirection. Then
the page (the big mess) and includes of new sub pages to manage specific
parts of the page (metadata, user comments, rates).

new: with the cleaner URL comes a new terminology. $page['cat'] doesn't
exist anymore. $page['section'] is among 'categories', 'tags' (TODO),
'list', 'most_seen'... And sub parameters are set : $page['category'] if
$page['section'] is "categories". See URL analyse in
include/section_init.inc.php for details.


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

1 files changed, 12 insertions, 18 deletions

diff --git a/include/category_subcats.inc.php b/include/category_subcats.inc.php
index 5f64a3a7f..3aa091269 100644
--- a/include/category_subcats.inc.php
+++ b/include/category_subcats.inc.php
@@ -26,7 +26,7 @@
 // +-----------------------------------------------------------------------+
 
 /**
- * This file is included by category.php to show thumbnails for a category
+ * This file is included by the main page to show thumbnails for a category
  * that have only subcategories
  * 
  */
@@ -34,16 +34,8 @@
 $query = '
 SELECT id, name, date_last, representative_picture_id
   FROM '.CATEGORIES_TABLE.'
-  WHERE id_uppercat ';
-if (!isset($page['cat']) or !is_numeric($page['cat']))
-{
-  $query.= 'is NULL';
-}
-else
-{
-  $query.= '= '.$page['cat'];
-}
-  $query.= '
+  WHERE id_uppercat '.
+  (!isset($page['category']) ? 'is NULL' : '= '.$page['category']).'
     AND id NOT IN ('.$user['forbidden_categories'].')
   ORDER BY rank
 ;';
@@ -142,17 +134,19 @@ SELECT id, path, tn_ext
   
   foreach ($cat_thumbnails as $item)
   {
-    $url_link = PHPWG_ROOT_PATH.'category.php?cat='.$row['id'];
-
     $template->assign_block_vars(
       'thumbnails.line.thumbnail',
       array(
-        'IMAGE' => $images[$item['picture']],
-        'IMAGE_ALT' => $item['name'],
+        'IMAGE'       => $images[$item['picture']],
+        'IMAGE_ALT'   => $item['name'],
         'IMAGE_TITLE' => $lang['hint_category'],
-        'IMAGE_TS' => get_icon(@$item['date_last']),
-        'U_IMG_LINK' =>
-          PHPWG_ROOT_PATH.'category.php?cat='.$item['category']
+        'IMAGE_TS'    => get_icon(@$item['date_last']),
+        
+        'U_IMG_LINK'  => make_index_url(
+          array(
+            'category' => $item['category'],
+            )
+          ),
         )
       );