Handle old config settings better

Signed-off-by: Andrew Welch <andrew@nystudio107.com>

Author: khalwat

src/models/Settings.php

@@ -33,7 +33,15 @@ public function __construct(array $config = [])
     {
         // Unset any deprecated properties
         if (!empty($config)) {
-            unset($config['transcoderPath'], $config['transcoderUrl']);
+            // If the old properties are set, remap them to the default
+            if (isset($config['transcoderPath'])) {
+                $config['transcoderPaths']['default'] = $config['transcoderPath'];
+                unset($config['transcoderPath']);
+            }
+            if (isset($config['transcoderUrl'])) {
+                $config['$transcoderUrls']['default'] = $config['transcoderUrl'];
+                unset($config['transcoderUrl']);
+            }
         }
         parent::__construct($config);
     }
@@ -70,10 +78,10 @@ public function __construct(array $config = [])
      */
     public $transcoderPaths = [
         'default' => '@webroot/transcoder/',
-        'video' => '@webroot/transcoder/video/',
-        'audio' => '@webroot/transcoder/audio/',
-        'thumbnail' => '@webroot/transcoder/thumbnail/',
-        'gif' => '@webroot/transcoder/gif/',
+        'video' => '@webroot/transcoder/',
+        'audio' => '@webroot/transcoder/',
+        'thumbnail' => '@webroot/transcoder/',
+        'gif' => '@webroot/transcoder/',
     ];
 
     /**
@@ -84,10 +92,10 @@ public function __construct(array $config = [])
      */
     public $transcoderUrls = [
         'default' => '@web/transcoder/',
-        'video' => '@web/transcoder/video/',
-        'audio' => '@web/transcoder/audio/',
-        'thumbnail' => '@web/transcoder/thumbnail/',
-        'gif' => '@web/transcoder/gif/',
+        'video' => '@web/transcoder/',
+        'audio' => '@web/transcoder/',
+        'thumbnail' => '@web/transcoder/',
+        'gif' => '@web/transcoder/',
     ];
 
     /**
@@ -226,10 +234,7 @@ public function __construct(array $config = [])
      */
     public function init()
     {
-        $tokens = [
-            '{DOCUMENT_ROOT}' => $_SERVER['DOCUMENT_ROOT'],
-        ];
-        $this->transcoderPath = str_replace(array_keys($tokens), array_values($tokens), $this->transcoderPath);
+        parent::init();
     }
 
     /**