Merge branch 'develop' into feature/stream

Conflicts:
	composer.lock

FAQ.md

@@ -0,0 +1,5 @@
+# Frequently asked questions
+
+## My browser plays the video. How do I download it?
+Most recent browsers automatically play a video if it is a format they know how to play.
+You can ususally download the video by doing *File > Save to* or *ctrl + S*.

README.md

@@ -1,11 +1,11 @@
-alltube
+Alltube Download
 =======
 
 HTML GUI for youtube-dl (http://alltubedownload.net/)
 
 ![Screenshot](img/screenshot.png "Alltube GUI screenshot")
 
-##Setup
+## Setup
 
 ### From a release package
 You can download the latest release package [here](https://github.com/Rudloff/alltube/releases).
@@ -28,20 +28,20 @@ You should also ensure that the *templates_c* folder has the right permissions:
 
 If your web server is Apache, you need to set the `AllowOverride` setting to `All` or `FileInfo`.
 
-##Config
+## Config
 
 If you want to use a custom config, you need to create a config file:
 
     cp config.example.yml config.yml
 
-##Web server configuration
-###Apache
+## Web server configuration
+### Apache
 You will need the following modules:
 
 * mod_mime
 * mod_rewrite
 
-###Nginx
+### Nginx
 Here is an exemple Nginx configuration:
 
     server {
@@ -90,12 +90,12 @@ Here is an exemple Nginx configuration:
     }
 
 
-##License
+## License
 This software is available under the [GNU General Public License](http://www.gnu.org/licenses/gpl.html).
 
 __Please use a different name and logo if you run it on a public server.__
 
-##Other dependencies
+## Other dependencies
 You need [avconv](https://libav.org/avconv.html), [rtmpdump](http://rtmpdump.mplayerhq.hu/) and [curl](https://curl.haxx.se/) in order to enable conversions.
 If you don't want to enable conversions, you can disable it in *config.yml*.
 

classes/Config.php

@@ -47,7 +47,7 @@ class Config
             $yaml = Yaml::parse(file_get_contents($yamlfile));
             if (isset($yaml) && is_array($yaml)) {
                 foreach ($yaml as $param => $value) {
-                    if (isset($this->$param)) {
+                    if (isset($this->$param) && isset($value)) {
                         $this->$param = $value;
                     }
                 }

composer.json

@@ -6,7 +6,7 @@
 	"type": "project",
 	"require": {
 		"smarty/smarty": "~3.1.29",
-		"rg3/youtube-dl": "~2016.07.26",
+		"rg3/youtube-dl": "~2016.07.26.2",
 		"slim/slim": "~3.5.0",
 		"mathmarques/smarty-view": "~1.1.0",
 		"symfony/yaml": "~3.1.0",
@@ -31,11 +31,11 @@
 		"type": "package",
 		"package": {
 			"name": "rg3/youtube-dl",
-			"version": "2016.07.26",
+			"version": "2016.07.26.2",
 			"source": {
 				"url": "https://github.com/rg3/youtube-dl.git",
 				"type": "git",
-				"reference": "2016.07.26"
+				"reference": "2016.07.26.2"
 			}
 		}
 	}, {

composer.lock

@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "3f4935b8a1ed3005a51f97b4da89cb34",
-    "content-hash": "9f3900f56384d5e60c097ca719c0af08",
+    "hash": "c4eb7b9cf1322b024130fba8517794f3",
+    "content-hash": "3608a48b9ac14ccba68577310338f6b7",
     "packages": [
         {
             "name": "container-interop/container-interop",
@@ -571,11 +571,11 @@
         },
         {
             "name": "rg3/youtube-dl",
-            "version": "2016.07.26",
+            "version": "2016.07.26.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rg3/youtube-dl.git",
-                "reference": "2016.07.26"
+                "reference": "2016.07.26.2"
             },
             "type": "library"
         },

controllers/FrontController.php

@@ -199,6 +199,7 @@ class FrontController
                                     array(
                                         'curl',
                                         '--silent',
+                                        '--location',
                                         '--user-agent', $video->http_headers->{'User-Agent'},
                                         $video->url
                                     ),