From ed1b5f24784715e818f22e45b197a071e86bbc52 Mon Sep 17 00:00:00 2001
From: icret <ispro@foxmail.com>
Date: Thu, 20 Jan 2022 02:18:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md           |  4 ++-
 admin/admin.inc.php | 66 +--------------------------------------------
 config/config.php   |  6 ++---
 3 files changed, 7 insertions(+), 69 deletions(-)

diff --git a/README.md b/README.md
index c9892bb..24ff6ce 100755
--- a/README.md
+++ b/README.md
@@ -35,6 +35,7 @@
 - [x] 支持API
 - [x] 在线管理图片
 - [x] 支持网站统计
+- [x] 支持上次黑白名单
 - [x] 更多支持···
 
 #### 界面演示
@@ -86,9 +87,10 @@ Deny from all
 <details><summary><mark><font color=darkred>点击查看2.0版更新日志</font></mark></summary>
 
 * 2022-1-19 v2.4.6 beta
+ 视图优化
 - 增加图片信息页面
 - 增加上传黑/白名单
-- 视图优化
+- 修复因关闭上传日志而导致的无法鉴黄和后端压缩图片
 
 * 2022-1-13 v2.4.5
 - 修复一处权限问题
diff --git a/admin/admin.inc.php b/admin/admin.inc.php
index d3e65a8..91ff164 100755
--- a/admin/admin.inc.php
+++ b/admin/admin.inc.php
@@ -531,7 +531,7 @@ if (isset($_GET['reimg'])) {
                                 <label>输入黑/白名单IP 每个IP以英文,结尾 支持IP段</label>
                                 <textarea class="form-control" rows="5" name="check_ip_list" placeholder=" 每个IP以英文,结尾 支持IP段 例:192.168.1.13,123.23.23.44,193.134.*.*"><?php echo $config['check_ip_list']; ?></textarea>
                             </div>
-                            <div class="form-group">                          
+                            <div class="form-group">
                                 <label class="radio-inline"><input type="radio" name="check_ip_model" value="0" <?php if($config['check_ip_model']==0){echo 'checked';}?>> 黑名单模式</label>
                                 <label class="radio-inline"><input type="radio" name="check_ip_model" value="1" <?php if($config['check_ip_model']==1){echo 'checked';}?>> 白名单模式</label>
                             </div>
@@ -555,70 +555,6 @@ if (isset($_GET['reimg'])) {
                             <button type="submit" class="btn btn-primary">保存</button>
                         </form>
                     </div>
-                    <div class="tab-pane fade" id="Content6">
-                        <form action="<?php echo $_SERVER['SCRIPT_NAME']; ?>" method="post" onsubmit="return md5_post()">
-                            <div class="form-group">
-                                <div class="input-control has-icon-left">
-                                    <input type="text" name="user" id="account" class="form-control" placeholder="更改管理账号 - 不填则保持默认">
-                                    <label for="account" class="input-control-icon-left"><i class="icon icon-user "></i></label>
-                                </div>
-                                <div class="input-control has-icon-left" style="margin-top: 10px;">
-                                    <input type="text" name="password" id="password" class="form-control" placeholder="更改管理密码 - 不填则保持默认">
-                                    <input type="hidden" name="password" id="md5_password">
-                                    <label for="password" class="input-control-icon-left"><i class="icon icon-key"></i></label>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <input type="hidden" class="form-control" name="form" value="<?php echo date("Y-m-d H:i:s") ;?>" placeholder="隐藏的保存">
-                            </div>
-                            <button type="submit" class="btn btn btn-primary">更改管理 账号/密码</button>
-                            <div class="alert alert-primary with-icon" style="margin-top: 5px;">
-                                <i class="icon-info-sign"></i>
-                                <div class="content">
-                                    <p>更改后会立即生效并重新登录，请务必牢记账号和密码！</p>
-                                    <p>如果忘记账号可以打开-><code>/config/config.php</code>文件->找到user对应的键值->填入</p>
-                                    <p>如果忘记密码请将密码->转换成MD5小写-><a href="https://md5jiami.bmcx.com/" target="_blank" class="text-purple">转换网址</a>->打开<code>/config/config.php</code>文件->找到password对应的键值->填入</p>
-                                </div>
-                            </div>
-                        </form>
-                        <form action="<?php echo $_SERVER['SCRIPT_NAME']; ?>" method="post" onsubmit="return md5_post()">
-                            <div class="form-group">
-                                <div class="switch">
-                                    <input type="hidden" name="checkImg" value="0">
-                                    <input type="checkbox" name="checkImg" value="1" <?php if ($config['checkImg']) {echo 'checked="checked"';} ?> title="开启后会受服务器到https://moderatecontent.com速度影响，国内不建议开启！">
-                                    <label style="font-weight: bold">开启图片监黄(需要申请key，填入分类API/Token的Moderate Key中)</label>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label>设置是不良图片概率,概率越大准确率越高，当前：</label>
-                                <label id="checkImg_value"><?php echo $config['checkImg_value']; ?></label><label>%</label>
-                                <input type="range" class="form-control" name="checkImg_value" value="<?php echo $config['checkImg_value']; ?>" min="1" max="100" step="1" onchange="document.getElementById('checkImg_value').innerHTML=value">
-                            </div>
-                            <div class="form-group">
-                                <label>缓存有效期，当前：</label>
-                                <label id="cache_freq"><?php echo $config['cache_freq']; ?></label><label>小时</label>
-                                <input type="range" class="form-control" name="cache_freq" value="<?php echo $config['cache_freq']; ?>" min="1" step="1"max="24" onchange="document.getElementById('cache_freq').innerHTML=value">
-                            </div>
-                            <div class="form-group">
-                                <div class="switch">
-                                    <input type="hidden" name="checkEnv" value="0">
-                                    <input type="checkbox" name="checkEnv" value="1" <?php if ($config['checkEnv']) {echo 'checked="checked"';} ?>>
-                                    <label style="font-weight: bold">开启PHP插件检测-安全设置检测-版本检测</label>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <div class="switch">
-                                    <input type="hidden" name="upload_logs" value="0">
-                                    <input type="checkbox" name="upload_logs" value="1" <?php if ($config['upload_logs']) {echo 'checked="checked"';} ?> title="日志每月保存一个文件；经过测试每月二十万条数据并不影响速度！">
-                                    <label style="font-weight: bold">开启上传日志</label>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <input type="hidden" class="form-control" name="form" value="<?php echo date("Y-m-d H:i:s") ;?>" placeholder="隐藏的保存">
-                            </div>
-                            <button type="submit" class="btn btn-primary">保存</button>
-                        </form>
-                    </div>
                     <div class="tab-pane fade" id="Content7">
                         <p>为了访问速度，仅显示最近20张图片；监黄需要在安全设置->开启图片监黄。</p>
                         <p>key申请地址：<a href="https://client.moderatecontent.com/" target="_blank">https://client.moderatecontent.com/</a></p>
diff --git a/config/config.php b/config/config.php
index 2fee876..7945494 100755
--- a/config/config.php
+++ b/config/config.php
@@ -37,11 +37,11 @@ $config=Array
 	'imgRatio_crop'=>0,
 	'imgRatio_preserve_headers'=>1,
 	'static_cdn'=>0,
-	'theme'=>'default',
+	'theme'=>'red',
 	'static_cdn_url'=>'https://cdn.jsdelivr.net/gh/icret/EasyImages2.0',
 	'TinyImag_key'=>'',
 	'moderatecontent_key'=>'',
-	'footer'=>'<a href="/admin/terms.php" target="_blank">请勿上传违反中国政策的图片</a>
+	'footer'=>'<a href="/admin/terms.php" target="_blank">请勿上传违反中国政策的图片</a>
   <i class="icon icon-smile"></i> <br/>',
 	'ad_top'=>0,
 	'ad_top_info'=>'  <div id="ad" class="col-md-12" align="center" style="padding:5px;">
@@ -77,5 +77,5 @@ $config=Array
 	'check_ip_model'=>0,
 	'check_ip_list'=>'',
 	'version'=>'2.4.6 beta',
-	'form'=>'2022-01-20 01:31:54'
+	'form'=>'2022-01-20 02:15:29'
 	);
\ No newline at end of file