Minor UI edits and working through PHP 7.4 stuff

classes/crypto.class.php

@@ -1,37 +1,40 @@
-<?
-class Crypto {
-  /**
-   * Encrypts input text for use in database
-   *
-   * @param string $plaintext
-   * @return encrypted string or false if DB key not accessible
-   */
-  public static function encrypt($plaintext) {
-    if (apcu_exists('DBKEY')) {
-      $iv_size = openssl_cipher_iv_length('AES-128-CBC');
-      $iv = openssl_random_pseudo_bytes($iv_size);
-      $ret = base64_encode($iv.openssl_encrypt($plaintext, 'AES-128-CBC', apcu_fetch('DBKEY'), OPENSSL_RAW_DATA, $iv));
-      return $ret;
-    } else {
-      return false;
+<?php
+
+class Crypto
+{
+    /**
+     * Encrypts input text for use in database
+     *
+     * @param string $plaintext
+     * @return encrypted string or false if DB key not accessible
+     */
+    public static function encrypt($plaintext)
+    {
+        if (apcu_exists('DBKEY')) {
+            $iv_size = openssl_cipher_iv_length('AES-128-CBC');
+            $iv = openssl_random_pseudo_bytes($iv_size);
+            $ret = base64_encode($iv.openssl_encrypt($plaintext, 'AES-128-CBC', apcu_fetch('DBKEY'), OPENSSL_RAW_DATA, $iv));
+            return $ret;
+        } else {
+            return false;
+        }
     }
-  }
 
-  /**
-   * Decrypts input text from database
-   *
-   * @param string $ciphertext
-   * @return decrypted string string or false if DB key not accessible
-   */
-  public static function decrypt($ciphertext) {
-    if (apcu_exists('DBKEY')) {
-      $iv_size = openssl_cipher_iv_length('AES-128-CBC');
-      $iv = substr(base64_decode($ciphertext), 0, $iv_size);
-      $ciphertext = substr(base64_decode($ciphertext), $iv_size);
-      return openssl_decrypt($ciphertext, 'AES-128-CBC', apcu_fetch('DBKEY'), OPENSSL_RAW_DATA, $iv);
-    } else {
-      return false;
+    /**
+     * Decrypts input text from database
+     *
+     * @param string $ciphertext
+     * @return decrypted string string or false if DB key not accessible
+     */
+    public static function decrypt($ciphertext)
+    {
+        if (apcu_exists('DBKEY')) {
+            $iv_size = openssl_cipher_iv_length('AES-128-CBC');
+            $iv = substr(base64_decode($ciphertext), 0, $iv_size);
+            $ciphertext = substr(base64_decode($ciphertext), $iv_size);
+            return openssl_decrypt($ciphertext, 'AES-128-CBC', apcu_fetch('DBKEY'), OPENSSL_RAW_DATA, $iv);
+        } else {
+            return false;
+        }
     }
-  }
 }
-?>

classes/torrent_form.class.php

@@ -177,7 +177,7 @@ class TorrentForm
             <?php
             foreach (Misc::display_array($this->Categories) as $Index => $Cat) {
                 echo "\t\t\t\t\t\t<option value=\"$Index\"";
-                if ($Cat == $this->Torrent['CategoryName']) {
+                if ($Cat === $this->Torrent['CategoryName']) {
                     echo ' selected="selected"';
                 }
                 echo ">$Cat</option>\n";

static/functions/validate_upload.js

@@ -0,0 +1,39 @@
+/*
+$(() => {
+  $("#post").click(e => {
+    let hard_error = m => {
+      if (e.isDefaultPrevented()) return
+      alert(m)
+      e.preventDefault()
+    }
+    let soft_error = m => {
+      if (e.isDefaultPrevented()) return
+      if (!confirm(`${m}\n\nPress OK to upload anyway`)) {
+        e.preventDefault()
+      }
+    }
+
+    if (!$('#file').raw().value) {
+      hard_error('No torrent file is selected')
+    }
+    if ($('#album_desc').raw().value.length < 10) {
+      hard_error('The group description is too short')
+    }
+
+    if ($('#file').raw().value.slice(-8).toLowerCase() != '.torrent') {
+      soft_error('The file selected does not appear to be a .torrent file')
+    }
+    let mi = $('#mediainfo').raw().value
+    if (mi && (!mi.includes('General') || (!mi.includes('Video') && !mi.includes('Audio')))) {
+      soft_error('Your MediaInfo does not appear to be from a valid MediaInfo utility')
+    }
+    if (!$('#image').raw().value) {
+      soft_error('You did not include a cover image, which is mandatory if one exists')
+    }
+    if ($('#media_tr select').raw().value == 'DVD' && (['720p','1080i','1080p','4K'].includes($('#ressel').raw().value) || +$('#resolution').raw().value.split('x')[1] > 576)) {
+      soft_error('Your selected resolution is too high to be a DVD. Are you sure the media type should be DVD and not WEB?')
+    }
+  })
+  $('#tags').on('blur', e => $('#tags').raw().value = $('#tags').raw().value.split(',').map(t=>t.trim()).filter(t=>t).join(', '))
+})
+*/