jinql
/
getFavicon
mirror of https://github.com/owen0o0/getFavicon
1
0
Fork 0
Code Issues Releases Wiki Activity

修复可能返回空白图像的问题

master
owen0o0 2019-11-27 20:37:42 +08:00
parent 53f439e33f
commit 173f32e62a
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
get.php
View File

@ -2,9 +2,9 @@
/** /**
* getFavicon * getFavicon
* @author 一为 * @author 一为
* @date 2019-05-18 * @date 2019-11-27
* @link https://www.iowen.cn * @link https://www.iowen.cn
* @version 1.0.0 * @version 1.1.0
*/ */
if( !isset($_GET['url'])){ if( !isset($_GET['url'])){
@ -46,11 +46,13 @@ if($expire == 0){
} }
else{ else{
$defaultMD5 = md5(file_get_contents($defaultIco)); $defaultMD5 = md5(file_get_contents($defaultIco));
if (Cache::get($formatUrl,$defaultMD5,$expire) !== NULL) {
$data = Cache::get($formatUrl,$defaultMD5,$expire);
if ($data !== NULL) {
foreach ($favicon->getHeader() as $header) { foreach ($favicon->getHeader() as $header) {
@header($header); @header($header);
} }
echo Cache::get($formatUrl,$defaultMD5,$expire); echo $data;
exit; exit;
} }
@ -96,17 +98,21 @@ class Cache
$a = $dir . '/' . $f . '.txt'; $a = $dir . '/' . $f . '.txt';
$data = file_get_contents($a); if(is_file($a)){
if( md5($data) == $default ){ $data = file_get_contents($a);
$expire = 43200; //如果返回默认图标，过期时间为12小时。 if( md5($data) == $default ){
} $expire = 43200; //如果返回默认图标，过期时间为12小时。
if ( !is_file($a) || (time() - filemtime($a)) > $expire ) { }
if( (time() - filemtime($a)) > $expire ){
return null;
}
else{
return $data;
}
}
else{
return null; return null;
} }
else {
return $data;
}
} }
/** /**
@ -133,7 +139,5 @@ class Cache
fwrite($imgdata, $value); fwrite($imgdata, $value);
fclose($imgdata); fclose($imgdata);
} }
} }
} }