Skip to content

Commit 77722ed

Browse files
mashirozxmashirozx
authored
Merge pull request #240 from mashirozx/dev
update to v3.3.9
2 parents 7a1ec65 + a831ae7 commit 77722ed

20 files changed

+1821
-1829
lines changed

‎404.php

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<head>
1313
<meta charset="<?php bloginfo( 'charset' ); ?>">
1414
<meta name="viewport" content="width=device-width, initial-scale=1">
15+
<link rel="shortcut icon" href="<?php echo akina_option('favicon_link', ''); ?>"/>
1516
<title itemprop="name"><?php global $page, $paged;wp_title( '-', true, 'right' );
1617
bloginfo( 'name' );$site_description = get_bloginfo( 'description', 'display' );
1718
if ( $site_description && ( is_home() || is_front_page() ) ) echo " - $site_description";if ( $paged >= 2 || $page >= 2 ) echo ' - ' . sprintf( __( 'page %s'), max( $paged, $page ) );/*第 %s 页*/?>

‎cdn/js/lib.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cdn/js/src/01.jquery.min.js

100644100755
+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎functions.php

+7-16
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ function akina_comment_format($comment, $args, $depth)
424424
</div>
425425
<?php comment_reply_link(array_merge($args, array('depth' => $depth, 'max_depth' => $args['max_depth'])));?>
426426
<div class="right">
427-
<div class="info"><time datetime="<?php comment_date('Y-m-d');?>"><?php echo poi_time_since(strtotime($comment->comment_date_gmt), true); //comment_date(get_option('date_format')); ?></time><?php echo siren_get_useragent($comment->comment_agent); ?><?php echo mobile_get_useragent_icon($comment->comment_agent); ?>&nbsp;<?php _e('Location', 'sakura'); /*来自*/?>: <?php echo convertip(get_comment_author_ip()); ?>
427+
<div class="info"><time datetime="<?php comment_date('Y-m-d');?>"><?php echo poi_time_since(strtotime($comment->comment_date_gmt), true); //comment_date(get_option('date_format')); ?></time><?php echo siren_get_useragent($comment->comment_agent); ?><?php echo mobile_get_useragent_icon($comment->comment_agent); ?>&nbsp;<?php if(akina_option('open_location')){ _e('Location', 'sakura'); /*来自*/?>: <?php echo convertip(get_comment_author_ip());} ?>
428428
<?php if (current_user_can('manage_options') and (wp_is_mobile() == false)) {
429429
$comment_ID = $comment->comment_ID;
430430
$i_private = get_comment_meta($comment_ID, '_private', true);
@@ -801,7 +801,7 @@ function custom_login()
801801
//echo '<link rel="stylesheet" type="text/css" href="' . get_bloginfo('template_directory') . '/inc/login.css" />'."\n";
802802
echo '<link rel="stylesheet" type="text/css" href="' . get_template_directory_uri() . '/inc/login.css?' . SAKURA_VERSION . '" />' . "\n";
803803
//echo '<script type="text/javascript" src="'.get_bloginfo('template_directory').'/js/jquery.min.js"></script>'."\n";
804-
echo '<script type="text/javascript" src="https://cdn.jsdelivr.net/gh/jquery/jquery@1.8.2/jquery.min.js"></script>' . "\n";
804+
echo '<script type="text/javascript" src="https://cdn.jsdelivr.net/gh/jquery/jquery@1.9.0/jquery.min.js"></script>' . "\n";
805805
}
806806

807807
add_action('login_head', 'custom_login');
@@ -969,11 +969,11 @@ function comment_mail_notify($comment_id)
969969
<h3>您有一条来自<a style="text-decoration: none;color: orange " target="_blank" href="' . home_url() . '/">' . get_option("blogname") . '</a>的回复</h3>
970970
<br>
971971
<p style="font-size: 14px;">您在文章《' . get_the_title($comment->comment_post_ID) . '》上发表的评论：</p>
972-
<p style="border-bottom:#ddd 1px solid;border-left:#ddd 1px solid;padding-bottom:20px;background-color:#eee;margin:15px 0px;padding-left:20px;padding-right:20px;border-top:#ddd 1px solid;border-right:#ddd 1px solid;padding-top:20px">'
973-
. trim(get_comment($parent_id)->comment_content) . '</p>
972+
<div style="border-bottom:#ddd 1px solid;border-left:#ddd 1px solid;padding-bottom:20px;background-color:#eee;margin:15px 0px;padding-left:20px;padding-right:20px;border-top:#ddd 1px solid;border-right:#ddd 1px solid;padding-top:20px">'
973+
. trim(get_comment($parent_id)->comment_content) . '</div>
974974
<p style="font-size: 14px;">' . trim($comment->comment_author) . ' 给您的回复如下：</p>
975-
<p style="border-bottom:#ddd 1px solid;border-left:#ddd 1px solid;padding-bottom:20px;background-color:#eee;margin:15px 0px;padding-left:20px;padding-right:20px;border-top:#ddd 1px solid;border-right:#ddd 1px solid;padding-top:20px">'
976-
. trim($comment->comment_content) . '</p>
975+
<div style="border-bottom:#ddd 1px solid;border-left:#ddd 1px solid;padding-bottom:20px;background-color:#eee;margin:15px 0px;padding-left:20px;padding-right:20px;border-top:#ddd 1px solid;border-right:#ddd 1px solid;padding-top:20px">'
976+
. trim($comment->comment_content) . '</div>
977977
978978
<div style="text-align: center;">
979979
<img src="https://cdn.jsdelivr.net/gh/moezx/cdn@3.1.4/img/other/hr.png" alt="hr" style="width:100%;
@@ -1762,16 +1762,6 @@ function DEFAULT_FEATURE_IMAGE()
17621762
return rest_url('sakura/v1/image/feature') . '?' . rand(1, 1000);
17631763
}
17641764

1765-
//防止设置置顶文章造成的图片同侧bug
1766-
add_action( 'pre_get_posts', function( $q ){
1767-
if ( $q->is_home() && $q->is_main_query() ){
1768-
$q->set( 'posts_per_page', 10 - sizeof(get_option( 'sticky_posts' )) );
1769-
if ( $q->get( 'paged' ) > 1 )
1770-
$q->set( 'post__not_in', get_option( 'sticky_posts' ) );
1771-
}
1772-
1773-
});
1774-
17751765
//评论回复
17761766
function sakura_comment_notify($comment_id)
17771767
{
@@ -1817,6 +1807,7 @@ function markdown_parser($incoming_comment)
18171807
return $incoming_comment;
18181808
}
18191809
add_filter('preprocess_comment', 'markdown_parser');
1810+
remove_filter( 'comment_text', 'make_clickable', 9 );
18201811

18211812
//保存Markdown评论
18221813
function save_markdown_comment($comment_ID, $comment_approved)

‎inc/Parsedown.php

+23-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Parsedown
1717
{
1818
# ~
1919

20-
const version = '1.7.3';
20+
const version = '1.7.4';
2121

2222
# ~
2323

@@ -1489,22 +1489,41 @@ protected function element(array $Element)
14891489
}
14901490
}
14911491

1492+
$permitRawHtml = false;
1493+
14921494
if (isset($Element['text']))
1495+
{
1496+
$text = $Element['text'];
1497+
}
1498+
// very strongly consider an alternative if you're writing an
1499+
// extension
1500+
elseif (isset($Element['rawHtml']))
1501+
{
1502+
$text = $Element['rawHtml'];
1503+
$allowRawHtmlInSafeMode = isset($Element['allowRawHtmlInSafeMode']) && $Element['allowRawHtmlInSafeMode'];
1504+
$permitRawHtml = !$this->safeMode || $allowRawHtmlInSafeMode;
1505+
}
1506+
1507+
if (isset($text))
14931508
{
14941509
$markup .= '>';
14951510

1496-
if (!isset($Element['nonNestables']))
1511+
if (!isset($Element['nonNestables']))
14971512
{
14981513
$Element['nonNestables'] = array();
14991514
}
15001515

15011516
if (isset($Element['handler']))
15021517
{
1503-
$markup .= $this->{$Element['handler']}($Element['text'], $Element['nonNestables']);
1518+
$markup .= $this->{$Element['handler']}($text, $Element['nonNestables']);
1519+
}
1520+
elseif (!$permitRawHtml)
1521+
{
1522+
$markup .= self::escape($text, true);
15041523
}
15051524
else
15061525
{
1507-
$markup .= self::escape($Element['text'], true);
1526+
$markup .= $text;
15081527
}
15091528

15101529
$markup .= '</'.$Element['name'].'>';

‎inc/api.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,12 @@ function cover_gallery() {
120120
* @rest api接口路径：https://sakura.2heng.xin/wp-json/sakura/v1/image/feature
121121
*/
122122
function feature_gallery() {
123-
return cover_gallery();
123+
$imgurl = Images::feature_gallery();
124+
$data = array('feature image');
125+
$response = new WP_REST_Response($data);
126+
$response->set_status(302);
127+
$response->header('Location', $imgurl);
128+
return $response;
124129
}
125130

126131
/*

‎inc/classes/Images.php

+10-1
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,21 @@ public static function cover_gallery() {
154154
$img_array = json_decode($sakura_image_array, true);
155155
$img = array_rand($img_array);
156156
$img_domain = akina_option('cover_cdn') ? akina_option('cover_cdn') : get_template_directory_uri();
157-
if (strpos($_SERVER['HTTP_ACCEPT'], 'image/webp')) {
157+
if (strpos($_SERVER['HTTP_ACCEPT'], 'image/webp') !== false) {
158158
$imgurl = $img_domain . "/manifest/" . $img_array[$img]["webp"][0];
159159
} else {
160160
$imgurl = $img_domain . "/manifest/" . $img_array[$img]["jpeg"][0];
161161
}
162162
}
163163
return $imgurl;
164164
}
165+
166+
public static function feature_gallery() {
167+
if (akina_option('post_cover_options') == "type_2") {
168+
$imgurl = akina_option('post_cover');
169+
} else {
170+
$imgurl = self::cover_gallery();
171+
}
172+
return $imgurl;
173+
}
165174
}

‎inc/css/optionsframework.css

+10-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ body {
88

99
.nav-tab-wrapper {
1010
position: relative;
11-
max-width: 860px;
11+
max-width: 900px;
1212
margin: auto !important;
1313
}
1414

@@ -37,7 +37,7 @@ body {
3737
.nav-tab {
3838
background: none;
3939
border:none;
40-
padding: 10px 20px;
40+
padding: 10px 15px;
4141
font-weight: 300;
4242
font-size: 15px;
4343
color: darkgoldenrod;
@@ -74,17 +74,23 @@ a#options-group-4-tab:before {
7474

7575
a#options-group-5-tab:before {
7676
font-family: "dashicons";
77-
content: "\f110";
77+
content: "\f101";
7878
float: left;
7979
}
8080

8181
a#options-group-6-tab:before {
82+
font-family: "dashicons";
83+
content: "\f110";
84+
float: left;
85+
}
86+
87+
a#options-group-7-tab:before {
8288
font-family: "dashicons";
8389
content: "\f325";
8490
float: left;
8591
}
8692

87-
a#options-group-7-tab:before {
93+
a#options-group-8-tab:before {
8894
font-family: "dashicons";
8995
content: "\f487";
9096
float: left;

‎inc/decorate.php

+34-1
Large diffs are not rendered by default.

‎inc/login.css

-2
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,7 @@ color: #676767 !important}
188188
}
189189

190190
input[type=checkbox]:checked:before {
191-
content: "\f147";
192191
margin: -2px 0 0 -2px;
193-
color: #FF5656;
194192
}
195193

196194
/* loading */

‎inc/swicher.php

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ function font_end_js_control() { ?>
3737
mashiro_option.skin_bg7 = "https://cdn.jsdelivr.net/gh/moezx/cdn@3.1.2/other-sites/api-index/images/me.png";
3838
<?php } ?>
3939

40+
mashiro_option.darkmode = <?php if ( akina_option('darkmode') ){ echo 'true'; } else { echo 'false'; } ?>;
41+
4042
<?php if( is_home() ){ ?>
4143
mashiro_option.land_at_home = true;
4244
<?php }else {?>

‎js/sakura-app.js

+17-19
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ function code_highlight_style() {
146146
}
147147
var ele_name = $('pre:eq(' + i + ')')[0].children[0].className;
148148
var lang = ele_name.substr(0, ele_name.indexOf(" ")).replace('language-', '');
149-
if (lang.toLowerCase() == "hljs") var lang = "text";
149+
if (lang.toLowerCase() == "hljs") var lang = $('pre:eq(' + i + ') code').attr("class").replace('hljs', '')?$('pre:eq(' + i + ') code').attr("class").replace('hljs', ''):"text";
150150
$('pre:eq(' + i + ')').addClass('highlight-wrap');
151151
for (var t in attributes) {
152152
$('pre:eq(' + i + ')').attr(t, attributes[t]);
@@ -334,12 +334,11 @@ function checkDarkModeCookie() {
334334
var dark = getCookie("dark"),
335335
today = new Date(),
336336
hour = today.getHours();
337-
if ((!dark && (hour > 21 || hour < 7) ) || (dark == '1' && (hour >= 22 || hour <= 6))) {
337+
if (mashiro_option.darkmode && ((!dark && (hour > 21 || hour < 7) ) || (dark == '1' && (hour >= 22 || hour <= 6)))) {
338338
setTimeout(function () {
339339
$("#dark-bg").click();
340340
}, 100);
341341
$("#moblieDarkLight").html('<i class="fa fa-sun-o" aria-hidden="true"></i>');
342-
console.log('夜间模式开启');
343342
} else {
344343
if (document.body.clientWidth > 860) {
345344
setTimeout(function () {
@@ -351,7 +350,6 @@ function checkDarkModeCookie() {
351350
$("#moblieDarkLight").html('<i class="fa fa-moon-o" aria-hidden="true"></i>');
352351
setCookie("dark", "0", 0.33);
353352
}
354-
console.log('夜间模式关闭');
355353
}
356354
}
357355
if (!getCookie("darkcache") && (new Date().getHours() > 21 || new Date().getHours() < 7)) {
@@ -399,45 +397,43 @@ $(document).ready(function () {
399397
checkskinSecter();
400398
}
401399
if (tagid == "dark-bg") {
400+
addComment.I("content").classList.add('notransition');
401+
addComment.I("content").style.backgroundColor = "#fff";
402+
addComment.I("content").offsetHeight;
403+
addComment.I("content").classList.remove('notransition');
402404
$("html").css("background", "#31363b");
403-
$(".site-content").css("background-color", "#fff");
404405
$("body").addClass("dark");
405406
setCookie("dark", "1", 0.33);
406407
} else{
407408
$("html").css("background", "unset");
408409
$("body").removeClass("dark");
409-
$(".site-content").css("background-color", "rgba(255, 255, 255, .8)");
410410
setCookie("dark", "0", 0.33);
411411
setCookie("bgImgSetting", tagid, 30);
412+
setTimeout(function () {
413+
addComment.I("content").style.backgroundColor = "rgba(255, 255, 255, 0.8)";
414+
}, 1000);
412415
}
413416
switch (tagid) {
414417
case "white-bg":
415418
$("body").css("background-image", "url(" + checkskin_bg(mashiro_option.skin_bg0) + ")");
416-
$(".site-content").css("background-color", "#fff");
417419
break;
418420
case "sakura-bg":
419421
$("body").css("background-image", "url(" + checkskin_bg(mashiro_option.skin_bg1) + ")");
420-
$(".site-content").css("background-color", "rgba(255, 255, 255, .8)");
421422
break;
422423
case "gribs-bg":
423424
$("body").css("background-image", "url(" + checkskin_bg(mashiro_option.skin_bg2) + ")");
424-
$(".site-content").css("background-color", "rgba(255, 255, 255, .8)");
425425
break;
426426
case "pixiv-bg":
427427
$("body").css("background-image", "url(" + checkskin_bg(mashiro_option.skin_bg3) + ")");
428-
$(".site-content").css("background-color", "rgba(255, 255, 255, .8)");
429428
break;
430429
case "KAdots-bg":
431430
$("body").css("background-image", "url(" + checkskin_bg(mashiro_option.skin_bg4) + ")");
432-
$(".site-content").css("background-color", "rgba(255, 255, 255, .8)");
433431
break;
434432
case "totem-bg":
435433
$("body").css("background-image", "url(" + checkskin_bg(mashiro_option.skin_bg5) + ")");
436-
$(".site-content").css("background-color", "rgba(255, 255, 255, .8)");
437434
break;
438435
case "bing-bg":
439436
$("body").css("background-image", "url(" + checkskin_bg(mashiro_option.skin_bg6) + ")");
440-
$(".site-content").css("background-color", "rgba(255, 255, 255, .8)");
441437
break;
442438
// case "dark-bg":
443439
// $("body").css("background-image", "url(" + checkskin_bg(mashiro_option.skin_bg7) + ")");
@@ -1055,12 +1051,14 @@ function load_bangumi() {
10551051
var xhr = new XMLHttpRequest();
10561052
xhr.open('POST', this.href + "&_wpnonce=" + Poi.nonce, true);
10571053
xhr.onreadystatechange = function() {
1058-
if (xhr.readyState == 4 && xhr.status == 200) {
1059-
var html = JSON.parse(xhr.responseText);
1060-
$("#bangumi-pagination").remove();
1061-
$(".row").append(html);
1062-
}else{
1063-
$("#bangumi-pagination a").removeClass("loading").html('<i class="fa fa-exclamation-triangle" aria-hidden="true"></i> ERROR ');
1054+
if (xhr.readyState == 4 ) {
1055+
if(xhr.status == 200){
1056+
var html = JSON.parse(xhr.responseText);
1057+
$("#bangumi-pagination").remove();
1058+
$(".row").append(html);
1059+
}else{
1060+
$("#bangumi-pagination a").removeClass("loading").html('<i class="fa fa-exclamation-triangle" aria-hidden="true"></i> ERROR ');
1061+
}
10641062
}
10651063
};
10661064
xhr.send();

‎languages/en_US.mo

40 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)