diff --git a/src/apps/diy.php b/src/apps/diy.php
index c429419e..cd548e84 100755
--- a/src/apps/diy.php
+++ b/src/apps/diy.php
@@ -1,140 +1,137 @@
-getForm(true);
- include DEDEROOT."/theme/apps/{$diy->postTemplate}";
- exit();
- } elseif ($do == 2) {
- $dede_fields = empty($dede_fields) ? '' : trim($dede_fields);
- $dede_fieldshash = empty($dede_fieldshash) ? '' : trim($dede_fieldshash);
- if (!empty($dede_fields)) {
- if ($dede_fieldshash != md5($dede_fields.$cfg_cookie_encode)) {
- showMsg('数据校验不对', '-1');
- exit();
- }
- }
- $diyform = $dsql->GetOne("SELECT * FROM `#@__diyforms` WHERE diyid='$diyid' ");
- if (!is_array($diyform)) {
- showmsg('表单不存在', '-1');
- exit();
- }
- $addvar = $addvalue = '';
- if (!empty($dede_fields)) {
- $fieldarr = explode(';', $dede_fields);
- if (is_array($fieldarr)) {
- foreach ($fieldarr as $field) {
- if ($field == '') continue;
- $fieldinfo = explode(',', $field);
- if ($fieldinfo[1] == 'textdata') {
- ${$fieldinfo[0]} = FilterSearch(stripslashes(${$fieldinfo[0]}));
- ${$fieldinfo[0]} = addslashes(${$fieldinfo[0]});
- }
- //获取提交链接,表单添加字段名称为链接,字段标识默认为link,数据类型为单行文本后模板里用使用
- if ($fieldinfo[0] == 'link') {
- ${$fieldinfo[0]} = $_SERVER['HTTP_REFERER'];
- }
- //获取提交地址,表单添加字段名称为地址,字段标识默认为ip,数据类型为单行文本后模板里用使用
- if ($fieldinfo[0] == 'ip') {
- ${$fieldinfo[0]} = GetIP();
- }
- //获取提交日期,表单添加字段名称为日期,字段标识默认为date,数据类型为单行文本后模板里用使用
- if ($fieldinfo[0] == 'date') {
- ${$fieldinfo[0]} = date("Y-m-d H:i:s");
- } else {
- ${$fieldinfo[0]} = GetFieldValue(${$fieldinfo[0]}, $fieldinfo[1],0,'add','','diy', $fieldinfo[0]);
- }
- $addvar .= ', `'.$fieldinfo[0].'`';
- $addvalue .= ", '".${$fieldinfo[0]}."'";
- }
- }
- }
- $query = "INSERT INTO `{$diy->table}` (`id`, `ifcheck` $addvar) VALUES (NULL, 0 $addvalue); ";
- if ($dsql->ExecuteNoneQuery($query)) {
- $id = $dsql->GetLastID();
- $mailtitle = "{$diy->name}通知";
- $mailbody = '';
- foreach($diy->getFieldList() as $field=>$fieldvalue)
- {
- $mailbody .= "{$fieldvalue[0]}:{${$field}}\r\n";
- }
- $headers = "From: ".$cfg_adminemail."Reply-To: ".$cfg_adminemail;
- $mailbody = mb_convert_encoding($mailbody, "GBK", "UTF-8");
- if ($cfg_sendmail_bysmtp == 'Y' && !empty($cfg_smtp_server)) {
- $mailtype = 'TXT';
- require_once(DEDEINC.'/libraries/mail.class.php');
- $smtp = new smtp($cfg_smtp_server, $cfg_smtp_port, true, $cfg_smtp_usermail, $cfg_smtp_password);
- $smtp->debug = false;
- $smtp->sendmail($cfg_adminemail, $cfg_webname, $cfg_smtp_usermail, $mailtitle, $mailbody, $mailtype);
- } else {
- @mail($cfg_adminemail, $mailtitle, $mailbody, $headers);
- }
- if ($diy->public == 2) {
- $goto = "diy.php?action=list&diyid={$diy->diyid}";
- $bkmsg = '提交成功,正在前往表单列表';
- } else {
- $goto = !empty($cfg_cmspath) ? $cfg_cmspath : '/';
- $bkmsg = '提交成功,请等待管理员处理';
- }
- ShowMsg($bkmsg, $goto);
- }
- }
-} else if ($action == 'list') {
- if (empty($diy->public)) {
- ShowMsg('表单已关闭前台浏览', 'javascript:;');
- exit();
- }
- include_once DEDEINC.'/datalistcp.class.php';
- if ($diy->public == 2)
- $query = "SELECT * FROM `{$diy->table}` ORDER BY id DESC";
- else
- $query = "SELECT * FROM `{$diy->table}` WHERE ifcheck=1 ORDER BY id DESC";
- $datalist = new DataListCP();
- $datalist->pagesize = 10;
- $datalist->SetParameter('action', 'list');
- $datalist->SetParameter('diyid', $diyid);
- $datalist->SetTemplate(DEDEINC."/../theme/apps/{$diy->listTemplate}");
- $datalist->SetSource($query);
- $fieldlist = $diy->getFieldList();
- $datalist->Display();
-} else if ($action == 'view') {
- if (empty($diy->public)) {
- showMsg('表单已关闭前台浏览', '/');
- exit();
- }
- if (empty($id)) {
- showMsg('操作失败,未指定id', '/');
- exit();
- }
- if ($diy->public == 2) {
- $query = "SELECT * FROM `{$diy->table}` WHERE id='$id' ";
- } else {
- $query = "SELECT * FROM `{$diy->table}` WHERE id='$id' AND ifcheck=1";
- }
- $row = $dsql->GetOne($query);
- if (!is_array($row)) {
- showmsg('您浏览的记录不存在或待审核', '-1');
- exit();
- }
- $fieldlist = $diy->getFieldList();
- include DEDEROOT."/theme/apps/{$diy->viewTemplate}";
-}
+getForm(true);
+ include DEDEROOT."/theme/apps/{$diy->postTemplate}";
+ exit();
+ } elseif ($do == 2) {
+ $dede_fields = empty($dede_fields) ? '' : trim($dede_fields);
+ $dede_fieldshash = empty($dede_fieldshash) ? '' : trim($dede_fieldshash);
+ if (!empty($dede_fields)) {
+ if ($dede_fieldshash != md5($dede_fields.$cfg_cookie_encode)) {
+ showMsg('表单校验失败', '-1');
+ exit();
+ }
+ }
+ $diyform = $dsql->GetOne("SELECT * FROM `#@__diyforms` WHERE diyid='$diyid' ");
+ if (!is_array($diyform)) {
+ showmsg('表单不存在', '-1');
+ exit();
+ }
+ $addvar = $addvalue = '';
+ if (!empty($dede_fields)) {
+ $link = $_SERVER['HTTP_REFERER'];
+ $date = GetDateTimeMk(time());
+ $ip = GetIP();
+ $fieldarr = explode(';', $dede_fields);
+ if (is_array($fieldarr)) {
+ foreach ($fieldarr as $field) {
+ if ($field == '') continue;
+ $fieldinfo = explode(',', $field);
+ if ($fieldinfo[1] == 'textdata') {
+ ${$fieldinfo[0]} = FilterSearch(stripslashes(${$fieldinfo[0]}));
+ ${$fieldinfo[0]} = addslashes(${$fieldinfo[0]});
+ } else {
+ ${$fieldinfo[0]} = GetFieldValue(${$fieldinfo[0]}, $fieldinfo[1],0,'add','','diy', $fieldinfo[0]);
+ }
+ $addvar .= ', `'.$fieldinfo[0].'`';
+ $addvalue .= ", '".${$fieldinfo[0]}."'";
+ }
+ }
+ }
+ //获取表单提交的链接、时间、ip,字段标识默认为link、date、ip,前台表单可以不用出现该输入框,但是biz_fields和biz_fieldshash的值要最新,下面是重复提交表单限制,恢复注释代码使用
+ /*$result = $dsql->getOne("SELECT count(*) AS dd FROM `{$diy->table}` WHERE ip='$ip' AND date_format(date,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d')");
+ if ($result['dd'] >= 3) {
+ showmsg('您已经重复提交啦,请等待平台处理', '-1');
+ exit();
+ }*/
+ $query = "INSERT INTO `{$diy->table}` (`id`, `ifcheck` $addvar) VALUES (NULL, 0 $addvalue); ";
+ if ($dsql->ExecuteNoneQuery($query)) {
+ $id = $dsql->GetLastID();
+ $mailtitle = "{$diy->name}通知";
+ $mailbody = '';
+ foreach($diy->getFieldList() as $field=>$fieldvalue)
+ {
+ $mailbody .= "{$fieldvalue[0]}:{${$field}}\r\n";
+ }
+ $headers = "From: ".$cfg_adminemail."Reply-To: ".$cfg_adminemail;
+ $mailbody = mb_convert_encoding($mailbody, "GBK", "UTF-8");
+ if ($cfg_sendmail_bysmtp == 'Y' && !empty($cfg_smtp_server)) {
+ $mailtype = 'TXT';
+ require_once(DEDEINC.'/libraries/mail.class.php');
+ $smtp = new smtp($cfg_smtp_server, $cfg_smtp_port, true, $cfg_smtp_usermail, $cfg_smtp_password);
+ $smtp->debug = false;
+ $smtp->sendmail($cfg_adminemail, $cfg_webname, $cfg_smtp_usermail, $mailtitle, $mailbody, $mailtype);
+ } else {
+ @mail($cfg_adminemail, $mailtitle, $mailbody, $headers);
+ }
+ if ($diy->public == 2) {
+ $goto = "diy.php?action=list&diyid={$diy->diyid}";
+ $bkmsg = '提交成功,正在前往表单列表';
+ } else {
+ $goto = 'javascript:history.go(-1);';
+ $bkmsg = '提交成功,请等待平台处理';
+ }
+ ShowMsg($bkmsg, $goto);
+ }
+ }
+} else if ($action == 'list') {
+ if (empty($diy->public)) {
+ ShowMsg('表单已关闭前台浏览', 'javascript:;');
+ exit();
+ }
+ include_once DEDEINC.'/datalistcp.class.php';
+ if ($diy->public == 2)
+ $query = "SELECT * FROM `{$diy->table}` ORDER BY id DESC";
+ else
+ $query = "SELECT * FROM `{$diy->table}` WHERE ifcheck=1 ORDER BY id DESC";
+ $datalist = new DataListCP();
+ $datalist->pagesize = 10;
+ $datalist->SetParameter('action', 'list');
+ $datalist->SetParameter('diyid', $diyid);
+ $datalist->SetTemplate(DEDEINC."/../theme/apps/{$diy->listTemplate}");
+ $datalist->SetSource($query);
+ $fieldlist = $diy->getFieldList();
+ $datalist->Display();
+} else if ($action == 'view') {
+ if (empty($diy->public)) {
+ showMsg('表单已关闭前台浏览', '/');
+ exit();
+ }
+ if (empty($id)) {
+ showMsg('操作失败,未指定id', '/');
+ exit();
+ }
+ if ($diy->public == 2) {
+ $query = "SELECT * FROM `{$diy->table}` WHERE id='$id' ";
+ } else {
+ $query = "SELECT * FROM `{$diy->table}` WHERE id='$id' AND ifcheck=1";
+ }
+ $row = $dsql->GetOne($query);
+ if (!is_array($row)) {
+ showmsg('您浏览的记录不存在或未审核', '-1');
+ exit();
+ }
+ $fieldlist = $diy->getFieldList();
+ include DEDEROOT."/theme/apps/{$diy->viewTemplate}";
+}
?>
\ No newline at end of file
diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css
index 8683819c..a4c15b32 100644
--- a/src/static/web/css/admin.css
+++ b/src/static/web/css/admin.css
@@ -698,7 +698,7 @@ body.menu-show .admin-content {
padding:1rem
}
.card-body canvas {
- height:365px!important
+ height:382px!important
}
.table {
margin-bottom:0;
@@ -799,7 +799,7 @@ input,select,textarea,button,.colordlg,.pubdlg,.quickselitem .topcat,.mysource,.
padding:30px
}
.card-body canvas {
- height:210px!important
+ height:230px!important
}
.pagination,.page-item {
display:inline-table