From e9b2824ab5021f6f75305d2b534af1987d83a335 Mon Sep 17 00:00:00 2001 From: ViVi Date: Mon, 26 May 2025 13:47:19 +0900 Subject: [PATCH 1/4] Add subroutine to check registration of email --- _core/lib/subroutine.pl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/_core/lib/subroutine.pl b/_core/lib/subroutine.pl index 2327719e7..c1d61789d 100644 --- a/_core/lib/subroutine.pl +++ b/_core/lib/subroutine.pl @@ -117,6 +117,14 @@ sub getplayername { } +### メールアドレス設定の有無を判定 -------------------------------------------------- +sub emailRegistered { + my $login_id = shift; + my $email = (getplayername($login_id))[1]; + return $email ne '' ? 1 : 0; +} + + ### 編集保護設定取得 -------------------------------------------------- sub getProtectType { my $file = shift; From 5d2b02378e134ce740b71d3f0884eda68a074bd2 Mon Sep 17 00:00:00 2001 From: ViVi Date: Mon, 26 May 2025 13:55:05 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=83=AB=E3=82=A2?= =?UTF-8?q?=E3=83=89=E3=83=AC=E3=82=B9=E3=81=8C=E8=A8=AD=E5=AE=9A=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88?= =?UTF-8?q?=E3=80=81=E8=A8=AD=E5=AE=9A=E3=82=92=E4=BF=83=E3=81=99=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _core/lib/ar2e/list-chara.pl | 1 + _core/lib/blp/list-chara.pl | 1 + _core/lib/dx3/list-chara.pl | 1 + _core/lib/gc/list-chara.pl | 1 + _core/lib/gc/list-country.pl | 1 + _core/lib/gs/list-chara.pl | 1 + _core/lib/info.pl | 1 + _core/lib/kiz/list-chara.pl | 1 + _core/lib/ms/list-chara.pl | 1 + _core/lib/ms/list-clan.pl | 1 + _core/lib/sw2/list-arts.pl | 1 + _core/lib/sw2/list-chara.pl | 1 + _core/lib/sw2/list-item.pl | 1 + _core/lib/sw2/list-making.pl | 1 + _core/lib/sw2/list-mons.pl | 1 + _core/lib/vc/list-chara.pl | 1 + _core/skin/_common/css/base.css | 60 +++++++++++++++++++++++++++++++++ _core/skin/_common/form.html | 1 + _core/skin/_common/notice.html | 11 ++++++ _core/skin/sw2/index.html | 1 + 20 files changed, 89 insertions(+) create mode 100644 _core/skin/_common/notice.html diff --git a/_core/lib/ar2e/list-chara.pl b/_core/lib/ar2e/list-chara.pl index e881bfb30..5f113fc10 100644 --- a/_core/lib/ar2e/list-chara.pl +++ b/_core/lib/ar2e/list-chara.pl @@ -27,6 +27,7 @@ $INDEX->param(typeName => 'キャラ'); $INDEX->param(LOGIN_ID => $LOGIN_ID); +$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID)); $INDEX->param(OAUTH_MODE => $set::oauth_service); $INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url); diff --git a/_core/lib/blp/list-chara.pl b/_core/lib/blp/list-chara.pl index 06cc617c4..b4482a34a 100644 --- a/_core/lib/blp/list-chara.pl +++ b/_core/lib/blp/list-chara.pl @@ -22,6 +22,7 @@ $INDEX->param(modeMylist => 1) if $mode eq 'mylist'; $INDEX->param(LOGIN_ID => $LOGIN_ID); +$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID)); $INDEX->param(OAUTH_MODE => $set::oauth_service); $INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url); diff --git a/_core/lib/dx3/list-chara.pl b/_core/lib/dx3/list-chara.pl index a9164602f..39c500e95 100644 --- a/_core/lib/dx3/list-chara.pl +++ b/_core/lib/dx3/list-chara.pl @@ -22,6 +22,7 @@ $INDEX->param(modeMylist => 1) if $mode eq 'mylist'; $INDEX->param(LOGIN_ID => $LOGIN_ID); +$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID)); $INDEX->param(OAUTH_MODE => $set::oauth_service); $INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url); diff --git a/_core/lib/gc/list-chara.pl b/_core/lib/gc/list-chara.pl index 8e1bd2d9d..5cfb7055e 100644 --- a/_core/lib/gc/list-chara.pl +++ b/_core/lib/gc/list-chara.pl @@ -27,6 +27,7 @@ $INDEX->param(typeName => 'キャラ'); $INDEX->param(LOGIN_ID => $LOGIN_ID); +$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID)); $INDEX->param(OAUTH_MODE => $set::oauth_service); $INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url); diff --git a/_core/lib/gc/list-country.pl b/_core/lib/gc/list-country.pl index 2ff42a96e..02700ac46 100644 --- a/_core/lib/gc/list-country.pl +++ b/_core/lib/gc/list-country.pl @@ -27,6 +27,7 @@ $INDEX->param(typeName => '国管理'); $INDEX->param(LOGIN_ID => $LOGIN_ID); +$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID)); $INDEX->param(OAUTH_MODE => $set::oauth_service); $INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url); diff --git a/_core/lib/gs/list-chara.pl b/_core/lib/gs/list-chara.pl index 2f587c80e..8a80cf4e4 100644 --- a/_core/lib/gs/list-chara.pl +++ b/_core/lib/gs/list-chara.pl @@ -28,6 +28,7 @@ $INDEX->param(typeName => 'キャラ'); $INDEX->param(LOGIN_ID => $LOGIN_ID); +$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID)); $INDEX->param(OAUTH_MODE => $set::oauth_service); $INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url); diff --git a/_core/lib/info.pl b/_core/lib/info.pl index 3d86c1bda..f9d9d52f8 100644 --- a/_core/lib/info.pl +++ b/_core/lib/info.pl @@ -15,6 +15,7 @@ $INDEX->param(modeInfo => 1); $INDEX->param(LOGIN_ID => $LOGIN_ID); +$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID)); $INDEX->param(OAUTH_MODE => $set::oauth_service); $INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url); diff --git a/_core/lib/kiz/list-chara.pl b/_core/lib/kiz/list-chara.pl index 3ca56281b..75374295b 100644 --- a/_core/lib/kiz/list-chara.pl +++ b/_core/lib/kiz/list-chara.pl @@ -22,6 +22,7 @@ $INDEX->param(modeMylist => 1) if $mode eq 'mylist'; $INDEX->param(LOGIN_ID => $LOGIN_ID); +$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID)); $INDEX->param(OAUTH_MODE => $set::oauth_service); $INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url); diff --git a/_core/lib/ms/list-chara.pl b/_core/lib/ms/list-chara.pl index 5518be0d4..83a1cfc71 100644 --- a/_core/lib/ms/list-chara.pl +++ b/_core/lib/ms/list-chara.pl @@ -23,6 +23,7 @@ $INDEX->param(typeName => '都民'); $INDEX->param(LOGIN_ID => $LOGIN_ID); +$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID)); $INDEX->param(OAUTH_MODE => $set::oauth_service); $INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url); diff --git a/_core/lib/ms/list-clan.pl b/_core/lib/ms/list-clan.pl index 75cb4a575..e5f32da1a 100644 --- a/_core/lib/ms/list-clan.pl +++ b/_core/lib/ms/list-clan.pl @@ -23,6 +23,7 @@ $INDEX->param(typeName => 'クラン'); $INDEX->param(LOGIN_ID => $LOGIN_ID); +$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID)); $INDEX->param(OAUTH_MODE => $set::oauth_service); $INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url); diff --git a/_core/lib/sw2/list-arts.pl b/_core/lib/sw2/list-arts.pl index a7b43f65e..9a6f1a335 100644 --- a/_core/lib/sw2/list-arts.pl +++ b/_core/lib/sw2/list-arts.pl @@ -24,6 +24,7 @@ $INDEX->param(typeName => '魔法'); $INDEX->param(LOGIN_ID => $LOGIN_ID); +$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID)); $INDEX->param(OAUTH_MODE => $set::oauth_service); $INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url); diff --git a/_core/lib/sw2/list-chara.pl b/_core/lib/sw2/list-chara.pl index 747a602c0..273a83433 100644 --- a/_core/lib/sw2/list-chara.pl +++ b/_core/lib/sw2/list-chara.pl @@ -29,6 +29,7 @@ $INDEX->param(typeName => 'キャラ'); $INDEX->param(LOGIN_ID => $LOGIN_ID); +$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID)); $INDEX->param(OAUTH_MODE => $set::oauth_service); $INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url); diff --git a/_core/lib/sw2/list-item.pl b/_core/lib/sw2/list-item.pl index c1554438f..fc94113e4 100644 --- a/_core/lib/sw2/list-item.pl +++ b/_core/lib/sw2/list-item.pl @@ -24,6 +24,7 @@ $INDEX->param(typeName => 'アイテム'); $INDEX->param(LOGIN_ID => $LOGIN_ID); +$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID)); $INDEX->param(OAUTH_MODE => $set::oauth_service); $INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url); diff --git a/_core/lib/sw2/list-making.pl b/_core/lib/sw2/list-making.pl index be2b7c361..83b1f26c0 100644 --- a/_core/lib/sw2/list-making.pl +++ b/_core/lib/sw2/list-making.pl @@ -25,6 +25,7 @@ $INDEX->param(name => (getplayername($LOGIN_ID))[0]); $INDEX->param(LOGIN_ID => $LOGIN_ID); +$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID)); $INDEX->param(OAUTH_MODE => $set::oauth_service); $INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url); diff --git a/_core/lib/sw2/list-mons.pl b/_core/lib/sw2/list-mons.pl index 1f984429c..9ae246104 100644 --- a/_core/lib/sw2/list-mons.pl +++ b/_core/lib/sw2/list-mons.pl @@ -24,6 +24,7 @@ $INDEX->param(typeName => '魔物'); $INDEX->param(LOGIN_ID => $LOGIN_ID); +$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID)); $INDEX->param(OAUTH_MODE => $set::oauth_service); $INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url); diff --git a/_core/lib/vc/list-chara.pl b/_core/lib/vc/list-chara.pl index 37a4aee7b..d9a979855 100644 --- a/_core/lib/vc/list-chara.pl +++ b/_core/lib/vc/list-chara.pl @@ -27,6 +27,7 @@ $INDEX->param(typeName => 'キャラ'); $INDEX->param(LOGIN_ID => $LOGIN_ID); +$INDEX->param(EMAIL_NOT_REGISTERED => !emailRegistered($LOGIN_ID)); $INDEX->param(OAUTH_MODE => $set::oauth_service); $INDEX->param(OAUTH_LOGIN_URL => $set::oauth_login_url); diff --git a/_core/skin/_common/css/base.css b/_core/skin/_common/css/base.css index 186228ccb..55a0792de 100644 --- a/_core/skin/_common/css/base.css +++ b/_core/skin/_common/css/base.css @@ -393,6 +393,66 @@ main { @media print { border-width: 0; } + + .notice-list { + grid-column: 2 / 3; + grid-row: 2 / 3; + margin: 5rem 0 0 0; + padding: 0 3em; + + @media screen and (width <= 735px) { + margin-top: 10rem; + } + + @media print { + display: none; + } + + &:not(:has(li)) { + display: none; + } + + > li { + margin: 2em auto; + padding: 1em; + border: 3px dashed #e70; + border-radius: 0.75em; + background-color: #f504; + width: max-content; + + > p { + margin: 0; + padding: 0; + } + + &[data-mode] { + display: grid; + grid-template-columns: max-content 1fr; + + &::before { + font-family: "Material Symbols Outlined", sans-serif; + font-variation-settings: 'FILL' 0; + grid-column: 1 / 2; + grid-row: 1 / -1; + font-size: 200%; + margin-right: 0.25em; + color: #e70; + } + + > p { + grid-column: 2 / -1; + grid-row: auto; + display: flex; + justify-content: center; + align-items: center; + } + + &[data-mode="important"]::before { + content: "\e000"; + } + } + } + } } article{ diff --git a/_core/skin/_common/form.html b/_core/skin/_common/form.html index 0dd702efe..28fe3cfd8 100644 --- a/_core/skin/_common/form.html +++ b/_core/skin/_common/form.html @@ -128,6 +128,7 @@

ユーザー設定

+

アカウント情報

diff --git a/_core/skin/_common/notice.html b/_core/skin/_common/notice.html new file mode 100644 index 000000000..eb6ce0d13 --- /dev/null +++ b/_core/skin/_common/notice.html @@ -0,0 +1,11 @@ +
    + + +
  • +

    + メールアドレスが設定されていません。（設定する） +

    +
    • +     +     +
diff --git a/_core/skin/sw2/index.html b/_core/skin/sw2/index.html index 047d533b5..5971f320b 100644 --- a/_core/skin/sw2/index.html +++ b/_core/skin/sw2/index.html @@ -30,6 +30,7 @@

<
+