优化文件检测

application/admin/controller/Safety.php

@@ -38,6 +38,10 @@ class Safety extends Base
     {
         $param = input();
         if($param['ck']){
+            $ft = $param['ft'];
+            if(empty($ft)){
+                $ft = ['1','2'];
+            }
             mac_echo('<style type="text/css">body{font-size:12px;color: #333333;line-height:21px;}span{font-weight:bold;color:#FF0000}</style>');
             $url = base64_decode("aHR0cDovL3VwZGF0ZS5tYWNjbXMubGEv") . "v10/mac_files_".config('version')['code'].'.html';
             $html = mac_curl_get($url);
@@ -54,11 +58,11 @@ class Safety extends Base
             foreach($this->_files as $k=>$v){
                 $color = '';
                 $msg = 'ok';
-                if(empty($json[$k])){
+                if(empty($json[$k]) && in_array('1',$ft)){
                     $color = 'BlueViolet';
                     $msg = lang('admin/safety/file_msg3');
                 }
-                elseif($v['md5'] != $json[$k]['md5']){
+                elseif(!empty($json[$k]) && $v['md5'] != $json[$k]['md5'] && in_array('2',$ft)){
                     $color = 'red';
                     $msg = lang('admin/safety/file_msg4');
                 }

application/admin/view/safety/file.html

@@ -19,6 +19,8 @@
         </div>
         <div class="layui-form-item center">
             <div class="layui-input-block">
+                <input type="checkbox" lay-skin="primary" name="ft[]" value="1" title="{:lang('admin/safety/file_msg3')}" checked>
+                <input type="checkbox" lay-skin="primary" name="ft[]" value="2" title="{:lang('admin/safety/file_msg4')}" checked>
                 <button type="submit" class="layui-btn" >{:lang('admin/safety/exec')}</button>
             </div>
         </div>

application/extra/version.php

@@ -3,7 +3,7 @@ return array (
     'name' => '苹果CMS内容管理系统',
     'copyright' => 'MacCMS',
     'url' => '//github.com/magicblack',
-    'code' => '2022.1000.3009',
+    'code' => '2022.1000.3010',
     'license' => '开源版',
 );
 ?>

application/lang/zh-cn.php

@@ -1731,7 +1731,7 @@ https://www.baidu.com/123.jpg
     'admin/safety/file_msg1'=>'获取官方文件数据失败，请重试',
     'admin/safety/file_msg2'=>'获取本地文件列表失败，请重试',
     'admin/safety/file_msg3'=>'新增文件',
-    'admin/safety/file_msg4'=>'与原版有差异',
+    'admin/safety/file_msg4'=>'差异文件',
 
     'admin/link/title'=>'友情链接管理',
     'admin/link/text_link'=>'文字链接',

application/lang/zh-tw.php

@@ -1731,7 +1731,7 @@ https://www.baidu.com/123.jpg
     'admin/safety/file_msg1'=>'獲取官方文件數據失敗，請重試',
     'admin/safety/file_msg2'=>'獲取本地文件列表失敗，請重試',
     'admin/safety/file_msg3'=>'新增文件',
-    'admin/safety/file_msg4'=>'與原版有差異',
+    'admin/safety/file_msg4'=>'差異文件',
 
     'admin/link/title'=>'友情鏈接管理',
     'admin/link/text_link'=>'文字鏈接',