diff --git a/common.php b/common.php index c0746cd..6a93acd 100644 --- a/common.php +++ b/common.php @@ -1638,34 +1638,34 @@ function EnvOpt($needUpdate = 0) }/* else { $frame .= getconstStr('NotNeedUpdate'); }*/ - $frame .= '
+ $frame .= '

- - + - + - +
old pass: + ' . getconstStr('OldPassword') . ':
new pass:' . getconstStr('NewPassword') . ':
reinput:' . getconstStr('ReInput') . ':

- + - +
admin pass: - ' . getconstStr('AdminPassword') . ': +
config: - ' . getconstStr('config') . ': +

@@ -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); diff --git a/conststr.php b/conststr.php index f3a6dcb..8980ec7 100644 --- a/conststr.php +++ b/conststr.php @@ -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' => '配置保存在环境变量',