From 9056afc5b5a62c52a54f13af7da70beed8105d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <93301500+xushubieli@users.noreply.github.com> Date: Tue, 6 Jun 2023 14:56:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=A1=86=EF=BC=8C=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=EF=BC=8C=E6=A8=A1=E5=9D=97=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=EF=BC=8C=E6=A8=A1=E5=9E=8B=E5=AF=BC=E5=85=A5=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E7=AD=89=E7=AD=89=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/album_add.php | 2 +- src/admin/album_edit.php | 2 +- src/admin/archives_add.php | 2 +- src/admin/archives_edit.php | 2 +- src/admin/archives_sg_add.php | 2 +- src/admin/archives_sg_edit.php | 2 +- src/admin/article_add.php | 2 +- src/admin/article_edit.php | 2 +- src/admin/catalog_add.php | 2 +- src/admin/content_list.php | 4 +- src/admin/content_sg_list.php | 4 +- src/admin/dialog/select_images.php | 6 +- src/admin/freelist_main.php | 3 +- src/admin/inc/inc_archives_all.php | 18 +-- src/admin/inc/inc_menu.php | 1 - src/admin/js/handlers.js | 2 +- src/admin/js/list.js | 6 +- src/admin/js/main.js | 4 +- src/admin/module_main.php | 2 +- src/admin/mychannel_edit.php | 126 +++++++++++------- src/admin/soft_add.php | 2 +- src/admin/soft_edit.php | 4 +- src/admin/spec_add.php | 2 +- src/admin/spec_edit.php | 2 +- src/admin/templets/ad_add.htm | 2 +- src/admin/templets/album_add.htm | 2 +- src/admin/templets/album_edit.htm | 2 +- src/admin/templets/archives_add.htm | 2 +- src/admin/templets/archives_edit.htm | 2 +- src/admin/templets/article_add.htm | 2 +- .../templets/article_description_main.htm | 2 +- src/admin/templets/article_edit.htm | 2 +- src/admin/templets/catalog_add.htm | 12 +- src/admin/templets/catalog_edit.htm | 14 +- src/admin/templets/diy_field_add.htm | 8 +- src/admin/templets/diy_field_edit.htm | 8 +- src/admin/templets/file_edit.htm | 4 +- src/admin/templets/file_upload.htm | 30 +++-- src/admin/templets/makehtml_homepage.htm | 2 +- src/admin/templets/makehtml_taglist.htm | 2 +- src/admin/templets/media_add.htm | 30 ++--- src/admin/templets/media_edit.htm | 19 ++- src/admin/templets/mychannel_add.htm | 2 +- src/admin/templets/mychannel_edit.htm | 4 +- src/admin/templets/mychannel_field_add.htm | 10 +- src/admin/templets/mychannel_field_edit.htm | 10 +- src/admin/templets/mychannel_main.htm | 2 +- src/admin/templets/soft_add.htm | 2 +- src/admin/templets/soft_edit.htm | 2 +- src/admin/templets/spec_add.htm | 2 +- src/admin/templets/spec_edit.htm | 2 +- src/admin/templets/stepselect_main.htm | 4 +- src/admin/templets/stepselect_showajax.htm | 4 +- src/admin/templets/templets_one_add.htm | 4 +- src/admin/templets/templets_one_edit.htm | 2 +- src/admin/templets/tpl_edit.htm | 2 +- src/admin/templets/tpl_edit_tag.htm | 2 +- src/admin/templets/tpl_newfile.htm | 2 +- src/admin/tpl.php | 2 +- src/apps/jump.php | 2 +- src/install/sql-dfdata.txt | 4 +- src/system/common.func.php | 2 +- src/system/customfields.func.php | 12 +- src/system/dedevote.class.php | 2 +- src/system/libraries/oxwindow.class.php | 24 ++-- src/system/typelink/typeunit.class.admin.php | 12 +- src/system/typelink/typeunit.class.menu.php | 2 +- src/theme/dedebiz/article_article.htm | 2 +- src/theme/dedebiz/article_default.htm | 4 +- src/theme/dedebiz/article_default_sg.htm | 4 +- src/theme/dedebiz/article_image.htm | 2 +- src/theme/dedebiz/article_infos.htm | 2 +- src/theme/dedebiz/article_soft.htm | 2 +- src/theme/dedebiz/widget_article_feedback.htm | 4 +- src/user/album_add.php | 2 +- src/user/album_edit.php | 2 +- src/user/archives_add.php | 2 +- src/user/archives_edit.php | 2 +- src/user/archives_sg_add.php | 2 +- src/user/archives_sg_edit.php | 2 +- src/user/article_add.php | 2 +- src/user/article_edit.php | 2 +- src/user/buy_action.php | 4 +- src/user/index_do.php | 2 +- src/user/soft_add.php | 2 +- src/user/soft_edit.php | 4 +- src/user/templets/album_edit.htm | 2 +- src/user/templets/buy.htm | 15 ++- src/user/templets/buy_action_payment.htm | 4 +- src/user/templets/index.htm | 4 +- src/user/templets/reg-new.htm | 2 +- src/user/templets/soft_add.htm | 4 +- src/user/templets/soft_edit.htm | 2 +- 93 files changed, 293 insertions(+), 255 deletions(-) diff --git a/src/admin/album_add.php b/src/admin/album_add.php index d8db5e64..e53b8a66 100644 --- a/src/admin/album_add.php +++ b/src/admin/album_add.php @@ -233,7 +233,7 @@ if ($dopost != 'save') { $wecome_info = "文档管理 - 发布图片文档"; $win = new OxWindow(); $win->AddTitle("成功发布图片文档"); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", FALSE); $win->Display(); } diff --git a/src/admin/album_edit.php b/src/admin/album_edit.php index dd7c1394..a743f4d7 100644 --- a/src/admin/album_edit.php +++ b/src/admin/album_edit.php @@ -274,7 +274,7 @@ if ($dopost != 'save') { $wecome_info = "文档管理 - 修改图片文档"; $win = new OxWindow(); $win->AddTitle("成功修改图片文档"); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(); } diff --git a/src/admin/archives_add.php b/src/admin/archives_add.php index daa0db04..230a78c3 100644 --- a/src/admin/archives_add.php +++ b/src/admin/archives_add.php @@ -179,7 +179,7 @@ if ($dopost != 'save') { $wecome_info = "文档管理 - 发布自定义文档"; $win = new OxWindow(); $win->AddTitle("成功发布自定义文档:"); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(); } diff --git a/src/admin/archives_edit.php b/src/admin/archives_edit.php index 865e9ca9..b4cf7a02 100644 --- a/src/admin/archives_edit.php +++ b/src/admin/archives_edit.php @@ -163,7 +163,7 @@ if ($dopost != 'save') { $wecome_info = "文档管理 - 修改自定义文档"; $win = new OxWindow(); $win->AddTitle("成功修改自定义文档"); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(); } diff --git a/src/admin/archives_sg_add.php b/src/admin/archives_sg_add.php index e55b34fe..898818ba 100644 --- a/src/admin/archives_sg_add.php +++ b/src/admin/archives_sg_add.php @@ -133,7 +133,7 @@ if ($dopost != 'save') { $wecome_info = "文档管理 - 发布分类文档"; $win = new OxWindow(); $win->AddTitle("成功发布分类文档"); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(); } diff --git a/src/admin/archives_sg_edit.php b/src/admin/archives_sg_edit.php index 28fafafb..8ba4a567 100644 --- a/src/admin/archives_sg_edit.php +++ b/src/admin/archives_sg_edit.php @@ -116,7 +116,7 @@ if ($dopost != 'save') { $wecome_info = "文档管理 - 修改分类文档"; $win = new OxWindow(); $win->AddTitle("成功修改分类文档"); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(); } diff --git a/src/admin/article_add.php b/src/admin/article_add.php index 93c7adf1..056cb485 100644 --- a/src/admin/article_add.php +++ b/src/admin/article_add.php @@ -206,7 +206,7 @@ if ($dopost != 'save') { $wecome_info = "文档管理 - 发布文档"; $win = new OxWindow(); $win->AddTitle("成功发布文档"); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(); } diff --git a/src/admin/article_edit.php b/src/admin/article_edit.php index 39a2cb8b..e2e998c5 100644 --- a/src/admin/article_edit.php +++ b/src/admin/article_edit.php @@ -177,7 +177,7 @@ if ($dopost != 'save') { $wecome_info = "文档管理 - 修改文档"; $win = new OxWindow(); $win->AddTitle("成功修改文档"); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(); } diff --git a/src/admin/catalog_add.php b/src/admin/catalog_add.php index d793ff29..c0a804b9 100644 --- a/src/admin/catalog_add.php +++ b/src/admin/catalog_add.php @@ -155,7 +155,7 @@ if ($dopost == 'quick') { if ($siteurl != '') { $siteurl = preg_replace("#\/$#", "", $siteurl); if (!preg_match("#http:\/\/#i", $siteurl)) { - ShowMsg("您绑定的二级域名无效,需要加http开头的链接", "-1"); + ShowMsg("您绑定的二级域名无效,需要以http开头的链接", "-1"); exit(); } if (preg_match("#".$cfg_basehost."#i", $siteurl)) { diff --git a/src/admin/content_list.php b/src/admin/content_list.php index f3d227c5..a28babb7 100644 --- a/src/admin/content_list.php +++ b/src/admin/content_list.php @@ -147,9 +147,9 @@ if ($stime > 0 && $etime > 0) { } if ($arcrank != '') { $whereSql .= " AND arc.arcrank = '$arcrank' "; - $CheckUserSend = ""; + $CheckUserSend = ""; } else { - $CheckUserSend = ""; + $CheckUserSend = ""; } $orderby = empty($orderby) ? 'id' : preg_replace("#[^a-z0-9]#", "", $orderby); $orderbyField = 'arc.'.$orderby; diff --git a/src/admin/content_sg_list.php b/src/admin/content_sg_list.php index 6f305ba9..8b965cc8 100644 --- a/src/admin/content_sg_list.php +++ b/src/admin/content_sg_list.php @@ -69,9 +69,9 @@ if ($keyword != '') $whereSql .= " AND (arc.title like '%$keyword%') "; if ($cid != 0 && !empty(GetSonIds($cid))) $whereSql .= " AND arc.typeid in (".GetSonIds($cid).")"; if ($arcrank != '') { $whereSql .= " AND arc.arcrank = '$arcrank' "; - $CheckUserSend = ""; + $CheckUserSend = ""; } else { - $CheckUserSend = ""; + $CheckUserSend = ""; } $query = "SELECT arc.aid,arc.aid as id,arc.typeid,arc.arcrank,arc.flag,arc.senddate,arc.channel,arc.title,arc.mid,arc.click,tp.typename,ch.typename as channelname FROM `$listtable` arc LEFT JOIN `#@__arctype` tp ON tp.id=arc.typeid LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel $whereSql ORDER BY arc.aid DESC"; $dlist = new DataListCP(); diff --git a/src/admin/dialog/select_images.php b/src/admin/dialog/select_images.php index b8f1a9d0..704caa53 100644 --- a/src/admin/dialog/select_images.php +++ b/src/admin/dialog/select_images.php @@ -65,7 +65,7 @@ if (!empty($iseditor)) {
- +
@@ -140,7 +140,7 @@ if (!empty($iseditor)) { else $lstyle = ""; $line = " @@ -155,7 +155,7 @@ if (!empty($iseditor)) { else $lstyle = ""; $line = " diff --git a/src/admin/freelist_main.php b/src/admin/freelist_main.php index 0a1f3326..5b54fed7 100644 --- a/src/admin/freelist_main.php +++ b/src/admin/freelist_main.php @@ -16,8 +16,7 @@ if (empty($pagesize)) $pagesize = 30; if (empty($pageno)) $pageno = 1; if (empty($dopost)) $dopost = ''; if (empty($orderby)) $orderby = 'aid'; -if (empty($keyword)) -{ +if (empty($keyword)) { $keyword = ''; $addget = ''; $addsql = ''; diff --git a/src/admin/inc/inc_archives_all.php b/src/admin/inc/inc_archives_all.php index a6719068..d891129d 100644 --- a/src/admin/inc/inc_archives_all.php +++ b/src/admin/inc/inc_archives_all.php @@ -78,27 +78,27 @@ function GetFormItem($ctag) } else if ($ctag->GetAtt("type") == "datetime") { $nowtime = GetDateTimeMk(time()); $innertext = ""; - $innertext .= ""; + $innertext .= ""; $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace("~form~", $innertext, $formitem); return $formitem; } else if ($ctag->GetAtt("type") == "img") { - $innertext = "\r\n"; + $innertext = "\r\n"; $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace("~form~", $innertext, $formitem); return $formitem; } else if ($ctag->GetAtt("type") == "media") { - $innertext = "\r\n"; + $innertext = "\r\n"; $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace("~form~", $innertext, $formitem); return $formitem; } else if ($ctag->GetAtt("type") == "addon") { - $innertext = "\r\n"; + $innertext = "\r\n"; $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace("~form~", $innertext, $formitem); return $formitem; } else if ($ctag->GetAtt("type") == "media") { - $innertext = "\r\n"; + $innertext = "\r\n"; $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace("~form~", $innertext, $formitem); return $formitem; @@ -293,7 +293,7 @@ function GetFormItemValue($ctag, $fvalue) } else if ($ctag->GetAtt("type") == "datetime") { $nowtime = GetDateTimeMk($fvalue); $innertext = ""; - $innertext .= ""; + $innertext .= ""; $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace("~form~", $innertext, $formitem); return $formitem; @@ -306,17 +306,17 @@ function GetFormItemValue($ctag, $fvalue) } $ntag = $ndtp->GetTag("img"); $fvalue = trim($ntag->GetInnerText()); - $innertext = "\r\n"; + $innertext = "\r\n"; $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace("~form~", $innertext, $formitem); return $formitem; } else if ($ctag->GetAtt("type") == "media") { - $innertext = "\r\n"; + $innertext = "\r\n"; $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace("~form~", $innertext, $formitem); return $formitem; } else if ($ctag->GetAtt("type") == "addon") { - $innertext = "\r\n"; + $innertext = "\r\n"; $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace("~form~", $innertext, $formitem); return $formitem; diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php index 02e54727..38e01a53 100644 --- a/src/admin/inc/inc_menu.php +++ b/src/admin/inc/inc_menu.php @@ -85,7 +85,6 @@ $menusMain = " $addset - diff --git a/src/admin/js/handlers.js b/src/admin/js/handlers.js index 26cd6109..ab6d2463 100644 --- a/src/admin/js/handlers.js +++ b/src/admin/js/handlers.js @@ -15,7 +15,7 @@ function addImage(src, pid) { newImgDiv.innerHTML = '
' + delstr; if (typeof arctype != 'undefined' && arctype == 'article') { if (pid != 0) { - newImgDiv.innerHTML = '
' + delstr; + newImgDiv.innerHTML = '
' + delstr; } } newImgDiv.innerHTML += '
'; diff --git a/src/admin/js/list.js b/src/admin/js/list.js index 3858947d..9c718e1b 100644 --- a/src/admin/js/list.js +++ b/src/admin/js/list.js @@ -6,7 +6,7 @@ function kwArc(aid) { var qstr=getCheckboxItem(); if (aid==0) aid = getOneItem(); if (qstr=='') { - ShowMsg('需要选择一个或多个文档'); + ShowMsg('请选择一个或多个文档'); return; } location="archives_do.php?aid="+aid+"&dopost=makekw&qstr="+qstr; @@ -28,7 +28,7 @@ function checkArc(aid) { function moveArc(e, obj, cid){ var qstr=getCheckboxItem(); if (qstr=='') { - ShowMsg('需要选择一个或多个文档'); + ShowMsg('请选择一个或多个文档'); return; } LoadQuickDiv(e, 'archives_do.php?dopost=moveArchives&qstr='+qstr+'&channelid='+cid+'&rnd='+Math.random(), 'moveArchives', 'auto', '180px'); @@ -43,7 +43,7 @@ function cAtts(jname, e, obj) { var qstr=getCheckboxItem(); var screeheight = document.body.clientHeight + 20; if (qstr=='') { - ShowMsg('需要选择一个或多个文档'); + ShowMsg('请选择一个或多个文档'); return; } LoadQuickDiv(e, 'archives_do.php?dopost=attsDlg&qstr='+qstr+'&dojob='+jname+'&rnd='+Math.random(), 'attsDlg', 'auto', '180px'); diff --git a/src/admin/js/main.js b/src/admin/js/main.js index 0a8ddeea..440219c1 100644 --- a/src/admin/js/main.js +++ b/src/admin/js/main.js @@ -390,7 +390,7 @@ function DedeConfirm(content = "", title = "确认提示") { reject("cancel"); CloseModal(`DedeModal${modalID}`); } - let footer = ``; + let footer = ``; let modal = ``; @@ -410,7 +410,7 @@ function ShowMsg(content, ...args) { size = ""; if (typeof content == "undefined") content = ""; modalID = guid(); - var footer = ``; + var footer = ``; var noClose = false; if (args.length == 1) { //存在args参数 diff --git a/src/admin/module_main.php b/src/admin/module_main.php index 88e10860..b793d092 100644 --- a/src/admin/module_main.php +++ b/src/admin/module_main.php @@ -244,7 +244,7 @@ if ($action == '') { $rooturl = $cfg_basehost.$cfg_cmspath; $setupsql = preg_replace("#_ROOTURL_#i", $rooturl, $setupsql); $setupsql = preg_replace("#[\r\n]{1,}#", "\n", $setupsql); - $sqls = @split(";[ \t]{0,}\n", $setupsql); + $sqls = preg_split('/;[ \t]{0,}\n/', $setupsql); foreach ($sqls as $sql) { if (trim($sql) != '') $dsql->ExecuteNoneQuery($sql); } diff --git a/src/admin/mychannel_edit.php b/src/admin/mychannel_edit.php index 8c5910c8..d35c30e5 100644 --- a/src/admin/mychannel_edit.php +++ b/src/admin/mychannel_edit.php @@ -53,41 +53,41 @@ if ($dopost == "show") { $win->AddHidden("id", $id); $win->AddHidden("dopost", 'copysave'); $msg = " - - - - - - - - - - - - - - - - - - - "; + + + + + + + + + + + + + + + + + + + "; $win->AddMsgItem("$msg"); $winform = $win->GetWindow("ok", ""); $win->Display(); exit(); } else if ($dopost == "export") { if ($id == -1) { - ShowMsg("专题文档模型不支持导出", "-1"); + ShowMsg("专题模型不支持导出", "-1"); exit(); } $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id' "); $channelconfig = ''; - $row['maintable'] = preg_replace('#dede_#', '#@__', $row['maintable']); - $row['addtable'] = preg_replace('#dede_#', '#@__', $row['addtable']); + $row['maintable'] = preg_replace('#biz_#', '#@__', $row['maintable']); + $row['addtable'] = preg_replace('#biz_#', '#@__', $row['addtable']); foreach ($row as $k => $v) { if ($k == 'fieldset') $v = "\r\n$v\r\n"; $channelconfig .= "$v\r\n"; @@ -119,7 +119,7 @@ if ($dopost == "show") { $wecome_info = "文档模型管理 - 导入文档模型规则"; $win = new OxWindow(); $win->Init(); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand"); $win->Display(); exit(); @@ -129,20 +129,35 @@ if ($dopost == "show") { $dtp = new DedeTagParse(); $dtp->SetNameSpace('channel', '<', '>'); $dtp->LoadSource($exconfig); - if (!is_array($dtp->CTags)) GotoStaMsg(""); + if (!is_array($dtp->CTags)) GotoStaMsg(" + + + + + "); $fields = array(); foreach ($dtp->CTags as $ctag) { $fname = $ctag->GetName('name'); $fields[$fname] = trim($ctag->GetInnerText()); } if (!isset($fields['nid']) || !isset($fields['fieldset'])) { - GotoStaMsg(""); + GotoStaMsg(" + + + + + "); } //正常的导入过程 $mysql_version = $dsql->GetVersion(true); $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE nid='{$fields['nid']}' "); if (is_array($row)) { - GotoStaMsg(""); + GotoStaMsg(" + + + + + "); } //创建表 if ($fields['issystem'] != -1) { @@ -157,7 +172,12 @@ if ($dopost == "show") { } $rs = $dsql->ExecuteNoneQuery($tabsql); if (!$rs) { - GotoStaMsg(""); + GotoStaMsg(" + + + + + "); exit(); } if ($fields['issystem'] == 1) $fields['issystem'] = 0; @@ -172,7 +192,12 @@ if ($dopost == "show") { $fields['fieldset'] = addslashes($fields['fieldset']); $inquery = "INSERT INTO `#@__channeltype` (`id`,`nid`,`typename`,`addtable`,`addcon`,`mancon`,`editcon`,`useraddcon`,`usermancon`,`usereditcon`,`fieldset`,`listfields`,`issystem`,`isshow`,`issend`,`arcsta`,`usertype`,`sendrank`) VALUES ('{$fields['newid']}','{$fields['nid']}','{$fields['typename']}','{$fields['addtable']}','{$fields['addcon']}','{$fields['mancon']}','{$fields['editcon']}','{$fields['useraddcon']}','{$fields['usermancon']}','{$fields['usereditcon']}','{$fields['fieldset']}','{$fields['listfields']}','{$fields['issystem']}','{$fields['isshow']}','{$fields['issend']}','{$fields['arcsta']}','{$fields['usertype']}','{$fields['sendrank']}' ); "; $rs = $dsql->ExecuteNoneQuery($inquery); - if (!$rs) GotoStaMsg(""); + if (!$rs) GotoStaMsg(" + + + + + "); $dtp = new DedeTagParse(); $dtp->SetNameSpace("field", "<", ">"); $dtp->LoadSource($fieldset); @@ -197,7 +222,12 @@ if ($dopost == "show") { if ($allfields != '') { $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET listfields='$allfields' WHERE id='{$fields['newid']}' "); } - GotoStaMsg(""); + GotoStaMsg(" + + + + + "); } else if ($dopost == "copysave") { $cid = intval($cid); $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$cid' ", MYSQL_ASSOC); @@ -226,7 +256,7 @@ if ($dopost == "show") { exit(); } else { $errv = $dsql->GetError(); - ShowMsg("复制模型失败,错误提示:$errv", "javascript:;"); + ShowMsg("复制文档模型失败,错误提示:$errv", "javascript:;"); exit(); } } else if ($dopost == "save") { @@ -244,7 +274,7 @@ if ($dopost == "show") { } $trueTable = str_replace("#@__", $cfg_dbprefix, $addtable); if (!$dsql->IsTable($trueTable)) { - ShowMsg("系统找不到您所指定的表$trueTable,请您创建这个表", "-1"); + ShowMsg("系统找不到您所指定的$trueTable表", "-1"); exit(); } $dsql->ExecuteNoneQuery($query); @@ -253,8 +283,8 @@ if ($dopost == "show") { } else if ($dopost == "gettemplets") { require_once(DEDEINC."/libraries/oxwindow.class.php"); $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id'"); - $wintitle = "查看模型使用模板"; - $wecome_info = "文档模型管理 - 查看模型模板"; + $wintitle = "查看模型应用模板"; + $wecome_info = "文档模型管理 - 模型应用模板"; $win = new OxWindow(); $win->Init("", "js/blank.js", ""); $win->AddTitle("栏目".$row['typename']."默认模板文件说明"); @@ -411,7 +441,7 @@ if ($dopost == "show") { $forms = ""; $forms .= ""; $forms .= ""; - $forms .= "关键词:
"; + $forms .= "
"; $mainstring = ''; if (!empty($mainfields) && is_array($mainfields)) { $mainstring = implode(',', $mainfields); @@ -420,7 +450,7 @@ if ($dopost == "show") { require_once(DEDEINC."/typelink/typelink.class.php"); $tl = new TypeLink(0); $typeOptions = $tl->GetOptionArray(0, 0, $mid); - $forms .= "栏目:\r\n"; $forms .= "\r\n"; $forms .= $typeOptions; $forms .= "
"; @@ -428,12 +458,12 @@ if ($dopost == "show") { } else if ($mainfield == 'iscommend') { $forms .= "
"; } else if ($mainfield == 'writer') { - $forms .= "作者:
"; + $forms .= "
"; } else if ($mainfield == 'source') { - $forms .= "来源:
"; + $forms .= "
"; } else if ($mainfield == 'senddate') { - $forms .= "开始时间:
"; - $forms .= "结束时间:
"; + $forms .= "
"; + $forms .= "
"; } } } @@ -446,15 +476,15 @@ if ($dopost == "show") { require_once(DEDEINC."/typelink/typelink.class.php"); $tl = new TypeLink(0); $typeOptions = $tl->GetOptionArray(0, 0, $mid); - $forms .= "栏目:\r\n"; $forms .= "\r\n"; $forms .= $typeOptions; $forms .= "
"; $forms .= "
"; $addonstring .= 'typeid:int,'; } elseif ($addonfield == 'senddate') { - $forms .= "开始时间:
"; - $forms .= "结束时间:
"; + $forms .= "
"; + $forms .= "
"; $addonstring .= 'senddate:datetime,'; } } @@ -512,8 +542,8 @@ if ($dopost == "show") { } } } elseif ($type == 'datetime') { - $forms .= "开始时间:
"; - $forms .= "结束时间:
"; + $forms .= "
"; + $forms .= "
"; } else { $tmp = ''; } @@ -534,7 +564,7 @@ if ($dopost == "show") { '; echo ""; - echo "

下面生成的网页表单,请自行复制,根据自己需求修改样式后粘贴到对应的模板中

"; + echo "

下面生成的网页表单,根据自己需求修改样式后粘贴到对应的模板中

"; echo "
"; echo " diff --git a/src/admin/templets/makehtml_homepage.htm b/src/admin/templets/makehtml_homepage.htm index 00edd7a5..62153f1c 100644 --- a/src/admin/templets/makehtml_homepage.htm +++ b/src/admin/templets/makehtml_homepage.htm @@ -19,7 +19,7 @@ diff --git a/src/admin/templets/makehtml_taglist.htm b/src/admin/templets/makehtml_taglist.htm index 1d3f3d95..b1a9a677 100644 --- a/src/admin/templets/makehtml_taglist.htm +++ b/src/admin/templets/makehtml_taglist.htm @@ -48,7 +48,7 @@ diff --git a/src/admin/templets/media_add.htm b/src/admin/templets/media_add.htm index 1f6b9cfc..e3ab576c 100644 --- a/src/admin/templets/media_add.htm +++ b/src/admin/templets/media_add.htm @@ -20,7 +20,7 @@ - + - + - + - +
- + $file $filesize KB
- + $file $filesize KB
新模型id:
新模型名称:
新模型标识:
新附加表:
复制模板: - - -
新模型id:
新模型名称:
新模型标识:
新附加表:
复制模板: + + +
文档模型规则出错
文档模型规则出错
文档模型规则出错
文档模型规则出错
已经存在相同的{$fields['nid']}模型
已经存在相同的{$fields['nid']}模型
创建数据表失败
创建数据表失败:{$dsql->GetError()}
导入文档模型时发生错误
导入文档模型时发生错误:{$dsql->GetError()}
成功导入一个文档模型
成功导入一个文档模型
-
首页默认更新文件存放在根目录,如果不是根目录安装网站又想首页更新到网站根目录,使用相对路径来表示首页位置,例:安装在“http://www.abc.com/DedeBIZ/目录”,更新首页为:“http://www.abc.com/index.html”,填写:“../index.html”
+
首页默认更新文件存放在根目录,如果不是根目录安装网站又想首页更新到网站根目录,使用相对路径来表示首页位置,例:安装在http://www.abc.com/DedeBIZ/目录,更新首页为:http://www.abc.com/index.html,填写:../index.html
更新位置: - (系统设置中其他选项“标签生成目录”项进行调整) + (系统设置中其他选项标签生成目录进行调整)
添加附件
媒体类型:附件类型: @@ -29,19 +29,19 @@
说明标题:附件标题:
附加参数: - -
上传文件:上传附件: @@ -50,16 +50,16 @@
-

-

-

-

-

- +
+
+
+
+
+
@@ -77,9 +77,9 @@ function MakeUpload() { var upfield = document.getElementById("uploadfield"); var endNum = Number(document.form1.picnum.value) + startNum; - if (endNum > 40) endNum = 40; + if (endNum > 30) endNum = 30; for (startNum; startNum <= endNum; startNum++) { - upfield.innerHTML += "

"; + upfield.innerHTML += "
"; } } function ResetUpload() { diff --git a/src/admin/templets/media_edit.htm b/src/admin/templets/media_edit.htm index 8e220a62..08febbc7 100644 --- a/src/admin/templets/media_edit.htm +++ b/src/admin/templets/media_edit.htm @@ -21,7 +21,7 @@ 修改附件 - 媒体类型: + 附件类型: @@ -30,15 +30,15 @@ - 说明标题: + 附件标题: 附加参数: - - - + + + @@ -49,13 +49,12 @@ 200) $w=200; else $w = $sizes[0]; ?> @@ -65,7 +64,7 @@ - 修改文件: + 修改附件: diff --git a/src/admin/templets/mychannel_add.htm b/src/admin/templets/mychannel_add.htm index 757faed8..28c0d9f6 100644 --- a/src/admin/templets/mychannel_add.htm +++ b/src/admin/templets/mychannel_add.htm @@ -35,7 +35,7 @@ 模型标识: - (建议由英文、数字或下划线组成,示例“article_名字标识.htm”,列表和封面模板类推) + (建议由英文、数字或下划线组成,示例article_名字标识.htm,列表和封面模板类推) diff --git a/src/admin/templets/mychannel_edit.htm b/src/admin/templets/mychannel_edit.htm index 7234b3a1..b443d220 100644 --- a/src/admin/templets/mychannel_edit.htm +++ b/src/admin/templets/mychannel_edit.htm @@ -40,7 +40,7 @@ 模型标识: - (建议由英文、数字或下划线组成,示例“article_名字标识.htm”,列表和封面模板类推) + (建议由英文、数字或下划线组成,示例article_名字标识.htm,列表和封面模板类推) 模型名称: @@ -108,7 +108,7 @@ 列表附加字段: - (用英文逗号分开,列表模板“{dede:list channelid='模型id' addfields='字段1,字段2'}{/dede:list}”中,标签“[field:name/]”调用) + (用英文逗号分开,列表模板{dede:list channelid='模型id' addfields='字段1,字段2'}{/dede:list}中,标签[field:name/]调用) diff --git a/src/admin/templets/mychannel_field_add.htm b/src/admin/templets/mychannel_field_add.htm index 829881e6..12fa1dc6 100644 --- a/src/admin/templets/mychannel_field_add.htm +++ b/src/admin/templets/mychannel_field_add.htm @@ -27,7 +27,7 @@ - 提示文字: + 字段文字: (发布时显示提示文字) @@ -37,7 +37,7 @@ 字段名称: - (只能用英文字母或数字,如果数据类型是联动类型,请填写联动类型的组名称) + (只能用英文字母或数字,如果数据类型是联动类型,请填写联动类型组名称) @@ -52,7 +52,7 @@ - (列表模板“{dede:list channelid='模型id' addfields='字段1,字段2'}{/dede:list}”中,标签“[field:name/]”调用) + (列表模板{dede:list channelid='模型id' addfields='字段1,字段2'}{/dede:list}中,标签[field:name/]调用) @@ -61,7 +61,7 @@ - (如果文档使用分页符,文档用#p#副标题#e#作为分页符,实现文档分页,但仅允许一个字段) + (如果文档使用分页符,文档用#p#副标题#e#作为分页符实现文档分页,但仅允许一个字段) @@ -111,7 +111,7 @@ 默认值: -

(如果定义数据类型为select、radio、checkbox时,此处填写被选择的项目,英文逗号分开,如“DedeBIZ,得德”。如果为联动选框,这里填写联动选框项目名称)

+

(自定义字段数据类型为select、radio、checkbox时,下面填写数据,英文逗号分开,如:DedeBIZ,得德)

diff --git a/src/admin/templets/mychannel_field_edit.htm b/src/admin/templets/mychannel_field_edit.htm index d73d5910..6be5251f 100644 --- a/src/admin/templets/mychannel_field_edit.htm +++ b/src/admin/templets/mychannel_field_edit.htm @@ -31,7 +31,7 @@ - 提示文字: + 字段文字: (发布文档时显示的项名字) @@ -39,7 +39,7 @@ 字段名称: - (只能用英文字母或数字,如果数据类型是联动类型,请填写联动类型的组名称) + (只能用英文字母或数字,如果数据类型是联动类型,请填写联动类型组名称) 字段类型: @@ -53,7 +53,7 @@ - (列表模板“{dede:list channelid='模型id' addfields='字段1,字段2'}{/dede:list}”中,标签“[field:name/]”调用) + (列表模板{dede:list channelid='模型id' addfields='字段1,字段2'}{/dede:list}中,标签[field:name/]调用) @@ -62,7 +62,7 @@ - (如果文档使用分页符,文档用#p#副标题#e#作为分页符,实现文档分页,但仅允许一个字段) + (如果文档使用分页符,文档用#p#副标题#e#作为分页符实现文档分页,但仅允许一个字段) @@ -123,7 +123,7 @@ 默认值: -

(如果定义数据类型为select、radio、checkbox时,此处填写被选择的项目,英文逗号分开,如“DedeBIZ,得德”。如果为联动选框,这里填写联动选框项目名称)

+

(自定义字段数据类型为select、radio、checkbox时,下面填写数据,英文逗号分开,如:DedeBIZ,得德)

diff --git a/src/admin/templets/mychannel_main.htm b/src/admin/templets/mychannel_main.htm index 9bfdc79a..70895ac9 100644 --- a/src/admin/templets/mychannel_main.htm +++ b/src/admin/templets/mychannel_main.htm @@ -14,7 +14,7 @@ 添加新模型 - 导入模型 + 导入文档模型 联动类型管理 diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm index 2999c5cc..9f87ab8a 100644 --- a/src/admin/templets/soft_add.htm +++ b/src/admin/templets/soft_add.htm @@ -92,7 +92,7 @@ - + diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm index 9340b215..95ab6d0c 100644 --- a/src/admin/templets/soft_edit.htm +++ b/src/admin/templets/soft_edit.htm @@ -94,7 +94,7 @@
标签:(英文逗号分开,如“DedeBIZ,得德”)(英文逗号分开,如:DedeBIZ,得德) 权重: (越小越靠前)
- + diff --git a/src/admin/templets/spec_add.htm b/src/admin/templets/spec_add.htm index 453a334e..50a5ab9d 100644 --- a/src/admin/templets/spec_add.htm +++ b/src/admin/templets/spec_add.htm @@ -67,7 +67,7 @@ diff --git a/src/admin/templets/spec_edit.htm b/src/admin/templets/spec_edit.htm index 181b266f..084e6c8f 100644 --- a/src/admin/templets/spec_edit.htm +++ b/src/admin/templets/spec_edit.htm @@ -65,7 +65,7 @@ diff --git a/src/admin/templets/stepselect_main.htm b/src/admin/templets/stepselect_main.htm index fbe17166..2c5788b8 100644 --- a/src/admin/templets/stepselect_main.htm +++ b/src/admin/templets/stepselect_main.htm @@ -166,7 +166,7 @@ - + 更新所有缓存 @@ -238,7 +238,7 @@ - + diff --git a/src/admin/templets/stepselect_showajax.htm b/src/admin/templets/stepselect_showajax.htm index 23128ff8..a42ca227 100644 --- a/src/admin/templets/stepselect_showajax.htm +++ b/src/admin/templets/stepselect_showajax.htm @@ -10,7 +10,7 @@ if ($action=='edit') {
- (缓存组名必须用英文或数字) + (缓存名必须用英文或数字)
关闭 @@ -25,7 +25,7 @@ if ($action=='edit') {
- (缓存组名必须用英文或数字) + (缓存名必须用英文或数字)
关闭 diff --git a/src/admin/templets/templets_one_add.htm b/src/admin/templets/templets_one_add.htm index ba955639..7e1d6392 100644 --- a/src/admin/templets/templets_one_add.htm +++ b/src/admin/templets/templets_one_add.htm @@ -20,7 +20,7 @@
@@ -49,7 +49,7 @@ } echo ""; ?> - (通过这个标识来识别类同页面,模板中用“{dede:likesgpage id='标识'/}”调用有相同标识的页面) + (通过这个标识来识别类同页面,标签{dede:likesgpage id='标识'/}调用有相同标识的页面) diff --git a/src/admin/templets/templets_one_edit.htm b/src/admin/templets/templets_one_edit.htm index 13ba94f1..af04b069 100644 --- a/src/admin/templets/templets_one_edit.htm +++ b/src/admin/templets/templets_one_edit.htm @@ -21,7 +21,7 @@ diff --git a/src/admin/templets/tpl_edit.htm b/src/admin/templets/tpl_edit.htm index 596cf169..a2645465 100644 --- a/src/admin/templets/tpl_edit.htm +++ b/src/admin/templets/tpl_edit.htm @@ -28,7 +28,7 @@ diff --git a/src/admin/templets/tpl_edit_tag.htm b/src/admin/templets/tpl_edit_tag.htm index 18b963f0..235155b7 100644 --- a/src/admin/templets/tpl_edit_tag.htm +++ b/src/admin/templets/tpl_edit_tag.htm @@ -37,7 +37,7 @@ diff --git a/src/admin/templets/tpl_newfile.htm b/src/admin/templets/tpl_newfile.htm index 8a5f3ab8..f3bdc08b 100644 --- a/src/admin/templets/tpl_newfile.htm +++ b/src/admin/templets/tpl_newfile.htm @@ -16,7 +16,7 @@ diff --git a/src/admin/tpl.php b/src/admin/tpl.php index c46ab88d..3006a200 100644 --- a/src/admin/tpl.php +++ b/src/admin/tpl.php @@ -207,7 +207,7 @@ else if ($action == 'savetagfile') { $wecome_info = "标签源码管理 - 新建修改标签"; $win = new OxWindow(); $win->AddTitle("新建修改标签"); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(); exit(); diff --git a/src/apps/jump.php b/src/apps/jump.php index cc39fb53..6690f8a5 100644 --- a/src/apps/jump.php +++ b/src/apps/jump.php @@ -25,7 +25,7 @@ if (preg_match("#^http#", $url)) { $wecome_info = "页面跳转提示"; $win = new OxWindow(); $win->AddTitle("您将要访问的链接不属于当前站点,请关注您的账号安全。"); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(); } else { diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt index 9a3dc4e1..90dbef21 100755 --- a/src/install/sql-dfdata.txt +++ b/src/install/sql-dfdata.txt @@ -3947,7 +3947,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin ('17','cfg_mediatype','允许的多媒体文件类型','3','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov'), ('18','cfg_specnote','专题的最大节点数','2','number','10'), ('19','cfg_list_symbol','栏目位置的间隔符号','2','string',''), -('20','cfg_notallowstr','禁用关键词,用“|”分开,但不要在结尾加“|”','5','bstring','乡巴佬|傻子'), +('20','cfg_notallowstr','禁用关键词,用|分开,但不要在结尾加|','5','bstring','乡巴佬|傻子'), ('21','cfg_feedbackcheck','是否需审核评论及留言','5','bool','Y'), ('22','cfg_keyword_replace','是否使用关键词替换功能,开启影响文档生成速度','2','bool','Y'), ('23','cfg_rewrite','是否使用伪静态,参考栏目修改中提示默认规则','1','bool','N'), @@ -3978,7 +3978,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin ('48','cfg_cli_time','服务器时区设置','2','number','8'), ('49','cfg_mb_addontype','会员附件许可的类型','4','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov|zip|rar|doc|xsl|ppt|wps'), ('50','cfg_mb_max','会员附件总大小限制(MB)','4','number','500'), -('51','cfg_replacestr','禁用关键词替换成*,用“|”分开,但不要在结尾加“|”','5','bstring','乡巴佬|傻子'), +('51','cfg_replacestr','禁用关键词替换成*,用|分开,但不要在结尾加|','5','bstring','乡巴佬|傻子'), ('52','cfg_makeindex','发布文档后马上更新网站首页','6','bool','N'), ('53','cfg_keyword_like','使用关键词关连文档','6','bool','Y'), ('54','cfg_index_max','首页调用函数最大索引文档数,不适用于经常单栏目采集过多文档网站,不启用本项此值设置为0即可','6','number','10000'), diff --git a/src/system/common.func.php b/src/system/common.func.php index 12752c0b..8216d681 100755 --- a/src/system/common.func.php +++ b/src/system/common.func.php @@ -352,7 +352,7 @@ function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0) $gourl = 'javascript:;'; $func .= "window.parent.document.getElementById('{$tgobj}').style.display='none';\r\n"; } - $func .= "var pgo=0;function JumpUrl(){if (pgo==0){location='$gourl'; pgo=1;}}"; + $func .= "var pgo=0;function JumpUrl(){if (pgo==0) {location='$gourl'; pgo=1;}}"; $rmsg = $func; $rmsg .= "document.write(\"

系统提示

\");"; $rmsg .= "document.write(\"
\");"; diff --git a/src/system/customfields.func.php b/src/system/customfields.func.php index 97637b5d..98a2b7f6 100755 --- a/src/system/customfields.func.php +++ b/src/system/customfields.func.php @@ -105,13 +105,13 @@ function GetFormItem($ctag, $admintype = 'admin') $innertext = ""; } else if ($fieldType == 'img') { $fname = defined('DEDEADMIN')? 'form1' : 'addcontent'; - $innertext = " "; + $innertext = " "; } else if ($fieldType == 'media') { $fname = defined('DEDEADMIN')? 'form1' : 'addcontent'; - $innertext = " "; + $innertext = " "; } else if ($fieldType == 'addon') { $fname = defined('DEDEADMIN')? 'form1' : 'addcontent'; - $innertext = " "; + $innertext = " "; } else if ($fieldType == 'int' || $fieldType == 'float') { $dfvalue = ($ctag->GetAtt('default') != '' ? $ctag->GetAtt('default') : '0'); $innertext = ""; @@ -370,17 +370,17 @@ function GetFormItemValue($ctag, $fvalue, $admintype = 'admin', $fieldname = '') } $fvalue = empty($fvalue)? $tmpValue : $fvalue; $fname = defined('DEDEADMIN')? 'form1' : 'addcontent'; - $innertext = " "; + $innertext = " "; } else if ($ftype == "imgfile") { $fname = defined('DEDEADMIN')? 'form1' : 'addcontent'; $innertext = ""; } else if ($ftype == "media") { $fname = defined('DEDEADMIN')? 'form1' : 'addcontent'; - $selectStr = ""; + $selectStr = ""; $innertext = " $selectStr"; } else if ($ftype == "addon") { $fname = defined('DEDEADMIN')? 'form1' : 'addcontent'; - $selectStr = ""; + $selectStr = ""; $innertext = " $selectStr"; } else if ($ftype == "int" || $ftype == "float") { $innertext = ""; diff --git a/src/system/dedevote.class.php b/src/system/dedevote.class.php index 34c38a89..a7ba676e 100755 --- a/src/system/dedevote.class.php +++ b/src/system/dedevote.class.php @@ -120,7 +120,7 @@ class DedeVote } $items .= "
\r\n"; } $items .= "\r\n
标签:(英文逗号分开,如“DedeBIZ,得德”)(英文逗号分开,如:DedeBIZ,得德) 权重: (越小越靠前)
-
文档列表用“1,2,3”英文逗号分开,系统会自动排除不同节点的相同文档。关于单条记录模板里“[field:fieldname/]”标签,请参考关于系统帮助关于arclist标签
+
文档列表用1,2,3英文逗号分开,系统会自动排除不同节点的相同文档。单条记录模板标签[field:fieldname/]调用,请参考关于系统帮助关于arclist标签
-
文档列表用“1,2,3”英文逗号分开,系统会自动排除不同节点的相同文档。关于单条记录模板里“[field:fieldname/]”标签,请参考关于系统帮助关于arclist标签
+
文档列表用1,2,3英文逗号分开,系统会自动排除不同节点的相同文档。单条记录模板标签[field:fieldname/]调用,请参考关于系统帮助关于arclist标签
选择 id 枚举名类别组名类别名 枚举类型 枚举值 组内排序
-
文档单页管理仅适用于页面较少的情况(建议小于500个页面)标签“{dede:field name='body'/}”调用
+
文档单页管理仅适用于页面较少的情况(建议小于500个页面)标签{dede:field name='body'/}调用
-
文档单页管理仅适用于页面较少的情况(建议小于500个页面)标签“{dede:field name='body'/}”调用
+
文档单页管理仅适用于页面较少的情况(建议小于500个页面)标签{dede:field name='body'/}调用
文件名称 - (不可以用“..”符号表示路径) + (不可以用..符号表示路径)
文件名称 - (不可以用“..”符号表示路径) + (不可以用..符号表示路径)
工作目录: - (空白表示根目录,不允许用“..” 形式的路径) + (空白表示根目录,不可以用..符号表示路径)
\r\n"; $items .= "\r\n"; - $items .= "VoteID."');>"; + $items .= "VoteID."');>"; $items .= "
\r\n"; diff --git a/src/system/libraries/oxwindow.class.php b/src/system/libraries/oxwindow.class.php index 37994ff1..743884a0 100755 --- a/src/system/libraries/oxwindow.class.php +++ b/src/system/libraries/oxwindow.class.php @@ -62,11 +62,11 @@ class OxWindow $this->myWin .= ""; } /** - * 添加单列的标题 + * 添加单列标题 * * @access public * @param string $title 标题 - * @param string $col 列数 + * @param string $col 列 * @return string */ function AddTitle($title, $col = "2") @@ -81,11 +81,10 @@ class OxWindow $this->myWinItem .= ""; } /** - * 添加单列的消息 + * 添加单列信息 * * @access public - * @param string $ivalue 消息行 - * @param string $col 列数 + * @param string $ivalue 信息 * @return void */ function AddMsgItem($ivalue) @@ -93,7 +92,7 @@ class OxWindow $this->myWinItem .= "$ivalue"; } /** - * 添加两列 + * 添加两列信息 * * @access public * @param string $iname 名称 @@ -170,12 +169,17 @@ class OxWindow $this->myWin .= ""; } else { - if ($msg != '') { - $this->myWin .= ""; + if ($msg != "") { + $this->myWin .= " + + + + + "; } else { $this->myWin .= ''; } @@ -217,7 +221,7 @@ class OxWindow * 显示一个不带表单的普通提示 * * @access public - * @param string $msg 消息提示信息 + * @param string $msg 提示信息 * @param string $title 提示标题 * @return string */ diff --git a/src/system/typelink/typeunit.class.admin.php b/src/system/typelink/typeunit.class.admin.php index 8547ad9b..6ef3591f 100755 --- a/src/system/typelink/typeunit.class.admin.php +++ b/src/system/typelink/typeunit.class.admin.php @@ -110,7 +110,7 @@ class TypeUnit if ($ispart == 0) { //列表栏目 echo ""; - echo "
- +
$msg
$msg
列表{$nss}".$typeName."[id:".$id."](文档数:".$this->GetTotalArc($id).")"; + echo ""; echo ""; - echo "
列表{$nss}".$typeName."[id:".$id."](文档数:".$this->GetTotalArc($id).")"; echo ""; echo ""; @@ -122,7 +122,7 @@ class TypeUnit } else if ($ispart == 1) { //封面栏目 echo "
封面{$nss}".$typeName."[id:".$id."]"; + echo ""; echo ""; - echo "
封面{$nss}".$typeName."[id:".$id."]"; echo ""; echo ""; @@ -134,7 +134,7 @@ class TypeUnit } else if ($ispart == 2) { //外部栏目 echo "
外部{$nss}".$typeName."[id:".$id."]"; + echo ""; echo ""; echo "
外部{$nss}".$typeName."[id:".$id."]"; echo ""; echo ""; @@ -194,7 +194,7 @@ class TypeUnit //列表栏目 echo "
"; echo ""; echo "
"; - echo "$step列表{$nss}".$typeName."[id:".$id."](文档数:".$this->GetTotalArc($id).")"; + echo "$step列表{$nss}".$typeName."[id:".$id."](文档数:".$this->GetTotalArc($id).")"; echo ""; echo ""; @@ -207,7 +207,7 @@ class TypeUnit //封面栏目 echo "
"; echo ""; echo "
"; - echo "$step封面{$nss}".$typeName."[id:".$id."]"; + echo "$step封面{$nss}".$typeName."[id:".$id."]"; echo ""; echo ""; @@ -220,7 +220,7 @@ class TypeUnit //外部栏目 echo "
"; echo "
"; - echo "$step外部{$nss}".$typeName."[id:".$id."]"; + echo "$step外部{$nss}".$typeName."[id:".$id."]"; echo ""; echo ""; diff --git a/src/system/typelink/typeunit.class.menu.php b/src/system/typelink/typeunit.class.menu.php index e1a96869..26d25e26 100755 --- a/src/system/typelink/typeunit.class.menu.php +++ b/src/system/typelink/typeunit.class.menu.php @@ -98,7 +98,7 @@ class TypeUnit continue; } echo "
\r\n"; - echo "
\r\n"; + echo "
\r\n"; echo "
".$typeName."
\r\n"; echo "
\r\n"; echo "
"; diff --git a/src/theme/dedebiz/article_article.htm b/src/theme/dedebiz/article_article.htm index eb0daccd..412bd779 100644 --- a/src/theme/dedebiz/article_article.htm +++ b/src/theme/dedebiz/article_article.htm @@ -59,7 +59,7 @@
  • 收藏
  • 挑错
  • 推荐
  • -
  • 打印
  • +
  • 打印
  • diff --git a/src/theme/dedebiz/article_default.htm b/src/theme/dedebiz/article_default.htm index bc823fa9..721499c2 100644 --- a/src/theme/dedebiz/article_default.htm +++ b/src/theme/dedebiz/article_default.htm @@ -46,7 +46,7 @@ -
    您会看到这个提示,那是因为您的系统无法识别某栏目的模型信息,或者您新建模型后,没为这个模型设计单独的模板不同模型的文档浏览页的模板为:article_模型名字标识.htm如“article_article.htm”,更多的信息您可以在栏目模型管理的地方查看
    +
    您会看到这个提示,因为系统无法识别某栏目的模型信息或者您新建模型后,没为模型设计单独的模板,不同模型的文档浏览页的模板为:article_模型名字标识.htm更多的信息您可以在栏目模型管理的地方查看
    {dede:fieldlist} @@ -70,7 +70,7 @@
  • 收藏
  • 挑错
  • 推荐
  • -
  • 打印
  • +
  • 打印
  • diff --git a/src/theme/dedebiz/article_default_sg.htm b/src/theme/dedebiz/article_default_sg.htm index 200eeb91..dd979df0 100644 --- a/src/theme/dedebiz/article_default_sg.htm +++ b/src/theme/dedebiz/article_default_sg.htm @@ -48,7 +48,7 @@ -
    您会看到这个提示,那是因为您的系统无法识别某栏目的模型信息,或者您新建模型后,没为这个模型设计单独的模板不同模型的文档浏览页的模板为:article_模型名字标识.htm如“article_article.htm”,更多的信息您可以在栏目模型管理的地方查看
    +
    您会看到这个提示,因为系统无法识别某栏目的模型信息或者您新建模型后,没为模型设计单独的模板,不同模型的文档浏览页的模板为:article_模型名字标识.htm更多的信息您可以在栏目模型管理的地方查看
    {dede:fieldlist}
    @@ -72,7 +72,7 @@
  • 收藏
  • 挑错
  • 推荐
  • -
  • 打印
  • +
  • 打印
  • diff --git a/src/theme/dedebiz/article_image.htm b/src/theme/dedebiz/article_image.htm index 162d5ee8..e0c31679 100644 --- a/src/theme/dedebiz/article_image.htm +++ b/src/theme/dedebiz/article_image.htm @@ -134,7 +134,7 @@
  • 收藏
  • 挑错
  • 推荐
  • -
  • 打印
  • +
  • 打印
  • diff --git a/src/theme/dedebiz/article_infos.htm b/src/theme/dedebiz/article_infos.htm index adbce6ef..2aa93245 100644 --- a/src/theme/dedebiz/article_infos.htm +++ b/src/theme/dedebiz/article_infos.htm @@ -65,7 +65,7 @@
  • 收藏
  • 挑错
  • 推荐
  • -
  • 打印
  • +
  • 打印
  • diff --git a/src/theme/dedebiz/article_soft.htm b/src/theme/dedebiz/article_soft.htm index 83154392..d73deba7 100644 --- a/src/theme/dedebiz/article_soft.htm +++ b/src/theme/dedebiz/article_soft.htm @@ -73,7 +73,7 @@
  • 收藏
  • 挑错
  • 推荐
  • -
  • 打印
  • +
  • 打印
  • diff --git a/src/theme/dedebiz/widget_article_feedback.htm b/src/theme/dedebiz/widget_article_feedback.htm index d861d762..67b6440c 100644 --- a/src/theme/dedebiz/widget_article_feedback.htm +++ b/src/theme/dedebiz/widget_article_feedback.htm @@ -26,7 +26,7 @@ -
    +
    {dede:feedback} @@ -106,7 +106,7 @@ let replyPannel = `
    - +
    `; $.get("{dede:global.cfg_cmsurl/}/user/api.php?format=json", function(result) { diff --git a/src/user/album_add.php b/src/user/album_add.php index fe82e309..4bc2390c 100755 --- a/src/user/album_add.php +++ b/src/user/album_add.php @@ -153,7 +153,7 @@ if (empty($dopost)) { $wintitle = "成功发布图片文档"; $wecome_info = "图片管理 - 发布图片文档"; $win = new OxWindow(); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(DEDEMEMBER."/templets/win_templet.htm"); } diff --git a/src/user/album_edit.php b/src/user/album_edit.php index 81d56b57..264dc852 100755 --- a/src/user/album_edit.php +++ b/src/user/album_edit.php @@ -131,7 +131,7 @@ if (empty($dopost)) { $wintitle = "成功修改图片文档"; $wecome_info = "图片管理 - 修改图片文档"; $win = new OxWindow(); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(DEDEMEMBER."/templets/win_templet.htm"); } diff --git a/src/user/archives_add.php b/src/user/archives_add.php index 5c327515..62171197 100755 --- a/src/user/archives_add.php +++ b/src/user/archives_add.php @@ -126,7 +126,7 @@ if (empty($dopost)) { $wintitle = "成功发布自定义文档"; $wecome_info = "文档管理 - 发布自定义文档"; $win = new OxWindow(); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(DEDEMEMBER."/templets/win_templet.htm"); } diff --git a/src/user/archives_edit.php b/src/user/archives_edit.php index eeb2a68d..2b02167c 100755 --- a/src/user/archives_edit.php +++ b/src/user/archives_edit.php @@ -94,7 +94,7 @@ if (empty($dopost)) { $wintitle = "成功修改自定义文档"; $wecome_info = "文档管理 - 修改自定义文档"; $win = new OxWindow(); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(DEDEMEMBER."/templets/win_templet.htm"); } diff --git a/src/user/archives_sg_add.php b/src/user/archives_sg_add.php index fa433345..e6de6e74 100755 --- a/src/user/archives_sg_add.php +++ b/src/user/archives_sg_add.php @@ -156,7 +156,7 @@ if (empty($dopost)) { $wintitle = "成功发布分类文档"; $wecome_info = "文档管理 - 发布分类文档"; $win = new OxWindow(); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(DEDEMEMBER."/templets/win_templet.htm"); } diff --git a/src/user/archives_sg_edit.php b/src/user/archives_sg_edit.php index 2795cd3a..7b756b50 100755 --- a/src/user/archives_sg_edit.php +++ b/src/user/archives_sg_edit.php @@ -110,7 +110,7 @@ if (empty($dopost)) { $wintitle = "成功修改分类文档"; $wecome_info = "文档管理 - 修改分类文档"; $win = new OxWindow(); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(DEDEMEMBER."/templets/win_templet.htm"); } diff --git a/src/user/article_add.php b/src/user/article_add.php index de1308d7..35295064 100755 --- a/src/user/article_add.php +++ b/src/user/article_add.php @@ -115,7 +115,7 @@ if (empty($dopost)) { $wintitle = "成功发布文档"; $wecome_info = "文档管理 - 发布文档"; $win = new OxWindow(); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(DEDEMEMBER."/templets/win_templet.htm"); } diff --git a/src/user/article_edit.php b/src/user/article_edit.php index b8fa6412..a86f5df8 100755 --- a/src/user/article_edit.php +++ b/src/user/article_edit.php @@ -89,7 +89,7 @@ if (empty($dopost)) { $wintitle = "成功修改文档"; $wecome_info = "文档管理 - 修改文档"; $win = new OxWindow(); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(DEDEMEMBER."/templets/win_templet.htm"); } diff --git a/src/user/buy_action.php b/src/user/buy_action.php index ace8dce1..250aadf3 100755 --- a/src/user/buy_action.php +++ b/src/user/buy_action.php @@ -208,7 +208,7 @@ if ($paytype === 0) { $wintitle = "使用微信支付"; $wecome_info = "微信支付";//这个空格不要去 $win = new OxWindow(); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(DEDEMEMBER."/templets/win_templet.htm"); } catch (Exception $e) { @@ -251,7 +251,7 @@ if ($paytype === 0) { $wintitle = "使用银行转账"; $wecome_info = "银行转账";//这个空格不要去 $win = new OxWindow(); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(DEDEMEMBER."/templets/win_templet.htm"); } elseif ($paytype === 4) { diff --git a/src/user/index_do.php b/src/user/index_do.php index 536af922..6309d5d8 100755 --- a/src/user/index_do.php +++ b/src/user/index_do.php @@ -255,7 +255,7 @@ if ($fmdo == 'sendMail') { $wintitle = "快来邀请好友赚积分啦"; $wecome_info = "邀请好友赚积分"; $win = new OxWindow(); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(DEDEMEMBER."/templets/win_templet.htm"); exit; diff --git a/src/user/soft_add.php b/src/user/soft_add.php index 639fd3ac..67de776b 100755 --- a/src/user/soft_add.php +++ b/src/user/soft_add.php @@ -169,7 +169,7 @@ if (empty($dopost)) { $wintitle = "成功发布文档文档"; $wecome_info = "软件管理 - 发布软件文档"; $win = new OxWindow(); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(DEDEMEMBER."/templets/win_templet.htm"); } diff --git a/src/user/soft_edit.php b/src/user/soft_edit.php index 7edad910..40c0708c 100755 --- a/src/user/soft_edit.php +++ b/src/user/soft_edit.php @@ -50,7 +50,7 @@ if (empty($dopost)) { if (is_array($dtp->CTags)) { foreach ($dtp->CTags as $ctag) { if ($ctag->GetName() == 'link') { - $nForm .= "
    选择
    + $nForm .= "
    选择
    "; $newRowStart++; } @@ -167,7 +167,7 @@ if (empty($dopost)) { $wintitle = "成功修改软件文档"; $wecome_info = "软件管理 - 修改软件文档"; $win = new OxWindow(); - $win->AddMsgItem($msg); + $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand", false); $win->Display(DEDEMEMBER."/templets/win_templet.htm"); } diff --git a/src/user/templets/album_edit.htm b/src/user/templets/album_edit.htm index 8b7278fc..5862b440 100755 --- a/src/user/templets/album_edit.htm +++ b/src/user/templets/album_edit.htm @@ -105,7 +105,7 @@
    -
    选择
    +
    选择
    diff --git a/src/user/templets/buy.htm b/src/user/templets/buy.htm index 6f9cfd1e..416b884e 100755 --- a/src/user/templets/buy.htm +++ b/src/user/templets/buy.htm @@ -28,12 +28,13 @@ 0) {?> fields['scores'] / $cfg_money_scores);?>
    -

    积分兑换金币(

    +

    积分换金币

    +

    - + @@ -46,19 +47,19 @@
    -

    积分充值

    +

    积分充值

    兑换数量:兑换数量:
    - + @@ -70,7 +71,7 @@
    -

    购买金币

    +

    购买金币

    积分密码:积分卡号:
    验证码 - +
    @@ -88,7 +89,7 @@
    -

    账号升级

    +

    账号升级

    diff --git a/src/user/templets/buy_action_payment.htm b/src/user/templets/buy_action_payment.htm index db3c7d54..711815b2 100755 --- a/src/user/templets/buy_action_payment.htm +++ b/src/user/templets/buy_action_payment.htm @@ -25,8 +25,8 @@ 返回 -
    您申请购买的产品如下,确认无误后请点击“购买并支付”按钮,进行网上支付,如果支付失败,请与管理员联系其它支付方式
    -

    订单确认

    +
    您申请购买的产品如下,确认无误后请点击购买并支付按钮,进行网上支付,如果支付失败,请与管理员联系其它支付方式
    +

    订单确认

    diff --git a/src/user/templets/index.htm b/src/user/templets/index.htm index bda1501e..da7ccd9f 100755 --- a/src/user/templets/index.htm +++ b/src/user/templets/index.htm @@ -74,7 +74,7 @@
    -

    用户空间MB/MB)

    +

    用户空间MB/MB)

    %
    @@ -85,7 +85,7 @@
    -

    最新文档

    +

    最新文档

    • diff --git a/src/user/templets/reg-new.htm b/src/user/templets/reg-new.htm index 2303adea..251c38fa 100755 --- a/src/user/templets/reg-new.htm +++ b/src/user/templets/reg-new.htm @@ -39,7 +39,7 @@
      - +
    diff --git a/src/user/templets/soft_add.htm b/src/user/templets/soft_add.htm index 50ac268b..e387bd9e 100755 --- a/src/user/templets/soft_add.htm +++ b/src/user/templets/soft_add.htm @@ -161,7 +161,7 @@
    -
    选择
    +
    选择
    @@ -194,7 +194,7 @@ morelinkobj.style.display = "block"; if (endNum > 12) endNum = 12; for (startNum; startNum <= endNum; startNum++) { - upfield.innerHTML += "
    选择
    "; + upfield.innerHTML += "
    选择
    "; } } function ShowHideAddr() { diff --git a/src/user/templets/soft_edit.htm b/src/user/templets/soft_edit.htm index 6c280af0..3b774708 100755 --- a/src/user/templets/soft_edit.htm +++ b/src/user/templets/soft_edit.htm @@ -191,7 +191,7 @@ morelinkobj.style.display = "block"; if (endNum > 12) endNum = 12; for (startNum; startNum <= endNum; startNum++) { - upfield.innerHTML += "
    选择
    "; + upfield.innerHTML += "
    选择
    "; } } function ShowHideAddr() {