Changeset 1597 for trunk/include/calendar_monthly.class.php

Timestamp:

Nov 8, 2006, 4:01:28 AM (17 years ago)

Author:

rvelices

Message:

• merge category_recent_cats and category_subcats into category_cats (a lot

of common code,and now representative selection works for recent cats...)

• some replacements of get_thumbnail_src with get_thumbnail_url

File:

• trunk/include/calendar_monthly.class.php (modified) (6 diffs, 1 prop)

trunk/include/calendar_monthly.class.php

@@ -4 +4 @@
 // | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
-// | last update   : $Date: 2006-01-27 02:11:43 +0100 (ven, 27 jan 2006) $
-// | last modifier : $Author: rvelices $
-// | revision      : $Revision: 1014 $
+// | file          : $Id$
+// | last update   : $Date$
+// | last modifier : $Author$
+// | revision      : $Revision$
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -342 +341 @@
     $page['chronology_date'][CDAY]=$day;
     $query = '
-SELECT file,tn_ext,path, width, height, DAYOFWEEK('.$this->date_field.')-1 as dow';
+SELECT id, file,tn_ext,path, width, height, DAYOFWEEK('.$this->date_field.')-1 as dow';
     $query.= $this->inner_sql;
     $query.= $this->get_date_where();
@@ -350 +349 @@
     unset ( $page['chronology_date'][CDAY] );
 
-    $row = mysql_fetch_array(pwg_query($query));
-    $items[$day]['tn_path'] = get_thumbnail_src($row['path'], @$row['tn_ext']);
+    $row = mysql_fetch_assoc(pwg_query($query));
+    $items[$day]['tn_url'] = get_thumbnail_url($row);
     $items[$day]['file'] = $row['file'];
     $items[$day]['path'] = $row['path'];
@@ -449 +448 @@
         else
         {// item not an image (tn is either mime type or an image)
-          $thumb = get_thumbnail_src(
-                $items[$day]['path'], @$items[$day]['tn_ext'], false
-              );
+          $thumb = get_thumbnail_path($items[$day]);
           $tn_size = @getimagesize($thumb);
         }
@@ -508 +505 @@
           );
         $alt = $wday_labels[$dow] . ' ' . $day.
-               ' ('.$items[$day]['nb_images'].')';
+               ' ('.sprintf("%d ".l10n('pictures'), $items[$day]['nb_images']).')';
         $template->assign_block_vars('calendar.thumbnails.row.col.full',
               array(
                 'LABEL'     => $day,
-                'IMAGE'     => $items[$day]['tn_path'],
+                'IMAGE'     => $items[$day]['tn_url'],
                 'U_IMG_LINK'=> $url,
                 'STYLE'     => $css_style,
@@ -554 +551 @@
           'thumbnails.line.thumbnail',
           array(
-            'IMAGE'=>$data['tn_path'],
+            'IMAGE'=>$data['tn_url'],
             'IMAGE_ALT'=>$data['file'],
             'IMAGE_TITLE'=>$thumbnail_title,