Skip to content

Commit abfc5a3

Browse files
icreticret
committed
fix
1 parent 919228f commit abfc5a3

File tree

10 files changed

+73
-59
lines changed

10 files changed

+73
-59
lines changed

‎README.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
2020
## 目录
2121

22-
[特点](#特点)-[注意](#常见问题)-[安装](#安装)-[升级](#程序升级)-[安全](#安全配置)-[鉴黄](#鉴黄)-[更新日志](#更新日志)-[支持开发者](#支持开发者)-[界面演示](#界面演示)-[兼容](#兼容)-[鸣谢](#鸣谢)-[开源许可](#许可证)
22+
[特点](#特点)-[注意](#常见问题)-[安装](#安装)-[升级](#程序升级)-[安全](#安全配置)-[鉴黄](#鉴黄)-[更新日志](#更新日志)-[支持开发者](#支持开发者)-[界面演示](#界面演示)-[兼容](#兼容)-[鸣谢](#鸣谢)-[许可证](#开源许可)
2323

2424
## 特点
2525

@@ -121,10 +121,11 @@ $HTTP["url"] =~ "^/(i|public)/" {
121121

122122
- nsfwjs [nsfwjs docker](https://hub.docker.com/r/icret/nsfw_restful_api)
123123
1. 确定已安装`docker`和`docker-compose`
124-
2. 拉去镜像 `docker pull icret/nsfw_restful_api:latest` 或者直接 `docker run -p 3307:3307 -d icret/nsfw_restful_api`
124+
2. 拉取镜像 `docker pull icret/nsfw_restful_api:latest` 或者直接 `docker run -p 3307:3307 -d icret/nsfw_restful_api`
125125
3. 后台API设置中填入网址 比如：`http://IP:3307/api/nsfw/classify?url=`
126126
4. 后台图片安全图片鉴黄以nsfwjs方式
127-
5. 如果你使用别的nsfwjs api必须返回json格式如下：
127+
5. 如果你使用别的nsfwjs api,必须返回json 并且格式如下：
128+
128129
```json
129130
[{
130131
"className": "Drawing",
@@ -151,6 +152,8 @@ $HTTP["url"] =~ "^/(i|public)/" {
151152
* 2022-04-02 v2.5.8 deving
152153
- 修复在PHP8环境下的bugs
153154
- 修复删除token产生的bug
155+
- 更改顶部广告位置
156+
- 更改广场样式
154157

155158
* 2022-3-30 v2.5.7
156159
- 增加弹窗公告

‎admin/admin.inc.php

+10-9
Original file line numberDiff line numberDiff line change
@@ -831,25 +831,26 @@
831831
<h5>我的信息</h5>
832832
<hr />
833833
<p class="text-ellipsis">Your IP: <?php echo real_ip(); ?></p>
834-
<p class="text-ellipsis">Browser: <?php echo $_SERVER['HTTP_USER_AGENT']; ?></p>
834+
<p class="text-ellipsis">Browser: <?php echo $_SERVER['HTTP_USER_AGENT']; ?></p>
835835
<h5>图床信息</h5>
836836
<hr />
837837
<p>
838838
<?php if (empty($config['TinyPng_key'])) : ?>
839-
<i class="icon icon-times" data-toggle="tooltip" title="图片压缩TinyPng未填写">TinyPng</i><br />
839+
<span class="label label-badge label-warning" data-toggle="tooltip" title="图片压缩TinyPng未填写">TinyPng</span>
840840
<?php else : ?>
841-
<i class="icon icon-check" data-toggle="tooltip" title="图片压缩TinyPng已填写">TinyPng</i><br />
841+
<span class="label label-badge label-success" data-toggle="tooltip" title="图片压缩TinyPng已填写">TinyPng</span>
842842
<?php endif; ?>
843843
<?php if (empty($config['moderatecontent_key'])) : ?>
844-
<i class="icon icon-times" data-toggle="tooltip" title="图片审查moderatecontent未填写">Moderatecontent</i><br />
844+
<span class="label label-badge label-warning" data-toggle="tooltip" title="图片审查moderatecontent未填写">Moderatecontent</span>
845845
<?php else : ?>
846-
<i class="icon icon-check" data-toggle="tooltip" title="图片审查moderatecontent已填写">Moderatecontent</i><br />
846+
<span class="label label-badge label-success" data-toggle="tooltip" title="图片审查moderatecontent已填写">Moderatecontent</span>
847+
<?php endif; ?>
848+
<a href="https://easysoft.github.io/zui/" target="_blank"><span class="label label-badge label-primary" data-toggle="tooltip" title="前端框架">ZUI</span></a>
849+
<span class="label label-badge label-success" data-toggle="tooltip" title="当前版本"><?php echo $config['version']; ?></span>
850+
<?php if (getVersion() !== $config['version']) : ?>
851+
<a href="https://github.com/icret/EasyImages2.0/releases" target="_blank"><span class="label label-badge label-warning" data-toggle="tooltip" title="Github有更新,更新后删除<p>/admin/logs/verson/</p>文件夹会自动同步最新版本号"><?php echo getVersion(); ?> New</span></a>
847852
<?php endif; ?>
848853
<a href="https://github.com/icret/EasyImages2.0/blob/master/LICENSE" target="_blank"><span class="label label-badge" data-toggle="tooltip" title="许可证">GPL-2.0</span></a>
849-
<a href="https://github.com/easysoft/zui" target="_blank"><span class="label label-badge label-info" data-toggle="tooltip" title="前端使用的框架">ZUI</span></a>
850-
<span class="label label-badge label-info" data-toggle="tooltip" title="当前版本"><?php echo $config['version']; ?></span>
851-
<a href="https://github.com/icret/EasyImages2.0/releases" target="_blank"><span class="label label-badge label-success" data-toggle="tooltip" title="更新后删除<p>/admin/logs/verson/</p>文件夹会自动同步版本">最新版本:<?php echo getVersion(); ?></span></a>
852-
853854
</p>
854855
</div>
855856
</div>

‎application/footer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
// 导航状态
6666
$('.nav-pills').find('a').each(function() {
6767
if (this.href == document.location.href) {
68-
$(this).parent().addClass('active'); // this.className = 'active';
68+
$(this).parent().addClass('active'); // this.className = 'active';
6969
}
7070
});
7171

‎application/function.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
/*---------------基础配置开始-------------------*/
2323

2424
// 设置html为utf8
25-
@header('Content-Type:text/html;charset=utf-8');
25+
header('Content-Type:text/html;charset=utf-8');
2626
//将时区设置为中国·上海
27-
@ini_set('date.timezone', 'Asia/Shanghai');
28-
@date_default_timezone_set('Asia/Shanghai');
27+
ini_set('date.timezone', 'Asia/Shanghai');
28+
date_default_timezone_set('Asia/Shanghai');
2929
// 修改内存限制 根据服务器配置选择，低于128M容易出现上传失败，你懂得图片挺占用内存的
30-
@ini_set('memory_limit', '512M');
30+
ini_set('memory_limit', '512M');
3131
// 定义根目录
32-
@define('APP_ROOT', str_replace('\\', '/', realpath(dirname(__FILE__) . '/../')));
32+
define('APP_ROOT', str_replace('\\', '/', realpath(dirname(__FILE__) . '/../')));
3333
// 判断当前的系统类型是否为windows
34-
@define('IS_WIN', strstr(PHP_OS, 'WIN') ? 1 : 0);
34+
define('IS_WIN', strstr(PHP_OS, 'WIN') ? 1 : 0);
3535

3636
/*---------------基础配置结束-------------------*/
3737

‎application/header.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?php require_once __DIR__ . '/function.php'; ?>
21
<!DOCTYPE html>
32
<html lang="zh-cn">
3+
<?php require_once __DIR__ . '/function.php'; ?>
44

55
<head>
66
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -16,7 +16,6 @@
1616
<link href="<?php static_cdn(); ?>/public/static/zui/css/zui.min.css" rel="stylesheet">
1717
<link href="<?php static_cdn(); ?>/public/static/zui/theme/zui-theme-<?php echo $config['theme']; ?>.css" rel="stylesheet">
1818
<script src="<?php static_cdn(); ?>/public/static/zui/lib/jquery/jquery-3.6.0.min.js"></script>
19-
<script src="<?php static_cdn(); ?>/public/static/zui/lib/clipboard/clipboard.min.js"></script>
2019
<script src="<?php static_cdn(); ?>/public/static/zui/js/zui.min.js"></script>
2120
<!--[if lt IE 9]>
2221
<script src="<?php static_cdn(); ?>/public/static/zui/lib/ieonly/html5shiv.js"></script>
@@ -28,7 +27,6 @@
2827
</head>
2928

3029
<body class="container">
31-
<?php if ($config['ad_top']) echo $config['ad_top_info']; ?>
3230
<div class="page-header">
3331
<ul class="nav nav-pills">
3432
<li><a href="<?php echo $config['domain']; ?>"><i class="icon icon-home"></i> 首页</a></li>
@@ -47,4 +45,4 @@
4745

4846
</ul>
4947
</div>
50-
<!-- 顶部导航栏END -->
48+
<!-- 顶部导航栏END -->

‎application/info.php

+3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727

2828
// 清除缓存
2929
clearstatcache();
30+
// 广告
31+
if ($config['ad_top']) echo $config['ad_top_info'];
3032
?>
3133
<div class="col-md-12">
3234
<div class="col-md-6" style="text-align: center;">
@@ -89,6 +91,7 @@
8991
</div>
9092
<script src="<?php static_cdn(); ?>/public/static/exif/exif.js"></script>
9193
<script src="<?php static_cdn(); ?>/public/static/EasyImage.js"></script>
94+
<script src="<?php static_cdn(); ?>/public/static/zui/lib/clipboard/clipboard.min.js"></script>
9295
<script>
9396
// 获取图片长宽
9497
function getImgNaturalDimensions(oImg, callback) {

‎application/list.php

+38-31
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?php require_once __DIR__ . '/header.php'; ?>
1+
<?php require_once __DIR__ . '/header.php';
2+
if ($config['ad_top']) echo $config['ad_top_info'];
3+
?>
24
<div class="row" style="margin-bottom:100px">
35
<div class="col-md-12">
46
<?php
@@ -34,9 +36,11 @@
3436
<a href="<?php echo $imgUrl; ?>" target="_blank"><i class="icon icon-picture" data-toggle="tooltip" title="原图" style="margin-left:10px;"></i></a>
3537
<a href="#" class="copy" data-clipboard-text="<?php echo $imgUrl; ?>" data-toggle="tooltip" title="复制" style="margin-left:10px;"><i class="icon icon-copy"></i></a>
3638
<a href="/application/info.php?img=<?php echo $imgUrl; ?>" data-toggle="tooltip" title="信息" target="_blank" style="margin-left:10px;"><i class="icon icon-info-sign"></i></a>
37-
<a href="<?php echo $config['domain']; ?>/application/del.php?recycle_url=<?php echo $imgUrl; ?>" target="_blank" data-toggle="tooltip" title="回收" style="margin-left:10px;"><i class="icon icon-undo"></i></a>
38-
<a href="<?php echo $config['domain']; ?>/application/del.php?url=<?php echo $imgUrl; ?>" target="_blank" data-toggle="tooltip" title="删除" style="margin-left:10px;"><i class="icon icon-trash"></i></a>
39-
<label style="margin-left:10px;" class="text-primary"><input type="checkbox" style="margin: left 200px;" id="url" name="checkbox" value="<?php echo $imgUrl; ?>"> 选择</label>
39+
<?php if (is_who_login('admin')) : ?>
40+
<a href="/application/del.php?recycle_url=<?php echo $imgUrl; ?>" target="_blank" data-toggle="tooltip" title="回收" style="margin-left:10px;"><i class="icon icon-undo"></i></a>
41+
<a href="/application/del.php?url=<?php echo $imgUrl; ?>" target="_blank" data-toggle="tooltip" title="删除" style="margin-left:10px;"><i class="icon icon-trash"></i></a>
42+
<label class="text-primary"><input type="checkbox" id="url" name="checkbox" value="<?php echo $imgUrl; ?>"> 选择</label>
43+
<?php endif; ?>
4044
</div>
4145
</div>
4246
</div>
@@ -60,40 +64,42 @@
6064
echo '<a class="btn btn-mini hidden-xs inline-block" href="?date=' . date('Y/m/d/', strtotime("-$x day")) . '">' . date('m月d日', strtotime("-$x day")) . '</a>';
6165
?>
6266
</div>
63-
<div class="btn-group">
64-
<a class="btn btn-mini" onclick="opcheckboxed('checkbox', 'checkall')">全选</a>
65-
<a class="btn btn-mini" onclick="opcheckboxed('checkbox', 'reversecheck')">反选</a>
66-
<a class="btn btn-mini" onclick="opcheckboxed('checkbox', 'uncheckall')">取消</a>
67-
<a class="btn btn-mini" onclick="recycle_img()">回收</a>
68-
<a class="btn btn-mini" onclick="delete_img()">删除</a>
69-
</div>
67+
<?php if (is_who_login('admin')) : ?>
68+
<div class="btn-group">
69+
<a class="btn btn-mini" onclick="opcheckboxed('checkbox', 'checkall')">全选</a>
70+
<a class="btn btn-mini" onclick="opcheckboxed('checkbox', 'reversecheck')">反选</a>
71+
<a class="btn btn-mini" onclick="opcheckboxed('checkbox', 'uncheckall')">取消</a>
72+
<a class="btn btn-mini" onclick="recycle_img()">回收</a>
73+
<a class="btn btn-mini" onclick="delete_img()">删除</a>
74+
</div>
75+
<?php endif; ?>
7076
</div>
7177
</div>
7278
<!-- 按格式 -->
7379
<div class="row">
74-
<!--
75-
<div class="col-md-2 col-xs-6">
76-
<form action="list.php" method="get">
77-
<div class="input-group">
78-
<select name="search" class="form-control input-sm">
79-
<option value="jpg">jpg</option>
80-
<option value="png">png</option>
81-
<option value="gif">gif</option>
82-
</select>
83-
<span class="input-group-btn">
84-
<input type="submit" value="按格式" class="btn btn-primary input-sm" />
85-
</span>
86-
</div>
87-
</form>
88-
</div> -->
8980
<div class="col-md-2 col-xs-6">
81+
<form action="list.php" method="get">
82+
<div class="input-group">
83+
<select name="&search" class="form-control input-sm">
84+
<option value="jpg">JPG</option>
85+
<option value="png">PNG</option>
86+
<option value="gif">Gif</option>
87+
<option value="gif">WEBP</option>
88+
</select>
89+
<span class="input-group-btn">
90+
<input type="submit" value="按格式" class="btn btn-primary input-sm" />
91+
</span>
92+
</div>
93+
</form>
94+
</div>
95+
<!-- <div class="col-md-2 col-xs-6">
9096
<div class="btn-group">
91-
<a class="btn btn-sm" href="<?php echo '?' . http_build_query($httpUrl) . '&search=jpg'; ?>">JPG</a>
92-
<a class="btn btn-sm" href="<?php echo '?' . http_build_query($httpUrl) . '&search=png'; ?>">PNG</a>
93-
<a class="btn btn-sm" href="<?php echo '?' . http_build_query($httpUrl) . '&search=gif'; ?>">GIF</a>
94-
<a class="btn btn-sm" href="<?php echo '?' . http_build_query($httpUrl) . '&search=webp'; ?>">Webp</a>
97+
<a class="btn btn-sm" href="<php echo '?' . http_build_query($httpUrl) . '&search=jpg'; ?>">JPG</a>
98+
<a class="btn btn-sm" href="<php echo '?' . http_build_query($httpUrl) . '&search=png'; ?>">PNG</a>
99+
<a class="btn btn-sm" href="<php echo '?' . http_build_query($httpUrl) . '&search=gif'; ?>">GIF</a>
100+
<a class="btn btn-sm" href="<php echo '?' . http_build_query($httpUrl) . '&search=webp'; ?>">Webp</a>
95101
</div>
96-
</div>
102+
</div> -->
97103
<!-- 按日期-->
98104
<div class="col-md-2 col-xs-6">
99105
<form action="<?php echo $_SERVER['SCRIPT_NAME']; ?>" method="get">
@@ -119,6 +125,7 @@
119125
<link rel="stylesheet" href="<?php static_cdn(); ?>/public/static/zui/lib/datetimepicker/datetimepicker.min.css">
120126
<script src="<?php static_cdn(); ?>/public/static/lazyload/lazyload.js"></script>
121127
<script src="<?php static_cdn(); ?>/public/static/viewjs/viewer.min.js"></script>
128+
<script src="<?php static_cdn(); ?>/public/static/zui/lib/clipboard/clipboard.min.js"></script>
122129
<script src="<?php static_cdn(); ?>/public/static/zui/lib/datetimepicker/datetimepicker.min.js"></script>
123130
<script>
124131
// tips提示

‎config/config.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@
103103
'tinyfilemanager'=>1,
104104
'delDir'=>'thumbnails/',
105105
'hide'=>0,
106-
'version'=>'2.5.7',
107-
'update'=>'2022-04-02 18:00:58',
106+
'version'=>'2.5.8',
107+
'update'=>'2022-04-08 21:14:14',
108108
'terms'=>'<div class="container">
109109
<div class="row">
110110
<div class="col-xs-3">

‎index.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22
require_once 'application/header.php';
3+
// 广告
4+
if ($config['ad_top']) echo $config['ad_top_info'];
35
// 检查登录
46
mustLogin();
57
?>
@@ -12,7 +14,7 @@
1214
</div>
1315
</div>
1416
</div>
15-
<div id='upShowID' class="uploader col-md-10 col-md-offset-1 clo-xs-12" data-ride="uploader" data-url="/application/upload.php">
17+
<div id='upShowID' class="uploader col-md-12 clo-xs-12" data-ride="uploader" data-url="/application/upload.php">
1618
<div class="uploader-message text-center">
1719
<div class="content"></div>
1820
<button type="button" class="close">x</button>
@@ -25,7 +27,7 @@
2527
<button type="button" class="btn btn-link uploader-btn-stop"><i class="icon icon-pause"></i> 暂停上传</button>
2628
</div>
2729
</div>
28-
<div class="col-md-10 col-md-offset-1 clo-xs-12" style="margin-bottom:90px;">
30+
<div class="col-md-12 clo-xs-12" style="margin-bottom:90px;">
2931
<ul class="nav nav-tabs">
3032
<li <?php if ($config['upload_first_show'] == 1) echo 'class="active"'; ?>>
3133
<a href="#" data-target="#tab2Content1" data-toggle="tab"><i class="icon icon-link"></i> 直链</a>

‎public/static/EasyImage.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,6 @@
8787
.bottom-bar {
8888
width: 100%;
8989
position: absolute;
90-
bottom: -4px;
90+
bottom: 0.1px;
9191
background-color: rgba(0, 0, 0, 0.2);
9292
}

0 commit comments

Comments
 (0)