diff --git a/README.md b/README.md old mode 100644 new mode 100755 index d9e64e0..35fe966 --- a/README.md +++ b/README.md @@ -123,9 +123,8 @@ $HTTP["url"] =~ "^/(i|public)/" { 1. 确定已安装`docker`和`docker-compose` 2. 拉去镜像 `docker pull icret/nsfw_restful_api:latest` 或者直接 `docker run -p 3307:3307 -d icret/nsfw_restful_api` 3. 后台API设置中填入网址 比如：`http://IP:3307/api/nsfw/classify?url=` - 4. 后台图片安全图片鉴黄以nsfwjs方式 - 5. nsfwjs鉴黄方式不支持webp - - 程序期望nsfwjs返回json 并且如下格式： + 4. 后台图片安全图片鉴黄以nsfwjs方式 + 5. 如果你使用别的nsfwjs api必须返回json格式如下： ```json [{ "className": "Drawing", diff --git a/admin/admin.inc.php b/admin/admin.inc.php old mode 100644 new mode 100755 index f734e53..0c117d7 --- a/admin/admin.inc.php +++ b/admin/admin.inc.php @@ -814,41 +814,42 @@ if (isset($_GET['recycle_reimg'])) {
系统信息
-

操作系统: ' . php_uname() . ''; ?>

-

Web 服务:

-

服务器IP:

-

系统时间:

+

服务系统: ' . php_uname() . ''; ?>

+

Web服务:

+

服务器IP:

+

系统时间:

已用磁盘:

剩余磁盘:

PHP信息

PHP:

-

GD :

-

PHP最大上传:

-

POST最大上传:

-

PHP最长执行时间:

-

PHP允许占用内存:

+

PHP UP:

+

POST UP:

+

PHP Max Time:

+

PHP Max Memery:

+

GD:

我的信息
-

浏览器:

-

登录IP:

+

Your IP:

+

Browser:

图床信息
-

+

TinyPng
TinyPng
- moderatecontent
+ Moderatecontent
Moderatecontent
-

-

- 当前版本: + GPL-2.0 + ZUI + 最新版本: +

diff --git a/admin/chart.php b/admin/chart.php old mode 100644 new mode 100755 diff --git a/admin/index.php b/admin/index.php old mode 100644 new mode 100755 diff --git a/admin/manager.php b/admin/manager.php old mode 100644 new mode 100755 diff --git a/admin/terms.php b/admin/terms.php old mode 100644 new mode 100755 diff --git a/admin/zui.chart.php b/admin/zui.chart.php old mode 100644 new mode 100755 diff --git a/api/index.php b/api/index.php old mode 100644 new mode 100755 diff --git a/api/public.php b/api/public.php old mode 100644 new mode 100755 diff --git a/application/TimThumb.php b/application/TimThumb.php old mode 100644 new mode 100755 diff --git a/application/WaterMask.php b/application/WaterMask.php old mode 100644 new mode 100755 diff --git a/application/captcha.php b/application/captcha.php old mode 100644 new mode 100755 diff --git a/application/chart.php b/application/chart.php old mode 100644 new mode 100755 diff --git a/application/check.php b/application/check.php old mode 100644 new mode 100755 diff --git a/application/check_admin.inc.php b/application/check_admin.inc.php old mode 100644 new mode 100755 diff --git a/application/class.thumb.php b/application/class.thumb.php old mode 100644 new mode 100755 diff --git a/application/class.upload.php b/application/class.upload.php old mode 100644 new mode 100755 index 8ae9b2d..30dc3b9 --- a/application/class.upload.php +++ b/application/class.upload.php @@ -2448,13 +2448,13 @@ class Upload { $this->log .= '    MAGIC path is set to ' . $path . '
'; } } - if ($path) { + if ($path && file_exists($path)) { $f = @finfo_open(FILEINFO_MIME, $path); } else { $this->log .= '    MAGIC path will not be used
'; $f = @finfo_open(FILEINFO_MIME); } - if (is_resource($f)) { + if ($f) { $mime = finfo_file($f, realpath($this->file_src_pathname)); finfo_close($f); $this->file_src_mime = $mime; @@ -2956,7 +2956,7 @@ class Upload { function imageunset($im) { if (is_resource($im)) { imagedestroy($im); - } else if (is_object($im) && $im instanceOf GdImage) { + } else if (is_object($im) && $im instanceOf \GdImage) { unset($im); } } diff --git a/application/class.version.php b/application/class.version.php old mode 100644 new mode 100755 diff --git a/application/compress/Imagick/class.Imgcompress.php b/application/compress/Imagick/class.Imgcompress.php old mode 100644 new mode 100755 diff --git a/application/compress/TinyImg/TinyImg.php b/application/compress/TinyImg/TinyImg.php old mode 100644 new mode 100755 diff --git a/application/compress/TinyImg/cacert.pem b/application/compress/TinyImg/cacert.pem old mode 100644 new mode 100755 diff --git a/application/compress/function.compress.php b/application/compress/function.compress.php old mode 100644 new mode 100755 diff --git a/application/compressing.php b/application/compressing.php old mode 100644 new mode 100755 diff --git a/application/del.php b/application/del.php old mode 100644 new mode 100755 diff --git a/application/footer.php b/application/footer.php old mode 100644 new mode 100755 diff --git a/application/function.php b/application/function.php old mode 100644 new mode 100755 diff --git a/application/header.php b/application/header.php old mode 100644 new mode 100755 diff --git a/application/hide.php b/application/hide.php old mode 100644 new mode 100755 diff --git a/application/info.php b/application/info.php old mode 100644 new mode 100755 diff --git a/application/lang/class.upload.xx_XX.php b/application/lang/class.upload.xx_XX.php old mode 100644 new mode 100755 diff --git a/application/lang/class.upload.zh_CN.php b/application/lang/class.upload.zh_CN.php old mode 100644 new mode 100755 diff --git a/application/lang/class.upload.zh_TW.php b/application/lang/class.upload.zh_TW.php old mode 100644 new mode 100755 diff --git a/application/list.php b/application/list.php old mode 100644 new mode 100755 diff --git a/application/post_del.php b/application/post_del.php old mode 100644 new mode 100755 diff --git a/application/process.php b/application/process.php old mode 100644 new mode 100755 diff --git a/application/thumb.php b/application/thumb.php old mode 100644 new mode 100755 diff --git a/application/total_files.php b/application/total_files.php old mode 100644 new mode 100755 diff --git a/application/upload.php b/application/upload.php old mode 100644 new mode 100755 diff --git a/config/api_key.php b/config/api_key.php old mode 100644 new mode 100755 diff --git a/config/config.guest.php b/config/config.guest.php old mode 100644 new mode 100755 diff --git a/config/config.manager.php b/config/config.manager.php old mode 100644 new mode 100755 diff --git a/config/config.php b/config/config.php old mode 100644 new mode 100755 diff --git a/favicon.ico b/favicon.ico old mode 100644 new mode 100755 diff --git a/i/.htaccess b/i/.htaccess old mode 100644 new mode 100755 diff --git a/index.php b/index.php old mode 100644 new mode 100755 diff --git a/install/README/1305032567.png b/install/README/1305032567.png old mode 100644 new mode 100755 diff --git a/install/README/2657944724.png b/install/README/2657944724.png old mode 100644 new mode 100755 diff --git a/install/README/3053540273.png b/install/README/3053540273.png old mode 100644 new mode 100755 diff --git a/install/README/674074848.png b/install/README/674074848.png old mode 100644 new mode 100755 diff --git a/install/README/info.png b/install/README/info.png old mode 100644 new mode 100755 diff --git a/install/contorl.php b/install/contorl.php old mode 100644 new mode 100755 diff --git a/install/index.php b/install/index.php old mode 100644 new mode 100755 diff --git a/install/install.php b/install/install.php old mode 100644 new mode 100755 diff --git a/public/.htaccess b/public/.htaccess old mode 100644 new mode 100755 diff --git a/public/images/404.png b/public/images/404.png old mode 100644 new mode 100755 diff --git a/public/images/EasyImage2.0.png b/public/images/EasyImage2.0.png old mode 100644 new mode 100755 diff --git a/public/images/alipay.jpg b/public/images/alipay.jpg old mode 100644 new mode 100755 diff --git a/public/images/image_icon_153794.png b/public/images/image_icon_153794.png old mode 100644 new mode 100755 diff --git a/public/images/loading.svg b/public/images/loading.svg old mode 100644 new mode 100755 diff --git a/public/images/picture_photo_image_icon_131252.png b/public/images/picture_photo_image_icon_131252.png old mode 100644 new mode 100755 diff --git a/public/images/rocket_button_up.png b/public/images/rocket_button_up.png old mode 100644 new mode 100755 diff --git a/public/images/watermark.png b/public/images/watermark.png old mode 100644 new mode 100755 diff --git a/public/images/wechat.jpg b/public/images/wechat.jpg old mode 100644 new mode 100755 diff --git a/public/static/EasyImage.js b/public/static/EasyImage.js old mode 100644 new mode 100755 diff --git a/public/static/echarts/echarts.min.js b/public/static/echarts/echarts.min.js old mode 100644 new mode 100755 diff --git a/public/static/exif/exif.js b/public/static/exif/exif.js old mode 100644 new mode 100755 diff --git a/public/static/fonts/FontAwesome.otf b/public/static/fonts/FontAwesome.otf old mode 100644 new mode 100755 diff --git a/public/static/fonts/fontawesome-webfont.eot b/public/static/fonts/fontawesome-webfont.eot old mode 100644 new mode 100755 diff --git a/public/static/fonts/fontawesome-webfont.svg b/public/static/fonts/fontawesome-webfont.svg old mode 100644 new mode 100755 diff --git a/public/static/fonts/fontawesome-webfont.ttf b/public/static/fonts/fontawesome-webfont.ttf old mode 100644 new mode 100755 diff --git a/public/static/fonts/fontawesome-webfont.woff b/public/static/fonts/fontawesome-webfont.woff old mode 100644 new mode 100755 diff --git a/public/static/fonts/fontawesome-webfont.woff2 b/public/static/fonts/fontawesome-webfont.woff2 old mode 100644 new mode 100755 diff --git a/public/static/hkxzy.ttf b/public/static/hkxzy.ttf old mode 100644 new mode 100755 diff --git a/public/static/i18n/jquery.s2t.js b/public/static/i18n/jquery.s2t.js old mode 100644 new mode 100755 diff --git a/public/static/jscolor/jscolor.min.js b/public/static/jscolor/jscolor.min.js old mode 100644 new mode 100755 diff --git a/public/static/lazyload/lazyload.js b/public/static/lazyload/lazyload.js old mode 100644 new mode 100755 diff --git a/public/static/marquee/marquee.css b/public/static/marquee/marquee.css old mode 100644 new mode 100755 diff --git a/public/static/marquee/marquee.min.js b/public/static/marquee/marquee.min.js old mode 100644 new mode 100755 diff --git a/public/static/md5/md5.min.js b/public/static/md5/md5.min.js old mode 100644 new mode 100755 diff --git a/public/static/md5/md5.min.js.map b/public/static/md5/md5.min.js.map old mode 100644 new mode 100755 diff --git a/public/static/nprogress/nprogress.min.css b/public/static/nprogress/nprogress.min.css old mode 100644 new mode 100755 diff --git a/public/static/nprogress/nprogress.min.js b/public/static/nprogress/nprogress.min.js old mode 100644 new mode 100755 diff --git a/public/static/qrcode/qrcode.min.js b/public/static/qrcode/qrcode.min.js old mode 100644 new mode 100755 diff --git a/public/static/tinyfilemanager/ace.js b/public/static/tinyfilemanager/ace.js old mode 100644 new mode 100755 diff --git a/public/static/tinyfilemanager/bootstrap.min.css b/public/static/tinyfilemanager/bootstrap.min.css old mode 100644 new mode 100755 diff --git a/public/static/tinyfilemanager/bootstrap.min.css.map b/public/static/tinyfilemanager/bootstrap.min.css.map old mode 100644 new mode 100755 diff --git a/public/static/tinyfilemanager/bootstrap.min.js b/public/static/tinyfilemanager/bootstrap.min.js old mode 100644 new mode 100755 diff --git a/public/static/tinyfilemanager/bootstrap.min.js.map b/public/static/tinyfilemanager/bootstrap.min.js.map old mode 100644 new mode 100755 diff --git a/public/static/tinyfilemanager/dropzone.min.css b/public/static/tinyfilemanager/dropzone.min.css old mode 100644 new mode 100755 diff --git a/public/static/tinyfilemanager/dropzone.min.js b/public/static/tinyfilemanager/dropzone.min.js old mode 100644 new mode 100755 diff --git a/public/static/tinyfilemanager/ekko-lightbox.css b/public/static/tinyfilemanager/ekko-lightbox.css old mode 100644 new mode 100755 diff --git a/public/static/tinyfilemanager/ekko-lightbox.min.js b/public/static/tinyfilemanager/ekko-lightbox.min.js old mode 100644 new mode 100755 diff --git a/public/static/tinyfilemanager/ekko-lightbox.min.js.map b/public/static/tinyfilemanager/ekko-lightbox.min.js.map old mode 100644 new mode 100755 diff --git a/public/static/tinyfilemanager/font-awesome.min.css b/public/static/tinyfilemanager/font-awesome.min.css old mode 100644 new mode 100755 diff --git a/public/static/tinyfilemanager/highlight.min.js b/public/static/tinyfilemanager/highlight.min.js old mode 100644 new mode 100755 diff --git a/public/static/tinyfilemanager/ir-black.min.css b/public/static/tinyfilemanager/ir-black.min.css old mode 100644 new mode 100755 diff --git a/public/static/tinyfilemanager/ir-dark.min.css b/public/static/tinyfilemanager/ir-dark.min.css old mode 100644 new mode 100755 diff --git a/public/static/tinyfilemanager/jquery.dataTables.min.js b/public/static/tinyfilemanager/jquery.dataTables.min.js old mode 100644 new mode 100755 diff --git a/public/static/tinyfilemanager/jquery.slim.min.js b/public/static/tinyfilemanager/jquery.slim.min.js old mode 100644 new mode 100755 diff --git a/public/static/tinyfilemanager/translation.json b/public/static/tinyfilemanager/translation.json old mode 100644 new mode 100755 diff --git a/public/static/tinyfilemanager/vs.min.css b/public/static/tinyfilemanager/vs.min.css old mode 100644 new mode 100755 diff --git a/public/static/viewjs/viewer.min.css b/public/static/viewjs/viewer.min.css old mode 100644 new mode 100755 diff --git a/public/static/viewjs/viewer.min.js b/public/static/viewjs/viewer.min.js old mode 100644 new mode 100755 diff --git a/public/static/zui/css/zui.min.css b/public/static/zui/css/zui.min.css old mode 100644 new mode 100755 diff --git a/public/static/zui/fonts/zenicon.eot b/public/static/zui/fonts/zenicon.eot old mode 100644 new mode 100755 diff --git a/public/static/zui/fonts/zenicon.svg b/public/static/zui/fonts/zenicon.svg old mode 100644 new mode 100755 diff --git a/public/static/zui/fonts/zenicon.ttf b/public/static/zui/fonts/zenicon.ttf old mode 100644 new mode 100755 diff --git a/public/static/zui/fonts/zenicon.woff b/public/static/zui/fonts/zenicon.woff old mode 100644 new mode 100755 diff --git a/public/static/zui/js/zui.min.js b/public/static/zui/js/zui.min.js old mode 100644 new mode 100755 diff --git a/public/static/zui/lib/clipboard/clipboard.min.js b/public/static/zui/lib/clipboard/clipboard.min.js old mode 100644 new mode 100755 diff --git a/public/static/zui/lib/datagrid/zui.datagrid.min.css b/public/static/zui/lib/datagrid/zui.datagrid.min.css old mode 100644 new mode 100755 diff --git a/public/static/zui/lib/datagrid/zui.datagrid.min.js b/public/static/zui/lib/datagrid/zui.datagrid.min.js old mode 100644 new mode 100755 diff --git a/public/static/zui/lib/datetimepicker/datetimepicker.min.css b/public/static/zui/lib/datetimepicker/datetimepicker.min.css old mode 100644 new mode 100755 diff --git a/public/static/zui/lib/datetimepicker/datetimepicker.min.js b/public/static/zui/lib/datetimepicker/datetimepicker.min.js old mode 100644 new mode 100755 diff --git a/public/static/zui/lib/ieonly/excanvas.js b/public/static/zui/lib/ieonly/excanvas.js old mode 100644 new mode 100755 diff --git a/public/static/zui/lib/ieonly/html5shiv.js b/public/static/zui/lib/ieonly/html5shiv.js old mode 100644 new mode 100755 diff --git a/public/static/zui/lib/ieonly/respond.js b/public/static/zui/lib/ieonly/respond.js old mode 100644 new mode 100755 diff --git a/public/static/zui/lib/jquery/jquery-3.6.0.min.js b/public/static/zui/lib/jquery/jquery-3.6.0.min.js old mode 100644 new mode 100755 diff --git a/public/static/zui/lib/uploader/Moxie.swf b/public/static/zui/lib/uploader/Moxie.swf old mode 100644 new mode 100755 diff --git a/public/static/zui/lib/uploader/Moxie.xap b/public/static/zui/lib/uploader/Moxie.xap old mode 100644 new mode 100755 diff --git a/public/static/zui/lib/uploader/zui.uploader.min.css b/public/static/zui/lib/uploader/zui.uploader.min.css old mode 100644 new mode 100755 diff --git a/public/static/zui/lib/uploader/zui.uploader.min.js b/public/static/zui/lib/uploader/zui.uploader.min.js old mode 100644 new mode 100755 diff --git a/public/static/zui/theme/zui-theme-black.css b/public/static/zui/theme/zui-theme-black.css old mode 100644 new mode 100755 diff --git a/public/static/zui/theme/zui-theme-blue.css b/public/static/zui/theme/zui-theme-blue.css old mode 100644 new mode 100755 diff --git a/public/static/zui/theme/zui-theme-bluegrey.css b/public/static/zui/theme/zui-theme-bluegrey.css old mode 100644 new mode 100755 diff --git a/public/static/zui/theme/zui-theme-brown.css b/public/static/zui/theme/zui-theme-brown.css old mode 100644 new mode 100755 diff --git a/public/static/zui/theme/zui-theme-default.css b/public/static/zui/theme/zui-theme-default.css old mode 100644 new mode 100755 diff --git a/public/static/zui/theme/zui-theme-green.css b/public/static/zui/theme/zui-theme-green.css old mode 100644 new mode 100755 diff --git a/public/static/zui/theme/zui-theme-indigo.css b/public/static/zui/theme/zui-theme-indigo.css old mode 100644 new mode 100755 diff --git a/public/static/zui/theme/zui-theme-purple.css b/public/static/zui/theme/zui-theme-purple.css old mode 100644 new mode 100755 diff --git a/public/static/zui/theme/zui-theme-red.css b/public/static/zui/theme/zui-theme-red.css old mode 100644 new mode 100755 diff --git a/public/static/zui/theme/zui-theme-yellow.css b/public/static/zui/theme/zui-theme-yellow.css old mode 100644 new mode 100755 diff --git a/robots.txt b/robots.txt old mode 100644 new mode 100755