修改*.lock文件位置
* 2023-02-01 v2.7.0 dev - 增加上传历史记录 - 增加粘贴上传状态 - 增加广场非图片图标 - 增加前端显示缩略图链接 - 增加每日获取Bing图片背景 - 增加图片详细信息管理登录后显示更多信息 - 增加解析上传IP地址 (使用方法参考提示信息) - 修复图片详细信息中随机图片排版混乱 - 替换访问生成缩略图代码 - 更新一些组件 - 调整前端显示 - 优化代码pull/141/head
icret
parent
ae21b70a13
commit
22b75d89c7
|
|
@ -1,12 +1,12 @@
|
|||
<?php
|
||||
require_once __DIR__ . '/function.php';
|
||||
// 跳转安装
|
||||
if (!is_file(APP_ROOT . '/install/install.lock') and is_file(APP_ROOT . '/install/install.php')) {
|
||||
if (!is_file(APP_ROOT . '/config/install.lock') and is_file(APP_ROOT . '/install/install.php')) {
|
||||
exit('<script type="text/javascript">window.location.href="' . get_whole_url('/') . '/install/index.php"</script>');
|
||||
}
|
||||
/** 检测弹窗 */
|
||||
if (file_exists(APP_ROOT . '/admin/EasyIamge.lock')) return; // 查询锁定弹窗文件是否存在
|
||||
file_put_contents(APP_ROOT . '/admin/EasyIamge.lock', '安装环境检测锁定文件,如需再次展示请删除此文件!', FILE_APPEND | LOCK_EX);
|
||||
if (file_exists(APP_ROOT . '/config/EasyIamge.lock')) return; // 查询锁定弹窗文件是否存在
|
||||
file_put_contents(APP_ROOT . '/config/EasyIamge.lock', '安装环境检测锁定文件,如需再次展示请删除此文件!', FILE_APPEND | LOCK_EX);
|
||||
?>
|
||||
<div class="modal fade" id="myModal-1">
|
||||
<div class="modal-dialog">
|
||||
|
|
|
|||
|
|
@ -787,7 +787,7 @@ function is_who_login($user)
|
|||
function checkEnv($mode)
|
||||
{
|
||||
// 初始化安装
|
||||
if (!is_file(APP_ROOT . '/install/install.lock') and is_file(APP_ROOT . '/install/install.php')) {
|
||||
if (!is_file(APP_ROOT . '/config/install.lock') and is_file(APP_ROOT . '/install/install.php')) {
|
||||
echo '<script type="text/javascript">window.location.href="' . get_whole_url('/') . '/install/index.php"</script>';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -33,9 +33,11 @@ $logsName = basename($img_url);
|
|||
if (is_file(APP_ROOT . '/admin/logs/upload/' . $logs . '.php')) {
|
||||
include APP_ROOT . '/admin/logs/upload/' . $logs . '.php';
|
||||
} else {
|
||||
$logs = array($logsName => array('source' => '日志文件不存在', 'date' => '日志文件不存在', 'ip' => '0.0.0.0', 'port' => '日志文件不存在', 'user_agent' => '日志文件不存在', 'path' => '日志文件不存在', 'size' => '日志文件不存在', 'md5' => '日志文件不存在', 'checkImg' => '日志文件不存在', 'from' => '日志文件不存在'));
|
||||
$logs = array($logsName => array('source' => '日志文件不存在, 请在图床安全中开启上传日志!', 'date' => '日志文件不存在, 请在图床安全中开启上传日志!', 'ip' => '0.0.0.0', 'port' => '0', 'user_agent' => '日志文件不存在, 请在图床安全中开启上传日志!', 'path' => '日志文件不存在, 请在图床安全中开启上传日志!', 'size' => '日志文件不存在, 请在图床安全中开启上传日志!', 'md5' => '日志文件不存在, 请在图床安全中开启上传日志!', 'checkImg' => '日志文件不存在, 请在图床安全中开启上传日志!', 'from' => '日志文件不存在, 请在图床安全中开启上传日志!'));
|
||||
}
|
||||
if (empty($logs[$logsName])) {
|
||||
$logs = array($logsName => array('source' => '日志不存在', 'date' => '日志不存在', 'ip' => '0.0.0.0', 'port' => '0', 'user_agent' => '日志不存在', 'path' => '日志不存在', 'size' => '日志不存在', 'md5' => '日志不存在', 'checkImg' => '日志不存在', 'from' => '日志不存在'));
|
||||
}
|
||||
|
||||
// 图片真实路径
|
||||
$imgABPath = APP_ROOT . $getIMG;
|
||||
|
||||
|
|
@ -171,20 +173,16 @@ if ($config['ad_top']) echo $config['ad_top_info'];
|
|||
<div class="col-md-12" style="padding-bottom: 10px;">
|
||||
<h4 class="header-dividing">当月随机图片：</h4>
|
||||
<div class="cards cards-borderless">
|
||||
<?php if (is_file(APP_ROOT . '/admin/logs/upload/' . date('Y-m') . '.php')) :
|
||||
include_once APP_ROOT . '/admin/logs/upload/' . date('Y-m') . '.php';
|
||||
for ($i = 0; $i <= 7; $i++) : $randName = array_rand($logs, 1)
|
||||
/** echo $img_url . $logs[$randName]['path']; */
|
||||
?>
|
||||
<?php if ($logs[$logsName]['port'] != 0) : for ($i = 0; $i <= 7; $i++) : $randName = array_rand($logs, 1) ?>
|
||||
<div class="col-md-4 col-sm-6 col-lg-3">
|
||||
<a class="card" href="?img=<?php echo $logs[$randName]['path']; ?>" target="_blank">
|
||||
<img src="thumb.php?img=<?php echo $logs[$randName]['path']; ?>">
|
||||
<div class="caption"><?php echo $logs[$randName]['source']; ?></div>
|
||||
</a>
|
||||
</div>
|
||||
<?php endfor;
|
||||
else : ?>
|
||||
<p class="alert alert-danger">本月还没有上传的图片哟~~ <br />快来上传第一张吧~!</p>
|
||||
<?php endfor; ?>
|
||||
<?php else : ?>
|
||||
<h3 class="alert alert-danger">本月没有上传图片或上传日志不存在~~</h3>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@ if ($config['ad_top']) echo $config['ad_top_info'];
|
|||
<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>
|
||||
<!-- <li><img src="holder.js/258x258?theme=sky&text=EasyImage2.0" 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 $linkUrl; ?>" 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 $linkUrl; ?>" data-toggle="tooltip" title="复制" style="margin-left:10px;"><i class="icon icon-copy"></i></a>
|
||||
|
|
@ -189,7 +188,6 @@ if ($config['ad_top']) echo $config['ad_top_info'];
|
|||
<script type="application/javascript" src="<?php static_cdn(); ?>/public/static/viewjs/viewer.min.js"></script>
|
||||
<script type="application/javascript" src="<?php static_cdn(); ?>/public/static/zui/lib/clipboard/clipboard.min.js"></script>
|
||||
<script type="application/javascript" src="<?php static_cdn(); ?>/public/static/zui/lib/datetimepicker/datetimepicker.min.js"></script>
|
||||
<!-- <script type="application/javascript" src="< php static_cdn(); ?>/public/static/holder.min.js"></script> -->
|
||||
<script>
|
||||
// viewjs
|
||||
new Viewer(document.getElementById('viewjs'), {
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ try {
|
|||
if (is_file($logFile)) {
|
||||
require_once $logFile;
|
||||
} else {
|
||||
throw new Exception('<div class="alert alert-info">日志文件不存在!<div>');
|
||||
throw new Exception('<h3 class="alert alert-danger">日志文件不存在, 请在图床安全中开启上传日志!</h3>');
|
||||
}
|
||||
if (empty($logs)) {
|
||||
throw new Exception('<div class="alert alert-info">没有上传日志!<div>');
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ $config=Array
|
|||
'guest_path_status'=>0,
|
||||
'token_path_status'=>0,
|
||||
'admin_path'=>'u',
|
||||
'update'=>'2023-02-01 02:10:54',
|
||||
'update'=>'2023-02-01 02:25:32',
|
||||
'footer'=>'<a href="https://github.com/icret/EasyImages2.0" target="_blank" rel="nofollow" data-toggle="tooltip" title="Since 2018 - Github">© Since 2018</a>
|
||||
<a href="https://png.cm/" target="_blank" data-toggle="tooltip" title="EasyImage 简单图床">EasyImage</a>
|
||||
<a href="/admin/terms.php" target="_blank" data-toggle="tooltip" title="使用协议">DMCA</a>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
require_once __DIR__ . '/../application/function.php';
|
||||
|
||||
if (file_exists(APP_ROOT . '/install/install.lock')) {
|
||||
if (file_exists(APP_ROOT . '/config/install.lock')) {
|
||||
exit(header("Location:/../index.php"));
|
||||
}
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ if (isset($_POST['imgurl'])) {
|
|||
$config_file = APP_ROOT . '/config/config.php';
|
||||
cache_write($config_file, $config);
|
||||
|
||||
file_put_contents(APP_ROOT . '/install/install.lock', '安装程序锁定文件。'); // 创建安装程序锁
|
||||
file_put_contents(APP_ROOT . '/config/install.lock', '安装程序锁定文件。'); // 创建安装程序锁
|
||||
|
||||
// 删除安装目录
|
||||
if (isset($_POST['del_install'])) {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
require_once __DIR__ . '/../application/function.php';
|
||||
clearstatcache();
|
||||
// 存在程序锁则跳转主页
|
||||
if (file_exists(APP_ROOT . '/install/install.lock')) {
|
||||
if (file_exists(APP_ROOT . '/config/install.lock')) {
|
||||
exit(header("Location:/../index.php"));
|
||||
}
|
||||
$phpEnv = (PHP_VERSION >= 5.6) ? true : false;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
require_once __DIR__ . '/../application/function.php';
|
||||
// 存在程序锁则跳转主页
|
||||
if (file_exists(APP_ROOT . '/install/install.lock')) {
|
||||
if (file_exists(APP_ROOT . '/config/install.lock')) {
|
||||
exit(header("Location:/../index.php"));
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue