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 87d15c7e..00000000 Binary files a/src/static/web/img/admin-logo.png and /dev/null differ diff --git a/src/static/web/img/logo.gif b/src/static/web/img/logo.gif deleted file mode 100644 index 4530dbbf..00000000 Binary files a/src/static/web/img/logo.gif and /dev/null differ diff --git a/src/static/web/img/xs.jpg b/src/static/web/img/xs.jpg deleted file mode 100644 index 7da56df1..00000000 Binary files a/src/static/web/img/xs.jpg and /dev/null differ diff --git a/src/system/archive/freelist.class.php b/src/system/archive/freelist.class.php index 83896149..9a0f1cfe 100755 --- a/src/system/archive/freelist.class.php +++ b/src/system/archive/freelist.class.php @@ -794,7 +794,7 @@ class FreeList return $plist; } /** - * 获得一个指定档案的链接 + * 获得一个指定文档的链接 * * @access public * @param int $aid 文档id diff --git a/src/system/archive/taglist.class.php b/src/system/archive/taglist.class.php index a6aad239..0de0f2ca 100755 --- a/src/system/archive/taglist.class.php +++ b/src/system/archive/taglist.class.php @@ -628,7 +628,7 @@ class TagList return GetTypeUrl($typeid, MfTypedir($typedir), $isdefault, $defaultname, $ispart, $namerule2, $siteurl); } /** - * 获得一个指定档案的链接 + * 获得一个指定文档的链接 * * @access private * @param int $aid 文档id diff --git a/src/system/channelunit.class.php b/src/system/channelunit.class.php index 6cc1f153..9b9b01b5 100755 --- a/src/system/channelunit.class.php +++ b/src/system/channelunit.class.php @@ -74,10 +74,10 @@ class ChannelUnit $this->__construct($cid, $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");