diff --git a/function/common.php b/function/common.php index 0c7d6f9..b14dbc4 100644 --- a/function/common.php +++ b/function/common.php @@ -1,6 +1,22 @@ $v) { - if (in_array($k, $innerEnv)) { + if (in_array($k, $InnerEnv)) { $diskconfig[$k] = $v; $indisk = 1; } elseif ($k=='disktag_add') { @@ -90,6 +90,8 @@ function setConfig($arr, $disktag = '') function get_refresh_token() { global $constStr; + global $CommonEnv; + foreach ($CommonEnv as $env) $envs .= '\'' . $env . '\', '; $url = path_format($_SERVER['PHP_SELF'] . '/'); if ($_GET['authorization_code'] && isset($_GET['code'])) { $_SERVER['disktag'] = $_COOKIE['disktag']; @@ -147,6 +149,9 @@ function get_refresh_token() } if ($_GET['install0']) { if ($_POST['disktag_add']!='' && ($_POST['Onedrive_ver']=='MS' || $_POST['Onedrive_ver']=='CN' || $_POST['Onedrive_ver']=='MSC')) { + if (in_array($_COOKIE['disktag'], $CommonEnv)) { + return message('Do not input ' . $envs . '
', 'Error', 201); + } $_SERVER['disktag'] = $_COOKIE['disktag']; $tmp['disktag_add'] = $_POST['disktag_add']; $tmp['diskname'] = $_POST['diskname']; @@ -199,6 +204,11 @@ function_name:' . $_SERVER['function_name'] . '
alert(\'Input Disk Tag\'); return false; } + envs = [' . $envs . ']; + if (envs.indexOf(t.disktag_add.value)>-1) { + alert(\'' . $envs . '\'); + return false; + } var reg = /^[a-zA-Z]([-_a-zA-Z0-9]{1,20})$/; if (!reg.test(t.disktag_add.value)) { alert(\''.getconstStr('TagFormatAlert').'\'); @@ -345,11 +355,10 @@ function updateHerokuapp($function_name, $apikey) function EnvOpt($function_name, $needUpdate = 0) { global $constStr; - global $commonEnv; - global $innerEnv; - global $ShowedinnerEnv; - asort($commonEnv); - asort($ShowedinnerEnv); + global $ShowedCommonEnv; + global $ShowedInnerEnv; + asort($ShowedCommonEnv); + asort($ShowedInnerEnv); $html = 'OneManager '.getconstStr('Setup').''; if ($_POST['updateProgram']==getconstStr('updateProgram')) { $response = json_decode(updateHerokuapp(getConfig('function_name'), getConfig('APIKey'))['body'], true); @@ -374,10 +383,10 @@ function_name:' . $_SERVER['function_name'] . '
} $_SERVER['disk_oprating'] = ''; foreach ($_POST as $k => $v) { - if (in_array($k, $commonEnv)) { + if (in_array($k, $ShowedCommonEnv)) { if (!(getConfig($k)==''&&$v=='')) $tmp[$k] = $v; } - if (in_array($k, $innerEnv)||$k=='disktag_del' || $k=='disktag_add') { + if (in_array($k, $ShowedInnerEnv)||$k=='disktag_del' || $k=='disktag_add') { $tmp[$k] = $v; } if ($k == 'disk') $_SERVER['disk_oprating'] = $v; @@ -425,7 +434,7 @@ function_name:' . $_SERVER['function_name'] . '
'.getconstStr('PlatformConfig').' '; - foreach ($commonEnv as $key) { + foreach ($ShowedCommonEnv as $key) { if ($key=='language') { $html .= ' @@ -494,7 +503,7 @@ function_name:' . $_SERVER['function_name'] . '
$html .= '
'; - foreach ($ShowedinnerEnv as $key) { + foreach ($ShowedInnerEnv as $key) { $html .= ' diff --git a/function/normal.php b/function/normal.php index 7d0bc0b..4e0f3de 100644 --- a/function/normal.php +++ b/function/normal.php @@ -38,14 +38,14 @@ function getGET() function getConfig($str, $disktag = '') { - global $innerEnv; + global $InnerEnv; //include 'config.php'; if ($disktag=='') $disktag = $_SERVER['disktag']; $s = file_get_contents('config.php'); $configs = substr($s, 18, -2); if ($configs!='') { $envs = json_decode($configs, true); - if (in_array($str, $innerEnv)) { + if (in_array($str, $InnerEnv)) { if (isset($envs[$disktag][$str])) return $envs[$disktag][$str]; } else if (isset($envs[$str])) return $envs[$str]; } @@ -54,7 +54,7 @@ function getConfig($str, $disktag = '') function setConfig($arr, $disktag = '') { - global $innerEnv; + global $InnerEnv; if ($disktag=='') $disktag = $_SERVER['disktag']; //include 'config.php'; $s = file_get_contents('config.php'); @@ -64,7 +64,7 @@ function setConfig($arr, $disktag = '') //$indisk = 0; $operatedisk = 0; foreach ($arr as $k => $v) { - if (in_array($k, $innerEnv)) { + if (in_array($k, $InnerEnv)) { $envs[$disktag][$k] = $v; /*$diskconfig[$k] = $v; $indisk = 1;*/ @@ -103,6 +103,8 @@ function setConfig($arr, $disktag = '') function get_refresh_token() { global $constStr; + global $CommonEnv; + foreach ($CommonEnv as $env) $envs .= '\'' . $env . '\', '; $url = path_format($_SERVER['PHP_SELF'] . '/'); if ($_GET['authorization_code'] && isset($_GET['code'])) { $_SERVER['disktag'] = $_COOKIE['disktag']; @@ -160,6 +162,9 @@ function get_refresh_token() } if ($_GET['install0']) { if ($_POST['disktag_add']!='' && ($_POST['Onedrive_ver']=='MS' || $_POST['Onedrive_ver']=='CN' || $_POST['Onedrive_ver']=='MSC')) { + if (in_array($_COOKIE['disktag'], $CommonEnv)) { + return message('Do not input ' . $envs . '
', 'Error', 201); + } $_SERVER['disktag'] = $_COOKIE['disktag']; $tmp['disktag_add'] = $_POST['disktag_add']; $tmp['diskname'] = $_POST['diskname']; @@ -211,6 +216,11 @@ Can not write config to file.
alert(\'Input Disk Tag\'); return false; } + envs = [' . $envs . ']; + if (envs.indexOf(t.disktag_add.value)>-1) { + alert(\'' . $envs . '\'); + return false; + } var reg = /^[a-zA-Z]([-_a-zA-Z0-9]{1,20})$/; if (!reg.test(t.disktag_add.value)) { alert(\''.getconstStr('TagFormatAlert').'\'); @@ -313,11 +323,10 @@ function RewriteEngineOn() function EnvOpt($function_name, $needUpdate = 0) { global $constStr; - global $commonEnv; - global $innerEnv; - global $ShowedinnerEnv; - asort($commonEnv); - asort($ShowedinnerEnv); + global $ShowedCommonEnv; + global $ShowedInnerEnv; + asort($ShowedCommonEnv); + asort($ShowedInnerEnv); $html = 'OneManager '.getconstStr('Setup').''; /*if ($_POST['updateProgram']==getconstStr('updateProgram')) { $response = json_decode(updataProgram($function_name, $Region, $namespace), true)['Response']; @@ -339,7 +348,7 @@ namespace:' . $namespace . '
if ($_POST['submit1']) { $_SERVER['disk_oprating'] = ''; foreach ($_POST as $k => $v) { - if (in_array($k, $commonEnv)||in_array($k, $innerEnv)||$k=='disktag_del' || $k=='disktag_add') { + if (in_array($k, $ShowedCommonEnv)||in_array($k, $ShowedInnerEnv)||$k=='disktag_del' || $k=='disktag_add') { $tmp[$k] = $v; } if ($k == 'disk') $_SERVER['disk_oprating'] = $v; @@ -384,7 +393,7 @@ namespace:' . $namespace . '
'.getconstStr('PlatformConfig').' '; - foreach ($commonEnv as $key) { + foreach ($ShowedCommonEnv as $key) { if ($key=='language') { $html .= ' @@ -453,7 +462,7 @@ namespace:' . $namespace . '
$html .= ' '; - foreach ($ShowedinnerEnv as $key) { + foreach ($ShowedInnerEnv as $key) { $html .= ' diff --git a/function/scf.php b/function/scf.php index 2a54565..8a09b47 100644 --- a/function/scf.php +++ b/function/scf.php @@ -53,9 +53,9 @@ function GetPathSetting($event, $context) function getConfig($str, $disktag = '') { - global $innerEnv; + global $InnerEnv; if ($disktag=='') $disktag = $_SERVER['disktag']; - if (in_array($str, $innerEnv)) { + if (in_array($str, $InnerEnv)) { return json_decode(getenv($disktag), true)[$str]; } return getenv($str); @@ -63,7 +63,7 @@ function getConfig($str, $disktag = '') function setConfig($arr, $disktag = '') { - global $innerEnv; + global $InnerEnv; if ($disktag=='') $disktag = $_SERVER['disktag']; $disktags = explode("|",getConfig('disktag')); $diskconfig = json_decode(getenv($disktag), true); @@ -71,7 +71,7 @@ function setConfig($arr, $disktag = '') $indisk = 0; $oparetdisk = 0; foreach ($arr as $k => $v) { - if (in_array($k, $innerEnv)) { + if (in_array($k, $InnerEnv)) { $diskconfig[$k] = $v; $indisk = 1; } elseif ($k=='disktag_add') { @@ -111,6 +111,8 @@ function WaitSCFStat() function get_refresh_token() { global $constStr; + global $CommonEnv; + foreach ($CommonEnv as $env) $envs .= '\'' . $env . '\', '; $url = path_format($_SERVER['PHP_SELF'] . '/'); if ($_GET['authorization_code'] && isset($_GET['code'])) { $_SERVER['disktag'] = $_COOKIE['disktag']; @@ -169,6 +171,9 @@ function get_refresh_token() } if ($_GET['install0']) { if ($_POST['disktag_add']!='' && ($_POST['Onedrive_ver']=='MS' || $_POST['Onedrive_ver']=='CN' || $_POST['Onedrive_ver']=='MSC')) { + if (in_array($_COOKIE['disktag'], $CommonEnv)) { + return message('Do not input ' . $envs . '
', 'Error', 201); + } $_SERVER['disktag'] = $_COOKIE['disktag']; $tmp['disktag_add'] = $_POST['disktag_add']; $tmp['diskname'] = $_POST['diskname']; @@ -223,6 +228,11 @@ namespace:' . $_SERVER['namespace'] . '
alert(\'Input Disk Tag\'); return false; } + envs = [' . $envs . ']; + if (envs.indexOf(t.disktag_add.value)>-1) { + alert(\'' . $envs . '\'); + return false; + } var reg = /^[a-zA-Z]([-_a-zA-Z0-9]{1,20})$/; if (!reg.test(t.disktag_add.value)) { alert(\''.getconstStr('TagFormatAlert').'\'); @@ -418,9 +428,9 @@ function updateEnvironment($Envs, $function_name, $Region, $Namespace, $SecretId function SetbaseConfig($Envs, $function_name, $Region, $Namespace, $SecretId, $SecretKey) { echo json_encode($Envs,JSON_PRETTY_PRINT); - $trynum = 0; + /*$trynum = 0; while( json_decode(getfunctioninfo($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], $SecretId, $SecretKey),true)['Response']['Status']!='Active' ) echo ' -'.++$trynum; +'.++$trynum;*/ //json_decode($a,true)['Response']['Environment']['Variables'][0]['Key'] $tmp = json_decode(getfunctioninfo($function_name, $Region, $Namespace, $SecretId, $SecretKey),true)['Response']['Environment']['Variables']; foreach ($tmp as $tmp1) { @@ -487,11 +497,10 @@ function updateProgram($function_name, $Region, $Namespace, $SecretId, $SecretKe function EnvOpt($function_name, $needUpdate = 0) { global $constStr; - global $commonEnv; - global $innerEnv; - global $ShowedinnerEnv; - asort($commonEnv); - asort($ShowedinnerEnv); + global $ShowedCommonEnv; + global $ShowedInnerEnv; + asort($ShowedCommonEnv); + asort($ShowedInnerEnv); $html = 'OneManager '.getconstStr('Setup').''; if ($_POST['updateProgram']==getconstStr('updateProgram')) { $response = json_decode(updateProgram($function_name, $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey')), true)['Response']; @@ -514,7 +523,7 @@ namespace:' . $namespace . '
if ($_POST['submit1']) { $_SERVER['disk_oprating'] = ''; foreach ($_POST as $k => $v) { - if (in_array($k, $commonEnv)||in_array($k, $innerEnv)||$k=='disktag_del' || $k=='disktag_add') { + if (in_array($k, $ShowedCommonEnv)||in_array($k, $ShowedInnerEnv)||$k=='disktag_del' || $k=='disktag_add') { $tmp[$k] = $v; } if ($k == 'disk') $_SERVER['disk_oprating'] = $v; @@ -568,7 +577,7 @@ namespace:' . $_SERVER['namespace'] . '
'.getconstStr('PlatformConfig').' '; - foreach ($commonEnv as $key) { + foreach ($ShowedCommonEnv as $key) { if ($key=='language') { $html .= ' @@ -637,7 +646,7 @@ namespace:' . $_SERVER['namespace'] . '
$html .= ' '; - foreach ($ShowedinnerEnv as $key) { + foreach ($ShowedInnerEnv as $key) { $html .= ' diff --git a/version b/version index 956463f..a813a8f 100644 --- a/version +++ b/version @@ -1,7 +1,10 @@ +20200225-1310.12 +Can update by one click any time. fix bugs: special tag, reupload. +可以不管版本直接一键更新(覆盖)了。修复可以使用特殊onedrive标签的bug,修复断网续传的问题。 + 20200222-2130.11 you can set background now. fix bug: 2nd disk upload. 可以设置背景图片了。第2个盘上传后链接不对。 - 20200222-1700.09 Can copy file and folder now. 可以复制文件跟目录了。