v2.0.09-20230410

system/api_root.php

@@ -25,13 +25,15 @@ function other_upsys(){
         if(!preg_match('/^v.+-(\d{8})$/i',SysVer,$matches)){
             msg(-1,"获取程序版本异常");
         }
+        if (!is_dir('./data/temp')) mkdir('./data/temp',0755,true) or msg(-1,'下载失败,创建临时[/data/temp]目录失败');
         //检查指定文件夹是否可写
-        $paths = ["./","./data","./static","./system","./templates"];
+        $paths = ["./","./data","./data/temp","./static","./system","./templates"];
         foreach($paths as $path){
             if(!is_writable($path)){
                 msg(-1,"文件夹不可写 >> $path");
             }
         }
+        
         $_SESSION['upsys']['sysver'] = intval($matches[1]);
         usleep(1000*300); //延迟300毫秒
         msg(1,'success');

system/public.php

@@ -230,8 +230,8 @@ function echo_category($property = false){
 function echo_pwds(){
     $where["uid"] = UID;
     $where['ORDER']['pid'] = 'ASC';
-    foreach (select_db('user_pwd_group',['pid','name'],$where) as $data) {
-        echo "<option value=\"{$data['pid']}\">{$data['name']}</option>";
+    foreach (select_db('user_pwd_group',['pid','name','password'],$where) as $data) {
+        echo "<option value=\"{$data['pid']}\">{$data['name']} | 密码 [{$data['password']}]</option>";
     }
 }
 //检查链接

system/version.txt

@@ -1 +1 @@
-v2.0.08-20230406
+v2.0.09-20230410

templates/admin/css/public.css

@@ -10,23 +10,6 @@ body {
     width: 190px;
 }
 
-/*手机端适配*/
-@media screen and (max-width: 768px) {
-    .layui-form-mid {
-        margin-left: 10px;
-    }
-    .layui-form-item .layui-input-inline {
-        margin-right: 0px;
-        width:  calc(100% - 110px);
-    }
-}
-@media screen and (max-width: 450px){
-    .layui-form-item .layui-input-inline+.layui-form-mid {
-        margin-left: 10px;
-    }
-}
-
-
 .layuimini-container {
     border: 1px solid #f2f2f2;
     border-radius: 5px;
@@ -91,4 +74,40 @@ body {
 
 .layui-table-tool-temp{
     padding-right: 0px;
+}
+
+
+/*手机端适配*/
+@media screen and (max-width: 768px) {
+    .layui-form-mid {
+        margin-left: 10px;
+    }
+    .layui-form-item .layui-input-inline {
+        margin-right: 0px;
+        width:  calc(100% - 110px);
+    }
+    /*手机端表单调整230410*/
+    .layui-form-label{
+        width: 60px;
+        padding: 9px 9px;
+    }
+    .layui-input-block{
+        margin-left: 85px; 
+    }
+    /*隐藏描述*/
+    .layui-form-mid{
+        display:none
+    }
+    /*边距*/
+    .layuimini-main {
+        margin: 10px 5px 10px 0px;
+    }
+    .layui-form-item{
+        margin-bottom: 8px;
+    }
+}
+@media screen and (max-width: 450px){
+    .layui-form-item .layui-input-inline+.layui-form-mid {
+        margin-left: 10px;
+    }
 }

templates/admin/js/category.js

@@ -80,20 +80,6 @@
                         $("#fid").append("<option value=\""+res.data[i].cid+"\">"+res.data[i].name+"</option>");
                     }
                 }
-                //加载加密分组数据
-                $.post(get_api('read_pwd_group_list'),{'page':'1','limit':'9999'},function(data,status){
-                    if(data.code == 1){
-                        pwds = [];
-                        $("#pwd_id").empty();
-                        $("#pwd_id").append("<option value=\"0\">无</option>");
-                        for(var i =0;i<data.count;i++){
-                            pwds['pid_'+data.data[i].pid] = {'pwd':data.data[i].password,'name':data.data[i].name};
-                            $("#pwd_id").append("<option value=\""+data.data[i].pid+"\">"+data.data[i].name+" | 密码 [" + data.data[i].password +"]</option>");
-                        }
-                    }
-                });
-                
-                layui.form.render("select");//重新渲染下拉框
                 limit = false; //取消修改限制
                 layer.closeAll('loading'); //关闭加载层
             } 

templates/admin/js/link_list.js

@@ -248,18 +248,6 @@ layui.use(['form','table','dropdown','miniTab'], function () {
                 return true;
             }
           })
-        }else if(event === 'generate'){  //生成大量链接
-            if($('#fid').val() == 0 ){
-                layer.msg("请选择一个分类",{icon:3});
-                return;
-            }
-            var fid = $('#fid').val();
-            for (i = 0; i < 1000; i++) {
-                $.post(get_api('write_link','add'),{title:'百度翻译'+i,fid:fid,url:'https://fanyi.baidu.com/#zh/en/'+i+'_'+randomString(5)},function(data,status){
-
-                });
-            }
-            
         }
     });
     

templates/admin/page/add_link_tpl.php

@@ -28,6 +28,7 @@
             <label class="layui-form-label required">所属分类</label>
             <div class="layui-input-block">
                 <select name="fid" id="fid" lay-verify="required">
+                    <option value=""></option><?php echo_category(true); ?>
                 </select> 
             </div>
         </div>

templates/admin/page/category_list.php

@@ -72,6 +72,7 @@
             <div class="layui-input-block">
                 <select name="pwd_id" id="pwd_id">
                     <option value="0">无</option>
+                    <?php echo_pwds(); ?>
                 </select> 
             </div>
         </div>

templates/admin/page/home.php

@@ -1,8 +1,6 @@
 <?php 
 $title='概况'; 
 $awesome=true;
-$HOST = getindexurl();
-
 
 //读取缓存数据
 $Notice = get_db('global_config','v',['k'=>'notice']);
@@ -261,11 +259,11 @@ require 'header.php';
                             <tr>
                                 <td>专属地址</td>
                                 <td>
-                                    <a href="<?php echo $HOST.'?u='.U;?>" target="_blank">我的主页</a>
+                                    <a href="<?php echo './?u='.U;?>" target="_blank">我的主页</a>
                                     &nbsp;
-                                    <a href="<?php echo $HOST.'?c='.$USER_DB['Login'].'&u='.U;?>" target="_blank">TwoNav - 登录</a>
+                                    <a href="<?php echo './?c='.$USER_DB['Login'].'&u='.U;?>" target="_blank">TwoNav - 登录</a>
                                     &nbsp;
-                                    <i class="fa fa-arrow-left layui-hide-xs" style="color: #ff5722;">&nbsp;<span style="color: #ff5722;" title="收藏专属入口可避免出现无法登录后台的情况">建议收藏</span></i>
+                                    <i class="fa fa-arrow-left layui-hide-xs" style="color: #ff5722;">&nbsp;<span style="color: #ff5722;" title="收藏专属入口可避免无法登录后台的情况">建议收藏</span></i>
                                 </td>
                             <tr>
                             </tbody>

templates/admin/page/link_add.php

@@ -13,7 +13,7 @@
     .badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:11px;font-weight:700;color:#fff;line-height:1;vertical-align:middle;white-space:nowrap;text-align:center;background-color:#777;border-radius:10px}
 </style>
 <div class="layuimini-container">
-    <div class="layuimini-main" style=" margin-left: 0px; ">
+    <div class="layuimini-main">
      <form class="layui-form layuimini-form" lay-filter="form">
          
         <div class="layui-form-item">

templates/admin/page/link_list.php

@@ -67,7 +67,6 @@
         <button class="layui-btn layui-btn-sm layui-btn-normal layui-hide-xs" lay-event="batch_disable" id="batch_disable">设为禁用</button>
         <button class="layui-btn layui-btn-sm layui-btn-normal layui-btn-danger layui-hide-xs" lay-event="testing" id="testing" <?php echo $global_config['offline']?'style="display:none;"':''?> >检测</button>
         <button class="layui-btn layui-btn-sm layui-btn-normal layui-btn-danger" layuimini-content-href="link_sort" data-title="链接排序">排序模式</button>
-        <button class="layui-btn layui-btn-sm layui-btn-normal layui-btn-danger layui-hide-xs" lay-event="generate" id="generate">生成</button>
     </div>
 </script>
 <script src = "<?php echo $libs;?>/jquery/jquery-3.6.0.min.js"></script>

templates/admin/page/root/reg_control.php

@@ -71,7 +71,7 @@ $user_groups = select_db('user_group',['id','code','name'],'');
 <script src = "./templates/admin/js/public.js?v=<?php echo $Ver;?>"></script>
 <?php load_static('js');?>
 <script>
-var host = '<?php echo getindexurl().'?c='.$global_config['Register']."&key=";?>';
+var host = Get_baseUrl() + '<?php echo 'index.php?c='.$global_config['Register']."&key=";?>';
 
 layui.use(['table','layer','form'], function(){
     var table = layui.table;

templates/admin/page/root/vip.php

@@ -1,7 +1,9 @@
 <?php 
 if($USER_DB['UserGroup'] != 'root'){$content='您没有权限访问此页面'; require(DIR.'/templates/admin/page/404.php');exit;}
 $title='授权管理';require(dirname(__DIR__).'/header.php'); 
-$subscribe = unserialize(get_db('global_config','v',["k" => "s_subscribe"])); ?>
+$subscribe = unserialize(get_db('global_config','v',["k" => "s_subscribe"])); 
+$HTTP_HOST = preg_replace('/:\d+$/','',$_SERVER['HTTP_HOST']); //去除端口号
+?>
 <body>
 <div class="layuimini-container">
   <div class="layuimini-main">
@@ -12,8 +14,7 @@ $subscribe = unserialize(get_db('global_config','v',["k" => "s_subscribe"])); ?>
             <li>3. 授权未绑定邮箱时邮箱留空,已绑定时请输入正确邮箱</li>
             <li>4. 如有其他疑问联系技术支持</li>
         </blockquote>
-        
-        <h3 style = "margin-bottom:1em;">当前域名：<font color="red"><?php echo $_SERVER['HTTP_HOST']; ?></font> (订阅时填写)</h3>
+        <h3 style = "margin-bottom:1em;">当前域名：<font color="red"><?php echo $HTTP_HOST; ?></font> (订阅时填写)</h3>
         
         <div class="layui-form-item">
             <label class="layui-form-label">订单号</label>
@@ -32,7 +33,7 @@ $subscribe = unserialize(get_db('global_config','v',["k" => "s_subscribe"])); ?>
         <div class="layui-form-item" style = "display:none;">
             <label class="layui-form-label">域名</label>
             <div class="layui-input-block">
-                <input type="text" name="domain" id ="domain" value="<?php echo $_SERVER['HTTP_HOST']; ?>" autocomplete="off" placeholder="网站域名" class="layui-input">
+                <input type="text" name="domain" id ="domain" value="<?php echo $HTTP_HOST; ?>" autocomplete="off" placeholder="网站域名" class="layui-input">
             </div>
         </div>
 

templates/admin/page/updatelog.php

@@ -2,6 +2,20 @@
 <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.09-20230410</h4>
+            <ul>
+                <li>优化兼容性/细节调整</li>
+                <li>放宽授权验证规则</li>
+                <li>修复前端调用添加链接页面没有分类的bug</li>
+                <li>修复默认主题删除链接提示ID不存在的bug</li>
+                <li>修复下载更新时temp目录不存在时未自动创建导致下载失败的bug</li>
+                <li>调整手机端布局(减小边距/不显示描述)</li>
+            </ul>
+        </div>
+    </li>
     <li class="layui-timeline-item">
         <i class="layui-icon layui-timeline-axis"></i>
         <div class="layui-timeline-content layui-text">

templates/home/default/static/embed.js

@@ -46,7 +46,7 @@ var menu = {
         link_id = link_id.replace('id_','');
         mdui.confirm('确认删除？'
             ,function(){
-                $.post(get_api('write_link','del'),{id:link_id},function(data,status){
+                $.post(get_api('write_link','del'),{lid:link_id},function(data,status){
                     if(data.code == 1) {
                         $("#id_" + link_id).remove();
                     }else{