From 3e8d313163d95cf18750933495e4599171028704 Mon Sep 17 00:00:00 2001
From: tianya <yanghuxiao@vip.qq.com>
Date: Thu, 31 Aug 2023 07:47:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=80=89=E6=8B=A9=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/dialog/select_media.php | 1 +
 src/admin/dialog/select_soft.php  | 2 ++
 src/admin/js/main.js              | 6 +++---
 src/install/update.txt            | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/admin/dialog/select_media.php b/src/admin/dialog/select_media.php
index 5d6614bb..2489c61f 100644
--- a/src/admin/dialog/select_media.php
+++ b/src/admin/dialog/select_media.php
@@ -57,6 +57,7 @@ if (!empty($noeditor)) {
                     <td colspan="3">
                         <form name="myform" action="select_media_post.php" method="POST" enctype="multipart/form-data">
                             <input type="hidden" name="activepath" value="<?php echo $activepath ?>">
+                            <?php $noeditor = !empty($noeditor) ? "<input type='hidden' name='noeditor' value='yes'>" : ''; echo $noeditor;?>
                             <input type="hidden" name="f" value="<?php echo $f ?>">
                             <input type="hidden" name="job" value="upload">
                             <input type="hidden" name="CKEditorFuncNum" value="<?php echo isset($CKEditorFuncNum) ? $CKEditorFuncNum : 1;?>">
diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php
index d158de4d..935d4da8 100644
--- a/src/admin/dialog/select_soft.php
+++ b/src/admin/dialog/select_soft.php
@@ -12,6 +12,7 @@ require_once(dirname(__FILE__)."/config.php");
 if (empty($activepath)) {
     $activepath = '';
 }
+$noeditor = isset($noeditor) ? $noeditor : '';
 $activepath = str_replace('.', '', $activepath);
 $activepath = preg_replace("#\/{1,}#", '/', $activepath);
 if (strlen($activepath) < strlen($cfg_soft_dir)) {
@@ -56,6 +57,7 @@ if (!empty($noeditor)) {
                     <td colspan="3">
                         <form name="myform"  action="select_soft_post.php" method="POST" enctype="multipart/form-data">
                             <input type="hidden" name="activepath" value="<?php echo $activepath ?>">
+                            <?php $noeditor = !empty($noeditor) ? "<input type='hidden' name='noeditor' value='yes'>" : ''; echo $noeditor;?>
                             <input type="hidden" name="f" value="<?php echo $f ?>">
                             <input type="hidden" name="job" value="upload">
                             <input type="file" name="uploadfile" class="w-50">
diff --git a/src/admin/js/main.js b/src/admin/js/main.js
index 440219c1..457a31bf 100644
--- a/src/admin/js/main.js
+++ b/src/admin/js/main.js
@@ -53,15 +53,15 @@ function SeePicNew(f, imgdid, frname, hpos, acname) {
 }
 function SelectFlash() {
 	var pos = GetWinPos(800,600);
-	window.open("./dialog/select_media.php?f=form1.flashurl", "popUpFlashWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top);
+	window.open("./dialog/select_media.php?f=form1.flashurl&noeditor=yes", "popUpFlashWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top);
 }
 function SelectMedia(fname) {
 	var pos = GetWinPos(800,600);
-	window.open("./dialog/select_media.php?f=" + fname, "popUpFlashWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top);
+	window.open("./dialog/select_media.php?f=" + fname + "&noeditor=yes", "popUpFlashWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top);
 }
 function SelectSoft(fname) {
 	var pos = GetWinPos(800,600);
-	window.open("./dialog/select_soft.php?f=" + fname, "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top);
+	window.open("./dialog/select_soft.php?f=" + fname+ "&noeditor=yes", "popUpImagesWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top);
 }
 function SelectImage(fname, stype, imgsel="") {
 	var pos = GetWinPos(800,600);
diff --git a/src/install/update.txt b/src/install/update.txt
index beb011c3..18e36a0f 100644
--- a/src/install/update.txt
+++ b/src/install/update.txt
@@ -143,4 +143,4 @@ CREATE TABLE `#@__search_sync`  (
   `add_at` int NULL DEFAULT NULL,
   `update_at` int NULL DEFAULT NULL,
   PRIMARY KEY (`id`)
-) TYPE = MyISAM;
\ No newline at end of file
+) TYPE=MyISAM;
\ No newline at end of file