Changeset 577 for trunk

Timestamp:

Oct 23, 2004, 2:38:34 PM (20 years ago)

Author:

z0rglub

Message:

can display thumbnail for non picture elements

Location:

trunk/admin

Files:

• infos_images.php (modified) (2 diffs)
• picture_modify.php (modified) (2 diffs)

trunk/admin/infos_images.php

@@ -249 +249 @@
   $current_category = get_cat_info($_GET['cat_id']);
   $url = PHPWG_ROOT_PATH.'admin.php?page=infos_images&cat_id=';
-  $category_path = get_cat_display_name($current_category['name'], '->', $url);
+  $category_path = get_cat_display_name($current_category['name'],
+                                        '->',
+                                        $url);
   
-  $form_action = PHPWG_ROOT_PATH.'admin.php?page=infos_images&cat_id='.$_GET['cat_id'];
+  $form_action = PHPWG_ROOT_PATH.'admin.php';
+  $form_action.= '?page=infos_images&cat_id='.$_GET['cat_id'];
   if($page['start'])
   {
@@ -322 +325 @@
         get_complete_dir($row['storage_category_id']);
     }
-    $thumbnail_url = $array_cat_directories[$row['storage_category_id']];
-    $thumbnail_url.= 'thumbnail/';
-    $thumbnail_url.= $conf['prefix_thumbnail'];
-    $thumbnail_url.= get_filename_wo_extension($row['file']);
-    $thumbnail_url.= '.'.$row['tn_ext'];
+
+    // thumbnail url
+    if (isset($row['tn_ext']) and $row['tn_ext'] != '')
+    {
+      $thumbnail_url = $array_cat_directories[$row['storage_category_id']];
+      $thumbnail_url.= 'thumbnail/'.$conf['prefix_thumbnail'];
+      $thumbnail_url.= get_filename_wo_extension($row['file']);
+      $thumbnail_url.= '.'.$row['tn_ext'];
+    }
+    else
+    {
+      $thumbnail_url = PHPWG_ROOT_PATH;
+      $thumbnail_url = 'template/'.$user['template'].'/mimetypes/';
+      $thumbnail_url.= strtolower(get_extension($row['file'])).'.png';
+    }
 
     // some fields are nullable in the images table

trunk/admin/picture_modify.php

@@ -189 +189 @@
 
 // some fields are nullable in the images table
-$nullables = array('name','author','keywords','date_creation','comment');
+$nullables = array('name','author','keywords','date_creation','comment',
+                   'width','height');
 foreach ($nullables as $field)
 {
@@ -210 +211 @@
 $dir_path = get_cat_display_name($current_category['name'], '->', '');
 
-$thumbnail_url = get_complete_dir($row['storage_category_id']);
-$file_wo_ext = get_filename_wo_extension($row['file']);
-$thumbnail_url.= '/thumbnail/';
-$thumbnail_url.= $conf['prefix_thumbnail'].$file_wo_ext.'.'.$row['tn_ext'];
+// thumbnail url
+if (isset($row['tn_ext']) and $row['tn_ext'] != '')
+{
+  $thumbnail_url = get_complete_dir($row['storage_category_id']);
+  $thumbnail_url.= 'thumbnail/'.$conf['prefix_thumbnail'];
+  $thumbnail_url.= get_filename_wo_extension($row['file']);
+  $thumbnail_url.= '.'.$row['tn_ext'];
+}
+else
+{
+  $thumbnail_url = PHPWG_ROOT_PATH;
+  $thumbnail_url = 'template/'.$user['template'].'/mimetypes/';
+  $thumbnail_url.= strtolower(get_extension($row['file'])).'.png';
+}
+
 $url_img = PHPWG_ROOT_PATH.'picture.php?image_id='.$_GET['image_id'];
 $url_img .= '&cat='.$row['storage_category_id'];