From 43061345e442032415a5a7ef33d9c34a4d8b38a6 Mon Sep 17 00:00:00 2001 From: tianya Date: Thu, 26 Nov 2020 07:24:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84dedebiz=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E9=98=B2=E7=AF=A1=E6=94=B9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dede/article_add.php | 288 +++++++++++------------- src/dede/makehtml_homepage.php | 5 +- src/dede/templets/index_body.htm | 2 +- src/dede/templets/makehtml_homepage.htm | 27 +-- 4 files changed, 146 insertions(+), 176 deletions(-) diff --git a/src/dede/article_add.php b/src/dede/article_add.php index 2e906985..2b447952 100755 --- a/src/dede/article_add.php +++ b/src/dede/article_add.php @@ -1,4 +1,5 @@ 0 && $channelid==0) - { + if ($cid > 0 && $channelid == 0) { $row = $dsql->GetOne("Select channeltype From `#@__arctype` where id='$cid'; "); $channelid = $row['channeltype']; - } - else - { - if($channelid==0) - { + } else { + if ($channelid == 0) { $channelid = 1; } } //获得频道模型信息 $cInfos = $dsql->GetOne(" Select * From `#@__channeltype` where id='$channelid' "); - + //获取文章最大id以确定当前权重 - $maxWright = $dsql->GetOne("SELECT COUNT(*) AS cc FROM #@__archives"); - + $maxWright = $dsql->GetOne("SELECT COUNT(*) AS cc FROM `#@__archives`"); + include DedeInclude("templets/article_add.htm"); exit(); } /*-------------------------------- function __save(){ } --------------------------------*/ -else if($dopost=='save') -{ - require_once(DEDEINC.'/image.func.php'); - require_once(DEDEINC.'/oxwindow.class.php'); - $flag = isset($flags) ? join(',',$flags) : ''; - $notpost = isset($notpost) && $notpost == 1 ? 1: 0; - - if(empty($typeid2)) $typeid2 = ''; - if(!isset($autokey)) $autokey = 0; - if(!isset($remote)) $remote = 0; - if(!isset($dellink)) $dellink = 0; - if(!isset($autolitpic)) $autolitpic = 0; - if(empty($click)) $click = ($cfg_arc_click=='-1' ? mt_rand(50, 200) : $cfg_arc_click); - - if(empty($typeid)) - { - ShowMsg("请指定文档的栏目！","-1"); +-------------------------------*/ else if ($dopost == 'save') { + require_once(DEDEINC . '/image.func.php'); + require_once(DEDEINC . '/oxwindow.class.php'); + $flag = isset($flags) ? join(',', $flags) : ''; + $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; + + if (empty($typeid2)) $typeid2 = ''; + if (!isset($autokey)) $autokey = 0; + if (!isset($remote)) $remote = 0; + if (!isset($dellink)) $dellink = 0; + if (!isset($autolitpic)) $autolitpic = 0; + if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(50, 200) : $cfg_arc_click); + + if (empty($typeid)) { + ShowMsg("请指定文档的栏目！", "-1"); exit(); } - if(empty($channelid)) - { - ShowMsg("文档为非指定的类型，请检查你发布内容的表单是否合法！","-1"); + if (empty($channelid)) { + ShowMsg("文档为非指定的类型，请检查你发布内容的表单是否合法！", "-1"); exit(); } - if(!CheckChannel($typeid,$channelid)) - { - ShowMsg("你所选择的栏目与当前模型不相符，请选择白色的选项！","-1"); + if (!CheckChannel($typeid, $channelid)) { + ShowMsg("你所选择的栏目与当前模型不相符，请选择白色的选项！", "-1"); exit(); } - if(!TestPurview('a_New')) - { - CheckCatalog($typeid,"对不起，你没有操作栏目 {$typeid} 的权限！"); + if (!TestPurview('a_New')) { + CheckCatalog($typeid, "对不起，你没有操作栏目 {$typeid} 的权限！"); } //对保存的内容进行处理 - if(empty($writer))$writer=$cuserLogin->getUserName(); - if(empty($source))$source='未知'; + if (empty($writer)) $writer = $cuserLogin->getUserName(); + if (empty($source)) $source = '未知'; $pubdate = GetMkTime($pubdate); $senddate = time(); - $sortrank = AddDay($pubdate,$sortup); - $ismake = $ishtml==0 ? -1 : 0; + $sortrank = AddDay($pubdate, $sortup); + $ismake = $ishtml == 0 ? -1 : 0; $title = preg_replace("#\"#", '＂', $title); - $title = dede_htmlspecialchars(cn_substrR($title,$cfg_title_maxlen)); - $shorttitle = cn_substrR($shorttitle,36); - $color = cn_substrR($color,7); - $writer = cn_substrR($writer,20); - $source = cn_substrR($source,30); - $description = cn_substrR($description,$cfg_auot_description); - $keywords = cn_substrR($keywords,60); - $filename = trim(cn_substrR($filename,40)); + $title = dede_htmlspecialchars(cn_substrR($title, $cfg_title_maxlen)); + $shorttitle = cn_substrR($shorttitle, 36); + $color = cn_substrR($color, 7); + $writer = cn_substrR($writer, 20); + $source = cn_substrR($source, 30); + $description = cn_substrR($description, $cfg_auot_description); + $keywords = cn_substrR($keywords, 60); + $filename = trim(cn_substrR($filename, 40)); $userip = GetIP(); $isremote = 0; - $serviterm=empty($serviterm)? "" : $serviterm; + $serviterm = empty($serviterm) ? "" : $serviterm; - if(!TestPurview('a_Check,a_AccCheck,a_MyCheck')) - { + if (!TestPurview('a_Check,a_AccCheck,a_MyCheck')) { $arcrank = -1; } $adminid = $cuserLogin->getUserID(); //处理上传的缩略图 - if(empty($ddisremote)) - { + if (empty($ddisremote)) { $ddisremote = 0; } - + $litpic = GetDDImage('none', $picname, $ddisremote); // 处理新的缩略图上传 if ($litpic_b64 != "") { - $data = explode( ',', $litpic_b64 ); + $data = explode(',', $litpic_b64); $ntime = time(); - $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime); + $savepath = $ddcfg_image_dir . '/' . MyDate($cfg_addon_savetype, $ntime); CreateDir($savepath); - $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999)); - $fullUrl = $fullUrl.".png"; - - file_put_contents($cfg_basedir.$fullUrl, base64_decode( $data[ 1 ] )); + $fullUrl = $savepath . '/' . dd2char(MyDate('mdHis', $ntime) . $cuserLogin->getUserID() . mt_rand(1000, 9999)); + $fullUrl = $fullUrl . ".png"; + + file_put_contents($cfg_basedir . $fullUrl, base64_decode($data[1])); // 加水印 - WaterImg($cfg_basedir.$fullUrl, 'up'); + WaterImg($cfg_basedir . $fullUrl, 'up'); $litpic = $fullUrl; } //生成文档ID - $arcID = GetIndexKey($arcrank,$typeid,$sortrank,$channelid,$senddate,$adminid); - - if(empty($arcID)) - { - ShowMsg("无法获得主键，因此无法进行后续操作！","-1"); + $arcID = GetIndexKey($arcrank, $typeid, $sortrank, $channelid, $senddate, $adminid); + + if (empty($arcID)) { + ShowMsg("无法获得主键，因此无法进行后续操作！", "-1"); exit(); } - if(trim($title) == '') - { + if (trim($title) == '') { ShowMsg('标题不能为空', '-1'); exit(); } //处理body字段自动摘要、自动提取缩略图等 - $body = AnalyseHtmlBody($body,$description,$litpic,$keywords,'htmltext'); + $body = AnalyseHtmlBody($body, $description, $litpic, $keywords, 'htmltext'); //自动分页 - if($sptype=='auto') - { - $body = SpLongBody($body,$spsize*1024,"#p#分页标题#e#"); + if ($sptype == 'auto') { + $body = SpLongBody($body, $spsize * 1024, "#p#分页标题#e#"); } //分析处理附加表数据 $inadd_f = $inadd_v = ''; - if(!empty($dede_addonfields)) - { - $addonfields = explode(';',$dede_addonfields); - if(is_array($addonfields)) - { - foreach($addonfields as $v) - { - if($v=='') continue; - $vs = explode(',',$v); - if($vs[1]=='htmltext'||$vs[1]=='textdata') - { - ${$vs[0]} = AnalyseHtmlBody(${$vs[0]},$description,$litpic,$keywords,$vs[1]); + if (!empty($dede_addonfields)) { + $addonfields = explode(';', $dede_addonfields); + if (is_array($addonfields)) { + foreach ($addonfields as $v) { + if ($v == '') continue; + $vs = explode(',', $v); + if ($vs[1] == 'htmltext' || $vs[1] == 'textdata') { + ${$vs[0]} = AnalyseHtmlBody(${$vs[0]}, $description, $litpic, $keywords, $vs[1]); + } else { + if (!isset(${$vs[0]})) ${$vs[0]} = ''; + ${$vs[0]} = GetFieldValueA(${$vs[0]}, $vs[1], $arcID); } - else - { - if(!isset(${$vs[0]})) ${$vs[0]} = ''; - ${$vs[0]} = GetFieldValueA(${$vs[0]},$vs[1],$arcID); - } - $inadd_f .= ','.$vs[0]; - $inadd_v .= " ,'".${$vs[0]}."' "; + $inadd_f .= ',' . $vs[0]; + $inadd_v .= " ,'" . ${$vs[0]} . "' "; } } } //处理图片文档的自定义属性 - if($litpic!='' && !preg_match("#p#", $flag)) - { - $flag = ($flag=='' ? 'p' : $flag.',p'); + if ($litpic != '' && !preg_match("#p#", $flag)) { + $flag = ($flag == '' ? 'p' : $flag . ',p'); } - if($redirecturl!='' && !preg_match("#j#", $flag)) - { - $flag = ($flag=='' ? 'j' : $flag.',j'); + if ($redirecturl != '' && !preg_match("#j#", $flag)) { + $flag = ($flag == '' ? 'j' : $flag . ',j'); } - + //跳转网址的文档强制为动态 - if(preg_match("#j#", $flag)) $ismake = -1; + if (preg_match("#j#", $flag)) $ismake = -1; //保存到主表 $query = "INSERT INTO `#@__archives`(id,typeid,typeid2,sortrank,flag,ismake,channel,arcrank,click,money,title,shorttitle, @@ -218,69 +193,60 @@ else if($dopost=='save') '$title','$shorttitle','$color','$writer','$source','$litpic','$pubdate','$senddate', '$adminid','0','$notpost','$description','$keywords','$filename','$adminid','$weight');"; - if(!$dsql->ExecuteNoneQuery($query)) - { + if (!$dsql->ExecuteNoneQuery($query)) { $gerr = $dsql->GetError(); $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE id='$arcID'"); - ShowMsg("把数据保存到数据库主表 `#@__archives` 时出错，请把相关信息提交给DedeCMS官方。".str_replace('"','',$gerr),"javascript:;"); + ShowMsg("把数据保存到数据库主表 `#@__archives` 时出错，请把相关信息提交给DedeCMS官方。" . str_replace('"', '', $gerr), "javascript:;"); exit(); } //保存到附加表 $cts = $dsql->GetOne("SELECT addtable FROM `#@__channeltype` WHERE id='$channelid' "); $addtable = trim($cts['addtable']); - if(empty($addtable)) - { + if (empty($addtable)) { $dsql->ExecuteNoneQuery("DELETE FROM `#@__archives` WHERE id='$arcID'"); $dsql->ExecuteNoneQuery("DELETE FROM `#@__arctiny` WHERE id='$arcID'"); - ShowMsg("没找到当前模型[{$channelid}]的主表信息，无法完成操作！。","javascript:;"); + ShowMsg("没找到当前模型[{$channelid}]的主表信息，无法完成操作！。", "javascript:;"); exit(); } $useip = GetIP(); $templet = empty($templet) ? '' : $templet; $query = "INSERT INTO `{$addtable}`(aid,typeid,redirecturl,templet,userip,body{$inadd_f}) Values('$arcID','$typeid','$redirecturl','$templet','$useip','$body'{$inadd_v})"; - if(!$dsql->ExecuteNoneQuery($query)) - { + if (!$dsql->ExecuteNoneQuery($query)) { $gerr = $dsql->GetError(); $dsql->ExecuteNoneQuery("Delete From `#@__archives` where id='$arcID'"); $dsql->ExecuteNoneQuery("Delete From `#@__arctiny` where id='$arcID'"); - ShowMsg("把数据保存到数据库附加表 `{$addtable}` 时出错，请把相关信息提交给DedeCMS官方。".str_replace('"','',$gerr),"javascript:;"); + ShowMsg("把数据保存到数据库附加表 `{$addtable}` 时出错，请把相关信息提交给DedeCMS官方。" . str_replace('"', '', $gerr), "javascript:;"); exit(); } //生成HTML - InsertTags($tags,$arcID); - if($cfg_remote_site=='Y' && $isremote=="1") - { - if($serviterm!=""){ - list($servurl,$servuser,$servpwd) = explode(',',$serviterm); - $config=array( 'hostname' => $servurl, 'username' => $servuser, 'password' => $servpwd,'debug' => 'TRUE'); - }else{ - $config=array(); + InsertTags($tags, $arcID); + if ($cfg_remote_site == 'Y' && $isremote == "1") { + if ($serviterm != "") { + list($servurl, $servuser, $servpwd) = explode(',', $serviterm); + $config = array('hostname' => $servurl, 'username' => $servuser, 'password' => $servpwd, 'debug' => 'TRUE'); + } else { + $config = array(); + } + if (!$ftp->connect($config)) exit('Error:None FTP Connection!'); + } + $picTitle = false; + if (count($_SESSION['bigfile_info']) > 0) { + foreach ($_SESSION['bigfile_info'] as $k => $v) { + if (!empty($v)) { + $pictitle = ${'picinfook' . $k}; + $titleSet = ''; + if (!empty($pictitle)) { + $picTitle = TRUE; + $titleSet = ",title='{$pictitle}'"; + } + $dsql->ExecuteNoneQuery("UPDATE `#@__uploads` SET arcid='{$arcID}'{$titleSet} WHERE url LIKE '{$v}'; "); + } } - if(!$ftp->connect($config)) exit('Error:None FTP Connection!'); } - $picTitle = false; - if(count($_SESSION['bigfile_info']) > 0) - { - foreach ($_SESSION['bigfile_info'] as $k => $v) - { - if(!empty($v)) - { - $pictitle = ${'picinfook'.$k}; - $titleSet = ''; - if(!empty($pictitle)) - { - $picTitle = TRUE; - $titleSet = ",title='{$pictitle}'"; - } - $dsql->ExecuteNoneQuery("UPDATE `#@__uploads` SET arcid='{$arcID}'{$titleSet} WHERE url LIKE '{$v}'; "); - } - } - } - $artUrl = MakeArt($arcID,true,true,$isremote); - if($artUrl=='') - { - $artUrl = $cfg_phpurl."/view.php?aid=$arcID"; + $artUrl = MakeArt($arcID, true, true, $isremote); + if ($artUrl == '') { + $artUrl = $cfg_phpurl . "/view.php?aid=$arcID"; } ClearMyAddon($arcID, $title); @@ -290,7 +256,7 @@ else if($dopost=='save') if (isset(${$key}) && !empty(${$key})) { $ids = explode(",", ${$key}); foreach ($ids as $id) { - MakeArt($id,true,true,$isremote); + MakeArt($id, true, true, $isremote); } } } @@ -302,18 +268,18 @@ else if($dopost=='save')    查看文章    - 更改文章 + 更改文章    已发布文章管理    $backurl "; - $msg = "
{$msg}
".GetUpdateTest(); + $msg = "
{$msg}
" . GetUpdateTest(); $wintitle = "成功发布文章！"; $wecome_info = "文章管理::发布文章"; $win = new OxWindow(); $win->AddTitle("成功发布文章："); $win->AddMsgItem($msg); - $winform = $win->GetWindow("hand"," ",false); + $winform = $win->GetWindow("hand", " ", false); $win->Display(); } diff --git a/src/dede/makehtml_homepage.php b/src/dede/makehtml_homepage.php index 8748b2c8..28486cfc 100755 --- a/src/dede/makehtml_homepage.php +++ b/src/dede/makehtml_homepage.php @@ -26,7 +26,10 @@ if ($dopost == "view") { $client->appid = $cfg_bizcore_appid; $client->key = $cfg_bizcore_key; $data = $client->AdminPWDExists(); - if ($data->data == "false") { + $data = json_decode($data->data); + $rs = (array)($data->result); + + if ($rs["admin_pwd_exists"] == "false") { // 设定dedebiz admin密码 if ($dedebiz_admin == "" || $dedebiz_admin !== $re_dedebiz_admin) { echo ""; diff --git a/src/dede/templets/index_body.htm b/src/dede/templets/index_body.htm index a13ce2de..7539b581 100755 --- a/src/dede/templets/index_body.htm +++ b/src/dede/templets/index_body.htm @@ -426,7 +426,7 @@ `; } - if (rsp.result.core.code != 200) { + if (rsp.result.core === null || rsp.result.core.code != 200) { // 下面是DedeBIZ Core组件信息 infoStr += ` diff --git a/src/dede/templets/makehtml_homepage.htm b/src/dede/templets/makehtml_homepage.htm index 76093673..08c09e58 100755 --- a/src/dede/templets/makehtml_homepage.htm +++ b/src/dede/templets/makehtml_homepage.htm @@ -81,7 +81,7 @@ - 首页防篡改（主页位置更改请重新启动DedeBIZ商业组件） + 首页防篡改（主页位置更改请重新启动DedeBIZ商业组件） appid = $cfg_bizcore_appid; $client->key = $cfg_bizcore_key; $data = $client->AdminPWDExists(); - $rs = (array)json_decode($data->data); + $data = json_decode($data->data); + $rs = (array)($data->result); if($rs["admin_pwd_exists"] == "false") {?> 设置DedeBIZ操作密码: - + 设定后所有的DedeBIZ涉及安全操作输入当前操作密码 @@ -107,12 +108,12 @@ - - DedeBIZ操作密码: - - - - + + DedeBIZ操作密码: + + + + @@ -120,11 +121,11 @@ 首页状态: + /> + 解锁 + /> + 锁定