Upload form: Fix resolution bug

classes/torrent_form.class.php

@@ -323,7 +323,7 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
     }
 ?>
           </select>
-          <input type="text" id="resolution" name="resolution" size="10" class="hidden tooltip" title='Enter "Other" resolutions in the form ###x###' value="<?=$Torrent['Resolution']?>" readonly></input>
+          <input type="text" id="resolution" name="resolution" size="10" class="hidden tooltip" pattern="[0-9]+x[0-9]+" title='Enter "Other" resolutions in the form ###x###' value="<?=$Torrent['Resolution']?>" readonly></input>
           <script>
             if ($('#ressel').raw().value == "Other") {
               $('#resolution').raw().readOnly = false
@@ -573,7 +573,7 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
 <?
     foreach($this->Resolutions as $Res) {
       echo "\t\t\t\t\t\t<option value=\"$Res\"";
-      if ($Res == $Torrent['Resolution'] || (!isset($FoundRes) && isset($Torrent ['Resolution']) && $Res == "Other")) {
+      if ($Res == $Torrent['Resolution'] || (!isset($FoundRes) && isset($Torrent['Resolution']) && $Res == "Other")) {
         echo " selected";
         $FoundRes = true;
       }

sections/upload/upload_handle.php

@@ -54,7 +54,8 @@ $Properties['Container'] = isset($_POST['container']) ? $_POST['container'] : ''
 $Properties['Media'] = $_POST['media'];
 
 $Properties['Codec'] = isset($_POST['codec']) ? $_POST['codec'] : '';
-$Properties['Resolution'] = isset($_POST['resolution']) ? $_POST['resolution'] : '';
+if (!($_POST['resolution'] ?? false)) $_POST['resolution'] = $_POST['ressel'] ?? '';
+$Properties['Resolution'] = $_POST['resolution'] ?? '';
 $Properties['AudioFormat'] = isset($_POST['audioformat']) ? $_POST['audioformat'] : '';
 $Properties['Subbing'] = isset($_POST['sub']) ? $_POST['sub'] : '';
 $Properties['Language'] = isset($_POST['lang']) ? $_POST['lang'] : '';