mirrors/EasyImages2.0
1
0
Fork 0
mirror of https://github.com/icret/EasyImages2.0.git synced 2025-12-13 11:43:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

v2.7.2 dev

Browse Source 
* 2023-02-04 v2.7.2 dev
- 增加 [web-indexr](https://github.com/rehiy/web-indexr) 文件管理
- - web-indexr处于实验中,作为Tinyfilemanager的替代
- 修复开启登录上传后,上传者账号上传失败 [#87](https://github.com/icret/EasyImages2.0/issues/87#issue-1569794639)
- 优化排版和移动端显示
This commit is contained in:
icret
2023-02-04 10:55:33 +08:00
parent fae2b6effe
commit e632634154
8 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/footer.php
View File

@@ -65,8 +65,9 @@ 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';
// console.log(document.location);
if (this.pathname == document.location.pathname) {
$(this).parent().addClass('active');
}
});

7
application/function.php
View File

@@ -764,9 +764,8 @@ function getDel($url, $type)
*/
function is_who_login($user)
{
if (empty($user)) {
if ($user == 'status') {
if (checkLogin() == 205 || checkLogin() == 204) return true;
return false;
}
$status = json_decode(_login(), true);
@@ -1506,7 +1505,7 @@ function rand_imgurl($text = null)
}
/**
* 获取当前版本号
* 获取当前版本号 | 读取字符串
* @param String $file 文件相对路径
* @return String 内容信息
*/
@@ -1519,7 +1518,7 @@ function get_current_version($file = '/admin/version.php')
return file_get_contents($file);
}
return 'No Version File';
return 'file does not exist';
}
// 压缩图片与图片鉴黄

44
application/header.php
View File

@@ -27,21 +27,33 @@
<body class="container">
<div class="page-header">
<ul class="nav nav-pills">
<li><a href="<?php echo $config['domain']; ?>"><i class="icon icon-home"></i> 首页</a></li>
<?php if ($config['showSwitch'] || is_who_login('admin')) : /** 非管理或未开启不显示广场 */ ?>
<li><a href="<?php echo $config['domain']; ?>/application/list.php"><i class="icon icon-th"></i> 广场<span class="label label-badge label-primary"><?php echo get_file_by_glob(APP_ROOT . config_path(), 'number'); ?></span></a></li>
<?php endif; ?>
<?php if ($config['history'] || is_who_login('admin')) : /** 非管理或未开启不显示上传历史 */ ?>
<li><a href="<?php $config['domain']; ?>/application/history.php"><i class="icon icon-history"></i> 历史<span class="label label-badge label-primary"></span></a></li>
<?php endif; ?>
<?php if (is_who_login('admin')) : /** 非管理不显示设置 */ ?>
<li><a href="<?php echo $config['domain']; ?>/admin/admin.inc.php"><i class="icon icon-cogs"></i> 设置</a></li>
<?php endif; ?>
<?php if ($config['chart_on'] && is_who_login('admin')) : /** 非管理或未开启不显示统计 */ ?>
<li><a href="<?php echo $config['domain']; ?>/admin/chart.php"><i class="icon icon-pie-chart"></i> 统计</a></li>
<?php endif; ?>
</ul>
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse-EasyImage">
<span class="icon icon-bars"></span>
</button>
</div>
<div class="collapse navbar-collapse navbar-collapse-EasyImage">
<ul class="nav nav-pills">
<li><a href="<?php echo $config['domain']; ?>"><i class="icon icon-home"></i> 首页</a></li>
<?php /** 非管理或未开启不显示广场 */ if ($config['showSwitch'] || is_who_login('admin')) : ?>
<li><a href="<?php echo $config['domain']; ?>/application/list.php"><i class="icon icon-th"></i> 广场<span class="label label-badge label-primary"><?php echo get_file_by_glob(APP_ROOT . config_path(), 'number'); ?></span></a></li>
<?php endif; ?>
<?php /** 非管理或未开启不显示上传历史 */ if ($config['history'] || is_who_login('admin')) : ?>
<li><a href="<?php $config['domain']; ?>/application/history.php"><i class="icon icon-history"></i> 历史<span class="label label-badge label-primary"></span></a></li>
<?php endif; ?>
<?php /** 非管理不显示设置 */ if (is_who_login('admin')) : ?>
<li><a href="<?php echo $config['domain']; ?>/admin/admin.inc.php"><i class="icon icon-cogs"></i> 设置</a></li>
<?php endif; ?>
<?php /** 非管理或未开启不显示统计 */ if ($config['chart_on'] && is_who_login('admin')) : ?>
<li><a href="<?php echo $config['domain']; ?>/admin/chart.php"><i class="icon icon-pie-chart"></i> 统计</a></li>
<?php endif; ?>
<?php /** 账号登录 */ if (is_who_login('status')) : ?>
<!-- 右侧的导航项目 -->
<li class="nav navbar-nav navbar-right hidden-xs"><a href="<?php echo $config['domain']; ?>/admin/index.php?login=logout"><i class="icon icon-signout"> 退出登录</i></a></li>
<?php else : ?>
<li class="nav navbar-nav navbar-right hidden-xs"><a href="<?php echo $config['domain']; ?>/admin/index.php"><i class="icon icon-user"> 登录账号</i></a></li>
<?php endif; ?>
</ul>
</div>
</div>
<!-- 顶部导航栏END -->

4
application/upload.php
View File

@@ -7,7 +7,7 @@ require __DIR__ . '/class.upload.php';
// 检查登录
if ($config['mustLogin']) {
if (is_who_login(null)) {
if (!is_who_login('status')) {
exit(json_encode(array(
"result" => "failed",
"code" => 401,
@@ -40,7 +40,7 @@ if ($config['check_ip']) {
}
// 根据IP限制游客每日上传数量
if ($config['ip_upload_counts'] > 0 && !is_who_login(null)) {
if ($config['ip_upload_counts'] > 0 && !is_who_login('status')) {
$ipList = APP_ROOT . '/admin/logs/ipcounts/' . date('Ymd') . '.php';
if (is_file($ipList)) {
$ipList = file_get_contents($ipList);