Changeset 58

Timestamp:

06/02/08 14:46:23

Author:

nperriault

Message:

Fixed application thumb upload and display

Files:

• trunk/apps/main/modules/applications/actions/actions.class.php (modified) (3 diffs)
• trunk/config/ProjectConfiguration.class.php (modified) (1 diff)
• trunk/lib/model/Application.php (modified) (1 diff)

trunk/apps/main/modules/applications/actions/actions.class.php

@@ -348 +348 @@
-   * @param  Application           $application  The Application object instance
-   */
-&
+
-  {
-    if (is_null($file))
@@ -354 +354 @@
-      return null;
-    }
-
+
-    $thumb = ImagesTools::createThumb (
-      $file,
-      sfConfig::get('sf_upload_dir').DIRECTORY_SEPARATOR.sfConfig::get('app_applications_upload_dir', 'applications'),
-_data
+
-      sfConfig::get('app_applications_screenshot_width', 200),
-      sfConfig::get('app_applications_screenshot_height', 140),
@@ -365 +365 @@
-    );
-    
-
+
+
+
+
+
-  }
-

trunk/config/ProjectConfiguration.class.php

@@ -22 +22 @@
-    }
-  }
+  
+  public function getWebDir()
+  {
+    return sfConfig::get('sf_web_dir');
+  }
+  
+  public function getUploadDir()
+  {
+    return sfConfig::get('sf_upload_dir');
+  }
+  
+  public function getUploadDirName()
+  {
+    $t = explode('/', sfConfig::get('sf_upload_dir'));
+    return (count($t) > 0) ? array_pop($t) : null;
+  }
-}

trunk/lib/model/Application.php

@@ -122 +122 @@
-      return sfConfig::get('app_applications_default_screenshot');
-    }
+    $t = explode('/', sfConfig::get('sf_upload_dir'));// FIXME: move this somewhere else
+    $base_dir = array_pop($t);
-    return sprintf('/%s/%s/%s',
-sfConfig::get('sf_upload_dir_name')
+$base_dir
-                   sfConfig::get('app_applications_upload_dir', 'applications'),
-                   $this->getScreenshotPath());