From 7545301144cc1b6ba0cb78cbec769c1d680b17dc Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sun, 5 Mar 2017 01:21:41 -0500 Subject: [PATCH] ### Changed * Fixed an issue with the downloadFile controller action * Broke out the changelog to `CHANGELOG.md` * Updated `README.md` --- CHANGELOG.md | 13 +++++++++++++ README.md | 8 ++------ controllers/TranscoderController.php | 4 ++-- releases.json | 12 +++++++++++- resources/icon-mask.svg | 20 -------------------- 5 files changed, 28 insertions(+), 29 deletions(-) create mode 100644 CHANGELOG.md delete mode 100644 resources/icon-mask.svg diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..7647f0a --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,13 @@ +# Transcoder Changelog + +## 1.1.1 - 2017.03.05 +### Changed +* Fixed an issue with the downloadFile controller action +* Broke out the changelog to `CHANGELOG.md` +* Updated `README.md` + +## 1.1.0 - 2016.09.12 +### Added +* Initial release + +Brought to you by [nystudio107](https://nystudio107.com) \ No newline at end of file diff --git a/README.md b/README.md index 3f026b8..94904c7 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ Transcode videos to various formats, and provide thumbnails of the video +Related: [Transcoder for Craft 3.x](https://github.com/nystudio107/craft3-transcoder) + ## Installation To install Transcoder, follow these steps: @@ -144,10 +146,4 @@ Some things to do, and ideas for potential features: * The videos could potentially be resized, either to an aspect ratio or an absolute size or what have you * Accessors could be written to get information about a video (height, width, duration, and so on) -## Transcoder Changelog - -### 1.1.0 -- 2016.09.12 - -* Initial release - Brought to you by [nystudio107](https://nystudio107.com) \ No newline at end of file diff --git a/controllers/TranscoderController.php b/controllers/TranscoderController.php index 8eb48d4..8b77d06 100644 --- a/controllers/TranscoderController.php +++ b/controllers/TranscoderController.php @@ -32,8 +32,8 @@ public function actionDownloadFile() $url = urldecode(craft()->request->getParam('url')); $filepath = parse_url($url, PHP_URL_PATH); $filepath = $_SERVER['DOCUMENT_ROOT'] . $filepath; - $content = IOHelper::getFileContents($path); - craft()->request->sendFile($path, $content, array('forceDownload' => true), true); + $content = IOHelper::getFileContents($filepath); + craft()->request->sendFile($filepath, $content, array('forceDownload' => true), true); } /* -- actionDownloadFile */ } \ No newline at end of file diff --git a/releases.json b/releases.json index a47e641..bd1da23 100644 --- a/releases.json +++ b/releases.json @@ -1,4 +1,14 @@ [ + { + "version": "1.1.1", + "downloadUrl": "https://github.com/nystudio107/transcoder/archive/master.zip", + "date": "2017-03-05T14:52:56.996Z", + "notes": [ + "[Fixed] Fixed an issue with the downloadFile controller action", + "[Added] Broke out the changelog to `CHANGELOG.md`", + "[Improved] Updated `README.md`" + ] + }, { "version": "1.1.0", "downloadUrl": "https://github.com/nystudio107/transcoder/archive/master.zip", @@ -7,4 +17,4 @@ "[Added] Initial release" ] } -] \ No newline at end of file +] diff --git a/resources/icon-mask.svg b/resources/icon-mask.svg deleted file mode 100644 index d43878a..0000000 --- a/resources/icon-mask.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - -