nystudio107 /
craft-transcoder
@@ -97,14 +97,14 @@ discard block |
||
| 97 | 97 | |
| 98 | 98 | $result = ''; |
| 99 | 99 | $settings = Transcoder::$plugin->getSettings(); |
| 100 | - $subfolder = ''; |
|
| 100 | + $subfolder = ''; |
|
| 101 | 101 | |
| 102 | - // sub folder check |
|
| 103 | - if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
| 104 | - $subfolder = $filePath->folderPath; |
|
| 105 | - } |
|
| 102 | + // sub folder check |
|
| 103 | + if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
| 104 | + $subfolder = $filePath->folderPath; |
|
| 105 | + } |
|
| 106 | 106 | |
| 107 | - // file path |
|
| 107 | + // file path |
|
| 108 | 108 | $filePath = $this->getAssetPath($filePath); |
| 109 | 109 | |
| 110 | 110 | if (!empty($filePath)) { |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | |
| 209 | 209 | // skip encoding |
| 210 | 210 | } elseif (!$generate) { |
| 211 | - $result = ""; |
|
| 211 | + $result = ""; |
|
| 212 | 212 | } else { |
| 213 | 213 | // Kick off the transcoding |
| 214 | 214 | $pid = $this->executeShellCommand($ffmpegCmd); |
@@ -239,12 +239,12 @@ discard block |
||
| 239 | 239 | { |
| 240 | 240 | $result = null; |
| 241 | 241 | $settings = Transcoder::$plugin->getSettings(); |
| 242 | - $subfolder = ''; |
|
| 242 | + $subfolder = ''; |
|
| 243 | 243 | |
| 244 | - // sub folder check |
|
| 245 | - if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
| 246 | - $subfolder = $filePath->folderPath; |
|
| 247 | - } |
|
| 244 | + // sub folder check |
|
| 245 | + if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
| 246 | + $subfolder = $filePath->folderPath; |
|
| 247 | + } |
|
| 248 | 248 | |
| 249 | 249 | $filePath = $this->getAssetPath($filePath); |
| 250 | 250 | |
@@ -335,12 +335,12 @@ discard block |
||
| 335 | 335 | { |
| 336 | 336 | $result = ''; |
| 337 | 337 | $settings = Transcoder::$plugin->getSettings(); |
| 338 | - $subfolder = ''; |
|
| 338 | + $subfolder = ''; |
|
| 339 | 339 | |
| 340 | - // sub folder check |
|
| 341 | - if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
| 342 | - $subfolder = $filePath->folderPath; |
|
| 343 | - } |
|
| 340 | + // sub folder check |
|
| 341 | + if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
| 342 | + $subfolder = $filePath->folderPath; |
|
| 343 | + } |
|
| 344 | 344 | |
| 345 | 345 | $filePath = $this->getAssetPath($filePath); |
| 346 | 346 | |
