From 32d470dd22919d878e298710f4b450bb216b60b9 Mon Sep 17 00:00:00 2001
From: icret
Date: Wed, 18 May 2022 13:38:23 +0000
Subject: [PATCH] :white_check_mark: for new version
---
README.md | 7 +-
admin/admin.inc.php | 45 ++++----
admin/chart.php | 0
admin/index.php | 0
admin/manager.php | 4 +-
admin/terms.php | 0
admin/zui.chart.php | 0
api/index.php | 0
api/public.php | 0
application/TimThumb.php | 0
application/WaterMask.php | 0
application/captcha.php | 0
application/chart.php | 0
application/check.php | 0
application/check_admin.inc.php | 92 ++++++++--------
application/class.thumb.php | 0
application/class.upload.php | 0
application/class.version.php | 0
.../compress/Imagick/class.Imgcompress.php | 0
application/compress/TinyImg/TinyImg.php | 0
application/compress/TinyImg/cacert.pem | 0
application/compress/function.compress.php | 0
application/compressing.php | 0
application/del.php | 0
application/footer.php | 26 ++---
application/function.php | 28 +++++
application/header.php | 0
application/hide.php | 0
application/info.php | 102 +++++++++---------
application/lang/class.upload.xx_XX.php | 0
application/lang/class.upload.zh_CN.php | 0
application/lang/class.upload.zh_TW.php | 0
application/list.php | 11 +-
application/md5.php | 0
application/post_del.php | 0
application/process.php | 2 +-
application/read_upload_logs.php | 16 +++
application/thumb.php | 0
application/total_files.php | 0
application/upload.php | 0
config/api_key.php | 10 +-
config/config.guest.php | 0
config/config.manager.php | 0
config/config.php | 4 +-
favicon.ico | Bin 4154 -> 525 bytes
i/.htaccess | 0
i/index.html | 0
index.php | 0
install/README/1305032567.png | Bin
install/README/2657944724.png | Bin
install/README/3053540273.png | Bin
install/README/674074848.png | Bin
install/README/chmod.png | Bin
install/README/info.png | Bin
install/contorl.php | 0
install/index.php | 0
install/install.php | 0
public/.htaccess | 0
public/images/404.png | Bin
public/images/EasyImage2.0.png | Bin
public/images/alipay.jpg | Bin
public/images/image_icon_153794.png | Bin 6626 -> 1988 bytes
public/images/loading.svg | 0
public/images/watermark.png | Bin
public/images/wechat.jpg | Bin
public/static/EasyImage.css | 0
public/static/EasyImage.js | 0
public/static/echarts/echarts.min.js | 0
public/static/exif/exif.js | 0
public/static/fonts/FontAwesome.otf | Bin
public/static/fonts/fontawesome-webfont.eot | Bin
public/static/fonts/fontawesome-webfont.svg | 0
public/static/fonts/fontawesome-webfont.ttf | Bin
public/static/fonts/fontawesome-webfont.woff | Bin
public/static/fonts/fontawesome-webfont.woff2 | Bin
public/static/hkxzy.ttf | Bin
public/static/i18n/jquery.s2t.js | 0
public/static/jscolor/jscolor.min.js | 0
public/static/lazyload/lazyload.js | 0
public/static/login.css | 0
public/static/marquee/marquee.css | 0
public/static/marquee/marquee.min.js | 0
public/static/md5/md5.min.js | 0
public/static/md5/md5.min.js.map | 0
public/static/nprogress/nprogress.min.css | 0
public/static/nprogress/nprogress.min.js | 0
public/static/qrcode/qrcode.min.js | 0
public/static/tinyfilemanager/ace.js | 0
.../static/tinyfilemanager/bootstrap.min.css | 0
.../tinyfilemanager/bootstrap.min.css.map | 0
.../static/tinyfilemanager/bootstrap.min.js | 0
.../tinyfilemanager/bootstrap.min.js.map | 0
.../static/tinyfilemanager/dropzone.min.css | 0
public/static/tinyfilemanager/dropzone.min.js | 0
.../static/tinyfilemanager/ekko-lightbox.css | 0
.../tinyfilemanager/ekko-lightbox.min.js | 0
.../tinyfilemanager/ekko-lightbox.min.js.map | 0
.../tinyfilemanager/font-awesome.min.css | 0
.../static/tinyfilemanager/highlight.min.js | 0
.../static/tinyfilemanager/ir-black.min.css | 0
public/static/tinyfilemanager/ir-dark.min.css | 0
.../tinyfilemanager/jquery.dataTables.min.js | 0
.../static/tinyfilemanager/jquery.slim.min.js | 0
.../static/tinyfilemanager/translation.json | 0
public/static/tinyfilemanager/vs.min.css | 0
public/static/viewjs/viewer.min.css | 0
public/static/viewjs/viewer.min.js | 0
public/static/zui/css/zui.min.css | 0
public/static/zui/fonts/zenicon.eot | Bin
public/static/zui/fonts/zenicon.svg | 0
public/static/zui/fonts/zenicon.ttf | Bin
public/static/zui/fonts/zenicon.woff | Bin
public/static/zui/js/zui.min.js | 0
public/static/zui/lib/bootbox/bootbox.min.css | 0
public/static/zui/lib/bootbox/bootbox.min.js | 0
.../static/zui/lib/clipboard/clipboard.min.js | 0
.../zui/lib/datagrid/zui.datagrid.min.css | 0
.../zui/lib/datagrid/zui.datagrid.min.js | 0
.../lib/datetimepicker/datetimepicker.min.css | 0
.../lib/datetimepicker/datetimepicker.min.js | 0
public/static/zui/lib/ieonly/excanvas.js | 0
public/static/zui/lib/ieonly/html5shiv.js | 0
public/static/zui/lib/ieonly/respond.js | 0
.../static/zui/lib/jquery/jquery-3.6.0.min.js | 0
public/static/zui/lib/uploader/Moxie.swf | Bin
public/static/zui/lib/uploader/Moxie.xap | Bin
.../zui/lib/uploader/zui.uploader.min.css | 0
.../zui/lib/uploader/zui.uploader.min.js | 0
public/static/zui/theme/zui-theme-black.css | 0
public/static/zui/theme/zui-theme-blue.css | 0
.../static/zui/theme/zui-theme-bluegrey.css | 0
public/static/zui/theme/zui-theme-brown.css | 0
public/static/zui/theme/zui-theme-default.css | 0
public/static/zui/theme/zui-theme-green.css | 0
public/static/zui/theme/zui-theme-indigo.css | 0
public/static/zui/theme/zui-theme-purple.css | 0
public/static/zui/theme/zui-theme-red.css | 0
public/static/zui/theme/zui-theme-yellow.css | 0
robots.txt | 0
139 files changed, 201 insertions(+), 146 deletions(-)
mode change 100755 => 100644 README.md
mode change 100755 => 100644 admin/admin.inc.php
mode change 100755 => 100644 admin/chart.php
mode change 100755 => 100644 admin/index.php
mode change 100755 => 100644 admin/manager.php
mode change 100755 => 100644 admin/terms.php
mode change 100755 => 100644 admin/zui.chart.php
mode change 100755 => 100644 api/index.php
mode change 100755 => 100644 api/public.php
mode change 100755 => 100644 application/TimThumb.php
mode change 100755 => 100644 application/WaterMask.php
mode change 100755 => 100644 application/captcha.php
mode change 100755 => 100644 application/chart.php
mode change 100755 => 100644 application/check.php
mode change 100755 => 100644 application/check_admin.inc.php
mode change 100755 => 100644 application/class.thumb.php
mode change 100755 => 100644 application/class.upload.php
mode change 100755 => 100644 application/class.version.php
mode change 100755 => 100644 application/compress/Imagick/class.Imgcompress.php
mode change 100755 => 100644 application/compress/TinyImg/TinyImg.php
mode change 100755 => 100644 application/compress/TinyImg/cacert.pem
mode change 100755 => 100644 application/compress/function.compress.php
mode change 100755 => 100644 application/compressing.php
mode change 100755 => 100644 application/del.php
mode change 100755 => 100644 application/footer.php
mode change 100755 => 100644 application/function.php
mode change 100755 => 100644 application/header.php
mode change 100755 => 100644 application/hide.php
mode change 100755 => 100644 application/info.php
mode change 100755 => 100644 application/lang/class.upload.xx_XX.php
mode change 100755 => 100644 application/lang/class.upload.zh_CN.php
mode change 100755 => 100644 application/lang/class.upload.zh_TW.php
mode change 100755 => 100644 application/list.php
mode change 100755 => 100644 application/md5.php
mode change 100755 => 100644 application/post_del.php
mode change 100755 => 100644 application/process.php
create mode 100644 application/read_upload_logs.php
mode change 100755 => 100644 application/thumb.php
mode change 100755 => 100644 application/total_files.php
mode change 100755 => 100644 application/upload.php
mode change 100755 => 100644 config/api_key.php
mode change 100755 => 100644 config/config.guest.php
mode change 100755 => 100644 config/config.manager.php
mode change 100755 => 100644 config/config.php
mode change 100755 => 100644 favicon.ico
mode change 100755 => 100644 i/.htaccess
mode change 100755 => 100644 i/index.html
mode change 100755 => 100644 index.php
mode change 100755 => 100644 install/README/1305032567.png
mode change 100755 => 100644 install/README/2657944724.png
mode change 100755 => 100644 install/README/3053540273.png
mode change 100755 => 100644 install/README/674074848.png
mode change 100755 => 100644 install/README/chmod.png
mode change 100755 => 100644 install/README/info.png
mode change 100755 => 100644 install/contorl.php
mode change 100755 => 100644 install/index.php
mode change 100755 => 100644 install/install.php
mode change 100755 => 100644 public/.htaccess
mode change 100755 => 100644 public/images/404.png
mode change 100755 => 100644 public/images/EasyImage2.0.png
mode change 100755 => 100644 public/images/alipay.jpg
mode change 100755 => 100644 public/images/image_icon_153794.png
mode change 100755 => 100644 public/images/loading.svg
mode change 100755 => 100644 public/images/watermark.png
mode change 100755 => 100644 public/images/wechat.jpg
mode change 100755 => 100644 public/static/EasyImage.css
mode change 100755 => 100644 public/static/EasyImage.js
mode change 100755 => 100644 public/static/echarts/echarts.min.js
mode change 100755 => 100644 public/static/exif/exif.js
mode change 100755 => 100644 public/static/fonts/FontAwesome.otf
mode change 100755 => 100644 public/static/fonts/fontawesome-webfont.eot
mode change 100755 => 100644 public/static/fonts/fontawesome-webfont.svg
mode change 100755 => 100644 public/static/fonts/fontawesome-webfont.ttf
mode change 100755 => 100644 public/static/fonts/fontawesome-webfont.woff
mode change 100755 => 100644 public/static/fonts/fontawesome-webfont.woff2
mode change 100755 => 100644 public/static/hkxzy.ttf
mode change 100755 => 100644 public/static/i18n/jquery.s2t.js
mode change 100755 => 100644 public/static/jscolor/jscolor.min.js
mode change 100755 => 100644 public/static/lazyload/lazyload.js
mode change 100755 => 100644 public/static/login.css
mode change 100755 => 100644 public/static/marquee/marquee.css
mode change 100755 => 100644 public/static/marquee/marquee.min.js
mode change 100755 => 100644 public/static/md5/md5.min.js
mode change 100755 => 100644 public/static/md5/md5.min.js.map
mode change 100755 => 100644 public/static/nprogress/nprogress.min.css
mode change 100755 => 100644 public/static/nprogress/nprogress.min.js
mode change 100755 => 100644 public/static/qrcode/qrcode.min.js
mode change 100755 => 100644 public/static/tinyfilemanager/ace.js
mode change 100755 => 100644 public/static/tinyfilemanager/bootstrap.min.css
mode change 100755 => 100644 public/static/tinyfilemanager/bootstrap.min.css.map
mode change 100755 => 100644 public/static/tinyfilemanager/bootstrap.min.js
mode change 100755 => 100644 public/static/tinyfilemanager/bootstrap.min.js.map
mode change 100755 => 100644 public/static/tinyfilemanager/dropzone.min.css
mode change 100755 => 100644 public/static/tinyfilemanager/dropzone.min.js
mode change 100755 => 100644 public/static/tinyfilemanager/ekko-lightbox.css
mode change 100755 => 100644 public/static/tinyfilemanager/ekko-lightbox.min.js
mode change 100755 => 100644 public/static/tinyfilemanager/ekko-lightbox.min.js.map
mode change 100755 => 100644 public/static/tinyfilemanager/font-awesome.min.css
mode change 100755 => 100644 public/static/tinyfilemanager/highlight.min.js
mode change 100755 => 100644 public/static/tinyfilemanager/ir-black.min.css
mode change 100755 => 100644 public/static/tinyfilemanager/ir-dark.min.css
mode change 100755 => 100644 public/static/tinyfilemanager/jquery.dataTables.min.js
mode change 100755 => 100644 public/static/tinyfilemanager/jquery.slim.min.js
mode change 100755 => 100644 public/static/tinyfilemanager/translation.json
mode change 100755 => 100644 public/static/tinyfilemanager/vs.min.css
mode change 100755 => 100644 public/static/viewjs/viewer.min.css
mode change 100755 => 100644 public/static/viewjs/viewer.min.js
mode change 100755 => 100644 public/static/zui/css/zui.min.css
mode change 100755 => 100644 public/static/zui/fonts/zenicon.eot
mode change 100755 => 100644 public/static/zui/fonts/zenicon.svg
mode change 100755 => 100644 public/static/zui/fonts/zenicon.ttf
mode change 100755 => 100644 public/static/zui/fonts/zenicon.woff
mode change 100755 => 100644 public/static/zui/js/zui.min.js
mode change 100755 => 100644 public/static/zui/lib/bootbox/bootbox.min.css
mode change 100755 => 100644 public/static/zui/lib/bootbox/bootbox.min.js
mode change 100755 => 100644 public/static/zui/lib/clipboard/clipboard.min.js
mode change 100755 => 100644 public/static/zui/lib/datagrid/zui.datagrid.min.css
mode change 100755 => 100644 public/static/zui/lib/datagrid/zui.datagrid.min.js
mode change 100755 => 100644 public/static/zui/lib/datetimepicker/datetimepicker.min.css
mode change 100755 => 100644 public/static/zui/lib/datetimepicker/datetimepicker.min.js
mode change 100755 => 100644 public/static/zui/lib/ieonly/excanvas.js
mode change 100755 => 100644 public/static/zui/lib/ieonly/html5shiv.js
mode change 100755 => 100644 public/static/zui/lib/ieonly/respond.js
mode change 100755 => 100644 public/static/zui/lib/jquery/jquery-3.6.0.min.js
mode change 100755 => 100644 public/static/zui/lib/uploader/Moxie.swf
mode change 100755 => 100644 public/static/zui/lib/uploader/Moxie.xap
mode change 100755 => 100644 public/static/zui/lib/uploader/zui.uploader.min.css
mode change 100755 => 100644 public/static/zui/lib/uploader/zui.uploader.min.js
mode change 100755 => 100644 public/static/zui/theme/zui-theme-black.css
mode change 100755 => 100644 public/static/zui/theme/zui-theme-blue.css
mode change 100755 => 100644 public/static/zui/theme/zui-theme-bluegrey.css
mode change 100755 => 100644 public/static/zui/theme/zui-theme-brown.css
mode change 100755 => 100644 public/static/zui/theme/zui-theme-default.css
mode change 100755 => 100644 public/static/zui/theme/zui-theme-green.css
mode change 100755 => 100644 public/static/zui/theme/zui-theme-indigo.css
mode change 100755 => 100644 public/static/zui/theme/zui-theme-purple.css
mode change 100755 => 100644 public/static/zui/theme/zui-theme-red.css
mode change 100755 => 100644 public/static/zui/theme/zui-theme-yellow.css
mode change 100755 => 100644 robots.txt
diff --git a/README.md b/README.md
old mode 100755
new mode 100644
index ac7a8ca..b93fe26
--- a/README.md
+++ b/README.md
@@ -180,11 +180,14 @@ $HTTP["url"] =~ "^/(i|public)/" {
点击查看2.0版更新日志
-* 2022-05-05 v2.6.3 deving
+* 2022-05-18 v2.6.3 Deving 此版本正在开发中, 尚未发布
+- 增加读取上传日志
- 增加广场浏览往日限制
- 有助于防爬虫抓取
-- 修复广场->信息中无法显示Exif
+- 文件管理中图片使用缩略图显示
- 更改广场->信息中图片长宽获取方式
+- 删除图片详情页Exif信息
+- 优化图片详情页
- 优化广场UI
* 2022-05-04 v2.6.2
diff --git a/admin/admin.inc.php b/admin/admin.inc.php
old mode 100755
new mode 100644
index 740bde3..4264ae0
--- a/admin/admin.inc.php
+++ b/admin/admin.inc.php
@@ -51,7 +51,7 @@ if (isset($_POST['add_token_id'])) {
cache_write($config_file, $new_config, 'tokenList');
echo '
- ';
- }
- }
-
- if ($config['checkImg'] == 2) {
-
- $ip = parse_url($config['nsfwjs_url'])['host'];
- $port = parse_url($config['nsfwjs_url'])['port'];
-
- if (filter_var($ip, FILTER_VALIDATE_IP)) {
- if (!@IP_URL_Ping($ip, $port, 1)) {
- echo '
-
- ';
- }
- } else {
- if (!@IP_URL_Ping($ip, 80, 1)) {
- echo '
-
- ';
- }
- }
- }
-}
-
// 检测是否存在.user.ini
if (file_exists(APP_ROOT . '/.user.ini')) {
echo '
@@ -108,7 +63,7 @@ if (file_exists(APP_ROOT . '/.user.ini')) {
}
// 检查当前版本与GitHub版本
-if (@getVersion() !== $config['version']) {
+if (getVersion() !== $config['version']) {
echo '
';
}
+
+// 检测监黄接口是否可以访问
+if ($config['checkImg'] !== 0) {
+
+ if ($config['checkImg'] == 1) {
+
+ if (!@IP_URL_Ping('api.moderatecontent.com', 80, 1)) {
+ echo '
+
+ ';
+ }
+ }
+
+ if ($config['checkImg'] == 2) {
+
+ $ip = parse_url($config['nsfwjs_url'])['host'];
+ $port = parse_url($config['nsfwjs_url'])['port'];
+
+ if (filter_var($ip, FILTER_VALIDATE_IP)) {
+ if (!@IP_URL_Ping($ip, $port, 1)) {
+ echo '
+
+ ';
+ }
+ } else {
+ if (!@IP_URL_Ping($ip, 80, 1)) {
+ echo '
+
+ ';
+ }
+ }
+ }
+}
diff --git a/application/class.thumb.php b/application/class.thumb.php
old mode 100755
new mode 100644
diff --git a/application/class.upload.php b/application/class.upload.php
old mode 100755
new mode 100644
diff --git a/application/class.version.php b/application/class.version.php
old mode 100755
new mode 100644
diff --git a/application/compress/Imagick/class.Imgcompress.php b/application/compress/Imagick/class.Imgcompress.php
old mode 100755
new mode 100644
diff --git a/application/compress/TinyImg/TinyImg.php b/application/compress/TinyImg/TinyImg.php
old mode 100755
new mode 100644
diff --git a/application/compress/TinyImg/cacert.pem b/application/compress/TinyImg/cacert.pem
old mode 100755
new mode 100644
diff --git a/application/compress/function.compress.php b/application/compress/function.compress.php
old mode 100755
new mode 100644
diff --git a/application/compressing.php b/application/compressing.php
old mode 100755
new mode 100644
diff --git a/application/del.php b/application/del.php
old mode 100755
new mode 100644
diff --git a/application/footer.php b/application/footer.php
old mode 100755
new mode 100644
index 1ce9585..264eabd
--- a/application/footer.php
+++ b/application/footer.php
@@ -48,19 +48,22 @@ if ($config['notice_status'] == 1 && !empty($config['notice'])) : ?>
';
- } else {
- echo '';
- }
- ?>
+ // 登录与退出
+ if (is_who_login('admin') || is_who_login('guest')) : ?>
+
+ else : ?>
+
+