v2.0.35-20230816

system/ATool.php

@@ -165,6 +165,14 @@ if(!empty($_GET['type'])){
         update_db("user_login_info", ["user" => $_POST['new_user_name']], ["user" => $USER['User']]);
         update_db("user_log", ["user" => $_POST['new_user_name']], ["user" => $USER['User']]);
         update_db("global_user", ["User" => $_POST['new_user_name']], ["ID" => $_POST['ID']],[1,'操作成功']);
+    }elseif($_GET['type'] == 'del_otp'){
+        $user_data = get_db('global_user','*',['ID'=>$_POST['ID']]);
+        $LoginConfig = unserialize($user_data['LoginConfig']);
+        if(empty($LoginConfig['totp_key'])){
+            msgA(['code'=>-1,'msg'=>'当前账号未开启OTP双重验证']);
+        }
+        $LoginConfig['totp_key'] = '';
+        update_db("global_user", ["LoginConfig" => $LoginConfig], ["ID" => $_POST['ID']],[1,'操作成功']);
     }
     
     msgA(['code'=>-1,'msg'=>'请求类型错误']);
@@ -267,6 +275,7 @@ function echo_Atool(){
         <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="set_pwd">改密码</a>
         <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="set_root">设站长</a>
         <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="set_user_name">改账号</a>
+        <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="del_otp" title="移除OTP登录验证">删OTP</a>
     </div>
 </script>
 <script src="../static/Layui/v2.8.10/layui.js"></script>
@@ -280,7 +289,7 @@ function echo_Atool(){
         var table = layui.table;
         var cols = [[
             {field:'ID',title:'ID',width:60,sort:true}
-            ,{title:'操作',toolbar:'#tablebar',width:175}
+            ,{title:'操作',toolbar:'#tablebar',width:220}
             ,{field:'User',title:'账号',minWidth:120,templet:function(d){
                 return '<a style="color:#3c78d8" title="打开用户主页" target="_blank" href="../?u='+d.User+'">'+d.User+'</a>'
             }}
@@ -359,6 +368,14 @@ function echo_Atool(){
                         }
                     });
                 });
+            }else if(obj.event == 'del_otp'){
+                $.post('./ATool.php?type=del_otp',{ID:data.ID},function(data,status){
+                    if(data.code == 1) {
+                        layer.msg(data.msg, {icon: 1});
+                    }else{
+                        layer.msg(data.msg, {icon: 5});
+                    }
+                });
             }
         });
         $('.set').click(function () {

system/api_root.php

@@ -352,6 +352,25 @@ function write_user_info(){
         delete_db('global_user',["ID" => $uids]);
         msg(1,'删除成功');
         break;
+    //删除OTP验证
+    case "Del_OTP":
+        $uids = json_decode($_POST['ID']);
+        $USER_S = select_db('global_user',['LoginConfig','ID','User'],['ID'=>$uids]);
+        $fail = 0;
+        foreach($USER_S as $USER){
+            $LoginConfig = unserialize($USER['LoginConfig']);
+            if(empty($LoginConfig['totp_key'])){
+                $fail ++;
+                continue;
+            }
+            $LoginConfig['totp_key'] = '';
+            update_db("global_user", ["LoginConfig" => $LoginConfig], ["ID" => $USER['ID']]);
+        }
+        if($fail > 0){
+            msg(1,'操作完毕,有'.$fail.'个账号未开启OTP双重验证');
+        }
+        msg(1,'操作成功');
+        break;
     //设用户组
     case "set_UserGroup":
         if(empty($_POST['UserGroup'])){

system/index.php

@@ -129,7 +129,6 @@ function get_links($fid) {
     $where['ORDER']['lid'] = 'ASC';
     if(!is_login){
         $where['property'] = 0;
-
     }
     //书签分享>私有可见
     if(isset($share['pv']) && $share['pv'] == 1){

system/public.php

@@ -713,10 +713,10 @@ function send_email($config){
         $mail->SMTPSecure = $config['secure'];
         $mail->Port = intval($config['port']);
         
-        if(preg_match('/(.+)<(.+)>/', $config['sender'], $match)){
+        if(preg_match('/(.+)<(.+@.+)>$/', $config['sender'], $match)){
             $mail->setFrom($match[2],$match[1]);
         }else{
-            $mail->setFrom($config['sender']);
+            $mail->setFrom($config['user'],empty($config['sender'])?'TwoNav':$config['sender']);
         }
         
         $mail->addAddress($config['addressee']); //收件人

system/version.txt

@@ -1 +1 @@
-v2.0.34-20230809
+v2.0.35-20230816