Browse Source

移除不必要的资源,更新时间调整

tags/6.2.0
xushubieli 1 year ago
parent
commit
6242709aea
59 changed files with 72 additions and 147 deletions
  1. +2
    -2
      src/admin/album_add.php
  2. +1
    -1
      src/admin/album_edit.php
  3. +1
    -1
      src/admin/article_allowurl_edit.php
  4. +2
    -2
      src/admin/article_select_sw.php
  5. +1
    -1
      src/admin/article_source_edit.php
  6. +1
    -1
      src/admin/article_string_mix.php
  7. +1
    -1
      src/admin/article_writer_edit.php
  8. +2
    -2
      src/admin/inc/inc_action_info.php
  9. +3
    -3
      src/admin/inc/inc_archives_functions.php
  10. +1
    -1
      src/admin/inc/inc_batchup.php
  11. +1
    -1
      src/admin/inc/inc_menu.php
  12. +1
    -1
      src/admin/js/main.js
  13. +2
    -2
      src/admin/makehtml_list_action.php
  14. +3
    -3
      src/admin/makehtml_taglist_action.php
  15. +1
    -1
      src/admin/media_edit.php
  16. +1
    -1
      src/admin/member_do.php
  17. +1
    -1
      src/admin/soft_edit.php
  18. +1
    -1
      src/admin/templets/archives_add.htm
  19. +1
    -1
      src/admin/templets/archives_sg_add.htm
  20. +1
    -1
      src/admin/templets/article_add.htm
  21. +1
    -1
      src/admin/templets/catalog_add_quick.htm
  22. +1
    -1
      src/admin/templets/content_att.htm
  23. +1
    -1
      src/admin/templets/content_batch_up.htm
  24. +1
    -1
      src/admin/templets/makehtml_taglist.htm
  25. +1
    -1
      src/admin/templets/member_pmone.htm
  26. +3
    -3
      src/admin/templets/mychannel_add.htm
  27. +3
    -3
      src/admin/templets/mychannel_edit.htm
  28. +1
    -1
      src/admin/templets/mytag_add.htm
  29. +1
    -1
      src/admin/templets/soft_add.htm
  30. +0
    -49
      src/admin/templets/update_guide_getfiles.htm
  31. +0
    -26
      src/admin/templets/update_guide_getlist.htm
  32. +1
    -1
      src/apps/advancedsearch.php
  33. +1
    -1
      src/apps/vote.php
  34. +1
    -1
      src/data/admin/source.txt
  35. +1
    -1
      src/data/admin/ver.txt
  36. +1
    -1
      src/data/admin/verifies.txt
  37. +4
    -4
      src/install/index.php
  38. +1
    -1
      src/install/sql-dfdata.txt
  39. +1
    -1
      src/install/v57sp2_to_v6.txt
  40. +1
    -0
      src/static/web/css/admin.css
  41. BIN
      src/static/web/img/admin-logo.png
  42. BIN
      src/static/web/img/logo.gif
  43. BIN
      src/static/web/img/xs.jpg
  44. +1
    -1
      src/system/archive/freelist.class.php
  45. +1
    -1
      src/system/archive/taglist.class.php
  46. +2
    -2
      src/system/channelunit.class.php
  47. +1
    -1
      src/system/database/dedesqli.class.php
  48. +1
    -1
      src/system/database/dedesqlite.class.php
  49. +3
    -3
      src/system/dedetag.class.php
  50. +1
    -1
      src/system/taglib/help/arclist.txt
  51. +1
    -1
      src/system/taglib/help/arclistsg.txt
  52. +1
    -1
      src/system/userlogin.class.php
  53. +1
    -1
      src/theme/plus/showphoto.htm
  54. +1
    -1
      src/user/archives_sg_add.php
  55. +1
    -1
      src/user/archives_sg_edit.php
  56. +1
    -1
      src/user/inc/archives_check.php
  57. +1
    -1
      src/user/inc/archives_check_edit.php
  58. +1
    -2
      src/user/inc/inc_archives_functions.php
  59. +1
    -1
      src/user/soft_edit.php

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

@@ -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();


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

@@ -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 (


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

@@ -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("<textarea name='allurls' id='allurls'class='biz-textarea'>$allurls</textarea>");
$win->AddMsgItem("<textarea name='allurls' id='allurls' class='biz-textarea'>$allurls</textarea>");
$winform = $win->GetWindow('ok');
$win->Display();
?>

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

@@ -22,7 +22,7 @@ if ($t == 'source') {
echo "<a href='javascript:;' onclick='javascript:PutSource(\"$v\")'>$v</a> | \r\n";
}
}
echo "</div><div class='coolbg5'> </div>";
echo "</div>";
} else {
//作者列表
$m_file = DEDEDATA."/admin/writer.txt";
@@ -40,6 +40,6 @@ if ($t == 'source') {
}
}
}
echo "</div><div class='coolbg5'> </div>\r\n";
echo "</div>";
}
?>

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

@@ -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("<textarea name='allsource' id='allsource'class='biz-textarea'>$allsource</textarea>");
$win->AddMsgItem("<textarea name='allsource' id='allsource' class='biz-textarea'>$allsource</textarea>");
$winform = $win->GetWindow('ok');
$win->Display();
?>

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

@@ -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("<textarea name='allsource' id='allsource'class='biz-textarea'>$allsource</textarea>");
$win->AddMsgItem("<textarea name='allsource' id='allsource' class='biz-textarea'>$allsource</textarea>");
$winform = $win->GetWindow('ok');
$win->Display();
?>

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

@@ -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("<textarea name='allwriter' id='allwriter'class='biz-textarea'>$allwriter</textarea>");
$win->AddMsgItem("<textarea name='allwriter' id='allwriter' class='biz-textarea'>$allwriter</textarea>");
$winform = $win->GetWindow('ok');
$win->Display();
?>

+ 2
- 2
src/admin/inc/inc_action_info.php View File

@@ -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'


+ 3
- 3
src/admin/inc/inc_archives_functions.php View File

@@ -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);
}


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

@@ -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 {


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

@@ -76,7 +76,7 @@ if ($cuserLogin->getUserType() >= 10) {
$menusMain = "<m:top item='1_' name='常用操作' display='block'>
<m:item name='网站栏目管理' link='catalog_main.php' ischannel='1' addalt='创建栏目' linkadd='catalog_add.php?listtype=all' rank='t_List,t_AccList' target='main' />
<m:item name='所有文档列表' link='content_list.php' rank='a_List,a_AccList' target='main' />
<m:item name='等审核的档' link='content_list.php?arcrank=-1' rank='a_Check,a_AccCheck' target='main' />
<m:item name='等审核的档' link='content_list.php?arcrank=-1' rank='a_Check,a_AccCheck' target='main' />
<m:item name='我发布的文档' link='content_list.php?mid=".$cuserLogin->getUserID()."' rank='a_List,a_AccList,a_MyList' target='main' />
<m:item name='评论管理' link='feedback_main.php' rank='sys_Feedback' target='main' />
<m:item name='文档回收站' link='recycling.php' ischannel='1' addalt='清空回收站' addico='fa-minus-circle' linkadd='archives_do.php?dopost=clear&aid=no&recycle=1' rank='a_List,a_AccList,a_MyList' target='main' />


+ 1
- 1
src/admin/js/main.js View File

@@ -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);


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

@@ -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) {


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

@@ -45,7 +45,7 @@ if ($ctagid == 0 && $allfinish) {
$dlist->SetTagsDir($tagsdir);
$dlist->MakeHtml(1, 10);
$reurl = '..'.$tagsdir;
ShowMsg("更新完成TAG,<a href='$reurl' target='_blank'>浏览标签</a>", "javascript:;");
ShowMsg("更新标签,<a href='$reurl' target='_blank'>浏览标签</a>", "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更新<a href='$reurl' target='_blank'>浏览标签</a>", "javascript:;");
ShowMsg("更新标签完成,<a href='$reurl' target='_blank'>浏览标签</a>", "javascript:;");
} else {
$query = "UPDATE `#@__tagindex` SET mktime=uptime WHERE id='$ctagid' ";
$dsql->ExecuteNoneQuery($query);
$reurl .= '/'.$ctagid;
ShowMsg("更新完成TAG:".$tag['tag'].",<a href='$reurl' target='_blank'>浏览标签</a>", "javascript:;");
ShowMsg("更新标签:".$tag['tag'].",<a href='$reurl' target='_blank'>浏览标签</a>", "javascript:;");
}
exit();
} else {


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

@@ -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');

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

@@ -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,<br>必须先删除这个管理员才能删除此帐号", $ENV_GOBACK_URL, 0, 3000);
ShowMsg("无法删除此会员,如果这个会员是管理员关连的id,<br>必须先删除这个管理员才能删除此帐号", $ENV_GOBACK_URL, 0, 3000);
exit();
}
}


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

@@ -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");


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

@@ -26,7 +26,7 @@
return false;
}
if (document.form1.typeid.value == 0) {
ShowMsg("请选择档的主栏目");
ShowMsg("请选择档的主栏目");
return false;
}
}


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

@@ -27,7 +27,7 @@
return false;
}
if (document.form1.typeid.value==0){
ShowMsg("请选择档的主栏目");
ShowMsg("请选择档的主栏目");
return false;
}
}


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

@@ -28,7 +28,7 @@
return false;
}
if (document.form1.typeid.value == 0) {
ShowMsg('请选择档的主类别');
ShowMsg('请选择档的主类别');
return false;
}
}


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

@@ -84,7 +84,7 @@
<input type="hidden" name="savetype" value="" id="savetype">
<table width="98%" align="center" cellpadding="0" cellspacing="0" class="mt-3 mb-3">
<tr>
<td width="70%"><i class="fa fa-map"></i><a href="catalog_main.php">栏目管理</a> &gt; 批量增加栏目</td>
<td width="70%"><i class="fa fa-map"></i> <a href="catalog_main.php">栏目管理</a> &gt; 批量增加栏目</td>
<td width="30%" align="right"><a href="catalog_add.php?listtype=all" class="btn btn-success btn-sm">增加顶级栏目</a></td>
</tr>
</table>


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

@@ -18,7 +18,7 @@
<tr>
<td colspan="3">
自定义属性的意义和使用说明:<br>
在以往的版本中,网站主页、频道封面的设计,都只能单调的用 arclist 标记把某栏目最新或按特定排序方式的文档无选择的读出来,这样做法存在很大的不足,例如,我希望在最顶部的地方显示我想要的文档,在以往的版本中是无法做到的,但使用自定义属性之后,只要给arclist 标记加上 att='自定义属性的ID' 的属性,然后在发布的时候对适合的文档选择专门的属性,那么使用arclist的地方就会按您的意愿显示指定的文档<br>
在以往的版本中,网站主页、频道封面的设计,都只能单调的用 arclist 标记把某栏目最新或按特定排序方式的文档无选择的读出来,这样做法存在很大的不足,例如,我希望在最顶部的地方显示我想要的文档,在以往的版本中是无法做到的,但使用自定义属性之后,只要给arclist 标记加上 att='自定义属性的id' 的属性,然后在发布的时候对适合的文档选择专门的属性,那么使用arclist的地方就会按您的意愿显示指定的文档<br>
注意事项:这个版本中att对应的字段是SET类型字段,因此为了数据安全起见不允许用户增加其它类型,但调用时允许使用组合条件,如:att='c,p'表示推荐图片新闻
</td>
</tr>


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

@@ -84,7 +84,7 @@
</td>
</tr>
<tr>
<td>档发布时间:</td>
<td>档发布时间:</td>
<td>
<table cellspacing="0" cellpadding="0" class="table table-borderless">
<tr>


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

@@ -45,7 +45,7 @@
<?php }?>
<tr>
<td>生成位置:</td>
<td><input type="text" name="tagsdir" id="tagsdir" value="<?php echo $cfg_tags_dir;?>" style="width:260px" disabled> <a href="sys_info.php">系统设置</a>-其他选项中“TAGS生成目录”项进行调整</td>
<td><input type="text" name="tagsdir" id="tagsdir" value="<?php echo $cfg_tags_dir;?>" style="width:260px" disabled> <a href="sys_info.php">系统设置</a>-其他选项中“标签生成目录”项进行调整</td>
</tr>
<tr>
<td>每次最大创建页数:</td>


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

@@ -38,7 +38,7 @@
<table width="100%" cellpadding="1" cellspacing="1">
<tr>
<td width="260">发送到:</td>
<td><input type="text" name="msgtoid" class="text" value="<?php echo empty($touid)? '' : $touid?>" style="width:260px"> 填写用户登录的ID(网址uid=后面跟着的ID)</td>
<td><input type="text" name="msgtoid" class="text" value="<?php echo empty($touid)? '' : $touid?>" style="width:260px"> 填写用户登录的id(网址uid=后面跟着的id)</td>
</tr>
<tr>
<td>标题:</td>


+ 3
- 3
src/admin/templets/mychannel_add.htm View File

@@ -158,15 +158,15 @@
</td>
</tr>
<tr>
<td>档发布程序</td>
<td>档发布程序</td>
<td><input type="text" name="addcon" id="addcon" value="archives_add.php" class="pubinputs"> *</td>
</tr>
<tr>
<td>档修改程序</td>
<td>档修改程序</td>
<td><input type="text" name="editcon" id="editcon" value="archives_edit.php" class="pubinputs"> *</td>
</tr>
<tr>
<td>档管理程序</td>
<td>档管理程序</td>
<td><input type="text" name="mancon" id="mancon" value="content_list.php" class="pubinputs"> *</td>
</tr>
<tr>


+ 3
- 3
src/admin/templets/mychannel_edit.htm View File

@@ -184,15 +184,15 @@
</td>
</tr>
<tr>
<td>档发布程序</td>
<td>档发布程序</td>
<td><input type="text" name="addcon" id="addcon" value="<?php echo $row['addcon'];?>" class="pubinputs"></td>
</tr>
<tr>
<td>档修改程序</td>
<td>档修改程序</td>
<td><input type="text" name="editcon" id="editcon" value="<?php echo $row['editcon'];?>" class="pubinputs"></td>
</tr>
<tr>
<td>档管理程序</td>
<td>档管理程序</td>
<td><input type="text" name="mancon" id="mancon" value="<?php echo $row['mancon'];?>" class="pubinputs"></td>
</tr>
<tr>


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

@@ -68,7 +68,7 @@
{dede:mytag name='标记名称' ismake='是否含板块代码(yes 或 no)' typeid='栏目id'/}<br>
1、name 标记名称,该项是必须的属性,以下 2、3是可选属性;<br>
2、ismake 默认是 no 表示设定的纯HTML代码, yes 表示含板块标记的代码;<br>
3、typeid 表示所属栏目的ID,默认为 0 ,表示所有栏目通用的显示内容,在列表和文档模板中,typeid默认是这个列表或文档本身的栏目id</td>
3、typeid 表示所属栏目的id,默认为 0 ,表示所有栏目通用的显示内容,在列表和文档模板中,typeid默认是这个列表或文档本身的栏目id</td>
</tr>
<tr>
<td width="15%" align="center">所属栏目:</td>


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

@@ -27,7 +27,7 @@
return false;
}
if (document.form1.typeid.value == 0) {
ShowMsg('请选择档的主类别');
ShowMsg('请选择档的主类别');
return false;
}
}


+ 0
- 49
src/admin/templets/update_guide_getfiles.htm View File

@@ -1,49 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="<?php echo $cfg_soft_lang;?>">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<title>自动更新程序-下载更新文件</title>
<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="../static/web/css/admin.css">
</head>
<body>
<table width="98%" cellpadding="3" cellspacing="1" align="center">
<tr>
<td bgcolor="#f8f8f8" colspan="2">
<span class="float-left py-2">自动更新程序::下载更新文件</span>
<span class="float-right mr-2"><a href="index_body.php" class="btn btn-success btn-sm">返回系统主页</a></span>
</td>
</tr>
<tr>
<td colspan="2">下载的文件临时存放在文件夹<span class="text-danger">../data/<?php echo $tmpdir;?></span>内,如果某些基础类有重要的改动导致更新中途中错,您可以从这文件夹提取文件手工更新</td>
</tr>
<?php echo $dirinfos;?>
<tr bgcolor="#f8f8f8">
<td colspan="2">
<table width="100%">
<tr>
<td width="30%">结果:</td>
<td width="70%" align="right">
<script>
function ResizeDiv(obj,ty) {
if (ty=="+") document.all[obj].style.pixelHeight += 50;
else if (document.all[obj].style.pixelHeight>80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
}
</script>
<a href="javascript:;" onClick="ResizeDiv('mdv','+');" class="btn btn-success btn-sm">增大</a>
<a href="javascript:;" onClick="ResizeDiv('mdv','-');" class="btn btn-success btn-sm">缩小</a>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td colspan="2" id="mtd">
<div id="mdv" class="biz-win-iframe"><?php echo $doneStr;?></div>
</td>
</tr>
</table>
</body>
</html>

+ 0
- 26
src/admin/templets/update_guide_getlist.htm View File

@@ -1,26 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="<?php echo $cfg_soft_lang;?>">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<title>自动更新程序 - 待下载文件列表</title>
<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="../static/web/css/admin.css">
<script src='../static/web/js/webajax.js'></script>
<script src='js/indexbody.js'></script>
</head>
<body>
<table width="98%" align="center" cellpadding="3" cellspacing="1" class="table maintable mt-3 mb-3">
<tr>
<td bgcolor="#f8f8f8">
<span class="float-left py-2">自动更新程序::待下载文件列表</span>
<span class="float-right mr-2"><a href="index_body.php" class="btn btn-success btn-sm">返回系统主页</a></span>
</td>
</tr>
<tr>
<td valign="top"><?php echo $allFileList;?></td>
</tr>
</table>
</body>
</html>

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

@@ -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);


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

@@ -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);


+ 1
- 1
src/data/admin/source.txt View File

@@ -1,3 +1,3 @@
今日头条
微信公众号
头条号
百家号

+ 1
- 1
src/data/admin/ver.txt View File

@@ -1 +1 @@
20220504
20221025

+ 1
- 1
src/data/admin/verifies.txt View File

@@ -1 +1 @@
20220415
20221025

+ 4
- 4
src/install/index.php View File

@@ -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');


+ 1
- 1
src/install/sql-dfdata.txt View File

@@ -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, ''),


+ 1
- 1
src/install/v57sp2_to_v6.txt View File

@@ -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


+ 1
- 0
src/static/web/css/admin.css View File

@@ -249,6 +249,7 @@ select:focus,input:focus,textarea:focus {
z-index:10001
}
.dlgws div {
padding:.5rem;
width:100%
}
.dlgTesttitle {


BIN
src/static/web/img/admin-logo.png View File

Before After
Width: 536  |  Height: 64  |  Size: 4.3KB

BIN
src/static/web/img/logo.gif View File

Before After
Width: 220  |  Height: 60  |  Size: 4.7KB

BIN
src/static/web/img/xs.jpg View File

Before After
Width: 640  |  Height: 640  |  Size: 30KB

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

@@ -794,7 +794,7 @@ class FreeList
return $plist;
}
/**
* 获得一个指定档的链接
* 获得一个指定档的链接
*
* @access public
* @param int $aid 文档id


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

@@ -628,7 +628,7 @@ class TagList
return GetTypeUrl($typeid, MfTypedir($typedir), $isdefault, $defaultname, $ispart, $namerule2, $siteurl);
}
/**
* 获得一个指定档的链接
* 获得一个指定档的链接
*
* @access private
* @param int $aid 文档id


+ 2
- 2
src/system/channelunit.class.php View File

@@ -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)


+ 1
- 1
src/system/database/dedesqli.class.php View File

@@ -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() 返回的值将不正确


+ 1
- 1
src/system/database/dedesqlite.class.php View File

@@ -411,7 +411,7 @@ class DedeSqlite
$row = $rs->fetchArray();
return $row['dd'];
}
//获取上一步INSERT操作产生的ID
//获取上一步INSERT操作产生的id
function GetLastID()
{
//如果 AUTO_INCREMENT 的列的类型是 BIGINT,则 mysqli_insert_id() 返回的值将不正确


+ 3
- 3
src/system/dedetag.class.php View File

@@ -1,7 +1,7 @@
<?php
if (!defined('DEDEINC')) exit('dedebiz');
/**
* DedeBIZ模板类
* 模板类
*
* @version $Id: dedetag.class.php 1 10:33 2010年7月6日Z tianya $
* @package DedeBIZ.Libraries
@@ -75,7 +75,7 @@ class DedeTag
}
}
/**
* DedeTagParse Dede织梦模板类
* DedeTagParse 模板类
* function c____DedeTagParse();
*
* @package DedeTagParse
@@ -370,7 +370,7 @@ class DedeTagParse
$this->LoadSource($str);
}
/**
* 获得指定名称的Tag的ID(如果有多个同名的Tag,则取没有被取代为内容的第一个Tag)
* 获得指定名称的Tag的id,如果有多个同名的Tag,则取没有被取代为内容的第一个Tag
*
* @access public
* @param string $str 字符串


+ 1
- 1
src/system/taglib/help/arclist.txt View File

@@ -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' 缩略图宽度


+ 1
- 1
src/system/taglib/help/arclistsg.txt View File

@@ -6,7 +6,7 @@
>>dede>>
col='' 分多少列显示(默认为单列),5.3版中本属性无效,要多列显示的可用div+css实现
row='10' 返回文档列表总数
typeid='' 栏目id,在列表模板和档模板中一般不需要指定,在封面模板中允许用","分开表示多个栏目;
typeid='' 栏目id,在列表模板和档模板中一般不需要指定,在封面模板中允许用","分开表示多个栏目;
titlelen = '30' 标题长度 等同于titlelength
orderwey='desc'或'asc' 排序方向
keyword= 含有指定关键词的文档列表,多个关键词用","分


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

@@ -364,7 +364,7 @@ class userLogin
return $this->getUserType();
}
/**
* 获得用户的ID
* 获得用户的id
*
* @access public
* @return int


+ 1
- 1
src/theme/plus/showphoto.htm View File

@@ -9,7 +9,7 @@
<body>
<div class="header">
<div class="top">
<h1><a href="<?php echo $cfg_basehost;?>" title="<?php echo $cfg_webname;?>"><img src="<?php echo $cfg_templets_skin;?>/images/logo.gif"></a></h1>
<h1><a href="<?php echo $cfg_basehost;?>" title="<?php echo $cfg_webname;?>"><img src="<?php echo $cfg_templets_skin;?>/images/logo.png"></a></h1>
</div>
</div>
<div class="msgbar">


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

@@ -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' ";


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

@@ -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' ";


+ 1
- 1
src/user/inc/archives_check.php View File

@@ -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' ";


+ 1
- 1
src/user/inc/archives_check_edit.php View File

@@ -15,7 +15,7 @@ $flag = '';
$typeid = isset($typeid) && is_numeric($typeid) ? $typeid : 0;
$userip = GetIP();
if ($typeid == 0) {
ShowMsg('请指定文档隶属的栏目', '-1');
ShowMsg('请指定文档所属栏目', '-1');
exit();
}
//校验CSRF


+ 1
- 2
src/user/inc/inc_archives_functions.php View File

@@ -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 "<input type=\"hidden\" name=\"_csrf_token\" value=\"".$GLOBALS['csrf_token']."\" />";
}
/**
* 创建指定ID的文档
* 创建指定id的文档
*
* @param int $aid
* @param bool $ismakesign


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

@@ -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");


Loading…
Cancel
Save