fix random on a file cause error in php8

#446 fix
pull/610/head
qkqpttgf 2021-10-19 14:36:15 +08:00 committed by GitHub
parent 5b232b3ef5
commit 04721295fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 19 deletions

View File

@ -373,26 +373,35 @@ function main($path)
return output(json_encode($files), 200, ['Content-Type' => 'application/json']); return output(json_encode($files), 200, ['Content-Type' => 'application/json']);
} }
// random file // random file
if (isset($_GET['random'])&&$_GET['random']!=='') { if (isset($_GET['random']))
if ($_SERVER['ishidden']<4) { if ($_GET['random']!==true) {
$tmp = []; if ($_SERVER['ishidden']<4) {
foreach (array_keys($files['list']) as $filename) { if (!isset($files['list'])) {
if (strtolower(splitlast($filename, '.')[1])==strtolower($_GET['random'])) $tmp[$filename] = $files['list'][$filename]['url']; $distfolder = splitlast($path, '/');
} if ($distfolder[1]=='') $tmpfolder = splitlast($distfolder[0], '/')[1];
$tmp = array_values($tmp); else $tmpfolder = $distfolder[1];
if (count($tmp)>0) { if ($tmpfolder=='') $tmpfolder = '/';
$url = $tmp[rand(0, count($tmp)-1)]; return output('No files in folder " ' . htmlspecialchars($tmpfolder) . ' ".', 404);
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); $tmp = [];
} else return output('No ' . htmlspecialchars($_GET['random']) . 'file', 404); foreach (array_keys($files['list']) as $filename) {
} else return output('Hidden', 401); 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 // is file && not preview mode, download file
if ($files['type']=='file' && !isset($_GET['preview'])) { if ($files['type']=='file' && !isset($_GET['preview'])) {
if ( $_SERVER['ishidden']<4 || (!!getConfig('downloadencrypt', $_SERVER['disktag'])&&$files['name']!=getConfig('passfile')) ) { if ( $_SERVER['ishidden']<4 || (!!getConfig('downloadencrypt', $_SERVER['disktag'])&&$files['name']!=getConfig('passfile')) ) {