Changeset 4723

Timestamp:

07/26/07 21:29:42 (1 year ago)

Author:

fabien

Message:

fixed thumbnail creation for non image media (#1981). This is a quick fix with the current code, but all the code really need to be rewritten

Files:

• plugins/sfMediaLibraryPlugin/README (modified) (1 diff)
• plugins/sfMediaLibraryPlugin/modules/sfMediaLibrary/lib/BasesfMediaLibraryActions.class.php (modified) (12 diffs)

plugins/sfMediaLibraryPlugin/README

@@ -140 +140 @@
-=== Trunk ===
-
+ * fabien: Fixed thumbnail creation for non image media (#1981)
+
-=== 2007-07-10 | 0.8.2 Beta === 
-

plugins/sfMediaLibraryPlugin/modules/sfMediaLibrary/lib/BasesfMediaLibraryActions.class.php

@@ -18 +18 @@
-class BasesfMediaLibraryActions extends sfActions
-{
+  protected
+    $useThumbnails = false;
+
-  public function preExecute()
-  {
-
-
-
-
+
+
+
-      $this->thumbnails_dir = sfConfig::get('app_sfMediaLibrary_thumbnails_dir', 'thumbnail');
- 
-
-
+
+
+
-  public function executeIndex()
-  {
-    $currentDir = $this->dot2slash($this->getRequestParameter('dir'));
-    $this->currentDir = $this->getRequestParameter('dir');
- . 
+.
-    $this->webAbsCurrentDir = $this->getRequest()->getRelativeUrlRoot().'/'.sfConfig::get('sf_upload_dir_name').'/assets'.$currentDir;
-    $this->absCurrentDir = sfConfig::get('sf_upload_dir').'/assets/'.$currentDir;
@@ -40 +42 @@
-    // directories
-    $dirsQuery = sfFinder::type('dir')->maxdepth(0)->prune('.*')->discard('.*')->relative();
-($this->use_t
+ ($this->useT
-    {
-      $dirsQuery = $dirsQuery->discard($this->thumbnails_dir);
-    }
- 
+
-    sort($dirs);
-    $this->dirs = $dirs;
-
+
-    // files, with stats
-    $files = sfFinder::type('file')->maxdepth(0)->prune('.*')->discard('.*')->relative()->in($this->absCurrentDir);
@@ -54 +56 @@
-    foreach ($files as $file)
-    {
- 
+
-      if (!$this->getRequestParameter('images_only') || $this->isImage($ext))
-      {
@@ -103 +105 @@
-
-    @rename($absCurrentDir.'/'.$name, $absCurrentDir.'/'.$new_name);
-
-($this->use_t
+
+ ($this->useT
-    {
-      @rename($absCurrentDir.'/'.$this->thumbnails_dir.'/'.$name, $absCurrentDir.'/'.$this->thumbnails_dir.'/'.$new_name);
@@ -125 +127 @@
-      $this->info = $this->getInfo($name);
-    }
-
+
-    $this->type = $type;
-  }
@@ -135 +137 @@
-    $stats = stat($this->absCurrentDir.'/'.$filename);
-    $info['size'] = $stats['size'];
-
-
-($this->use_t
+ 
+
+ ($this->useT
-      {
-        $info['icon'] = $this->webAbsCurrentDir.'/'.$this->thumbnails_dir.'/'.$filename;
@@ -149 +151 @@
-    else
-    {
-
+ 
-      {
-        $info['icon'] = '/sfMediaLibraryPlugin/images/'.$info['ext'].'.png';
@@ -158 +160 @@
-      }
-    }
-
+
-    return $info;
-  }
@@ -172 +174 @@
-    $fileName = $this->sanitizeFile($this->getRequest()->getFileName('file'));
-
-($this->use_t
-
-
+ ($this->isImage($info['ext']) && $this->useT
+
+ 
-      {
-        // If the thumbnails directory doesn't exist, create it now
@@ -199 +201 @@
-
-    unlink($absCurrentFile);
-
-($this->use_t
+
+ ($this->useT
-    {
-      $absThumbnailFile = sfConfig::get('sf_upload_dir').'/assets/'.$currentDir.'/'.$this->thumbnails_dir.'/'.$currentFile;
-
+ 
-      {
-        unlink($absThumbnailFile);
@@ -220 +222 @@
-    $old = umask(0000);
-    @mkdir($absCurrentDir, 0777);
-($this->use_t
+ ($this->useT
-    {
-      @mkdir($absCurrentDir.'/'.$this->thumbnails_dir, 0777);
@@ -236 +238 @@
-    $this->forward404Unless(is_dir($absCurrentDir));
-
-_t
+T
-    {
-      rmdir($absCurrentDir.'/'.$this->thumbnails_dir);
-    }
-
+
-    rmdir($absCurrentDir);
-
-    $this->redirect('sfMediaLibrary/index?dir='.$this->getRequestParameter('current_path'));
-  }
-
+
-  protected function dot2slash($txt)
-  {