diff --git a/composer.json b/composer.json index fb072d0..86180e8 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ }, "require-dev": { "symfony/var-dumper": "~3.2.0", - "squizlabs/php_codesniffer": "~2.7.0", + "squizlabs/php_codesniffer": "~2.8.0", "phpunit/phpunit": "~5.7.2", "ffmpeg/ffmpeg": "dev-release", "rg3/youtube-dl": "~2017.03.07", diff --git a/composer.lock b/composer.lock index 8edfbe1..88a5f74 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "1ac742cf7c2832a7af628c157ced2dbc", + "content-hash": "c3f8122650f9ab9d3c19dffeefaf6e9c", "packages": [ { "name": "aura/session", @@ -214,16 +214,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.4.1", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "0d6c7ca039329247e4f0f8f8f6506810e8248855" + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/0d6c7ca039329247e4f0f8f8f6506810e8248855", - "reference": "0d6c7ca039329247e4f0f8f8f6506810e8248855", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", "shasum": "" }, "require": { @@ -275,7 +275,7 @@ "uri", "url" ], - "time": "2017-02-27T10:51:17+00:00" + "time": "2017-03-20T17:10:46+00:00" }, { "name": "jeremykendall/php-domain-parser", @@ -1045,16 +1045,16 @@ }, { "name": "heroku/heroku-buildpack-php", - "version": "v120", + "version": "v121", "source": { "type": "git", "url": "https://github.com/heroku/heroku-buildpack-php.git", - "reference": "e0499a7fdffd56f46534a037a6c48d65cef4e645" + "reference": "727aa850a02a7af94c9225237464be8e8c8ff6db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/e0499a7fdffd56f46534a037a6c48d65cef4e645", - "reference": "e0499a7fdffd56f46534a037a6c48d65cef4e645", + "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/727aa850a02a7af94c9225237464be8e8c8ff6db", + "reference": "727aa850a02a7af94c9225237464be8e8c8ff6db", "shasum": "" }, "bin": [ @@ -1085,7 +1085,7 @@ "nginx", "php" ], - "time": "2017-02-20T15:05:49+00:00" + "time": "2017-03-27T23:33:27+00:00" }, { "name": "myclabs/deep-copy", @@ -1340,16 +1340,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "4.0.7", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "09e2277d14ea467e5a984010f501343ef29ffc69" + "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/09e2277d14ea467e5a984010f501343ef29ffc69", - "reference": "09e2277d14ea467e5a984010f501343ef29ffc69", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d", + "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d", "shasum": "" }, "require": { @@ -1399,7 +1399,7 @@ "testing", "xunit" ], - "time": "2017-03-01T09:12:17+00:00" + "time": "2017-04-02T07:44:40+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1589,16 +1589,16 @@ }, { "name": "phpunit/phpunit", - "version": "5.7.16", + "version": "5.7.18", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "dafc78e2a7d12139b0e97078d1082326bd09363d" + "reference": "c6884c0d4b8a7277de7ae3c9e597aff138c6365f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/dafc78e2a7d12139b0e97078d1082326bd09363d", - "reference": "dafc78e2a7d12139b0e97078d1082326bd09363d", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c6884c0d4b8a7277de7ae3c9e597aff138c6365f", + "reference": "c6884c0d4b8a7277de7ae3c9e597aff138c6365f", "shasum": "" }, "require": { @@ -1667,7 +1667,7 @@ "testing", "xunit" ], - "time": "2017-03-15T13:02:34+00:00" + "time": "2017-04-02T15:44:48+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -2254,16 +2254,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "2.7.1", + "version": "2.8.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "9b324f3a1132459a7274a0ace2e1b766ba80930f" + "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9b324f3a1132459a7274a0ace2e1b766ba80930f", - "reference": "9b324f3a1132459a7274a0ace2e1b766ba80930f", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d", + "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d", "shasum": "" }, "require": { @@ -2328,7 +2328,7 @@ "phpcs", "standards" ], - "time": "2016-11-30T04:02:31+00:00" + "time": "2017-03-01T22:17:45+00:00" }, { "name": "symfony/polyfill-mbstring", diff --git a/controllers/FrontController.php b/controllers/FrontController.php index 84ef036..8c82779 100644 --- a/controllers/FrontController.php +++ b/controllers/FrontController.php @@ -229,6 +229,7 @@ class FrontController 'protocol' => $protocol, 'config' => $this->config, 'canonical' => $this->getCanonicalUrl($request), + 'uglyUrls' => $this->config->uglyUrls, ] ); diff --git a/package.json b/package.json index 69ce6d1..5ed5c63 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "alltube", "description": "HTML GUI for youtube-dl", - "version": "0.7.2-beta2", + "version": "0.8.0", "author": "Pierre Rudloff", "bugs": "https://github.com/Rudloff/alltube/issues", "dependencies": { diff --git a/templates/video.tpl b/templates/video.tpl index 5b82363..8872b1e 100644 --- a/templates/video.tpl +++ b/templates/video.tpl @@ -24,7 +24,7 @@