diff --git a/.gitignore b/.gitignore index fa67896a..7ec90dbd 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ src/data/rss/* src/data/rssmap.html src/data/sitemap.html src/data/js/ +src/data/vote/*.js +src/data/module/*.xml diff --git a/src/dede/templets/diy_edit_content.htm b/src/dede/templets/diy_edit_content.htm index a1948147..d6f13c21 100755 --- a/src/dede/templets/diy_edit_content.htm +++ b/src/dede/templets/diy_edit_content.htm @@ -4,16 +4,18 @@ 编辑评论 - + + + + + - +
@@ -56,10 +58,10 @@ body { +
 表单管理 >> 编辑评论: - - + + -
diff --git a/src/dede/templets/diy_list.htm b/src/dede/templets/diy_list.htm index bd6d4c36..99b468d8 100755 --- a/src/dede/templets/diy_list.htm +++ b/src/dede/templets/diy_list.htm @@ -64,10 +64,10 @@ if(!empty($fields)) - - + +    - + diff --git a/src/plus/diy.php b/src/plus/diy.php index 8668969d..4428ff29 100755 --- a/src/plus/diy.php +++ b/src/plus/diy.php @@ -1,4 +1,5 @@ getForm(true); - include DEDEROOT."/templets/plus/{$diy->postTemplate}"; + include DEDEROOT . "/templets/plus/{$diy->postTemplate}"; exit(); - } - elseif($do == 2) - { + } 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)) - { + 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)) - { + $diyform = $dsql->getOne("SELECT * from `#@__diyforms` WHERE diyid='$diyid' "); + if (!is_array($diyform)) { showmsg('自定义表单不存在', '-1'); exit(); } $addvar = $addvalue = ''; - if(!empty($dede_fields)) - { + if (!empty($dede_fields)) { $fieldarr = explode(';', $dede_fields); - if(is_array($fieldarr)) - { - foreach($fieldarr as $field) - { - if($field == '') continue; + if (is_array($fieldarr)) { + foreach ($fieldarr as $field) { + if ($field == '') continue; $fieldinfo = explode(',', $field); - if($fieldinfo[1] == 'textdata') - { + 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]); } - else - { - ${$fieldinfo[0]} = GetFieldValue(${$fieldinfo[0]}, $fieldinfo[1],0,'add','','diy', $fieldinfo[0]); - } - $addvar .= ', `'.$fieldinfo[0].'`'; - $addvalue .= ", '".${$fieldinfo[0]}."'"; + $addvar .= ', `' . $fieldinfo[0] . '`'; + $addvalue .= ", '" . ${$fieldinfo[0]} . "'"; } } - } - $query = "INSERT INTO `{$diy->table}` (`id`, `ifcheck` $addvar) VALUES (NULL, 0 $addvalue); "; + $query = "INSERT INTO `{$diy->table}` (`id`, `ifcheck` $addvar) VALUES (NULL, 0 $addvalue); "; - if($dsql->ExecuteNoneQuery($query)) - { + if ($dsql->ExecuteNoneQuery($query)) { $id = $dsql->GetLastID(); - if($diy->public == 2) - { + if ($diy->public == 2) { //diy.php?action=view&diyid={$diy->diyid}&id=$id $goto = "diy.php?action=list&diyid={$diy->diyid}"; $bkmsg = '发布成功,现在转向表单列表页...'; - } - else - { + } else { $goto = !empty($cfg_cmspath) ? $cfg_cmspath : '/'; $bkmsg = '发布成功,请等待管理员处理...'; } - showmsg($bkmsg, $goto); + ShowMsg($bkmsg, $goto); } } } /*---------------------------- function list(){ } ----------------------------*/ -else if($action == 'list') -{ - if(empty($diy->public)) - { - showMsg('后台关闭前台浏览', 'javascript:;'); +---------------------------*/ else if ($action == 'list') { + if (empty($diy->public)) { + ShowMsg('后台关闭前台浏览', 'javascript:;'); exit(); } - include_once DEDEINC.'/datalistcp.class.php'; - if($diy->public == 2) + 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"; @@ -122,40 +101,32 @@ else if($action == 'list') $datalist->pageSize = 10; $datalist->SetParameter('action', 'list'); $datalist->SetParameter('diyid', $diyid); - $datalist->SetTemplate(DEDEINC."/../templets/plus/{$diy->listTemplate}"); + $datalist->SetTemplate(DEDEINC . "/../templets/plus/{$diy->listTemplate}"); $datalist->SetSource($query); $fieldlist = $diy->getFieldList(); $datalist->Display(); -} -else if($action == 'view') -{ - if(empty($diy->public)) - { - showMsg('后台关闭前台浏览' , 'javascript:;'); +} else if ($action == 'view') { + if (empty($diy->public)) { + showMsg('后台关闭前台浏览', 'javascript:;'); exit(); } - if(empty($id)) - { + if (empty($id)) { showMsg('非法操作!未指定id', 'javascript:;'); 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"; + 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)) - { + if (!is_array($row)) { showmsg('你访问的记录不存在或未经审核', '-1'); exit(); } $fieldlist = $diy->getFieldList(); - include DEDEROOT."/templets/plus/{$diy->viewTemplate}"; -} \ No newline at end of file + include DEDEROOT . "/templets/plus/{$diy->viewTemplate}"; +} diff --git a/src/templets/plus/list_diyform.htm b/src/templets/plus/list_diyform.htm index bbce74af..4aac9b0f 100755 --- a/src/templets/plus/list_diyform.htm +++ b/src/templets/plus/list_diyform.htm @@ -2,66 +2,71 @@ -<?php echo $diy->name; ?> - powered by dedecms - +<?php echo $diy->name; ?> - Powered by DedeBIZ + + + + + +
- -
+ +
-

name; ?>内容列表

- + +
-
-{dede:datalist} - -'; - echo ''; - echo ''; - foreach($fieldlist as $field=>$fielddata) - { - if($fields[$field]=='') continue; - if($fielddata[1]=='img') + {dede:datalist} +
id
'.$fields['id'].'
+ 图片附件\r\n"; + echo ''; + echo ''; + echo ''; + foreach($fieldlist as $field=>$fielddata) + { + if($fields[$field]=='') continue; + if($fielddata[1]=='img') + { + $fields[$field] = " 图片附件\r\n"; + } + else if($fielddata[1]=='addon') + { + $fields[$field] = " 其它附件"; + } + else + { + if($fielddata[1]=='htmltext') $fields[$field] = html2text($fields[$field]); + else $fields[$field] = dede_htmlspecialchars($fields[$field]); + if( strlen($fields[$field]) > 250 ) + { + $fields[$field] = cn_substr( $fields[$field], 250).'...'; + } + } + echo "\r\n"; + } + echo ''; + }else{ + echo ""; } - else if($fielddata[1]=='addon') - { - $fields[$field] = " 其它附件"; - } - else - { - if($fielddata[1]=='htmltext') $fields[$field] = html2text($fields[$field]); - else $fields[$field] = dede_htmlspecialchars($fields[$field]); - if( strlen($fields[$field]) > 250 ) - { - $fields[$field] = cn_substr( $fields[$field], 250).'...'; - } - } - echo "\r\n"; - } - echo ''; -}else{ - echo ""; -} -?> -
id
'.$fields['id'].'
{$fielddata[0]}{$fields[$field]}
暂无记录
{$fielddata[0]}{$fields[$field]}
暂无记录
-{/dede:datalist} + ?> + + {/dede:datalist}
{dede:pagelist listsize=5 /}
@@ -69,10 +74,6 @@ if(!empty($fields))
- - - + \ No newline at end of file diff --git a/src/templets/plus/post_diyform.htm b/src/templets/plus/post_diyform.htm index a83819ac..d0b0632c 100755 --- a/src/templets/plus/post_diyform.htm +++ b/src/templets/plus/post_diyform.htm @@ -1,53 +1,49 @@ - + + - -<?php echo $diy->name;?> - Powered by DedeCMS - - + + <?php echo $diy->name;?> - Powered by DedeBIZ + + + + + + - -
- -
-
-

name;?>发布

- -
-
-
-
-
- - - - - -
-
- -  - -
-
+ +
+ +
+
+

name;?>发布

+
+
+
+
+ + + + + +
+
+ +   + +
+
+
-
- + + \ No newline at end of file diff --git a/src/templets/plus/view_diyform.htm b/src/templets/plus/view_diyform.htm index 22eba726..07813565 100755 --- a/src/templets/plus/view_diyform.htm +++ b/src/templets/plus/view_diyform.htm @@ -3,27 +3,26 @@ <?php echo $diy->name;?> - powered by dedecms - + + + + + +
- -
+ +
-

name;?>详细内容

+

name;?>详细内容


- +
'; echo ''; @@ -56,9 +55,7 @@ echo ''; - +
id'.$row['id'].'