Browse Source

修正子目录安装问题,移除fck编辑器

tags/6.1.1^2
tianya 2 years ago
parent
commit
35484a060f
3 changed files with 3 additions and 21 deletions
  1. +1
    -1
      src/admin/templets/index.htm
  2. +1
    -1
      src/install/templates/step-1.html
  3. +1
    -19
      src/system/inc/inc_fun_funAdmin.php

+ 1
- 1
src/admin/templets/index.htm View File

@@ -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


+ 1
- 1
src/install/templates/step-1.html View File

@@ -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>


+ 1
- 19
src/system/inc/inc_fun_funAdmin.php View File

@@ -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'}";


Loading…
Cancel
Save