From 4c588a6903940ed3fbeadf5328126a0f7a553718 Mon Sep 17 00:00:00 2001 From: daichimarukana Date: Tue, 12 Sep 2023 22:55:41 +0900 Subject: [PATCH] uwuzu version 1.2.22 --- admin/index.php | 1 + admin/success.php | 1 + css/color.css | 2 + css/home.css | 59 +++++++- emoji/addemoji.php | 3 + emoji/index.php | 2 + errorpage/400.php | 1 + errorpage/401.php | 1 + errorpage/403.php | 1 + errorpage/404.php | 1 + errorpage/500.php | 1 + errorpage/503.php | 1 + errorpage/serverstop.php | 1 + home/ftl.php | 5 +- home/index.php | 7 +- img/sysimage/menuicon/menu.svg | 5 + js/console_notice.js | 28 ++++ logout/index.php | 1 + manifest/manifest.json | 6 + nextpage/view.php | 1 + notice/addnotice.php | 3 + notification/index.php | 1 + others/index.php | 2 + others/token.php | 1 + passrecovery/index.php | 1 - require/botbox.php | 46 +++++- search/index.php | 69 +++++---- server/uwuzuinfo.txt | 4 +- server/uwuzurelease.txt | 9 ++ settings/addauthcode.php | 2 + settings/index.php | 2 + settings/success.php | 2 + settings_admin/ad_admin.php | 1 + settings_admin/codeadmin.php | 1 + settings_admin/customize_admin.php | 1 + settings_admin/moderation_admin.php | 1 + settings_admin/role_admin.php | 1 + settings_admin/serveradmin.php | 1 + settings_admin/useradmin.php | 2 + settings_admin/userinfo.php | 1 + sw.js | 3 + ueuse/index.php | 208 +++++++++++++++------------- user/index.php | 67 ++++----- user/report.php | 1 + user/success.php | 1 + 45 files changed, 376 insertions(+), 183 deletions(-) create mode 100644 img/sysimage/menuicon/menu.svg create mode 100644 js/console_notice.js diff --git a/admin/index.php b/admin/index.php index a8a9fb8..a73c984 100644 --- a/admin/index.php +++ b/admin/index.php @@ -85,6 +85,7 @@ $pdo = null; + diff --git a/admin/success.php b/admin/success.php index 42f355e..a995c10 100644 --- a/admin/success.php +++ b/admin/success.php @@ -80,6 +80,7 @@ if(!(empty($_SESSION['backupcode']))){ + diff --git a/css/color.css b/css/color.css index 80980ff..555c30a 100644 --- a/css/color.css +++ b/css/color.css @@ -2,6 +2,8 @@ --main-color: #FFC832; --sub-color: #FFFAE6; --background-color: #f5f5f5; + --tl-color: #F7F7F7; + --ueuse-color:#f5f5f5; --text-color: #252525; --subtext-color: #999; --link-color: #4e4428; diff --git a/css/home.css b/css/home.css index 056b940..b795379 100644 --- a/css/home.css +++ b/css/home.css @@ -463,7 +463,7 @@ main{ margin-left: 12px; margin-right: 12px; width: 62%; - background-color: var(--background-color); + background-color: var(--tl-color-color); box-shadow:0 0px 48px 0 rgba(0, 0, 0, .05); border: 1px solid var(--main-color); } @@ -923,7 +923,7 @@ main h1{ padding-right: 24px; padding-top: 16px; padding-bottom: 16px; - background-color: var(--background-color); + background-color: var(--ueuse-color); border: 1px solid var(--border-color); width: auto; } @@ -1850,7 +1850,7 @@ main h1{ padding-left: 32px; padding-right: 32px; border-radius: 15px; - background-color: var(--background-color)fff; + background-color: var(--tl-color); box-shadow:none; text-align: left; } @@ -3671,7 +3671,7 @@ summary { margin-left: 0px; margin-right: 0px; width: auto; - background-color: var(--background-color); + background-color: var(--tl-color); box-shadow:0 0px 48px 0 rgba(0, 0, 0, .05); box-shadow:0 0px 48px 0 rgba(0, 0, 0, .05); border: none; @@ -4057,7 +4057,7 @@ summary { padding-right: 12px; padding-top: 12px; padding-bottom: 12px; - background-color: var(--background-color); + background-color: var(--ueuse-color); border: 1px solid var(--border-color); width: auto; } @@ -4806,6 +4806,46 @@ summary { width:75%; } + .bot_menu_area{ + display: flex; + flex-wrap : wrap; + width: 100%; + } + .menubutton{ + display: block; + background-color: var(--background-color); + color: var(--main-color); + border-radius: 10px; + width: 25%; + height: 10dvh; + padding:0px; + text-align: center; + transition: all 250ms ease-out; + text-decoration: none; + } + .menubutton:hover{ + background-color: var(--sub-color); + color: var(--main-color); + } + .menubutton svg { + width: 40%; + height: 40%; + margin-left: auto; + margin-right: auto; + margin-top: 15%; + margin-bottom: 0px; + vertical-align: middle; + fill: currentColor; + } + .menubutton div{ + font-family: 'BIZ UDPGothic', sans-serif; + word-wrap: break-word; + font-size: 12px; + line-height: 22px; + font-weight: bold; + text-align: center; + margin-bottom: 15%; + } } /*------------------------------------------------------------------------------------------------------------*/ @@ -5416,4 +5456,13 @@ summary { .error p{ color: var(--background-color); } + + .menubutton{ + background-color: var(--dark-sub-color); + color: var(--main-color); + } + .menubutton:hover{ + background-color: var(--dark-background-color); + color: var(--main-color); + } } \ No newline at end of file diff --git a/emoji/addemoji.php b/emoji/addemoji.php index 5664311..25909df 100644 --- a/emoji/addemoji.php +++ b/emoji/addemoji.php @@ -308,6 +308,9 @@ $pdo = null; + + + 絵文字登録 - <?php echo file_get_contents($servernamefile);?> diff --git a/emoji/index.php b/emoji/index.php index 5968bb7..adfd6f1 100644 --- a/emoji/index.php +++ b/emoji/index.php @@ -172,6 +172,8 @@ $pdo = null; + + diff --git a/errorpage/400.php b/errorpage/400.php index 63462a0..b87b30c 100644 --- a/errorpage/400.php +++ b/errorpage/400.php @@ -20,6 +20,7 @@ $termsdata = file_get_contents($termsfile); + 400 Bad Request - <?php echo file_get_contents($servernamefile);?> diff --git a/errorpage/401.php b/errorpage/401.php index 9aa4b7c..9be45b4 100644 --- a/errorpage/401.php +++ b/errorpage/401.php @@ -20,6 +20,7 @@ $termsdata = file_get_contents($termsfile); + 401 Unauthorized - <?php echo file_get_contents($servernamefile);?> diff --git a/errorpage/403.php b/errorpage/403.php index 0a5cce4..140dea0 100644 --- a/errorpage/403.php +++ b/errorpage/403.php @@ -20,6 +20,7 @@ $termsdata = file_get_contents($termsfile); + 403 Forbidden - <?php echo file_get_contents($servernamefile);?> diff --git a/errorpage/404.php b/errorpage/404.php index 2563107..609f7bb 100644 --- a/errorpage/404.php +++ b/errorpage/404.php @@ -24,6 +24,7 @@ $termsdata = file_get_contents($termsfile); + 404 Not found - <?php echo file_get_contents($servernamefile);?> diff --git a/errorpage/500.php b/errorpage/500.php index 5961426..4d15dec 100644 --- a/errorpage/500.php +++ b/errorpage/500.php @@ -20,6 +20,7 @@ $termsdata = file_get_contents($termsfile); + 500 Internal Server Error - <?php echo file_get_contents($servernamefile);?> diff --git a/errorpage/503.php b/errorpage/503.php index a90d7e5..86ca1b2 100644 --- a/errorpage/503.php +++ b/errorpage/503.php @@ -25,6 +25,7 @@ $termsdata = file_get_contents($termsfile); + 503 Service Unavailable - <?php echo file_get_contents($servernamefile);?> diff --git a/errorpage/serverstop.php b/errorpage/serverstop.php index a43ca8b..1ddda5b 100644 --- a/errorpage/serverstop.php +++ b/errorpage/serverstop.php @@ -4,6 +4,7 @@ + サーバー停止 - ゆずさば diff --git a/home/ftl.php b/home/ftl.php index 9323f65..e7227b0 100644 --- a/home/ftl.php +++ b/home/ftl.php @@ -431,6 +431,7 @@ $pdo = null; + + diff --git a/manifest/manifest.json b/manifest/manifest.json index a0fec86..e82f264 100644 --- a/manifest/manifest.json +++ b/manifest/manifest.json @@ -6,6 +6,12 @@ "display": "standalone", "start_url": "../index.php", "icons": [ + { + "src": "icon-512x512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "any" + }, { "src": "icon-512x512.png", "sizes": "512x512", diff --git a/nextpage/view.php b/nextpage/view.php index 6b13e23..f7b69f2 100644 --- a/nextpage/view.php +++ b/nextpage/view.php @@ -1,6 +1,7 @@ $1

', $markdownText);//←ここ！！！！！！！！！！！！！！ // コード（#code）をHTMLのdiv class="code"タグに変換 $markdownText = preg_replace('/^#code (.+)/m', '

$1

', $markdownText); diff --git a/notice/addnotice.php b/notice/addnotice.php index 2f5b05c..a4d8b95 100644 --- a/notice/addnotice.php +++ b/notice/addnotice.php @@ -267,7 +267,10 @@ $pdo = null; + + + お知らせ配信 - <?php echo file_get_contents($servernamefile);?> diff --git a/notification/index.php b/notification/index.php index 97d17d1..a289024 100644 --- a/notification/index.php +++ b/notification/index.php @@ -165,6 +165,7 @@ $pdo = null; + diff --git a/others/index.php b/others/index.php index ee83665..504827b 100644 --- a/others/index.php +++ b/others/index.php @@ -428,7 +428,9 @@ require('../logout/logout.php'); + + その他の項目 - <?php echo file_get_contents($servernamefile);?> diff --git a/others/token.php b/others/token.php index 704715e..ca49f6e 100644 --- a/others/token.php +++ b/others/token.php @@ -159,6 +159,7 @@ require('../logout/logout.php'); + アクセストークン発行完了 - <?php echo file_get_contents($servernamefile);?> diff --git a/passrecovery/index.php b/passrecovery/index.php index 8e58a25..9be48eb 100644 --- a/passrecovery/index.php +++ b/passrecovery/index.php @@ -167,7 +167,6 @@ $pdo = null; -
diff --git a/require/botbox.php b/require/botbox.php index 269c849..3ff4fd4 100644 --- a/require/botbox.php +++ b/require/botbox.php @@ -8,10 +8,48 @@ - - - - +
+ + + + + \ No newline at end of file diff --git a/search/index.php b/search/index.php index 17a1a55..4670834 100644 --- a/search/index.php +++ b/search/index.php @@ -174,6 +174,7 @@ $pdo = null; + @@ -254,7 +255,7 @@ $pdo = null; + 設定 - <?php echo file_get_contents($servernamefile);?> diff --git a/settings/index.php b/settings/index.php index 66fcbf1..27f6b03 100644 --- a/settings/index.php +++ b/settings/index.php @@ -704,7 +704,9 @@ $pdo = null; + + 設定 - <?php echo file_get_contents($servernamefile);?> diff --git a/settings/success.php b/settings/success.php index 104ef7b..b6e25a3 100644 --- a/settings/success.php +++ b/settings/success.php @@ -158,7 +158,9 @@ require('../logout/logout.php'); + + 設定 - <?php echo file_get_contents($servernamefile);?> diff --git a/settings_admin/ad_admin.php b/settings_admin/ad_admin.php index 5246fd1..1769065 100644 --- a/settings_admin/ad_admin.php +++ b/settings_admin/ad_admin.php @@ -300,6 +300,7 @@ if (!empty($pdo)) { + diff --git a/settings_admin/codeadmin.php b/settings_admin/codeadmin.php index 575ecad..92a3080 100644 --- a/settings_admin/codeadmin.php +++ b/settings_admin/codeadmin.php @@ -269,6 +269,7 @@ require('../logout/logout.php'); + diff --git a/settings_admin/customize_admin.php b/settings_admin/customize_admin.php index 952bf8d..e8cba9e 100644 --- a/settings_admin/customize_admin.php +++ b/settings_admin/customize_admin.php @@ -235,6 +235,7 @@ require('../logout/logout.php'); + diff --git a/settings_admin/moderation_admin.php b/settings_admin/moderation_admin.php index 9ac2f35..03f97af 100644 --- a/settings_admin/moderation_admin.php +++ b/settings_admin/moderation_admin.php @@ -254,6 +254,7 @@ require('../logout/logout.php'); + diff --git a/settings_admin/role_admin.php b/settings_admin/role_admin.php index a853b4e..0e3a3e3 100644 --- a/settings_admin/role_admin.php +++ b/settings_admin/role_admin.php @@ -360,6 +360,7 @@ if (!empty($pdo)) { + diff --git a/settings_admin/serveradmin.php b/settings_admin/serveradmin.php index 39c3bff..f8d8890 100644 --- a/settings_admin/serveradmin.php +++ b/settings_admin/serveradmin.php @@ -320,6 +320,7 @@ require('../logout/logout.php'); + diff --git a/settings_admin/useradmin.php b/settings_admin/useradmin.php index 4252710..00e78a5 100644 --- a/settings_admin/useradmin.php +++ b/settings_admin/useradmin.php @@ -286,6 +286,7 @@ if (!empty($pdo)) { + @@ -371,4 +372,5 @@ if (!empty($pdo)) { + \ No newline at end of file diff --git a/settings_admin/userinfo.php b/settings_admin/userinfo.php index 5c8d698..96b162c 100644 --- a/settings_admin/userinfo.php +++ b/settings_admin/userinfo.php @@ -480,6 +480,7 @@ require('../logout/logout.php'); + diff --git a/sw.js b/sw.js index a999c24..b564d9e 100644 --- a/sw.js +++ b/sw.js @@ -1,6 +1,8 @@ var CACHE_NAME = "app_uwuzu"; var urlsToCache = [ "home/index.php", + "home/ftl.php", + "notification/index.php", "search/index.php", "require/botbox.php", "require/leftbox.php", @@ -16,6 +18,7 @@ var urlsToCache = [ "new.php", "check.php", "success.php", + "img/", ]; self.addEventListener('install', function(event) { diff --git a/ueuse/index.php b/ueuse/index.php index 238ebc1..b360484 100644 --- a/ueuse/index.php +++ b/ueuse/index.php @@ -161,8 +161,13 @@ $notiData = $notiQuery->fetch(PDO::FETCH_ASSOC); $notificationcount = $notiData['notification_count']; -$ueuseid = htmlentities(str_replace('!', '', $_GET['ueuseid'])); -$touserid = htmlentities(str_replace('~', '', $_GET['touser'])); +if(isset($_GET['ueuseid']) && isset($_GET['touser'])) { + $ueuseid = htmlentities(str_replace('!', '', $_GET['ueuseid'])); + $touserid = htmlentities(str_replace('~', '', $_GET['touser'])); +}elseif(isset($_GET['ueuseid'])){ + $ueuseid = htmlentities(str_replace('!', '', $_GET['ueuseid'])); + $touserid = null; +} function get_mentions_userid($postText) { @@ -191,6 +196,9 @@ function get_mentions_userid($postText) { return $mentionedUsers; } + + + if( !empty($_POST['btn_submit']) ) { @@ -475,6 +483,7 @@ $pdo = null; + @@ -495,82 +504,87 @@ $pdo = null;
-

返信

-
- -
-
- -

画像のEXIF情報(位置情報など)は削除されません。
情報漏洩に気をつけてくださいね…

-
- - - + +

返信

+
+ + +
+ +

画像のEXIF情報(位置情報など)は削除されません。
情報漏洩に気をつけてくださいね…

+
+ + + - -
-
- + +
+ + + + + +

ユーズ

+ - -
-
+
+
-
-
+
+
-