diff --git a/src/apps/diy.php b/src/apps/diy.php
index 615a5a31..84c0b98f 100755
--- a/src/apps/diy.php
+++ b/src/apps/diy.php
@@ -77,8 +77,9 @@ if ($action == 'post') {
$bkmsg = '发布成功，请等待管理员处理';
//提交后返回提交页面
echo"<script>alert('提交成功');history.go(-1)</script>";
+ exit;
}
- showmsg($bkmsg, $goto);
+ ShowMsg($bkmsg, $goto);
}
}
} else if ($action == 'list') {
diff --git a/src/static/web/js/diy.js b/src/static/web/js/diy.js
new file mode 100644
index 00000000..533ddc14
--- /dev/null
+++ b/src/static/web/js/diy.js
@@ -0,0 +1,38 @@
+function SelectImage(sform,stype) {
+ let s = sform.split(".");
+ if (s.length === 2) {
+ let frm = document.getElementsByName(s[0]);
+ let ipt = document.getElementsByName(s[1]);
+ let tmp = document.createElement("input");
+ tmp.id = 'field'+s[1];
+ tmp.type = "file";
+ tmp.style.display = 'none';
+ if ($(`#${tmp.id}`).length === 0) {
+ $(frm).append(tmp);
+ }
+ $(`#${tmp.id}`).click();
+ $(`#${tmp.id}`).off('change').change(function (val) {
+ const f = val.target.files[0];
+ var formData = new FormData();
+ var fileData = f;
+ formData.append('file', fileData);
+ $.ajax({
+ url: '../user/api.php?action=upload&type=litpic',
+ type: 'POST',
+ data: formData,
+ processData: false,
+ contentType: false,
+ success: function (result) {
+ if (result.code === 0) {
+ $(ipt).val(result.data);
+ } else {
+ ShowMsg("文件上传失败，错误原因："+result.msg);
+ }
+ },
+ error: function (xhr, status, error) {
+ ShowMsg("文件上传失败");//处理上传失败后的回调
+ }
+ });
+ })
+ }
+}
\ No newline at end of file
diff --git a/src/static/web/js/user.js b/src/static/web/js/user.js
index 44acbe71..abe94bed 100644
--- a/src/static/web/js/user.js
+++ b/src/static/web/js/user.js
@@ -8,4 +8,43 @@ function checkSubmit(t) {
ShowMsg("请您选择文档所属栏目");
return false;
}
+}
+
+function SelectImage(sform,stype) {
+ let s = sform.split(".");
+ if (s.length === 2) {
+ let frm = document.getElementsByName(s[0]);
+ let ipt = document.getElementsByName(s[1]);
+ let tmp = document.createElement("input");
+ tmp.id = 'field'+s[1];
+ tmp.type = "file";
+ tmp.style.display = 'none';
+ if ($(`#${tmp.id}`).length === 0) {
+ $(frm).append(tmp);
+ }
+ $(`#${tmp.id}`).click();
+ $(`#${tmp.id}`).off('change').change(function (val) {
+ const f = val.target.files[0];
+ var formData = new FormData();
+ var fileData = f;
+ formData.append('file', fileData);
+ $.ajax({
+ url: 'api.php?action=upload&type=litpic',
+ type: 'POST',
+ data: formData,
+ processData: false,
+ contentType: false,
+ success: function (result) {
+ if (result.code === 0) {
+ $(ipt).val(result.data);
+ } else {
+ ShowMsg("文件上传失败，错误原因："+result.msg);
+ }
+ },
+ error: function (xhr, status, error) {
+ ShowMsg("文件上传失败");//处理上传失败后的回调
+ }
+ });
+ })
+ }
}
\ No newline at end of file
diff --git a/src/system/customfields.func.php b/src/system/customfields.func.php
index 367d7cf8..c8cf3782 100755
--- a/src/system/customfields.func.php
+++ b/src/system/customfields.func.php
@@ -104,23 +104,11 @@ function GetFormItem($ctag, $admintype = 'admin')
$nowtime = GetDateTimeMk(time());
$innertext = "<input type=\"text\" name=\"$fieldname\" value=\"$nowtime\" id=\"$fieldname\" class=\"form-control admin-input-md\">";
} else if ($fieldType == 'img' || $fieldType == 'imgfile') {
- if ($admintype == 'diy') {
- $innertext = "<input type='file' name='$fieldname' id='$fieldname' class='form-control admin-input-md'>";
- } else {
- $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectImage('form1.$fieldname','big')\">";
- }
+ $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectImage('addcontent.$fieldname','big')\">";
} else if ($fieldType == 'media') {
- if ($admintype == 'diy') {
- $innertext = "<input type='hidden' name='$fieldname' id='$fieldname' value=''> 不支持类型";
- } else {
- $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectMedia('form1.$fieldname')\">";
- }
+ $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-md' placeholder='请输入多媒体文件地址'>";
} else if ($fieldType == 'addon') {
- if ($admintype == 'diy') {
- $innertext = "<input type='file' name='$fieldname' id='$fieldname' class='form-control admin-input-md'>";
- } else {
- $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectSoft('form1.$fieldname')\">";
- }
+ $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-md' placeholder='请输入附件地址'>";
} else if ($fieldType == 'int' || $fieldType == 'float') {
$dfvalue = ($ctag->GetAtt('default') != '' ? $ctag->GetAtt('default') : '0');
$innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-xs' value='$dfvalue'>";
@@ -230,7 +218,7 @@ function GetFieldValue($dvalue, $dtype, $aid = 0, $job = 'add', $addvar = '', $a
CloseFtp();
return $filename;
} else if ($dtype == 'img' || $dtype == 'imgfile') {
- if (preg_match("#[\\|/]uploads[\\|/]userup#", $dvalue)) return $dvalue;
+ if (preg_match("#[\\|/]static[\\|/]userup#", $dvalue)) return $dvalue;
if ($admintype == 'diy') {
$iurl = MemberUploads($fieldname, '', 0, 'image', '', -1, -1, false);
return $iurl;
@@ -413,20 +401,22 @@ function GetFormItemValue($ctag, $fvalue, $admintype = 'admin', $fieldname = '')
$fvalue = "";
} else {
$ntag = $ndtp->GetTag("img");
- $fvalue = trim($ntag->GetInnerText());
+ if (!empty($ntag)) {
+ $fvalue = trim($ntag->GetInnerText());
+ }
}
- $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectImage('form1.$fieldname','big')\">";
+ $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectImage('addcontent.$fieldname','big')\">";
} else if ($ftype == "imgfile") {
- $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectImage('form1.$fieldname','big')\">";
+ $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectImage('addcontent.$fieldname','big')\">";
} else if ($ftype == "media") {
- $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm'value='浏览' onClick=\"SelectMedia('form1.$fieldname')\">";
+ $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm'value='浏览' onClick=\"SelectMedia('addcontent.$fieldname')\">";
} else if ($ftype == "addon") {
- $innertext = "<input type='text' name='$fieldname' id='$fieldname' value='$fvalue' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectSoft('form1.$fieldname')\">";
+ $innertext = "<input type='text' name='$fieldname' id='$fieldname' value='$fvalue' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectSoft('addcontent.$fieldname')\">";
} else if ($ftype == "int" || $ftype == "float") {
$innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-xs' value='$fvalue'>";
} else if ($ftype == "relation") {
$channel = ($ctag->GetAtt('channel') == "") ? "1" : $ctag->GetAtt('channel');
- $innertext = "<textarea name='$fieldname' id='$fieldname' class='form-control admin-textarea-sm'>$fvalue</textarea><br><button type='button' class='btn btn-success btn-sm' onclick='SelectArcList(\"form1.$fieldname\", $channel);'>选择关联文档</button>";
+ $innertext = "<textarea name='$fieldname' id='$fieldname' class='form-control admin-textarea-sm'>$fvalue</textarea><br><button type='button' class='btn btn-success btn-sm' onclick='SelectArcList(\"addcontent.$fieldname\", $channel);'>选择关联文档</button>";
if ($ctag->GetAtt('automake') == 1) {
$innertext .= "<input type='hidden' name='automake[$fieldname]' value='1'>";
}
diff --git a/src/theme/plus/post_diyform.htm b/src/theme/plus/post_diyform.htm
index 22caeee8..5eabd0de 100644
--- a/src/theme/plus/post_diyform.htm
+++ b/src/theme/plus/post_diyform.htm
@@ -8,6 +8,7 @@
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/style.css">
<script src="<?php echo $cfg_cmsurl;?>/static/web/js/jquery.min.js"></script>
+ <script src="<?php echo $cfg_cmsurl;?>/static/web/js/diy.js"></script>
</head>
<body>
<?php pasterTempletDiy('top.htm');?>
@@ -15,7 +16,7 @@
<div class="row">
<div class="col-md-12">
<h4 class="mb-3"><?php echo $diy->name;?>发布</h4>
- <form action="<?php echo $cfg_cmspath;?>/apps/diy.php" enctype="multipart/form-data" method="post">
+ <form name="addcontent" action="<?php echo $cfg_cmspath;?>/apps/diy.php" enctype="multipart/form-data" method="post">
<input type="hidden" name="action" value="post">
<input type="hidden" name="diyid" value="<?php echo $diyid;?>">
<input type="hidden" name="do" value="2">
diff --git a/src/user/api.php b/src/user/api.php
index 26e796a9..dee074fa 100755
--- a/src/user/api.php
+++ b/src/user/api.php
@@ -60,15 +60,11 @@ if ($action === 'is_need_check_code') {
));
} else if ($action === 'upload') {
if (!$cfg_ml->IsLogin()) {
- if ($format === 'json') {
- echo json_encode(array(
- "code" => -1,
- "msg" => "未登录",
- "data" => null,
- ));
- } else {
- echo "";
- }
+ echo json_encode(array(
+ "code" => -1,
+ "msg" => "未登录",
+ "data" => null,
+ ));
exit;
}
$target_dir = "uploads/";//上传目录
diff --git a/src/user/archives_edit.php b/src/user/archives_edit.php
index 29be3b41..e21d4562 100755
--- a/src/user/archives_edit.php
+++ b/src/user/archives_edit.php
@@ -95,7 +95,7 @@ if (empty($dopost)) {
$artUrl = MakeArt($aid, TRUE);
if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$aid";
//返回成功信息
- $msg = "请选择您的后续操作：<a href='archives_add.php?cid=$typeid&channelid=$channelid' class='btn btn-success btn-sm'>发布自定义文档</a><a href='archives_edit.php?channelid=$channelid&aid=".$aid."' class='btn btn-success btn-sm'>修改自定义文档</a><a href='$artUrl' target='_blank'>浏览自定义文档</a><a href='content_list.php?channelid=$channelid' class='btn btn-success btn-sm'>管理自定义文档</a>";
+ $msg = "请选择您的后续操作：<a href='archives_add.php?cid=$typeid&channelid=$channelid' class='btn btn-success btn-sm'>发布自定义文档</a><a href='archives_edit.php?channelid=$channelid&aid=".$aid."' class='btn btn-success btn-sm'>修改自定义文档</a><a class='btn btn-success btn-sm' href='$artUrl' target='_blank'>浏览自定义文档</a><a href='content_list.php?channelid=$channelid' class='btn btn-success btn-sm'>管理自定义文档</a>";
$wintitle = "成功修改自定义文档";
$wecome_info = "文档管理::修改自定义文档";
$win = new OxWindow();