Akkariin/PHPMC7
1
0
Fork 0
mirror of https://github.com/ZeroDream-CN/PHPMC7 synced 2024-11-24 04:52:54 +08:00
Code Issues Releases Wiki Activity

修复正则表达式错误

Browse Source 
修正了一些错误，创建和更新服务器时的启动命令判断问题
This commit is contained in:
Akkariin Meiko 2018-09-16 20:08:39 +08:00
parent c7c54cc8eb
commit d4bc04c045
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/core/PHPMC/Event.php
View File

@ -291,7 +291,7 @@ class Event {
if(!preg_match("/^[A-Za-z0-9\-\_\.]+$/", $data['jar'])) { if(!preg_match("/^[A-Za-z0-9\-\_\.]+$/", $data['jar'])) {
PHPMC::Error()->Println("请填写字段：核心文件名字，只能包含英文大小写、数字、_、. 和 -"); PHPMC::Error()->Println("请填写字段：核心文件名字，只能包含英文大小写、数字、_、. 和 -");
} }
if(!preg_match("/^[A-Za-z0-9\-\_\.\{\} ]+$/", $data['startcommand'])) { if(!preg_match("/^[A-Za-z0-9\-\_\.\{\}\:\/\\\= ]+$/", $data['startcommand'])) {
PHPMC::Error()->Println("请填写字段：核心启动命令"); PHPMC::Error()->Println("请填写字段：核心启动命令");
} }
if(!preg_match("/^[A-Za-z0-9\-\_\.\{\} ]+$/", $data['stopcommand'])) { if(!preg_match("/^[A-Za-z0-9\-\_\.\{\} ]+$/", $data['stopcommand'])) {
@ -339,7 +339,7 @@ class Event {
if(!preg_match("/^[A-Za-z0-9\-\_\.]+$/", $data['jar'])) { if(!preg_match("/^[A-Za-z0-9\-\_\.]+$/", $data['jar'])) {
PHPMC::Error()->Println("请填写字段：核心文件名字，只能包含英文大小写、数字、_、. 和 -"); PHPMC::Error()->Println("请填写字段：核心文件名字，只能包含英文大小写、数字、_、. 和 -");
} }
if(!preg_match("/^[A-Za-z0-9\-\_\.\{\} ]+$/", $data['startcommand'])) { if(!preg_match("/^[A-Za-z0-9\-\_\.\{\}\:\/\\\= ]+$/", $data['startcommand'])) {
PHPMC::Error()->Println("请填写字段：核心启动命令"); PHPMC::Error()->Println("请填写字段：核心启动命令");
} }
if(!preg_match("/^[A-Za-z0-9\-\_\.\{\} ]+$/", $data['stopcommand'])) { if(!preg_match("/^[A-Za-z0-9\-\_\.\{\} ]+$/", $data['stopcommand'])) {
@ -361,12 +361,12 @@ class Event {
PHPMC::Error()->Println("Server Not Found"); PHPMC::Error()->Println("Server Not Found");
} }
$Server2->setServer($data['name']); $Server2->setServer($data['name']);
if($Server2->uuid !== null) { if($Server2->uuid !== null && $Server2->id !== $data['id']) {
PHPMC::Error()->Println("相同名字的服务器已经存在。"); PHPMC::Error()->Println("相同名字的服务器已经存在。");
} }
$Server2->unselectServer(); $Server2->unselectServer();
$Server2->setServer($data['port'], $Server->daemon); $Server2->setServer($data['port'], $Server->daemon);
if($Server->uuid !== null) { if($Server2->uuid !== null && $Server2->id !== $data['id']) {
PHPMC::Error()->Println("相同端口、相同 Daemon 的服务器已经存在。"); PHPMC::Error()->Println("相同端口、相同 Daemon 的服务器已经存在。");
} }
PHPMC::Server()->updateServer($data['id'], $data['name'], $data['maxram'], $data['jar'], $data['startcommand'], PHPMC::Server()->updateServer($data['id'], $data['name'], $data['maxram'], $data['jar'], $data['startcommand'],