Skip to content

Commit 704bf77

Browse files
committed
resolving repo conflicts
2 parents 5babb1c + 5e861eb commit 704bf77

File tree

9 files changed

+963
-375
lines changed

9 files changed

+963
-375
lines changed

web/download/backup/index.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
error_reporting(NULL);
44
session_start();
55
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
6-
$backup = $_GET['backup'];
6+
$backup = basename($_GET['backup']);
77

88
// Check if the backup exists
9-
if (!file_exists($backup)) {
9+
if (!file_exists('/backup/'.$backup)) {
1010
exit(0);
1111
}
1212

web/edit/cron/index.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
$v_job = escapeshellarg($_GET['job']);
2323
exec (VESTA_CMD."v-list-cron-job ".$user." ".$v_job." 'json'", $output, $return_var);
2424
check_return_code($return_var,$output);
25-
$data = json_decode(implode('', $output), true);
25+
26+
$data = json_decode(implode('', str_replace("\\", "\\\\", $output)), true);
2627
unset($output);
2728

2829
// Parse cron job

web/inc/i18n/cn.php

Lines changed: 81 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -129,85 +129,86 @@
129129
'outdated' => '过期',
130130
'updated' => '更新',
131131

132-
'yes' => '',
133-
'no' => '',
134-
'none' => 'none',
135-
'pb' => 'PB',
136-
'tb' => 'TB',
137-
'gb' => 'GB',
138-
'mb' => 'MB',
139-
'minute' => '分钟',
140-
'hour' => '小时',
141-
'day' => '',
142-
'days' => '',
143-
'hours' => '小时',
144-
'minutes' => '',
145-
'month' => '',
146-
'package' => '预设方案',
147-
'Bandwidth' => '流量',
148-
'Disk' => '硬盘',
149-
'Web' => '网页',
150-
'Mail' => '邮箱',
151-
'Databases' => '数据库',
152-
'User Directories' => '用户目录',
153-
'Template' => '模板',
154-
'Web Template' => 'Web模板',
155-
'Backend Template' => 'Backend模板',
156-
'Proxy Template' =>'Proxy模板',
157-
'DNS Template' => 'DNS模板',
158-
'Web Domains' => '网站域名',
159-
'SSL Domains' => 'SSL域名',
160-
'Web Aliases' => '网站别名',
161-
'per domain' => '个域名',
162-
'DNS Domains' => 'DNS域名',
163-
'DNS Domains' => 'DNS域名',
164-
'DNS records' => 'DNS记录' ,
165-
'Name Servers' => 'Name Servers',
166-
'Mail Domains' => '邮局域名',
167-
'Mail Accounts' => '邮箱账户',
168-
'Cron Jobs' => '定时任务',
169-
'SSH Access' => 'SSH权限',
170-
'IP Addresses' => 'IP地址',
171-
'Backups' => '备份',
172-
'Backup System' => '备份系统',
173-
'backup exclusions' => '排除',
174-
'template' => '模板',
175-
'SSL Support' => 'SSL支持',
176-
'SSL Home Directory' => 'SSL主目录',
177-
'Proxy Support' => 'Proxy代理支持',
178-
'Proxy Extensions' => 'Proxy扩展',
179-
'Web Statistics' => 'Web统计',
180-
'Additional FTP Account' => '其他FTP账户',
181-
'SOA' => 'SOA',
182-
'TTL' => 'TTL',
183-
'Expire' => '过期',
184-
'Records' => '记录',
185-
'Catchall email' => '综合概括邮件',
186-
'AntiVirus Support' => '反病毒支持',
187-
'AntiSpam Support' => '反垃圾支持',
188-
'DKIM Support' => 'DKIM支持',
189-
'Accounts' => '账户',
190-
'Quota' => '配额',
191-
'Autoreply' => '自动回复',
192-
'Forward to' => '转发到',
193-
'Do not store forwarded mail' => '不保存转发邮件',
194-
'database' => '数据库',
195-
'User' => '用户',
196-
'Host' => '主机',
197-
'Charset' => '字符集编码',
198-
'Min' => '分钟',
199-
'Hour' => '小时',
200-
'Day' => '',
201-
'Month' => '',
202-
'Day of week' => '星期几',
203-
'local' => '本地',
204-
'Run Time' => '运行时间',
205-
'Backup Size' => '备份大小',
206-
'SYS' => 'SYS',
207-
'Domains' => '域名',
208-
'Status' => '状态',
209-
'shared' => '共享',
210-
'dedicated' => '独立',
132+
'yes' => '',
133+
'no' => '',
134+
'none' => '',
135+
'pb' => 'PB',
136+
'tb' => 'TB',
137+
'gb' => 'GB',
138+
'mb' => 'MB',
139+
'minute' => '分钟',
140+
'hour' => '小时',
141+
'day' => '',
142+
'days' => '',
143+
'hours' => '小时',
144+
'minutes' => '分钟',
145+
'month' => '',
146+
'package' => '方案',
147+
'Bandwidth' => '流量',
148+
'Disk' => '磁盘空间',
149+
'Web' => '网站',
150+
'Mail' => '邮箱',
151+
'Databases' => '数据库',
152+
'User Directories' => '用户目录',
153+
'Template' => '模板',
154+
'Web Template' => 'Web模板',
155+
'Backend Template' => '后台模板',
156+
'Proxy Template' => '代理模板',
157+
'DNS Template' => 'DNS模板',
158+
'Web Domains' => '网站域名',
159+
'SSL Domains' => 'SSL域名',
160+
'Web Aliases' => '网站别名',
161+
'per domain' => '每域名',
162+
'DNS domains' => 'DNS域名',
163+
'DNS Domains' => 'DNS域名',
164+
'DNS records' => 'DNS记录' ,
165+
'Name Servers' => 'DNS服务器',
166+
'Mail Domains' => '邮箱域名',
167+
'Mail Accounts' => '邮箱账户',
168+
'Cron Jobs' => '定时任务',
169+
'SSH Access' => 'SSH权限',
170+
'IP Addresses' => 'IP地址',
171+
'Backups' => '备份',
172+
'Backup System' => '备份系统',
173+
'backup exclusions' => '备份排除项目',
174+
'template' => '模板',
175+
'SSL Support' => 'SSL支持',
176+
'SSL Home Directory' => 'SSL主目录',
177+
'Proxy Support' => '代理支持',
178+
'Proxy Extensions' => '代理扩展名',
179+
'Proxy Extentions' => '代理扩展名',
180+
'Web Statistics' => '网站统计',
181+
'Additional FTP Account' => '额外的FTP账户',
182+
'SOA' => 'SOA',
183+
'TTL' => 'TTL',
184+
'Expire' => '过期',
185+
'Records' => '记录',
186+
'Catchall email' => '收取未知邮件的邮箱',
187+
'AntiVirus Support' => '防病毒支持',
188+
'AntiSpam Support' => '防垃圾邮件支持',
189+
'DKIM Support' => 'DKIM支持',
190+
'Accounts' => '账户',
191+
'Quota' => '配额',
192+
'Autoreply' => '自动回复',
193+
'Forward to' => '转发到',
194+
'Do not store forwarded mail' => '不保留已转发的邮件',
195+
'database' => '数据库',
196+
'User' => '用户',
197+
'Host' => '主机',
198+
'Charset' => '编码',
199+
'Min' => '几分',
200+
'Hour' => '几点',
201+
'Day' => '几号',
202+
'Month' => '月份',
203+
'Day of week' => '星期几',
204+
'local' => '本地',
205+
'Run Time' => '运行时间',
206+
'Backup Size' => '备份大小',
207+
'SYS' => 'SYS',
208+
'Domains' => '域名',
209+
'Status' => '状态',
210+
'shared' => '共享',
211+
'dedicated' => '独立',
211212
'Owner' => '归属',
212213
'Users' => '用户',
213214
'Load Average' => '平均负载',
@@ -642,4 +643,4 @@
642643
'Hour' => 'Hour',
643644
'Minute' => 'Minute'
644645

645-
);
646+
);

0 commit comments

Comments
 (0)