Changeset 1092 for trunk/include/calendar_monthly.class.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/calendar_monthly.class.php (modified) (4 diffs)

trunk/include/calendar_monthly.class.php

@@ -225 +225 @@
   $query.= '
   GROUP BY period
-  ORDER BY YEAR('.$this->date_field.') DESC';
+  ORDER BY YEAR('.$this->date_field.') DESC, MONTH('.$this->date_field.')';
 
   $result = pwg_query($query);
@@ -351 +351 @@
     $row = mysql_fetch_array(pwg_query($query));
     $items[$day]['tn_path'] = get_thumbnail_src($row['path'], @$row['tn_ext']);
-    $items[$day]['tn_file'] = $row['file'];
+    $items[$day]['file'] = $row['file'];
+    $items[$day]['path'] = $row['path'];
+    $items[$day]['tn_ext'] = @$row['tn_ext'];
     $items[$day]['width'] = $row['width'];
     $items[$day]['height'] = $row['height'];
@@ -446 +448 @@
         else
         {// item not an image (tn is either mime type or an image)
-          $tn_size = @getimagesize($items[$day]['tn_path']);
+          $thumb = get_thumbnail_src(
+                $items[$day]['path'], @$items[$day]['tn_ext'], false
+              );
+          $tn_size = @getimagesize($thumb);
         }
         $tn_width = $tn_size[0];
@@ -549 +554 @@
           array(
             'IMAGE'=>$data['tn_path'],
-            'IMAGE_ALT'=>$data['tn_file'],
+            'IMAGE_ALT'=>$data['file'],
             'IMAGE_TITLE'=>$thumbnail_title,
             'U_IMG_LINK'=>$url