@@ -95,14 +95,14 @@ discard block |
||
95 | 95 | |
96 | 96 | $result = ''; |
97 | 97 | $settings = Transcoder::$plugin->getSettings(); |
98 | - $subfolder = ''; |
|
98 | + $subfolder = ''; |
|
99 | 99 | |
100 | - // sub folder check |
|
101 | - if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
102 | - $subfolder = $filePath->folderPath; |
|
103 | - } |
|
100 | + // sub folder check |
|
101 | + if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
102 | + $subfolder = $filePath->folderPath; |
|
103 | + } |
|
104 | 104 | |
105 | - // file path |
|
105 | + // file path |
|
106 | 106 | $filePath = $this->getAssetPath($filePath); |
107 | 107 | |
108 | 108 | if (!empty($filePath)) { |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | |
204 | 204 | // skip encoding |
205 | 205 | } elseif (!$generate) { |
206 | - $result = ""; |
|
206 | + $result = ""; |
|
207 | 207 | } else { |
208 | 208 | // Kick off the transcoding |
209 | 209 | $pid = $this->executeShellCommand($ffmpegCmd); |
@@ -232,12 +232,12 @@ discard block |
||
232 | 232 | { |
233 | 233 | $result = null; |
234 | 234 | $settings = Transcoder::$plugin->getSettings(); |
235 | - $subfolder = ''; |
|
235 | + $subfolder = ''; |
|
236 | 236 | |
237 | - // sub folder check |
|
238 | - if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
239 | - $subfolder = $filePath->folderPath; |
|
240 | - } |
|
237 | + // sub folder check |
|
238 | + if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
239 | + $subfolder = $filePath->folderPath; |
|
240 | + } |
|
241 | 241 | |
242 | 242 | $filePath = $this->getAssetPath($filePath); |
243 | 243 | |
@@ -325,12 +325,12 @@ discard block |
||
325 | 325 | Craft::info('testing123', __METHOD__); |
326 | 326 | $result = ''; |
327 | 327 | $settings = Transcoder::$plugin->getSettings(); |
328 | - $subfolder = ''; |
|
328 | + $subfolder = ''; |
|
329 | 329 | |
330 | - // sub folder check |
|
331 | - if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
332 | - $subfolder = $filePath->folderPath; |
|
333 | - } |
|
330 | + // sub folder check |
|
331 | + if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
332 | + $subfolder = $filePath->folderPath; |
|
333 | + } |
|
334 | 334 | |
335 | 335 | $filePath = $this->getAssetPath($filePath); |
336 | 336 | |
@@ -598,12 +598,12 @@ discard block |
||
598 | 598 | { |
599 | 599 | $result = ''; |
600 | 600 | $settings = Transcoder::$plugin->getSettings(); |
601 | - $subfolder = ''; |
|
601 | + $subfolder = ''; |
|
602 | 602 | |
603 | - // sub folder check |
|
604 | - if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
605 | - $subfolder = $filePath->folderPath; |
|
606 | - } |
|
603 | + // sub folder check |
|
604 | + if(\is_object($filePath) && ($filePath instanceof Asset) && $settings['createSubfolders']) { |
|
605 | + $subfolder = $filePath->folderPath; |
|
606 | + } |
|
607 | 607 | |
608 | 608 | $filePath = $this->getAssetPath($filePath); |
609 | 609 |