diff --git a/README.md b/README.md
index 61de9eaf..2205237d 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-## Dedev6
+## DedeBIZ
-DedeBIZ系统基于PHP7版本开发,具有很强的可扩展性,并且完全开放源代码。DedeBIZ支持采用现流行的Go语言设计开发,拥有简单易用、灵活扩展特性之外更安全、高效。模板设计制作简单,一直是系统一大特点,延续之前标签,同时采用响应式模板引擎Bootstrap作为系统模板渲染引擎,让搭建跨终端和移动端全媒体站点更简单。
+DedeBIZ系统基于PHP开发,遵循国际GPLv2开源许可协议做到真正开源免费,具有可扩展性且完全开放源代码。其商业支持采用Go语言设计,具备简单易用、灵活扩展、安全高效的特性。模板设计简便,延续原有标签并引入 Bootstrap响应式模板引擎,让跨终端与移动端全媒体站点搭建更轻松。当前版本支持AI功能,兼容PHP高版本,既保留经典操作体验又融入新技术,让DedeBIZ成为智能的开源CMS。
## 版本说明
-Dedev6.x是一个LTS版本,支持将到2025年10月截止,目前Dedev6已经发布,可以[点击下载](https://www.dedebiz.com/download)获取
+DedeBIZ v6.x是一个LTS版本,支持将到2025年10月截止,目前DedeBIZ已经发布,可以[点击下载](https://www.dedebiz.com/download)获取

@@ -122,7 +122,9 @@ WEBSITE:
详细参考:[DedeBIZ站点授权协议](https://www.dedebiz.com/license)
-我们对DedeBIZ系统授权的态度是“鼓励但不强制”,购买授权是对知识产权的尊重,是对我们技术服务的认可
+DedeBIZ 系统严格遵循 GPLv2 国际开源标准,全力打造纯粹的开源环境,开发者可自由使用、修改与分发代码,畅享开源带来的无限可能。
+
+在商业化层面,我们将商业化功能及服务独立设计为扩展形式。这种方式既能保证系统核心开源部分的纯粹性与稳定性,又能为有进阶需求的企业或个人,提供定制化商业服务与功能。我们始终紧跟主流新技术趋势,积极将前沿技术融入系统,不断拓展DedeBIZ的应用边界与效能,无论是开源基础功能,还是商业化扩展,都致力于为用户带来更优质、高效的体验。
## 相关资源
diff --git a/docs/changelog.md b/docs/changelog.md
index f69e3a0f..bdf5ee59 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,6 +1,10 @@
# 更新记录
通过访问 https://www.dedebiz.com/git 获取完整更新记录
+# V6.5.8
+- 流量统计功能增加蜘蛛判断及查询;
+- 修复自定义模型中字段禁止会员投稿的问题;
+
# V6.5.6
- PHP8高版本兼容性调整;
- SQLite支持兼容性调整;
@@ -79,7 +83,7 @@
- 修正TAG生成目录错误;
- 移除FTP的支持;
- 其他常规问题修复;
--
+
# V6.2.10
- DedeBIZ基于自由软件基金会发行的GPL v2许可证发布
- 修正后台功能说明提示;
diff --git a/src/admin/ai_dialog.php b/src/admin/ai_dialog.php
index a69e5112..15114643 100644
--- a/src/admin/ai_dialog.php
+++ b/src/admin/ai_dialog.php
@@ -44,7 +44,7 @@ if (!empty($noeditor)) {
diff --git a/src/admin/file_class.php b/src/admin/file_class.php
index 82a2a086..ea146ea5 100644
--- a/src/admin/file_class.php
+++ b/src/admin/file_class.php
@@ -1,5 +1,5 @@
0 ";
+ }
$sql = "SELECT * FROM `#@__statistics_detail` $addsql ORDER BY id DESC";
$dlist = new DataListCP();
//流量列表数
$dlist->pagesize = 30;
$tplfile = DEDEADMIN."/templets/statistics_list.htm";
$dlist->SetParameter("ip",$ip);
+ $dlist->SetParameter("url_type",$url_type);
$dlist->SetTemplate($tplfile);
$dlist->SetSource($sql);
$dlist->Display();
diff --git a/src/admin/sys_cloud.php b/src/admin/sys_cloud.php
deleted file mode 100644
index 9381f03b..00000000
--- a/src/admin/sys_cloud.php
+++ /dev/null
@@ -1,62 +0,0 @@
-CloudGet();
- if ($rs->code === 200) {
- echo json_encode(array(
- "code" => 0,
- "msg" => "",
- "data" => $rs->data,
- ));
- } else {
- echo json_encode(array(
- "code"=>-1,
- "msg"=>'获取配置信息失败',
- ));
- }
- exit;
-} else if ($dopost == "cloud_set"){
- $config = array(
- "aliyun_enabled" => $aliyun_enabled,
- "aliyun_access_key_id" => $aliyun_access_key_id,
- "aliyun_access_key_secret" => $aliyun_access_key_secret,
- "huaweicloud_enabled" => $huaweicloud_enabled,
- "huawei_access_key_id" => $huawei_access_key_id,
- "huawei_secret_access_key" => $huawei_secret_access_key,
- "tencent_enabled" => $tencent_enabled,
- "tencent_secret_id" => $tencent_secret_id,
- "tencent_secret_key" => $tencent_secret_key,
- );
- $rs = $client->CloudSet($config);
- if ($rs->code === 200) {
- echo json_encode(array(
- "code" => 0,
- "msg" => "",
- "data" => "ok",
- ));
- } else {
- echo json_encode(array(
- "code" => -1,
- "msg" => "设置失败,请检查服务是否正确",
- ));
- }
- exit;
-}
-if (!$client->IsEnabled()) {
- echo DedeAlert("商业扩展未启动或连接失败,请检查配置是否正确",ALERT_WARNING);
- exit();
-}
-include DedeInclude("templets/sys_cloud.htm");
-?>
\ No newline at end of file
diff --git a/src/admin/tags_main.php b/src/admin/tags_main.php
index 6bc863b1..82e41843 100644
--- a/src/admin/tags_main.php
+++ b/src/admin/tags_main.php
@@ -14,9 +14,10 @@ require_once(DEDEINC.'/datalistcp.class.php');
$timestamp = time();
if (empty($tag)) $tag = '';
if (empty($action)) {
+ $tag = HtmlReplace($tag, -1);
$orderby = empty($orderby) ? 'id' : preg_replace("#[^a-z]#i", '', $orderby);
$orderway = isset($orderway) && $orderway == 'asc' ? 'asc' : 'desc';
- if (!empty($tag)) $where = " WHERE tag like '%$tag%'";
+ if (!empty($tag)) $where = " WHERE tag like '%$tag%' OR id = '$tag'";
else $where = '';
$neworderway = ($orderway == 'desc' ? 'asc' : 'desc');
$query = "SELECT T.*,TI.* FROM `#@__tagindex` T LEFT JOIN `#@__tagindex_infos` TI ON TI.tagid=T.id $where ORDER BY $orderby $orderway";
diff --git a/src/admin/templets/ai_log_main.htm b/src/admin/templets/ai_log_main.htm
index ae5b22d4..04438cec 100644
--- a/src/admin/templets/ai_log_main.htm
+++ b/src/admin/templets/ai_log_main.htm
@@ -70,7 +70,7 @@
{/dede:datalist}
-
+ |
反选
删除
清空
diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm
index 90728599..0d079049 100644
--- a/src/admin/templets/album_add.htm
+++ b/src/admin/templets/album_add.htm
@@ -169,7 +169,7 @@
|
|
-
+
|
diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm
index 50272a24..6914be5c 100644
--- a/src/admin/templets/album_edit.htm
+++ b/src/admin/templets/album_edit.htm
@@ -205,7 +205,7 @@
-
+
|
diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm
index 8e3d1d0c..4b3745a9 100644
--- a/src/admin/templets/archives_add.htm
+++ b/src/admin/templets/archives_add.htm
@@ -144,7 +144,7 @@
-
+
评论选项 |
diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm
index 8c8c504c..5430ba1e 100644
--- a/src/admin/templets/archives_edit.htm
+++ b/src/admin/templets/archives_edit.htm
@@ -137,7 +137,7 @@
|
-
+
评论选项 |
diff --git a/src/admin/templets/archives_sg_add.htm b/src/admin/templets/archives_sg_add.htm
index 5d7721ed..4d0ccc4b 100644
--- a/src/admin/templets/archives_sg_add.htm
+++ b/src/admin/templets/archives_sg_add.htm
@@ -86,7 +86,7 @@
|
-
+
浏览权限 |
diff --git a/src/admin/templets/archives_sg_edit.htm b/src/admin/templets/archives_sg_edit.htm
index c70a8ff1..739f5d49 100644
--- a/src/admin/templets/archives_sg_edit.htm
+++ b/src/admin/templets/archives_sg_edit.htm
@@ -88,7 +88,7 @@
|
-
+
浏览权限 |
diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm
index 652bdb7d..128726ca 100644
--- a/src/admin/templets/article_add.htm
+++ b/src/admin/templets/article_add.htm
@@ -144,7 +144,7 @@
|
-
+
|
diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm
index be744f6d..7f3cea99 100644
--- a/src/admin/templets/article_edit.htm
+++ b/src/admin/templets/article_edit.htm
@@ -136,7 +136,7 @@
-
+
|
diff --git a/src/admin/templets/mychannel_add.htm b/src/admin/templets/mychannel_add.htm
index 894c11ce..753202fe 100644
--- a/src/admin/templets/mychannel_add.htm
+++ b/src/admin/templets/mychannel_add.htm
@@ -84,7 +84,7 @@
$dsql->Execute();
while($row3 = $dsql->GetObject())
{
- echo "
";
+ echo "
";
}
?>
diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm
index eecf1eff..dcc4446a 100644
--- a/src/admin/templets/soft_add.htm
+++ b/src/admin/templets/soft_add.htm
@@ -294,7 +294,7 @@
-
+
|
diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm
index ce7d2525..eab35aa3 100644
--- a/src/admin/templets/soft_edit.htm
+++ b/src/admin/templets/soft_edit.htm
@@ -247,7 +247,7 @@
-
+
|
diff --git a/src/admin/templets/statistics_list.htm b/src/admin/templets/statistics_list.htm
index d9bf3ac0..a4aae748 100644
--- a/src/admin/templets/statistics_list.htm
+++ b/src/admin/templets/statistics_list.htm
@@ -20,7 +20,12 @@
diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css
index 2812ad29..bb73b664 100644
--- a/src/static/web/css/admin.css
+++ b/src/static/web/css/admin.css
@@ -421,7 +421,7 @@ body.menu-show .admin-content {
border-radius:var(--b-radius)
}
.tips-box {
- margin:70px auto 0;
+ margin:1.75rem auto;
width:500px;
height:auto;
background:var(--white);
@@ -793,7 +793,7 @@ input,select,textarea,.colordlg,.pubdlg,.quickselitem .topcat,.mysource,.mywrite
td {
white-space:nowrap
}
- .install-box,.tips-box,.w-65,.w-35 {
+ .install-box,.w-65,.w-35 {
width:100%!important
}
.admin-textarea-sm,.admin-input-lg,.admin-input-md,.admin-input-sm {
@@ -828,7 +828,7 @@ input,select,textarea,.colordlg,.pubdlg,.quickselitem .topcat,.mysource,.mywrite
.pubdlg {
padding:0 0.5rem
}
- .pubdlg .card {
+ .pubdlg .card,.tips-box {
margin:0.5rem auto;
width:auto
}
diff --git a/src/system/archive/archives.class.php b/src/system/archive/archives.class.php
index db3af124..21d11c27 100755
--- a/src/system/archive/archives.class.php
+++ b/src/system/archive/archives.class.php
@@ -1,5 +1,5 @@
Fields = $this->dsql->GetOne($query);
+ if (!is_array($this->Fields)) {
+ echo DedeAlert('id:'.$aid.'的文档数据不存在',ALERT_DANGER);
+ }
} else {
$this->Fields['title'] = '';
$this->Fields['money'] = $this->Fields['arcrank'] = 0;
diff --git a/src/system/archive/freelist.class.php b/src/system/archive/freelist.class.php
index e373519b..83b2d38d 100755
--- a/src/system/archive/freelist.class.php
+++ b/src/system/archive/freelist.class.php
@@ -1,5 +1,5 @@
TotalResult."&nativeplace=$nativeplace&infotype=$infotype&keyword=".urlencode($keyword)."&";
- $hidenform = "
";
- $hidenform = "
";
- $hidenform = "
";
- $hidenform = "
";
- $hidenform .= "
";
- $purl .= "?tid=".$this->TypeID."&";
+ $geturl = "tid=".$this->TypeID."&TotalResult=".$this->TotalResult."&";
+ $purl .= '?'.$geturl;
+ $optionlist = '';
//获得上页和下页的链接
if ($this->PageNo != 1) {
- $prepage .= "
上页";
- $indexpage = "
首页";
+ $prepage .= "
上页";
+ $indexpage = "
首页";
} else {
$indexpage = "
首页";
}
if ($this->PageNo != $totalpage && $totalpage > 1) {
- $nextpage .= "
下页";
- $endpage = "
末页";
+ $nextpage .= "
下页";
+ $endpage = "
末页";
} else {
$endpage = "
末页";
}
@@ -1011,7 +1007,7 @@ class SgListView
if ($j == $this->PageNo) {
$listdd .= "
$j";
} else {
- $listdd .= "
$j";
+ $listdd .= "
$j";
}
}
$plist = '';
diff --git a/src/system/archive/sgpage.class.php b/src/system/archive/sgpage.class.php
index a2055004..2b49302d 100755
--- a/src/system/archive/sgpage.class.php
+++ b/src/system/archive/sgpage.class.php
@@ -1,5 +1,5 @@
=')) {
- error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
+ if (version_compare(PHP_VERSION, '8.4', '>=')) {
+ error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
+ } else {
+ error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
+ }
} else {
error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
}
diff --git a/src/system/customfields.func.php b/src/system/customfields.func.php
index a0f55f0c..06395251 100755
--- a/src/system/customfields.func.php
+++ b/src/system/customfields.func.php
@@ -1,5 +1,5 @@
SourceString, $eTagEndWord, $i);
$e2 = strpos($this->SourceString, $FullTagStartWord, $i);
$e3 = strpos($this->SourceString, $fullTagEndWordThis, $i);
+ $e4 = strpos($this->SourceString, $TagStartWord, $i);
$e1 = trim($e1);
$e2 = trim($e2);
$e3 = trim($e3);
@@ -717,12 +718,14 @@ class DedeTagParse
$endPos = $e3;
$elen = $endPos + strlen($fullTagEndWordThis);
} else {
- if ($e1 < $e3) {
- $endPos = $e3;
- $elen = $endPos + strlen($fullTagEndWordThis);
- } elseif ($e1 < $e2) {
- $endPos = $e1;
- $elen = $endPos + strlen($eTagEndWord);
+ if ($e1 < $e2 && $e1 < $e3) {
+ if ($e4 < $e1) {
+ $endPos = $e3;
+ $elen = $endPos + strlen($fullTagEndWordThis);
+ } else {
+ $endPos = $e1;
+ $elen = $endPos + strlen($eTagEndWord);
+ }
} else {
$endPos = $e3;
$elen = $endPos + strlen($fullTagEndWordThis);
@@ -768,6 +771,7 @@ class DedeTagParse
break;
}
}
+ // exit;
if ($this->IsCache) {
$this->SaveCache();
}
diff --git a/src/system/dedetemplate.class.php b/src/system/dedetemplate.class.php
index c0dce5b0..4e556ccc 100755
--- a/src/system/dedetemplate.class.php
+++ b/src/system/dedetemplate.class.php
@@ -1,5 +1,5 @@
crawlers = new Crawlers();
$this->exclusions = new Exclusions();
diff --git a/src/system/libraries/dedebiz.class.php b/src/system/libraries/dedebiz.class.php
index 2421e339..a46d45f3 100644
--- a/src/system/libraries/dedebiz.class.php
+++ b/src/system/libraries/dedebiz.class.php
@@ -1,5 +1,5 @@
isRobot()) {
- return "";
- }
$pm = array();
$pm['dduuid'] = GetCookie("DedeStUUID");
if (empty($pm['dduuid'])) {
@@ -46,6 +42,10 @@ class DedeStatistics {
$pm['created_date'] = MyDate("Ymd",$pm['t']);
$pm['created_hour'] = MyDate("H",$pm['t']);
$pm['url_type'] = isset($envs['url_type'])? $envs['url_type'] : $url_type;
+ if ($crawler = $agent->robot($agent->getUserAgent())) {
+ $pm['url_type'] = -1;
+ $pm['browser'] = $crawler;
+ }
$pm['typeid'] = isset($envs['typeid'])? $envs['typeid'] : $typeid;
$pm['aid'] = isset($envs['aid'])? $envs['aid'] : $aid;
$pm['value'] = isset($envs['value'])? $envs['value'] : $value;
@@ -156,10 +156,10 @@ class DedeStatistics {
if (is_array($info)) {
return $info;
}
- $pv = $dsql->GetOne("SELECT COUNT(*) as total FROM `#@__statistics_detail` WHERE created_date = $d");
- $uv = $dsql->GetOne("SELECT COUNT(DISTINCT dduuid) as total FROM `#@__statistics_detail` WHERE created_date = $d");
- $ip = $dsql->GetOne("SELECT COUNT(DISTINCT ip) as total FROM `#@__statistics_detail` WHERE created_date = $d");
- $vv = $dsql->GetOne("SELECT COUNT(DISTINCT ssid) as total FROM `#@__statistics_detail` WHERE created_date = $d");
+ $pv = $dsql->GetOne("SELECT COUNT(*) as total FROM `#@__statistics_detail` WHERE created_date = $d AND url_type >= 0");
+ $uv = $dsql->GetOne("SELECT COUNT(DISTINCT dduuid) as total FROM `#@__statistics_detail` WHERE created_date = $d AND url_type >= 0");
+ $ip = $dsql->GetOne("SELECT COUNT(DISTINCT ip) as total FROM `#@__statistics_detail` WHERE created_date = $d AND url_type >= 0");
+ $vv = $dsql->GetOne("SELECT COUNT(DISTINCT ssid) as total FROM `#@__statistics_detail` WHERE created_date = $d AND url_type >= 0");
if ($d < intval($today)) {
//缓存数据
$insql = "INSERT INTO `#@__statistics` (`sdate`,`pv`,`uv`,`ip`,`vv`) VALUES ('$d', '{$pv['total']}','{$uv['total']}','{$ip['total']}','{$vv['total']}')";
diff --git a/src/system/libraries/webwindow.class.php b/src/system/libraries/webwindow.class.php
index 51d67871..b7f1573a 100644
--- a/src/system/libraries/webwindow.class.php
+++ b/src/system/libraries/webwindow.class.php
@@ -1,5 +1,5 @@
diff --git a/src/system/sdks/WeMini/crypt/wxBizDataCrypt.php b/src/system/sdks/WeMini/crypt/wxBizDataCrypt.php
index 82b223fd..8150692a 100644
--- a/src/system/sdks/WeMini/crypt/wxBizDataCrypt.php
+++ b/src/system/sdks/WeMini/crypt/wxBizDataCrypt.php
@@ -1,5 +1,5 @@
true,
diff --git a/src/system/sdks/_test/config.php b/src/system/sdks/_test/config.php
index a2462aa9..7497d241 100644
--- a/src/system/sdks/_test/config.php
+++ b/src/system/sdks/_test/config.php
@@ -1,5 +1,5 @@
function ($name, $value, $expired = 360) {
diff --git a/src/system/sdks/_test/mini-login.php b/src/system/sdks/_test/mini-login.php
index be2b3279..4e60b9ac 100644
--- a/src/system/sdks/_test/mini-login.php
+++ b/src/system/sdks/_test/mini-login.php
@@ -1,5 +1,5 @@
'',//企业id
'appsecret' => '',//应用的凭证密钥
diff --git a/src/system/sdks/_test/work-department.php b/src/system/sdks/_test/work-department.php
index 98d0a603..58e57122 100644
--- a/src/system/sdks/_test/work-department.php
+++ b/src/system/sdks/_test/work-department.php
@@ -1,5 +1,5 @@
Clear();
return $fvalue;
}
+ if (count($dtp->CTags) == 0) {
+ $dtp->Clear();
+ return $fvalue;
+ }
$pagestyle = $cfg_album_style;
$maxwidth = $cfg_album_width;
$ddmaxwidth = $cfg_album_ddwidth;
@@ -58,11 +62,16 @@ function ch_img($fvalue, &$arcTag, &$refObj, $fname = '')
$pagesize = 12;
}
$aid = $refObj->ArcID;
- $row = $refObj->dsql->GetOne("SELECT title FROM `#@__archives` WHERE `id` = '$aid';");
+ if ($refObj->ChannelInfos['issystem'] == '-1') {
+ $row = $refObj->dsql->GetOne("SELECT title FROM `{$refObj->ChannelInfos['addtable']}` WHERE `aid` = '$aid';");
+ } else {
+ $row = $refObj->dsql->GetOne("SELECT title FROM `#@__archives` WHERE `id` = '$aid';");
+ }
$title = $row['title'];
$revalue = '';
$GLOBAL['photoid'] = 0;
foreach ($dtp->CTags as $ctag) {
+
if ($ctag->GetName() == "img") {
$fields = $ctag->CAttribute->Items;
$fields['text'] = str_replace("'", "", $ctag->GetAtt('text'));
diff --git a/src/system/taglib/channel/softlinks.lib.php b/src/system/taglib/channel/softlinks.lib.php
index 721ebecf..f04c4b9d 100755
--- a/src/system/taglib/channel/softlinks.lib.php
+++ b/src/system/taglib/channel/softlinks.lib.php
@@ -1,5 +1,5 @@
GetInnerText());
if (empty($innerText)) $innerText = GetSysTemplets("info_guide.htm");
+ $dtp = new DedeTagParse();
+ $dtp->SetNameSpace('dede', '{', '}');
+ $dtp->LoadSource($innerText);
+ for ($i = 0; $i <= $dtp->Count; $i++) {
+ $CTag = $dtp->CTags[$i];
+ if ($CTag->TagName == 'global') {
+ $str = $dtp->GetGlobals($CTag->GetAtt('name'));
+ if ($dtp->CTags[$i]->GetAtt('function') != '') {
+ //$str = $this->EvalFunc( $this->CTags[$i]->TagValue, $this->CTags[$i]->GetAtt('function'),$this->CTags[$i] );
+ $str = $dtp->EvalFunc($str, $dtp->CTags[$i]->GetAtt('function'), $dtp->CTags[$i]);
+ }
+ $dtp->CTags[$i]->IsReplace = TRUE;
+ $dtp->CTags[$i]->TagValue = $str;
+ }
+ }
+ $innerText = $dtp->GetResult();
+
$ctp = new DedeTagParse();
$ctp->SetNameSpace('field', '[', ']');
$ctp->LoadSource($innerText);
diff --git a/src/system/taglib/infolink.lib.php b/src/system/taglib/infolink.lib.php
index 08abe1a9..37ab108d 100755
--- a/src/system/taglib/infolink.lib.php
+++ b/src/system/taglib/infolink.lib.php
@@ -1,5 +1,5 @@
CTags)) {
foreach ($dtp->CTags as $tid => $ctag) {
- if ($loadtype != 'autofield' || $ctag->GetAtt('autofield') == 1) {
+ if (($loadtype != 'autofield' || $ctag->GetAtt('autofield') == 1) && $ctag->GetAtt('notsend') == 0) {
$dede_addonfields .= ($dede_addonfields == "" ? $ctag->GetName().",".$ctag->GetAtt('type') : ";".$ctag->GetName().",".$ctag->GetAtt('type'));
$addonfieldsname .= ",".$ctag->GetName();
- if ($isprint) echo GetFormItemA($ctag);
+ if ($isprint) echo GetFormItemA($ctag);
}
}
}
@@ -217,7 +217,7 @@ function PrintAutoFieldsEdit(&$fieldset, &$fieldValues, $loadtype = 'all')
if (is_array($dtp->CTags)) {
foreach ($dtp->CTags as $tid => $ctag) {
if (
- $loadtype != 'autofield' || ($loadtype == 'autofield' && $ctag->GetAtt('autofield') == 1)) {
+ ($loadtype != 'autofield' || ($loadtype == 'autofield' && $ctag->GetAtt('autofield') == 1) && $ctag->GetAtt('notsend') == 0)) {
$dede_addonfields .= ($dede_addonfields == '' ? $ctag->GetName().",".$ctag->GetAtt('type') : ";".$ctag->GetName().",".$ctag->GetAtt('type'));
echo GetFormItemValueA($ctag, $fieldValues[$ctag->GetName()]);
}
diff --git a/src/user/inc/inc_batchup.php b/src/user/inc/inc_batchup.php
index 3ea58e5e..6fea7381 100755
--- a/src/user/inc/inc_batchup.php
+++ b/src/user/inc/inc_batchup.php
@@ -1,5 +1,5 @@
描述
-
+
-
+