diff --git a/hwe/_admin8.php b/hwe/_admin8.php
index 344c7749..d4335ec4 100644
--- a/hwe/_admin8.php
+++ b/hwe/_admin8.php
@@ -73,7 +73,6 @@ $sel[$type] = "selected";
| 국 가 명 |
상 태 |
기 간 |
- 비 고 |
{$dip['fixed']}";
- }
- if ($dip['reserved'] != "" || $dip2['reserved'] != "") {
- $note .= "
";
- }
- }
- if ($dip['reserved'] != "") {
- if ($dip['showing'] >= $date) {
- $note .= "아국측 제의: {$dip['reserved']}";
- } else {
- $note .= "아국측 제의: {$dip['reserved']}";
- }
- if ($dip2['reserved'] != "") {
- $note .= "
";
- }
- }
- if ($dip2['reserved'] != "") {
- if ($dip2['showing'] >= $date) {
- $note .= "상대측 제의: {$dip2['reserved']}";
- } else {
- $note .= "상대측 제의: {$dip2['reserved']}";
- }
- }
- if ($note == "") {
- $note = " ";
- }
echo "
@@ -153,7 +117,6 @@ for ($i=0; $i < $dipcount; $i++) {
| $nationName[$you] |
$state |
{$dip['term']} 개월 |
- {$note} |
";
}
?>
diff --git a/hwe/b_dipcenter.php b/hwe/b_dipcenter.php
index e2eb0ca7..77a805c2 100644
--- a/hwe/b_dipcenter.php
+++ b/hwe/b_dipcenter.php
@@ -106,19 +106,15 @@ for ($i=0; $i < $nationcount; $i++) {
- |
- |
- |
- - |
";
continue;
}
- $query = "select state,term,fixed,reserved,showing from diplomacy where me='{$me['nation']}' and you='{$nation['nation']}'";
+ $query = "select state,term from diplomacy where me='{$me['nation']}' and you='{$nation['nation']}'";
$result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$dip = MYDB_fetch_array($result2);
- $query = "select reserved,showing from diplomacy where you='{$me['nation']}' and me='{$nation['nation']}'";
- $result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
- $dip2 = MYDB_fetch_array($result2);
//속령수
$query = "select city from city where nation='{$nation['nation']}'";
$result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
@@ -144,33 +140,6 @@ for ($i=0; $i < $nationcount; $i++) {
}
$date = date('Y-m-d H:i:s');
- $note = "";
- if ($dip['fixed'] != "") {
- if ($dip['state'] == 7) {
- $note .= $dip['fixed'];
- } else {
- $note .= "{$dip['fixed']}";
- }
- if ($dip['reserved'] != "" || $dip2['reserved'] != "") {
- $note .= "
";
- }
- }
- if ($dip['showing'] >= $date) {
- if ($dip['reserved'] != "") {
- $note .= "아국측 제의: ".$dip['reserved'];
- if ($dip2['reserved'] != "") {
- $note .= "
";
- }
- }
- }
- if ($dip2['showing'] >= $date) {
- if ($dip2['reserved'] != "") {
- $note .= "상대측 제의: ".$dip2['reserved'];
- }
- }
- if ($note == "") {
- $note = " ";
- }
echo "
@@ -188,9 +157,7 @@ for ($i=0; $i < $nationcount; $i++) {
| - |
- | ";
}
- echo "
- {$note} |
-
";
+ echo "";
}
echo "
diff --git a/hwe/c_double.php b/hwe/c_double.php
index 632f04b7..b9e3ac79 100644
--- a/hwe/c_double.php
+++ b/hwe/c_double.php
@@ -93,11 +93,6 @@ if($command == 61) {
$me = MYDB_fetch_array($result);
if($me['level'] >= 5) {
- $note = StringUtil::neutralize($note, 90);
-
- $query = "update diplomacy set reserved='{$note}' where me='{$me['nation']}' and you='$double'";
- MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
$count = count($turn);
$str = "type=type";
for($i=0; $i < $count; $i++) {
diff --git a/hwe/func_process_chief.php b/hwe/func_process_chief.php
index 555cc256..33248ccc 100644
--- a/hwe/func_process_chief.php
+++ b/hwe/func_process_chief.php
@@ -605,11 +605,6 @@ function process_61(&$general) {
$validMinutes = max(30, $turnterm*3);
$validUntil->add(new \DateInterval("PT{$validMinutes}M"));
- //FIXME: 현재 command가 숫자로만 이루어져 있어서 문자열을 처리할 수 없다.
- //XXX: 으악.
- //TODO: 커맨드 처리 방식을 json으로 변경
- $option = $db->queryFirstField('SELECT reserved FROM diplomacy WHERE me=%i AND you=%i', $src->nationID, $dest->nationID);
-
$msg = new DiplomaticMessage(
Message::MSGTYPE_DIPLOMACY,
$src,
@@ -619,19 +614,11 @@ function process_61(&$general) {
$validUntil,
[
'action'=>DiplomaticMessage::TYPE_NO_AGGRESSION,
- 'year'=>$when,
- 'option'=>$option
+ 'year'=>$when
]
);
$msg->send();
- //NOTE: 현재 내무부 외교란의 비고는 diplomacy가 기준이니까 유지할 필요는 있다.
- //FIXME: 외교란도 message란의 diplomacy를 참조하든가 하도록.
- $db->update('diplomacy', [
- 'showing'=>$validUntil->format('Y-m-d H:i:s')
- ], 'me=%i AND you=%i', $src->nationID, $dest->nationID);
- // 3턴후
-
pushGenLog($general, ["●{$month}월:{$destNation['name']}으로 불가침 제의 서신을 보냈습니다.<1>$date"]);
}
diff --git a/hwe/processing.php b/hwe/processing.php
index 1729eb2f..169d1d84 100644
--- a/hwe/processing.php
+++ b/hwe/processing.php
@@ -1739,7 +1739,6 @@ function command_61($turn, $command) {
타국에게 불가침을 제의합니다.
제의할 국가를 목록에서 선택하세요.
배경색은 현재 제의가 불가능한 국가는 붉은색, 현재 불가침중인 국가는 푸른색으로 표시됩니다.
-비고는 불가침시 세부 조건등을 지정하는 곳입니다.(최대 45자) ※유저 편의를 위한 것일뿐 시스템적으로 보장하지는 않습니다.