Changeset 3720

Timestamp:

Aug 2, 2009, 3:04:17 PM (15 years ago)

Author:

nikrou

Message:

New feature : configuration option for thumbnail directory

Location:

trunk

Files:

• admin/thumbnail.php (modified) (1 diff)
• admin/upload.php (modified) (1 diff)
• include/config_default.inc.php (modified) (1 diff)
• include/functions.inc.php (modified) (2 diffs)
• include/ws_functions.inc.php (modified) (1 diff)

trunk/admin/thumbnail.php

@@ -205 +205 @@
       $filename_wo_ext = get_filename_wo_extension($filename);
       $tn_ext = '';
-      $base_test = $dirname.'/thumbnail/';
+      $base_test = $dirname.'/'.$conf['dir_thumbnail'].'/';
       $base_test.= $conf['prefix_thumbnail'].$filename_wo_ext.'.';
       foreach ($conf['picture_ext'] as $ext)

trunk/admin/upload.php

@@ -188 +188 @@
     $thumbnail.= '.'.$row['tn_ext'];
         $url = $cat_names[$row['storage_category_id']]['dir'];
-    $url.= 'thumbnail/'.$thumbnail;
+    $url.= $conf['dir_thumbnail'].'/'.$thumbnail;
 
     $tpl_var['thumbnail'] =

trunk/include/config_default.inc.php

@@ -264 +264 @@
 // contain characters among : a to z (case insensitive), "-" or "_".
 $conf['prefix_thumbnail'] = 'TN-';
+
+// dir_thumbnail : directory where thumbnail reside.
+$conf['dir_thumbnail'] = 'thumbnail';
 
 // users_page: how many users to display in screen

trunk/include/functions.inc.php

@@ -257 +257 @@
 function mkget_thumbnail_dir($dirname, &$errors)
 {
-  $tndir = $dirname.'/thumbnail';
+  $tndir = $dirname.'/'.$conf['dir_thumbnail'];
   if (! mkgetdir($tndir, MKGETDIR_NONE) )
   {
@@ -866 +866 @@
     $path = substr_replace(
       get_filename_wo_extension($element_info['path']),
-      '/thumbnail/'.$conf['prefix_thumbnail'],
+      '/'.$conf['dir_thumbnail'].'/'.$conf['prefix_thumbnail'],
       strrpos($element_info['path'],'/'),
       1

trunk/include/ws_functions.inc.php

@@ -1066 +1066 @@
   // thumbnail directory is a subdirectory of the photo file, hard coded
   // "thumbnail"
-  $thumbnail_dir = $upload_dir.'/thumbnail';
+  $thumbnail_dir = $upload_dir.'/'.$conf['dir_thumbnail'];
   if (!is_dir($thumbnail_dir)) {
     umask(0000);