Skip to content

Commit b73c45f

Browse files
spirit1431007spirit1431007
authored
perf: update to v3.4.0 (#273)
* fix: bug fix update Meting API, add ipv6 support, fix icon close #255,#243 * style: add some variable definitions support php8 * perf: update to v3.4.0 * docs: update screenshot
1 parent 8a46b85 commit b73c45f

File tree

6 files changed

+142
-130
lines changed

6 files changed

+142
-130
lines changed

‎README-en.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ Sakura🌸: A Wonderful WordPress Theme
33

44
[中文](README.md) | Engilsh
55

6-
![Sakura](https://view.moezx.cc/images/2018/05/26/sakura.png)
6+
![Sakura](screenshot.jpg)
77

8-
![PHP version](https://img.shields.io/badge/PHP-7.1+-4F5B93.svg?style=flat-square)
9-
![WP version](https://img.shields.io/badge/WordPress-5.0+-0073aa.svg?style=flat-square)
8+
![PHP version](https://img.shields.io/badge/PHP-7.1+-4F5B93.svg?style=flat-square&logo=php)
9+
![WP version](https://img.shields.io/badge/WordPress-5.3-0073aa.svg?style=flat-square&logo=wordpress)
1010
[![GitHub release](https://img.shields.io/github/release/mashirozx/Sakura.svg?style=flat-square)](https://github.com/mashirozx/Sakura/releases/latest)
1111
[![Github commits (since latest release)](https://img.shields.io/github/commits-since/mashirozx/Sakura/latest/dev.svg?style=flat-square)](https://github.com/mashirozx/Sakura/commits/dev)
1212
[![](https://data.jsdelivr.com/v1/package/gh/moezx/cdn/badge)](https://www.jsdelivr.com/package/gh/moezx/cdn)

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
中文 | [Engilsh](README-en.md)
55

6-
![Sakura](https://view.moezx.cc/images/2018/05/26/sakura.png)
6+
![Sakura](screenshot.jpg)
77

8-
![PHP version](https://shader.2heng.xin/badge/PHP-7.1+-4F5B93.svg?style=flat-square&logo=php)
9-
![WP version](https://shader.2heng.xin/badge/WordPress-5.3-0073aa.svg?style=flat-square&logo=wordpress)
8+
![PHP version](https://img.shields.io/badge/PHP-7.1+-4F5B93.svg?style=flat-square&logo=php)
9+
![WP version](https://img.shields.io/badge/WordPress-5.3-0073aa.svg?style=flat-square&logo=wordpress)
1010
[![GitHub release](https://img.shields.io/github/v/release/mashirozx/Sakura.svg?style=flat-square&logo=github)](https://github.com/mashirozx/Sakura/releases/latest)
1111
[![Github commits (since latest release)](https://img.shields.io/github/commits-since/mashirozx/Sakura/latest/dev.svg?style=flat-square&logo=git&color=important)](https://github.com/mashirozx/Sakura/commits/dev)
1212
[![](https://data.jsdelivr.com/v1/package/gh/moezx/cdn/badge)](https://www.jsdelivr.com/package/gh/moezx/cdn)

‎comments.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<?php endif; ?>
4949

5050
<?php
51-
51+
$robot_comments = '';
5252
if(comments_open()){
5353
if(akina_option('norobot')) $robot_comments = '<label class="siren-checkbox-label"><input class="siren-checkbox-radio" type="checkbox" name="no-robot"><span class="siren-no-robot-checkbox siren-checkbox-radioInput"></span>'.__('I\'m not a robot', 'sakura').'</label>';
5454
$private_ms = akina_option('open_private_message') ? '<label class="siren-checkbox-label"><input class="siren-checkbox-radio" type="checkbox" name="is-private"><span class="siren-is-private-checkbox siren-checkbox-radioInput"></span>'.__('Comment in private', 'sakura').'</label>' : '';

‎functions.php

+132-120
Original file line numberDiff line numberDiff line change
@@ -249,149 +249,160 @@ function sakura_scripts()
249249
function convertip($ip)
250250
{
251251
error_reporting(E_ALL ^ E_NOTICE);
252-
$dat_path = dirname(__FILE__) . '/inc/QQWry.Dat';
253-
if (!$fd = @fopen($dat_path, 'rb')) {
254-
return 'IP date file not exists or access denied';
255-
}
256-
$ip = explode('.', $ip);
257-
$ipNum = intval($ip[0]) * 16777216 + intval($ip[1]) * 65536 + intval($ip[2]) * 256 + intval($ip[3]);
258-
$DataBegin = fread($fd, 4);
259-
$DataEnd = fread($fd, 4);
260-
$ipbegin = implode('', unpack('L', $DataBegin));
261-
if ($ipbegin < 0) {
262-
$ipbegin += pow(2, 32);
263-
}
264-
265-
$ipend = implode('', unpack('L', $DataEnd));
266-
if ($ipend < 0) {
267-
$ipend += pow(2, 32);
268-
}
269-
270-
$ipAllNum = ($ipend - $ipbegin) / 7 + 1;
271-
$BeginNum = 0;
272-
$EndNum = $ipAllNum;
273-
while ($ip1num > $ipNum || $ip2num < $ipNum) {
274-
$Middle = intval(($EndNum + $BeginNum) / 2);
275-
fseek($fd, $ipbegin + 7 * $Middle);
276-
$ipData1 = fread($fd, 4);
277-
if (strlen($ipData1) < 4) {
278-
fclose($fd);
279-
return 'System Error';
280-
}
281-
$ip1num = implode('', unpack('L', $ipData1));
282-
if ($ip1num < 0) {
283-
$ip1num += pow(2, 32);
284-
}
285-
286-
if ($ip1num > $ipNum) {
287-
$EndNum = $Middle;
288-
continue;
252+
if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false) {
253+
$file_contents = file_get_contents('http://ip.taobao.com/outGetIpInfo?accessKey=alibaba-inc&ip='.$ip);
254+
$result = json_decode($file_contents,true);
255+
if ($result['data']['country'] != '中国') {
256+
return $result['data']['country'];
257+
} else {
258+
return $result['data']['region'].'&nbsp;·&nbsp;'.$result['data']['city'].'&nbsp;·&nbsp;'.$result['data']['isp'];
289259
}
290-
$DataSeek = fread($fd, 3);
291-
if (strlen($DataSeek) < 3) {
292-
fclose($fd);
293-
return 'System Error';
260+
} else {
261+
$dat_path = dirname(__FILE__) . '/inc/QQWry.Dat';
262+
if (!$fd = @fopen($dat_path, 'rb')) {
263+
return 'IP date file not exists or access denied';
294264
}
295-
$DataSeek = implode('', unpack('L', $DataSeek . chr(0)));
296-
fseek($fd, $DataSeek);
297-
$ipData2 = fread($fd, 4);
298-
if (strlen($ipData2) < 4) {
299-
fclose($fd);
300-
return 'System Error';
265+
$ip = explode('.', $ip);
266+
$ipNum = intval($ip[0]) * 16777216 + intval($ip[1]) * 65536 + intval($ip[2]) * 256 + intval($ip[3]);
267+
$DataBegin = fread($fd, 4);
268+
$DataEnd = fread($fd, 4);
269+
$ipbegin = implode('', unpack('L', $DataBegin));
270+
if ($ipbegin < 0) {
271+
$ipbegin += pow(2, 32);
301272
}
302-
$ip2num = implode('', unpack('L', $ipData2));
303-
if ($ip2num < 0) {
304-
$ip2num += pow(2, 32);
273+
274+
$ipend = implode('', unpack('L', $DataEnd));
275+
if ($ipend < 0) {
276+
$ipend += pow(2, 32);
305277
}
306278

307-
if ($ip2num < $ipNum) {
308-
if ($Middle == $BeginNum) {
279+
$ipAllNum = ($ipend - $ipbegin) / 7 + 1;
280+
$BeginNum = 0;
281+
$EndNum = $ipAllNum;
282+
$ip1num = $ip2num = $ipAddr1 = $ipAddr2 = '';
283+
while ($ip1num > $ipNum || $ip2num < $ipNum) {
284+
$Middle = intval(($EndNum + $BeginNum) / 2);
285+
fseek($fd, $ipbegin + 7 * $Middle);
286+
$ipData1 = fread($fd, 4);
287+
if (strlen($ipData1) < 4) {
309288
fclose($fd);
310-
return 'Unknown';
289+
return 'System Error';
311290
}
312-
$BeginNum = $Middle;
313-
}
314-
}
315-
$ipFlag = fread($fd, 1);
316-
if ($ipFlag == chr(1)) {
317-
$ipSeek = fread($fd, 3);
318-
if (strlen($ipSeek) < 3) {
319-
fclose($fd);
320-
return 'System Error';
321-
}
322-
$ipSeek = implode('', unpack('L', $ipSeek . chr(0)));
323-
fseek($fd, $ipSeek);
324-
$ipFlag = fread($fd, 1);
325-
}
326-
if ($ipFlag == chr(2)) {
327-
$AddrSeek = fread($fd, 3);
328-
if (strlen($AddrSeek) < 3) {
329-
fclose($fd);
330-
return 'System Error';
331-
}
332-
$ipFlag = fread($fd, 1);
333-
if ($ipFlag == chr(2)) {
334-
$AddrSeek2 = fread($fd, 3);
335-
if (strlen($AddrSeek2) < 3) {
291+
$ip1num = implode('', unpack('L', $ipData1));
292+
if ($ip1num < 0) {
293+
$ip1num += pow(2, 32);
294+
}
295+
296+
if ($ip1num > $ipNum) {
297+
$EndNum = $Middle;
298+
continue;
299+
}
300+
$DataSeek = fread($fd, 3);
301+
if (strlen($DataSeek) < 3) {
336302
fclose($fd);
337303
return 'System Error';
338304
}
339-
$AddrSeek2 = implode('', unpack('L', $AddrSeek2 . chr(0)));
340-
fseek($fd, $AddrSeek2);
341-
} else {
342-
fseek($fd, -1, SEEK_CUR);
343-
}
344-
while (($char = fread($fd, 1)) != chr(0)) {
345-
$ipAddr2 .= $char;
346-
}
347-
348-
$AddrSeek = implode('', unpack('L', $AddrSeek . chr(0)));
349-
fseek($fd, $AddrSeek);
350-
while (($char = fread($fd, 1)) != chr(0)) {
351-
$ipAddr1 .= $char;
352-
}
305+
$DataSeek = implode('', unpack('L', $DataSeek . chr(0)));
306+
fseek($fd, $DataSeek);
307+
$ipData2 = fread($fd, 4);
308+
if (strlen($ipData2) < 4) {
309+
fclose($fd);
310+
return 'System Error';
311+
}
312+
$ip2num = implode('', unpack('L', $ipData2));
313+
if ($ip2num < 0) {
314+
$ip2num += pow(2, 32);
315+
}
353316

354-
} else {
355-
fseek($fd, -1, SEEK_CUR);
356-
while (($char = fread($fd, 1)) != chr(0)) {
357-
$ipAddr1 .= $char;
317+
if ($ip2num < $ipNum) {
318+
if ($Middle == $BeginNum) {
319+
fclose($fd);
320+
return 'Unknown';
321+
}
322+
$BeginNum = $Middle;
323+
}
358324
}
359-
360325
$ipFlag = fread($fd, 1);
326+
if ($ipFlag == chr(1)) {
327+
$ipSeek = fread($fd, 3);
328+
if (strlen($ipSeek) < 3) {
329+
fclose($fd);
330+
return 'System Error';
331+
}
332+
$ipSeek = implode('', unpack('L', $ipSeek . chr(0)));
333+
fseek($fd, $ipSeek);
334+
$ipFlag = fread($fd, 1);
335+
}
361336
if ($ipFlag == chr(2)) {
362-
$AddrSeek2 = fread($fd, 3);
363-
if (strlen($AddrSeek2) < 3) {
337+
$AddrSeek = fread($fd, 3);
338+
if (strlen($AddrSeek) < 3) {
364339
fclose($fd);
365340
return 'System Error';
366341
}
367-
$AddrSeek2 = implode('', unpack('L', $AddrSeek2 . chr(0)));
368-
fseek($fd, $AddrSeek2);
342+
$ipFlag = fread($fd, 1);
343+
if ($ipFlag == chr(2)) {
344+
$AddrSeek2 = fread($fd, 3);
345+
if (strlen($AddrSeek2) < 3) {
346+
fclose($fd);
347+
return 'System Error';
348+
}
349+
$AddrSeek2 = implode('', unpack('L', $AddrSeek2 . chr(0)));
350+
fseek($fd, $AddrSeek2);
351+
} else {
352+
fseek($fd, -1, SEEK_CUR);
353+
}
354+
while (($char = fread($fd, 1)) != chr(0)) {
355+
$ipAddr2 .= $char;
356+
}
357+
358+
$AddrSeek = implode('', unpack('L', $AddrSeek . chr(0)));
359+
fseek($fd, $AddrSeek);
360+
while (($char = fread($fd, 1)) != chr(0)) {
361+
$ipAddr1 .= $char;
362+
}
363+
369364
} else {
370365
fseek($fd, -1, SEEK_CUR);
366+
while (($char = fread($fd, 1)) != chr(0)) {
367+
$ipAddr1 .= $char;
368+
}
369+
370+
$ipFlag = fread($fd, 1);
371+
if ($ipFlag == chr(2)) {
372+
$AddrSeek2 = fread($fd, 3);
373+
if (strlen($AddrSeek2) < 3) {
374+
fclose($fd);
375+
return 'System Error';
376+
}
377+
$AddrSeek2 = implode('', unpack('L', $AddrSeek2 . chr(0)));
378+
fseek($fd, $AddrSeek2);
379+
} else {
380+
fseek($fd, -1, SEEK_CUR);
381+
}
382+
while (($char = fread($fd, 1)) != chr(0)) {
383+
$ipAddr2 .= $char;
384+
}
371385
}
372-
while (($char = fread($fd, 1)) != chr(0)) {
373-
$ipAddr2 .= $char;
386+
fclose($fd);
387+
if (preg_match('/http/i', $ipAddr2)) {
388+
$ipAddr2 = '';
374389
}
375-
}
376-
fclose($fd);
377-
if (preg_match('/http/i', $ipAddr2)) {
378-
$ipAddr2 = '';
379-
}
380-
$ipaddr = "$ipAddr1 $ipAddr2";
381-
$ipaddr = preg_replace('/CZ88.Net/is', '', $ipaddr);
382-
$ipaddr = preg_replace('/^s*/is', '', $ipaddr);
383-
$ipaddr = preg_replace('/s*$/is', '', $ipaddr);
384-
if (preg_match('/http/i', $ipaddr) || $ipaddr == '') {
385-
$ipaddr = 'Unknown';
386-
}
387-
$ipaddr = iconv('gbk', 'utf-8//IGNORE', $ipaddr);
388-
if ($ipaddr != ' ') {
390+
$ipaddr = "$ipAddr1 $ipAddr2";
391+
$ipaddr = preg_replace('/CZ88.Net/is', '', $ipaddr);
392+
$ipaddr = preg_replace('/^s*/is', '', $ipaddr);
393+
$ipaddr = preg_replace('/s*$/is', '', $ipaddr);
394+
if (preg_match('/http/i', $ipaddr) || $ipaddr == '') {
395+
$ipaddr = 'Unknown';
396+
}
397+
$ipaddr = iconv('gbk', 'utf-8//IGNORE', $ipaddr);
398+
if ($ipaddr != ' ') {
399+
return $ipaddr;
400+
} else {
401+
$ipaddr = 'Unknown';
402+
}
403+
389404
return $ipaddr;
390-
} else {
391-
$ipaddr = 'Unknown';
392405
}
393-
394-
return $ipaddr;
395406
}
396407
//Comment Location End
397408

@@ -428,6 +439,7 @@ function akina_comment_format($comment, $args, $depth)
428439
<?php if (current_user_can('manage_options') and (wp_is_mobile() == false)) {
429440
$comment_ID = $comment->comment_ID;
430441
$i_private = get_comment_meta($comment_ID, '_private', true);
442+
$flag = '';
431443
$flag .= ' <i class="fa fa-snowflake-o" aria-hidden="true"></i> <a href="javascript:;" data-actionp="set_private" data-idp="' . get_comment_id() . '" id="sp" class="sm" style="color:rgba(0,0,0,.35)">' . __("Private", "sakura") . ': <span class="has_set_private">';
432444
if (!empty($i_private)) {
433445
$flag .= __("Yes", "sakura") . ' <i class="fa fa-lock" aria-hidden="true"></i>';

‎inc/classes/Meting.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ public function playlist($id)
496496
case 'netease':
497497
$api = array(
498498
'method' => 'POST',
499-
'url' => 'http://music.163.com/api/v3/playlist/detail',
499+
'url' => 'http://music.163.com/api/v6/playlist/detail',
500500
'body' => array(
501501
's' => '0',
502502
'id' => $id,
@@ -1362,4 +1362,4 @@ private function format_baidu($data)
13621362

13631363
return $result;
13641364
}
1365-
}
1365+
}

‎style.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Theme URI: https://github.com/mashirozx/Sakura/
55
Author: Mashiro, Spirit, Louie, Fuzzz
66
Author URI: http://2heng.xin
77
Description: A wonderful branch of theme Akina
8-
Version: 3.3.9
8+
Version: 3.4.0
99
License: GNU General Public License v2 or later
1010
License URI: http://www.gnu.org/licenses/gpl-2.0.html
1111
Text Domain: sakura

0 commit comments

Comments
 (0)