Browse Source

修复

tags/6.3.2
叙述、别离 10 months ago
parent
commit
368c25caf6
38 changed files with 749 additions and 743 deletions
  1. +1
    -1
      src/admin/catalog_add.php
  2. +1
    -1
      src/admin/dialog/select_soft.php
  3. +1
    -1
      src/admin/file_manage_main.php
  4. +1
    -1
      src/admin/friendlink_edit.php
  5. +1
    -1
      src/admin/inc/inc_archives_all.php
  6. +2
    -2
      src/admin/makehtml_taglist_action.php
  7. +2
    -1
      src/admin/module_main.php
  8. +1
    -1
      src/admin/mychannel_edit.php
  9. +1
    -1
      src/admin/templets/makehtml_spec.htm
  10. +2
    -2
      src/admin/templets_one_edit.php
  11. +1
    -1
      src/apps/diy.php
  12. +1
    -1
      src/apps/feedback.php
  13. +4
    -4
      src/system/archive/archives.class.php
  14. +3
    -3
      src/system/archive/freelist.class.php
  15. +4
    -3
      src/system/archive/listview.class.php
  16. +1
    -1
      src/system/archive/searchview.class.php
  17. +2
    -2
      src/system/archive/sglistview.class.php
  18. +1
    -1
      src/system/archive/sgpage.class.php
  19. +1
    -1
      src/system/archive/specview.class.php
  20. +7
    -7
      src/system/archive/taglist.class.php
  21. +9
    -9
      src/system/common.inc.php
  22. +10
    -8
      src/system/customfields.func.php
  23. +2
    -2
      src/system/extend.func.php
  24. +670
    -670
      src/system/helpers/channelunit.helper.php
  25. +1
    -1
      src/system/libraries/statistics.class.php
  26. +1
    -1
      src/system/taglib/arclist.lib.php
  27. +1
    -1
      src/system/taglib/arclistsg.lib.php
  28. +1
    -1
      src/system/taglib/feedback.lib.php
  29. +5
    -4
      src/system/taglib/infoguide.lib.php
  30. +3
    -2
      src/system/taglib/infolink.lib.php
  31. +1
    -1
      src/system/taglib/likearticle.lib.php
  32. +1
    -1
      src/system/taglib/relation.lib.php
  33. +1
    -1
      src/system/taglib/statistics.lib.php
  34. +1
    -1
      src/system/taglib/tag.lib.php
  35. +1
    -1
      src/system/tpllib/plus_userarclist.php
  36. +1
    -1
      src/system/typelink/typelink.class.php
  37. +1
    -1
      src/system/typelink/typeunit.class.admin.php
  38. +1
    -1
      src/user/index_do.php

+ 1
- 1
src/admin/catalog_add.php View File

@@ -166,7 +166,7 @@ if ($dopost == 'quick') {
} }
//创建目录 //创建目录
if ($ispart != 2) { if ($ispart != 2) {
$true_typedir = str_replace("{cmspath}", "", $typedir);
$true_typedir = str_replace("{cmspath}", $cfg_cmspath, $typedir);
$true_typedir = preg_replace("#\/{1,}#", "/", $true_typedir); $true_typedir = preg_replace("#\/{1,}#", "/", $true_typedir);
if (!CreateDir($true_typedir)) { if (!CreateDir($true_typedir)) {
ShowMsg("创建目录{$true_typedir}失败,请检查路径是否存在问题", "-1"); ShowMsg("创建目录{$true_typedir}失败,请检查路径是否存在问题", "-1");


+ 1
- 1
src/admin/dialog/select_soft.php View File

@@ -157,7 +157,7 @@ if (!empty($noeditor)) {
window.opener.CKEDITOR.tools.callFunction(funcNum, reimg); window.opener.CKEDITOR.tools.callFunction(funcNum, reimg);
} }
if (typeof window.opener.CKEDITOR.instances["<?php echo $f ?>"] !== "undefined") { if (typeof window.opener.CKEDITOR.instances["<?php echo $f ?>"] !== "undefined") {
let addonHTML = `<a href='${reimg}' target='_blank'><img src='/static/web/img/icon_addon.png'> 附件:${reimg}</a>`;
let addonHTML = `<a href='${reimg}' target='_blank'><img src='<?php echo $cfg_cmspath ?>/static/web/img/icon_addon.png'>附件:${reimg}</a>`;
window.opener.CKEDITOR.instances["<?php echo $f ?>"].insertHtml(addonHTML); window.opener.CKEDITOR.instances["<?php echo $f ?>"].insertHtml(addonHTML);
} }
if (window.opener.document.<?php echo $f ?> != null) { if (window.opener.document.<?php echo $f ?> != null) {


+ 1
- 1
src/admin/file_manage_main.php View File

@@ -10,7 +10,7 @@
*/ */
require(dirname(__FILE__)."/config.php"); require(dirname(__FILE__)."/config.php");
CheckPurview('plus_文件管理器'); CheckPurview('plus_文件管理器');
if (!isset($activepath)) $activepath = DEDEBIZ_SAFE_MODE? $cfg_medias_dir : '/';
if (!isset($activepath)) $activepath = DEDEBIZ_SAFE_MODE? $cfg_medias_dir : $cfg_cmspath;
$inpath = ''; $inpath = '';
$activepath = str_replace("..", "", $activepath); $activepath = str_replace("..", "", $activepath);
$activepath = preg_replace("#^\/{1,}#", "/", $activepath); $activepath = preg_replace("#^\/{1,}#", "/", $activepath);


+ 1
- 1
src/admin/friendlink_edit.php View File

@@ -60,7 +60,7 @@ if ($dopost == "delete") {
$fullfilename = DEDEROOT.'/static/flink/'.$logoimg_name; $fullfilename = DEDEROOT.'/static/flink/'.$logoimg_name;
move_uploaded_file($logoimg, $fullfilename) or die("上传文件到".$fullfilename."失败"); move_uploaded_file($logoimg, $fullfilename) or die("上传文件到".$fullfilename."失败");
@unlink($logoimg); @unlink($logoimg);
$logo = '/static/flink/'.$logoimg_name;
$logo = $cfg_cmspath.'/static/flink/'.$logoimg_name;
} }
$sortrank = isset($sortrank)? intval($sortrank) : 1; $sortrank = isset($sortrank)? intval($sortrank) : 1;
$url = isset($url)? HtmlReplace($url, -1) : ''; $url = isset($url)? HtmlReplace($url, -1) : '';


+ 1
- 1
src/admin/inc/inc_archives_all.php View File

@@ -153,7 +153,7 @@ function GetFieldValue($dvalue, $dtype, $aid = 0, $job = 'add', $addvar = '')
fclose($fp); fclose($fp);
return $addvar; return $addvar;
} else { } else {
$ipath = '/data/textdata';
$ipath = $GLOBALS['cfg_cmspath']."/data/textdata";
$tpath = ceil($aid / 5000); $tpath = ceil($aid / 5000);
if (!is_dir($GLOBALS['cfg_basedir'].$ipath)) { if (!is_dir($GLOBALS['cfg_basedir'].$ipath)) {
MkdirAll($GLOBALS['cfg_basedir'].$ipath, $cfg_dir_purview); MkdirAll($GLOBALS['cfg_basedir'].$ipath, $cfg_dir_purview);


+ 2
- 2
src/admin/makehtml_taglist_action.php View File

@@ -20,7 +20,7 @@ if (empty($maxpagesize)) $maxpagesize = 30;
$startid = isset($startid) ? intval($startid) : 0; $startid = isset($startid) ? intval($startid) : 0;
$endid = isset($endid) ? intval($endid) : 0; $endid = isset($endid) ? intval($endid) : 0;
$tagid = isset($tagid) ? intval($tagid) : 0; $tagid = isset($tagid) ? intval($tagid) : 0;
$tagsdir = str_replace("{cmspath}", "", $cfg_tags_dir);
$tagsdir = str_replace("{cmspath}", $cfg_cmspath, $cfg_tags_dir);
//生成 //生成
if ($tagid > 0) { if ($tagid > 0) {
$upall = 0; //更新单个模式 $upall = 0; //更新单个模式
@@ -50,7 +50,7 @@ if ($ctagid == 0 && $allfinish) {
} }
$tag = $dsql->GetOne("SELECT * FROM `#@__tagindex` WHERE id='$ctagid' LIMIT 0,1;"); $tag = $dsql->GetOne("SELECT * FROM `#@__tagindex` WHERE id='$ctagid' LIMIT 0,1;");
//创建TAGS目录 //创建TAGS目录
$tagsDir = str_replace("{cmspath}", "", $cfg_tags_dir);
$tagsDir = str_replace("{cmspath}",$cfg_cmspath,$cfg_tags_dir);
MkdirAll($cfg_basedir.$tagsDir, $cfg_dir_purview); MkdirAll($cfg_basedir.$tagsDir, $cfg_dir_purview);
if (is_array($tag) && count($tag) > 0) { if (is_array($tag) && count($tag) > 0) {
$dlist = new TagList($tag['id'], 'tag_list.htm'); $dlist = new TagList($tag['id'], 'tag_list.htm');


+ 2
- 1
src/admin/module_main.php View File

@@ -237,7 +237,8 @@ if ($action == '') {
$setupsql = preg_replace("#TYPE=MyISAM#i", $sql41tmp, $setupsql); $setupsql = preg_replace("#TYPE=MyISAM#i", $sql41tmp, $setupsql);
} }
//_ROOTURL_ //_ROOTURL_
$rooturl = $cfg_basehost;
if ($cfg_cmspath == '/') $cfg_cmspath = '';
$rooturl = $cfg_basehost.$cfg_cmspath;
$setupsql = preg_replace("#_ROOTURL_#i", $rooturl, $setupsql); $setupsql = preg_replace("#_ROOTURL_#i", $rooturl, $setupsql);
$setupsql = preg_replace("#[\r\n]{1,}#", "\n", $setupsql); $setupsql = preg_replace("#[\r\n]{1,}#", "\n", $setupsql);
$sqls = preg_split('/;[ \t]{0,}\n/', $setupsql); $sqls = preg_split('/;[ \t]{0,}\n/', $setupsql);


+ 1
- 1
src/admin/mychannel_edit.php View File

@@ -440,7 +440,7 @@ if ($dopost == "show") {
$addonfields = ''; $addonfields = '';
} }
$template = trim($template); $template = trim($template);
$forms = "<form action=\"/apps/advancedsearch.php\" method=\"post\">";
$forms = "<form action=\"$cfg_cmspath/apps/advancedsearch.php\" method=\"post\">";
$forms .= "<input type=\"hidden\" name=\"mid\" value=\"$mid\">"; $forms .= "<input type=\"hidden\" name=\"mid\" value=\"$mid\">";
$forms .= "<input type=\"hidden\" name=\"dopost\" value=\"search\">"; $forms .= "<input type=\"hidden\" name=\"dopost\" value=\"search\">";
$forms .= "<label>关键词:<input type=\"text\" name=\"q\"></label><br>"; $forms .= "<label>关键词:<input type=\"text\" name=\"q\"></label><br>";


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

@@ -16,7 +16,7 @@
<div class="card shadow-sm"> <div class="card shadow-sm">
<div class="card-header">更新专题</div> <div class="card-header">更新专题</div>
<div class="card-body"> <div class="card-body">
<div class="alert alert-info">发布专题后需要手动更新,建议专题目录设置仅可读写权限,存放目录:<?php echo $cfg_special.'/index.html';?></div>
<div class="alert alert-info">发布专题后需要手动更新,建议专题目录设置仅可读写权限,存放目录:<?php echo $cfg_cmspath.$cfg_special."/index.html"?></div>
<form name="form1" action="makehtml_spec.php" method="get" target="stafrm"> <form name="form1" action="makehtml_spec.php" method="get" target="stafrm">
<input type="hidden" name="dopost" value="ok"> <input type="hidden" name="dopost" value="ok">
<div class="table-responsive"> <div class="table-responsive">


+ 2
- 2
src/admin/templets_one_edit.php View File

@@ -45,7 +45,7 @@ if ($dopost == "saveedit") {
ShowMsg("系统文件禁止重名", "javascript:;"); ShowMsg("系统文件禁止重名", "javascript:;");
exit(); exit();
} }
$oldfilename = $cfg_basedir.'/'.$oldfilename;
$oldfilename = $cfg_basedir.$cfg_cmspath."/".$oldfilename;
if (is_file($oldfilename)) { if (is_file($oldfilename)) {
unlink($oldfilename); unlink($oldfilename);
} }
@@ -64,7 +64,7 @@ if ($dopost == "saveedit") {
exit(); exit();
} else if ($dopost == "delete") { } else if ($dopost == "delete") {
$row = $dsql->GetOne("SELECT filename FROM `#@__sgpage` WHERE aid='$aid'"); $row = $dsql->GetOne("SELECT filename FROM `#@__sgpage` WHERE aid='$aid'");
$filename = preg_replace("#\/{1,}#", "/", $cfg_basedir."/".$row['filename']);
$filename = preg_replace("#\/{1,}#", "/", $cfg_basedir.$cfg_cmspath."/".$row['filename']);
$dsql->ExecuteNoneQuery(" DELETE FROM `#@__sgpage` WHERE aid='$aid' "); $dsql->ExecuteNoneQuery(" DELETE FROM `#@__sgpage` WHERE aid='$aid' ");
if (is_file($filename)) { if (is_file($filename)) {
unlink($filename); unlink($filename);


+ 1
- 1
src/apps/diy.php View File

@@ -74,7 +74,7 @@ if ($action == 'post') {
$goto = "diy.php?action=list&diyid={$diy->diyid}"; $goto = "diy.php?action=list&diyid={$diy->diyid}";
$bkmsg = '提交成功,正在前往表单列表'; $bkmsg = '提交成功,正在前往表单列表';
} else { } else {
$goto = '/';
$goto = !empty($cfg_cmspath) ? $cfg_cmspath : '/';
$bkmsg = '提交成功,请等待管理员处理'; $bkmsg = '提交成功,请等待管理员处理';
} }
ShowMsg($bkmsg, $goto); ShowMsg($bkmsg, $goto);


+ 1
- 1
src/apps/feedback.php View File

@@ -65,7 +65,7 @@ if ($action == '' || $action == 'show') {
$dsql->Execute('fb', $querystring." LIMIT 20 "); $dsql->Execute('fb', $querystring." LIMIT 20 ");
$data = array(); $data = array();
while ($row = $dsql->GetArray('fb')) { while ($row = $dsql->GetArray('fb')) {
$row['face'] = empty($row['mface']) ? '/static/web/img/admin.png' : $row['mface'];
$row['face'] = empty($row['mface']) ? $GLOBALS['cfg_cmspath'].'/static/web/img/admin.png' : $row['mface'];
$row['dtimestr'] = MyDate('Y-m-d', $row['dtime']); $row['dtimestr'] = MyDate('Y-m-d', $row['dtime']);
unset($row['ip']); unset($row['ip']);
$data[] = $row; $data[] = $row;


+ 4
- 4
src/system/archive/archives.class.php View File

@@ -219,7 +219,7 @@ class Archives
//处理默认缩略图等 //处理默认缩略图等
if (isset($this->Fields['litpic'])) { if (isset($this->Fields['litpic'])) {
if ($this->Fields['litpic'] == '-' || $this->Fields['litpic'] == '') { if ($this->Fields['litpic'] == '-' || $this->Fields['litpic'] == '') {
$this->Fields['litpic'] = '/static/web/img/thumbnail.jpg';
$this->Fields['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg';
} }
if (!preg_match("#^http:\/\/#i", $this->Fields['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { if (!preg_match("#^http:\/\/#i", $this->Fields['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') {
$this->Fields['litpic'] = $GLOBALS['cfg_mainsite'].$this->Fields['litpic']; $this->Fields['litpic'] = $GLOBALS['cfg_mainsite'].$this->Fields['litpic'];
@@ -232,7 +232,7 @@ class Archives
if (isset($this->Fields['voteid']) && !empty($this->Fields['voteid'])) { if (isset($this->Fields['voteid']) && !empty($this->Fields['voteid'])) {
$this->Fields['vote'] = ''; $this->Fields['vote'] = '';
$voteid = $this->Fields['voteid']; $voteid = $this->Fields['voteid'];
$this->Fields['vote'] = "<script src='/data/vote/vote_{$voteid}.js'></script>";
$this->Fields['vote'] = "<script src='{$GLOBALS['cfg_cmspath']}/data/vote/vote_{$voteid}.js'></script>";
if ($GLOBALS['cfg_multi_site'] == 'Y') { if ($GLOBALS['cfg_multi_site'] == 'Y') {
$this->Fields['vote'] = "<script src='{$GLOBALS['cfg_mainsite']}/data/vote/vote_{$voteid}.js'></script>"; $this->Fields['vote'] = "<script src='{$GLOBALS['cfg_mainsite']}/data/vote/vote_{$voteid}.js'></script>";
} }
@@ -681,7 +681,7 @@ class Archives
$preRow['siteurl'], $preRow['siteurl'],
$preRow['sitepath'] $preRow['sitepath']
); );
$preRow['litpic'] = (empty($preRow['litpic'])) ? '/static/web/img/thumbnail.jpg' : $preRow['litpic'];
$preRow['litpic'] = (empty($preRow['litpic'])) ? $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg' : $preRow['litpic'];
$this->PreNext['diy']['pre']['id'] = $preRow['id']; $this->PreNext['diy']['pre']['id'] = $preRow['id'];
$this->PreNext['diy']['pre']['arcurl'] = $mlink; $this->PreNext['diy']['pre']['arcurl'] = $mlink;
$this->PreNext['diy']['pre']['title'] = $preRow['title']; $this->PreNext['diy']['pre']['title'] = $preRow['title'];
@@ -709,7 +709,7 @@ class Archives
$nextRow['siteurl'], $nextRow['siteurl'],
$nextRow['sitepath'] $nextRow['sitepath']
); );
$nextRow['litpic'] = (empty($nextRow['litpic'])) ? '/static/web/img/thumbnail.jpg' : $nextRow['litpic'];
$nextRow['litpic'] = (empty($nextRow['litpic'])) ? $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg' : $nextRow['litpic'];
$this->PreNext['diy']['next']['id'] = $nextRow['id']; $this->PreNext['diy']['next']['id'] = $nextRow['id'];
$this->PreNext['diy']['next']['arcurl'] = $mlink; $this->PreNext['diy']['next']['arcurl'] = $mlink;
$this->PreNext['diy']['next']['title'] = $nextRow['title']; $this->PreNext['diy']['next']['title'] = $nextRow['title'];


+ 3
- 3
src/system/archive/freelist.class.php View File

@@ -229,7 +229,7 @@ class FreeList
$this->dtp->SaveTo($makeFile); $this->dtp->SaveTo($makeFile);
} }
if ($this->FLInfos['nodefault'] == 0) { if ($this->FLInfos['nodefault'] == 0) {
$murl = '/'.str_replace('{cmspath}', $this->FLInfos['listdir']);
$murl = '/'.str_replace('{cmspath}', $GLOBALS['cfg_cmspath'], $this->FLInfos['listdir']);
$murl .= '/'.$this->FLInfos['defaultpage']; $murl .= '/'.$this->FLInfos['defaultpage'];
$indexfile = $GLOBALS['cfg_basedir'].$murl; $indexfile = $GLOBALS['cfg_basedir'].$murl;
$murl = preg_replace("#\/{1,}#", "/", $murl); $murl = preg_replace("#\/{1,}#", "/", $murl);
@@ -355,7 +355,7 @@ class FreeList
$okfile = ''; $okfile = '';
$namerule = $this->FLInfos['namerule']; $namerule = $this->FLInfos['namerule'];
$listdir = $this->FLInfos['listdir']; $listdir = $this->FLInfos['listdir'];
$listdir = str_replace('{cmspath}', $listdir);
$listdir = str_replace('{cmspath}', $GLOBALS['cfg_cmspath'], $listdir);
$okfile = str_replace('{listid}', $this->FLInfos['aid'], $namerule); $okfile = str_replace('{listid}', $this->FLInfos['aid'], $namerule);
$okfile = str_replace('{listdir}', $listdir, $okfile); $okfile = str_replace('{listdir}', $listdir, $okfile);
$okfile = str_replace("\\", "/", $okfile); $okfile = str_replace("\\", "/", $okfile);
@@ -540,7 +540,7 @@ class FreeList
} }
$row['description'] = cn_substr($row['description'], $infolen); $row['description'] = cn_substr($row['description'], $infolen);
if ($row['litpic'] == '-' || $row['litpic'] == '') { if ($row['litpic'] == '-' || $row['litpic'] == '') {
$row['litpic'] = '/static/web/img/thumbnail.jpg';
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg';
} }
/*if (!preg_match("#^http:\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { /*if (!preg_match("#^http:\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') {
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic'];


+ 4
- 3
src/system/archive/listview.class.php View File

@@ -525,7 +525,7 @@ class ListView
$row['sitepath'] $row['sitepath']
); );
if ($row['litpic'] == '-' || $row['litpic'] == '') { if ($row['litpic'] == '-' || $row['litpic'] == '') {
$row['litpic'] = '/static/web/img/thumbnail.jpg';
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg';
} }
/*if (!preg_match("/^http:\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { /*if (!preg_match("/^http:\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') {
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic'];
@@ -945,7 +945,7 @@ class ListView
$row['sitepath'] $row['sitepath']
); );
if ($row['litpic'] == '-' || $row['litpic'] == '') { if ($row['litpic'] == '-' || $row['litpic'] == '') {
$row['litpic'] = '/static/web/img/thumbnail.jpg';
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg';
} }
/*if (!preg_match("/^http:\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { /*if (!preg_match("/^http:\/\//i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') {
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic'];
@@ -1014,6 +1014,7 @@ class ListView
*/ */
function GetPageListST($list_len, $listitem = "index,end,pre,next,pageno") function GetPageListST($list_len, $listitem = "index,end,pre,next,pageno")
{ {
global $cfg_cmspath;
$prepage = $nextpage = ''; $prepage = $nextpage = '';
$prepagenum = $this->PageNo - 1; $prepagenum = $this->PageNo - 1;
$nextpagenum = $this->PageNo + 1; $nextpagenum = $this->PageNo + 1;
@@ -1102,7 +1103,7 @@ class ListView
*/ */
function GetPageListDM($list_len, $listitem = "index,end,pre,next,pageno") function GetPageListDM($list_len, $listitem = "index,end,pre,next,pageno")
{ {
global $cfg_rewrite;
global $cfg_cmspath, $cfg_rewrite;
$prepage = $nextpage = ''; $prepage = $nextpage = '';
$prepagenum = $this->PageNo - 1; $prepagenum = $this->PageNo - 1;
$nextpagenum = $this->PageNo + 1; $nextpagenum = $this->PageNo + 1;


+ 1
- 1
src/system/archive/searchview.class.php View File

@@ -568,7 +568,7 @@ class SearchView
$row["title"] = $this->GetRedKeyWord(cn_substr($row["title"], $titlelen)); $row["title"] = $this->GetRedKeyWord(cn_substr($row["title"], $titlelen));
$row["id"] = $row["id"]; $row["id"] = $row["id"];
if ($row['litpic'] == '-' || $row['litpic'] == '') { if ($row['litpic'] == '-' || $row['litpic'] == '') {
$row['litpic'] = '/static/web/img/thumbnail.jpg';
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg';
} }
/*if (!preg_match("/^(http|https):\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { /*if (!preg_match("/^(http|https):\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') {
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic'];


+ 2
- 2
src/system/archive/sglistview.class.php View File

@@ -431,7 +431,7 @@ class SgListView
$row['sitepath'] $row['sitepath']
); );
if ($row['litpic'] == '-' || $row['litpic'] == '') { if ($row['litpic'] == '-' || $row['litpic'] == '') {
$row['litpic'] = '/static/web/img/thumbnail.jpg';
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg';
} }
/*if (!preg_match("/^http:\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { /*if (!preg_match("/^http:\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') {
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic'];
@@ -780,7 +780,7 @@ class SgListView
$row['sitepath'] $row['sitepath']
); );
if ($row['litpic'] == '-' || $row['litpic'] == '') { if ($row['litpic'] == '-' || $row['litpic'] == '') {
$row['litpic'] = '/static/web/img/thumbnail.jpg';
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg';
} }
if (!preg_match("/^http:\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { if (!preg_match("/^http:\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') {
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic'];


+ 1
- 1
src/system/archive/sgpage.class.php View File

@@ -80,7 +80,7 @@ class sgpage
*/ */
function SaveToHtml() function SaveToHtml()
{ {
$filename = $GLOBALS['cfg_basedir'].'/'.$this->Fields['filename'];
$filename = $GLOBALS['cfg_basedir'].$GLOBALS['cfg_cmspath'].'/'.$this->Fields['filename'];
$filename = preg_replace("/\/{1,}/", '/', $filename); $filename = preg_replace("/\/{1,}/", '/', $filename);
$this->dtp->SaveTo($filename); $this->dtp->SaveTo($filename);
} }


+ 1
- 1
src/system/archive/specview.class.php View File

@@ -348,7 +348,7 @@ class SpecView
$row["title"] = cn_substr($row["title"], $titlelen); $row["title"] = cn_substr($row["title"], $titlelen);
$row["id"] = $row["id"]; $row["id"] = $row["id"];
if ($row['litpic'] == '-' || $row['litpic'] == '') { if ($row['litpic'] == '-' || $row['litpic'] == '') {
$row['litpic'] = '/static/web/img/thumbnail.jpg';
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg';
} }
if (!preg_match("/^http:\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { if (!preg_match("/^http:\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') {
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic'];


+ 7
- 7
src/system/archive/taglist.class.php View File

@@ -156,8 +156,8 @@ class TagList
*/ */
function Display() function Display()
{ {
global $cfg_tags_dir;
$tagsDir = str_replace("{cmspath}", "", $cfg_tags_dir);
global $cfg_cmspath, $cfg_tags_dir;
$tagsDir = str_replace("{cmspath}",$cfg_cmspath,$cfg_tags_dir);
$makeDir = empty($this->Tag) ? $this->GetTruePath().$tagsDir."/index.html" : $this->GetTruePath().$tagsDir."/".$this->Tag."/index.html"; $makeDir = empty($this->Tag) ? $this->GetTruePath().$tagsDir."/index.html" : $this->GetTruePath().$tagsDir."/".$this->Tag."/index.html";
if ($this->Tag != '') { if ($this->Tag != '') {
$this->CountRecord(); $this->CountRecord();
@@ -346,7 +346,7 @@ class TagList
$row['sitepath'] $row['sitepath']
); );
if ($row['litpic'] == '-' || $row['litpic'] == '') { if ($row['litpic'] == '-' || $row['litpic'] == '') {
$row['litpic'] = '/static/web/img/thumbnail.jpg';
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg';
} }
/*if (!preg_match("/^http:\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { /*if (!preg_match("/^http:\/\//", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') {
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic'];
@@ -559,16 +559,16 @@ class TagList
} }
function SetTagsDir($dir = '') function SetTagsDir($dir = '')
{ {
global $cfg_tags_dir;
if ($dir == "") $dir = str_replace("{cmspath}", "", $cfg_tags_dir);
global $cfg_tags_dir, $cfg_cmspath;
if ($dir == "") $dir = str_replace("{cmspath}", $cfg_cmspath, $cfg_tags_dir);
$this->tagsDir = $dir; $this->tagsDir = $dir;
} }
//生成静态标签 //生成静态标签
function MakeHtml($startpage = 1, $makepagesize = 0) function MakeHtml($startpage = 1, $makepagesize = 0)
{ {
global $cfg_dir_purview, $envs, $cfg_tags_dir, $cfg_cmsurl;
global $cfg_dir_purview, $envs, $cfg_cmspath, $cfg_tags_dir, $cfg_cmsurl;
$envs['makeTag'] = 1; $envs['makeTag'] = 1;
$tagsdir = str_replace("{cmspath}", "", $cfg_tags_dir);
$tagsdir = str_replace("{cmspath}", $cfg_cmspath, $cfg_tags_dir);
if (isset($envs['makeTag']) && $envs['makeTag'] == 1) { if (isset($envs['makeTag']) && $envs['makeTag'] == 1) {
$this->Fields['position'] = $cfg_cmsurl.$tagsdir."/"; $this->Fields['position'] = $cfg_cmsurl.$tagsdir."/";
} }


+ 9
- 9
src/system/common.inc.php View File

@@ -152,32 +152,32 @@ if (PHP_SAPI === 'cli') {
$cfg_clihost = 'http://'.$_SERVER['HTTP_HOST']; $cfg_clihost = 'http://'.$_SERVER['HTTP_HOST'];
} }
//站点根目录 //站点根目录
$cfg_basedir = preg_replace('#'.'\/system$#i', '', DEDEINC);
$cfg_basedir = preg_replace('#'.$cfg_cmspath.'\/system$#i', '', DEDEINC);
if ($cfg_multi_site == 'Y') { if ($cfg_multi_site == 'Y') {
$cfg_mainsite = $cfg_basehost; $cfg_mainsite = $cfg_basehost;
} else { } else {
$cfg_mainsite = ''; $cfg_mainsite = '';
} }
//模板存放目录 //模板存放目录
$cfg_templets_dir = '/theme';
$cfg_templets_dir = $cfg_cmspath.'/theme';
$cfg_templeturl = $cfg_mainsite.$cfg_templets_dir; $cfg_templeturl = $cfg_mainsite.$cfg_templets_dir;
$cfg_templets_skin = empty($cfg_df_style) ? $cfg_mainsite.$cfg_templets_dir."/templets" : $cfg_mainsite.$cfg_templets_dir."/$cfg_df_style"; $cfg_templets_skin = empty($cfg_df_style) ? $cfg_mainsite.$cfg_templets_dir."/templets" : $cfg_mainsite.$cfg_templets_dir."/$cfg_df_style";
//安装目录网址 //安装目录网址
$cfg_cmsurl = $cfg_mainsite;
$cfg_cmsurl = $cfg_mainsite.$cfg_cmspath;
//模块插件目录 //模块插件目录
$cfg_plus_dir = '/apps';
$cfg_plus_dir = $cfg_cmspath.'/apps';
$cfg_phpurl = $cfg_mainsite.$cfg_plus_dir; $cfg_phpurl = $cfg_mainsite.$cfg_plus_dir;
//一些缓存配置数据存放目录 //一些缓存配置数据存放目录
$cfg_data_dir = '/data';
$cfg_data_dir = $cfg_cmspath.'/data';
$cfg_dataurl = $cfg_mainsite.$cfg_data_dir; $cfg_dataurl = $cfg_mainsite.$cfg_data_dir;
//专题存放目录 //专题存放目录
$cfg_special = '/a/special';
$cfg_special = $cfg_cmspath.'/a/special';
$cfg_specialurl = $cfg_mainsite.$cfg_special; $cfg_specialurl = $cfg_mainsite.$cfg_special;
//会员会员目录 //会员会员目录
$cfg_member_dir = '/user';
$cfg_member_dir = $cfg_cmspath.'/user';
$cfg_memberurl = $cfg_mainsite.$cfg_member_dir; $cfg_memberurl = $cfg_mainsite.$cfg_member_dir;
//静态文件存放目录 //静态文件存放目录
$cfg_static_dir = '/static';
$cfg_static_dir = $cfg_cmspath.'/static';
$cfg_staticurl = $cfg_mainsite.$cfg_static_dir; $cfg_staticurl = $cfg_mainsite.$cfg_static_dir;
//上传图片存放目录,建议按默认 //上传图片存放目录,建议按默认
$cfg_image_dir = $cfg_medias_dir.'/allimg'; $cfg_image_dir = $cfg_medias_dir.'/allimg';
@@ -188,7 +188,7 @@ $cfg_soft_dir = $cfg_medias_dir.'/soft';
//上传多媒体文件存放目录 //上传多媒体文件存放目录
$cfg_other_medias = $cfg_medias_dir.'/media'; $cfg_other_medias = $cfg_medias_dir.'/media';
//附件目录 //附件目录
$cfg_medias_dir = $cfg_medias_dir;
$cfg_medias_dir = $cfg_cmspath.$cfg_medias_dir;
$cfg_mediasurl = $cfg_mainsite.$cfg_medias_dir; $cfg_mediasurl = $cfg_mainsite.$cfg_medias_dir;
//程序信息摘要,请不要删除则系统无法接收升级信息 //程序信息摘要,请不要删除则系统无法接收升级信息
$cfg_version = 'V6'; $cfg_version = 'V6';


+ 10
- 8
src/system/customfields.func.php View File

@@ -38,19 +38,20 @@ function GetFormItem($ctag, $admintype = 'admin')
$myformItem .= "</select>"; $myformItem .= "</select>";
$innertext = $myformItem; $innertext = $myformItem;
} else if ($fieldType == 'stepselect') { } else if ($fieldType == 'stepselect') {
global $hasSetEnumJs;
global $hasSetEnumJs, $cfg_cmspath;
$cmspath = ((empty($cfg_cmspath) || !preg_match('/[/$]/', $cfg_cmspath)) ? $cfg_cmspath.'/' : $cfg_cmspath);
$myformItem = ''; $myformItem = '';
$myformItem .= "<input type='hidden' id='hidden_{$fieldname}' name='{$fieldname}' value='0'>"; $myformItem .= "<input type='hidden' id='hidden_{$fieldname}' name='{$fieldname}' value='0'>";
$myformItem .= "<span id='span_{$fieldname}'></span>"; $myformItem .= "<span id='span_{$fieldname}'></span>";
$myformItem .= "<span id='span_{$fieldname}_son'></span>"; $myformItem .= "<span id='span_{$fieldname}_son'></span>";
$myformItem .= "<span id='span_{$fieldname}_sec'></span>"; $myformItem .= "<span id='span_{$fieldname}_sec'></span>";
if ($hasSetEnumJs != 'hasset') { if ($hasSetEnumJs != 'hasset') {
$myformItem .= '<script src="/static/web/js/enums.js"></script>'."";
$myformItem .= '<script src="'.$cmspath.'static/web/js/enums.js"></script>'."";
$GLOBALS['hasSetEnumJs'] = 'hasset'; $GLOBALS['hasSetEnumJs'] = 'hasset';
} }
$myformItem .= "<script> $myformItem .= "<script>
var em_{$fieldname}s = []; var em_{$fieldname}s = [];
fetch('/static/enums/{$fieldname}.json').then((resp)=>resp.json()).then((d) => {
fetch('{$cmspath}static/enums/{$fieldname}.json').then((resp)=>resp.json()).then((d)=>{
Object.entries(d).forEach(v=>{ Object.entries(d).forEach(v=>{
em_{$fieldname}s[parseFloat(v[0])]= v[1]; em_{$fieldname}s[parseFloat(v[0])]= v[1];
}); });
@@ -156,7 +157,7 @@ EOT;
*/ */
function GetFieldValue($dvalue, $dtype, $aid = 0, $job = 'add', $addvar = '', $admintype = 'admin', $fieldname = '') function GetFieldValue($dvalue, $dtype, $aid = 0, $job = 'add', $addvar = '', $admintype = 'admin', $fieldname = '')
{ {
global $cfg_basedir, $adminid, $cfg_ml, $cfg_cookie_encode;
global $cfg_basedir, $cfg_cmspath, $adminid, $cfg_ml, $cfg_cookie_encode;
if (!empty($adminid)) { if (!empty($adminid)) {
$adminid = $adminid; $adminid = $adminid;
} else { } else {
@@ -200,7 +201,7 @@ function GetFieldValue($dvalue, $dtype, $aid = 0, $job = 'add', $addvar = '', $a
} }
return $dvalue; return $dvalue;
} else if ($dtype == "textdata") { } else if ($dtype == "textdata") {
$ipath = '/data/textdata';
$ipath = $cfg_cmspath."/data/textdata";
$tpath = ceil($aid / 5000); $tpath = ceil($aid / 5000);
if (!is_dir($cfg_basedir.$ipath)) { if (!is_dir($cfg_basedir.$ipath)) {
MkdirAll($cfg_basedir.$ipath, $GLOBALS['cfg_dir_purview']); MkdirAll($cfg_basedir.$ipath, $GLOBALS['cfg_dir_purview']);
@@ -271,19 +272,20 @@ function GetFormItemValue($ctag, $fvalue, $admintype = 'admin', $fieldname = '')
$myformItem .= "</select>"; $myformItem .= "</select>";
$innertext = $myformItem; $innertext = $myformItem;
} else if ($ctag->GetAtt("type") == 'stepselect') { } else if ($ctag->GetAtt("type") == 'stepselect') {
global $hasSetEnumJs;
global $hasSetEnumJs, $cfg_cmspath;
$cmspath = ((empty($cfg_cmspath) || preg_match('/[/$]/', $cfg_cmspath)) ? $cfg_cmspath.'/' : $cfg_cmspath);
$myformItem = ''; $myformItem = '';
$myformItem .= "<input type='hidden' id='hidden_{$fieldname}' name='{$fieldname}' value='{$fvalue}'>"; $myformItem .= "<input type='hidden' id='hidden_{$fieldname}' name='{$fieldname}' value='{$fvalue}'>";
$myformItem .= "<span id='span_{$fieldname}'></span>"; $myformItem .= "<span id='span_{$fieldname}'></span>";
$myformItem .= "<span id='span_{$fieldname}_son'></span>"; $myformItem .= "<span id='span_{$fieldname}_son'></span>";
$myformItem .= "<span id='span_{$fieldname}_sec'></span>"; $myformItem .= "<span id='span_{$fieldname}_sec'></span>";
if ($hasSetEnumJs != 'hasset') { if ($hasSetEnumJs != 'hasset') {
$myformItem .= '<script src="/static/web/js/enums.js"></script>'."";
$myformItem .= '<script src="'.$cmspath.'static/web/js/enums.js"></script>'."";
$GLOBALS['hasSetEnumJs'] = 'hasset'; $GLOBALS['hasSetEnumJs'] = 'hasset';
} }
$myformItem .= "<script> $myformItem .= "<script>
var em_{$fieldname}s = []; var em_{$fieldname}s = [];
fetch('/static/enums/{$fieldname}.json').then((resp)=>resp.json()).then((d) => {
fetch('{$cmspath}static/enums/{$fieldname}.json').then((resp)=>resp.json()).then((d)=>{
Object.entries(d).forEach(v=>{ Object.entries(d).forEach(v=>{
em_{$fieldname}s[parseFloat(v[0])]= v[1]; em_{$fieldname}s[parseFloat(v[0])]= v[1];
}); });


+ 2
- 2
src/system/extend.func.php View File

@@ -25,12 +25,12 @@ if (!function_exists('obtaintheme')) {
if (!function_exists('obtaintags')) { if (!function_exists('obtaintags')) {
function obtaintags($aid, $num = 3) function obtaintags($aid, $num = 3)
{ {
global $dsql;
global $dsql, $cfg_cmspath;
$tags = ''; $tags = '';
$query = "SELECT * FROM `#@__taglist` WHERE aid='$aid' LIMIT $num"; $query = "SELECT * FROM `#@__taglist` WHERE aid='$aid' LIMIT $num";
$dsql->Execute('tag', $query); $dsql->Execute('tag', $query);
while($row = $dsql->GetArray('tag')) { while($row = $dsql->GetArray('tag')) {
$link = "/apps/tags.php?/{$row['tid']}";
$link = $cfg_cmspath."/apps/tags.php?/{$row['tid']}";
$tags .= ($tags == '' ? "<a href='{$link}'>{$row['tag']}</a>" : "<a href='{$link}'>{$row['tag']}</a>"); $tags .= ($tags == '' ? "<a href='{$link}'>{$row['tag']}</a>" : "<a href='{$link}'>{$row['tag']}</a>");
} }
return $tags; return $tags;


+ 670
- 670
src/system/helpers/channelunit.helper.php
File diff suppressed because it is too large
View File


+ 1
- 1
src/system/libraries/statistics.class.php View File

@@ -52,7 +52,7 @@ class DedeStatistics {
ksort($pm); ksort($pm);
$pm['sign'] = sha1(http_build_query($pm).md5($cfg_cookie_encode)); $pm['sign'] = sha1(http_build_query($pm).md5($cfg_cookie_encode));
$pm['dopost'] = "stat"; $pm['dopost'] = "stat";
$url = '/apps/statistics.php?'.http_build_query($pm);
$url = $GLOBALS['cfg_cmspath'].'/apps/statistics.php?'.http_build_query($pm);
return " return "
(function() { (function() {
let u = '{$url}'; let u = '{$url}';


+ 1
- 1
src/system/taglib/arclist.lib.php View File

@@ -344,7 +344,7 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele
$row['sitepath'] $row['sitepath']
); );
if ($row['litpic'] == '-' || $row['litpic'] == '') { if ($row['litpic'] == '-' || $row['litpic'] == '') {
$row['litpic'] = '/static/web/img/thumbnail.jpg';
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg';
} }
if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') {
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic'];


+ 1
- 1
src/system/taglib/arclistsg.lib.php View File

@@ -178,7 +178,7 @@ function lib_arclistsg(&$ctag, &$refObj)
$row['sitepath'] $row['sitepath']
); );
if ($row['litpic'] == '-' || $row['litpic'] == '') { if ($row['litpic'] == '-' || $row['litpic'] == '') {
$row['litpic'] = '/static/web/img/thumbnail.jpg';
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg';
} }
if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') {
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic'];


+ 1
- 1
src/system/taglib/feedback.lib.php View File

@@ -45,7 +45,7 @@ function lib_feedback(&$ctag, &$refObj)
$ctp->LoadSource($innertext); $ctp->LoadSource($innertext);
$dsql->Execute('fb', $equery); $dsql->Execute('fb', $equery);
while ($arr = $dsql->GetArray('fb')) { while ($arr = $dsql->GetArray('fb')) {
$arr['face'] = empty($arr['mface']) ? '/static/web/img/admin.png' : $arr['mface'];
$arr['face'] = empty($arr['mface']) ? $GLOBALS['cfg_cmspath'].'/static/web/img/admin.png' : $arr['mface'];
$arr['userurl'] = $GLOBALS['cfg_memberurl'].'/index.php?uid='.$arr['userid']; $arr['userurl'] = $GLOBALS['cfg_memberurl'].'/index.php?uid='.$arr['userid'];
$arr['title'] = cn_substr($arr['arctitle'], $titlelen); $arr['title'] = cn_substr($arr['arctitle'], $titlelen);
$arr['msg'] = jsTrim(Html2Text($arr['msg']), $infolen); $arr['msg'] = jsTrim(Html2Text($arr['msg']), $infolen);


+ 5
- 4
src/system/taglib/infoguide.lib.php View File

@@ -11,7 +11,8 @@ if (!defined('DEDEINC')) exit ('dedebiz');
*/ */
function lib_infoguide(&$ctag, &$refObj) function lib_infoguide(&$ctag, &$refObj)
{ {
global $dsql, $nativeplace, $infotype, $hasSetEnumJs, $cfg_mainsite;
global $dsql, $nativeplace, $infotype, $hasSetEnumJs, $cfg_cmspath, $cfg_mainsite;
$cmspath = ((empty($cfg_cmspath) || preg_match('#[/$]#', $cfg_cmspath)) ? $cfg_cmspath.'/' : $cfg_cmspath);
if (empty($refObj->Fields['typeid'])) { if (empty($refObj->Fields['typeid'])) {
$row = $dsql->GetOne("SELECT id FROM `#@__arctype` WHERE channeltype='-8' And reid = '0' "); $row = $dsql->GetOne("SELECT id FROM `#@__arctype` WHERE channeltype='-8' And reid = '0' ");
$typeid = (is_array($row) ? $row['id'] : 0); $typeid = (is_array($row) ? $row['id'] : 0);
@@ -29,7 +30,7 @@ function lib_infoguide(&$ctag, &$refObj)
$revalue = $seli = ''; $revalue = $seli = '';
$fields = array('nativeplace' => '', 'infotype' => '', 'typeid' => $typeid); $fields = array('nativeplace' => '', 'infotype' => '', 'typeid' => $typeid);
if ($hasSetEnumJs != 'has') { if ($hasSetEnumJs != 'has') {
$revalue .= '<script src="'.$cfg_mainsite.'/static/web/js/enums.js"></script>'."\r\n";
$revalue .= '<script src="'.$cfg_mainsite.$cmspath.'static/web/js/enums.js"></script>'."\r\n";
$GLOBALS['hasSetEnumJs'] = 'hasset'; $GLOBALS['hasSetEnumJs'] = 'hasset';
} }
$fields['nativeplace'] = $fields['infotype'] = ''; $fields['nativeplace'] = $fields['infotype'] = '';
@@ -40,7 +41,7 @@ function lib_infoguide(&$ctag, &$refObj)
$fields['nativeplace'] .= "<span id='span_nativeplace_son'></span>\r\n<span id='span_nativeplace_sec'></span>\r\n"; $fields['nativeplace'] .= "<span id='span_nativeplace_son'></span>\r\n<span id='span_nativeplace_sec'></span>\r\n";
$fields['nativeplace'] .= "<script> $fields['nativeplace'] .= "<script>
var em_nativeplaces = []; var em_nativeplaces = [];
fetch('/static/enums/nativeplace.json').then((resp)=>resp.json()).then((d)=>{
fetch('{$cmspath}static/enums/nativeplace.json').then((resp)=>resp.json()).then((d)=>{
Object.entries(d).forEach(v=>{ Object.entries(d).forEach(v=>{
em_nativeplaces[parseFloat(v[0])]= v[1]; em_nativeplaces[parseFloat(v[0])]= v[1];
}); });
@@ -52,7 +53,7 @@ function lib_infoguide(&$ctag, &$refObj)
$fields['infotype'] .= "<span id='span_infotype_son'></span><span id='span_infotype_sec'></span>\r\n"; $fields['infotype'] .= "<span id='span_infotype_son'></span><span id='span_infotype_sec'></span>\r\n";
$fields['infotype'] .= "<script> $fields['infotype'] .= "<script>
var em_infotypes = []; var em_infotypes = [];
fetch('/static/enums/infotype.json').then((resp)=>resp.json()).then((d)=>{
fetch('{$cmspath}static/enums/infotype.json').then((resp)=>resp.json()).then((d)=>{
Object.entries(d).forEach(v=>{ Object.entries(d).forEach(v=>{
em_infotypes[parseFloat(v[0])]= v[1]; em_infotypes[parseFloat(v[0])]= v[1];
}); });


+ 3
- 2
src/system/taglib/infolink.lib.php View File

@@ -25,11 +25,12 @@ function is_str_float($value){
} }
function lib_infolink(&$ctag, &$refObj) function lib_infolink(&$ctag, &$refObj)
{ {
global $dsql, $nativeplace, $infotype, $cfg_rewrite, $cfg_mainsite, $em_nativeplaces, $em_infotypes;
global $dsql, $nativeplace, $infotype, $cfg_rewrite, $cfg_cmspath, $cfg_mainsite, $em_nativeplaces, $em_infotypes;
//$attlist="row|10,titlelen|30"; //$attlist="row|10,titlelen|30";
//FillAttsDefault($ctag->CAttribute->Items,$attlist); //FillAttsDefault($ctag->CAttribute->Items,$attlist);
//extract($ctag->CAttribute->Items, EXTR_SKIP); //extract($ctag->CAttribute->Items, EXTR_SKIP);
$baseurl = preg_replace("#\/$#", '', $cfg_mainsite);
$cmspath = ((empty($cfg_cmspath) || !preg_match("#\/$#", $cfg_cmspath)) ? $cfg_cmspath.'/' : $cfg_cmspath);
$baseurl = preg_replace("#\/$#", '', $cfg_mainsite).$cmspath;
$smalltypes = ''; $smalltypes = '';
if (!empty($refObj->TypeLink->TypeInfos['smalltypes'])) { if (!empty($refObj->TypeLink->TypeInfos['smalltypes'])) {
$smalltypes = explode(',', $refObj->TypeLink->TypeInfos['smalltypes']); $smalltypes = explode(',', $refObj->TypeLink->TypeInfos['smalltypes']);


+ 1
- 1
src/system/taglib/likearticle.lib.php View File

@@ -122,7 +122,7 @@ function lib_likearticle(&$ctag, &$refObj)
$row['sitepath'] $row['sitepath']
); );
if ($row['litpic'] == '-' || $row['litpic'] == '') { if ($row['litpic'] == '-' || $row['litpic'] == '') {
$row['litpic'] = '/static/web/img/thumbnail.jpg';
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg';
} }
if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') {
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic'];


+ 1
- 1
src/system/taglib/relation.lib.php View File

@@ -108,7 +108,7 @@ function lib_relation(&$ctag, &$refObj)
$row['sitepath'] $row['sitepath']
); );
if ($row['litpic'] == '-' || $row['litpic'] == '') { if ($row['litpic'] == '-' || $row['litpic'] == '') {
$row['litpic'] = '/static/web/img/thumbnail.jpg';
$row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg';
} }
if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') { if (!preg_match("#^(http|https):\/\/#i", $row['litpic']) && $GLOBALS['cfg_multi_site'] == 'Y') {
$row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic']; $row['litpic'] = $GLOBALS['cfg_mainsite'].$row['litpic'];


+ 1
- 1
src/system/taglib/statistics.lib.php View File

@@ -21,7 +21,7 @@ function lib_statistics(&$ctag, &$refObj)
$pms['typeid'] = isset($envs['typeid'])? $envs['typeid'] : 0; $pms['typeid'] = isset($envs['typeid'])? $envs['typeid'] : 0;
$pms['aid'] = isset($envs['aid'])? $envs['aid'] : 0; $pms['aid'] = isset($envs['aid'])? $envs['aid'] : 0;
$pms['value'] = isset($envs['value'])? $envs['value'] : ''; $pms['value'] = isset($envs['value'])? $envs['value'] : '';
$revalue = '<script async src="'.'/apps/statistics.php?'.http_build_query($pms).'"></script>';
$revalue = '<script async src="'.$GLOBALS['cfg_cmspath'].'/apps/statistics.php?'.http_build_query($pms).'"></script>';
return $revalue; return $revalue;
} }
?> ?>

+ 1
- 1
src/system/taglib/tag.lib.php View File

@@ -21,7 +21,7 @@ function lib_tag(&$ctag, &$refObj)
$ltype = $sort; $ltype = $sort;
$num = $row; $num = $row;
$addsql = ''; $addsql = '';
$tagsdir = str_replace("{cmspath}", "", $cfg_tags_dir);
$tagsdir = str_replace("{cmspath}", $cfg_cmspath, $cfg_tags_dir);
if ($getall == 0 && isset($refObj->Fields['tags']) && !empty($refObj->Fields['aid'])) { if ($getall == 0 && isset($refObj->Fields['tags']) && !empty($refObj->Fields['aid'])) {
$dsql->SetQuery("SELECT tid FROM `#@__taglist` WHERE aid = '{$refObj->Fields['aid']}' "); $dsql->SetQuery("SELECT tid FROM `#@__taglist` WHERE aid = '{$refObj->Fields['aid']}' ");
$dsql->Execute(); $dsql->Execute();


+ 1
- 1
src/system/tpllib/plus_userarclist.php View File

@@ -28,7 +28,7 @@ function plus_userarclist(&$atts, &$refObj, &$fields)
$row['arcrank'],$row['namerule'],$row['typedir'],$row['money'],$row['filename'],$row['moresite'],$row['siteurl'],$row['sitepath']); $row['arcrank'],$row['namerule'],$row['typedir'],$row['money'],$row['filename'],$row['moresite'],$row['siteurl'],$row['sitepath']);
$row['typeurl'] = GetTypeUrl($row['typeid'],$row['typedir'],$row['isdefault'],$row['defaultname'],$row['ispart'], $row['typeurl'] = GetTypeUrl($row['typeid'],$row['typedir'],$row['isdefault'],$row['defaultname'],$row['ispart'],
$row['namerule2'],$row['moresite'],$row['siteurl'],$row['sitepath']); $row['namerule2'],$row['moresite'],$row['siteurl'],$row['sitepath']);
if ($row['litpic']=='') $row['litpic'] = '/static/web/img/thumbnail.jpg';
if ($row['litpic']=='') $row['litpic'] = $GLOBALS['cfg_cmspath'].'/static/web/img/thumbnail.jpg';
if (!preg_match("#^(http|https):\/\/#i", $row['litpic'])) { if (!preg_match("#^(http|https):\/\/#i", $row['litpic'])) {
$row['picname'] = $row['litpic'] = $GLOBALS['cfg_cmsurl'].$row['litpic']; $row['picname'] = $row['litpic'] = $GLOBALS['cfg_cmsurl'].$row['litpic'];
} else { } else {


+ 1
- 1
src/system/typelink/typelink.class.php View File

@@ -75,7 +75,7 @@ class TypeLink
function GetTypeDir() function GetTypeDir()
{ {
if (empty($this->TypeInfos['typedir'])) { if (empty($this->TypeInfos['typedir'])) {
return $GLOBALS['cfg_arcdir'];
return $GLOBALS['cfg_cmspath'].$GLOBALS['cfg_arcdir'];
} else { } else {
return $this->TypeInfos['typedir']; return $this->TypeInfos['typedir'];
} }


+ 1
- 1
src/system/typelink/typeunit.class.admin.php View File

@@ -23,7 +23,7 @@ class TypeUnit
function __construct() function __construct()
{ {
$this->idCounter = 0; $this->idCounter = 0;
$this->artDir = $GLOBALS['cfg_arcdir'];
$this->artDir = $GLOBALS['cfg_cmspath'].$GLOBALS['cfg_arcdir'];
$this->baseDir = $GLOBALS['cfg_basedir']; $this->baseDir = $GLOBALS['cfg_basedir'];
$this->shortName = $GLOBALS['art_shortname']; $this->shortName = $GLOBALS['art_shortname'];
$this->idArray = array(); $this->idArray = array();


+ 1
- 1
src/user/index_do.php View File

@@ -21,7 +21,7 @@ if ($fmdo == 'sendMail') {
exit(); exit();
} }
$userhash = md5($cfg_cookie_encode.'--'.$cfg_ml->fields['mid'].'--'.$cfg_ml->fields['email']); $userhash = md5($cfg_cookie_encode.'--'.$cfg_ml->fields['mid'].'--'.$cfg_ml->fields['email']);
$url = $cfg_basehost.$cfg_memberurl."/index_do.php?fmdo=checkMail&mid={$cfg_ml->fields['mid']}&userhash={$userhash}&do=1";
$url = $cfg_basehost.(empty($cfg_cmspath) ? '/' : $cfg_cmspath)."/user/index_do.php?fmdo=checkMail&mid={$cfg_ml->fields['mid']}&userhash={$userhash}&do=1";
$url = preg_replace("#http:\/\/#i", '', $url); $url = preg_replace("#http:\/\/#i", '', $url);
$proto = IsSSL()? "https://" : "http://"; $proto = IsSSL()? "https://" : "http://";
$url = $proto.preg_replace("#\/\/#i", '/', $url); $url = $proto.preg_replace("#\/\/#i", '/', $url);


Loading…
Cancel
Save