Merge pull request #40 from qkqpttgf/master

pull
pull/98/head
Mr.Lin 2020-03-11 19:54:34 +08:00 committed by GitHub
commit daef9328b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions

View File

@ -13,7 +13,7 @@ $constStr = [
'zh-cn' => '中文', 'zh-cn' => '中文',
'ja' => '日本語', 'ja' => '日本語',
'ko-kr' => '한국어', 'ko-kr' => '한국어',
'fa' => 'Persian', 'fa' => 'فارسی',
], ],
'Week' => [ 'Week' => [
'en-us' => [ 'en-us' => [

View File

@ -91,7 +91,7 @@ function getcache($str)
return $cache->fetch($str); return $cache->fetch($str);
} }
function savecache($key, $value, $exp = 3300) function savecache($key, $value, $exp = 1800)
{ {
$cache = null; $cache = null;
$cache = new \Doctrine\Common\Cache\FilesystemCache(sys_get_temp_dir(), __DIR__.'/Onedrive/'.$_SERVER['disktag']); $cache = new \Doctrine\Common\Cache\FilesystemCache(sys_get_temp_dir(), __DIR__.'/Onedrive/'.$_SERVER['disktag']);
@ -566,7 +566,7 @@ function main($path)
error_log('Get access token:'.json_encode($ret, JSON_PRETTY_PRINT)); error_log('Get access token:'.json_encode($ret, JSON_PRETTY_PRINT));
$_SERVER['access_token'] = $ret['access_token']; $_SERVER['access_token'] = $ret['access_token'];
savecache('access_token', $_SERVER['access_token'], $ret['expires_in'] - 300); savecache('access_token', $_SERVER['access_token'], $ret['expires_in'] - 300);
if (time()>getConfig('token_expires')) setConfig([ 'refresh_token' => $ret['refresh_token'], 'token_expires' => time()+30*24*60*60 ]); if (time()>getConfig('token_expires')) setConfig([ 'refresh_token' => $ret['refresh_token'], 'token_expires' => time()+7*24*60*60 ]);
} }
$_SERVER['retry'] = 0; $_SERVER['retry'] = 0;
@ -624,8 +624,10 @@ function main($path)
if (strtolower(splitlast($filename,'.')[1])==strtolower($_GET['random'])) $tmp[$filename] = $files['children'][$filename]['@microsoft.graph.downloadUrl']; if (strtolower(splitlast($filename,'.')[1])==strtolower($_GET['random'])) $tmp[$filename] = $files['children'][$filename]['@microsoft.graph.downloadUrl'];
} }
$tmp = array_values($tmp); $tmp = array_values($tmp);
if (count($tmp)>0) return output('', 302, [ 'Location' => $tmp[rand(0,count($tmp)-1)] ]); if (count($tmp)>0) {
else return output('',404); if (isset($_GET['url'])) return output($tmp[rand(0,count($tmp)-1)], 200);
return output('', 302, [ 'Location' => $tmp[rand(0,count($tmp)-1)] ]);
} else return output('',404);
} else return output('',401); } else return output('',401);
} }
if (isset($files['file']) && !$_GET['preview']) { if (isset($files['file']) && !$_GET['preview']) {