From 86ff1e6bc806b1ad95121580922ef0e1784d69c6 Mon Sep 17 00:00:00 2001
From: daichimarukana
Date: Sun, 27 Aug 2023 00:17:49 +0900
Subject: [PATCH] uwuzu version 1.2.12
---
css/home.css | 309 ++++++++++++++++++++++++++++++++++-----
emoji/addemoji.php | 2 +-
errorpage/400.php | 6 +-
errorpage/401.php | 6 +-
errorpage/403.php | 6 +-
errorpage/404.php | 6 +-
errorpage/500.php | 6 +-
errorpage/503.php | 6 +-
home/index.php | 54 +++++--
img/sysimage/more_1.svg | 1 +
img/sysimage/reply_1.svg | 1 +
logout/index.php | 4 +
nextpage/nextpage.php | 9 ++
nextpage/searchpage.php | 9 ++
nextpage/ueusepage.php | 9 ++
nextpage/userpage.php | 9 ++
nextpage/view.php | 22 +--
notice/addnotice.php | 2 +-
server/uwuzuabout.txt | 3 +-
server/uwuzuinfo.txt | 4 +-
server/uwuzurelease.txt | 8 +
settings/index.php | 2 +-
22 files changed, 406 insertions(+), 78 deletions(-)
create mode 100644 img/sysimage/more_1.svg
create mode 100644 img/sysimage/reply_1.svg
diff --git a/css/home.css b/css/home.css
index d67891c..6ea4616 100644
--- a/css/home.css
+++ b/css/home.css
@@ -1165,12 +1165,12 @@ main h1{
}
+
.ueuse .favbox .tuduki{
cursor: pointer;
border: none;
display: block;
width:auto;
- padding: 8px auto;
margin-left: 0px;
margin-right: 12px;
@@ -1178,8 +1178,8 @@ main h1{
margin-bottom: 2px;
- padding-top: 5px;
- padding-bottom: 5px;
+ padding-top: 2px;
+ padding-bottom: 2px;
padding-left: 12px;
padding-right: 12px;
@@ -1193,8 +1193,6 @@ main h1{
font-weight: normal;
text-decoration:none;
text-align: center;
- transition: box-shadow 250ms ease-in-out;
- transition: width 250ms ease-out;
transition: all 250ms ease-out;
}
@@ -1203,20 +1201,15 @@ main h1{
border: none;
display: block;
width:auto;
- padding: 8px auto;
-
margin-left: 0px;
margin-right: 12px;
margin-top: 2px;
margin-bottom: 2px;
-
-
- padding-top: 5px;
- padding-bottom: 5px;
+ padding-top: 2px;
+ padding-bottom: 2px;
padding-left: 12px;
padding-right: 12px;
-
background-color: #FFC832;
border-radius: 50px;
@@ -1230,7 +1223,10 @@ main h1{
transition: width 250ms ease-out;
transition: all 250ms ease-out;
}
-
+.ueuse .favbox .tuduki svg {
+ fill: currentColor;
+ transition: all 250ms ease-out;
+}
.ueuse .favbox .delbtn{
cursor: pointer;
border: none;
@@ -1843,7 +1839,9 @@ label>input {
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
+ backdrop-filter: blur(5px);
z-index: 9999;
+ transition: all 250ms ease-out;
}
.show {
@@ -1853,11 +1851,11 @@ label>input {
background-color: #fff;
padding: 16px;
border-radius: 10px;
- width: 60%;
- max-width: 400px;
+ width: 20%;
position: absolute;
- top: 50%;
- left: 50%;
+ top: 30%;
+ left: 40%;
+ right: 40%;
transform: translate(-50%, -50%);
box-shadow:0 0px 48px 0 rgba(0, 0, 0, .05);
}
@@ -1977,6 +1975,35 @@ label>input {
width:115px;
}
+.modal-content.slideUp {
+ animation: SlideUp .3s ease-out forwards;
+ }
+.modal-content.slideDown {
+ animation: SlideDown .15s ease-in-out forwards;
+}
+/*下から上*/
+@keyframes SlideUp {
+ 0% {
+ opacity: 0;
+ transform: translateY(-1%);
+ }
+ 100% {
+ opacity: 1;
+ transform: translateY(-20%);
+ }
+}
+/*上から下*/
+@keyframes SlideDown {
+ 0% {
+ opacity: 1;
+ transform: translateY(-20%);
+ }
+ 100% {
+ opacity: 0;
+ transform: translateY(-1%);
+ }
+}
+
.topbox {
position: fixed;
@@ -2682,6 +2709,98 @@ hr{
border-bottom: 3px solid #ffffff;
transform: rotate(-45deg);
}
+.new_ueuse {
+ margin-left: auto;
+ margin-right: auto;
+}
+.new_ueuse_text {
+ width: auto;
+ height: 24px;
+ animation: slideDown 3.0s ease forwards;
+ position: absolute;
+ z-index: 101;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ margin-left: 40%;
+ margin-right: 40%;
+ background: #FFC832;
+ text-align: center;
+ overflow: hidden;
+ box-shadow:0 0px 48px 0 rgba(0, 0, 0, .05);
+ border-radius: 25px;
+ padding-top: 8px;
+ padding-bottom: 0px;
+ padding-left: 0px;
+ padding-right: 0px;
+ color:#FFF;
+ font-family: 'BIZ UDPGothic', sans-serif;
+}
+@keyframes slideDown {
+ 0%, 100% { transform: translateY(-64px); }
+ 10%, 90% { transform: translateY(32px); }
+}
+
+
+
+.buruburu {
+ display: inline-block;
+ animation: hurueru .1s infinite;
+}
+
+@keyframes hurueru {
+ 0% {
+ transform: translate(0px, 0px) rotateZ(0deg)
+ }
+
+ 25% {
+ transform: translate(2px, 2px) rotateZ(1deg)
+ }
+
+ 50% {
+ transform: translate(0px, 2px) rotateZ(0deg)
+ }
+
+ 75% {
+ transform: translate(2px, 0px) rotateZ(-1deg)
+ }
+
+ 100% {
+ transform: translate(0px, 0px) rotateZ(0deg)
+ }
+}
+
+.btn-shine {
+ position: relative;
+ overflow: hidden;
+}
+
+.btn-shine:after {
+ content: "";
+ position: absolute;
+ top: -50%;
+ left: -50%;
+ width: 10%;
+ height: 150%;
+ background: #fff;
+ transform: rotate(45deg);
+ animation: reflect 3s ease-in-out infinite;
+}
+
+@keyframes reflect {
+
+ 0%,
+ 75% {
+ transform: rotate(45deg) scale(0);
+ opacity: 1;
+ }
+
+ 100% {
+ transform: rotate(45deg) scale(100);
+ opacity: 0;
+ }
+}
/*------------------------------------------------------------------------------------------------------------*/
/*--------------------------------------------------スマホ向け--------------------------------------------------*/
@@ -2918,26 +3037,26 @@ hr{
.ueuse .favbox .tuduki{
display: block;
- width:26%;
+ width:auto;
padding: 8px auto;
margin-left: 0px;
margin-right: 12px;
margin-top: 2px;
margin-bottom: 2px;
-
-
- padding-top: 8px;
- padding-bottom: 8px;
- padding-left: 6px;
- padding-right: 6px;
+
+
+ padding-top: 2px;
+ padding-bottom: 2px;
+ padding-left: 12px;
+ padding-right: 12px;
background-color: #FFFAE6;
border-radius: 50px;
color:#FFC832;
- font-size: 12px;
+ font-size: 16px;
font-family: 'Zen Maru Gothic', sans-serif;
font-weight: normal;
text-decoration:none;
@@ -2946,24 +3065,23 @@ hr{
.ueuse .favbox .tuduki:hover{
background-color: #FFC832;
-
margin-left: 0px;
margin-right: 12px;
margin-top: 2px;
margin-bottom: 2px;
+
+
+ padding-top: 2px;
+ padding-bottom: 2px;
+ padding-left: 12px;
+ padding-right: 12px;
-
- padding-top: 8px;
- padding-bottom: 8px;
- padding-left: 6px;
- padding-right: 6px;
-
- width:28%;
+ width:auto;
border-radius: 50px;
color:#FFFAE6;
font-family: 'Zen Maru Gothic', sans-serif;
font-weight: normal;
- font-size: 12px;
+ font-size: 16px;
text-decoration:none;
text-align: center;
}
@@ -3578,6 +3696,129 @@ hr{
font-family: 'BIZ UDPGothic', sans-serif;
font-weight: bold;
}
+
+ .modal{
+ top:0;
+ left: 0;
+ bottom: 0;
+ width: 100%;
+ height: 100dvh;
+ background-color: rgba(0, 0, 0, 0.2);
+ backdrop-filter: blur(4px);
+ z-index: 9999;
+ margin-bottom: 0px;
+ }
+ .modal-content {
+ margin-top:40dvh;
+ width: calc(100% - 48px);
+ margin-bottom: 0px;
+ height: 55dvh;
+ padding: 24px;
+ bottom: 0px;
+ left: 0;
+ animation: SlideUp .5s ease-in-out forwards;
+ }
+
+ .modal-content textarea{
+ text-align: left;
+ width:100%;
+ height:90px;
+ border-radius: 12px;
+ font-size: 16px;
+ }
+
+ .modal-content .btn_area{
+ display: flex;
+ width: 100%;
+ margin-top: 12px;
+ margin-left: auto;
+ margin-right: auto;
+ }
+
+ .modal-content .fbtn{
+ cursor: pointer;
+ border: none;
+ display: block;
+ width:48%;
+ padding: 8px auto;
+ margin-left: auto;
+ margin-right: 0px;
+ margin-bottom: 0px;
+ padding-top: 6px;
+ padding-bottom: 6px;
+ border-radius: 50px;
+ font-size: 16px;
+ font-family: 'Zen Maru Gothic', sans-serif;
+ font-weight: normal;
+ text-decoration:none;
+ text-align: center;
+ transition: box-shadow 250ms ease-in-out;
+ transition: width 250ms ease-out;
+ transition: all 250ms ease-out;
+ }
+ .modal-content .fbtn:hover{
+ width:50%;
+ }
+ .modal-content .fbtn:active{
+ width:45%;
+ }
+
+ .modal-content .fbtn_no{
+ cursor: pointer;
+ border: none;
+ display: block;
+ width:48%;
+ padding: 8px auto;
+ margin-left: 0px;
+ margin-right: auto;
+ margin-bottom: 0px;
+ padding-top: 6px;
+ padding-bottom: 6px;
+ border-radius: 50px;
+ font-size: 16px;
+ font-family: 'Zen Maru Gothic', sans-serif;
+ font-weight: normal;
+ text-decoration:none;
+ text-align: center;
+ transition: box-shadow 250ms ease-in-out;
+ transition: width 250ms ease-out;
+ transition: all 250ms ease-out;
+ }
+ .modal-content .fbtn_no:hover{
+ width:50%;
+ }
+ .modal-content .fbtn_no:active{
+ width:45%;
+ }
+
+ .modal-content.slideUp {
+ animation: SlideUp .3s ease-out forwards;
+ }
+ .modal-content.slideDown {
+ animation: SlideDown .15s ease-in-out forwards;
+ }
+ /*下から上*/
+ @keyframes SlideUp {
+ 0% {
+ opacity: 0;
+ transform: translateY(-1%);
+ }
+ 100% {
+ opacity: 1;
+ transform: translateY(-40%);
+ }
+ }
+ /*上から下*/
+ @keyframes SlideDown {
+ 0% {
+ opacity: 1;
+ transform: translateY(-40%);
+ }
+ 100% {
+ opacity: 0;
+ transform: translateY(-1%);
+ }
+ }
}
diff --git a/emoji/addemoji.php b/emoji/addemoji.php
index 67c3e10..985cbbb 100644
--- a/emoji/addemoji.php
+++ b/emoji/addemoji.php
@@ -139,7 +139,7 @@ if( !empty($pdo) ) {
$dbh = new PDO('mysql:charset=UTF8;dbname='.DB_NAME.';host='.DB_HOST , DB_USER, DB_PASS, $option);
- $rerole = $dbh->prepare("SELECT username, userid, password, mailadds, profile, iconname, iconcontent, icontype, iconsize, headname, headcontent, headtype, headsize, role, datetime FROM account WHERE userid = :userid");
+ $rerole = $dbh->prepare("SELECT username, userid, password, mailadds, profile, iconname, headname, role, datetime FROM account WHERE userid = :userid");
$rerole->bindValue(':userid', $userid);
// SQL実行
diff --git a/errorpage/400.php b/errorpage/400.php
index 257a915..63462a0 100644
--- a/errorpage/400.php
+++ b/errorpage/400.php
@@ -19,7 +19,7 @@ $termsdata = file_get_contents($termsfile);
-
+
400 Bad Request -
@@ -28,7 +28,7 @@ $termsdata = file_get_contents($termsfile);
-

+
@@ -42,7 +42,7 @@ $termsdata = file_get_contents($termsfile);
<(_ _)>
はいっ!エラーです!!!
原因はわかりません!!!!!!!!
- ホームへ行く
+ ホームへ行く
diff --git a/errorpage/401.php b/errorpage/401.php
index 15a820b..9aa4b7c 100644
--- a/errorpage/401.php
+++ b/errorpage/401.php
@@ -19,7 +19,7 @@ $termsdata = file_get_contents($termsfile);
-
+
401 Unauthorized -
@@ -28,7 +28,7 @@ $termsdata = file_get_contents($termsfile);
-

+
@@ -42,7 +42,7 @@ $termsdata = file_get_contents($termsfile);
...(* ̄0 ̄)ノ< アクセス権が無いようです()
サービス管理者によってアクセス権の変更をされた可能性がございます。
- ホームへ行く
+ ホームへ行く
diff --git a/errorpage/403.php b/errorpage/403.php
index afd8daa..0a5cce4 100644
--- a/errorpage/403.php
+++ b/errorpage/403.php
@@ -19,7 +19,7 @@ $termsdata = file_get_contents($termsfile);
-
+
403 Forbidden -
@@ -28,7 +28,7 @@ $termsdata = file_get_contents($termsfile);
-

+
@@ -42,7 +42,7 @@ $termsdata = file_get_contents($termsfile);
...(* ̄0 ̄)ノ< 閲覧権限が無いようです()
サービス管理者によって閲覧権限の変更をされた可能性がございます。
- ホームへ行く
+ ホームへ行く
diff --git a/errorpage/404.php b/errorpage/404.php
index 6907507..3fdaca4 100644
--- a/errorpage/404.php
+++ b/errorpage/404.php
@@ -19,7 +19,7 @@ $termsdata = file_get_contents($termsfile);
-
+
404 Not found -
@@ -28,7 +28,7 @@ $termsdata = file_get_contents($termsfile);
-

+
@@ -42,7 +42,7 @@ $termsdata = file_get_contents($termsfile);
申し訳ございませんがお探しのページは見つかりませんでした!
ページの移動や削除が行われた可能性がございます。
- ホームへ行く
+ ホームへ行く
diff --git a/errorpage/500.php b/errorpage/500.php
index 909d21c..5961426 100644
--- a/errorpage/500.php
+++ b/errorpage/500.php
@@ -19,7 +19,7 @@ $termsdata = file_get_contents($termsfile);
-
+
500 Internal Server Error -
@@ -28,7 +28,7 @@ $termsdata = file_get_contents($termsfile);
-

+
@@ -42,7 +42,7 @@ $termsdata = file_get_contents($termsfile);
\(^o^)/
サーバーオワタ☆
- ホームへ行く
+ ホームへ行く
diff --git a/errorpage/503.php b/errorpage/503.php
index 8f20a4f..6eb5011 100644
--- a/errorpage/503.php
+++ b/errorpage/503.php
@@ -19,7 +19,7 @@ $termsdata = file_get_contents($termsfile);
-
+
503 Service Unavailable -
@@ -28,7 +28,7 @@ $termsdata = file_get_contents($termsfile);
-

+
@@ -42,7 +42,7 @@ $termsdata = file_get_contents($termsfile);
(´。_。`;)< サーバーに過負荷がかかっているようです...
時間をおいてから再度アクセスしてください!
- ホームへ行く
+ ホームへ行く
diff --git a/home/index.php b/home/index.php
index 36949ba..1ce7c0b 100644
--- a/home/index.php
+++ b/home/index.php
@@ -506,6 +506,7 @@ if ("serviceWorker" in navigator) {
+
@@ -603,15 +604,22 @@ $(document).ready(function() {
var modal = document.getElementById('myDelModal');
var deleteButton = document.getElementById('deleteButton');
var cancelButton = document.getElementById('cancelButton'); // 追加
+ var modalMain = $('.modal-content');
$(document).on('click', '.delbtn', function (event) {
modal.style.display = 'block';
+ modalMain.addClass("slideUp");
+ modalMain.removeClass("slideDown");
var uniqid2 = $(this).attr('data-uniqid2');
var postElement = $(this).closest('.ueuse');
deleteButton.addEventListener('click', () => {
- modal.style.display = 'none';
+ modalMain.removeClass("slideUp");
+ modalMain.addClass("slideDown");
+ window.setTimeout(function(){
+ modal.style.display = 'none';
+ }, 150);
$.ajax({
url: '../delete/delete.php',
@@ -632,25 +640,54 @@ $(document).ready(function() {
});
cancelButton.addEventListener('click', () => { // 追加
- modal.style.display = 'none';
+ modalMain.removeClass("slideUp");
+ modalMain.addClass("slideDown");
+ window.setTimeout(function(){
+ modal.style.display = 'none';
+ }, 150);
});
});
+ var more_modal = document.getElementById('myMoreModal');
+ var m_cancelButton = document.getElementById('m_c_button'); // 追加
+ var modalMain = $('.modal-content');
+
+ $(document).on('click', '.more_btn', function (event) {
+ more_modal.style.display = 'block';
+ modalMain.addClass("slideUp");
+ modalMain.removeClass("slideDown");
+
+ m_cancelButton.addEventListener('click', () => {
+ modalMain.removeClass("slideUp");
+ modalMain.addClass("slideDown");
+ window.setTimeout(function(){
+ more_modal.style.display = 'none';
+ }, 150);
+ });
+ });
+
var abimodal = document.getElementById('myAbiModal');
var AbiAddButton = document.getElementById('AbiAddButton');
var AbiCancelButton = document.getElementById('AbiCancelButton');
+ var modalMain = $('.modal-content');
$(document).on('click', '.addabi', function (event) {
abimodal.style.display = 'block';
+ modalMain.addClass("slideUp");
+ modalMain.removeClass("slideDown");
var uniqid2 = $(this).attr('data-uniqid2');
var postAbiElement = $(this).closest('.addabi');
AbiCancelButton.addEventListener('click', () => {
- abimodal.style.display = 'none';
+ modalMain.removeClass("slideUp");
+ modalMain.addClass("slideDown");
+ window.setTimeout(function(){
+ abimodal.style.display = 'none';
+ }, 150);
});
$('#AbiForm').off('submit').on('submit', function (event) {
@@ -660,7 +697,11 @@ $(document).ready(function() {
var abitext = document.getElementById("abitexts").value;
if(abitext == ""){
- abimodal.style.display = 'none';
+ modalMain.removeClass("slideUp");
+ modalMain.addClass("slideDown");
+ window.setTimeout(function(){
+ abimodal.style.display = 'none';
+ }, 150);
}else{
$.ajax({
url: '../abi/addabi.php',
@@ -685,11 +726,6 @@ $(document).ready(function() {
});
});
- // 10秒後に実行
- setTimeout(() => {
- console.log("Execution 10sec"); // Execution 10sec
- }, 10000);
-
});
diff --git a/img/sysimage/more_1.svg b/img/sysimage/more_1.svg
new file mode 100644
index 0000000..687bd69
--- /dev/null
+++ b/img/sysimage/more_1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/img/sysimage/reply_1.svg b/img/sysimage/reply_1.svg
new file mode 100644
index 0000000..d2f81e5
--- /dev/null
+++ b/img/sysimage/reply_1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/logout/index.php b/logout/index.php
index e261dea..a134d97 100644
--- a/logout/index.php
+++ b/logout/index.php
@@ -17,6 +17,10 @@ if (isset($_SERVER['HTTP_COOKIE'])) {
setcookie($name, '', time()-1000, '/settings');
setcookie($name, '', time()-1000, '/emoji');
setcookie($name, '', time()-1000, '/user');
+ setcookie('admin_login', '', time()-1000, '');
+ setcookie('loginid', '', time()-1000, '');
+ setcookie('userid', '', time()-1000, '');
+ setcookie('username', '', time()-1000, '');
}
}
?>
diff --git a/nextpage/nextpage.php b/nextpage/nextpage.php
index e7a64c6..be844a1 100644
--- a/nextpage/nextpage.php
+++ b/nextpage/nextpage.php
@@ -56,6 +56,15 @@ if (!empty($pdo)) {
$message['username'] = $userData['username'];
$message['role'] = $userData['role'];
}
+
+ $rpQuery = $pdo->prepare("SELECT COUNT(*) as reply_count FROM ueuse WHERE rpuniqid = :rpuniqid");
+ $rpQuery->bindValue(':rpuniqid', $message['uniqid']);
+ $rpQuery->execute();
+ $rpData = $rpQuery->fetch(PDO::FETCH_ASSOC);
+
+ if ($rpData){
+ $message['reply_count'] = $rpData['reply_count'];
+ }
}
if(!empty($messages)){
diff --git a/nextpage/searchpage.php b/nextpage/searchpage.php
index 4afa767..5db6e70 100644
--- a/nextpage/searchpage.php
+++ b/nextpage/searchpage.php
@@ -61,6 +61,15 @@ if (!empty($pdo)) {
$message['username'] = $userData['username'];
$message['role'] = $userData['role'];
}
+
+ $rpQuery = $pdo->prepare("SELECT COUNT(*) as reply_count FROM ueuse WHERE rpuniqid = :rpuniqid");
+ $rpQuery->bindValue(':rpuniqid', $message['uniqid']);
+ $rpQuery->execute();
+ $rpData = $rpQuery->fetch(PDO::FETCH_ASSOC);
+
+ if ($rpData){
+ $message['reply_count'] = $rpData['reply_count'];
+ }
}
if(!empty($messages)){
diff --git a/nextpage/ueusepage.php b/nextpage/ueusepage.php
index 351dce0..adc9e75 100644
--- a/nextpage/ueusepage.php
+++ b/nextpage/ueusepage.php
@@ -72,6 +72,15 @@ if (!empty($pdo)) {
$message['username'] = $userData['username'];
$message['role'] = $userData['role'];
}
+
+ $rpQuery = $pdo->prepare("SELECT COUNT(*) as reply_count FROM ueuse WHERE rpuniqid = :rpuniqid");
+ $rpQuery->bindValue(':rpuniqid', $message['uniqid']);
+ $rpQuery->execute();
+ $rpData = $rpQuery->fetch(PDO::FETCH_ASSOC);
+
+ if ($rpData){
+ $message['reply_count'] = $rpData['reply_count'];
+ }
}
if(!empty($messages)){
diff --git a/nextpage/userpage.php b/nextpage/userpage.php
index e3cb0bc..47c8a69 100644
--- a/nextpage/userpage.php
+++ b/nextpage/userpage.php
@@ -70,6 +70,15 @@ if (!empty($pdo)) {
$message['username'] = $userData['username'];
$message['role'] = $userData['role'];
}
+
+ $rpQuery = $pdo->prepare("SELECT COUNT(*) as reply_count FROM ueuse WHERE rpuniqid = :rpuniqid");
+ $rpQuery->bindValue(':rpuniqid', $message['uniqid']);
+ $rpQuery->execute();
+ $rpData = $rpQuery->fetch(PDO::FETCH_ASSOC);
+
+ if ($rpData){
+ $message['reply_count'] = $rpData['reply_count'];
+ }
}
if(!empty($messages)){
diff --git a/nextpage/view.php b/nextpage/view.php
index 5fb34ab..08e9680 100644
--- a/nextpage/view.php
+++ b/nextpage/view.php
@@ -1,22 +1,22 @@
$1
', $markdownText);//←ここ!!!!!!!!!!!!!!
+
// コード(#code)をHTMLのdiv class="code"タグに変換
$markdownText = preg_replace('/^#code (.+)/m', '', $markdownText);
-
+
+ // 画像(#img)をHTMLのimgタグに変換
+ $markdownText = preg_replace('/^#img (.+)/m', '
', $markdownText);
+
// タイトル(#、##、###)をHTMLのhタグに変換
- $markdownText = preg_replace('/^# (.+)/m', '$1
', $markdownText);
- $markdownText = preg_replace('/^## (.+)/m', '$1
', $markdownText);
- $markdownText = preg_replace('/^### (.+)/m', '$1
', $markdownText);
+ $markdownText = preg_replace('/^# (.+)/m', '$1
', $markdownText);
+ $markdownText = preg_replace('/^## (.+)/m', '$1
', $markdownText);
+ $markdownText = preg_replace('/^### (.+)/m', '$1
', $markdownText);
// 箇条書き(-)をHTMLのul/liタグに変換
$markdownText = preg_replace('/^- (.+)/m', '', $markdownText);
- // 空行の前に何もない行をHTMLのpタグに変換
- $markdownText = preg_replace('/(^\s*)(?!\s)(.*)/m', '$1$2
', $markdownText);
-
return $markdownText;
}
@@ -154,7 +154,7 @@ class MessageDisplay {
}else{
echo '';
}
- echo '返信をみる&する';
+ echo ''.htmlentities($this->value['reply_count']).'';
if($this->value['account'] === $this->userid){
if($this->value['abi'] === "none"){
echo '';
diff --git a/notice/addnotice.php b/notice/addnotice.php
index 948e63a..5372d51 100644
--- a/notice/addnotice.php
+++ b/notice/addnotice.php
@@ -139,7 +139,7 @@ if( !empty($pdo) ) {
$dbh = new PDO('mysql:charset=utf8mb4;dbname='.DB_NAME.';host='.DB_HOST , DB_USER, DB_PASS, $option);
- $rerole = $dbh->prepare("SELECT username, userid, password, mailadds, profile, iconname, iconcontent, icontype, iconsize, headname, headcontent, headtype, headsize, role, datetime FROM account WHERE userid = :userid");
+ $rerole = $dbh->prepare("SELECT username, userid, password, mailadds, profile, iconname, headname, role, datetime FROM account WHERE userid = :userid");
$rerole->bindValue(':userid', $userid);
// SQL実行
diff --git a/server/uwuzuabout.txt b/server/uwuzuabout.txt
index eb5022d..29a1a8b 100644
--- a/server/uwuzuabout.txt
+++ b/server/uwuzuabout.txt
@@ -25,11 +25,12 @@ daichimarukana < 「うぃずゆー(With you)」「うぃじゅー(witzou)」「
## 4. 開発言語は?
uwuzuはPHPとJS、HTML(プログラミング言語じゃないか)、CSSで作られています!
-ライブラリはjQuery、Reactを導入しています!
+ライブラリはjQueryを導入しています!
## 5. サーバーの建て方
※MySQLの設定結構めんどいです。
まず、Apache2とPHP 8とmysql Ver 15が導入されているサーバーを準備します!
+PHP 8では事前にGDを有効化しておいてください!(QRコードの生成に必要です。)
次にSQLを設定します。(InnoDB)
まず、お好きな名前でDBを作成し、その中に、account,emoji,notice,role,ueuse,notificationとテーブルを作成します。
テーブルの中身は以下のとおりです。
diff --git a/server/uwuzuinfo.txt b/server/uwuzuinfo.txt
index 429e4a1..5ee3e9c 100644
--- a/server/uwuzuinfo.txt
+++ b/server/uwuzuinfo.txt
@@ -1,4 +1,4 @@
uwuzu
-1.2.11
-2023/08/25
+1.2.12
+2023/08/27
daichimarukana,putonfps
\ No newline at end of file
diff --git a/server/uwuzurelease.txt b/server/uwuzurelease.txt
index ce06a31..81ef5f6 100644
--- a/server/uwuzurelease.txt
+++ b/server/uwuzurelease.txt
@@ -1,6 +1,14 @@
## リリースノートだぜぇぇぇぇぇぇい!!!!!!!
ここにはuwuzuの更新情報を載せてくぜぇ~!(いやまてテンションおかしいだろ...)
+## Version 1.2.12
+リリース日:2023/08/27
+致命的なバグを修正しました。
+モバイル向けUIを変更しました。
+リプライ数を表示するようにしました。
+文字をぶるぶるできるようにしました。(?)
+[[buruburu ここにぶるぶるさせたい文字]]でできます。
+
## Version 1.2.11
リリース日:2023/08/25
モバイル向けUIを変更しました。
diff --git a/settings/index.php b/settings/index.php
index f6f04d9..18b084f 100644
--- a/settings/index.php
+++ b/settings/index.php
@@ -134,7 +134,7 @@ if( !empty($pdo) ) {
$dbh = new PDO('mysql:charset=utf8mb4;dbname='.DB_NAME.';host='.DB_HOST , DB_USER, DB_PASS, $option);
- $rerole = $dbh->prepare("SELECT username, userid, password, mailadds, profile, iconname, iconcontent, icontype, iconsize, headname, headcontent, headtype, headsize, role, datetime, authcode FROM account WHERE userid = :userid");
+ $rerole = $dbh->prepare("SELECT username, userid, password, mailadds, profile, iconname, headname, role, datetime, authcode FROM account WHERE userid = :userid");
$rerole->bindValue(':userid', $userid);
// SQL実行