Changeset 5010

Timestamp:

Mar 1, 2010, 12:29:34 PM (14 years ago)

Author:

laurent.duretz

Message:

Merging corrections from branch 2.0

File:

• trunk/tools/create_listing_file.php (modified) (8 diffs, 2 props)

trunk/tools/create_listing_file.php

@@ -208 +208 @@
     
     // Backup input/output format support
-    array_push($pwg_conf['gd_supported_format'], $info['JPG Support'] ? 'jpeg' : NULL);
+    array_push($pwg_conf['gd_supported_format'], isset($info['JPG Support']) or isset($info['JPEG Support']) ? 'jpeg' : NULL);
     array_push($pwg_conf['gd_supported_format'], $info['PNG Support'] ? 'png' : NULL);
     array_push($pwg_conf['gd_supported_format'], ($info['GIF Read Support'] and $info['GIF Create Support']) ? 'gif' : NULL);
@@ -509 +509 @@
  * @return string
  */
-function pwg_get_thumbnail_ext($file_dir, $file_short, $file_ext, &$error_log)
+function pwg_get_thumbnail_ext($file_dir, $file_short, $file_ext, &$error_log, &$icon_log)
 {
   //~ pwg_log('>>>>> pwg_get_thumbnail_ext($file_dir = '.var_export($file_dir, TRUE).', $file_short = '.var_export($file_short, TRUE).') >>>>>'."\n");
@@ -534 +534 @@
         $thumb_ext = $conf['thumbnail_format'];
       }
-      $error_log .= $log;  
+      $icon_log .= $log;  
     }
   }
@@ -559 +559 @@
   $error_log = '';
   
+  // Create thumbnail directory if not exists
+  if (!file_exists($file_dir.'/'.$conf['thumbs']))
+  {
+    mkdir($file_dir.'/'.$conf['thumbs']);
+  }
+
   // Get original properties (width, height)
   if ($image_size = getimagesize($file_dir.'/'.$file_short.'.'.$file_ext))
@@ -702 +708 @@
   
   $error_log ='';
+  $icon_log = '';
   
   $file_base  = basename($file_full);
@@ -714 +721 @@
   {
     // Here we scan a picture : thumbnail is mandatory, high is optionnal, representative is not scanned
-    $element['tn_ext'] = pwg_get_thumbnail_ext($file_dir, $file_short, $file_ext, $error_log);
+    $element['tn_ext'] = pwg_get_thumbnail_ext($file_dir, $file_short, $file_ext, $error_log, $icon_log);
     if ($element['tn_ext'] != '')
     {
@@ -805 +812 @@
     $line .= '/>'."\n";
   }
-  
+
+  // Adding Icon generation log to message
+  $error_log .= $icon_log;
+
   //~ pwg_log('<<<<< pwg_scan_file() returns '.var_export($error_log, TRUE).' <<<<<'."\n");
   return $error_log;
@@ -1097 +1107 @@
       $format = ($info['GIF Create Support']) ? '<code>gif</code>' : NULL;
       array_push($format_list, $format);
-      $format = ($info['JPG Support']) ? '<code>jpg</code>' : NULL;
+      $format = (isset($info['JPG Support']) or isset($info['JPEG Support'])) ? '<code>jpg</code>' : NULL;
       array_push($format_list, $format);
       $format = ($info['PNG Support']) ? '<code>png</code>' : NULL;