Changeset 1090 for trunk/include/category_default.inc.php

Timestamp:

Mar 21, 2006, 2:27:21 AM (18 years ago)

Author:

rvelices

Message:

URL rewriting: fix some old links, calendar simplification and prepare code
for urls without ? (added functions get_root_url and add_url_param)

File:

• trunk/include/category_default.inc.php (modified) (7 diffs)

trunk/include/category_default.inc.php

@@ -29 +29 @@
  * This file is included by the main page to show thumbnails for the default
  * case
- * 
+ *
  */
 
@@ -53 +53 @@
   {
     $row['rank'] = $page['rank_of'][ $row['id'] ];
-    
+
     array_push($pictures, $row);
   }
@@ -73 +73 @@
 {
   $thumbnail_url = get_thumbnail_src($row['path'], @$row['tn_ext']);
-  
+
   // message in title for the thumbnail
   $thumbnail_title = $row['file'];
@@ -80 +80 @@
     $thumbnail_title .= ' : '.$row['filesize'].' KB';
   }
-  
-  // url link on picture.php page
-  $url_link = PHPWG_ROOT_PATH.'picture.php?/'.$row['id'];
 
-  switch ($page['section'])
-  {
-    case 'categories' :
-    {
-      $url_link.= '/category/'.$page['category'];
-      break;
-    }
-    case 'tags' :
-    {
-      // TODO
-      break;
-    }
-    case 'search' :
-    {
-      $url_link.= '/search/'.$page['search'];
-      break;
-    }
-    case 'list' :
-    {
-      $url_link.= '/list/'.implode(',', $page['list']);
-      break;
-    }
-    default :
-    {
-      $url_link.= '/'.$page['section'];
-    }
-  }
-  
-  if (isset($page['chronology']))
-  {
-    $url_link.= '/chronology='.$page['chronology'];
-  }
-    
+  // link on picture.php page
+  $url = duplicate_picture_url(
+        array(
+          'image_id' => $row['id'],
+          'image_file' => $row['file']
+        )
+      );
+
   $template->assign_block_vars(
     'thumbnails.line.thumbnail',
@@ -124 +96 @@
       'IMAGE_TITLE'        => $thumbnail_title,
       'IMAGE_TS'           => get_icon($row['date_available']),
-      
-      'U_IMG_LINK'         => $url_link
+
+      'U_IMG_LINK'         => $url
       )
     );
@@ -159 +131 @@
       }
     }
-  
+
     $template->assign_block_vars(
       'thumbnails.line.thumbnail.element_name',
@@ -167 +139 @@
       );
   }
-    
+
   if ($user['show_nb_comments']
       and isset($page['category'])