From 5b232b3ef52d4a1f159db79ec4f867cab98ea09f Mon Sep 17 00:00:00 2001
From: qkqpttgf <45693631+qkqpttgf@users.noreply.github.com>
Date: Mon, 18 Oct 2021 10:34:54 +0800
Subject: [PATCH 1/2] fix cant change disk order

---
 common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.php b/common.php
index 2ae98af..b6c4f3e 100644
--- a/common.php
+++ b/common.php
@@ -1589,7 +1589,6 @@ output:
 <table border=1>
     <form id="sortdisks_form" action="" method="post" style="margin: 0" onsubmit="return dragsort(this);">
     <tr id="sortdisks">
-        <input name="_admin" type="hidden" value="">
         <input type="hidden" name="disktag_sort" value="">';
             $num = 0;
             foreach ($disktags as $disktag) {
@@ -1600,6 +1599,7 @@ output:
                 }
             }
             $frame .= '
+        <input name="_admin" type="hidden" value="">
     </tr>
     <tr><td colspan="' . $num . '">' . getconstStr('DragSort') . '<input type="submit" name="submit1" value="' . getconstStr('SubmitSortdisks') . '"></td></tr>
     </form>

From 04721295fae8315c16bd6f63b514d4e30ccb3343 Mon Sep 17 00:00:00 2001
From: qkqpttgf <45693631+qkqpttgf@users.noreply.github.com>
Date: Tue, 19 Oct 2021 14:36:15 +0800
Subject: [PATCH 2/2] fix random on a file cause error in php8

#446 fix
---
 common.php | 47 ++++++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/common.php b/common.php
index b6c4f3e..05b8ac1 100644
--- a/common.php
+++ b/common.php
@@ -373,26 +373,35 @@ function main($path)
         return output(json_encode($files), 200, ['Content-Type' => 'application/json']);
     }
     // random file
-    if (isset($_GET['random'])&&$_GET['random']!=='') {
-        if ($_SERVER['ishidden']<4) {
-            $tmp = [];
-            foreach (array_keys($files['list']) as $filename) {
-                if (strtolower(splitlast($filename, '.')[1])==strtolower($_GET['random'])) $tmp[$filename] = $files['list'][$filename]['url'];
-            }
-            $tmp = array_values($tmp);
-            if (count($tmp)>0) {
-                $url = $tmp[rand(0, count($tmp)-1)];
-                if (isset($_GET['url'])) return output($url, 200);
-                $header['Location'] = $url;
-                $domainforproxy = '';
-                $domainforproxy = getConfig('domainforproxy', $_SERVER['disktag']);
-                if ($domainforproxy!='') {
-                    $url = proxy_replace_domain($url, $domainforproxy, $header);
+    if (isset($_GET['random']))
+        if ($_GET['random']!==true) {
+            if ($_SERVER['ishidden']<4) {
+                if (!isset($files['list'])) {
+                    $distfolder = splitlast($path, '/');
+                    if ($distfolder[1]=='') $tmpfolder = splitlast($distfolder[0], '/')[1];
+                    else $tmpfolder = $distfolder[1];
+                    if ($tmpfolder=='') $tmpfolder = '/';
+                    return output('No files in folder " ' . htmlspecialchars($tmpfolder) . ' ".', 404);
                 }
-                return output('', 302, $header);
-            } else return output('No ' . htmlspecialchars($_GET['random']) . 'file', 404);
-        } else return output('Hidden', 401);
-    }
+                $tmp = [];
+                foreach (array_keys($files['list']) as $filename) {
+                    if (strtolower(splitlast($filename, '.')[1])==strtolower($_GET['random'])) $tmp[$filename] = $files['list'][$filename]['url'];
+                }
+                $tmp = array_values($tmp);
+                if (count($tmp)>0) {
+                    $url = $tmp[rand(0, count($tmp)-1)];
+                    if (isset($_GET['url'])) return output($url, 200);
+                    $header['Location'] = $url;
+                    $domainforproxy = '';
+                    $domainforproxy = getConfig('domainforproxy', $_SERVER['disktag']);
+                    if ($domainforproxy!='') {
+                        $url = proxy_replace_domain($url, $domainforproxy, $header);
+                    }
+                    return output('', 302, $header);
+                } else return output('No "' . htmlspecialchars($_GET['random']) . '" files', 404);
+            } else return output('Hidden', 401);
+        } else return output('must provide a suffix, like "?random=gif".', 401);
+
     // is file && not preview mode, download file
     if ($files['type']=='file' && !isset($_GET['preview'])) {
         if ( $_SERVER['ishidden']<4 || (!!getConfig('downloadencrypt', $_SERVER['disktag'])&&$files['name']!=getConfig('passfile')) ) {