From 409b6f3dcc7e06de9846dd18ce4c61acfa9e4109 Mon Sep 17 00:00:00 2001
From: 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 <thetopuser@gmail.com>
Date: Wed, 2 Mar 2022 21:33:03 +0800
Subject: [PATCH] v2.5.5

---
 README.md                       | 5 ++++-
 application/check_admin.inc.php | 9 +++++++++
 application/footer.php          | 2 +-
 config/config.php               | 8 ++++----
 index.php                       | 3 +--
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index e6744ea..305837e 100755
--- a/README.md
+++ b/README.md
@@ -103,7 +103,10 @@ $HTTP["url"] =~ "^/(i|public)/" {
 
 <details><summary><mark>点击查看2.0版更新日志</mark></summary>
 
-* 2022-2-21 v2.5.4 Developing
+* 2022-3-2 v2.5.5
+- 增加设置页面检测是否开启登录上传
+
+* 2022-2-29 v2.5.4
 - 增加Token有效期
 - 增加回收图片按钮
 - 增加加密删除回收站
diff --git a/application/check_admin.inc.php b/application/check_admin.inc.php
index 063fde6..29dd697 100755
--- a/application/check_admin.inc.php
+++ b/application/check_admin.inc.php
@@ -90,3 +90,12 @@ if (file_exists(APP_ROOT . '/.user.ini')) {
     </script>
     ';
 }
+
+// 检测是否开启登录上传
+if ($config['mustLogin']) {
+    echo '
+    <script>
+    $.zui.browser.tip("请注意: 当前已开启登录上传,非登录用户不可上传图片!");
+    </script>
+    ';
+}
diff --git a/application/footer.php b/application/footer.php
index d2ee2fc..0c9d1ea 100755
--- a/application/footer.php
+++ b/application/footer.php
@@ -2,7 +2,7 @@
 defined('APP_ROOT') ?: exit; // 禁止访问
 if ($config['ad_bot']) echo $config['ad_bot_info']; // 底部广告 
 ?>
-<footer class="col-md-12 text-muted small" style="text-align: center;">
+<footer class="container text-muted small navbar-fixed-bottom" style="text-align: center;background-color:rgba(255,255,255,0.7);">
   <hr>
   <!-- 对话框HTML -->
   <div class="modal fade" id="myModal">
diff --git a/config/config.php b/config/config.php
index fb87cf1..50d75b3 100755
--- a/config/config.php
+++ b/config/config.php
@@ -11,7 +11,7 @@ $config=Array
 	'imgurl'=>'http://127.0.0.1',
 	'user'=>'admin',
 	'password'=>'e6e061838856bf47e1de730719fb2609',
-	'mustLogin'=>1,
+	'mustLogin'=>0,
 	'apiStatus'=>1,
 	'path'=>'/i/',
 	'imgName'=>'default',
@@ -62,8 +62,8 @@ var _hmt = _hmt || [];
 <div class="col-md-12" style="text-align: center;margin:2px;">
     <a href="https://app.cloudcone.com.cn/?ref=3521" target="_blank"><img src="/public/images/EasyImage2.0.png" /></a>
 </div>',
-	'ad_bot'=>0,
-	'ad_bot_info'=>'<div class="col-md-12" style="text-align: center;margin:12px;">
+	'ad_bot'=>1,
+	'ad_bot_info'=>'<div class="col-md-12" style="text-align: center;padding:12px 0 90px 0;">
     <a href="../public/images/wechat.jpg" title="您的赞美是我开发的动力!" data-toggle="lightbox" class="btn btn-mini" style="color:#329d38;" data-lightbox-group="group1644998953432"><i class="icon icon-wechat"></i> 打赏作者</a>
     <a href="../public/images/alipay.jpg" title="您的赞美是我开发的动力!" data-toggle="lightbox" class="btn btn-mini" style="color:#1970fc;" data-lightbox-group="group1644998953432"><i class="icon icon-zhifubao"></i> 打赏作者</a>
 </div>',
@@ -98,7 +98,7 @@ var _hmt = _hmt || [];
 	'language'=>0,
 	'image_recycl'=>1,
 	'version'=>'2.5.4',
-	'update'=>'2022-02-27 15:00:09',
+	'update'=>'2022-03-02 18:12:15',
 	'terms'=>'<div class="container">
   <div class="row">
     <div class="col-xs-3">
diff --git a/index.php b/index.php
index 70726e9..751b0e3 100755
--- a/index.php
+++ b/index.php
@@ -25,7 +25,7 @@ mustLogin();
       <button type="button" class="btn btn-link uploader-btn-stop"><i class="icon icon-pause"></i>暂停上传</button>
     </div>
   </div>
-  <div class="col-md-10 col-md-offset-1 clo-xs-12">
+  <div class="col-md-10 col-md-offset-1 clo-xs-12" style="margin-bottom:90px;">
     <ul class="nav nav-tabs">
       <li <?php if ($config['upload_first_show'] == 1) echo 'class="active"'; ?>>
         <a href="#" data-target="#tab2Content1" data-toggle="tab"><i class="icon icon-link"></i> 直链</a>
@@ -72,7 +72,6 @@ mustLogin();
     </div>
   </div>
 </div>
-</table>
 <link href="<?php static_cdn(); ?>/public/static/marquee/marquee.css" rel="stylesheet">
 <link href="<?php static_cdn(); ?>/public/static/zui/lib/uploader/zui.uploader.min.css" rel="stylesheet">
 <script src="<?php static_cdn(); ?>/public/static/zui/lib/uploader/zui.uploader.min.js"></script>