Changeset 1092 for trunk/include/functions_html.inc.php

Timestamp:

Mar 22, 2006, 2:01:47 AM (18 years ago)

Author:

rvelices

Message:

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)

File:

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

trunk/include/functions_html.inc.php

@@ -67 +67 @@
     $title .=  ' '.$lang['days'];
     $size = getimagesize( $icon_url );
+    $icon_url = get_root_url().$icon_url;
     $output = '<img title="'.$title.'" src="'.$icon_url.'" class="icon" style="border:0;';
     $output.= 'height:'.$size[1].'px;width:'.$size[0].'px" alt="(!)" />';
@@ -245 +246 @@
  * categories string returned contains categories as given in the input
  * array $cat_informations. $cat_informations array must be an association
- * of {category_id => category_name}. If url input parameter is empty,
+ * of {category_id => category_name}. If url input parameter is null,
  * returns only the categories name without links.
  *
@@ -254 +255 @@
  */
 function get_cat_display_name($cat_informations,
-                              $url = 'category.php?/category/',
+                              $url = '',
                               $replace_space = true)
 {
@@ -272 +273 @@
     }
 
-    if ($url == '')
+    if ( !isset($url) )
     {
       $output.= $name;
+    }
+    elseif ($url == '')
+    {
+      $output.= '<a class=""';
+      $output.= ' href="'.make_index_url( array('category'=>$id) ).'">';
+      $output.= $name.'</a>';
     }
     else
@@ -307 +314 @@
  */
 function get_cat_display_name_cache($uppercats,
-                                    $url = 'category.php?/category/',
+                                    $url = '',
                                     $replace_space = true)
 {
@@ -340 +347 @@
     }
 
-    if ($url == '')
+    if ( !isset($url) )
     {
       $output.= $name;
+    }
+    elseif ($url == '')
+    {
+      $output.= '
+<a class=""
+   href="'.make_index_url( array('category'=>$category_id) ).'">'.$name.'</a>';
     }
     else
@@ -475 +488 @@
 
 function get_cat_display_name_from_id($cat_id,
-                                      $url = 'category.php?/category/',
+                                      $url = '',
                                       $replace_space = true)
 {