diff --git a/src/admin/album_add.php b/src/admin/album_add.php index 84baa8e6..f805c36c 100644 --- a/src/admin/album_add.php +++ b/src/admin/album_add.php @@ -45,8 +45,6 @@ if ($dopost != 'save') { if (!isset($remote)) $remote = 0; if (!isset($dellink)) $dellink = 0; if (!isset($autolitpic)) $autolitpic = 0; - if (!isset($formhtml)) $formhtml = 0; - if (!isset($formzip)) $formzip = 0; if (!isset($ddisfirst)) $ddisfirst = 0; if (!isset($albums)) $albums = ""; if (!isset($delzip)) $delzip = 0; @@ -100,22 +98,6 @@ if ($dopost != 'save') { } $imgurls = "{dede:pagestyle maxwidth='$maxwidth' pagepicnum='$pagepicnum' ddmaxwidth='$ddmaxwidth' row='$row' col='$col' value='$pagestyle'/}\r\n"; $hasone = FALSE; - //处理并保存从网上复制的图片 - if ($formhtml == 1) { - $imagebody = stripslashes($imagebody); - $imgurls .= GetCurContentAlbum($imagebody, $copysource, $litpicname); - if ($ddisfirst == 1 && $litpic == '' && !empty($litpicname)) { - $litpic = $litpicname; - $hasone = TRUE; - } - } - //处理从ZIP中解压的图片 - if ($formzip == 1) { - include_once(DEDEADMIN."/file_class.php"); - $zipfile = $cfg_basedir.str_replace($cfg_mainsite, '', $zipfile); - $tmpzipdir = DEDEDATA.'/ziptmp/'.cn_substr(md5(ExecTime()), 16); - $ntime = time(); - } if ($albums !== "") { $albumsArr = json_decode(stripslashes($albums), true); for ($i = 0; $i <= count($albumsArr) - 1; $i++) { @@ -146,6 +128,9 @@ if ($dopost != 'save') { $info = ''; $imginfos = GetImageSize($cfg_basedir.$v, $info); } + if ($ddisfirst == 1) { + $litpic = $v; + } $imginfo = !empty($album['txt']) ? $album['txt'] : ''; $imgurls .= "{dede:img ddimg='$v' text='$imginfo' width='".$imginfos[0]."' height='".$imginfos[1]."'} $v {/dede:img}\r\n"; } diff --git a/src/admin/album_edit.php b/src/admin/album_edit.php index a3a45548..e8f54f52 100644 --- a/src/admin/album_edit.php +++ b/src/admin/album_edit.php @@ -58,7 +58,6 @@ if ($dopost != 'save') { if (!isset($remote)) $remote = 0; if (!isset($dellink)) $dellink = 0; if (!isset($autolitpic)) $autolitpic = 0; - if (!isset($formhtml)) $formhtml = 0; if (!isset($albums)) $albums = ""; if (!isset($formzip)) $formzip = 0; if (!isset($ddisfirst)) $ddisfirst = 0; @@ -173,22 +172,6 @@ if ($dopost != 'save') { $imgurls .= "{dede:img ddimg='$ddurl' text='$iinfo' width='".$imginfos[0]."' height='".$imginfos[1]."'} $iurl {/dede:img}\r\n"; } } - //从网页中获取新图片 - if ($formhtml == 1 && !empty($imagebody)) { - $imagebody = stripslashes($imagebody); - $imgurls .= GetCurContentAlbum($imagebody, $copysource, $litpicname); - if ($ddisfirst == 1 && $litpic == "" && !empty($litpicname)) { - $litpic = $litpicname; - $hasone = true; - } - } - //从ZIP文件中获取新图片 - if ($formzip == 1) { - include_once(DEDEADMIN."/file_class.php"); - $zipfile = $cfg_basedir.str_replace($cfg_mainsite, '', $zipfile); - $tmpzipdir = DEDEDATA.'/ziptmp/'.cn_substr(md5(ExecTime()), 16); - $ntime = time(); - } if ($albums !== "") { $albumsArr = json_decode(stripslashes($albums), true); for ($i = 0; $i <= count($albumsArr) - 1; $i++) { diff --git a/src/user/album_add.php b/src/user/album_add.php index 11f9ead1..f6aafb60 100755 --- a/src/user/album_add.php +++ b/src/user/album_add.php @@ -26,7 +26,6 @@ require_once(DEDEMEMBER."/inc/inc_archives_functions.php"); $channelid = isset($channelid) && is_numeric($channelid) ? $channelid : 2; $typeid = isset($typeid) && is_numeric($typeid) ? $typeid : 0; $menutype = 'content'; -if (empty($formhtml)) $formhtml = 0; if ($cfg_ml->IsSendLimited()) { ShowMsg("投稿失败,每日投稿次数{$cfg_ml->M_SendMax}次,剩余0次,需要增加次数,请联系网站管理员", "index.php", "0", 5000); exit(); @@ -79,9 +78,6 @@ if (empty($dopost)) { $imgurls = addslashes($imgurls); //分析处理附加表数据 $isrm = 1; - if (!isset($formhtml)) { - $formhtml = 0; - } $inadd_f = $inadd_v = ''; if (!empty($dede_addonfields)) { $addonfields = explode(';', $dede_addonfields); diff --git a/src/user/album_edit.php b/src/user/album_edit.php index 93fcede2..2f21af64 100755 --- a/src/user/album_edit.php +++ b/src/user/album_edit.php @@ -25,7 +25,6 @@ require_once(DEDEMEMBER."/inc/inc_archives_functions.php"); $channelid = isset($channelid) && is_numeric($channelid) ? $channelid : 2; $aid = isset($aid) && is_numeric($aid) ? $aid : 0; $menutype = 'content'; -if (empty($formhtml)) $formhtml = 0; if ($cfg_ml->IsSendLimited()) { ShowMsg("投稿失败,每日投稿次数{$cfg_ml->M_SendMax}次,剩余0次,需要增加次数,请联系网站管理员", "index.php", "0", 5000); exit();