Author: david
Date: Wed Aug 24 14:23:45 2011
New Revision: 9583
Log:
Rollback 9581. Removing 'upload' dir from path may break display of assets
Modified:
trunk/lib/model/QubitDigitalObject.php
Modified: trunk/lib/model/QubitDigitalObject.php
==============================================================================
--- trunk/lib/model/QubitDigitalObject.php Wed Aug 24 13:56:25 2011
(r9582)
+++ trunk/lib/model/QubitDigitalObject.php Wed Aug 24 14:23:45 2011
(r9583)
@@ -427,7 +427,7 @@
// Upload paths for this information object / digital object
$infoObjectPath = $this->getAssetPath();
- $filePath = sfConfig::get('sf_upload_dir').$infoObjectPath.'/';
+ $filePath = sfConfig::get('sf_web_dir').$infoObjectPath.'/';
$relativePath = $infoObjectPath.'/';
$filePathName = $filePath.$cleanFileName;
@@ -461,7 +461,7 @@
}
// Iterate through new directories and set permissions (mkdir() won't do
this properly)
- $pathToDir = sfConfig::get('sf_upload_dir');
+ $pathToDir = sfConfig::get('sf_web_dir');
foreach (explode('/', $infoObjectPath) as $dir)
{
$pathToDir .= '/'.$dir;
@@ -1095,17 +1095,17 @@
foreach (explode('/', $assetPath) as $d)
{
$createPath .= '/'.$d;
- if (!is_dir(sfConfig::get('sf_upload_dir').$createPath))
+ if (!is_dir(sfConfig::get('sf_web_dir').$createPath))
{
- mkdir(sfConfig::get('sf_upload_dir').$createPath, 0755);
+ mkdir(sfConfig::get('sf_web_dir').$createPath, 0755);
}
- chmod(sfConfig::get('sf_upload_dir').$createPath, 0755);
+ chmod(sfConfig::get('sf_web_dir').$createPath, 0755);
}
// Derive new name for file based on original file name +
newDigitalObject
// id
$filename = basename($filepath);
- $newFilepath = sfConfig::get('sf_upload_dir').$assetPath.'/'.$filename;
+ $newFilepath = sfConfig::get('sf_web_dir').$assetPath.'/'.$filename;
// Move asset to new name and path
rename($filepath, $newFilepath);
@@ -1543,7 +1543,7 @@
list($originalNameNoExtension) = explode('.', $this->getName());
$derivativeName = $originalNameNoExtension.'_'.$usageId.'.mp3';
- $derivativeFullPath =
sfConfig::get('sf_upload_dir').$this->getPath().$derivativeName;
+ $derivativeFullPath =
sfConfig::get('sf_web_dir').$this->getPath().$derivativeName;
self::convertAudioToMp3($originalFullPath, $derivativeFullPath);
@@ -1616,14 +1616,14 @@
{
case QubitTerm::REFERENCE_ID:
$derivativeName = $originalNameNoExtension.'_'.$usageId.'.flv';
- $derivativeFullPath =
sfConfig::get('sf_upload_dir').$this->getPath().$derivativeName;
+ $derivativeFullPath =
sfConfig::get('sf_web_dir').$this->getPath().$derivativeName;
self::convertVideoToFlash($originalFullPath, $derivativeFullPath);
break;
case QubitTerm::THUMBNAIL_ID:
default:
$extension = '.'.self::THUMB_EXTENSION;
$derivativeName = $originalNameNoExtension.'_'.$usageId.$extension;
- $derivativeFullPath =
sfConfig::get('sf_upload_dir').$this->getPath().$derivativeName;
+ $derivativeFullPath =
sfConfig::get('sf_web_dir').$this->getPath().$derivativeName;
$maxDimensions = self::getImageMaxDimensions($usageId);
self::convertVideoToThumbnail($originalFullPath, $derivativeFullPath,
$maxDimensions[0], $maxDimensions[1]);
}
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
