0){
+ if (count($arrMsg) > 0){
foreach($arrMsg as $msg){
?>
diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt
index cfb69b27..74bf8be8 100755
--- a/src/install/sql-dfdata.txt
+++ b/src/install/sql-dfdata.txt
@@ -502,12 +502,12 @@ INSERT INTO `#@__area` VALUES ('1','北京市','0','0'),
('33','澳门区','0','0'),
('35','台湾省','0','0');
-INSERT INTO `#@__channeltype` VALUES ('1','article','普通文档','#@__archives','#@__addonarticle','article_add.php','content_list.php','article_edit.php','article_add.php','content_list.php','article_edit.php','
\t\n\t\n','','','1','1','1','-1','','10','0','1','1','标题','0','0'),
-('2','image','图片集','#@__archives','#@__addonimages','album_add.php','content_i_list.php','album_edit.php','album_add.php','content_list.php','album_edit.php','
\t\n
\t\n
','','','1','1','1','-1','','10','0','1','1','标题','0','0'),
-('3','soft','软件','#@__archives','#@__addonsoft','soft_add.php','content_i_list.php','soft_edit.php','','','','
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
','filetype,language,softtype,os,accredit,softrank','','1','1','1','-1','','10','0','1','1','标题','0','0'),
-('6','shop','商品','#@__archives','#@__addonshop','archives_add.php','content_list.php','archives_edit.php','archives_add.php','content_list.php','archives_edit.php','
\t\n\t\n
\t\n\t\n
\t\n\t\n
\t\n\t\n
\t\n\t\n\n\t\n\n
\t\n\t\n\n
\t\n\t\n\n
\t\n\t\n','price,trueprice,brand,units','','0','1','1','-1','','10','0','1','1','商品名称','0','0'),
-('-1','spec','专题','#@__archives','#@__addonspec','spec_add.php','content_s_list.php','spec_edit.php','','','','
','','','1','1','0','-1','','10','0','1','1','标题','0','0'),
-('-8','infos','分类信息','#@__archives','#@__addoninfos','archives_sg_add.php','content_sg_list.php','archives_sg_edit.php','archives_sg_add.php','content_sg_list.php','archives_sg_edit.php','
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n\t\n
\t\n\t\n
\t\n\t\n
\t\n\t\n
\t\n\t\n
\t\n\t\n
\t\n\t\n
\t\n\t\n','channel,arcrank,mid,click,title,senddate,flag,litpic,lastpost,scores,goodpost,badpost,nativeplace,infotype,endtime','','-1','1','1','-1','','0','0','0','1','信息标题','0','0');
+INSERT INTO `#@__channeltype` VALUES ('1','article','文档模型','#@__archives','#@__addonarticle','article_add.php','content_list.php','article_edit.php','article_add.php','content_list.php','article_edit.php','
\t\n\t\n','','','1','1','1','-1','','10','0','1','1','标题','0','0'),
+('2','image','图片模型','#@__archives','#@__addonimages','album_add.php','content_i_list.php','album_edit.php','album_add.php','content_list.php','album_edit.php','
\t\n
\t\n
','','','1','1','1','-1','','10','0','1','1','标题','0','0'),
+('3','soft','软件模型','#@__archives','#@__addonsoft','soft_add.php','content_i_list.php','soft_edit.php','','','','
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
','filetype,language,softtype,os,accredit,softrank','','1','1','1','-1','','10','0','1','1','标题','0','0'),
+('6','shop','商品模型','#@__archives','#@__addonshop','archives_add.php','content_list.php','archives_edit.php','archives_add.php','content_list.php','archives_edit.php','
\t\n\t\n
\t\n\t\n
\t\n\t\n
\t\n\t\n
\t\n\t\n\n\t\n\n
\t\n\t\n\n
\t\n\t\n\n
\t\n\t\n','price,trueprice,brand,units','','0','1','1','-1','','10','0','1','1','商品名称','0','0'),
+('-1','spec','专题模型','#@__archives','#@__addonspec','spec_add.php','content_s_list.php','spec_edit.php','','','','
','','','1','1','0','-1','','10','0','1','1','标题','0','0'),
+('-8','infos','分类模型','#@__archives','#@__addoninfos','archives_sg_add.php','content_sg_list.php','archives_sg_edit.php','archives_sg_add.php','content_sg_list.php','archives_sg_edit.php','
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n
\t\n\t\n
\t\n\t\n
\t\n\t\n
\t\n\t\n
\t\n\t\n
\t\n\t\n
\t\n\t\n
\t\n\t\n','channel,arcrank,mid,click,title,senddate,flag,litpic,lastpost,scores,goodpost,badpost,nativeplace,infotype,endtime','','-1','1','1','-1','','0','0','0','1','信息标题','0','0');
INSERT INTO `#@__co_onepage` VALUES ('5','www.dedebiz.com','DedeBIZ','1','gb2312','
{@body}
'),
('4','www.techweb.com.cn','Techweb','1','gb2312','
{@body}
\t\n'),
diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css
index a46ff7b1..cca39110 100644
--- a/src/static/web/css/admin.css
+++ b/src/static/web/css/admin.css
@@ -398,14 +398,6 @@ span.page-link {
margin-right:10px;
width:360px
}
-.biz-win {
- background:#f8f8f8;
- border:1px solid #dee2e6
-}
-.biz-win-iframe {
- width:100%;
- height:360px
-}
.biz-updates {
display:inline-block;
position:absolute;
@@ -416,9 +408,21 @@ span.page-link {
background:#dc3545;
border-radius:50%
}
+.biz-win {
+ background:#f8f8f8;
+ border:1px solid #dee2e6
+}
+.biz-win-iframe {
+ width:100%;
+ height:360px
+}
.biz-border {
border:1px solid #dee2e6
}
+.biz-textarea {
+ width:98%;
+ height:90px
+}
.biz-itemnote1 {
background:#f8fcf2;
border-radius:.2rem .2rem 0 0
diff --git a/src/system/archive/archives.class.php b/src/system/archive/archives.class.php
index e2b510f4..a8868c90 100755
--- a/src/system/archive/archives.class.php
+++ b/src/system/archive/archives.class.php
@@ -589,10 +589,10 @@ class Archives
$this->dtp->Assign($i, $this->GetPreNext($ctag->GetAtt('get')));
}
//二次开发上一篇下一篇{dede:prenextdiy get='pre'}{/dede:prenextdiy}{dede:prenextdiy get='next'}{/dede:prenextdiy}
- else if($ctag->GetName()=='prenextdiy')
+ else if ($ctag->GetName()=='prenextdiy')
{
$innertext = trim($ctag->GetInnerText());
- if($innertext)
+ if ($innertext)
{
$get = $ctag->GetAtt('get');
$diys['diy'] = $this->GetPreNext('diy');
@@ -604,14 +604,14 @@ class Archives
{
foreach($dtp2->CTags as $tid=>$ctag2)
{
- if(isset($row[$get][$ctag2->GetName()]))
+ if (isset($row[$get][$ctag2->GetName()]))
{
$dtp2->Assign($tid,$row[$get][$ctag2->GetName()]);
}
}
$revalue .= $dtp2->GetResult();
}
- if($row[$get]['id']) $this->dtp->Assign($i,$revalue);
+ if ($row[$get]['id']) $this->dtp->Assign($i,$revalue);
}
}
else if ($ctag->GetName() == 'fieldlist') {
@@ -742,11 +742,11 @@ class Archives
}
}
//二次开发上一篇下一篇
- if($gtype=='diy')
+ if ($gtype=='diy')
{
return $this->PreNext['diy'];
}
- if($gtype=='pre')
+ if ($gtype=='pre')
{
$rs = $this->PreNext['pre'];
} else if ($gtype == 'preimg') {
diff --git a/src/system/archive/freelist.class.php b/src/system/archive/freelist.class.php
index 2983c597..83896149 100755
--- a/src/system/archive/freelist.class.php
+++ b/src/system/archive/freelist.class.php
@@ -58,7 +58,7 @@ class FreeList
}
$channelid = $this->ListObj->GetAtt('channel');
/*
- if(empty($channelid))
+ if (empty($channelid))
{
showmsg('必须指定频道','-1');exit();
} else {
diff --git a/src/system/archive/listview.class.php b/src/system/archive/listview.class.php
index 3ce93be7..6bdd1cb5 100755
--- a/src/system/archive/listview.class.php
+++ b/src/system/archive/listview.class.php
@@ -130,11 +130,11 @@ class ListView
function CountRecord()
{
global $cfg_list_son,$cfg_need_typeid2,$cfg_cross_sectypeid;
- if(empty($cfg_need_typeid2)) $cfg_need_typeid2 = 'N';
+ if (empty($cfg_need_typeid2)) $cfg_need_typeid2 = 'N';
//获得附加表的相关信息
$addtable = $this->ChannelUnit->ChannelInfos['addtable'];
$filtersql = '';
- if($addtable!="")
+ if ($addtable!="")
{
$addJoin = " LEFT JOIN `$addtable` ON arc.id = ".$addtable.'.aid ';
$addField = '';
@@ -143,13 +143,13 @@ class ListView
{
$nfields[$v] = $k;
}
- if(is_array($this->ChannelUnit->ChannelFields) && !empty($this->ChannelUnit->ChannelFields))
+ if (is_array($this->ChannelUnit->ChannelFields) && !empty($this->ChannelUnit->ChannelFields))
{
foreach($this->ChannelUnit->ChannelFields as $k=>$arr)
{
- if(isset($nfields[$k]))
+ if (isset($nfields[$k]))
{
- if(!empty($arr['rename'])) {
+ if (!empty($arr['rename'])) {
$addField .= ','.$addtable.'.'.$k.' as '.$arr['rename'];
}
else {
@@ -218,7 +218,7 @@ class ListView
}
}
}
- if($this->TotalResult==-1)
+ if ($this->TotalResult==-1)
{
$cquery = "SELECT COUNT(*) AS dd FROM `#@__arctiny` arc $addJoin WHERE ".$this->addSql.$filtersql;
$row = $this->dsql->GetOne($cquery);
@@ -635,7 +635,7 @@ class ListView
$filtersql = '';
//获得附加表的相关信息
$addtable = $this->ChannelUnit->ChannelInfos['addtable'];
- if($addtable!="")
+ if ($addtable!="")
{
$addJoin = " LEFT JOIN `$addtable` ON arc.id = ".$addtable.'.aid ';
$addField = '';
@@ -644,13 +644,13 @@ class ListView
{
$nfields[$v] = $k;
}
- if(is_array($this->ChannelUnit->ChannelFields) && !empty($this->ChannelUnit->ChannelFields))
+ if (is_array($this->ChannelUnit->ChannelFields) && !empty($this->ChannelUnit->ChannelFields))
{
foreach($this->ChannelUnit->ChannelFields as $k=>$arr)
{
- if(isset($nfields[$k]))
+ if (isset($nfields[$k]))
{
- if(!empty($arr['rename'])) {
+ if (!empty($arr['rename'])) {
$addField .= ','.$addtable.'.'.$k.' as '.$arr['rename'];
}
else {
diff --git a/src/system/archive/sglistview.class.php b/src/system/archive/sglistview.class.php
index da5aa3cd..260ad723 100755
--- a/src/system/archive/sglistview.class.php
+++ b/src/system/archive/sglistview.class.php
@@ -717,7 +717,7 @@ class SgListView
$optionlist = "
diff --git a/src/theme/plus/carbuyaction.htm b/src/theme/plus/carbuyaction.htm
index 1791e8ce..02d25dfb 100644
--- a/src/theme/plus/carbuyaction.htm
+++ b/src/theme/plus/carbuyaction.htm
@@ -16,7 +16,7 @@
商品购买
- IsLogin()){?>
+ IsLogin()){?>
| 欢迎来到本网站，请 登录 或 注册 |
diff --git a/src/theme/plus/flink-list.htm b/src/theme/plus/flink-list.htm
index 835ffe28..d0a1f305 100644
--- a/src/theme/plus/flink-list.htm
+++ b/src/theme/plus/flink-list.htm
@@ -34,15 +34,15 @@
$revalue = "";
for($i=1;$i<=$row;$i++)
{
- if($dbrow=$dsql->GetObject())
+ if ($dbrow=$dsql->GetObject())
{
$wtitle = cn_substr($dbrow->webname,$titlelen);
- if($dbrow->logo=="")
+ if ($dbrow->logo=="")
$revalue.= "$wtitle";
else
$revalue.= "![$wtitle](".$dbrow->logo.")
";
}
- if(!$dbrow) break;
+ if (!$dbrow) break;
}
echo $revalue;
?>
diff --git a/src/theme/plus/list_diyform.htm b/src/theme/plus/list_diyform.htm
index 551ba965..eced00ae 100644
--- a/src/theme/plus/list_diyform.htm
+++ b/src/theme/plus/list_diyform.htm
@@ -28,25 +28,25 @@
{dede:datalist}
';
echo '| id | ';
echo ''.$fields['id'].' |
';
foreach($fieldlist as $field=>$fielddata)
{
- if($fields[$field]=='') continue;
- if($fielddata[1]=='img')
+ if ($fields[$field]=='') continue;
+ if ($fielddata[1]=='img')
{
$fields[$field] = "
图片附件";
}
- else if($fielddata[1]=='addon')
+ else if ($fielddata[1]=='addon')
{
$fields[$field] = " 其它附件";
} else {
- if($fielddata[1]=='htmltext') $fields[$field] = html2text($fields[$field]);
+ if ($fielddata[1]=='htmltext') $fields[$field] = html2text($fields[$field]);
else $fields[$field] = dede_htmlspecialchars($fields[$field]);
- if( strlen($fields[$field]) > 250 )
+ if ( strlen($fields[$field]) > 250 )
{
$fields[$field] = cn_substr( $fields[$field], 250).'';
}
diff --git a/src/theme/plus/view_diyform.htm b/src/theme/plus/view_diyform.htm
index 062cd599..2703eb43 100644
--- a/src/theme/plus/view_diyform.htm
+++ b/src/theme/plus/view_diyform.htm
@@ -25,16 +25,16 @@
$allowhtml = array('htmltext');
foreach($fieldlist as $field=>$fielddata)
{
- if($row[$field]=='') continue;
- if($fielddata[1]=='img')
+ if ($row[$field]=='') continue;
+ if ($fielddata[1]=='img')
{
$row[$field] = "
";
}
- else if($fielddata[1]=='addon')
+ else if ($fielddata[1]=='addon')
{
$row[$field] = " 相关附件";
} else {
- if(!in_array($fielddata[1], $allowhtml))
+ if (!in_array($fielddata[1], $allowhtml))
{
$row[$field] = htmlspecialchars($row[$field]);
}
diff --git a/src/theme/templets/article_image.htm b/src/theme/templets/article_image.htm
index b15cee78..dc7f8934 100644
--- a/src/theme/templets/article_image.htm
+++ b/src/theme/templets/article_image.htm
@@ -90,10 +90,10 @@
{dede:field name='pagestyle' alt='根据不同的页面风格输出不同的头信息' runphp='yes'}
- if(@me==3) {
+ if (@me==3) {
@me = '
';
}
- else if(@me==2) {
+ else if (@me==2) {
@me = "
原始图片
@@ -118,11 +118,11 @@
[field:pagestyle runphp='yes'] @me = (@me==3 ? '' : ''); [/field:pagestyle]
{/dede:field}
{dede:field name='pagestyle' alt='根据不同的风格输出不同的结尾信息' runphp='yes'}
- if(@me==3) {
+ if (@me==3) {
@me = '
';
}
- else if(@me==2) {
+ else if (@me==2) {
@me = "
 echo $arcRow['litpic']; else echo '../static/web/img/defaultpic.jpg';?>)
 echo $arcRow['litpic']; else echo '../static/web/img/defaultpic.jpg';?>)