Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

notify user if texture file is deleted

Browse Source
This commit is contained in:
printempw 2016-08-16 22:58:21 +08:00
parent 3a9d1fc665
commit 4a862c6ecc
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controllers/SkinlibController.php
View File

@ -96,7 +96,10 @@ class SkinlibController extends BaseController
{ {
if (!isset($_GET['tid'])) Http::abort(404, 'No specified tid.'); if (!isset($_GET['tid'])) Http::abort(404, 'No specified tid.');
$texture = Texture::find($_GET['tid']); $texture = Texture::find($_GET['tid']);
if (!$texture) Http::abort(404, '请求的材质已经被删除');
if (!$texture || $texture && !\Storage::exist(BASE_DIR."/textures/".$texture->hash)) {
Http::abort(404, '请求的材质文件已经被删除，请联系管理员删除该条目');
}
if ($texture->public == "0") { if ($texture->public == "0") {
if (is_null($this->user) || ($this->user->uid != $texture->uploader && !$this->user->is_admin)) if (is_null($this->user) || ($this->user->uid != $texture->uploader && !$this->user->is_admin))

10
app/Controllers/TextureController.php
View File

@ -119,8 +119,14 @@ class TextureController extends BaseController
public function raw($tid) { public function raw($tid) {
if ($t = Texture::find($tid)) { if ($t = Texture::find($tid)) {
header('Content-Type: image/png'); $fname = BASE_DIR."/textures/".$t->hash;
echo \Storage::fread(BASE_DIR."/textures/".$t->hash);
if (\Storage::exist($fname)) {
header('Content-Type: image/png');
echo \Storage::fread($fname);
} else {
Http::abort(404, '请求的材质文件已经被删除');
}
} else { } else {
Http::abort(404, '材质不存在'); Http::abort(404, '材质不存在');
} }