From 6242709aea3470dd7562fd78d51fc59717d26a76 Mon Sep 17 00:00:00 2001 From: xushubieli Date: Tue, 25 Oct 2022 15:20:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E7=9A=84=E8=B5=84=E6=BA=90=EF=BC=8C=E6=9B=B4=E6=96=B0=E6=97=B6?= =?UTF-8?q?=E9=97=B4=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 | 4 +- src/admin/album_edit.php | 2 +- src/admin/article_allowurl_edit.php | 2 +- src/admin/article_select_sw.php | 4 +- src/admin/article_source_edit.php | 2 +- src/admin/article_string_mix.php | 2 +- src/admin/article_writer_edit.php | 2 +- src/admin/inc/inc_action_info.php | 4 +- src/admin/inc/inc_archives_functions.php | 6 +-- src/admin/inc/inc_batchup.php | 2 +- src/admin/inc/inc_menu.php | 2 +- src/admin/js/main.js | 2 +- src/admin/makehtml_list_action.php | 4 +- src/admin/makehtml_taglist_action.php | 6 +-- src/admin/media_edit.php | 2 +- src/admin/member_do.php | 2 +- src/admin/soft_edit.php | 2 +- src/admin/templets/archives_add.htm | 2 +- src/admin/templets/archives_sg_add.htm | 2 +- src/admin/templets/article_add.htm | 2 +- src/admin/templets/catalog_add_quick.htm | 2 +- src/admin/templets/content_att.htm | 2 +- src/admin/templets/content_batch_up.htm | 2 +- src/admin/templets/makehtml_taglist.htm | 2 +- src/admin/templets/member_pmone.htm | 2 +- src/admin/templets/mychannel_add.htm | 6 +-- src/admin/templets/mychannel_edit.htm | 6 +-- src/admin/templets/mytag_add.htm | 2 +- src/admin/templets/soft_add.htm | 2 +- src/admin/templets/update_guide_getfiles.htm | 49 ------------------- src/admin/templets/update_guide_getlist.htm | 26 ---------- src/apps/advancedsearch.php | 2 +- src/apps/vote.php | 2 +- src/data/admin/source.txt | 2 +- src/data/admin/ver.txt | 2 +- src/data/admin/verifies.txt | 2 +- src/install/index.php | 8 +-- src/install/sql-dfdata.txt | 2 +- src/install/v57sp2_to_v6.txt | 2 +- src/static/web/css/admin.css | 1 + src/static/web/img/admin-logo.png | Bin 4430 -> 0 bytes src/static/web/img/logo.gif | Bin 4765 -> 0 bytes src/static/web/img/xs.jpg | Bin 30565 -> 0 bytes src/system/archive/freelist.class.php | 2 +- src/system/archive/taglist.class.php | 2 +- src/system/channelunit.class.php | 4 +- src/system/database/dedesqli.class.php | 2 +- src/system/database/dedesqlite.class.php | 2 +- src/system/dedetag.class.php | 6 +-- src/system/taglib/help/arclist.txt | 2 +- src/system/taglib/help/arclistsg.txt | 2 +- src/system/userlogin.class.php | 2 +- src/theme/plus/showphoto.htm | 2 +- src/user/archives_sg_add.php | 2 +- src/user/archives_sg_edit.php | 2 +- src/user/inc/archives_check.php | 2 +- src/user/inc/archives_check_edit.php | 2 +- src/user/inc/inc_archives_functions.php | 3 +- src/user/soft_edit.php | 2 +- 59 files changed, 72 insertions(+), 147 deletions(-) delete mode 100644 src/admin/templets/update_guide_getfiles.htm delete mode 100644 src/admin/templets/update_guide_getlist.htm delete mode 100644 src/static/web/img/admin-logo.png delete mode 100644 src/static/web/img/logo.gif delete mode 100644 src/static/web/img/xs.jpg diff --git a/src/admin/album_add.php b/src/admin/album_add.php index 98814064..ffc83601 100644 --- a/src/admin/album_add.php +++ b/src/admin/album_add.php @@ -155,7 +155,7 @@ else if ($dopost == 'save') { $info = ''; $imginfos = GetImageSize($imgfile, $info); $imgurls .= "{dede:img ddimg='$litpicname' text='' width='".$imginfos[0]."' height='".$imginfos[1]."'} $iurl {/dede:img}\r\n"; - //把图片信息保存到媒体文档管理档案中 + //把图片信息保存到媒体文档管理文档中 $inquery = "INSERT INTO `#@__uploads` (title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('{$title}','{$iurl}','1','".$imginfos[0]."','".$imginfos[1]."','0','".filesize($imgfile)."','".$ntime."','$adminid');"; $dsql->ExecuteNoneQuery($inquery); $fid = $dsql->GetLastID(); @@ -247,7 +247,7 @@ else if ($dopost == 'save') { } //跳转网址的文档强制为动态 if (preg_match("#j#", $flag)) $ismake = -1; - //加入主档案表 + //加入主文档表 $query = "INSERT INTO `#@__archives` (id,typeid,typeid2,sortrank,flag,ismake,channel,arcrank,click,money,title,shorttitle,color,writer,source,litpic,pubdate,senddate,mid,notpost,description,keywords,filename,dutyadmin,weight) VALUES ('$arcID','$typeid','$typeid2','$sortrank','$flag','$ismake','$channelid','$arcrank','$click','$money','$title','$shorttitle','$color','$writer','$source','$litpic','$pubdate','$senddate','$adminid','$notpost','$description','$keywords','$filename','$adminid','$weight'); "; if (!$dsql->ExecuteNoneQuery($query)) { $gerr = $dsql->GetError(); diff --git a/src/admin/album_edit.php b/src/admin/album_edit.php index 8098b3eb..a56bb726 100644 --- a/src/admin/album_edit.php +++ b/src/admin/album_edit.php @@ -224,7 +224,7 @@ else if ($dopost == 'save') { $info = ''; $imginfos = GetImageSize($imgfile, $info); $imgurls .= "{dede:img ddimg='$litpicname' text='' width='".$imginfos[0]."' height='".$imginfos[1]."'} $iurl {/dede:img}\r\n"; - //把图片信息保存到媒体文档管理档案中 + //把图片信息保存到媒体文档管理文档中 $inquery = "INSERT INTO `#@__uploads` (title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('{$title}','{$iurl}','1','".$imginfos[0]."','".$imginfos[1]."','0','".filesize($imgfile)."','".$ntime."','$adminid');"; $dsql->ExecuteNoneQuery($inquery); if ( diff --git a/src/admin/article_allowurl_edit.php b/src/admin/article_allowurl_edit.php index 0a763194..581698b1 100644 --- a/src/admin/article_allowurl_edit.php +++ b/src/admin/article_allowurl_edit.php @@ -35,7 +35,7 @@ $win = new OxWindow(); $win->Init('article_allowurl_edit.php', 'js/blank.js', 'POST'); $win->AddHidden('dopost', 'save'); $win->AddTitle("每行保存一个超链接："); -$win->AddMsgItem(""); +$win->AddMsgItem(""); $winform = $win->GetWindow('ok'); $win->Display(); ?> \ No newline at end of file diff --git a/src/admin/article_select_sw.php b/src/admin/article_select_sw.php index aca5f6fd..ef38c7ce 100644 --- a/src/admin/article_select_sw.php +++ b/src/admin/article_select_sw.php @@ -22,7 +22,7 @@ if ($t == 'source') { echo "$v | \r\n"; } } - echo "
"; + echo ""; } else { //作者列表 $m_file = DEDEDATA."/admin/writer.txt"; @@ -40,6 +40,6 @@ if ($t == 'source') { } } } - echo "
\r\n"; + echo ""; } ?> \ No newline at end of file diff --git a/src/admin/article_source_edit.php b/src/admin/article_source_edit.php index 400bec9c..e675af9f 100644 --- a/src/admin/article_source_edit.php +++ b/src/admin/article_source_edit.php @@ -35,7 +35,7 @@ $win = new OxWindow(); $win->Init('article_source_edit.php', 'js/blank.js', 'POST'); $win->AddHidden('dopost', 'save'); $win->AddTitle("每行保存一个来源："); -$win->AddMsgItem(""); +$win->AddMsgItem(""); $winform = $win->GetWindow('ok'); $win->Display(); ?> \ No newline at end of file diff --git a/src/admin/article_string_mix.php b/src/admin/article_string_mix.php index 635d97e5..552240d1 100644 --- a/src/admin/article_string_mix.php +++ b/src/admin/article_string_mix.php @@ -38,7 +38,7 @@ $win->Init('article_string_mix.php', 'js/blank.js', 'POST'); $win->AddHidden('dopost', 'save'); $win->AddHidden('token', $_SESSION['token']); $win->AddTitle("如果您要启用字符串混淆来防采集，请在文档模板需要的字段加上 function='RndString(@me)' 属性，如：{dede:field name='body' function='RndString(@me)'/}"); -$win->AddMsgItem(""); +$win->AddMsgItem(""); $winform = $win->GetWindow('ok'); $win->Display(); ?> \ No newline at end of file diff --git a/src/admin/article_writer_edit.php b/src/admin/article_writer_edit.php index 28cd3cef..a129eb54 100644 --- a/src/admin/article_writer_edit.php +++ b/src/admin/article_writer_edit.php @@ -35,7 +35,7 @@ $win = new OxWindow(); $win->Init('article_writer_edit.php', 'js/blank.js', 'POST'); $win->AddHidden('dopost', 'save'); $win->AddTitle("把作者姓名用半角逗号“,”分开："); -$win->AddMsgItem(""); +$win->AddMsgItem(""); $winform = $win->GetWindow('ok'); $win->Display(); ?> \ No newline at end of file diff --git a/src/admin/inc/inc_action_info.php b/src/admin/inc/inc_action_info.php index 98c2341f..05e41342 100644 --- a/src/admin/inc/inc_action_info.php +++ b/src/admin/inc/inc_action_info.php @@ -14,7 +14,7 @@ $cuserLogin = new userLogin(); $actionSearch[0] = array( 'toptitle' => '运维', 'title' => '常规操作', - 'description' => '站点档案常规功能操作', + 'description' => '站点文档常规功能操作', 'soniterm' => array( 0 => array( 'title' => '网站栏目管理', @@ -23,7 +23,7 @@ $actionSearch[0] = array( 'linkurl' => 'catalog_main.php' ), 1 => array( - 'title' => '等审核的档案', + 'title' => '等审核的文档', 'description' => '所有内容模型发表的未经审核内容列表', 'purview' => 'a_Check,a_AccCheck', 'linkurl' => 'content_list.php?arcrank=-1' diff --git a/src/admin/inc/inc_archives_functions.php b/src/admin/inc/inc_archives_functions.php index 732a05dd..b8d6cc05 100644 --- a/src/admin/inc/inc_archives_functions.php +++ b/src/admin/inc/inc_archives_functions.php @@ -235,7 +235,7 @@ function CheckChannel($typeid, $channelid) else return TRUE; } /** - * 检测档案权限 + * 检测文档权限 * * @access public * @param int $aid 文档AID @@ -301,7 +301,7 @@ function SpLongBody($mybody, $spsize, $sptag) return addslashes($mybody); } /** - * 创建指定ID的文档 + * 创建指定id的文档 * * @access public * @param string $aid 文档id @@ -740,7 +740,7 @@ function UploadOneImage($upname, $handurl = '', $isremote = 1, $ntitle = '') if (is_file($imgfile) && $isrm_up && $filename != '') { $info = ""; $imginfos = GetImageSize($imgfile, $info); - //把新上传的图片信息保存到媒体文档管理档案中 + //把新上传的图片信息保存到媒体文档管理文档中 $inquery = "INSERT INTO `#@__uploads` (title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('$title','$filename','1','".$imginfos[0]."','".$imginfos[1]."','0','".filesize($imgfile)."','".time()."','".$cuserLogin->getUserID()."');"; $dsql->ExecuteNoneQuery($inquery); } diff --git a/src/admin/inc/inc_batchup.php b/src/admin/inc/inc_batchup.php index 9a7210d3..4826aa68 100644 --- a/src/admin/inc/inc_batchup.php +++ b/src/admin/inc/inc_batchup.php @@ -35,7 +35,7 @@ function DelArc($aid, $type = 'ON', $onlyfile = FALSE, $recycle = 0) $maintable = (trim($row['maintable']) == '' ? '#@__archives' : trim($row['maintable'])); $addtable = trim($row['addtable']); $issystem = $row['issystem']; - //查询档案信息 + //查询文档信息 if ($issystem == -1) { $arcQuery = "SELECT arc.*,tp.* FROM `$addtable` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id WHERE arc.aid='$aid' "; } else { diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php index d1043081..546c415e 100644 --- a/src/admin/inc/inc_menu.php +++ b/src/admin/inc/inc_menu.php @@ -76,7 +76,7 @@ if ($cuserLogin->getUserType() >= 10) { $menusMain = " - + diff --git a/src/admin/js/main.js b/src/admin/js/main.js index 391be322..b482cc76 100644 --- a/src/admin/js/main.js +++ b/src/admin/js/main.js @@ -587,7 +587,7 @@ var optCropper = { aspectRatio: 4 / 3, //拖动截取缩略图后，截取的缩略图更新到imageItems中 cropend: function (data) { - //这里的ID要单独取出来 + //这里的id要单独取出来 var dataUrl = $(this).cropper("getCroppedCanvas").toDataURL(); litpicImg = dataUrl; $("#litPic").attr("src", litpicImg); diff --git a/src/admin/makehtml_list_action.php b/src/admin/makehtml_list_action.php index 70dd002c..3b12aa8a 100644 --- a/src/admin/makehtml_list_action.php +++ b/src/admin/makehtml_list_action.php @@ -42,7 +42,7 @@ else if ($gotype == 'mkall') { $idArray = array(); if (file_exists($mkcachefile)) require_once($mkcachefile); } -//当前更新栏目的ID +//当前更新栏目的id $totalpage = count($idArray); if (isset($idArray[$pageno])) { $tid = $idArray[$pageno]; @@ -63,7 +63,7 @@ $reurl = ''; //更新数组所记录的栏目 if (!empty($tid)) { if (!isset($cfg_Cs[$tid])) { - ShowMsg('没有该栏目数据, 可能缓存文件(/data/cache/inc_catalog_base.inc)没有更新, 请检查是否有写入权限', 'javascript:;'); + ShowMsg('没有该栏目数据, 可能缓存文件没有更新, 请检查是否有写入权限', 'javascript:;'); exit(); } if ($cfg_Cs[$tid][1] > 0) { diff --git a/src/admin/makehtml_taglist_action.php b/src/admin/makehtml_taglist_action.php index 45eafa24..33bcea37 100644 --- a/src/admin/makehtml_taglist_action.php +++ b/src/admin/makehtml_taglist_action.php @@ -45,7 +45,7 @@ if ($ctagid == 0 && $allfinish) { $dlist->SetTagsDir($tagsdir); $dlist->MakeHtml(1, 10); $reurl = '..'.$tagsdir; - ShowMsg("更新完成TAG，浏览标签", "javascript:;"); + ShowMsg("更新标签，浏览标签", "javascript:;"); exit; } $tag = $dsql->GetOne("SELECT * FROM `#@__tagindex` WHERE id='$ctagid' LIMIT 0,1;"); @@ -75,12 +75,12 @@ if (is_array($tag) && count($tag) > 0) { $dlist->MakeHtml(1, 10); $reurl = '..'.$tagsdir; if ($upall == 1) { - ShowMsg("完成TAG更新浏览标签", "javascript:;"); + ShowMsg("更新标签完成，浏览标签", "javascript:;"); } else { $query = "UPDATE `#@__tagindex` SET mktime=uptime WHERE id='$ctagid' "; $dsql->ExecuteNoneQuery($query); $reurl .= '/'.$ctagid; - ShowMsg("更新完成TAG：".$tag['tag']."，浏览标签", "javascript:;"); + ShowMsg("更新标签：".$tag['tag']."，浏览标签", "javascript:;"); } exit(); } else { diff --git a/src/admin/media_edit.php b/src/admin/media_edit.php index 5cb066df..1a6f9421 100644 --- a/src/admin/media_edit.php +++ b/src/admin/media_edit.php @@ -160,7 +160,7 @@ else if ($dopost == 'save') { //读取文档信息 $myrow = $dsql->GetOne("SELECT * FROM `#@__uploads` WHERE aid='".$aid."'"); if (!is_array($myrow)) { - ShowMsg('错误，找不到此编号的档案', 'javascript:;'); + ShowMsg('错误，找不到此编号的文档', 'javascript:;'); exit(); } include DedeInclude('templets/media_edit.htm'); diff --git a/src/admin/member_do.php b/src/admin/member_do.php index c2e248ac..812497c8 100644 --- a/src/admin/member_do.php +++ b/src/admin/member_do.php @@ -98,7 +98,7 @@ if ($dopost == "delmember") { $dsql->ExecuteNoneQuery("DELETE FROM `#@__feedback` WHERE mid IN (".str_replace("`", ",", $id).") "); $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET mid='0' WHERE mid IN (".str_replace("`", ",", $id).")"); } else { - ShowMsg("无法删除此会员，如果这个会员是管理员关连的ID，
必须先删除这个管理员才能删除此帐号", $ENV_GOBACK_URL, 0, 3000); + ShowMsg("无法删除此会员，如果这个会员是管理员关连的id，
必须先删除这个管理员才能删除此帐号", $ENV_GOBACK_URL, 0, 3000); exit(); } } diff --git a/src/admin/soft_edit.php b/src/admin/soft_edit.php index a8736b3b..e0d42efb 100644 --- a/src/admin/soft_edit.php +++ b/src/admin/soft_edit.php @@ -161,7 +161,7 @@ else if ($dopost == 'save') { } //跳转网址的文档强制为动态 if (preg_match('#j#', $flag)) $ismake = -1; - //修改主档案表 + //修改主文档表 $inQuery = "UPDATE `#@__archives` SET typeid='$typeid',typeid2='$typeid2',sortrank='$sortrank',flag='$flag',click='$click',ismake='$ismake',arcrank='$arcrank',`money`='$money',title='$title',color='$color',source='$source',writer='$writer',litpic='$litpic',pubdate='$pubdate',notpost='$notpost',description='$description',keywords='$keywords',shorttitle='$shorttitle',filename='$filename',dutyadmin='$adminid',weight='$weight' WHERE id='$id'; "; if (!$dsql->ExecuteNoneQuery($inQuery)) { ShowMsg("数据保存到数据库主表`#@__archives`时出错，请检查数据库字段", "-1"); diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm index 24678071..eac1f8ce 100644 --- a/src/admin/templets/archives_add.htm +++ b/src/admin/templets/archives_add.htm @@ -26,7 +26,7 @@ return false; } if (document.form1.typeid.value == 0) { - ShowMsg("请选择档案的主栏目"); + ShowMsg("请选择文档的主栏目"); return false; } } diff --git a/src/admin/templets/archives_sg_add.htm b/src/admin/templets/archives_sg_add.htm index 5b410252..40042cf2 100644 --- a/src/admin/templets/archives_sg_add.htm +++ b/src/admin/templets/archives_sg_add.htm @@ -27,7 +27,7 @@ return false; } if (document.form1.typeid.value==0){ - ShowMsg("请选择档案的主栏目"); + ShowMsg("请选择文档的主栏目"); return false; } } diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm index 8978041f..dc667696 100644 --- a/src/admin/templets/article_add.htm +++ b/src/admin/templets/article_add.htm @@ -28,7 +28,7 @@ return false; } if (document.form1.typeid.value == 0) { - ShowMsg('请选择档案的主类别'); + ShowMsg('请选择文档的主类别'); return false; } } diff --git a/src/admin/templets/catalog_add_quick.htm b/src/admin/templets/catalog_add_quick.htm index 29e0dd1c..710fdadf 100644 --- a/src/admin/templets/catalog_add_quick.htm +++ b/src/admin/templets/catalog_add_quick.htm @@ -84,7 +84,7 @@ - +
栏目管理 > 批量增加栏目 栏目管理 > 批量增加栏目 增加顶级栏目
diff --git a/src/admin/templets/content_att.htm b/src/admin/templets/content_att.htm index 4c353753..bdc9126f 100644 --- a/src/admin/templets/content_att.htm +++ b/src/admin/templets/content_att.htm @@ -18,7 +18,7 @@ 自定义属性的意义和使用说明：
- 在以往的版本中，网站主页、频道封面的设计，都只能单调的用 arclist 标记把某栏目最新或按特定排序方式的文档无选择的读出来，这样做法存在很大的不足，例如，我希望在最顶部的地方显示我想要的文档，在以往的版本中是无法做到的，但使用自定义属性之后，只要给arclist 标记加上 att='自定义属性的ID' 的属性，然后在发布的时候对适合的文档选择专门的属性，那么使用arclist的地方就会按您的意愿显示指定的文档
+ 在以往的版本中，网站主页、频道封面的设计，都只能单调的用 arclist 标记把某栏目最新或按特定排序方式的文档无选择的读出来，这样做法存在很大的不足，例如，我希望在最顶部的地方显示我想要的文档，在以往的版本中是无法做到的，但使用自定义属性之后，只要给arclist 标记加上 att='自定义属性的id' 的属性，然后在发布的时候对适合的文档选择专门的属性，那么使用arclist的地方就会按您的意愿显示指定的文档
注意事项：这个版本中att对应的字段是SET类型字段,因此为了数据安全起见不允许用户增加其它类型,但调用时允许使用组合条件,如:att='c,p'表示推荐图片新闻 diff --git a/src/admin/templets/content_batch_up.htm b/src/admin/templets/content_batch_up.htm index 1f17bb31..71496781 100644 --- a/src/admin/templets/content_batch_up.htm +++ b/src/admin/templets/content_batch_up.htm @@ -84,7 +84,7 @@ - 档案发布时间： + 文档发布时间： diff --git a/src/admin/templets/makehtml_taglist.htm b/src/admin/templets/makehtml_taglist.htm index e73ec25b..15d9943f 100644 --- a/src/admin/templets/makehtml_taglist.htm +++ b/src/admin/templets/makehtml_taglist.htm @@ -45,7 +45,7 @@ - + diff --git a/src/admin/templets/member_pmone.htm b/src/admin/templets/member_pmone.htm index 8281e79b..637f2b1d 100644 --- a/src/admin/templets/member_pmone.htm +++ b/src/admin/templets/member_pmone.htm @@ -38,7 +38,7 @@
生成位置： 系统设置-其他选项中“TAGS生成目录”项进行调整 系统设置-其他选项中“标签生成目录”项进行调整
每次最大创建页数：
- + diff --git a/src/admin/templets/mychannel_add.htm b/src/admin/templets/mychannel_add.htm index b777f891..9a16d8fb 100644 --- a/src/admin/templets/mychannel_add.htm +++ b/src/admin/templets/mychannel_add.htm @@ -158,15 +158,15 @@ - + - + - + diff --git a/src/admin/templets/mychannel_edit.htm b/src/admin/templets/mychannel_edit.htm index 335ab494..9f43e17d 100644 --- a/src/admin/templets/mychannel_edit.htm +++ b/src/admin/templets/mychannel_edit.htm @@ -184,15 +184,15 @@ - + - + - + diff --git a/src/admin/templets/mytag_add.htm b/src/admin/templets/mytag_add.htm index 28ebeeb1..14ef9a42 100644 --- a/src/admin/templets/mytag_add.htm +++ b/src/admin/templets/mytag_add.htm @@ -68,7 +68,7 @@ {dede:mytag name='标记名称' ismake='是否含板块代码（yes 或 no）' typeid='栏目id'/}
1、name 标记名称，该项是必须的属性，以下 2、3是可选属性；
2、ismake 默认是 no 表示设定的纯HTML代码， yes 表示含板块标记的代码；
- 3、typeid 表示所属栏目的ID，默认为 0 ，表示所有栏目通用的显示内容，在列表和文档模板中，typeid默认是这个列表或文档本身的栏目id + 3、typeid 表示所属栏目的id，默认为 0 ，表示所有栏目通用的显示内容，在列表和文档模板中，typeid默认是这个列表或文档本身的栏目id diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm index fe3e2362..af4bbeed 100644 --- a/src/admin/templets/soft_add.htm +++ b/src/admin/templets/soft_add.htm @@ -27,7 +27,7 @@ return false; } if (document.form1.typeid.value == 0) { - ShowMsg('请选择档案的主类别'); + ShowMsg('请选择文档的主类别'); return false; } } diff --git a/src/admin/templets/update_guide_getfiles.htm b/src/admin/templets/update_guide_getfiles.htm deleted file mode 100644 index fec3c864..00000000 --- a/src/admin/templets/update_guide_getfiles.htm +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - 自动更新程序-下载更新文件 - - - - - -
发送到： 填写用户登录的ID（网址uid=后面跟着的ID） 填写用户登录的id（网址uid=后面跟着的id）
标题：
档案发布程序文档发布程序 *
档案修改程序文档修改程序 *
档案管理程序文档管理程序 *
档案发布程序文档发布程序
档案修改程序文档修改程序
档案管理程序文档管理程序
所属栏目：
- - - - - - - - - - - - - -
- 自动更新程序::下载更新文件 - 返回系统主页 -
下载的文件临时存放在文件夹../data/内，如果某些基础类有重要的改动导致更新中途中错，您可以从这文件夹提取文件手工更新
- - - - - -
结果： - - 增大 - 缩小 -
-
-
-
- - \ No newline at end of file diff --git a/src/admin/templets/update_guide_getlist.htm b/src/admin/templets/update_guide_getlist.htm deleted file mode 100644 index 3d14aec0..00000000 --- a/src/admin/templets/update_guide_getlist.htm +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - 自动更新程序 - 待下载文件列表 - - - - - - - - - - - - - - -
- 自动更新程序::待下载文件列表 - 返回系统主页 -
- - \ No newline at end of file diff --git a/src/apps/advancedsearch.php b/src/apps/advancedsearch.php index ae1244bd..040dbfef 100755 --- a/src/apps/advancedsearch.php +++ b/src/apps/advancedsearch.php @@ -187,7 +187,7 @@ if (file_exists(DEDEROOT."/theme/templets/$template")) { $dlist->SetTemplate($templatefile); $dlist->SetSource($query); require_once(DEDEINC."/channelunit.class.php"); -//获得一个指定档案的链接 +//获得一个指定文档的链接 function GetArcUrl($aid, $typeid, $timetag, $title, $ismake = 0, $rank = 0, $namerule = '', $artdir = '', $money = 0) { return GetFileUrl($aid, $typeid, $timetag, $title, $ismake, $rank, $namerule, $artdir, $money); diff --git a/src/apps/vote.php b/src/apps/vote.php index 30df5b1d..b717d89b 100755 --- a/src/apps/vote.php +++ b/src/apps/vote.php @@ -20,7 +20,7 @@ if (empty($dopost)) $dopost = ''; $aid = (isset($aid) && is_numeric($aid)) ? $aid : 0; if ($aid == 0) die("dedebiz"); if ($aid == 0) { - ShowMsg("没指定投票项目的ID", "-1"); + ShowMsg("没指定投票项目的id", "-1"); exit(); } $vo = new DedeVote($aid); diff --git a/src/data/admin/source.txt b/src/data/admin/source.txt index 110f627d..b3272b82 100644 --- a/src/data/admin/source.txt +++ b/src/data/admin/source.txt @@ -1,3 +1,3 @@ -今日头条 微信公众号 +头条号 百家号 \ No newline at end of file diff --git a/src/data/admin/ver.txt b/src/data/admin/ver.txt index 24221b81..e29161b8 100644 --- a/src/data/admin/ver.txt +++ b/src/data/admin/ver.txt @@ -1 +1 @@ -20220504 \ No newline at end of file +20221025 \ No newline at end of file diff --git a/src/data/admin/verifies.txt b/src/data/admin/verifies.txt index 67eb4be5..e29161b8 100644 --- a/src/data/admin/verifies.txt +++ b/src/data/admin/verifies.txt @@ -1 +1 @@ -20220415 \ No newline at end of file +20221025 \ No newline at end of file diff --git a/src/install/index.php b/src/install/index.php index 37c402c2..feefd0da 100644 --- a/src/install/index.php +++ b/src/install/index.php @@ -265,16 +265,16 @@ else if ($step==2) $upwd = password_hash($adminpwd, PASSWORD_BCRYPT); } //增加管理员帐号 - $adminquery = "INSERT INTO `{$dbprefix}admin` (`id`, `usertype`, `userid`, `$pfd`, `uname`, `tname`, `email`, `typeid`, `logintime`, `loginip`) VALUES (1, 10, '$adminuser', '".$apwd."', 'admin', '', '', 0, '".time()."', '127.0.0.1');"; + $adminquery = "INSERT INTO `{$dbprefix}admin` (`id`,`usertype`,`userid`,`$pfd`,`uname`,`tname`,`email`,`typeid`,`logintime`,`loginip`) VALUES (1,10,'$adminuser','".$apwd."','admin','','',0,'".time()."','127.0.0.1');"; $dbtype == 'sqlite'? $db->exec($adminquery) : mysql_query($adminquery,$conn); //关连前台会员帐号 - $adminquery = "INSERT INTO `{$dbprefix}member` (`mid`,`mtype`,`userid`,`{$pfd}`,`uname`,`sex`,`rank`,`money`,`email`,`scores` ,`matt` ,`face`,`safequestion`,`safeanswer` ,`jointime` ,`joinip` ,`logintime` ,`loginip` ) VALUES ('1','个人','$adminuser','".$upwd."','$adminuser','男','100','0','','10000','10','','0','','".time()."','','0',''); "; + $adminquery = "INSERT INTO `{$dbprefix}member` (`mid`,`mtype`,`userid`,`{$pfd}`,`uname`,`sex`,`rank`,`money`,`email`,`scores`,`matt`,`face`,`safequestion`,`safeanswer`,`jointime`,`joinip`,`logintime`,`loginip`) VALUES ('1','个人','$adminuser','".$upwd."','$adminuser','男','100','0','','10000','10','','0','','".time()."','','0',''); "; $dbtype == 'sqlite'? $db->exec($adminquery) : mysql_query($adminquery,$conn); - $adminquery = "INSERT INTO `{$dbprefix}member_person` (`mid`,`onlynet`,`sex`,`uname`,`qq`,`msn`,`tel`,`mobile`,`place`,`oldplace`,`birthday`,`star`,`income` , `education` , `height` , `bodytype` , `blood` , `vocation` , `smoke` , `marital` , `house` ,`drink` , `datingtype` , `language` , `nature` , `lovemsg` , `address`,`uptime`) VALUES ('1', '1', '男', '{$adminuser}', '', '', '', '', '0', '0','1980-01-01', '1', '0', '0', '160', '0', '0', '0', '0', '0', '0','0', '0', '', '', '', '','0'); "; + $adminquery = "INSERT INTO `{$dbprefix}member_person` (`mid`,`onlynet`,`sex`,`uname`,`qq`,`msn`,`tel`,`mobile`,`place`,`oldplace`,`birthday`,`star`,`income`,`education`,`height`,`bodytype`,`blood`,`vocation`,`smoke`,`marital`,`house`,`drink`,`datingtype`,`language`,`nature`,`lovemsg`,`address`,`uptime`) VALUES ('1','1','男','{$adminuser}','','','','','0','0','1980-01-01','1','0','0','160','0','0','0','0','0','0','0','0','','','','','0'); "; $dbtype == 'sqlite'? $db->exec($adminquery) : mysql_query($adminquery,$conn); $adminquery = "INSERT INTO `{$dbprefix}member_tj` (`mid`,`article`,`album`,`archives`,`homecount`,`pagecount`,`feedback`,`friend`,`stow`) VALUES ('1','0','0','0','0','0','0','0','0'); "; $dbtype == 'sqlite'? $db->exec($adminquery): mysql_query($adminquery,$conn); - $adminquery = "INSERT INTO `{$dbprefix}member_space` (`mid` ,`pagesize` ,`matt` ,`spacename` ,`spacelogo` ,`spacestyle`, `sign` ,`spacenews`) VALUES ('1','10','0','{$adminuser}的空间','','person','',''); "; + $adminquery = "INSERT INTO `{$dbprefix}member_space` (`mid`,`pagesize`,`matt`,`spacename`,`spacelogo`,`spacestyle`,`sign`,`spacenews`) VALUES ('1','10','0','{$adminuser}的空间','','person','',''); "; $dbtype == 'sqlite'? $db->exec($adminquery) : mysql_query($adminquery,$conn); //锁定程序安装 $fp = fopen(INSLOCKFILE,'w'); diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt index 74bf8be8..403c6f7b 100755 --- a/src/install/sql-dfdata.txt +++ b/src/install/sql-dfdata.txt @@ -4088,7 +4088,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin ('146', 'cfg_bizcore_port', 'DedeBIZ Core端口', 1, 'number', '8181'), ('147', 'cfg_bizcore_appid', 'DedeBIZ Core应用ID', 1, 'string', ''), ('148', 'cfg_bizcore_key', 'DedeBIZ Core通信密钥', 1, 'string', ''), -('149', 'cfg_tags_dir', 'TAGS生成目录', 7, 'string', '{cmspath}/a/tags'); +('149', 'cfg_tags_dir', '标签生成目录', 7, 'string', '{cmspath}/a/tags'); INSERT INTO `#@__sys_module` VALUES(1, '1f35620fb42d452fa2bdc1dee1690f92', '文件管理器', '', '', 0, ''), (2, 'b437d85a7a7bc778c9c79b5ec36ab9aa', '友情链接', '', '', 0, ''), diff --git a/src/install/v57sp2_to_v6.txt b/src/install/v57sp2_to_v6.txt index 315dd47c..a7ad0fd1 100644 --- a/src/install/v57sp2_to_v6.txt +++ b/src/install/v57sp2_to_v6.txt @@ -12,7 +12,7 @@ ALTER TABLE `#@__admin` ADD COLUMN `pwd_new` varchar(120) NOT NULL DEFAULT '' AF ALTER TABLE `#@__member` ADD COLUMN `pwd_new` varchar(120) NOT NULL DEFAULT '' AFTER `pwd`; -- 6.1.8 -INSERT INTO `#@__sysconfig` VALUES ('151', 'cfg_tags_dir', 'TAGS生成目录', 7, 'string', '{cmspath}/a/tags'); +INSERT INTO `#@__sysconfig` VALUES ('151', 'cfg_tags_dir', '标签生成目录', 7, 'string', '{cmspath}/a/tags'); ALTER TABLE `#@__tagindex` DROP COLUMN `tag_pinyin`; -- 6.1.7 diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index cca39110..d30efe7b 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -249,6 +249,7 @@ select:focus,input:focus,textarea:focus { z-index:10001 } .dlgws div { + padding:.5rem; width:100% } .dlgTesttitle { diff --git a/src/static/web/img/admin-logo.png b/src/static/web/img/admin-logo.png deleted file mode 100644 index 87d15c7e88dccf9733fc817559ae1d26d854496d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4430 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 r%-*J3uAHEvG=YokkPWLU-`PI3{+0u%vEbPP-k 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, $aid); } /** - * 设置档案ID + * 设置文档ID * * @access private - * @param int $aid 档案ID + * @param int $aid 文档ID * @return void */ function SetArcID($aid) diff --git a/src/system/database/dedesqli.class.php b/src/system/database/dedesqli.class.php index b9739ed0..d09a8833 100755 --- a/src/system/database/dedesqli.class.php +++ b/src/system/database/dedesqli.class.php @@ -433,7 +433,7 @@ class DedeSqli return @mysqli_num_rows($this->result[$id]); } } - //获取上一步INSERT操作产生的ID + //获取上一步INSERT操作产生的id function GetLastID() { //如果 AUTO_INCREMENT 的列的类型是 BIGINT，则 mysqli_insert_id() 返回的值将不正确 diff --git a/src/system/database/dedesqlite.class.php b/src/system/database/dedesqlite.class.php index 4eb4fbe7..3a9d0b95 100755 --- a/src/system/database/dedesqlite.class.php +++ b/src/system/database/dedesqlite.class.php @@ -411,7 +411,7 @@ class DedeSqlite $row = $rs->fetchArray(); return $row['dd']; } - //获取上一步INSERT操作产生的ID + //获取上一步INSERT操作产生的id function GetLastID() { //如果 AUTO_INCREMENT 的列的类型是 BIGINT，则 mysqli_insert_id() 返回的值将不正确 diff --git a/src/system/dedetag.class.php b/src/system/dedetag.class.php index ffd99d43..e0147294 100755 --- a/src/system/dedetag.class.php +++ b/src/system/dedetag.class.php @@ -1,7 +1,7 @@ LoadSource($str); } /** - * 获得指定名称的Tag的ID(如果有多个同名的Tag,则取没有被取代为内容的第一个Tag) + * 获得指定名称的Tag的id，如果有多个同名的Tag，则取没有被取代为内容的第一个Tag * * @access public * @param string $str 字符串 diff --git a/src/system/taglib/help/arclist.txt b/src/system/taglib/help/arclist.txt index 80341088..2cfbec98 100755 --- a/src/system/taglib/help/arclist.txt +++ b/src/system/taglib/help/arclist.txt @@ -7,7 +7,7 @@ imgwidth='' imgheight='' listtype='' orderby='' keyword='' limit='0,1'} >>dede>> col='' 分多少列显示（默认为单列） row='10' 返回文档列表总数 -typeid='' 栏目id,在列表模板和档案模板中一般不需要指定，在封面模板中允许用","分开表示多个栏目； +typeid='' 栏目id,在列表模板和文档模板中一般不需要指定，在封面模板中允许用","分开表示多个栏目； titlelen = '30' 标题长度 等同于titlelength infolen='160' 表示内容简介长度 等同于infolength imgwidth='120' 缩略图宽度 diff --git a/src/system/taglib/help/arclistsg.txt b/src/system/taglib/help/arclistsg.txt index 122158c4..5096ed81 100755 --- a/src/system/taglib/help/arclistsg.txt +++ b/src/system/taglib/help/arclistsg.txt @@ -6,7 +6,7 @@ >>dede>> col='' 分多少列显示（默认为单列），5.3版中本属性无效，要多列显示的可用div+css实现 row='10' 返回文档列表总数 -typeid='' 栏目id,在列表模板和档案模板中一般不需要指定，在封面模板中允许用","分开表示多个栏目； +typeid='' 栏目id,在列表模板和文档模板中一般不需要指定，在封面模板中允许用","分开表示多个栏目； titlelen = '30' 标题长度 等同于titlelength orderwey='desc'或'asc' 排序方向 keyword= 含有指定关键词的文档列表，多个关键词用","分 diff --git a/src/system/userlogin.class.php b/src/system/userlogin.class.php index cee14eaa..5b5845cb 100755 --- a/src/system/userlogin.class.php +++ b/src/system/userlogin.class.php @@ -364,7 +364,7 @@ class userLogin return $this->getUserType(); } /** - * 获得用户的ID + * 获得用户的id * * @access public * @return int diff --git a/src/theme/plus/showphoto.htm b/src/theme/plus/showphoto.htm index 3e37747c..0dcb30ad 100644 --- a/src/theme/plus/showphoto.htm +++ b/src/theme/plus/showphoto.htm @@ -9,7 +9,7 @@
-

+

diff --git a/src/user/archives_sg_add.php b/src/user/archives_sg_add.php index 1865cdfd..236fd631 100755 --- a/src/user/archives_sg_add.php +++ b/src/user/archives_sg_add.php @@ -65,7 +65,7 @@ else if ($dopost == 'save') { $autokey = $remote = $dellink = $autolitpic = 0; $userip = GetIP(); if ($typeid == 0) { - ShowMsg('请指定文档隶属的栏目', '-1'); + ShowMsg('请指定文档所属栏目', '-1'); exit(); } $query = "SELECT tp.ispart,tp.channeltype,tp.issend,ch.issend AS cissend,ch.sendrank,ch.arcsta,ch.addtable,ch.fieldset,ch.usertype FROM `#@__arctype` tp LEFT JOIN `#@__channeltype` ch ON ch.id=tp.channeltype WHERE tp.id='$typeid' "; diff --git a/src/user/archives_sg_edit.php b/src/user/archives_sg_edit.php index 88cf6983..46cab4d9 100755 --- a/src/user/archives_sg_edit.php +++ b/src/user/archives_sg_edit.php @@ -48,7 +48,7 @@ else if ($dopost == 'save') { $typeid = isset($typeid) && is_numeric($typeid) ? $typeid : 0; $userip = GetIP(); if ($typeid == 0) { - ShowMsg('请指定文档隶属的栏目', '-1'); + ShowMsg('请指定文档所属栏目', '-1'); exit(); } $query = "SELECT tp.ispart,tp.channeltype,tp.issend,ch.issend AS cissend,ch.sendrank,ch.arcsta,ch.addtable,ch.fieldset,ch.usertype FROM `#@__arctype` tp LEFT JOIN `#@__channeltype` ch ON ch.id=tp.channeltype WHERE tp.id='$typeid' "; diff --git a/src/user/inc/archives_check.php b/src/user/inc/archives_check.php index d789794c..5d341f92 100755 --- a/src/user/inc/archives_check.php +++ b/src/user/inc/archives_check.php @@ -26,7 +26,7 @@ $flag = ''; $autokey = $remote = $dellink = $autolitpic = 0; $userip = GetIP(); if ($typeid == 0) { - ShowMsg('请指定文档隶属的栏目', '-1'); + ShowMsg('请指定文档所属栏目', '-1'); exit(); } $query = "SELECT tp.ispart,tp.channeltype,tp.issend,ch.issend as cissend,ch.sendrank,ch.arcsta,ch.addtable,ch.fieldset,ch.usertype FROM `#@__arctype` tp LEFT JOIN `#@__channeltype` ch on ch.id=tp.channeltype WHERE tp.id='$typeid' "; diff --git a/src/user/inc/archives_check_edit.php b/src/user/inc/archives_check_edit.php index 8dc14aec..7d00cfd9 100755 --- a/src/user/inc/archives_check_edit.php +++ b/src/user/inc/archives_check_edit.php @@ -15,7 +15,7 @@ $flag = ''; $typeid = isset($typeid) && is_numeric($typeid) ? $typeid : 0; $userip = GetIP(); if ($typeid == 0) { - ShowMsg('请指定文档隶属的栏目', '-1'); + ShowMsg('请指定文档所属栏目', '-1'); exit(); } //校验CSRF diff --git a/src/user/inc/inc_archives_functions.php b/src/user/inc/inc_archives_functions.php index 1a06691e..d30f2a20 100755 --- a/src/user/inc/inc_archives_functions.php +++ b/src/user/inc/inc_archives_functions.php @@ -54,7 +54,6 @@ function GetCurContentAlbum($body, $rfurl, &$firstdd) if (!preg_match("#\.(gif|jpg|png)#i", $itype)) $itype = ".jpg"; $rndFileName = $imgPath."/".$milliSecond.$key.$itype; $iurl = $imgUrl."/".$milliSecond.$key.$itype; - //下载并保存文件 //$rs = $htd->SaveToBin($rndFileName); $rs = DownImageKeep($value, $rfurl, $rndFileName, '', 0, 30); @@ -233,7 +232,7 @@ function PrintAutoFieldsEdit(&$fieldset, &$fieldValues, $loadtype = 'all') echo ""; } /** - * 创建指定ID的文档 + * 创建指定id的文档 * * @param int $aid * @param bool $ismakesign diff --git a/src/user/soft_edit.php b/src/user/soft_edit.php index fbef477c..c5fc478b 100755 --- a/src/user/soft_edit.php +++ b/src/user/soft_edit.php @@ -129,7 +129,7 @@ else if ($dopost == 'save') { exit(); } } - //修改主档案表 + //修改主文档表 $upQuery = "UPDATE `#@__archives` SET ismake='$ismake',arcrank='$arcrank',typeid='$typeid',title='$title',litpic='$litpic',description='$description',keywords='$keywords',flag='$flag' WHERE id='$aid' AND mid='$mid'; "; if (!$dsql->ExecuteNoneQuery($upQuery)) { ShowMsg("数据保存到数据库主表`#@__archives`时出错，请联系管理员", "-1");