root 2 years ago
parent
commit
076e4306be
2 changed files with 14 additions and 3 deletions
  1. 5 0
      src/Auth.php
  2. 9 3
      src/Database.php

+ 5 - 0
src/Auth.php

@@ -204,7 +204,12 @@ class Auth
         Dever::config('base')->getAdmin = 1;
         if ($state == true && Dever::config('base')->getAdmin && $info && isset($info['id'])) {
             $admin = Dever::db('manage/admin')->one($info['id']);
+            if (!$admin) {
+                $this->save->un($this->name);
+                echo '管理账户已被封禁';die;
+            }
             if ($admin['status'] != 1) {
+                $this->save->un($this->name);
                 echo '管理账户已被封禁';die;
             }
             if ($admin['auth']) {

+ 9 - 3
src/Database.php

@@ -3850,16 +3850,20 @@ class Database
                                     if (isset($v['name'])) {
                                         $v = $v['name'];
                                     }
-                                    $param['value'][$v][$key] = $k;
+                                    $param['value'][$v]['main_' . $key] = $k;
                                 }
                             } else {
                                 foreach ($param['option'] as $k => $v) {
                                     if (isset($v['name'])) {
                                         $v = $v['name'];
                                     }
-                                    foreach ($value[$k-1] as $k1 => $v1) {
+                                    foreach ($value[$k] as $k1 => $v1) {
                                         $param['value'][$v][$k1] = $v1;
                                     }
+                                    /*
+                                    foreach ($value[$k-1] as $k1 => $v1) {
+                                        $param['value'][$v][$k1] = $v1;
+                                    }*/
                                 }
                             }
                             
@@ -3870,7 +3874,7 @@ class Database
                                 if (isset($v['name'])) {
                                     $v = $v['name'];
                                 }
-                                $param['value'][$v][$key] = $k;
+                                $param['value'][$v]['main_' . $key] = $k;
                             }
                         }
 
@@ -3901,6 +3905,8 @@ class Database
                             $param['value'] = Dever::array_decode($param['value']);
                         }
 
+                        //print_r($param['value']);die;
+
                         if (is_array($param['value'])) {
                             $i = 0;
                             foreach ($param['value'] as $k => $v) {