diff --git a/src/admin/album_add.php b/src/admin/album_add.php index 0e83b70a..d8db5e64 100644 --- a/src/admin/album_add.php +++ b/src/admin/album_add.php @@ -226,7 +226,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 发布图片文档修改图片文档浏览图片文档管理图片文档$backurl + 浏览图片文档发布图片文档修改图片文档管理图片文档$backurl "; $msg = "{$msg}".GetUpdateTest(); $wintitle = "成功发布图片文档"; diff --git a/src/admin/album_edit.php b/src/admin/album_edit.php index b3d20cdb..dd7c1394 100644 --- a/src/admin/album_edit.php +++ b/src/admin/album_edit.php @@ -268,7 +268,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 发布图片文档修改图片文档浏览图片文档管理图片文档$backurl + 浏览图片文档发布图片文档修改图片文档管理图片文档$backurl "; $wintitle = "成功修改图片文档"; $wecome_info = "文档管理 - 修改图片文档"; diff --git a/src/admin/archives_add.php b/src/admin/archives_add.php index 38776ed1..daa0db04 100644 --- a/src/admin/archives_add.php +++ b/src/admin/archives_add.php @@ -172,7 +172,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 发布自定义文档修改自定义文档浏览自定义文档管理自定义文档$backurl + 浏览自定义文档发布自定义文档修改自定义文档管理自定义文档$backurl "; $msg = "{$msg}".GetUpdateTest(); $wintitle = "成功发布自定义文档"; diff --git a/src/admin/archives_edit.php b/src/admin/archives_edit.php index 72db2fd0..865e9ca9 100644 --- a/src/admin/archives_edit.php +++ b/src/admin/archives_edit.php @@ -157,7 +157,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 发布自定义文档修改自定义文档查看自定义文档管理自定义文档$backurl + 浏览自定义文档发布自定义文档修改自定义文档管理自定义文档$backurl "; $wintitle = "成功修改自定义文档"; $wecome_info = "文档管理 - 修改自定义文档"; diff --git a/src/admin/archives_sg_add.php b/src/admin/archives_sg_add.php index 4282025d..e55b34fe 100644 --- a/src/admin/archives_sg_add.php +++ b/src/admin/archives_sg_add.php @@ -127,7 +127,7 @@ if ($dopost != 'save') { ClearMyAddon($arcID, $title); //返回成功信息 $msg = " - 发布分类文档修改分类文档浏览分类文档管理分类文档 + 浏览分类文档发布分类文档修改分类文档管理分类文档 "; $wintitle = "成功发布分类文档"; $wecome_info = "文档管理 - 发布分类文档"; diff --git a/src/admin/archives_sg_edit.php b/src/admin/archives_sg_edit.php index c179f308..28fafafb 100644 --- a/src/admin/archives_sg_edit.php +++ b/src/admin/archives_sg_edit.php @@ -110,7 +110,7 @@ if ($dopost != 'save') { ClearMyAddon($id, $title); //返回成功信息 $msg = " - 发布分类文档修改分类文档浏览分类文档管理分类文档 + 浏览分类文档发布分类文档修改分类文档管理分类文档 "; $wintitle = "成功修改分类文档"; $wecome_info = "文档管理 - 修改分类文档"; diff --git a/src/admin/article_add.php b/src/admin/article_add.php index 0a64a3bc..93c7adf1 100644 --- a/src/admin/article_add.php +++ b/src/admin/article_add.php @@ -199,7 +199,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 发布文档修改文档浏览文档管理文档$backurl + 浏览文档发布文档修改文档管理文档 "; $msg = "{$msg}".GetUpdateTest(); $wintitle = "成功发布文档"; diff --git a/src/admin/article_edit.php b/src/admin/article_edit.php index 37a4de87..39a2cb8b 100644 --- a/src/admin/article_edit.php +++ b/src/admin/article_edit.php @@ -171,7 +171,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 发布文档修改文档浏览文档管理文档$backurl + 浏览文档发布文档修改文档管理文档 "; $wintitle = "成功修改文档"; $wecome_info = "文档管理 - 修改文档"; diff --git a/src/admin/soft_add.php b/src/admin/soft_add.php index 6a88bc5e..df8760bb 100644 --- a/src/admin/soft_add.php +++ b/src/admin/soft_add.php @@ -231,7 +231,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 发布软件文档修改软件文档浏览软件文档管理软件文档 + 浏览软件文档发布软件文档修改软件文档管理软件文档 "; $msg = "{$msg}".GetUpdateTest(); $wintitle = "成功发布软件文档"; diff --git a/src/admin/soft_edit.php b/src/admin/soft_edit.php index 03e70194..dc971d18 100644 --- a/src/admin/soft_edit.php +++ b/src/admin/soft_edit.php @@ -213,7 +213,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 发布软件文档修改软件文档浏览软件文档管理软件文档 + 浏览软件文档发布软件文档修改软件文档管理软件文档 "; $wintitle = "成功修改软件文档"; $wecome_info = "文档管理 - 修改软件文档"; diff --git a/src/admin/spec_add.php b/src/admin/spec_add.php index b1d57958..09c21d72 100644 --- a/src/admin/spec_add.php +++ b/src/admin/spec_add.php @@ -177,7 +177,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 发布专题修改专题浏览专题管理专题 + 浏览专题发布专题修改专题管理专题 "; $wintitle = "成功发布专题"; $wecome_info = "专题管理 - 发布专题"; diff --git a/src/admin/spec_edit.php b/src/admin/spec_edit.php index ee072d80..f1d8c544 100644 --- a/src/admin/spec_edit.php +++ b/src/admin/spec_edit.php @@ -190,7 +190,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 发布专题修改专题浏览专题管理专题 + 浏览专题发布专题修改专题管理专题 "; $wintitle = "成功修改专题"; $wecome_info = "专题管理 - 修改专题"; diff --git a/src/admin/templets/stepselect_showajax.htm b/src/admin/templets/stepselect_showajax.htm index 4b319f66..23128ff8 100644 --- a/src/admin/templets/stepselect_showajax.htm +++ b/src/admin/templets/stepselect_showajax.htm @@ -7,7 +7,7 @@ if ($action=='edit') {
> -
+
(缓存组名必须用英文或数字) @@ -22,9 +22,9 @@ if ($action=='edit') { ?> -
+
- + (缓存组名必须用英文或数字)
@@ -53,7 +53,7 @@ if ($action=='edit') {
-
+
(如果不指定,默认以枚举添加先后来排序) diff --git a/src/system/archive/archives.class.php b/src/system/archive/archives.class.php index cbebc356..7e97e31b 100755 --- a/src/system/archive/archives.class.php +++ b/src/system/archive/archives.class.php @@ -238,7 +238,7 @@ class Archives } $this->Fields['picname'] = $this->Fields['litpic']; //模板里直接使用{dede:field name='image'/}获取缩略图 - $this->Fields['image'] = (!preg_match('/jpg|gif|png/i', $this->Fields['picname']) ? '' : ""); + $this->Fields['image'] = (!preg_match('/jpg|gif|png/i', $this->Fields['picname']) ? '' : ""); } //处理投票选项 if (isset($this->Fields['voteid']) && !empty($this->Fields['voteid'])) { @@ -352,8 +352,8 @@ class Archives if ($i > 1) $this->Fields['title'] = $this->Fields['tmptitle']."($i)"; } if ($i > 1) { - $TRUEfilename = $this->GetTruePath().$fileFirst."_".$i.".".$this->ShortName; - $URLFilename = $fileFirst."_".$i.".".$this->ShortName; + $TRUEfilename = $this->GetTruePath().$fileFirst."-".$i.".".$this->ShortName; + $URLFilename = $fileFirst."-".$i.".".$this->ShortName; } else { $TRUEfilename = $this->GetTruePath().$filename; $URLFilename = $filename; @@ -412,11 +412,11 @@ class Archives */ function GetField($fname, $ctag) { - //所有Field数组 OR 普通Field + //所有Field数组OR普通Field if ($fname == 'array') { return $this->Fields; } - //指定了ID的节点 + //指定了id的节点 else if ($ctag->GetAtt('noteid') != '') { if (isset($this->Fields[$fname.'_'.$ctag->GetAtt('noteid')])) { return $this->Fields[$fname.'_'.$ctag->GetAtt('noteid')]; @@ -489,7 +489,7 @@ class Archives if ($GLOBALS['cfg_jump_once'] == 'N') { $pageHtml = "\r\n\r\n\r\n".$this->Fields['title']."\r\n"; $pageHtml .= "Fields['redirecturl']."\">\r\n\r\n\r\n"; - $pageHtml .= "正在前往文档:".$this->Fields['title']."

\r\n文档描述:".$this->Fields['description']."\r\n\r\n\r\n"; + $pageHtml .= "

正在前往文档:".$this->Fields['title']."

\r\n

文档描述:".$this->Fields['description']."

\r\n\r\n"; echo $pageHtml; } else { header("location:{$this->Fields['redirecturl']}"); @@ -750,7 +750,106 @@ class Archives return $rs; } /** - * 获得动态页面分页列表 + * 获得动态文档分页标题 + * + * @access public + * @param string $styleName 类型名称 + * @param string $pageNo 页码数 + * @return string + */ + function GetPageTitlesDM($styleName, $pageNo) + { + if ($this->TotalPage == 1) { + return ""; + } + if (count($this->SplitTitles) == 0) { + return ""; + } + $i = 1; + $aid = $this->ArcID; + if ($styleName == 'link') { + $revalue = ""; + foreach ($this->SplitTitles as $k => $v) { + if ($i == 1) { + $revalue .= "$v\r\n"; + } else { + if ($pageNo == $i) { + $revalue .= " $v \r\n"; + } else { + $revalue .= "$v\r\n"; + } + } + $i++; + } + } else { + $revalue = "\r\n"; + } + return $revalue; + } + /** + * 获得静态文档分页标题 + * + * @access public + * @param string $styleName 类型名称 + * @param string $pageNo 页码数 + * @return string + */ + function GetPageTitlesST($styleName, $pageNo) + { + if ($this->TotalPage == 1) { + return ""; + } + if (count($this->SplitTitles) == 0) { + return ""; + } + $i = 1; + if ($styleName == 'link') { + $revalue = ""; + foreach ($this->SplitTitles as $k => $v) { + if ($i == 1) { + $revalue .= "$v\r\n"; + } else { + if ($pageNo == $i) { + $revalue .= " $v \r\n"; + } else { + $revalue .= "$v\r\n"; + } + } + $i++; + } + } else { + $revalue = "\r\n"; + } + return $revalue; + } + /** + * 获得动态文档分页列表 * * @access public * @param int $totalPage 总页数 @@ -768,38 +867,38 @@ class Archives $nPage = $nowPage - 1; $lPage = $nowPage + 1; if ($nowPage == 1) { - $PageList .= "
  • 上一页
  • "; + $PageList .= "
  • 上一页
  • "; } else { if ($nPage == 1) { - $PageList .= "
  • 上一页
  • "; + $PageList .= "
  • 上一页
  • "; if ($cfg_rewrite == 'Y') { - $PageList = preg_replace("#.php\?aid=(\d+)#i", '-\\1-1.html', $PageList); + $PageList = preg_replace("#.php\?aid=(\d+)#i", "-\\1-1.html", $PageList); } } else { - $PageList .= "
  • 上一页
  • "; + $PageList .= "
  • 上一页
  • "; if ($cfg_rewrite == 'Y') { $PageList = str_replace(".php?aid=", "-", $PageList); - $PageList = preg_replace("#&pageno=(\d+)#i", '-\\1.html', $PageList); + $PageList = preg_replace("#&pageno=(\d+)#i", "-\\1.html", $PageList); } } } for ($i = 1; $i <= $totalPage; $i++) { if ($i == 1) { if ($nowPage != 1) { - $PageList .= "
  • 1
  • "; + $PageList .= "
  • 1
  • "; if ($cfg_rewrite == 'Y') { - $PageList = preg_replace("#.php\?aid=(\d+)#i", '-\\1-1.html', $PageList); + $PageList = preg_replace("#.php\?aid=(\d+)#i", "-\\1-1.html", $PageList); } } else { - $PageList .= "
  • 1
  • "; + $PageList .= "
  • 1
  • "; } } else { $n = $i; if ($nowPage != $i) { - $PageList .= "
  • ".$n."
  • "; + $PageList .= "
  • {$n}
  • "; if ($cfg_rewrite == 'Y') { $PageList = str_replace(".php?aid=", "-", $PageList); - $PageList = preg_replace("#&pageno=(\d+)#i", '-\\1.html', $PageList); + $PageList = preg_replace("#&pageno=(\d+)#i", "-\\1.html", $PageList); } } else { $PageList .= "
  • {$n}
  • "; @@ -807,10 +906,10 @@ class Archives } } if ($lPage <= $totalPage) { - $PageList .= "
  • 下一页
  • "; + $PageList .= "
  • 下一页
  • "; if ($cfg_rewrite == 'Y') { $PageList = str_replace(".php?aid=", "-", $PageList); - $PageList = preg_replace("#&pageno=(\d+)#i", '-\\1.html', $PageList); + $PageList = preg_replace("#&pageno=(\d+)#i", "-\\1.html", $PageList); } } else { $PageList .= "
  • 下一页
  • "; @@ -818,7 +917,7 @@ class Archives return $PageList; } /** - * 获得静态页面分页列表 + * 获得静态文档分页列表 * * @access public * @param int $totalPage 总页数 @@ -831,7 +930,7 @@ class Archives if ($totalPage == 1) { return ""; } - $PageList = "
  • ".$totalPage."页:
  • "; + $PageList = "
  • ".$totalPage."页
  • "; $nPage = $nowPage - 1; $lPage = $nowPage + 1; if ($nowPage == 1) { @@ -840,7 +939,7 @@ class Archives if ($nPage == 1) { $PageList .= "
  • 上一页
  • "; } else { - $PageList .= "
  • 上一页
  • "; + $PageList .= "
  • 上一页
  • "; } } for ($i = 1; $i <= $totalPage; $i++) { @@ -853,120 +952,21 @@ class Archives } else { $n = $i; if ($nowPage != $i) { - $PageList .= "
  • ".$n."
  • "; + $PageList .= "
  • {$n}
  • "; } else { $PageList .= "
  • {$n}
  • "; } } } if ($lPage <= $totalPage) { - $PageList .= "
  • 下一页
  • "; + $PageList .= "
  • 下一页
  • "; } else { $PageList .= "
  • 下一页
  • "; } return $PageList; } /** - * 获得动态页面小标题 - * - * @access public - * @param string $styleName 类型名称 - * @param string $pageNo 页码数 - * @return string - */ - function GetPageTitlesDM($styleName, $pageNo) - { - if ($this->TotalPage == 1) { - return ""; - } - if (count($this->SplitTitles) == 0) { - return ""; - } - $i = 1; - $aid = $this->ArcID; - if ($styleName == 'link') { - $revalue = ""; - foreach ($this->SplitTitles as $k => $v) { - if ($i == 1) { - $revalue .= "$v\r\n"; - } else { - if ($pageNo == $i) { - $revalue .= " $v \r\n"; - } else { - $revalue .= "$v\r\n"; - } - } - $i++; - } - } else { - $revalue = "\r\n"; - } - return $revalue; - } - /** - * 获得静态页面小标题 - * - * @access public - * @param string $styleName 类型名称 - * @param string $pageNo 页码数 - * @return string - */ - function GetPageTitlesST($styleName, $pageNo) - { - if ($this->TotalPage == 1) { - return ""; - } - if (count($this->SplitTitles) == 0) { - return ""; - } - $i = 1; - if ($styleName == 'link') { - $revalue = ""; - foreach ($this->SplitTitles as $k => $v) { - if ($i == 1) { - $revalue .= "$v\r\n"; - } else { - if ($pageNo == $i) { - $revalue .= " $v \r\n"; - } else { - $revalue .= "$v\r\n"; - } - } - $i++; - } - } else { - $revalue = "\r\n"; - } - return $revalue; - } - /** - * 高亮问题修正,排除alt title 直接的字符替换 + * 高亮问题修正,排除alt、title、直接的字符替换 * * @param string $kw * @param string $body diff --git a/src/user/album_add.php b/src/user/album_add.php index d01f49de..fe82e309 100755 --- a/src/user/album_add.php +++ b/src/user/album_add.php @@ -149,7 +149,7 @@ if (empty($dopost)) { if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$arcID"; ClearMyAddon($arcID, $title); //返回成功信息 - $msg = "发布图片文档修改图片文档浏览图片文档管理图片文档"; + $msg = "浏览图片文档发布图片文档修改图片文档管理图片文档"; $wintitle = "成功发布图片文档"; $wecome_info = "图片管理 - 发布图片文档"; $win = new OxWindow(); diff --git a/src/user/album_edit.php b/src/user/album_edit.php index 9ae63361..81d56b57 100755 --- a/src/user/album_edit.php +++ b/src/user/album_edit.php @@ -126,7 +126,7 @@ if (empty($dopost)) { $artUrl = MakeArt($aid, TRUE); if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$aid"; //返回成功信息 - $msg = "发布图片文档修改图片文档浏览图片文档管理图片文档 "; + $msg = "浏览图片文档发布图片文档修改图片文档管理图片文档 "; //提交后返回提交页面 $wintitle = "成功修改图片文档"; $wecome_info = "图片管理 - 修改图片文档"; diff --git a/src/user/archives_add.php b/src/user/archives_add.php index 557ad6e0..5c327515 100755 --- a/src/user/archives_add.php +++ b/src/user/archives_add.php @@ -122,7 +122,7 @@ if (empty($dopost)) { } ClearMyAddon($arcID, $title); //返回成功信息 - $msg = "发布自定义文档修改自定义文档浏览自定义文档管理自定义文档"; + $msg = "浏览自定义文档发布自定义文档修改自定义文档管理自定义文档"; $wintitle = "成功发布自定义文档"; $wecome_info = "文档管理 - 发布自定义文档"; $win = new OxWindow(); diff --git a/src/user/archives_edit.php b/src/user/archives_edit.php index a446d34b..eeb2a68d 100755 --- a/src/user/archives_edit.php +++ b/src/user/archives_edit.php @@ -90,7 +90,7 @@ if (empty($dopost)) { $artUrl = MakeArt($aid, TRUE); if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$aid"; //返回成功信息 - $msg = "发布自定义文档修改自定义文档浏览自定义文档管理自定义文档"; + $msg = "浏览自定义文档发布自定义文档修改自定义文档管理自定义文档"; $wintitle = "成功修改自定义文档"; $wecome_info = "文档管理 - 修改自定义文档"; $win = new OxWindow(); diff --git a/src/user/archives_sg_add.php b/src/user/archives_sg_add.php index a37dd061..fa433345 100755 --- a/src/user/archives_sg_add.php +++ b/src/user/archives_sg_add.php @@ -152,7 +152,7 @@ if (empty($dopost)) { if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$arcID"; ClearMyAddon($arcID, $title); //返回成功信息 - $msg = "发布分类文档修改分类文档浏览分类文档管理分类文档"; + $msg = "浏览分类文档发布分类文档修改分类文档管理分类文档"; $wintitle = "成功发布分类文档"; $wecome_info = "文档管理 - 发布分类文档"; $win = new OxWindow(); diff --git a/src/user/archives_sg_edit.php b/src/user/archives_sg_edit.php index 1f5441e7..2795cd3a 100755 --- a/src/user/archives_sg_edit.php +++ b/src/user/archives_sg_edit.php @@ -106,7 +106,7 @@ if (empty($dopost)) { $artUrl = MakeArt($aid, true); if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$aid"; //返回成功信息 - $msg = "发布分类文档修改分类文档浏览分类文档管理分类文档"; + $msg = "浏览分类文档发布分类文档修改分类文档管理分类文档"; $wintitle = "成功修改分类文档"; $wecome_info = "文档管理 - 修改分类文档"; $win = new OxWindow(); diff --git a/src/user/article_add.php b/src/user/article_add.php index acf257cc..de1308d7 100755 --- a/src/user/article_add.php +++ b/src/user/article_add.php @@ -111,7 +111,7 @@ if (empty($dopost)) { if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$arcID"; ClearMyAddon($arcID, $title); //返回成功信息 - $msg = "发布文档修改文档浏览文档管理文档"; + $msg = "浏览文档发布文档修改文档管理文档"; $wintitle = "成功发布文档"; $wecome_info = "文档管理 - 发布文档"; $win = new OxWindow(); diff --git a/src/user/article_edit.php b/src/user/article_edit.php index e7f4a5c2..b8fa6412 100755 --- a/src/user/article_edit.php +++ b/src/user/article_edit.php @@ -85,7 +85,7 @@ if (empty($dopost)) { $artUrl = $cfg_phpurl."/view.php?aid=$aid"; } //返回成功信息 - $msg = "发布文档修改文档浏览文档管理文档"; + $msg = "浏览文档发布文档修改文档管理文档"; $wintitle = "成功修改文档"; $wecome_info = "文档管理 - 修改文档"; $win = new OxWindow(); diff --git a/src/user/soft_add.php b/src/user/soft_add.php index 210dbd9b..639fd3ac 100755 --- a/src/user/soft_add.php +++ b/src/user/soft_add.php @@ -165,7 +165,7 @@ if (empty($dopost)) { } ClearMyAddon($arcID, $title); //返回成功信息 - $msg = "发布软件文档修改软件文档浏览软件文档管理软件文档"; + $msg = "浏览软件文档发布软件文档修改软件文档管理软件文档"; $wintitle = "成功发布文档文档"; $wecome_info = "软件管理 - 发布软件文档"; $win = new OxWindow(); diff --git a/src/user/soft_edit.php b/src/user/soft_edit.php index f94ab2d6..7edad910 100755 --- a/src/user/soft_edit.php +++ b/src/user/soft_edit.php @@ -163,7 +163,7 @@ if (empty($dopost)) { $artUrl = $cfg_phpurl."/view.php?aid=$aid"; } //返回成功信息 - $msg = "发布软件文档修改软件文档浏览软件文档管理软件文档"; + $msg = "浏览软件文档发布软件文档修改软件文档管理软件文档"; $wintitle = "成功修改软件文档"; $wecome_info = "软件管理 - 修改软件文档"; $win = new OxWindow(); diff --git a/src/user/templets/edit_baseinfo.htm b/src/user/templets/edit_baseinfo.htm index 91a6e59b..af073ba8 100755 --- a/src/user/templets/edit_baseinfo.htm +++ b/src/user/templets/edit_baseinfo.htm @@ -35,8 +35,8 @@
    M_LoginID;?>
    - -
    + +
    @@ -47,15 +47,15 @@
    - +
    - +
    - +
    @@ -63,7 +63,7 @@
    - +
    @@ -71,11 +71,11 @@
    - +
    - +