未验证 提交 d7dcc180 编写于 作者: Q qkqpttgf 提交者: GitHub

fix bug: special tag

上级 ff2e852f
...@@ -39,9 +39,9 @@ function getGET() ...@@ -39,9 +39,9 @@ function getGET()
function getConfig($str, $disktag = '') function getConfig($str, $disktag = '')
{ {
global $innerEnv; global $InnerEnv;
if ($disktag=='') $disktag = $_SERVER['disktag']; if ($disktag=='') $disktag = $_SERVER['disktag'];
if (in_array($str, $innerEnv)) { if (in_array($str, $InnerEnv)) {
return json_decode(getenv($disktag), true)[$str]; return json_decode(getenv($disktag), true)[$str];
} }
return getenv($str); return getenv($str);
...@@ -49,7 +49,7 @@ function getConfig($str, $disktag = '') ...@@ -49,7 +49,7 @@ function getConfig($str, $disktag = '')
function setConfig($arr, $disktag = '') function setConfig($arr, $disktag = '')
{ {
global $innerEnv; global $InnerEnv;
if ($disktag=='') $disktag = $_SERVER['disktag']; if ($disktag=='') $disktag = $_SERVER['disktag'];
$disktags = explode("|",getConfig('disktag')); $disktags = explode("|",getConfig('disktag'));
$diskconfig = json_decode(getenv($disktag), true); $diskconfig = json_decode(getenv($disktag), true);
...@@ -57,7 +57,7 @@ function setConfig($arr, $disktag = '') ...@@ -57,7 +57,7 @@ function setConfig($arr, $disktag = '')
$indisk = 0; $indisk = 0;
$oparetdisk = 0; $oparetdisk = 0;
foreach ($arr as $k => $v) { foreach ($arr as $k => $v) {
if (in_array($k, $innerEnv)) { if (in_array($k, $InnerEnv)) {
$diskconfig[$k] = $v; $diskconfig[$k] = $v;
$indisk = 1; $indisk = 1;
} elseif ($k=='disktag_add') { } elseif ($k=='disktag_add') {
...@@ -90,6 +90,8 @@ function setConfig($arr, $disktag = '') ...@@ -90,6 +90,8 @@ function setConfig($arr, $disktag = '')
function get_refresh_token() function get_refresh_token()
{ {
global $constStr; global $constStr;
global $CommonEnv;
foreach ($CommonEnv as $env) $envs .= '\'' . $env . '\', ';
$url = path_format($_SERVER['PHP_SELF'] . '/'); $url = path_format($_SERVER['PHP_SELF'] . '/');
if ($_GET['authorization_code'] && isset($_GET['code'])) { if ($_GET['authorization_code'] && isset($_GET['code'])) {
$_SERVER['disktag'] = $_COOKIE['disktag']; $_SERVER['disktag'] = $_COOKIE['disktag'];
...@@ -147,6 +149,9 @@ function get_refresh_token() ...@@ -147,6 +149,9 @@ function get_refresh_token()
} }
if ($_GET['install0']) { if ($_GET['install0']) {
if ($_POST['disktag_add']!='' && ($_POST['Onedrive_ver']=='MS' || $_POST['Onedrive_ver']=='CN' || $_POST['Onedrive_ver']=='MSC')) { 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 . '<br><button onclick="location.href = location.href;">'.getconstStr('Reflesh').'</button><script>document.cookie=\'disktag=; path=/\';</script>', 'Error', 201);
}
$_SERVER['disktag'] = $_COOKIE['disktag']; $_SERVER['disktag'] = $_COOKIE['disktag'];
$tmp['disktag_add'] = $_POST['disktag_add']; $tmp['disktag_add'] = $_POST['disktag_add'];
$tmp['diskname'] = $_POST['diskname']; $tmp['diskname'] = $_POST['diskname'];
...@@ -199,6 +204,11 @@ function_name:' . $_SERVER['function_name'] . '<br> ...@@ -199,6 +204,11 @@ function_name:' . $_SERVER['function_name'] . '<br>
alert(\'Input Disk Tag\'); alert(\'Input Disk Tag\');
return false; 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})$/; var reg = /^[a-zA-Z]([-_a-zA-Z0-9]{1,20})$/;
if (!reg.test(t.disktag_add.value)) { if (!reg.test(t.disktag_add.value)) {
alert(\''.getconstStr('TagFormatAlert').'\'); alert(\''.getconstStr('TagFormatAlert').'\');
...@@ -345,11 +355,10 @@ function updateHerokuapp($function_name, $apikey) ...@@ -345,11 +355,10 @@ function updateHerokuapp($function_name, $apikey)
function EnvOpt($function_name, $needUpdate = 0) function EnvOpt($function_name, $needUpdate = 0)
{ {
global $constStr; global $constStr;
global $commonEnv; global $ShowedCommonEnv;
global $innerEnv; global $ShowedInnerEnv;
global $ShowedinnerEnv; asort($ShowedCommonEnv);
asort($commonEnv); asort($ShowedInnerEnv);
asort($ShowedinnerEnv);
$html = '<title>OneManager '.getconstStr('Setup').'</title>'; $html = '<title>OneManager '.getconstStr('Setup').'</title>';
if ($_POST['updateProgram']==getconstStr('updateProgram')) { if ($_POST['updateProgram']==getconstStr('updateProgram')) {
$response = json_decode(updateHerokuapp(getConfig('function_name'), getConfig('APIKey'))['body'], true); $response = json_decode(updateHerokuapp(getConfig('function_name'), getConfig('APIKey'))['body'], true);
...@@ -374,10 +383,10 @@ function_name:' . $_SERVER['function_name'] . '<br> ...@@ -374,10 +383,10 @@ function_name:' . $_SERVER['function_name'] . '<br>
} }
$_SERVER['disk_oprating'] = ''; $_SERVER['disk_oprating'] = '';
foreach ($_POST as $k => $v) { foreach ($_POST as $k => $v) {
if (in_array($k, $commonEnv)) { if (in_array($k, $ShowedCommonEnv)) {
if (!(getConfig($k)==''&&$v=='')) $tmp[$k] = $v; 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; $tmp[$k] = $v;
} }
if ($k == 'disk') $_SERVER['disk_oprating'] = $v; if ($k == 'disk') $_SERVER['disk_oprating'] = $v;
...@@ -425,7 +434,7 @@ function_name:' . $_SERVER['function_name'] . '<br> ...@@ -425,7 +434,7 @@ function_name:' . $_SERVER['function_name'] . '<br>
<tr> <tr>
<td colspan="2">'.getconstStr('PlatformConfig').'</td> <td colspan="2">'.getconstStr('PlatformConfig').'</td>
</tr>'; </tr>';
foreach ($commonEnv as $key) { foreach ($ShowedCommonEnv as $key) {
if ($key=='language') { if ($key=='language') {
$html .= ' $html .= '
<tr> <tr>
...@@ -494,7 +503,7 @@ function_name:' . $_SERVER['function_name'] . '<br> ...@@ -494,7 +503,7 @@ function_name:' . $_SERVER['function_name'] . '<br>
$html .= ' $html .= '
<form name="'.$disktag.'" action="" method="post"> <form name="'.$disktag.'" action="" method="post">
<input type="hidden" name="disk" value="'.$disktag.'">'; <input type="hidden" name="disk" value="'.$disktag.'">';
foreach ($ShowedinnerEnv as $key) { foreach ($ShowedInnerEnv as $key) {
$html .= ' $html .= '
<tr> <tr>
<td><label>' . $key . '</label></td> <td><label>' . $key . '</label></td>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册