diff --git a/src/admin/article_description_main.php b/src/admin/article_description_main.php
index c544a127..b9791b00 100644
--- a/src/admin/article_description_main.php
+++ b/src/admin/article_description_main.php
@@ -79,7 +79,7 @@ if ($dojob == '') {
exit();
}
$dvlen = $tjlen * 1;
- $tjsta = "
";
+ $tjsta = "";
$tjsta .= "完成更新文档总数$tjlen%";
$nurl = "article_description_main.php?totalnum=$totalnum&startdd={$startdd}&pagesize=$pagesize&table={$table}&field={$field}&dsize={$dsize}&msize={$msize}&channel={$channel}&dojob={$dojob}";
ShowMsg($tjsta, $nurl);
diff --git a/src/admin/dialog/select_images_post.php b/src/admin/dialog/select_images_post.php
index b7e5bb14..21e2ea49 100644
--- a/src/admin/dialog/select_images_post.php
+++ b/src/admin/dialog/select_images_post.php
@@ -86,7 +86,11 @@ $fid = $dsql->GetLastID();
AddMyAddon($fid, $activepath.'/'.$filename);
$CKUpload = isset($CKUpload) ? $CKUpload : FALSE;
if ($GLOBALS['cfg_html_editor'] == 'ckeditor' && $CKUpload) {
- $fileurl = $activepath.'/'.$filename;
+ if ($GLOBALS['cfg_multi_site'] == 'Y') {
+ $fileurl = $GLOBALS['cfg_mainsite'].$activepath.'/'.$filename;
+ } else {
+ $fileurl = $activepath.'/'.$filename;
+ }
$result = array('url' => $fileurl, "uploaded" => 1, 'fileName' => $filename);
echo json_encode($result);
exit;
diff --git a/src/admin/makehtml_taglist.php b/src/admin/makehtml_taglist.php
index ce57a7a9..e30ef3bc 100644
--- a/src/admin/makehtml_taglist.php
+++ b/src/admin/makehtml_taglist.php
@@ -18,7 +18,7 @@ if ($action == "search") {
$dsql->Execute('al',$sql);
$result = array();
while($row=$dsql->GetObject('al')){
- $row->text= $row->tag;
+ $row->text= $row->tag;
$result[] = $row;
}
$result = array(
diff --git a/src/admin/statistics_list.php b/src/admin/statistics_list.php
index c8d6714d..be0878c2 100644
--- a/src/admin/statistics_list.php
+++ b/src/admin/statistics_list.php
@@ -47,7 +47,7 @@ if (isset($dopost) && $dopost == "delete") {
if ($dquery != "") $dquery = " WHERE ".$dquery;
$dsql->ExecuteNoneQuery("DELETE FROM `#@__statistics_detail` $dquery");
ShowMsg("成功删除指定的记录", "statistics_list.php");
- exit();
+ exit();
} else {
$addsql = " WHERE ip LIKE '%$ip%' ";
if ($url_type === -1) {
diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm
index 0f390e00..6ef15a20 100644
--- a/src/admin/templets/article_add.htm
+++ b/src/admin/templets/article_add.htm
@@ -288,10 +288,10 @@
const chars = event.data.split('');
chars.forEach(char => {
if (lastChar === '\\' && char === 'r') {
- char = '
'; //替换为br标签
- lastChar = ""; //清空追踪字符
+ char = '
'; //替换为br标签
+ lastChar = ""; //清空追踪字符
} else {
- lastChar = char; //记录当前字符
+ lastChar = char; //记录当前字符
}
if (char === '\\') {
return; //如果是反斜杠,跳过处理
diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm
index 7f3cea99..54a76190 100644
--- a/src/admin/templets/article_edit.htm
+++ b/src/admin/templets/article_edit.htm
@@ -292,10 +292,10 @@
const chars = event.data.split('');
chars.forEach(char => {
if (lastChar === '\\' && char === 'r') {
- char = '
'; //替换为br标签
- lastChar = ""; //清空追踪字符
+ char = '
'; //替换为br标签
+ lastChar = ""; //清空追踪字符
} else {
- lastChar = char; //记录当前字符
+ lastChar = char; //记录当前字符
}
if (char === '\\') {
return; //如果是反斜杠,跳过处理
diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm
index 056865b1..221007f5 100644
--- a/src/admin/templets/catalog_add.htm
+++ b/src/admin/templets/catalog_add.htm
@@ -434,10 +434,10 @@
const chars = event.data.split('');
chars.forEach(char => {
if (lastChar === '\\' && char === 'r') {
- char = '
'; //替换为br标签
- lastChar = ""; //清空追踪字符
+ char = '
'; //替换为br标签
+ lastChar = ""; //清空追踪字符
} else {
- lastChar = char; //记录当前字符
+ lastChar = char; //记录当前字符
}
if (char === '\\') {
return; //如果是反斜杠,跳过处理
diff --git a/src/admin/templets/catalog_add_quick.htm b/src/admin/templets/catalog_add_quick.htm
index d928e161..64445314 100644
--- a/src/admin/templets/catalog_add_quick.htm
+++ b/src/admin/templets/catalog_add_quick.htm
@@ -308,10 +308,10 @@
const chars = event.data.split('');
chars.forEach(char => {
if (lastChar === '\\' && char === 'r') {
- char = '
'; //替换为br标签
- lastChar = ""; //清空追踪字符
+ char = '
'; //替换为br标签
+ lastChar = ""; //清空追踪字符
} else {
- lastChar = char; //记录当前字符
+ lastChar = char; //记录当前字符
}
if (char === '\\') {
return; //如果是反斜杠,跳过处理
diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm
index 8d4908a2..149ce7d5 100644
--- a/src/admin/templets/catalog_edit.htm
+++ b/src/admin/templets/catalog_edit.htm
@@ -465,10 +465,10 @@
const chars = event.data.split('');
chars.forEach(char => {
if (lastChar === '\\' && char === 'r') {
- char = '
'; //替换为br标签
- lastChar = ""; //清空追踪字符
+ char = '
'; //替换为br标签
+ lastChar = ""; //清空追踪字符
} else {
- lastChar = char; //记录当前字符
+ lastChar = char; //记录当前字符
}
if (char === '\\') {
return; //如果是反斜杠,跳过处理
diff --git a/src/admin/vote_edit.php b/src/admin/vote_edit.php
index 5493dcf4..91dc7a73 100644
--- a/src/admin/vote_edit.php
+++ b/src/admin/vote_edit.php
@@ -33,7 +33,7 @@ if ($dopost == "delete") {
$vt = new DedeVote($aid);
$vote_file = DEDEDATA."/vote/vote_".$aid.".js";
$vote_content = $vt->GetVoteForm();
- $vote_content = preg_replace(array("#/#", "#([\r\n])[\s]+#"), array("\/", " "), $vote_content); //取出文档中的空白字符并进行转义
+ $vote_content = preg_replace(array("#/#", "#([\r\n])[\s]+#"), array("\/", " "), $vote_content); //取出文档中的空白字符并进行转义
$vote_content = 'document.write("'.$vote_content.'");';
file_put_contents($vote_file, $vote_content);
ShowMsg('成功修改一组投票', $ENV_GOBACK_URL);
diff --git a/src/system/common.func.php b/src/system/common.func.php
index 314c349d..5476ae3d 100755
--- a/src/system/common.func.php
+++ b/src/system/common.func.php
@@ -440,7 +440,7 @@ function HideEmail($email)
$em = explode("@",$email);
$name = implode('@', array_slice($em, 0, count($em)-1));
$len = floor(strlen($name)/2);
- return substr($name,0, $len).str_repeat('*', $len)."@".end($em);
+ return substr($name,0, $len).str_repeat('*', $len)."@".end($em);
}
//用来返回index的active
function IndexActive($idx)
diff --git a/src/system/taglib/channelartlist.lib.php b/src/system/taglib/channelartlist.lib.php
index defb1708..0ce3ff4e 100755
--- a/src/system/taglib/channelartlist.lib.php
+++ b/src/system/taglib/channelartlist.lib.php
@@ -34,7 +34,7 @@ function lib_channelartlist(&$ctag, &$refObj)
$typeids = array();
$order = " ORDER BY sortrank ASC ";
if ($type == 'reid') {
- $reid = $refObj->TypeLink->TypeInfos['reid'];
+ $reid = $refObj->TypeLink->TypeInfos['reid'];
$tpsql = " reid='$reid' AND ispart<>2 AND ishidden<>1 ";
} else if ($typeid == 0 || $typeid == 'top') {
$tpsql = " reid=0 AND ispart<>2 AND ishidden<>1 AND channeltype>0 ";
diff --git a/src/system/taglib/comment.lib.php b/src/system/taglib/comment.lib.php
index ba20b7b2..b7c2ce95 100644
--- a/src/system/taglib/comment.lib.php
+++ b/src/system/taglib/comment.lib.php
@@ -12,6 +12,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
//只是用于进行注释
function lib_comment(&$ctag, &$refObj)
{
- return "";
+ return "";
}
?>
\ No newline at end of file