From d48854791fcf126fdcc7937e4d8bf9c7d9d7449b Mon Sep 17 00:00:00 2001 From: root Date: Thu, 3 Sep 2020 11:27:21 +0800 Subject: [PATCH] base64 but not urlencode in saving config --- platform/AliyunFC.php | 8 ++++---- platform/BaiduCFC.php | 8 ++++---- platform/Heroku.php | 8 ++++---- platform/HuaweiFG_env.php | 8 ++++---- platform/HuaweiFG_file.php | 8 ++++---- platform/Normal.php | 8 ++++---- platform/TencentSCF_env.php | 8 ++++---- platform/TencentSCF_file.php | 8 ++++---- theme/Onedrive-dev.html | 5 ++--- theme/classic.html | 17 ++++++++++------- 10 files changed, 44 insertions(+), 42 deletions(-) diff --git a/platform/AliyunFC.php b/platform/AliyunFC.php index 8d3abb1..107f559 100644 --- a/platform/AliyunFC.php +++ b/platform/AliyunFC.php @@ -59,11 +59,11 @@ function getConfig($str, $disktag = '') if ($disktag=='') $disktag = $_SERVER['disktag']; $env = json_decode(getenv($disktag), true); if (isset($env[$str])) { - if (in_array($str, $Base64Env)) return equal_replace($env[$str],1); + if (in_array($str, $Base64Env)) return base64y_decode($env[$str]); else return $env[$str]; } } else { - if (in_array($str, $Base64Env)) return equal_replace(getenv($str),1); + if (in_array($str, $Base64Env)) return base64y_decode(getenv($str)); else return getenv($str); } return ''; @@ -81,7 +81,7 @@ function setConfig($arr, $disktag = '') $oparetdisk = 0; foreach ($arr as $k => $v) { if (in_array($k, $InnerEnv)) { - if (in_array($k, $Base64Env)) $diskconfig[$k] = equal_replace($v); + if (in_array($k, $Base64Env)) $diskconfig[$k] = base64y_encode($v); else $diskconfig[$k] = $v; $indisk = 1; } elseif ($k=='disktag_add') { @@ -92,7 +92,7 @@ function setConfig($arr, $disktag = '') $tmp[$v] = ''; $oparetdisk = 1; } else { - if (in_array($k, $Base64Env)) $tmp[$k] = equal_replace($v); + if (in_array($k, $Base64Env)) $tmp[$k] = base64y_encode($v); else $tmp[$k] = $v; } } diff --git a/platform/BaiduCFC.php b/platform/BaiduCFC.php index d872d5a..78a2128 100644 --- a/platform/BaiduCFC.php +++ b/platform/BaiduCFC.php @@ -53,11 +53,11 @@ function getConfig($str, $disktag = '') if ($disktag=='') $disktag = $_SERVER['disktag']; $env = json_decode(getenv($disktag), true); if (isset($env[$str])) { - if (in_array($str, $Base64Env)) return equal_replace($env[$str],1); + if (in_array($str, $Base64Env)) return base64y_decode($env[$str]); else return $env[$str]; } } else { - if (in_array($str, $Base64Env)) return equal_replace(getenv($str),1); + if (in_array($str, $Base64Env)) return base64y_decode(getenv($str)); else return getenv($str); } return ''; @@ -75,7 +75,7 @@ function setConfig($arr, $disktag = '') $oparetdisk = 0; foreach ($arr as $k => $v) { if (in_array($k, $InnerEnv)) { - if (in_array($k, $Base64Env)) $diskconfig[$k] = equal_replace($v); + if (in_array($k, $Base64Env)) $diskconfig[$k] = base64y_encode($v); else $diskconfig[$k] = $v; $indisk = 1; } elseif ($k=='disktag_add') { @@ -86,7 +86,7 @@ function setConfig($arr, $disktag = '') $tmp[$v] = ''; $oparetdisk = 1; } else { - if (in_array($k, $Base64Env)) $tmp[$k] = equal_replace($v); + if (in_array($k, $Base64Env)) $tmp[$k] = base64y_encode($v); else $tmp[$k] = $v; } } diff --git a/platform/Heroku.php b/platform/Heroku.php index 7f65b22..55acfa2 100644 --- a/platform/Heroku.php +++ b/platform/Heroku.php @@ -46,11 +46,11 @@ function getConfig($str, $disktag = '') if ($disktag=='') $disktag = $_SERVER['disktag']; $env = json_decode(getenv($disktag), true); if (isset($env[$str])) { - if (in_array($str, $Base64Env)) return equal_replace($env[$str],1); + if (in_array($str, $Base64Env)) return base64y_decode($env[$str]); else return $env[$str]; } } else { - if (in_array($str, $Base64Env)) return equal_replace(getenv($str),1); + if (in_array($str, $Base64Env)) return base64y_decode(getenv($str)); else return getenv($str); } return ''; @@ -68,7 +68,7 @@ function setConfig($arr, $disktag = '') $oparetdisk = 0; foreach ($arr as $k => $v) { if (in_array($k, $InnerEnv)) { - if (in_array($k, $Base64Env)) $diskconfig[$k] = equal_replace($v); + if (in_array($k, $Base64Env)) $diskconfig[$k] = base64y_encode($v); else $diskconfig[$k] = $v; $indisk = 1; } elseif ($k=='disktag_add') { @@ -79,7 +79,7 @@ function setConfig($arr, $disktag = '') $tmp[$v] = ''; $oparetdisk = 1; } else { - if (in_array($k, $Base64Env)) $tmp[$k] = equal_replace($v); + if (in_array($k, $Base64Env)) $tmp[$k] = base64y_encode($v); else $tmp[$k] = $v; } } diff --git a/platform/HuaweiFG_env.php b/platform/HuaweiFG_env.php index 4b08134..125ca42 100644 --- a/platform/HuaweiFG_env.php +++ b/platform/HuaweiFG_env.php @@ -76,11 +76,11 @@ function getConfig($str, $disktag = '') if ($disktag=='') $disktag = $_SERVER['disktag']; $env = json_decode($contextUserData->getUserData($disktag), true); if (isset($env[$str])) { - if (in_array($str, $Base64Env)) return equal_replace($env[$str],1); + if (in_array($str, $Base64Env)) return base64y_decode($env[$str]); else return $env[$str]; } } else { - if (in_array($str, $Base64Env)) return equal_replace($contextUserData->getUserData($str),1); + if (in_array($str, $Base64Env)) return base64y_decode($contextUserData->getUserData($str)); else return $contextUserData->getUserData($str); } return ''; @@ -99,7 +99,7 @@ function setConfig($arr, $disktag = '') $oparetdisk = 0; foreach ($arr as $k => $v) { if (in_array($k, $InnerEnv)) { - if (in_array($k, $Base64Env)) $diskconfig[$k] = equal_replace($v); + if (in_array($k, $Base64Env)) $diskconfig[$k] = base64y_encode($v); else $diskconfig[$k] = $v; $indisk = 1; } elseif ($k=='disktag_add') { @@ -110,7 +110,7 @@ function setConfig($arr, $disktag = '') $tmp[$v] = ''; $oparetdisk = 1; } else { - if (in_array($k, $Base64Env)) $tmp[$k] = equal_replace($v); + if (in_array($k, $Base64Env)) $tmp[$k] = base64y_encode($v); else $tmp[$k] = $v; } } diff --git a/platform/HuaweiFG_file.php b/platform/HuaweiFG_file.php index 0995c45..0d78918 100644 --- a/platform/HuaweiFG_file.php +++ b/platform/HuaweiFG_file.php @@ -80,12 +80,12 @@ function getConfig($str, $disktag = '') if (in_array($str, $InnerEnv)) { if ($disktag=='') $disktag = $_SERVER['disktag']; if (isset($envs[$disktag][$str])) { - if (in_array($str, $Base64Env)) return equal_replace($envs[$disktag][$str],1); + if (in_array($str, $Base64Env)) return base64y_decode($envs[$disktag][$str]); else return $envs[$disktag][$str]; } } else { if (isset($envs[$str])) { - if (in_array($str, $Base64Env)) return equal_replace($envs[$str],1); + if (in_array($str, $Base64Env)) return base64y_decode($envs[$str]); else return $envs[$str]; } } @@ -108,7 +108,7 @@ function setConfig($arr, $disktag = '') $operatedisk = 0; foreach ($arr as $k => $v) { if (in_array($k, $InnerEnv)) { - if (in_array($k, $Base64Env)) $envs[$disktag][$k] = equal_replace($v); + if (in_array($k, $Base64Env)) $envs[$disktag][$k] = base64y_encode($v); else $envs[$disktag][$k] = $v; $indisk = 1; } elseif ($k=='disktag_add') { @@ -119,7 +119,7 @@ function setConfig($arr, $disktag = '') $envs[$v] = ''; $operatedisk = 1; } else { - if (in_array($k, $Base64Env)) $envs[$k] = equal_replace($v); + if (in_array($k, $Base64Env)) $envs[$k] = base64y_encode($v); else $envs[$k] = $v; } } diff --git a/platform/Normal.php b/platform/Normal.php index 64f7240..a261705 100644 --- a/platform/Normal.php +++ b/platform/Normal.php @@ -54,12 +54,12 @@ function getConfig($str, $disktag = '') if (in_array($str, $InnerEnv)) { if ($disktag=='') $disktag = $_SERVER['disktag']; if (isset($envs[$disktag][$str])) { - if (in_array($str, $Base64Env)) return equal_replace($envs[$disktag][$str],1); + if (in_array($str, $Base64Env)) return base64y_decode($envs[$disktag][$str]); else return $envs[$disktag][$str]; } } else { if (isset($envs[$str])) { - if (in_array($str, $Base64Env)) return equal_replace($envs[$str],1); + if (in_array($str, $Base64Env)) return base64y_decode($envs[$str]); else return $envs[$str]; } } @@ -82,7 +82,7 @@ function setConfig($arr, $disktag = '') $operatedisk = 0; foreach ($arr as $k => $v) { if (in_array($k, $InnerEnv)) { - if (in_array($k, $Base64Env)) $envs[$disktag][$k] = equal_replace($v); + if (in_array($k, $Base64Env)) $envs[$disktag][$k] = base64y_encode($v); else $envs[$disktag][$k] = $v; $indisk = 1; } elseif ($k=='disktag_add') { @@ -93,7 +93,7 @@ function setConfig($arr, $disktag = '') $envs[$v] = ''; $operatedisk = 1; } else { - if (in_array($k, $Base64Env)) $envs[$k] = equal_replace($v); + if (in_array($k, $Base64Env)) $envs[$k] = base64y_encode($v); else $envs[$k] = $v; } } diff --git a/platform/TencentSCF_env.php b/platform/TencentSCF_env.php index cbbe4f3..e2951a4 100644 --- a/platform/TencentSCF_env.php +++ b/platform/TencentSCF_env.php @@ -60,11 +60,11 @@ function getConfig($str, $disktag = '') if ($disktag=='') $disktag = $_SERVER['disktag']; $env = json_decode(getenv($disktag), true); if (isset($env[$str])) { - if (in_array($str, $Base64Env)) return equal_replace($env[$str],1); + if (in_array($str, $Base64Env)) return base64y_decode($env[$str]); else return $env[$str]; } } else { - if (in_array($str, $Base64Env)) return equal_replace(getenv($str),1); + if (in_array($str, $Base64Env)) return base64y_decode(getenv($str)); else return getenv($str); } return ''; @@ -82,7 +82,7 @@ function setConfig($arr, $disktag = '') $oparetdisk = 0; foreach ($arr as $k => $v) { if (in_array($k, $InnerEnv)) { - if (in_array($k, $Base64Env)) $diskconfig[$k] = equal_replace($v); + if (in_array($k, $Base64Env)) $diskconfig[$k] = base64y_encode($v); else $diskconfig[$k] = $v; $indisk = 1; } elseif ($k=='disktag_add') { @@ -93,7 +93,7 @@ function setConfig($arr, $disktag = '') $tmp[$v] = ''; $oparetdisk = 1; } else { - if (in_array($k, $Base64Env)) $tmp[$k] = equal_replace($v); + if (in_array($k, $Base64Env)) $tmp[$k] = base64y_encode($v); else $tmp[$k] = $v; } } diff --git a/platform/TencentSCF_file.php b/platform/TencentSCF_file.php index c54771b..85a5c10 100644 --- a/platform/TencentSCF_file.php +++ b/platform/TencentSCF_file.php @@ -65,12 +65,12 @@ function getConfig($str, $disktag = '') if (in_array($str, $InnerEnv)) { if ($disktag=='') $disktag = $_SERVER['disktag']; if (isset($envs[$disktag][$str])) { - if (in_array($str, $Base64Env)) return equal_replace($envs[$disktag][$str],1); + if (in_array($str, $Base64Env)) return base64y_decode($envs[$disktag][$str]); else return $envs[$disktag][$str]; } } else { if (isset($envs[$str])) { - if (in_array($str, $Base64Env)) return equal_replace($envs[$str],1); + if (in_array($str, $Base64Env)) return base64y_decode($envs[$str]); else return $envs[$str]; } } @@ -93,7 +93,7 @@ function setConfig($arr, $disktag = '') $operatedisk = 0; foreach ($arr as $k => $v) { if (in_array($k, $InnerEnv)) { - if (in_array($k, $Base64Env)) $envs[$disktag][$k] = equal_replace($v); + if (in_array($k, $Base64Env)) $envs[$disktag][$k] = base64y_encode($v); else $envs[$disktag][$k] = $v; $indisk = 1; } elseif ($k=='disktag_add') { @@ -104,7 +104,7 @@ function setConfig($arr, $disktag = '') $envs[$v] = ''; $operatedisk = 1; } else { - if (in_array($k, $Base64Env)) $envs[$k] = equal_replace($v); + if (in_array($k, $Base64Env)) $envs[$k] = base64y_encode($v); else $envs[$k] = $v; } } diff --git a/theme/Onedrive-dev.html b/theme/Onedrive-dev.html index 7ac335e..ac664b2 100644 --- a/theme/Onedrive-dev.html +++ b/theme/Onedrive-dev.html @@ -227,7 +227,6 @@ main .main-item-list .main-items-fileName a:hover { text-decoration: underline; } - .main-title-path a{vertical-align: middle;} .more-disk{ vertical-align: middle; overflow: hidden; @@ -293,10 +292,10 @@

- + > - +

diff --git a/theme/classic.html b/theme/classic.html index 42f743a..1bacac5 100644 --- a/theme/classic.html +++ b/theme/classic.html @@ -149,7 +149,7 @@
-

/

+

/

@@ -999,12 +999,14 @@ var response=JSON.parse(xhr.responseText); if (response['size']>0) { // contain size, upload finish. 有size说明是最终返回，上传结束 - var xhr3 = new XMLHttpRequest(); - xhr3.open("GET", '?action=del_upload_cache&filelastModified='+file.lastModified+'&filesize='+file.size+'&filename='+filename); - xhr3.setRequestHeader('x-requested-with','XMLHttpRequest'); - xhr3.send(null); - xhr3.onload = function(e){ - console.log(xhr3.responseText+','+xhr3.status); + if (totalsize>10*1024*1024) { + var xhr3 = new XMLHttpRequest(); + xhr3.open("GET", '?action=del_upload_cache&filelastModified='+file.lastModified+'&filesize='+file.size+'&filename='+filename); + xhr3.setRequestHeader('x-requested-with','XMLHttpRequest'); + xhr3.send(null); + xhr3.onload = function(e){ + console.log(xhr3.responseText+','+xhr3.status); + } } EndTime=new Date(); MiddleStr = ':'+EndTime.toLocaleString()+'
'; @@ -1015,6 +1017,7 @@ } document.getElementById('upfile_td1_'+tdnum).innerHTML='
'+document.getElementById('upfile_td1_'+tdnum).innerHTML+'
'; label.innerHTML=StartStr+MiddleStr; + label.style.color='green'; // uploadbuttonshow(); response.name=file.webkitRelativePath||response.name; -- GitLab