yanglc
/
OneManager-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'qkqpttgf:master' into master

pull/610/head
gd1214b 2021-08-22 13:07:36 +08:00 committed by GitHub
parent f88769416a 45648eb676
commit 7a466e6917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common.php
View File

@ -1638,34 +1638,34 @@ function EnvOpt($needUpdate = 0)
}/* else {
$frame .= getconstStr('NotNeedUpdate');
}*/
$frame .= '<br>
$frame .= '<br><br>
<script src="https://cdn.bootcss.com/js-sha1/0.6.0/sha1.min.js"></script>
<table>
<form id="change_pass" name="change_pass" action="" method="POST" onsubmit="return changePassword(this);">
<tr>
<td>old pass:</td><td><input type="password" name="oldPass">
<td>' . getconstStr('OldPassword') . ':</td><td><input type="password" name="oldPass">
<input type="hidden" name="timestamp"></td>
</tr>
<tr>
<td>new pass:</td><td><input type="password" name="newPass1"></td>
<td>' . getconstStr('NewPassword') . ':</td><td><input type="password" name="newPass1"></td>
</tr>
<tr>
<td>reinput:</td><td><input type="password" name="newPass2"></td>
<td>' . getconstStr('ReInput') . ':</td><td><input type="password" name="newPass2"></td>
</tr>
<tr>
<td></td><td><button name="changePass" value="changePass">Change Admin Pass</button></td>
<td></td><td><button name="changePass" value="changePass">' . getconstStr('ChangAdminPassword') . '</button></td>
</tr>
</form>
</table><br>
<table>
<form id="config_f" name="config" action="" method="POST" onsubmit="return false;">
<tr>
<td>admin pass:<input type="password" name="pass">
<button name="config_b" value="export" onclick="exportConfig(this);">export</button></td>
<td>' . getconstStr('AdminPassword') . ':<input type="password" name="pass">
<button name="config_b" value="export" onclick="exportConfig(this);">' . getconstStr('export') . '</button></td>
</tr>
<tr>
<td>config:<textarea name="config_t"></textarea>
<button name="config_b" value="import" onclick="importConfig(this);">import</button></td>
<td>' . getconstStr('config') . ':<textarea name="config_t"></textarea>
<button name="config_b" value="import" onclick="importConfig(this);">' . getconstStr('import') . '</button></td>
</tr>
</form>
</table><br>
@ -2729,9 +2729,9 @@ function render_list($path = '', $files = [])
}
// 最后清除换行
while (strpos($html, "\r\n\r\n")) $html = str_replace("\r\n\r\n", "\r\n", $html);
//while (strpos($html, "\r\n\r\n")) $html = str_replace("\r\n\r\n", "\r\n", $html);
//while (strpos($html, "\r\r")) $html = str_replace("\r\r", "\r", $html);
while (strpos($html, "\n\n")) $html = str_replace("\n\n", "\n", $html);
//while (strpos($html, "\n\n")) $html = str_replace("\n\n", "\n", $html);
//while (strpos($html, PHP_EOL.PHP_EOL)) $html = str_replace(PHP_EOL.PHP_EOL, PHP_EOL, $html);
$exetime = round(microtime(true)-$_SERVER['php_starttime'],3);

40
conststr.php
View File

@ -1140,6 +1140,46 @@ $constStr = [
'zh-cn' => '查询分支',
'zh-tw' => '查詢分支',
],
'OldPassword' => [
'en-us' => 'Old Password',
'zh-cn' => '旧密码',
'zh-tw' => '旧密碼',
],
'NewPassword' => [
'en-us' => 'New Password',
'zh-cn' => '新密码',
'zh-tw' => '新密碼',
],
'ReInput' => [
'en-us' => 'ReInput',
'zh-cn' => '再输入一次',
'zh-tw' => '再输入一次',
],
'ChangAdminPassword' => [
'en-us' => 'Chang Admin Password',
'zh-cn' => '修改管理密码',
'zh-tw' => '修改管理密碼',
],
'AdminPassword' => [
'en-us' => 'Admin Password',
'zh-cn' => '管理密码',
'zh-tw' => '管理密碼',
],
'export' => [
'en-us' => 'export',
'zh-cn' => '导出',
'zh-tw' => '导出',
],
'config' => [
'en-us' => 'config',
'zh-cn' => '配置',
'zh-tw' => '配置',
],
'import' => [
'en-us' => 'import',
'zh-cn' => '导入',
'zh-tw' => '导入',
],
'ONEMANAGER_CONFIG_SAVE_ENV' => [
'en-us' => 'Config save in Environments',
'zh-cn' => '配置保存在环境变量',