From 35484a060f05d1971c102d7502a64fa9e5947b96 Mon Sep 17 00:00:00 2001
From: tianya <tianya@benshar.com>
Date: Sun, 20 Mar 2022 15:28:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=AD=90=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E9=97=AE=E9=A2=98=EF=BC=8C=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?fck=E7=BC=96=E8=BE=91=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/templets/index.htm        |  2 +-
 src/install/templates/step-1.html   |  2 +-
 src/system/inc/inc_fun_funAdmin.php | 20 +-------------------
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/src/admin/templets/index.htm b/src/admin/templets/index.htm
index 73699c22..88ff44b2 100644
--- a/src/admin/templets/index.htm
+++ b/src/admin/templets/index.htm
@@ -40,7 +40,7 @@
             <div class="top_link">
                 <ul>
                     <li class="welcome">
-                        <a target="main" href="sys_admin_user_edit.php?id=<?php echo $cuserLogin->getUserID(); ?>&dopost=edit"><img src="/static/img/avatar.png" title="<?php echo $cuserLogin->getUserName(); ?>"><?php echo $cuserLogin->getUserName(); ?></a>
+                        <a target="main" href="sys_admin_user_edit.php?id=<?php echo $cuserLogin->getUserID(); ?>&dopost=edit"><img src="../static/img/avatar.png" title="<?php echo $cuserLogin->getUserName(); ?>"><?php echo $cuserLogin->getUserName(); ?></a>
                         <a href="exit.php">退出</a>
                     </li>
                     <?php
diff --git a/src/install/templates/step-1.html b/src/install/templates/step-1.html
index 5db3a499..492faed0 100755
--- a/src/install/templates/step-1.html
+++ b/src/install/templates/step-1.html
@@ -97,7 +97,7 @@
 					</div>
 					<div class="mb-3">
 						<label for="cmspath" class="form-label">安装目录</label>
-						<input name="cmspath" type="text" class="form-control" id="cmspath" placeholder="<?php echo $basepath; ?>">
+						<input name="cmspath" type="text" class="form-control" id="cmspath" value="<?php echo $basepath; ?>" placeholder="<?php echo $basepath; ?>">
 						<div class="form-text text-danger">在根目录安装时不必理会</div>
 					</div>
 					<button type="submit" class="btn btn-success">立即安装</button>
diff --git a/src/system/inc/inc_fun_funAdmin.php b/src/system/inc/inc_fun_funAdmin.php
index 45afe688..1ef98bc8 100755
--- a/src/system/inc/inc_fun_funAdmin.php
+++ b/src/system/inc/inc_fun_funAdmin.php
@@ -146,25 +146,7 @@ function SpGetEditor($fname, $fvalue, $nheight = "350", $etype = "Basic", $gtype
     if ($gtype == "") {
         $gtype = "print";
     }
-    if ($GLOBALS['cfg_html_editor'] == 'fck') {
-        require_once(DEDEINC.'/FCKeditor/fckeditor.php');
-        $fck = new FCKeditor($fname);
-        $fck->BasePath        = $GLOBALS['cfg_cmspath'].'/include/FCKeditor/';
-        $fck->Width        = '100%';
-        $fck->Height        = $nheight;
-        $fck->ToolbarSet    = $etype;
-        $fck->Config['FullPage'] = $isfullpage;
-        if ($GLOBALS['cfg_fck_xhtml'] == 'Y') {
-            $fck->Config['EnableXHTML'] = 'true';
-            $fck->Config['EnableSourceXHTML'] = 'true';
-        }
-        $fck->Value = $fvalue;
-        if ($gtype == "print") {
-            $fck->Create();
-        } else {
-            return $fck->CreateHtml();
-        }
-    } else if ($GLOBALS['cfg_html_editor'] == 'ckeditor') {
+    if ($GLOBALS['cfg_html_editor'] == 'ckeditor') {
         $addConfig = "";
         if (defined("DEDEADMIN")) {
             $addConfig = ",{allowedContent:true,filebrowserImageUploadUrl:'./dialog/select_images_post.php',filebrowserUploadUrl:'./dialog/select_media_post.php?ck=1',extraPlugins:'html5video,dedepagebreak,ddfilebrowser,mimage,textindent'}";