- 修复广场重复显示图片

- 调整了广告的位置
pull/141/head
icret 2022-04-08 17:49:53 +00:00
parent abfc5a3fa0
commit fb931cc7c1
7 changed files with 61 additions and 43 deletions

View File

@ -149,7 +149,11 @@ $HTTP["url"] =~ "^/(i|public)/" {
<details><summary>点击查看2.0版更新日志</summary> <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 - 修复在PHP8环境下的bugs
- 修复删除token产生的bug - 修复删除token产生的bug
- 更改顶部广告位置 - 更改顶部广告位置

View File

@ -822,9 +822,9 @@ if (isset($_GET['recycle_reimg'])) {
<p class="text-ellipsis">剩余磁盘: <?php echo getDistUsed(disk_free_space(__DIR__)); ?></p> <p class="text-ellipsis">剩余磁盘: <?php echo getDistUsed(disk_free_space(__DIR__)); ?></p>
<h5>PHP信息</h5> <h5>PHP信息</h5>
<hr /> <hr />
<p class="text-ellipsis">PHP: <?php echo phpversion(); ?></p> <p class="text-ellipsis">PHP Version: <?php echo phpversion(); ?></p>
<p class="text-ellipsis">PHP UP: <?PHP echo get_cfg_var("upload_max_filesize"); ?></p> <p class="text-ellipsis">PHP Max 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">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 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">PHP Max Memery: <?PHP echo get_cfg_var("memory_limit"); ?></p>
<p class="text-ellipsis">GD: <?php echo (gd_info()["GD Version"]); ?></p> <p class="text-ellipsis">GD: <?php echo (gd_info()["GD Version"]); ?></p>
@ -845,7 +845,7 @@ if (isset($_GET['recycle_reimg'])) {
<?php else : ?> <?php else : ?>
<span class="label label-badge label-success" data-toggle="tooltip" title="图片审查moderatecontent已填写">Moderatecontent</span> <span class="label label-badge label-success" data-toggle="tooltip" title="图片审查moderatecontent已填写">Moderatecontent</span>
<?php endif; ?> <?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> <span class="label label-badge label-success" data-toggle="tooltip" title="当前版本"><?php echo $config['version']; ?></span>
<?php if (getVersion() !== $config['version']) : ?> <?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> <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>

View File

@ -1,9 +1,8 @@
<?php <?php
// 禁止直接访问
/** 禁止直接访问 */
defined('APP_ROOT') ?: exit; defined('APP_ROOT') ?: exit;
// 底部广告 /** 弹窗公告 */
if ($config['ad_bot']) echo $config['ad_bot_info'];
// 弹窗公告
if ($config['notice_status'] == 1 && !empty($config['notice'])) : ?> if ($config['notice_status'] == 1 && !empty($config['notice'])) : ?>
<div class="modal fade" id="notice"> <div class="modal fade" id="notice">
<div class="modal-dialog"> <div class="modal-dialog">
@ -65,7 +64,7 @@ if ($config['notice_status'] == 1 && !empty($config['notice'])) : ?>
// 导航状态 // 导航状态
$('.nav-pills').find('a').each(function() { $('.nav-pills').find('a').each(function() {
if (this.href == document.location.href) { if (this.href == document.location.href) {
$(this).parent().addClass('active'); // this.className = 'active'; $(this).parent().addClass('active'); // this.className = 'active';
} }
}); });

View File

@ -55,6 +55,7 @@ if ($config['ad_top']) echo $config['ad_top_info'];
</div> </div>
</div> </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="margin-top: 10px;">
<div class="col-md-12" style="padding-bottom: 10px;"> <div class="col-md-12" style="padding-bottom: 10px;">
<div class="col-md-6" 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']; ?>" document.title = "图片<?php echo basename($img); ?>的详细信息 - <?php echo $config['title']; ?>"
</script> </script>
<?php <?php
include_once __DIR__ . "/footer.php"; /** 引入底部 */
require_once APP_ROOT . '/application/footer.php';

View File

@ -23,32 +23,35 @@ if ($config['ad_top']) echo $config['ad_top_info'];
<?php else : ?> <?php else : ?>
<ul id="viewjs"> <ul id="viewjs">
<div class="cards listNum"> <div class="cards listNum">
<?php <?php foreach ($fileArr as $key => $value) {
foreach ($fileArr as $key => $value) :
if ($key < $keyNum) { if ($key < $keyNum) {
$imgUrl = $config['imgurl'] . config_path($path) . $value; $imgUrl = $config['imgurl'] . config_path($path) . $value; ?>
} <div class="col-md-4 col-sm-6 col-lg-3">
?> <div class="card">
<div class="col-md-4 col-sm-6 col-lg-3"> <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="card"> <div class="bottom-bar">
<li><img src="../public/images/loading.svg" data-image="<?php echo creat_thumbnail_by_list($imgUrl); ?>" data-original="<?php echo $imgUrl; ?>" alt="简单图床-EasyImage"></li> <a href="<?php echo $imgUrl; ?>" target="_blank"><i class="icon icon-picture" data-toggle="tooltip" title="原图" style="margin-left:10px;"></i></a>
<div class="bottom-bar"> <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="<?php echo $imgUrl; ?>" target="_blank"><i class="icon icon-picture" data-toggle="tooltip" title="原图" style="margin-left:10px;"></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>
<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> <?php if (is_who_login('admin')) : ?>
<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> <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>
<?php if (is_who_login('admin')) : ?> <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>
<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> <label class="text-primary"><input type="checkbox" id="url" name="checkbox" value="<?php echo $imgUrl; ?>"> 选择</label>
<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> <?php endif; ?>
<label class="text-primary"><input type="checkbox" id="url" name="checkbox" value="<?php echo $imgUrl; ?>"> 选择</label> </div>
<?php endif; ?>
</div> </div>
</div> </div>
</div> <?php
<?php endforeach; ?> }
}
?>
</div> </div>
</ul> </ul>
<?php endif; <?php
endif; ?> endif;
endif;
/** 底部广告 */
if ($config['ad_bot']) echo $config['ad_bot_info']; ?>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<hr /> <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']; ?>" 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> </script>
<?php require_once APP_ROOT . '/application/footer.php'; <?php
/** 引入底部 */
require_once APP_ROOT . '/application/footer.php';

View File

@ -60,16 +60,20 @@ var _hmt = _hmt || [];
s.parentNode.insertBefore(hm, s); s.parentNode.insertBefore(hm, s);
})(); })();
</script>', </script>',
'ad_top'=>0, 'ad_top'=>1,
'ad_top_info'=>' <!--广告 按照这个范例替换相应链接,如果想多几个广告,就多复制几个--> 'ad_top_info'=>' <!--广告 按照这个范例替换相应链接,如果想多几个广告,就多复制几个-->
<div class="col-md-12" style="text-align: center;margin:2px;"> <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> <a href="https://app.cloudcone.com.cn/?ref=3521" target="_blank"><img src="/public/images/EasyImage2.0.png" /></a>
</div>', </div>',
'ad_bot'=>0, 'ad_bot'=>1,
'ad_bot_info'=>'<div class="col-md-12" style="text-align: center;padding:12px 0 110px 0;"> 'ad_bot_info'=>'<div class="col-md-12 col-md-offset-4">
<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> <div class="col-md-2">
<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> <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>
<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, 'showSwitch'=>1,
'showSort'=>1, 'showSort'=>1,
'listNumber'=>20, 'listNumber'=>20,
@ -104,7 +108,7 @@ var _hmt = _hmt || [];
'delDir'=>'thumbnails/', 'delDir'=>'thumbnails/',
'hide'=>0, 'hide'=>0,
'version'=>'2.5.8', 'version'=>'2.5.8',
'update'=>'2022-04-08 21:14:14', 'update'=>'2022-04-09 00:57:03',
'terms'=>'<div class="container"> 'terms'=>'<div class="container">
<div class="row"> <div class="row">
<div class="col-xs-3"> <div class="col-xs-3">

View File

@ -1,8 +1,8 @@
<?php <?php
require_once 'application/header.php'; require_once 'application/header.php';
// 广告 /** 顶部广告 */
if ($config['ad_top']) echo $config['ad_top_info']; if ($config['ad_top']) echo $config['ad_top_info'];
// 检查登录 /** 检查登陆 */
mustLogin(); mustLogin();
?> ?>
<div class="col-md-12"> <div class="col-md-12">
@ -156,5 +156,9 @@ mustLogin();
}); });
</script> </script>
<?php <?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'; require_once APP_ROOT . '/application/footer.php';