Skip to content

Commit

Permalink
Merge pull request #453 from mirai-mamori/preview
Browse files Browse the repository at this point in the history 
物語「ものがたり」　Chapter　Ⅰ　~君が見た夢の物語~　Update　Fix　Pack　1
  • Loading branch information
@mirai-mamori
mirai-mamori authored Feb 28, 2022
2 parents 0f92fc0 + fa9a0b3 commit 4011651
Show file tree
Hide file tree
Showing 164 changed files with 175 additions and 215 deletions.
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
[![GitHub release](https://img.shields.io/github/v/release/mirai-mamori/Sakurairo.svg?style=for-the-badge&logo=appveyor)](https://github.com/mirai-mamori/Sakurairo/releases/latest)[![GitHub Release Date](https://img.shields.io/github/release-date/mirai-mamori/Sakurairo?style=for-the-badge&logo=appveyor)](https://github.com/mirai-mamori/Sakurairo/releases)![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/mirai-mamori/Sakurairo?style=for-the-badge&logo=appveyor)[![jsDelivr hits (GitHub)](https://img.shields.io/jsdelivr/gh/hm/Fuukei/Public_Repository?color=red&logo=jsdelivr&logoColor=red&style=for-the-badge)](https://www.jsdelivr.com/package/gh/mirai-mamori/sakurairo)

![Alt](https://repobeats.axiom.co/api/embed/292776675b642d6dc86f264f4b71ed411ee9be91.svg "Repobeats analytics image")

## 版本简介：

Expand Down
1 change: 1 addition & 0 deletions README_en.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
[![GitHub release](https://img.shields.io/github/v/release/mirai-mamori/Sakurairo.svg?style=for-the-badge&logo=appveyor)](https://github.com/mirai-mamori/Sakurairo/releases/latest)[![GitHub Release Date](https://img.shields.io/github/release-date/mirai-mamori/Sakurairo?style=for-the-badge&logo=appveyor)](https://github.com/mirai-mamori/Sakurairo/releases)![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/mirai-mamori/Sakurairo?style=for-the-badge&logo=appveyor)[![jsDelivr hits (GitHub)](https://img.shields.io/jsdelivr/gh/hm/Fuukei/Public_Repository?color=red&logo=jsdelivr&logoColor=red&style=for-the-badge)](https://www.jsdelivr.com/package/gh/mirai-mamori/sakurairo)

![Alt](https://repobeats.axiom.co/api/embed/292776675b642d6dc86f264f4b71ed411ee9be91.svg "Repobeats analytics image")

## What's new：

Expand Down
1 change: 1 addition & 0 deletions README_ja.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
[![GitHub release](https://img.shields.io/github/v/release/mirai-mamori/Sakurairo.svg?style=for-the-badge&logo=appveyor)](https://github.com/mirai-mamori/Sakurairo/releases/latest)[![GitHub Release Date](https://img.shields.io/github/release-date/mirai-mamori/Sakurairo?style=for-the-badge&logo=appveyor)](https://github.com/mirai-mamori/Sakurairo/releases)![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/mirai-mamori/Sakurairo?style=for-the-badge&logo=appveyor)[![jsDelivr hits (GitHub)](https://img.shields.io/jsdelivr/gh/hm/Fuukei/Public_Repository?color=red&logo=jsdelivr&logoColor=red&style=for-the-badge)](https://www.jsdelivr.com/package/gh/mirai-mamori/sakurairo)

![Alt](https://repobeats.axiom.co/api/embed/292776675b642d6dc86f264f4b71ed411ee9be91.svg "Repobeats analytics image")

## バージョン紹介：

Expand Down
1 change: 1 addition & 0 deletions README_tw.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
[![GitHub release](https://img.shields.io/github/v/release/mirai-mamori/Sakurairo.svg?style=for-the-badge&logo=appveyor)](https://github.com/mirai-mamori/Sakurairo/releases/latest)[![GitHub Release Date](https://img.shields.io/github/release-date/mirai-mamori/Sakurairo?style=for-the-badge&logo=appveyor)](https://github.com/mirai-mamori/Sakurairo/releases)![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/mirai-mamori/Sakurairo?style=for-the-badge&logo=appveyor)[![jsDelivr hits (GitHub)](https://img.shields.io/jsdelivr/gh/hm/Fuukei/Public_Repository?color=red&logo=jsdelivr&logoColor=red&style=for-the-badge)](https://www.jsdelivr.com/package/gh/mirai-mamori/sakurairo)

![Alt](https://repobeats.axiom.co/api/embed/292776675b642d6dc86f264f4b71ed411ee9be91.svg "Repobeats analytics image")

## 版本宣傳：

Expand Down
10 changes: 3 additions & 7 deletions footer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,7 @@ class="aplayer"
</body>
<!-- Particles动效 -->
<?php if (iro_opt('particles_effects', 'true')): ?>

<style type="text/css">
<style>
#particles-js {
width: 100%;
height: 100%;
Expand All @@ -182,10 +181,7 @@ class="aplayer"
z-index: -1;
}
</style>
<div id="particles-js">
</div>
<script type="application/json" id="particles-js-cfg">
<?=iro_opt('particles_json','')?>
</script>
<div id="particles-js"></div>
<script type="application/json" id="particles-js-cfg"><?=iro_opt('particles_json','')?></script>
<?php endif; ?>
</html>
23 changes: 9 additions & 14 deletions inc/classes/Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,13 @@

class Captcha
{
private $font;
private $captchCode;
private $timestamp;

/**
* CAPTCHA constructor.
*/
public function __construct()
{
$this->font = STYLESHEETPATH . '/inc/KumoFont.ttf';
$this->timestamp = time();
$this->captchCode = '';
}

Expand All @@ -42,8 +38,8 @@ private function create_captcha(): void
private function crypt_captcha(): string
{
//return md5($this->captchCode);
// return password_hash($this->captchCode, PASSWORD_DEFAULT);
return wp_hash_password($this->captchCode);
return password_hash($this->captchCode, PASSWORD_DEFAULT);
// return wp_hash_password($this->captchCode);
}

/**
Expand All @@ -56,8 +52,8 @@ private function crypt_captcha(): string
public function verify_captcha(string $captcha, string $hash): bool
{
//return md5($captcha) == $hash ? true : false;
// return password_verify($captcha, $hash);
return wp_check_password($captcha, $hash);
return password_verify($captcha, $hash);
// return wp_check_password($captcha, $hash);
}

/**
Expand All @@ -69,8 +65,7 @@ public function create_captcha_img(): array
{
//创建画布
$img = imagecreatetruecolor(120, 40);
//setcookie('timestamp',$this->timestamp,$this->timestamp+60,'/');
//setcookie('id',$this->uniqid,$this->timestamp+60,'/');
$file = STYLESHEETPATH . '/inc/KumoFont.ttf';
//填充背景色
$backcolor = imagecolorallocate($img, mt_rand(200, 255), mt_rand(200, 255), mt_rand(0, 255));
imagefill($img, 0, 0, $backcolor);
Expand All @@ -81,7 +76,6 @@ public function create_captcha_img(): array
for ($i = 1; $i <= 5; $i++) {
$span = 20;
$stringcolor = imagecolorallocate($img, mt_rand(0, 255), mt_rand(0, 100), mt_rand(0, 80));
$file = $this->font;
imagefttext($img, 25, 2, $i * $span, 30, $stringcolor, $file, $this->captchCode[$i - 1]);
}

Expand All @@ -96,7 +90,8 @@ public function create_captcha_img(): array
$pixelcolor = imagecolorallocate($img, mt_rand(100, 150), mt_rand(0, 120), mt_rand(0, 255));
imagesetpixel($img, mt_rand(0, 179), mt_rand(0, 39), $pixelcolor);
}

$timestamp = time();
$this->captchCode .= $timestamp;
//打开缓存区
ob_start();
imagepng($img);
Expand All @@ -113,7 +108,7 @@ public function create_captcha_img(): array
'data' => $captchaimg,
'msg' => '',
'id' => $this->crypt_captcha(),
'time' => $this->timestamp,
'time' => $timestamp,
];
}

Expand All @@ -138,7 +133,7 @@ public function check_captcha(string $captcha, int $timestamp, string $id): arra
$code = 2;
$msg = __("Captcha timeout.","sakurairo");//超时!
} elseif ($timestamp >= $temp1 && $timestamp <= $temp) {
if ($this->verify_captcha($captcha, $id) == true) {
if ($this->verify_captcha($captcha.$timestamp, $id) == true) {
$code = 5;
$msg = __("Captcha check passed.","sakurairo");//'验证码正确!'
} else {
Expand Down
43 changes: 1 addition & 42 deletions inc/decorate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1050,18 +1050,6 @@ function customizer_css() { ?>
#video-add{
background-image: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>basic/add.png);
}
a{
cursor: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>cursor/ayuda.cur), auto;
}
a:active{
cursor: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>cursor/work.cur), alias;
}
body{
cursor: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>cursor/normal.cur), auto;
}
p{
cursor: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>cursor/texto.cur), auto;
}
body.dark .post-footer {
background-image: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>basic/creativecommons-dark.png);
}
Expand All @@ -1070,30 +1058,7 @@ function customizer_css() { ?>
background-image: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>basic/grid.png);
}
}
.emoji-item,
.on-hover {
cursor: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>cursor/No_Disponible.cur), auto;
}
.emotion-item{
cursor: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>cursor/No_Disponible.cur), auto;
}
.emotion-box{
cursor: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>cursor/No_Disponible.cur), auto;
}
#emotion-toggle {
cursor: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>cursor/No_Disponible.cur), auto;
}
.tieba-container span {
cursor: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>cursor/No_Disponible.cur), auto;
}
.ins-section .ins-search-item {
cursor: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>cursor/ayuda.cur), auto;
}
.post-footer
{
background-image: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>basic/creativecommons-light.png);

}
.post-footer{background-image: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>basic/creativecommons-light.png);}
.headertop.filter-grid::before {
background-image: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>basic/grid.png);
}
Expand All @@ -1108,12 +1073,6 @@ function customizer_css() { ?>
.video-pause {
background-image: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>basic/stop.png);
}
.ins-section .ins-search-item .ins-search-preview {
cursor: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>cursor/ayuda.cur), auto;
}
.ins-section .ins-section-header {
cursor: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>cursor/ayuda.cur), auto;
}
#loading-comments {
background-image: url(<?=iro_opt('vision_resource_basepath', 'https://x.jscdn.host/release/ucode-x/source/Sakurairo_Vision/@2.4/')?>load_svg/ball.svg);}

Expand Down
2 changes: 0 additions & 2 deletions js/1.js
View file

This file was deleted.

1 change: 0 additions & 1 deletion js/1.js.map
View file

This file was deleted.

2 changes: 2 additions & 0 deletions js/114.js
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions js/114.js.map
View file

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions js/122.js
View file

This file was deleted.

1 change: 0 additions & 1 deletion js/122.js.map
View file

This file was deleted.

2 changes: 2 additions & 0 deletions js/128.js
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions js/128.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/514.css → js/138.css
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions js/138.css.map
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 4011651

Please sign in to comment.