DedeBIZ
/
DedeV6
Watch 2
Star 0
Fork 0
Code Pull Requests 0 Releases 29 Activity
Browse Source

细节调整

tags/6.2.7
叙述、别离 2 years ago
parent
d090bc345c
commit
2155b9411a
18 changed files with 44 additions and 54 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      src/admin/diy_list.php
  2. +2
    -3
      src/admin/tag_test_action.php
  3. +1
    -1
      src/admin/templets/ad_add.htm
  4. +1
    -1
      src/admin/templets/index.htm
  5. +6
    -5
      src/admin/templets/mytag_tag_guide.htm
  6. +5
    -9
      src/admin/templets/mytag_tag_guide_ok.htm
  7. +1
    -1
      src/admin/templets/sys_admin_user_tj.htm
  8. +7
    -8
      src/admin/templets/sys_data_revert.htm
  9. +2
    -1
      src/admin/templets/sys_sql_query.htm
  10. +1
    -1
      src/admin/templets/tag_test.htm
  11. +2
    -4
      src/admin/templets/tags_main.htm
  12. +4
    -4
      src/admin/templets/vote_add.htm
  13. +1
    -1
      src/admin/templets/vote_main.htm
  14. +2
    -4
      src/admin/tpl.php
  15. +4
    -6
      src/apps/diy.php
  16. +1
    -1
      src/apps/jump.php
  17. +1
    -1
      src/apps/search.php
  18. +1
    -1
      src/apps/vote.php

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

@@ -13,7 +13,7 @@ CheckPurview('c_New');
$diyid = isset($diyid) && is_numeric($diyid) ? $diyid : 0; $diyid = isset($diyid) && is_numeric($diyid) ? $diyid : 0;
$action = isset($action) && in_array($action, array('post', 'list', 'edit', 'check', 'delete','excel')) ? $action : ''; $action = isset($action) && in_array($action, array('post', 'list', 'edit', 'check', 'delete','excel')) ? $action : '';
if (empty($diyid)) { if (empty($diyid)) {
showMsg("非法操作", 'javascript:;');
showMsg("操作失败", 'javascript:;');
exit(); exit();
} }
require_once DEDEINC.'/diyform.class.php'; require_once DEDEINC.'/diyform.class.php';
@@ -80,7 +80,7 @@ if ($action == 'post') {
if (empty($do)) { if (empty($do)) {
$id = isset($id) && is_numeric($id) ? $id : 0; $id = isset($id) && is_numeric($id) ? $id : 0;
if (empty($id)) { if (empty($id)) {
showMsg('非法操作未指定id', 'javascript:;');
showMsg('操作失败，未指定id', 'javascript:;');
exit(); exit();
} }
$query = "SELECT * FROM {$diy->table} WHERE id=$id"; $query = "SELECT * FROM {$diy->table} WHERE id=$id";


+ 2
- 3
src/admin/tag_test_action.php View File

@@ -16,7 +16,7 @@ CheckPurview('temp_Test');
require_once(DEDEINC."/archive/partview.class.php"); require_once(DEDEINC."/archive/partview.class.php");
CheckCSRF(); CheckCSRF();
if (empty($partcode)) { if (empty($partcode)) {
ShowMsg('错误请求', 'javascript:;');
ShowMsg('标签测试失败', 'javascript:;');
exit; exit;
} }
$partcode = stripslashes($partcode); $partcode = stripslashes($partcode);
@@ -26,9 +26,8 @@ if ($typeid > 0) $pv = new PartView($typeid);
else $pv = new PartView(); else $pv = new PartView();
$pv->SetTemplet($partcode, "string"); $pv->SetTemplet($partcode, "string");
if ($showsource == "" || $showsource == "yes") { if ($showsource == "" || $showsource == "yes") {
echo "模板代码:";
echo "<span class='text-primary'><pre>".dede_htmlspecialchars($partcode)."</pre></span>"; echo "<span class='text-primary'><pre>".dede_htmlspecialchars($partcode)."</pre></span>";
echo "结果:<hr size='1' width='100%'>";
echo "<hr>";
} }
$pv->Display(); $pv->Display();
?> ?>

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

@@ -73,7 +73,7 @@
</tr> </tr>
<tr> <tr>
<td>广告分类：</td> <td>广告分类：</td>
<td >
<td>
<select name="clsid" id="clsid" class="admin-input-sm"> <select name="clsid" id="clsid" class="admin-input-sm">
<option value="0">默认分类</option> <option value="0">默认分类</option>
<?php echo $option;?> <?php echo $option;?>


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

@@ -76,7 +76,7 @@
$(this).html('<i class="fa fa-dedent"></i>'); $(this).html('<i class="fa fa-dedent"></i>');
} }
}); });
};
}
</script> </script>
</body> </body>
</html> </html>

+ 6
- 5
src/admin/templets/mytag_tag_guide.htm View File

@@ -29,7 +29,7 @@
</tr> </tr>
</table> </table>
</span> </span>
<span style="display:none" id="list4">
<span id="list4" style="display:none">
<table width="100%" cellspacing="2" cellpadding="2"> <table width="100%" cellspacing="2" cellpadding="2">
<tr> <tr>
<td width="30%" rowspan="2" align="center">[field:imglink/]</td> <td width="30%" rowspan="2" align="center">[field:imglink/]</td>
@@ -47,8 +47,8 @@
<td bgcolor="#f5f5f5"><a href="mytag_main.php">自定义宏标记</a> &gt; 智能标记向导</td> <td bgcolor="#f5f5f5"><a href="mytag_main.php">自定义宏标记</a> &gt; 智能标记向导</td>
</tr> </tr>
<tr> <tr>
<td>
<table width="98%" cellspacing="0" cellpadding="0" class="table table-borderless">
<td class="p-0">
<table cellspacing="0" cellpadding="0" class="table table-borderless">
<tr> <tr>
<td width="25%"> <td width="25%">
<label><img src="../static/web/img/g_t2.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle()" value="1" checked="1"></label> <label><img src="../static/web/img/g_t2.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle()" value="1" checked="1"></label>
@@ -93,7 +93,7 @@
} }
echo "</select>"; echo "</select>";
?> ?>
附加属性：
<span>附加属性：</span>
<?php <?php
echo "<select name='att' class='admin-input-sm'>"; echo "<select name='att' class='admin-input-sm'>";
echo "<option value='0' selected>不限</option>"; echo "<option value='0' selected>不限</option>";
@@ -116,7 +116,8 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td>高级筛选：
<td>
<span>高级筛选：</span>
<label><input type="checkbox" name="types[]" id="type[]" value="image"> 带缩略图</label> <label><input type="checkbox" name="types[]" id="type[]" value="image"> 带缩略图</label>
<label><input type="checkbox" name="types[]" id="type[]" value="commend"> 推荐</label> <label><input type="checkbox" name="types[]" id="type[]" value="commend"> 推荐</label>
<label><input type="checkbox" name="types[]" id="type[]" value="spec"> 专题</label> <label><input type="checkbox" name="types[]" id="type[]" value="spec"> 专题</label>


+ 5
- 9
src/admin/templets/mytag_tag_guide_ok.htm View File

@@ -3,20 +3,16 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<title>智能标记向导</title>
<title>智能标记向导预览</title>
<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="../static/web/css/admin.css"> <link rel="stylesheet" href="../static/web/css/admin.css">
</head> </head>
<body> <body>
<form action="tag_test_action.php" method="post" name="f1" target="_blank"> <form action="tag_test_action.php" method="post" name="f1" target="_blank">
<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>"> <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
<table width="98%" cellspacing="0" cellpadding="0">
<tr>
<td align="center">
<textarea name="partcode" id="partcode" class="admin-textarea-xl"><?php echo $fulltag?></textarea>
<input type="submit" name="Submit" value="预览">
</td>
</tr>
</table>
<textarea name="partcode" id="partcode" class="admin-textarea-xl mb-3"><?php echo $fulltag?></textarea>
<input type="submit" name="Submit" value="预览">
</form> </form>
</body> </body>
</html> </html>

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

@@ -32,7 +32,7 @@
<td bgcolor="#f5f5f5"><a href="sys_admin_user.php">管理员帐号</a> &gt; 绩效统计</td> <td bgcolor="#f5f5f5"><a href="sys_admin_user.php">管理员帐号</a> &gt; 绩效统计</td>
</tr> </tr>
<tr> <tr>
<td >
<td>
<div id="loaddiv" class="text-center" style="display:none"><img src="../static/web/img/loadinglit.gif"></div> <div id="loaddiv" class="text-center" style="display:none"><img src="../static/web/img/loadinglit.gif"></div>
<?php <?php
$dsql->Execute('me', 'SELECT * FROM `#@__admin` ORDER BY id ASC'); $dsql->Execute('me', 'SELECT * FROM `#@__admin` ORDER BY id ASC');


+ 7
- 8
src/admin/templets/sys_data_revert.htm View File

@@ -75,16 +75,15 @@
for ($i=0;$i<count($filelists);$i++) for ($i=0;$i<count($filelists);$i++)
{ {
echo "<tr align='center'>"; echo "<tr align='center'>";
$mtd = "<td width='10%'><input name='bakfile' id='bakfile' type='checkbox' value='".$filelists[$i]."' checked='1'></td><td width='40%'>{$filelists[$i]}</td>";
echo $mtd;
if (isset($filelists[$i+1]))
{
$i++;
$mtd = "<td width='10%'><input name='bakfile' id='bakfile' type='checkbox' value='".$filelists[$i]."' checked='1'></td><td width='40%'>{$filelists[$i]}</td>"; $mtd = "<td width='10%'><input name='bakfile' id='bakfile' type='checkbox' value='".$filelists[$i]."' checked='1'></td><td width='40%'>{$filelists[$i]}</td>";
echo $mtd; echo $mtd;
} else {
echo "<td></td><td></td>";
}
if (isset($filelists[$i+1])) {
$i++;
$mtd = "<td width='10%'><input name='bakfile' id='bakfile' type='checkbox' value='".$filelists[$i]."' checked='1'></td><td width='40%'>{$filelists[$i]}</td>";
echo $mtd;
} else {
echo "<td></td><td></td>";
}
echo "</tr>"; echo "</tr>";
} }
?> ?>


+ 2
- 1
src/admin/templets/sys_sql_query.htm View File

@@ -58,7 +58,8 @@
<input type="hidden" name="dopost" value="query"> <input type="hidden" name="dopost" value="query">
<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>"> <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
<tr> <tr>
<td colspan="2">运行SQL命令行：
<td colspan="2">
<span>运行SQL命令行：</span>
<label><input type="radio" name="querytype" value="0"> 单行命令</label> <label><input type="radio" name="querytype" value="0"> 单行命令</label>
<label><input type="radio" name="querytype" value="2" checked> 多行命令</label> <label><input type="radio" name="querytype" value="2" checked> 多行命令</label>
</td> </td>


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

@@ -23,7 +23,7 @@
<td bgcolor="#f5f5f5" colspan="2">全局标记测试</td> <td bgcolor="#f5f5f5" colspan="2">全局标记测试</td>
</tr> </tr>
<tr> <tr>
<td >
<td>
<div class="alert alert-info mb-0">全局标记应用在网站首页、单独页面、封面栏目使用的单独模板标记，在列表或文档模板中，一般只允许调用channel、arclist标记（hotart、coolart、imglist等都是这个标记延伸出来的标记），但是环境变量限定为文档或列表所在的栏目，如果您要测试的标记是在列表或文档中使用，请指定环境变量（栏目id）各标记的具体含义和用途</div> <div class="alert alert-info mb-0">全局标记应用在网站首页、单独页面、封面栏目使用的单独模板标记，在列表或文档模板中，一般只允许调用channel、arclist标记（hotart、coolart、imglist等都是这个标记延伸出来的标记），但是环境变量限定为文档或列表所在的栏目，如果您要测试的标记是在列表或文档中使用，请指定环境变量（栏目id）各标记的具体含义和用途</div>
</td> </td>
</tr> </tr>


+ 2
- 4
src/admin/templets/tags_main.htm View File

@@ -32,8 +32,7 @@
let title = rs.title ? rs.title : ""; let title = rs.title ? rs.title : "";
let keywords = rs.keywords ? rs.keywords : ""; let keywords = rs.keywords ? rs.keywords : "";
let description = rs.description ? rs.description : ""; let description = rs.description ? rs.description : "";
ShowMsg(`
<div class="form-group row">
ShowMsg(`<div class="form-group row">
<label for="iptTitle" class="col-sm-3 col-form-label">标签</label> <label for="iptTitle" class="col-sm-3 col-form-label">标签</label>
<div class="col-sm-9"><input type="text" name="title" class="form-control" disabled value="${tag}"></div> <div class="col-sm-9"><input type="text" name="title" class="form-control" disabled value="${tag}"></div>
</div> </div>
@@ -48,8 +47,7 @@
<div class="form-group row"> <div class="form-group row">
<label for="iptDes" class="col-sm-3 col-form-label">描述</label> <label for="iptDes" class="col-sm-3 col-form-label">描述</label>
<div class="col-sm-9"><textarea id="iptDes" name="des" class="form-control" placeholder="例如：DedeBIZ系统基于PHP7版本开发，具有很强的可扩展性，并且完全开放源代码。">${description}</textarea></div> <div class="col-sm-9"><textarea id="iptDes" name="des" class="form-control" placeholder="例如：DedeBIZ系统基于PHP7版本开发，具有很强的可扩展性，并且完全开放源代码。">${description}</textarea></div>
</div>
`, {
</div>`, {
footer: `<button type="button" class="btn btn-success btn-sm" onclick="UpdateKwDesDo(${tid}, '~modalID~')">设置</button>`, footer: `<button type="button" class="btn btn-success btn-sm" onclick="UpdateKwDesDo(${tid}, '~modalID~')">设置</button>`,
}); });
}) })


+ 4
- 4
src/admin/templets/vote_add.htm View File

@@ -18,16 +18,16 @@
function AddItem() { function AddItem() {
i++; i++;
if (i > 15) { if (i > 15) {
ShowMsg("最大只允许15个选项");
ShowMsg("最多添加15个选项");
return; return;
} }
var htmldata = "<br>选项" + i + "：<input name='voteitem" + i + "' type='text' size='30' class='mt-2'>";
var htmldata = "<div class='py-2'>选项" + i + "：<input type='text' name='voteitem" + i + "' class='admin-input-lg'></div>";
jQuery("#voteitem").append(htmldata); jQuery("#voteitem").append(htmldata);
} }
function ResetItem() { function ResetItem() {
i = 1; i = 1;
var obj = document.getElementById("voteitem"); var obj = document.getElementById("voteitem");
obj.innerHTML = "选项1：<input name='voteitem1' type='text' size='30'>";
obj.innerHTML = "<div class='py-2'>选项1：<input type='text' name='voteitem1' class='admin-input-lg'></div>";
} }
function checkSubmit() { function checkSubmit() {
if (document.form1.votename.value == "") { if (document.form1.votename.value == "") {
@@ -127,7 +127,7 @@
<tr> <tr>
<td></td> <td></td>
<td> <td>
<div id="voteitem">选项1：<input type="text" name="voteitem1" size="30" id="voteitem1"></div>
<div id="voteitem" class="py-2">选项1：<input type="text" name="voteitem1" id="voteitem1" class="admin-input-lg"></div>
</td> </td>
</tr> </tr>
<tr> <tr>


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

@@ -23,7 +23,7 @@
<td width="10%">状态</td> <td width="10%">状态</td>
<td>操作</td> <td>操作</td>
</tr> </tr>
{dede:datalist empty='<tr><td colspan="7" align="center">暂无文档</td></tr>'}
{dede:datalist empty='<tr><td colspan="7" align="center">暂无投票</td></tr>'}
<tr align="center"> <tr align="center">
<td>{dede:field.aid/}</td> <td>{dede:field.aid/}</td>
<td><a href="{dede:global name='cfg_phpurl'/}/vote.php?aid={dede:field.aid/}&dopost=view" target="_blank"> {dede:field.votename/}</a></td> <td><a href="{dede:global name='cfg_phpurl'/}/vote.php?aid={dede:field.aid/}&dopost=view" target="_blank"> {dede:field.votename/}</a></td>


+ 2
- 4
src/admin/tpl.php View File

@@ -203,13 +203,11 @@ else if ($action == 'savetagfile') {
$fp = fopen($truefile, 'w'); $fp = fopen($truefile, 'w');
fwrite($fp, $content); fwrite($fp, $content);
fclose($fp); fclose($fp);
$msg = "
<form name='form1' action='tag_test_action.php' target='blank' method='post'>
$msg = "<form name='form1' action='tag_test_action.php' target='blank' method='post'>
<label><input type='hidden' name='dopost' value='make'> 标签测试（环境变量标签不支持测试）</label><br> <label><input type='hidden' name='dopost' value='make'> 标签测试（环境变量标签不支持测试）</label><br>
<textarea name='partcode' cols='150' rows='6' style='width:90%'>{dede:{$tagname}}{/dede:{$tagname}}</textarea><br> <textarea name='partcode' cols='150' rows='6' style='width:90%'>{dede:{$tagname}}{/dede:{$tagname}}</textarea><br>
<button type='submit' name='B1' class='btn btn-success btn-sm'>确定</button> <button type='submit' name='B1' class='btn btn-success btn-sm'>确定</button>
</form>
";
</form>";
$wintitle = "成功操作文件"; $wintitle = "成功操作文件";
$wecome_info = "<a href='templets_tagsource.php'>标签源码管理</a> &gt; 新建修改标签"; $wecome_info = "<a href='templets_tagsource.php'>标签源码管理</a> &gt; 新建修改标签";
$win = new OxWindow(); $win = new OxWindow();


+ 4
- 6
src/apps/diy.php View File

@@ -13,7 +13,7 @@ $diyid = isset($diyid) && is_numeric($diyid) ? $diyid : 0;
$action = isset($action) && in_array($action, array('post', 'list', 'view')) ? $action : 'post'; $action = isset($action) && in_array($action, array('post', 'list', 'view')) ? $action : 'post';
$id = isset($id) && is_numeric($id) ? $id : 0; $id = isset($id) && is_numeric($id) ? $id : 0;
if (empty($diyid)) { if (empty($diyid)) {
showMsg('非法操作', 'javascript:;');
showMsg('操作失败', 'javascript:;');
exit(); exit();
} }
require_once DEDEINC.'/diyform.class.php'; require_once DEDEINC.'/diyform.class.php';
@@ -49,13 +49,11 @@ if ($action == 'post') {
${$fieldinfo[0]} = addslashes(${$fieldinfo[0]}); ${$fieldinfo[0]} = addslashes(${$fieldinfo[0]});
} }
//获取地址，表单添加text数据类型ip字段型后模板用<input type="hidden" name="ip" value=""> //获取地址，表单添加text数据类型ip字段型后模板用<input type="hidden" name="ip" value="">
if ($fieldinfo[0] == 'ip')
{
if ($fieldinfo[0] == 'ip') {
${$fieldinfo[0]}=GetIP(); ${$fieldinfo[0]}=GetIP();
} }
//获取时间，表单添加text数据类型sj字段型后模板用<input type="hidden" name="sj" value=""> //获取时间，表单添加text数据类型sj字段型后模板用<input type="hidden" name="sj" value="">
if ($fieldinfo[0] == 'sj')
{
if ($fieldinfo[0] == 'sj') {
${$fieldinfo[0]}=date("Y-m-d H:i:s"); ${$fieldinfo[0]}=date("Y-m-d H:i:s");
} else { } else {
${$fieldinfo[0]} = GetFieldValue(${$fieldinfo[0]}, $fieldinfo[1],0,'add','','diy', $fieldinfo[0]); ${$fieldinfo[0]} = GetFieldValue(${$fieldinfo[0]}, $fieldinfo[1],0,'add','','diy', $fieldinfo[0]);
@@ -106,7 +104,7 @@ if ($action == 'post') {
exit(); exit();
} }
if (empty($id)) { if (empty($id)) {
showMsg('非法操作未指定id', 'javascript:;');
showMsg('操作失败，未指定id', 'javascript:;');
exit(); exit();
} }
if ($diy->public == 2) { if ($diy->public == 2) {


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

@@ -21,7 +21,7 @@ if (preg_match("#^http#", $url)) {
if ($rur['host'] !== $loc['host']) { if ($rur['host'] !== $loc['host']) {
//如果不是本站点的，则需要点击进行跳转 //如果不是本站点的，则需要点击进行跳转
$wintitle = "将要访问"; $wintitle = "将要访问";
$msg = "<code>$url</code><p><a href='$url' class='btn btn-success mt-2'>继续访问</a></p>";
$msg = "<code>$url</code><div class='mt-3'><a href='$url' class='btn btn-success btn-sm'>继续访问</a></div>";
$wecome_info = "页面跳转提示"; $wecome_info = "页面跳转提示";
$win = new OxWindow(); $win = new OxWindow();
$win->AddTitle("您将要访问的链接不属于当前站点，请关注您的账号安全。"); $win->AddTitle("您将要访问的链接不属于当前站点，请关注您的账号安全。");


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

@@ -70,7 +70,7 @@ $now = time();
$row = $dsql->GetOne("SELECT * FROM `#@__search_limits` WHERE ip='{$ip}'"); $row = $dsql->GetOne("SELECT * FROM `#@__search_limits` WHERE ip='{$ip}'");
if (is_array($row)) { if (is_array($row)) {
if (($now - $row['searchtime']) < $cfg_search_time) { if (($now - $row['searchtime']) < $cfg_search_time) {
ShowMsg('管理员设定搜索时间间隔为'.$cfg_search_time.'秒，请稍后再试', '-1');
ShowMsg("搜索间隔为<span class='text-primary'>$cfg_search_time</span>秒，请稍后重试", "-1");
exit; exit;
} }
$dsql->ExecuteNoneQuery("UPDATE `#@__search_limits` SET `searchtime`='{$now}' WHERE `ip`='{$ip}';"); $dsql->ExecuteNoneQuery("UPDATE `#@__search_limits` SET `searchtime`='{$now}' WHERE `ip`='{$ip}';");


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

@@ -29,7 +29,7 @@ $row = $dsql->GetOne("SELECT * FROM `#@__vote` WHERE aid='$aid'");
//判断是否允许游客进行投票 //判断是否允许游客进行投票
if ($row['isallow'] == 1) { if ($row['isallow'] == 1) {
if (!$member->IsLogin()) { if (!$member->IsLogin()) {
ShowMsg('请先登录再进行投票', $loginurl);
ShowMsg('请先登录后投票', $loginurl);
exit(); exit();
} }
} }


Write Preview
Loading…
Cancel
Save