From a68180412637ce04ff51e77257ae2731d0124662 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Thu, 4 May 2017 20:26:42 +0200
Subject: [PATCH] Don't use variables when we can use a Config object directly

---
 controllers/FrontController.php | 5 +----
 templates/index.tpl             | 4 ++--
 templates/video.tpl             | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/controllers/FrontController.php b/controllers/FrontController.php
index 16d22ee..c930b81 100644
--- a/controllers/FrontController.php
+++ b/controllers/FrontController.php
@@ -101,8 +101,7 @@ class FrontController
             $response,
             'index.tpl',
             [
-                'convert'      => $this->config->convert,
-                'uglyUrls'     => $this->config->uglyUrls,
+                'config'      => $this->config,
                 'class'        => 'index',
                 'description'  => 'Easily download videos from Youtube, Dailymotion, Vimeo and other websites.',
                 'domain'       => $uri->getScheme().'://'.$uri->getAuthority(),
@@ -247,8 +246,6 @@ class FrontController
                 'protocol'    => $protocol,
                 'config'      => $this->config,
                 'canonical'   => $this->getCanonicalUrl($request),
-                'uglyUrls'    => $this->config->uglyUrls,
-                'remux'       => $this->config->remux,
             ]
         );
 
diff --git a/templates/index.tpl b/templates/index.tpl
index 9f3583c..12d78d8 100644
--- a/templates/index.tpl
+++ b/templates/index.tpl
@@ -12,11 +12,11 @@
         <input class="URLinput" type="url" name="url" id="url"
         required autofocus placeholder="http://example.com/video" />
         </span>
-        {if $uglyUrls}
+        {if $config->uglyUrls}
             <input type="hidden" name="page" value="video" />
         {/if}
         <input class="downloadBtn" type="submit" value="Download" /><br/>
-        {if $convert}
+        {if $config->convert}
             <div class="mp3">
                 <p><input type="checkbox" id="audio" class="audio" name="audio">
                 <label for="audio"><span class="ui"></span>
diff --git a/templates/video.tpl b/templates/video.tpl
index 64ca555..d1785a5 100644
--- a/templates/video.tpl
+++ b/templates/video.tpl
@@ -24,7 +24,7 @@
     <h3><label for="format">Available formats:</label></h3>
     <form action="{path_for name="redirect"}">
         <input type="hidden" name="url" value="{$video->webpage_url}" />
-        {if $uglyUrls}
+        {if $config->uglyUrls}
             <input type="hidden" name="page" value="redirect" />
         {/if}
         <select name="format" id="format" class="formats monospace">
@@ -34,7 +34,7 @@
                         Best ({$video->ext})
                     {/strip}
                 </option>
-                {if $remux}
+                {if $config->remux}
                     <option value="bestvideo+bestaudio">
                         Remux best video with best audio
                     </option>