renun/TwoNav
1
0
Fork 0
mirror of https://github.com/tznb1/TwoNav.git synced 2025-08-10 08:51:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

v2.0.13-20230418

Browse Source
This commit is contained in:
MI15\Win
2023-04-18 13:17:09 +08:00
parent fa292ba2ab
commit 5cae5af159
10 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
system/api_root.php
View File

@@ -499,6 +499,7 @@ function write_sys_settings(){
'Debug'=>['int'=>true,'min'=>0,'max'=>1,'msg'=>'调试模式参数错误'],
'Maintenance'=>['int'=>true,'min'=>0,'max'=>1,'msg'=>'维护模式参数错误'],
'Sub_domain'=>['int'=>true,'min'=>0,'max'=>1,'msg'=>'二级域名参数错误'],
'Privacy'=>['int'=>true,'min'=>0,'max'=>1,'msg'=>'强制私有参数错误'],
'copyright'=>['empty'=>true],
'global_header'=>['empty'=>true],
'global_footer'=>['empty'=>true],
@@ -519,11 +520,13 @@ function write_sys_settings(){
}
if(!is_subscribe('bool')){
if($_POST['Sub_domain'] == 1){$o_config['Sub_domain'] = 0;$filter = true;}
if($_POST['Privacy'] == 1){$o_config['Privacy'] = 0;$filter = true;}
if(!empty($_POST['copyright'])){$o_config['copyright'] = "";$filter = true;}
if(!empty($_POST['global_header'])){$o_config['global_header'] = "";$filter = true;}
if(!empty($_POST['global_footer'])){$o_config['global_footer'] = "";$filter = true;}
if(!empty($_POST['apply'])){$o_config['apply'] = 0;$filter = true;}
if(!empty($_POST['guestbook'])){$o_config['guestbook'] = 0;$filter = true;}
if($_POST['apply'] == 1){$o_config['apply'] = 0;$filter = true;}
if($_POST['guestbook'] == 1){$o_config['guestbook'] = 0;$filter = true;}
if($_POST['link_extend'] == 1){$o_config['link_extend'] = 0;$filter = true;}
}
update_db("global_config", ["v" => $o_config], ["k" => "o_config"],[1,($filter ?"保存成功,未检测到有效授权,带*号的配置无法为你保存":"保存成功")]);

36
system/click.php
View File

@@ -8,17 +8,20 @@ if(empty($id)){Not_Found();}
//查询链接信息
$where['lid'] = $id;
$where['uid'] = UID;
//$where['status'] = 1;
$where['status'] = 1;
$link = get_db('user_links','*',$where);
//查找失败时显示404
if(empty($link)){
Not_Found();
}
if(empty($link)){Not_Found();}
//站点设置和站点图标
$site = unserialize(get_db('user_config','v',['uid'=>UID,'k'=>'s_site']));
$favicon = ( !empty($site['site_icon_file'])) ? $site['site_icon'] : './favicon.ico';
$site['Title'] = $site['title'].(empty($site['subtitle'])?'':' - '.$site['subtitle']);
//免费用户请保留版权,谢谢!
$copyright = empty($global_config['copyright'])?'<a target="_blank" href="https://gitee.com/tznb/twonav">Copyright © TwoNav</a>':$global_config['copyright'];
$ICP = empty($global_config['ICP'])?'':'<a target="_blank" href="https://beian.miit.gov.cn">'.$global_config['ICP'].'</a>';
$favicon = ( !empty($site['site_icon_file'])) ? $site['site_icon'] : './favicon.ico';
//取登录状态
$is_login = is_login();
@@ -40,7 +43,6 @@ if(!$is_login){
}
}
//判断链接是否停用/私有
if($link['status'] == 0){
exit('很抱歉,链接已停用!您无权限查看,如果您是管理员,请先登录!');
@@ -64,7 +66,6 @@ if(!$is_login){
exit('很抱歉,页面所属的祖分类是私有的!您无权限查看,如果您是管理员,请先登录!');
}
//判断链接是否加密
if(!empty($link['pid'])){
$verify_type = 'link_pwd';
@@ -94,9 +95,6 @@ if(!$is_login){
}
}
//取模板信息
require DIR ."/system/templates.php";
$dir_path = DIR.'/templates/transit/'.$s_templates['transit'];
@@ -107,18 +105,12 @@ if(!is_file($transit_path)){
$transit_path= DIR.'/templates/transit/default/index.php';
}
//免费用户请保留版权,谢谢!
$copyright = empty($global_config['copyright'])?'<a target="_blank" href="https://gitee.com/tznb/twonav">Copyright © TwoNav</a>':$global_config['copyright'];
$ICP = empty($global_config['ICP'])?'':'<a target="_blank" href="https://beian.miit.gov.cn">'.$global_config['ICP'].'</a>';
//统计点击数
write_user_count(date('Ym'),'click_Ym');
write_user_count(date('Ymd'),'click_Ymd');
update_db("user_links", ["click[+]"=>1],['uid'=>UID,'lid'=>$id]);
//读取过渡页设置
$transition_page = unserialize(get_db("user_config","v",["t"=>"config","k"=>"s_transition_page","uid"=>UID]));
//读取用户主题配置
$theme_config_db = unserialize(get_db('user_config','v',['t'=>'theme','k'=>$s_templates['transit'],'uid'=>UID]));
@@ -143,24 +135,24 @@ if(!empty($link['url_standby'])) {
exit;
}
if ($s_site['link_model'] == '302'){ //302重定向
if ($site['link_model'] == '302'){ //302重定向
header("HTTP/1.1 302 Moved Permanently");
header("Location: ".$link['url']);
exit;
}elseif($s_site['link_model'] == '301'){ //301重定向
}elseif($site['link_model'] == '301'){ //301重定向
header("HTTP/1.1 301 Moved Permanently");
header("Location: ".$link['url']);
exit;
}elseif($s_site['link_model'] == 'Privacy'){ //隐私保护_header
}elseif($site['link_model'] == 'Privacy'){ //隐私保护_header
header("Content-type: text/html; charset=utf-8");
header("Refresh:0;url=".$link['url']);
echo '<html lang="zh-ch"><head><title>正在保护您的隐私..</title><meta name="referrer" content="same-origin"></head>';
exit;
}elseif($s_site['link_model'] == 'Privacy_js'){ //隐私保护_js
}elseif($site['link_model'] == 'Privacy_js'){ //隐私保护_js
header("Content-type: text/html; charset=utf-8");
echo '<html lang="zh-ch"><head><title>正在保护您的隐私..</title><meta name="referrer" content="same-origin"><script>window.location.href="'.$link['url'].'"</script></head>';
exit;
}elseif($s_site['link_model'] == 'Privacy_meta'){ //隐私保护_meta
}elseif($site['link_model'] == 'Privacy_meta'){ //隐私保护_meta
header("Content-type: text/html; charset=utf-8");
echo '<html lang="zh-ch"><head><title>正在保护您的隐私..</title><meta name="referrer" content="same-origin"><meta http-equiv="refresh" content="0;url='.$link['url'].'"></head>';
exit;

3
system/index.php
View File

@@ -1,10 +1,9 @@
<?php if(!defined('DIR')){header('HTTP/1.1 404 Not Found');header("status: 404 Not Found");exit;}
//主页入口
define('is_login',is_login());
//var_dump($global_config['offline']);
//判断用户组,是否允许未登录时访问主页
if(!is_login && !check_purview('Common_home',1)){
if(!is_login && ($global_config['Privacy'] == 1 || !check_purview('Common_home',1))){
header("HTTP/1.1 302 Moved Permanently");
header("Location: ./?c=admin");
exit;

2
system/version.txt
View File

@@ -1 +1 @@
v2.0.12-20230417
v2.0.13-20230418

2
templates/admin/page/expand/guestbook-admin.php
View File

@@ -58,7 +58,7 @@ if($s['help'] != 'del'|| !count($dbs) || isset($_GET['help'])){
$arr['type'] = '使用说明';
$arr['contact'] = '271152681@qq.com';
$arr['title'] = 'TwoNav 极简留言板';
$arr['content'] = "1.极简留言板采用轻量设计,整体只有几KB\n2.留言数据存放路径/data/user/xxx/MessageBoard/ (xxx表示用户名)\n3.默认是禁止留言的,点击上方蓝色字(禁止留言/允许留言)可切换状态\n4.使用方法: 点击极简留言板(蓝字)>把地址栏的URL复制>在后台添加链接即可\n5.本条信息被删除时如果存在留言则不显示,没有留言时依旧会显示!\n6.有提交长度限制,类型32,联系方式64,标题128,内容2048字节!若不够用请自己修改源代码!\n7.为了防止被恶意提交,当留言数超过256时将不在接收留言!";
$arr['content'] = "1.极简留言板采用轻量设计,整体只有几KB\n2.留言数据存放路径/data/user/xxx/MessageBoard/ (xxx表示用户名)\n3.默认是禁止留言的,点击上方蓝色字(禁止留言/允许留言)可切换状态\n4.使用方法: 点击极简留言板(蓝字)>把地址栏的URL复制>在后台添加链接即可(部分主题已支持自动展现入口)\n5.本条信息被删除时如果存在留言则不显示,没有留言时依旧会显示!\n6.有提交长度限制,类型32,联系方式64,标题128,内容2048字节!若不够用请自己修改源代码!\n7.为了防止被恶意提交,当留言数超过256时将不在接收留言!";
$arr['time'] = date("Y-m-d H:i:s",time());
$arr['ip'] = '127.0.0.1';
$arr['id'] = $id;

4
templates/admin/page/link_extend.php
View File

@@ -25,7 +25,7 @@ function echo_text($data){ ?>
<div class="layui-form-item">
<label class="layui-form-label"><?php echo $data['title']?></label>
<div class="layui-input-block">
<input type="text" name="_<?php echo $data['name']?>" autocomplete="off" value="<?php echo $data['value']?>" class="layui-input">
<input type="text" name="_<?php echo $data['name']?>" autocomplete="off" value="<?php echo htmlentities($data['value'])?>" class="layui-input">
</div>
</div>
<?php
@@ -35,7 +35,7 @@ function echo_textarea($data){ ?>
<div class="layui-form-item">
<label class="layui-form-label"><?php echo $data['title']?></label>
<div class="layui-input-block">
<textarea name="_<?php echo $data['name']?>" class="layui-textarea"><?php echo $data['value']?></textarea>
<textarea name="_<?php echo $data['name']?>" class="layui-textarea"><?php echo htmlentities($data['value'])?></textarea>
</div>
</div>
<?php

11
templates/admin/page/root/sys_setting.php
View File

@@ -124,6 +124,17 @@ $title='系统设置';require(dirname(__DIR__).'/header.php');
<div class="layui-form-mid layui-word-aux">开启时将关闭主页/登录/注册等服务,站长账号不受影响(网站升级迁移时适用)</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label required">强制私有</label>
<div class="layui-input-inline">
<select name="Privacy">
<option value="0" selected="">依用户组配置</option>
<option value="1" >全站用户</option>
</select>
</div>
<div class="layui-form-mid layui-word-aux">开启后用户必须登录才可以进入主页(过渡页不限制)</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label required">二级域名</label>
<div class="layui-input-inline">

3
templates/admin/page/root/tool.php
View File

@@ -1,6 +1,9 @@
<?php
if($USER_DB['UserGroup'] != 'root'){$content='您没有权限访问此页面'; require(DIR.'/templates/admin/page/404.php');exit;}
$title='站长工具';
if(function_exists("opcache_reset")){
opcache_reset(); //清理PHP缓存
}
require(dirname(__DIR__).'/header.php');
?>
<style>

4
templates/admin/page/share.php
View File

@@ -200,7 +200,7 @@ layui.use(['form','table','laydate','tableSelect'], function () {
,{field:'id',title:'ID',width:60,sort:true,hide:true}
,{title: '操作',toolbar: '#tablebar',align:'center',width:140}
,{field:'sid',title:'标识',width:118,align:'center',templet:function(d){
return '<a style="color:#3c78d8" href = "./index.php?share='+d.sid+'" target = "_blank" title = "点击打开">'+d.sid+'</a>';
return '<a style="color:#3c78d8" href = "./index.php?u='+u+'&share='+d.sid+'" target = "_blank" title = "点击打开">'+d.sid+'</a>';
}}
,{field:'name',title:'名称',width:180}
,{field:'pwd',title:'提取码',width:160}
@@ -331,7 +331,7 @@ layui.use(['form','table','laydate','tableSelect'], function () {
});
}else if(obj.event === 'copy'){
if(isSupported){
ClipboardJS.copy(baseUrl + "index.php?share=" + data.sid +(data.pwd != '' ? '&pwd=' + data.pwd:''));
ClipboardJS.copy(baseUrl + "index.php?u="+u+"&share=" + data.sid +(data.pwd != '' ? '&pwd=' + data.pwd:''));
layer.msg('复制成功', {icon: 1});
}else{
layer.msg('复制失败,浏览器不支持', {icon: 5});

12
templates/admin/page/updatelog.php
View File

@@ -2,6 +2,18 @@
<body>
<div class="layuimini-container">
<div class="layuimini-main" style=" margin-left: 20px;">
<li class="layui-timeline-item">
<i class="layui-icon layui-timeline-axis"></i>
<div class="layui-timeline-content layui-text">
<h4 class="layui-timeline-title">v2.0.13-20230418</h4>
<ul>
<li>修复链接模式不受控的问题(上个版本造成)</li>
<li>网站管理/系统设置新增强制私有选项</li>
<li>修复书签分享的链接可能无法访问</li>
<li>修复扩展字段输入html代码可能造成页面渲染异常的问题</li>
</ul>
</div>
</li>
<li class="layui-timeline-item">
<i class="layui-icon layui-timeline-axis"></i>
<div class="layui-timeline-content layui-text">