From d4d9d05568b7e570471371a87b830c708f9f903d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?=
 <93301500+xushubieli@users.noreply.github.com>
Date: Wed, 7 Jun 2023 19:19:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/content_list.php             |  4 +-
 src/admin/dialog/select_mimages.php    | 66 ++++++++++++++------------
 src/admin/media_main.php               |  4 +-
 src/admin/member_main.php              |  2 +-
 src/admin/templets/freelist_add.htm    |  4 +-
 src/admin/templets/freelist_edit.htm   |  4 +-
 src/admin/templets/member_edit.htm     |  2 +-
 src/admin/templets/mytag_tag_guide.htm |  2 +-
 8 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/src/admin/content_list.php b/src/admin/content_list.php
index a28babb7..52d44b92 100644
--- a/src/admin/content_list.php
+++ b/src/admin/content_list.php
@@ -59,7 +59,7 @@ if (empty($totalresult) && empty($keyword) && empty($orderby) && empty($flag)) {
     if (!empty($channelid) && empty($cid)) {
         $tinyQuerys[] = " channel = '$channelid' ";
     } else {
-        $tinyQuerys[] = " channel>0 ";
+        $tinyQuerys[] = " channel > 0 ";
     }
     if (!empty($arcrank)) {
         $tinyQuerys[] = " arcrank='$arcrank' ";
@@ -86,7 +86,7 @@ if (empty($totalresult) && empty($keyword) && empty($orderby) && empty($flag)) {
 }
 if ($cid == 0) {
     if ($channelid == 0) {
-        $positionname = '所有栏目&gt;';
+        $positionname = '所有栏目 - ';
     } else {
         $row = $tl->dsql->GetOne("SELECT id,typename,maintable FROM `#@__channeltype` WHERE id='$channelid'");
         $positionname = $row['typename']." - ";
diff --git a/src/admin/dialog/select_mimages.php b/src/admin/dialog/select_mimages.php
index dfe252cf..703be481 100644
--- a/src/admin/dialog/select_mimages.php
+++ b/src/admin/dialog/select_mimages.php
@@ -26,11 +26,13 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
     	<ul id="file_list"></ul>
     </div>
     <script>
-    	var axupimgs={};
+    	var axupimgs = {};
     	axupimgs.res = [];//存放本地文件的数组
     	var blobInfo = {file:null}
-    	blobInfo.blob = function(){return this.file;}
-    	var upload_handler = async(blobInfo, succFun, failFun)=>{
+    	blobInfo.blob = function() {
+            return this.file;
+        }
+    	var upload_handler = async(blobInfo, succFun, failFun) => {
             var file = blobInfo.blob();
             formData = new FormData();
             formData.append('upload', file, file.name);
@@ -53,8 +55,8 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
         };
     	var upload_base_path = axupimgs.images_upload_base_path;
     	//为列表添加排序
-    	function reSort(){
-            document.querySelectorAll('#file_list li').forEach((el,i)=>{
+    	function reSort() {
+            document.querySelectorAll('#file_list li').forEach((el,i) => {
                 el.setAttribute('data-num',i);
             });
     	}
@@ -82,24 +84,24 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
             //reSort();
         }
         //清空列表
-        document.querySelector('#topbar .removeall').addEventListener('click',()=>{
+        document.querySelector('#topbar .removeall').addEventListener('click',() => {
             axupimgs.res=[]
-            document.querySelectorAll('#file_list li').forEach((el,i)=>{
+            document.querySelectorAll('#file_list li').forEach((el,i) => {
                 el.parentNode.removeChild(el)
             });
         });
         //拖拽添加
-        document.addEventListener('dragover', (e)=>{
+        document.addEventListener('dragover', (e) => {
             e.stopPropagation();
             e.preventDefault();
             e.dataTransfer.dropEffect = 'copy';
         });
-        document.addEventListener('drop', (e)=>{
+        document.addEventListener('drop', (e) => {
             e.stopPropagation();
             e.preventDefault();
             if (!e.dataTransfer.files){return false;}
             var dropfiles = e.dataTransfer.files;
-            if (!(dropfiles.length>0)){return false;}
+            if (!(dropfiles.length > 0)){return false;}
             var exts='.png,.gif,.jpg,.jpeg'.replace(/(\s)+/g,'').toLowerCase().split(',');
             var files=[];
             for ( let file of dropfiles ) {
@@ -112,10 +114,12 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
                     }
                 }
             }
-            if (files.length>0){ addList(files) }
+            if (files.length > 0) {
+                addList(files)
+            }
         });
         //添加文件
-        document.querySelector('#topbar .addfile').addEventListener('click',()=>{
+        document.querySelector('#topbar .addfile').addEventListener('click',() => {
             var input = document.createElement('input');
             input.setAttribute('type', 'file');
             input.setAttribute('multiple', 'multiple');
@@ -127,31 +131,31 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
             }
         });
     	var file_i = 0;
-    	function upAllFiles(n){
+    	function upAllFiles(n) {
     		var len = axupimgs.res.length;
     		file_i = n;
-    		if (len == n){
+    		if (len == n) {
     			file_i=0;
                 document.querySelector('#topbar .upall').innerText='全部上传';
                 //返回
-                axupimgs.res.forEach((v,k)=>{
-                    let addonHTML = `<img src='${v.url}'/>`;
+                axupimgs.res.forEach((v,k) => {
+                    let addonHTML = `<img src='${v.url}'>`;
                     window.opener.CKEDITOR.instances["<?php echo $f ?>"].insertHtml(addonHTML);
                 })
                 window.close();
     			return true;
     		}
-    		if ( axupimgs.res[n].url!='' ){
+    		if (axupimgs.res[n].url!='') {
     			n++;
     			upAllFiles(n)
     		} else {
     			blobInfo.file=axupimgs.res[n].file;
                 blobInfo.isWater = document.querySelector('#isWater').checked;
-    			upload_handler(blobInfo,function(url){
-    				if (upload_base_path){
+    			upload_handler(blobInfo,function(url) {
+    				if (upload_base_path) {
     					if (upload_base_path.slice(-1)=='/' && url.substr(0,1)=='/' ){
     						url = upload_base_path + url.slice(1);
-    					}else if (upload_base_path.slice(-1)!='/' && url.substr(0,1)!='/' ){
+    					} else if (upload_base_path.slice(-1)!='/' && url.substr(0,1)!='/' ){
     						url = upload_base_path + '/' + url;
     					} else {
     						url = upload_base_path + url;
@@ -164,29 +168,31 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
     				li.querySelector('.namebox span').innerText = filename;
     				n++
     				upAllFiles(n);
-    			},function(err){
+    			},function(err) {
                     document.querySelector('#topbar .upall').innerText='全部上传';
-                    document.querySelectorAll('#file_list li.up-now').forEach((el,i)=>{
+                    document.querySelectorAll('#file_list li.up-now').forEach((el,i) => {
                         el.setAttribute('class','up-no');
                     });
                     alert(err);
                 });
     		}	
     	}
-        document.querySelector('#topbar .upall').addEventListener('click',(e)=>{
-            if (e.target.innerText!='全部上传'){return false;}
-            if (axupimgs.res.length>0){
-                document.querySelectorAll('#file_list li.up-no').forEach((el,i)=>{
+        document.querySelector('#topbar .upall').addEventListener('click',(e) => {
+            if (e.target.innerText!='全部上传') {
+                return false;
+            }
+            if (axupimgs.res.length > 0) {
+                document.querySelectorAll('#file_list li.up-no').forEach((el,i) => {
                     el.classList ? el.classList.add('up-now') : el.className+=' up-now';
                 });
                 e.target.innerText='上传中';
                 upAllFiles(0);
             }
         });
-        var observ_flist = new MutationObserver( (muList,observe)=>{
-            if (muList[0].addedNodes.length>0){
-                muList[0].addedNodes.forEach((el)=>{
-                    el.querySelector('.remove').addEventListener('click',(e)=>{
+        var observ_flist = new MutationObserver( (muList,observe) => {
+            if (muList[0].addedNodes.length > 0) {
+                muList[0].addedNodes.forEach((el) => {
+                    el.querySelector('.remove').addEventListener('click',(e) => {
                         var li = e.target.parentNode.parentNode;
                         var n = li.getAttribute('data-num');
                         var el = document.querySelectorAll('#file_list li')[n];
diff --git a/src/admin/media_main.php b/src/admin/media_main.php
index bf65b6f0..c957a0eb 100644
--- a/src/admin/media_main.php
+++ b/src/admin/media_main.php
@@ -29,9 +29,9 @@ if (empty($membertype)) {
     $membertype = 0;
 }
 if ($membertype == 1) {
-    $addsql .= " AND u.mid>0 ";
+    $addsql .= " AND u.mid > 0 ";
 } else if ($membertype == 2) {
-    $addsql .= " AND u.mid>0 ";
+    $addsql .= " AND u.mid > 0 ";
 }
 
 if (empty($mediatype)) {
diff --git a/src/admin/member_main.php b/src/admin/member_main.php
index fb44bf3b..6143fd78 100644
--- a/src/admin/member_main.php
+++ b/src/admin/member_main.php
@@ -24,7 +24,7 @@ $sortkey = empty($sortkey) ? 'mid' : preg_replace("#[^a-z]#i", '', $sortkey);
 $staArr = array(-2 => '限制禁言会员', -1 => '未通过审核', 0 => '审核通过需要填写信息', 1 => '待补充完善信息', 2 => '正常使用');
 $staArrmatt = array(1 => '被推荐', 0 => '非普通 ');
 $MemberTypes = array();
-$dsql->SetQuery("SELECT `rank`,membername From `#@__arcrank` where `rank`>0 ");
+$dsql->SetQuery("SELECT `rank`,membername FROM `#@__arcrank` WHERE `rank` > 0 ");
 $dsql->Execute();
 while ($row = $dsql->GetObject()) {
     $MemberTypes[$row->rank] = $row->membername;
diff --git a/src/admin/templets/freelist_add.htm b/src/admin/templets/freelist_add.htm
index dc1f2566..77483f40 100644
--- a/src/admin/templets/freelist_add.htm
+++ b/src/admin/templets/freelist_add.htm
@@ -97,7 +97,7 @@
 						<?php
 						echo "<select name='typeid' class='admin-input-sm'>";
 						echo "<option value='0'>不限栏目</option>";
-						$dsql->SetQuery("Select ID,typename, channeltype From `#@__arctype`");
+						$dsql->SetQuery("SELECT id,typename, channeltype FROM `#@__arctype`");
 						$dsql->Execute();
 						while($lrow = $dsql->GetObject()){
 							$disable = '';
@@ -112,7 +112,7 @@
 						<?php
 						echo "<select name='channel' class='admin-input-sm'>";
 						echo "<option value='0' selected>不限模型</option>";
-						$dsql->SetQuery("Select ID,typename From `#@__channeltype` where ID>0");
+						$dsql->SetQuery("SELECT id,typename FROM `#@__channeltype` WHERE id > 0");
 							$dsql->Execute();
 							while($row = $dsql->GetObject())
 							{
diff --git a/src/admin/templets/freelist_edit.htm b/src/admin/templets/freelist_edit.htm
index 8b81c2eb..c417e8f1 100644
--- a/src/admin/templets/freelist_edit.htm
+++ b/src/admin/templets/freelist_edit.htm
@@ -76,7 +76,7 @@
 						$typeid = $ctag->GetAtt('typeid');
 						echo "<select name='typeid' class='admin-input-sm'>";
 						echo "<option value='0'>不限栏目</option>";
-						$dsql->SetQuery("Select id,typename, channeltype From `#@__arctype`");
+						$dsql->SetQuery("SELECT id,typename, channeltype FROM `#@__arctype`");
 						$dsql->Execute();
 						while($lrow = $dsql->GetObject()){
 							$disable = '';
@@ -93,7 +93,7 @@
 						<?php
 						$channel  = $ctag->GetAtt('channel');
 						echo "<select name='channel' class='admin-input-sm'><option value='0'>不限模型</option>";
-						$dsql->SetQuery("Select id,typename From `#@__channeltype` where id>0");
+						$dsql->SetQuery("SELECT id,typename FROM `#@__channeltype` WHERE id > 0");
 						$dsql->Execute();
 						while($nrow = $dsql->GetObject())
 						{
diff --git a/src/admin/templets/member_edit.htm b/src/admin/templets/member_edit.htm
index 28b34f43..2842e51a 100644
--- a/src/admin/templets/member_edit.htm
+++ b/src/admin/templets/member_edit.htm
@@ -64,7 +64,7 @@
 					<td>
 						<?php
 						$MemberTypes = array();
-						$dsql->SetQuery("SELECT `rank`,membername From `#@__arcrank` where `rank`>0 ORDER BY `rank` ASC");
+						$dsql->SetQuery("SELECT `rank`,membername FROM `#@__arcrank` WHERE `rank` > 0 ORDER BY `rank` ASC");
 						$dsql->Execute('n');
 						$MemberTypes[0] = "限制会员";
 						while($nrow = $dsql->GetObject('n')){
diff --git a/src/admin/templets/mytag_tag_guide.htm b/src/admin/templets/mytag_tag_guide.htm
index 45d1039a..3036ccf0 100644
--- a/src/admin/templets/mytag_tag_guide.htm
+++ b/src/admin/templets/mytag_tag_guide.htm
@@ -62,7 +62,7 @@
 						<?php
 						echo "<select name='channel' class='admin-input-sm'>";
 						echo "<option value='0' selected>不限模型</option>";
-						$tl->dsql->SetQuery("Select id,typename From `#@__channeltype` where id>0");
+						$tl->dsql->SetQuery("SELECT id,typename FROM `#@__channeltype` WHRER id > 0");
 						$tl->dsql->Execute();
 						while($row = $tl->dsql->GetObject())
 						{