From fb931cc7c13c9f16a120f836d24e60c9b5b4eade Mon Sep 17 00:00:00 2001
From: icret <thetopuser@gmail.com>
Date: Fri, 8 Apr 2022 17:49:53 +0000
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=E5=B9=BF=E5=9C=BA?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=98=BE=E7=A4=BA=E5=9B=BE=E7=89=87=20-=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E5=B9=BF=E5=91=8A=E7=9A=84=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md              |  6 +++++-
 admin/admin.inc.php    |  8 +++----
 application/footer.php |  9 ++++----
 application/info.php   |  4 +++-
 application/list.php   | 49 +++++++++++++++++++++++-------------------
 config/config.php      | 18 ++++++++++------
 index.php              | 10 ++++++---
 7 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/README.md b/README.md
index 76e8a32..f5de16a 100755
--- a/README.md
+++ b/README.md
@@ -149,7 +149,11 @@ $HTTP["url"] =~ "^/(i|public)/" {
 
 <details><summary>点击查看2.0版更新日志</summary>
 
-* 2022-04-02 v2.5.8 deving
+* 2022-04-02 v2.5.9 deving
+- 修复广场重复显示图片
+- 调整了广告的位置
+
+* 2022-04-02 v2.5.8
 - 修复在PHP8环境下的bugs
 - 修复删除token产生的bug
 - 更改顶部广告位置
diff --git a/admin/admin.inc.php b/admin/admin.inc.php
index 03d63b9..4e13ec8 100755
--- a/admin/admin.inc.php
+++ b/admin/admin.inc.php
@@ -822,9 +822,9 @@ if (isset($_GET['recycle_reimg'])) {
                 <p class="text-ellipsis">剩余磁盘: <?php echo  getDistUsed(disk_free_space(__DIR__)); ?></p>
                 <h5>PHP信息</h5>
                 <hr />
-                <p class="text-ellipsis">PHP: <?php echo  phpversion(); ?></p>
-                <p class="text-ellipsis">PHP UP: <?PHP echo get_cfg_var("upload_max_filesize"); ?></p>
-                <p class="text-ellipsis">POST UP: <?php echo ini_get('post_max_size'); ?></p>
+                <p class="text-ellipsis">PHP Version: <?php echo  phpversion(); ?></p>
+                <p class="text-ellipsis">PHP Max UP: <?PHP echo get_cfg_var("upload_max_filesize"); ?></p>
+                <p class="text-ellipsis">POST Max UP: <?php echo ini_get('post_max_size'); ?></p>
                 <p class="text-ellipsis">PHP Max Time: <?PHP echo get_cfg_var("max_execution_time") . "秒"; ?></p>
                 <p class="text-ellipsis">PHP Max Memery: <?PHP echo get_cfg_var("memory_limit"); ?></p>
                 <p class="text-ellipsis">GD: <?php echo (gd_info()["GD Version"]); ?></p>
@@ -845,7 +845,7 @@ if (isset($_GET['recycle_reimg'])) {
                     <?php else : ?>
                         <span class="label label-badge label-success" data-toggle="tooltip" title="图片审查moderatecontent已填写">Moderatecontent</span>
                     <?php endif; ?>
-                    <a href="https://easysoft.github.io/zui/" target="_blank"><span class="label label-badge label-primary" data-toggle="tooltip" title="前端框架">ZUI</span></a>
+                    <a href="https://easysoft.github.io/zui/" target="_blank"><span class="label label-badge label-success" data-toggle="tooltip" title="前端框架">ZUI</span></a>
                     <span class="label label-badge label-success" data-toggle="tooltip" title="当前版本"><?php echo $config['version']; ?></span>
                     <?php if (getVersion() !== $config['version']) : ?>
                         <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>
diff --git a/application/footer.php b/application/footer.php
index 735eb4f..df38383 100755
--- a/application/footer.php
+++ b/application/footer.php
@@ -1,9 +1,8 @@
 <?php
-// 禁止直接访问
+
+/** 禁止直接访问 */
 defined('APP_ROOT') ?: exit;
-// 底部广告 
-if ($config['ad_bot']) echo $config['ad_bot_info'];
-// 弹窗公告
+/** 弹窗公告 */
 if ($config['notice_status'] == 1 && !empty($config['notice'])) : ?>
   <div class="modal fade" id="notice">
     <div class="modal-dialog">
@@ -65,7 +64,7 @@ if ($config['notice_status'] == 1 && !empty($config['notice'])) : ?>
   // 导航状态
   $('.nav-pills').find('a').each(function() {
     if (this.href == document.location.href) {
-        $(this).parent().addClass('active'); // this.className = 'active';
+      $(this).parent().addClass('active'); // this.className = 'active';
     }
   });
 
diff --git a/application/info.php b/application/info.php
index 5c95505..91d5fd7 100755
--- a/application/info.php
+++ b/application/info.php
@@ -55,6 +55,7 @@ if ($config['ad_top']) echo $config['ad_top_info'];
         </div>
     </div>
 </div>
+<? /** 底部广告 */ if ($config['ad_bot']) echo $config['ad_bot_info']; ?>
 <div class="col-md-12" style="margin-top: 10px;">
     <div class="col-md-12" style="padding-bottom: 10px;">
         <div class="col-md-6" style="padding-bottom: 10px;">
@@ -149,4 +150,5 @@ if ($config['ad_top']) echo $config['ad_top_info'];
     document.title = "图片<?php echo basename($img); ?>的详细信息 - <?php echo $config['title']; ?>"
 </script>
 <?php
-include_once __DIR__ . "/footer.php";
+/** 引入底部 */
+require_once APP_ROOT . '/application/footer.php';
diff --git a/application/list.php b/application/list.php
index 5a830c7..73f0999 100755
--- a/application/list.php
+++ b/application/list.php
@@ -23,32 +23,35 @@ if ($config['ad_top']) echo $config['ad_top_info'];
       <?php else : ?>
         <ul id="viewjs">
           <div class="cards listNum">
-            <?php
-            foreach ($fileArr as $key => $value) :
+            <?php foreach ($fileArr as $key => $value) {
               if ($key < $keyNum) {
-                $imgUrl = $config['imgurl'] . config_path($path) . $value;
-              }
-            ?>
-              <div class="col-md-4 col-sm-6 col-lg-3">
-                <div class="card">
-                  <li><img src="../public/images/loading.svg" data-image="<?php echo creat_thumbnail_by_list($imgUrl); ?>" data-original="<?php echo $imgUrl; ?>" alt="简单图床-EasyImage"></li>
-                  <div class="bottom-bar">
-                    <a href="<?php echo $imgUrl; ?>" target="_blank"><i class="icon icon-picture" data-toggle="tooltip" title="原图" style="margin-left:10px;"></i></a>
-                    <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>
-                    <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>
-                    <?php if (is_who_login('admin')) : ?>
-                      <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>
-                      <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>
-                      <label class="text-primary"><input type="checkbox" id="url" name="checkbox" value="<?php echo $imgUrl; ?>"> 选择</label>
-                    <?php endif; ?>
+                $imgUrl = $config['imgurl'] . config_path($path) . $value; ?>
+                <div class="col-md-4 col-sm-6 col-lg-3">
+                  <div class="card">
+                    <li><img src="../public/images/loading.svg" data-image="<?php echo creat_thumbnail_by_list($imgUrl); ?>" data-original="<?php echo $imgUrl; ?>" alt="简单图床-EasyImage"></li>
+                    <div class="bottom-bar">
+                      <a href="<?php echo $imgUrl; ?>" target="_blank"><i class="icon icon-picture" data-toggle="tooltip" title="原图" style="margin-left:10px;"></i></a>
+                      <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>
+                      <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>
+                      <?php if (is_who_login('admin')) : ?>
+                        <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>
+                        <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>
+                        <label class="text-primary"><input type="checkbox" id="url" name="checkbox" value="<?php echo $imgUrl; ?>"> 选择</label>
+                      <?php endif; ?>
+                    </div>
                   </div>
                 </div>
-              </div>
-            <?php endforeach; ?>
+            <?php
+              }
+            }
+            ?>
           </div>
         </ul>
-    <?php endif;
-    endif; ?>
+    <?php
+      endif;
+    endif;
+    /** 底部广告 */
+    if ($config['ad_bot']) echo $config['ad_bot_info']; ?>
   </div>
   <div class="col-md-12">
     <hr />
@@ -335,4 +338,6 @@ if ($config['ad_top']) echo $config['ad_top_info'];
   // 更改网页标题
   document.title = "图床广场 - 今日上传<?php echo get_file_by_glob(APP_ROOT . config_path(), 'number'); ?>张 昨日<?php echo get_file_by_glob(APP_ROOT . $config['path'] . date("Y/m/d/", strtotime("-1 day")) . '*.*', 'number'); ?>张 - <?php echo $config['title']; ?>"
 </script>
-<?php require_once APP_ROOT . '/application/footer.php';
+<?php
+/** 引入底部 */
+require_once APP_ROOT . '/application/footer.php';
diff --git a/config/config.php b/config/config.php
index 71de897..35e9d08 100755
--- a/config/config.php
+++ b/config/config.php
@@ -60,16 +60,20 @@ var _hmt = _hmt || [];
   s.parentNode.insertBefore(hm, s);
 })();
 </script>',
-	'ad_top'=>0,
+	'ad_top'=>1,
 	'ad_top_info'=>' <!--广告 按照这个范例替换相应链接，如果想多几个广告，就多复制几个-->
 <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;padding:12px 0 110px 0;">
-    <a href="../public/images/wechat.jpg" alt="您的赞美是我开发的动力!" 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" alt="您的赞美是我开发的动力!" data-toggle="lightbox" class="btn btn-mini" style="color:#1970fc;" data-lightbox-group="group1644998953432"><i class="icon icon-zhifubao"></i> 打赏作者</a>
-</div>',
+	'ad_bot'=>1,
+	'ad_bot_info'=>'<div class="col-md-12 col-md-offset-4">
+        <div class="col-md-2">
+            <a href="https://png.cm/public/images/wechat.jpg" data-toggle="lightbox" data-group="image-group-1"><img src="https://png.cm/public/images/wechat.jpg" class="img-rounded" alt="微信打赏"></a>
+        </div>
+        <div class="col-md-2">
+            <a href="https://png.cm/public/images/alipay.jpg" data-toggle="lightbox" data-group="image-group-1"><img src="https://png.cm/public/images/alipay.jpg" class="img-rounded" alt="支付宝打赏"></a>
+        </div>
+    </div>',
 	'showSwitch'=>1,
 	'showSort'=>1,
 	'listNumber'=>20,
@@ -104,7 +108,7 @@ var _hmt = _hmt || [];
 	'delDir'=>'thumbnails/',
 	'hide'=>0,
 	'version'=>'2.5.8',
-	'update'=>'2022-04-08 21:14:14',
+	'update'=>'2022-04-09 00:57:03',
 	'terms'=>'<div class="container">
   <div class="row">
     <div class="col-xs-3">
diff --git a/index.php b/index.php
index a32f066..b5ddab3 100755
--- a/index.php
+++ b/index.php
@@ -1,8 +1,8 @@
 <?php
 require_once 'application/header.php';
-// 广告
+/** 顶部广告 */
 if ($config['ad_top']) echo $config['ad_top_info'];
-// 检查登录
+/** 检查登陆 */
 mustLogin();
 ?>
 <div class="col-md-12">
@@ -156,5 +156,9 @@ mustLogin();
   });
 </script>
 <?php
-/** 环境检测 */ if ($config['checkEnv']) require_once APP_ROOT . '/application/check.php';
+/** 环境检测 */
+if ($config['checkEnv']) require_once APP_ROOT . '/application/check.php';
+/** 底部广告 */
+if ($config['ad_bot']) echo $config['ad_bot_info'];
+/** 引入底部 */
 require_once APP_ROOT . '/application/footer.php';