主程序研发: |
-
+
1)
{
diff --git a/src/dede/templets/makehtml_taglist.htm b/src/dede/templets/makehtml_taglist.htm
index 9aaf4b68..31a00938 100644
--- a/src/dede/templets/makehtml_taglist.htm
+++ b/src/dede/templets/makehtml_taglist.htm
@@ -51,9 +51,9 @@
说明: |
仅更新文档数多于的关键词
- 更新所有TAG将会智能更新在[TAG标签管理]中重新获取更新的内容
- TAG首页模板文件://tag.htm
- TAG列表页模板文件://taglist.htm
+ 更新所有Tag将会智能更新在[Tag标签管理]中重新获取更新的内容
+ Tag首页模板文件://tag.htm
+ Tag列表页模板文件://taglist.htm
生成静态文件后,访问动态文件则直接跳转到静态文件,如果需要动态访问,删除对应文件即可。
|
diff --git a/src/index.php b/src/index.php
index d4b1970e..3eece6f9 100755
--- a/src/index.php
+++ b/src/index.php
@@ -3,6 +3,7 @@
* @version $Id: index.php 1 9:23 2010-11-11 tianya $
* @package DedeCMS.Site
* @copyright Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright Copyright (c) 2020, DedeBIZ.COM
* @license http://help.dedecms.com/usersguide/license.html
* @link http://www.dedecms.com
*/
diff --git a/src/plus/feedback.php b/src/plus/feedback.php
index b08c95b9..d2bcde7e 100755
--- a/src/plus/feedback.php
+++ b/src/plus/feedback.php
@@ -27,6 +27,7 @@ if (!isset($action)) {
}
$msg = isset($msg) ? $msg : "";
+$feedbacktype = isset($feedbacktype) ? $feedbacktype : "";
$validate = isset($validate) ? $validate : "";
$pwd = isset($pwd) ? $pwd : "";
$comtype = isset($comtype) ? $comtype : "";
@@ -34,8 +35,8 @@ $good = isset($good) ? intval($good) : 0;
$cfg_formmember = isset($cfg_formmember) ? true : false;
$ischeck = $cfg_feedbackcheck == 'Y' ? 0 : 1;
-$aid = (isset($aid) && is_numeric($aid)) ? $aid : 0;
-$fid = (isset($fid) && is_numeric($fid)) ? $fid : 0; // 用来标记回复评论的变量
+$aid = isset($aid) ? intval($aid) : 0;
+$fid = isset($fid) ? intval($fid) : 0; // 用来标记回复评论的变量
if (empty($aid) && empty($fid)) {
echo json_encode(array(
@@ -97,23 +98,6 @@ if ($action == '' || $action == 'show') {
));
exit;
}
-
-//引用评论
-//------------------------------------
-/*
-function __Quote(){ }
-*/ else if ($action == 'quote') {
- AjaxHead();
-
- $row = $dsql->GetOne("SELECT * FROM `#@__feedback` WHERE id ='$fid'");
- require_once(DEDEINC . '/dedetemplate.class.php');
- $dtp = new DedeTemplate();
- $tplfile = $type == '' ? DEDETEMPLATE . '/plus/feedback_quote.htm' : DEDETEMPLATE . '/plus/feedback_quote_ajax.htm';
-
- $dtp->LoadTemplate($tplfile);
- $dtp->Display();
- exit();
-}
//发表评论
//------------------------------------
/*
@@ -223,18 +207,20 @@ function __SendFeedback(){ }
extract($arcRow, EXTR_SKIP);
$msg = cn_substrR(TrimMsg($msg), $cfg_feedback_msglen);
$username = cn_substrR(HtmlReplace($username, 2), 20);
- if (empty($feedbacktype) || ($feedbacktype != 'good' && $feedbacktype != 'bad')) {
+
+ if (empty($feedbacktype) || !in_array($feedbacktype, array('good', 'bad'))) {
$feedbacktype = 'feedback';
}
+
//保存评论内容
- if ($comtype == 'comments') {
- $arctitle = addslashes($title);
+ if ($comtype == 'comments' || $comtype == 'reply') {
+ $arctitle = empty($title)? "" : addslashes($title);
$typeid = intval($typeid);
$ischeck = intval($ischeck);
$feedbacktype = preg_replace("#[^0-9a-z]#i", "", $feedbacktype);
if ($msg != '') {
- $inquery = "INSERT INTO `#@__feedback`(`aid`,`typeid`,`username`,`arctitle`,`ip`,`ischeck`,`dtime`, `mid`,`bad`,`good`,`ftype`,`face`,`msg`)
- VALUES ('$aid','$typeid','$username','$arctitle','$ip','$ischeck','$dtime', '{$cfg_ml->M_ID}','0','0','$feedbacktype','$face','$msg'); ";
+ $inquery = "INSERT INTO `#@__feedback`(`aid`,`typeid`,`fid`, `username`,`arctitle`,`ip`,`ischeck`,`dtime`, `mid`,`bad`,`good`,`ftype`,`face`,`msg`)
+ VALUES ('$aid','$typeid','$fid','$username','$arctitle','$ip','$ischeck','$dtime', '{$cfg_ml->M_ID}','0','0','$feedbacktype','$face','$msg'); ";
$rs = $dsql->ExecuteNoneQuery($inquery);
if (!$rs) {
echo json_encode(array(
diff --git a/src/plus/feedback_ajax.php b/src/plus/feedback_ajax.php
deleted file mode 100755
index 4e5d2ffe..00000000
--- a/src/plus/feedback_ajax.php
+++ /dev/null
@@ -1,352 +0,0 @@
-验证码错误,请点击验证码图片更新验证码!';
- exit();
- }
- }
-
- $arcRow = GetOneArchive($aid);
- if(empty($arcRow['aid']))
- {
- echo '无法查看未知文档的评论!';
- exit();
- }
- if(isset($arcRow['notpost']) && $arcRow['notpost']==1)
- {
- echo '这篇文档禁止评论!';
- exit();
- }
-
- if( $cfg_soft_lang != 'utf8' )
- {
- $msg = UnicodeUrl2Gbk($msg);
- if(!empty($username)) $username = UnicodeUrl2Gbk($username);
- }
- //词汇过滤检查
- if( $cfg_notallowstr != '' )
- {
- if(preg_match("#".$cfg_notallowstr."#i", $msg))
- {
- echo "评论内容含有禁用词汇!";
- exit();
- }
- }
- if( $cfg_replacestr != '' )
- {
- $msg = preg_replace("#".$cfg_replacestr."#i", '***', $msg);
- }
- if( empty($msg) )
- {
- echo "评论内容可能不合法或为空!";
- exit();
- }
- if($cfg_feedback_guest == 'N' && $cfg_ml->M_ID < 1)
- {
- echo "管理员禁用了游客评论!点击登录";
- exit();
- }
- //检查用户
- $username = empty($username) ? '游客' : $username;
- if(empty($notuser)) $notuser = 0;
- if($notuser==1)
- {
- $username = $cfg_ml->M_ID > 0 ? '匿名' : '游客';
- }
- else if($cfg_ml->M_ID > 0)
- {
- $username = $cfg_ml->M_UserName;
- }
- else if($username!='' && $pwd!='')
- {
- $rs = $cfg_ml->CheckUser($username, $pwd);
- if($rs==1)
- {
- $dsql->ExecuteNoneQuery("Update `#@__member` set logintime='".time()."',loginip='".GetIP()."' where mid='{$cfg_ml->M_ID}'; ");
- }
- $cfg_ml = new MemberLogin();
- }
-
- //检查评论间隔时间
- $ip = GetIP();
- $dtime = time();
- if(!empty($cfg_feedback_time))
- {
- //检查最后发表评论时间,如果未登录判断当前IP最后评论时间
- $where = ($cfg_ml->M_ID > 0 ? "WHERE `mid` = '$cfg_ml->M_ID' " : "WHERE `ip` = '$ip' ");
- $row = $dsql->GetOne("SELECT dtime FROM `#@__feedback` $where ORDER BY `id` DESC ");
- if(is_array($row) && $dtime - $row['dtime'] < $cfg_feedback_time)
- {
- ResetVdValue();
- echo '管理员设置了评论间隔时间,请稍等休息一下!';
- exit();
- }
- }
- $face = 1;
- extract($arcRow, EXTR_SKIP);
- $msg = cn_substrR(TrimMsg($msg), 500);
- $username = cn_substrR(HtmlReplace($username,2), 20);
- if(empty($feedbacktype) || ($feedbacktype!='good' && $feedbacktype!='bad'))
- {
- $feedbacktype = 'feedback';
- }
- //保存评论内容
- if(!empty($fid))
- {
- $row = $dsql->GetOne("SELECT username,msg from `#@__feedback` WHERE id ='$fid' ");
- $qmsg = '{quote}{content}'.$row['msg'].'{/content}{title}'.$row['username'].' 的原帖:{/title}{/quote}';
- $msg = addslashes($qmsg).$msg;
- }
- $ischeck = ($cfg_feedbackcheck=='Y' ? 0 : 1);
- $arctitle = addslashes(RemoveXSS($title));
- $typeid = intval($typeid);
- $feedbacktype = preg_replace("#[^0-9a-z]#i", "", $feedbacktype);
- $inquery = "INSERT INTO `#@__feedback`(`aid`,`typeid`,`username`,`arctitle`,`ip`,`ischeck`,`dtime`, `mid`,`bad`,`good`,`ftype`,`face`,`msg`)
- VALUES ('$aid','$typeid','$username','$arctitle','$ip','$ischeck','$dtime', '{$cfg_ml->M_ID}','0','0','$feedbacktype','$face','$msg'); ";
- $rs = $dsql->ExecuteNoneQuery($inquery);
- if( !$rs )
- {
- echo "发表评论出错了!";
- //echo $dslq->GetError();
- exit();
- }
- $newid = $dsql->GetLastID();
- //给文章评分
- if($feedbacktype=='bad')
- {
- $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET scores=scores-{cfg_feedback_sub},badpost=badpost+1,lastpost='$dtime' WHERE id='$aid' ");
- }
- else if($feedbacktype=='good')
- {
- $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET scores=scores+{$cfg_feedback_add},goodpost=goodpost+1,lastpost='$dtime' WHERE id='$aid' ");
- }
- else
- {
- $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET scores=scores+1,lastpost='$dtime' WHERE id='$aid' ");
- }
- //给用户增加积分
- if($cfg_ml->M_ID > 0)
- {
- $dsql->ExecuteNoneQuery("UPDATE `#@__member` set scores=scores+{$cfg_sendfb_scores} WHERE mid='{$cfg_ml->M_ID}' ");
- $row = $dsql->GetOne("SELECT COUNT(*) AS nums FROM `#@__feedback` WHERE `mid`='".$cfg_ml->M_ID."'");
- $dsql->ExecuteNoneQuery("UPDATE `#@__member_tj` SET `feedback`='$row[nums]' WHERE `mid`='".$cfg_ml->M_ID."'");
- }
- $_SESSION['sedtime'] = time();
- if($ischeck==0)
- {
- echo '成功发表评论,但需审核后才会显示你的评论!';
- exit();
- }
- else
- {
- $spaceurl = '#';
- if($cfg_ml->M_ID > 0) $spaceurl = "{$cfg_memberurl}/index.php?uid=".urlencode($cfg_ml->M_LoginID);
- $id = $newid;
- $msg = stripslashes($msg);
- $msg = str_replace('<', '<', $msg);
- $msg = str_replace('>', '>', $msg);
- helper('smiley');
- $msg = RemoveXSS(Quote_replace(parseSmileys($msg, $cfg_cmspath.'/images/smiley')));
- //$msg = RemoveXSS(Quote_replace($msg));
- if($feedbacktype=='bad') $bgimg = 'cmt-bad.gif';
- else if($feedbacktype=='good') $bgimg = 'cmt-good.gif';
- else $bgimg = 'cmt-neu.gif';
- global $dsql, $aid, $pagesize, $cfg_templeturl;
- if($cfg_ml->M_ID==""){
- $mface=$cfg_cmspath."/member/templets/images/dfboy.png";
- } else {
- $row = $dsql->GetOne("SELECT face,sex FROM `#@__member` WHERE mid={$cfg_ml->M_ID} ");
- if(empty($row['face']))
- {
- if($row['sex']=="女") $mface=$cfg_cmspath."/member/templets/images/dfgirl.png";
- else $mface=$cfg_cmspath."/member/templets/images/dfboy.png";
- }
- }
-?>
-
-
-
- -
-
-
-
-
-
-
-
-
-GetOne("SELECT COUNT(*) AS dd FROM `#@__feedback` WHERE aid='$aid' AND ischeck='1' ");
- $totalcount = (empty($row['dd']) ? 0 : $row['dd']);
- $startNum = $pagesize * ($page-1);
- if($startNum > $totalcount)
- {
- echo "参数错误!";
- return $totalcount;
- }
- $dsql->Execute('fb', $querystring." LIMIT $startNum, $pagesize ");
- while($fields = $dsql->GetArray('fb'))
- {
- if($fields['userid']!='') $spaceurl = $GLOBALS['cfg_memberurl'].'/index.php?uid='.$fields['userid'];
- else $spaceurl = '#';
- if($fields['username']=='匿名') $spaceurl = '#';
- $fields['bgimg'] = 'cmt-neu.gif';
- $fields['ftypetitle'] = '该用户表示中立';
- if($fields['ftype']=='bad')
- {
- $fields['bgimg'] = 'cmt-bad.gif';
- $fields['ftypetitle'] = '该用户表示差评';
- }
- else if($fields['ftype']=='good')
- {
- $fields['bgimg'] = 'cmt-good.gif';
- $fields['ftypetitle'] = '该用户表示好评';
- }
- if(empty($fields['mface']))
- {
- if($fields['sex']=="女") $fields['mface']=$cfg_cmspath."/member/templets/images/dfgirl.png";
- else $fields['mface']=$cfg_cmspath."/member/templets/images/dfboy.png";
- }
- $fields['face'] = empty($fields['face']) ? 6 : $fields['face'];
- $fields['msg'] = str_replace('<', '<', $fields['msg']);
- $fields['msg'] = str_replace('>', '>', $fields['msg']);
- helper('smiley');
- $fields['msg'] = RemoveXSS(Quote_replace(parseSmileys($fields['msg'], $cfg_cmspath.'/images/smiley')));
- extract($fields, EXTR_OVERWRITE);
-?>
-
-
- -
-
-
-
-
-
-
-
-";
- echo "总: {$allpage} 页/{$totalcount} 条评论 ";
- $listsize = 5;
- $total_list = $listsize * 2 + 1;
- $totalpage = $allpage;
- $listdd = '';
- if($curpage-1 > 0 )
- {
- echo "上一页 ";
- }
- if($curpage >= $total_list)
- {
- $j = $curpage - $listsize;
- $total_list = $curpage + $listsize;
- if($total_list > $totalpage)
- {
- $total_list = $totalpage;
- }
- }
- else
- {
- $j = 1;
- if($total_list > $totalpage) $total_list = $totalpage;
- }
- for($j; $j <= $total_list; $j++)
- {
- echo ($j==$curpage ? "$j " : "{$j} ");
- }
- if($curpage+1 <= $totalpage )
- {
- echo "下一页 ";
- }
- echo "
-";
-}
\ No newline at end of file
diff --git a/src/static/css/member.css b/src/static/css/member.css
index aae16233..7c212075 100644
--- a/src/static/css/member.css
+++ b/src/static/css/member.css
@@ -55,6 +55,7 @@ main.login-from {
.member .member-logo {
border-radius: 50%;
+ max-width: 72px;
}
.member-actions a {
diff --git a/src/templets/default/ajaxfeedback2.htm b/src/templets/default/ajaxfeedback2.htm
deleted file mode 100755
index 40958a79..00000000
--- a/src/templets/default/ajaxfeedback2.htm
+++ /dev/null
@@ -1,258 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/templets/default/widget_article_digg.htm b/src/templets/default/widget_article_digg.htm
index da430d0e..a65d224e 100644
--- a/src/templets/default/widget_article_digg.htm
+++ b/src/templets/default/widget_article_digg.htm
@@ -54,7 +54,7 @@
if (j == 19 && !hasid) break;
}
}
- if (hasid) { alert("您已经顶过该帖,请不要重复顶帖 !"); return; }
+ if (hasid) { ShowMsg("您已经顶过该帖,请不要重复顶帖 !"); return; }
else saveid += ',' + aid;
SetCookie('diggid', saveid, 1);
}
diff --git a/src/templets/default/widget_article_feedback.htm b/src/templets/default/widget_article_feedback.htm
index 7167e176..9560bed9 100644
--- a/src/templets/default/widget_article_feedback.htm
+++ b/src/templets/default/widget_article_feedback.htm
@@ -142,6 +142,7 @@
action : "send",
comtype : "reply",
fid : fid,
+ aid : "{dede:field name='id'/}",
msg : content,
}
$.post("{dede:field name='phpurl'/}/feedback.php", reply, function (data) {
|