diff --git a/src/dede/album_add.php b/src/dede/album_add.php index 59ffc70a..1cb52b87 100755 --- a/src/dede/album_add.php +++ b/src/dede/album_add.php @@ -104,7 +104,7 @@ else if($dopost=='save') $keywords = cn_substrR($keywords,60); $filename = trim(cn_substrR($filename,40)); $userip = GetIP(); - $isremote = (empty($isremote)? 0 : $isremote); + $isremote = 0; $serviterm=empty($serviterm)? "" : $serviterm; if(!TestPurview('a_Check,a_AccCheck,a_MyCheck')) { @@ -113,10 +113,7 @@ else if($dopost=='save') $adminid = $cuserLogin->getUserID(); //处理上传的缩略图 - if(empty($ddisremote)) - { - $ddisremote = 0; - } + if(empty($ddisremote)) $ddisremote = 0; $litpic = GetDDImage('none',$picname,$ddisremote); // 处理新的缩略图上传 if ($litpic_b64 != "") { diff --git a/src/dede/album_edit.php b/src/dede/album_edit.php index 782edb63..fe912ac2 100755 --- a/src/dede/album_edit.php +++ b/src/dede/album_edit.php @@ -117,7 +117,7 @@ else if($dopost=='save') $description = cn_substrR($description,250); $keywords = trim(cn_substrR($keywords,60)); $filename = trim(cn_substrR($filename,40)); - $isremote = (empty($isremote)? 0 : $isremote); + $isremote = 0; $serviterm=empty($serviterm)? "" : $serviterm; if(!TestPurview('a_Check,a_AccCheck,a_MyCheck')) { diff --git a/src/dede/archives_add.php b/src/dede/archives_add.php index d20c9ad6..53ebcf56 100755 --- a/src/dede/archives_add.php +++ b/src/dede/archives_add.php @@ -103,7 +103,7 @@ else if($dopost=='save') $keywords = cn_substrR($keywords,60); $filename = trim(cn_substrR($filename,40)); $userip = GetIP(); - $isremote = (empty($isremote)? 0 : $isremote); + $isremote = 0; $voteid = (empty($voteid)? 0 : $voteid); $serviterm=empty($serviterm)? "" : $serviterm; if(!TestPurview('a_Check,a_AccCheck,a_MyCheck')) diff --git a/src/dede/archives_edit.php b/src/dede/archives_edit.php index 5caedda4..c103e465 100755 --- a/src/dede/archives_edit.php +++ b/src/dede/archives_edit.php @@ -107,7 +107,7 @@ else if($dopost=='save') $description = cn_substrR($description, $cfg_auot_description); $keywords = trim(cn_substrR($keywords, 60)); $filename = trim(cn_substrR($filename, 40)); - $isremote = (empty($isremote)? 0 : $isremote); + $isremote = 0; $serviterm=empty($serviterm)? "" : $serviterm; if(!TestPurview('a_Check,a_AccCheck,a_MyCheck')) $arcrank = -1; diff --git a/src/dede/archives_sg_add.php b/src/dede/archives_sg_add.php index 99c42af1..33009ac3 100755 --- a/src/dede/archives_sg_add.php +++ b/src/dede/archives_sg_add.php @@ -79,7 +79,7 @@ else if($dopost=='save') $senddate = time(); if(empty($litpic_b64)) $litpic_b64 = ''; $title = cn_substrR($title,$cfg_title_maxlen); - $isremote = (empty($isremote)? 0 : $isremote); + $isremote = 0; $serviterm=empty($serviterm)? "" : $serviterm; if(!TestPurview('a_Check,a_AccCheck,a_MyCheck')) $arcrank = -1; diff --git a/src/dede/archives_sg_edit.php b/src/dede/archives_sg_edit.php index 8b8ad582..fd9261c1 100755 --- a/src/dede/archives_sg_edit.php +++ b/src/dede/archives_sg_edit.php @@ -77,7 +77,7 @@ else if($dopost=='save') if(empty($flags)) $flag = ''; else $flag = join(',', $flags); $title = cn_substrR($title, $cfg_title_maxlen); - $isremote = (empty($isremote)? 0 : $isremote); + $isremote = 0; $serviterm=empty($serviterm)? "" : $serviterm; if(empty($litpic_b64)) $litpic_b64 = ''; if(!TestPurview('a_Check,a_AccCheck,a_MyCheck')) $arcrank = -1; diff --git a/src/dede/article_add.php b/src/dede/article_add.php index b1216792..21dfa7c6 100755 --- a/src/dede/article_add.php +++ b/src/dede/article_add.php @@ -108,7 +108,7 @@ else if($dopost=='save') $keywords = cn_substrR($keywords,60); $filename = trim(cn_substrR($filename,40)); $userip = GetIP(); - $isremote = (empty($isremote)? 0 : $isremote); + $isremote = 0; $serviterm=empty($serviterm)? "" : $serviterm; if(!TestPurview('a_Check,a_AccCheck,a_MyCheck')) diff --git a/src/dede/article_edit.php b/src/dede/article_edit.php index 845f4108..657cac8c 100755 --- a/src/dede/article_edit.php +++ b/src/dede/article_edit.php @@ -114,7 +114,7 @@ else if($dopost=='save') $description = cn_substrR($description,250); $keywords = trim(cn_substrR($keywords,60)); $filename = trim(cn_substrR($filename,40)); - $isremote = (empty($isremote)? 0 : $isremote); + $isremote = 0; $serviterm=empty($serviterm)? "" : $serviterm; if(!TestPurview('a_Check,a_AccCheck,a_MyCheck')) { diff --git a/src/dede/config.php b/src/dede/config.php index e66b3036..94a245ea 100755 --- a/src/dede/config.php +++ b/src/dede/config.php @@ -222,31 +222,6 @@ function ClearOptCache() return FALSE; } -/** - * 更新会员模型缓存 - * - * @access public - * @return void - */ -function UpDateMemberModCache() -{ - global $dsql; - $cachefile = DEDEDATA.'/cache/member_model.inc'; - - $dsql->SetQuery("SELECT * FROM `#@__member_model` WHERE state='1'"); - $dsql->Execute(); - $fp1 = fopen($cachefile,'w'); - $phph = '?'; - $fp1Header = "<{$phph}php\r\nglobal \$_MemberMod;\r\n\$_MemberMod=array();\r\n"; - fwrite($fp1,$fp1Header); - while($row=$dsql->GetObject()) - { - fwrite($fp1,"\$_MemberMod[{$row->id}]=array('{$row->name}','{$row->table}');\r\n"); - } - fwrite($fp1,"{$phph}>"); - fclose($fp1); -} - /** * 引入模板文件 * @@ -260,45 +235,6 @@ function DedeInclude($filename, $isabs=FALSE) return $isabs ? $filename : DEDEADMIN.'/'.$filename; } -/** - * 获取当前用户的ftp站点 - * - * @access public - * @param string $current 当前站点 - * @param string $formname 表单名称 - * @return string - */ -function GetFtp($current='', $formname='') -{ - global $dsql; - $formname = empty($formname)? 'serviterm' : $formname; - $cuserLogin = new userLogin(); - $row=$dsql->GetOne("SELECT servinfo FROM `#@__multiserv_config`"); - $row['servinfo']=trim($row['servinfo']); - if(!empty($row['servinfo'])){ - $servinfos = explode("\n", $row['servinfo']); - $select=""; - echo '"; - } -} helper('cache'); /** * 根据用户mid获取用户名称 diff --git a/src/dede/css/base.css b/src/dede/css/base.css index 73618bcd..b3e3f73b 100755 --- a/src/dede/css/base.css +++ b/src/dede/css/base.css @@ -644,3 +644,6 @@ height: auto !important; .maintable { width: 98%!important; } +a.btn { + color: white!important; +} \ No newline at end of file diff --git a/src/dede/makehtml_archives_action.php b/src/dede/makehtml_archives_action.php index 56f26365..f40f2af9 100755 --- a/src/dede/makehtml_archives_action.php +++ b/src/dede/makehtml_archives_action.php @@ -25,9 +25,6 @@ $etime = (empty($etime) ? '' : $etime); $sstime = (empty($sstime) ? 0 : $sstime); $mkvalue = (empty($mkvalue) ? 0 : $mkvalue); -$isremote = (empty($isremote)? 0 : $isremote); -$serviterm = empty($serviterm)? "" : $serviterm; - //一键更新传递的参数 if(!empty($uptype)) { @@ -90,25 +87,13 @@ if($totalnum > 500 && empty($typeid)) } else { $dsql->Execute('out',"SELECT id FROM `#@__arctiny` $idsql $limitSql"); } -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!'); -} while($row=$dsql->GetObject('out')) { $tjnum++; $id = $row->id; $ac = new Archives($id); - $rurl = $ac->MakeHtml($isremote); + $rurl = $ac->MakeHtml(0); } $t2 = ExecTime(); @@ -120,7 +105,6 @@ $ttime = number_format(($ttime / 60),2); $tjlen = $totalnum>0 ? ceil( ($tjnum/$totalnum) * 100 ) : 100; $dvlen = $tjlen * 2; $tjsta = "
"; -if($cfg_remote_site=='Y' && $isremote=="1") $tjsta .= "
您已开启远程发布功能,生成速度会比较慢,请您耐心等待.."; $tjsta .= "
本次用时：".number_format($t2,2)."，总用时：$ttime 分钟，到达位置：".($startdd+$pagesize)."
完成创建文件总数的：$tjlen %，继续执行任务..."; @@ -137,7 +121,7 @@ if($tjnum < $totalnum) { $nurl = "makehtml_archives_action.php?endid=$endid&startid=$startid&typeid=$typeid"; $nurl .= "&totalnum=$totalnum&startdd=".($startdd+$pagesize)."&pagesize=$pagesize"; - $nurl .= "&seltime=$seltime&sstime=$sstime&stime=".urlencode($stime)."&etime=".urlencode($etime)."&uptype=$uptype&mkvalue=$mkvalue&isremote={$isremote}&serviterm={$serviterm}"; + $nurl .= "&seltime=$seltime&sstime=$sstime&stime=".urlencode($stime)."&etime=".urlencode($etime)."&uptype=$uptype&mkvalue=$mkvalue"; ShowMsg($tjsta,$nurl,0,100); exit(); } @@ -145,7 +129,7 @@ else { if($typeid!='') { - ShowMsg("生成文件：$totalnum 总用时：{$ttime} 分钟，现转向当前栏目更新>>","makehtml_list_action.php?typeid=$typeid&uptype=all&maxpagesize=50&upnext=1&isremote={$isremote}&serviterm={$serviterm}"); + ShowMsg("生成文件：$totalnum 总用时：{$ttime} 分钟，现转向当前栏目更新>>","makehtml_list_action.php?typeid=$typeid&uptype=all&maxpagesize=50&upnext=1"); } else { diff --git a/src/dede/makehtml_homepage.php b/src/dede/makehtml_homepage.php index 95d4e95a..3a8a31a7 100755 --- a/src/dede/makehtml_homepage.php +++ b/src/dede/makehtml_homepage.php @@ -24,7 +24,6 @@ if($dopost=="view") else if($dopost=="make") { $remotepos = empty($remotepos)? '/index.html' : $remotepos; - $isremote = empty($isremote)? 0 : $isremote; $serviterm = empty($serviterm)? "" : $serviterm; $homeFile = DEDEADMIN."/".$position; $homeFile = str_replace("\\","/",$homeFile); @@ -63,14 +62,6 @@ else if($dopost=="make") $config=array( 'hostname' => $servurl, 'username' => $servuser, 'password' => $servpwd,'debug' => 'TRUE'); } - //如果启用远程站点则上传 - if($cfg_remote_site=='Y' && $showmod==1) - { - if($ftp->connect($config) && $isremote == 1) - { - if($ftp->upload($position, $remotepos, 'ascii')) echo "远程发布成功!"."
"; - } - } exit(); } $row = $dsql->GetOne("SELECT * FROM #@__homepageset"); diff --git a/src/dede/makehtml_js_action.php b/src/dede/makehtml_js_action.php index eb6f82b6..56d90c9c 100755 --- a/src/dede/makehtml_js_action.php +++ b/src/dede/makehtml_js_action.php @@ -13,23 +13,9 @@ CheckPurview('sys_MakeHtml'); require_once(DEDEINC."/arc.partview.class.php"); if(empty($typeid)) $typeid = 0; -$isremote = empty($isremote)? 0 : $isremote; -$serviterm=empty($serviterm)? "" : $serviterm; if(empty($templet)) $templet = "plus/js.htm"; if(empty($uptype)) $uptype = "all"; -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!'); -} if($uptype == "all") { $row = $dsql->GetOne("SELECT id FROM #@__arctype WHERE id>'$typeid' AND ispart<>2 ORDER BY id ASC LIMIT 0,1;"); @@ -40,15 +26,15 @@ if($uptype == "all") } else { $pv = new PartView($row['id']); $pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet); - $pv->SaveToHtml($cfg_basedir.$cfg_cmspath."/data/js/".$row['id'].".js",$isremote); + $pv->SaveToHtml($cfg_basedir.$cfg_cmspath."/data/js/".$row['id'].".js", 0); $typeid = $row['id'];; - ShowMsg("成功更新".$cfg_cmspath."/data/js/".$row['id'].".js，继续进行操作！","makehtml_js_action.php?typeid=$typeid&isremote=$isremote&serviterm=$serviterm",0,100); + ShowMsg("成功更新".$cfg_cmspath."/data/js/".$row['id'].".js，继续进行操作！","makehtml_js_action.php?typeid=$typeid",0,100); exit(); } } else { $pv = new PartView($typeid); $pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet); - $pv->SaveToHtml($cfg_basedir.$cfg_cmspath."/data/js/".$typeid.".js",$isremote); + $pv->SaveToHtml($cfg_basedir.$cfg_cmspath."/data/js/".$typeid.".js", 0); echo "成功更新".$cfg_cmspath."/data/js/".$typeid.".js！"; echo "预览："; echo "
"; diff --git a/src/dede/makehtml_list_action.php b/src/dede/makehtml_list_action.php index 2885a5e4..d3e8c28c 100755 --- a/src/dede/makehtml_list_action.php +++ b/src/dede/makehtml_list_action.php @@ -22,9 +22,6 @@ if(!isset($uppage)) $uppage = 0; if(empty($maxpagesize)) $maxpagesize = 50; $adminID = $cuserLogin->getUserID(); -$isremote = (empty($isremote) ? 0 : $isremote); -$serviterm = empty($serviterm)? "" : $serviterm; - //检测获取所有栏目ID //普通生成或一键更新时更新所有栏目 if($gotype=='' || $gotype=='mkallct') @@ -102,27 +99,15 @@ if(!empty($tid)) $lv->CountRecord(); if($lv->TypeLink->TypeInfos['ispart']==0 && $lv->TypeLink->TypeInfos['isdefault']!=-1) $ntotalpage = $lv->TotalPage; else $ntotalpage = 1; - 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!'); - } //如果栏目的文档太多，分多批次更新 if($ntotalpage <= $maxpagesize || $lv->TypeLink->TypeInfos['ispart']!=0 || $lv->TypeLink->TypeInfos['isdefault']==-1) { - $reurl = $lv->MakeHtml('', '', $isremote); + $reurl = $lv->MakeHtml('', '', 0); $finishType = TRUE; } else { - $reurl = $lv->MakeHtml($mkpage, $maxpagesize, $isremote); + $reurl = $lv->MakeHtml($mkpage, $maxpagesize, 0); $finishType = FALSE; $mkpage = $mkpage + $maxpagesize; if( $mkpage >= ($ntotalpage+1) ) $finishType = TRUE; @@ -146,11 +131,11 @@ if($nextpage >= $totalpage && $finishType) } else { if($finishType) { - $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$nextpage&isremote={$isremote}&serviterm={$serviterm}"; + $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$nextpage"; ShowMsg("成功创建栏目：".$tid."，继续进行操作！",$gourl,0,100); exit(); } else { - $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&mkpage=$mkpage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$pageno&isremote={$isremote}&serviterm={$serviterm}"; + $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&mkpage=$mkpage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$pageno"; ShowMsg("栏目：".$tid."，继续进行操作...",$gourl,0,100); exit(); } diff --git a/src/dede/makehtml_map.php b/src/dede/makehtml_map.php index 42900348..e10425ea 100755 --- a/src/dede/makehtml_map.php +++ b/src/dede/makehtml_map.php @@ -17,7 +17,7 @@ if(empty($dopost)) ShowMsg("参数错误!","-1"); exit(); } -$isremote = empty($isremote)? 0 : $isremote; + $serviterm=empty($serviterm)? "" : $serviterm; $sm = new SiteMap(); $maplist = $sm->GetSiteMap($dopost); @@ -34,26 +34,6 @@ else $dtp = new DedeTagParse(); $dtp->LoadTemplet($tmpfile); $dtp->SaveTo($cfg_basedir.$murl); -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) ) - { - //分析远程文件路径 - $remotefile = $murl; - $localfile = '..'.$remotefile; - $remotedir = preg_replace('#[^\/]*\.html#', '', $remotefile); - $ftp->rmkdir($remotedir); - if($ftp->upload($localfile, $remotefile, 'acii')) echo "远程发布成功!"."
"; - } -} $dtp->Clear(); echo "成功更新文件: $murl 浏览..."; exit(); \ No newline at end of file diff --git a/src/dede/makehtml_rss_action.php b/src/dede/makehtml_rss_action.php index 7e1463c8..dc8268f7 100755 --- a/src/dede/makehtml_rss_action.php +++ b/src/dede/makehtml_rss_action.php @@ -11,31 +11,17 @@ require_once(dirname(__FILE__)."/config.php"); CheckPurview('sys_MakeHtml'); require_once(DEDEINC."/arc.rssview.class.php"); -$isremote = empty($isremote)? 0 : $isremote; -$serviterm = empty($serviterm)? "" : $serviterm; if(empty($tid)) $tid = 0; if(empty($maxrecord)) $maxrecord = 50; -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!'); -} $row = $dsql->GetOne("SELECT id FROM `#@__arctype` WHERE id>'$tid' AND ispart<>2 ORDER BY id ASC LIMIT 0,1;"); if(!is_array($row)) { echo "完成所有文件更新！"; } else { $rv = new RssView($row['id'],$maxrecord); - $rssurl = $rv->MakeRss($isremote); + $rssurl = $rv->MakeRss(0); $tid = $row['id']; - ShowMsg("成功更新".$rssurl."，继续进行操作！","makehtml_rss_action.php?tid=$tid&maxrecord=$maxrecord&isremote=$isremote&serviterm={$serviterm}",0,100); + ShowMsg("成功更新".$rssurl."，继续进行操作！","makehtml_rss_action.php?tid=$tid&maxrecord=$maxrecord",0,100); } \ No newline at end of file diff --git a/src/dede/makehtml_spec.php b/src/dede/makehtml_spec.php index 5c243bd2..eba04c99 100755 --- a/src/dede/makehtml_spec.php +++ b/src/dede/makehtml_spec.php @@ -10,27 +10,13 @@ */ require_once(dirname(__FILE__)."/config.php"); CheckPurview('sys_MakeHtml'); -$isremote = empty($isremote)? 0 : $isremote; -$serviterm = empty($serviterm)? "" : $serviterm; if(empty($dopost)) $dopost = ""; if($dopost=="ok") { require_once(DEDEINC."/arc.specview.class.php"); - 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!'); - } $sp = new SpecView(); - $rurl = $sp->MakeHtml($isremote); + $rurl = $sp->MakeHtml(0); echo "成功生成所有专题HTML列表！预览"; exit(); } diff --git a/src/dede/member_main.php b/src/dede/member_main.php index 33fa1d8d..d9aac378 100755 --- a/src/dede/member_main.php +++ b/src/dede/member_main.php @@ -83,12 +83,7 @@ if($whereSql!='') { $whereSql = ' WHERE '.$whereSql; } -$dsql->SetQuery("SELECT name FROM `#@__member_model`"); -$dsql->Execute(); -while($row = $dsql->GetArray()) -{ - $MemberModels[] = $row; -} + $sql = "SELECT * FROM `#@__member` $whereSql ORDER BY $sortkey DESC "; $dlist = new DataListCP(); $dlist->SetParameter('sex',$sex); diff --git a/src/dede/soft_add.php b/src/dede/soft_add.php index 73ed3393..e26d5ab3 100755 --- a/src/dede/soft_add.php +++ b/src/dede/soft_add.php @@ -101,7 +101,7 @@ else if($dopost=='save') $keywords = cn_substrR($keywords, 60); $filename = trim(cn_substrR($filename, 40)); $userip = GetIP(); - $isremote = (empty($isremote)? 0 : $isremote); + $isremote = 0; $serviterm=empty($serviterm)? "" : $serviterm; if(!TestPurview('a_Check,a_AccCheck,a_MyCheck')) { @@ -110,7 +110,10 @@ else if($dopost=='save') $adminid = $cuserLogin->getUserID(); //处理上传的缩略图 - if(empty($ddisremote)) $ddisremote = 0; + if(empty($ddisremote)) + { + $ddisremote = 0; + } $litpic = GetDDImage('none', $picname, $ddisremote); // 处理新的缩略图上传 if ($litpic_b64 != "") { @@ -286,20 +289,7 @@ else if($dopost=='save') //生成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(); - } - if(!$ftp->connect($config)) exit('Error:None FTP Connection!'); - } - - $arcUrl = MakeArt($arcID, TRUE, TRUE, $isremote); + $arcUrl = MakeArt($arcID, TRUE, TRUE, 0); if($arcUrl=='') { $arcUrl = $cfg_phpurl."/view.php?aid=$arcID"; diff --git a/src/dede/soft_edit.php b/src/dede/soft_edit.php index fcedbce6..18642237 100755 --- a/src/dede/soft_edit.php +++ b/src/dede/soft_edit.php @@ -146,7 +146,7 @@ else if($dopost=='save') $description = cn_substrR($description,$cfg_auot_description); $keywords = cn_substrR($keywords,60); $filename = trim(cn_substrR($filename,40)); - $isremote = (empty($isremote)? 0 : $isremote); + $isremote = 0; $serviterm=empty($serviterm)? "" : $serviterm; if(!TestPurview('a_Check,a_AccCheck,a_MyCheck')) { @@ -312,18 +312,7 @@ else if($dopost=='save') //生成HTML UpIndexKey($id, $arcrank, $typeid, $sortrank, $tags); - 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!'); - } + $arcUrl = MakeArt($id, TRUE, TRUE, $isremote); if($arcUrl=="") { diff --git a/src/dede/spec_add.php b/src/dede/spec_add.php index 4ed7d03d..0800efb7 100755 --- a/src/dede/spec_add.php +++ b/src/dede/spec_add.php @@ -66,13 +66,16 @@ else if($dopost=='save') $description = cn_substrR($description, $cfg_auot_description); $keywords = cn_substrR($keywords, 60); $filename = trim(cn_substrR($filename, 40)); - $isremote = (empty($isremote)? 0 : $isremote); + $isremote = 0; $serviterm=empty($serviterm)? "" : $serviterm; if(!TestPurview('a_Check,a_AccCheck,a_MyCheck')) $arcrank = -1; $adminid = $cuserLogin->getUserID(); //处理上传的缩略图 - if(empty($ddisremote)) $ddisremote = 0; + if(empty($ddisremote)) + { + $ddisremote = 0; + } $litpic = GetDDImage('none', $picname, $ddisremote); // 处理新的缩略图上传 if ($litpic_b64 != "") { @@ -218,18 +221,6 @@ else if($dopost=='save') //生成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(); - } - if(!$ftp->connect($config)) exit('Error:None FTP Connection!'); - } $artUrl = MakeArt($arcID, TRUE, TRUE, $isremote); if($artUrl=='') { diff --git a/src/dede/spec_edit.php b/src/dede/spec_edit.php index 89a581fb..8110b543 100755 --- a/src/dede/spec_edit.php +++ b/src/dede/spec_edit.php @@ -76,7 +76,7 @@ else if($dopost=='save') $description = cn_substrR($description, $cfg_auot_description); $keywords = trim(cn_substrR($keywords, 60)); $filename = trim(cn_substrR($filename, 40)); - $isremote = (empty($isremote)? 0 : $isremote); + $isremote = 0; $serviterm = empty($serviterm)? "" : $serviterm; if(!TestPurview('a_Check,a_AccCheck,a_MyCheck')) { @@ -265,18 +265,6 @@ else if($dopost=='save') //生成HTML UpIndexKey($id, $arcrank, $typeid, $sortrank, $tags); - 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!'); - } $artUrl = MakeArt($id, TRUE, TRUE, $isremote); if($artUrl=='') { diff --git a/src/dede/sys_multiserv.php b/src/dede/sys_multiserv.php deleted file mode 100755 index 8ef2bd83..00000000 --- a/src/dede/sys_multiserv.php +++ /dev/null @@ -1,73 +0,0 @@ -$c_rmhost, 'rmport'=>$c_rmport, - 'rmname'=>$c_rmname, 'rmpwd'=>$c_rmpwd)); - $query = "UPDATE `#@__multiserv_config` SET - `remoteuploads` = '$c_remoteuploads' , - `remoteupUrl` ='$c_remoteupUrl' , - `rminfo` = '$rminfo', - `servinfo` = '$c_servinfo'"; - $dsql->ExecuteNoneQuery($query); - //更新配置缓存文件 - - $configstr = "\$remoteuploads = '".$c_remoteuploads."';\r\n"; - $configstr .= "\$remoteupUrl = '".$c_remoteupUrl."';\r\n"; - $configstr .= "\$rmhost = '".$c_rmhost."';\r\n"; - $configstr .= "\$rmport = '".$c_rmport."';\r\n"; - $configstr .= "\$rmname = '".$c_rmname."';\r\n"; - $configstr .= "\$rmpwd = '".$c_rmpwd."';\r\n"; - $configstr = "<"."?php\r\n".$configstr."?".">\r\n"; - - $fp = fopen($configfile, "w") or die("写入文件 $safeconfigfile 失败，请检查权限！"); - fwrite($fp, $configstr); - fclose($fp); - - ShowMsg('成功保存参数！', 'sys_multiserv.php'); - exit(); -} - -//读取参数 -$row = $dsql->GetOne("SELECT * FROM `#@__multiserv_config` "); -if(!is_array($row)) -{ - $dsql->ExecuteNoneQuery("INSERT INTO `#@__multiserv_config` - (`remoteuploads`, `remoteupUrl`, `rminfo`, `servinfo`) - VALUES ('0','http://img.dedecms.com', '', '')" - ); - $row['remoteuploads'] = 1; - $row['remoteupUrl'] = 'http://img.dedecms.com'; - $row['rminfo'] = ''; - $row['servinfo'] = ''; -} -//对配置信息进行处理 -if(!empty($row['rminfo'])) -{ - $row['rminfo'] = unserialize($row['rminfo']); -} - -//获取会员列表 -$query = "SELECT #@__admin.*,#@__admintype.typename FROM #@__admin LEFT JOIN #@__admintype ON #@__admin.usertype = #@__admintype.rank"; -$dsql->SetQuery($query); -$dsql->Execute(); -while($row3 = $dsql->GetArray()) -{ - $adminLists[] = $row3; -} -include DedeInclude('templets/sys_multiserv.htm'); -exit(); \ No newline at end of file diff --git a/src/dede/templets/album_add.htm b/src/dede/templets/album_add.htm index adafa1ab..4921e857 100755 --- a/src/dede/templets/album_add.htm +++ b/src/dede/templets/album_add.htm @@ -227,14 +227,7 @@ echo "【选择副栏目】"; } ?> - 　 - >是否同步远程发布 + diff --git a/src/dede/templets/album_edit.htm b/src/dede/templets/album_edit.htm index 87fe7612..27908aeb 100755 --- a/src/dede/templets/album_edit.htm +++ b/src/dede/templets/album_edit.htm @@ -195,16 +195,7 @@ body { echo ''; ?> 快捷选择 - - > - 是否同步远程发布 - - + diff --git a/src/dede/templets/archives_add.htm b/src/dede/templets/archives_add.htm index 92eda1cf..0f9a9da5 100755 --- a/src/dede/templets/archives_add.htm +++ b/src/dede/templets/archives_add.htm @@ -224,14 +224,7 @@ echo "【选择副栏目】"; } ?> - 　 - >是否同步远程发布 + diff --git a/src/dede/templets/archives_edit.htm b/src/dede/templets/archives_edit.htm index 46da982f..2fb9137c 100755 --- a/src/dede/templets/archives_edit.htm +++ b/src/dede/templets/archives_edit.htm @@ -210,14 +210,7 @@ ?> 快捷选择 - 　 - >是否同步远程发布 + diff --git a/src/dede/templets/archives_sg_add.htm b/src/dede/templets/archives_sg_add.htm index a6f52026..e83c4207 100755 --- a/src/dede/templets/archives_sg_add.htm +++ b/src/dede/templets/archives_sg_add.htm @@ -182,13 +182,6 @@ function checkSubmit() 快捷选择  【栏目管理】  【增加大栏目】 - 　 - >是否同步远程发布 diff --git a/src/dede/templets/archives_sg_edit.htm b/src/dede/templets/archives_sg_edit.htm index 1a413035..ff65a6f9 100755 --- a/src/dede/templets/archives_sg_edit.htm +++ b/src/dede/templets/archives_sg_edit.htm @@ -172,13 +172,7 @@ function checkSubmit() echo ""; ?> 快捷选择 - 　 - >是否同步远程发布 + diff --git a/src/dede/templets/article_add.htm b/src/dede/templets/article_add.htm index f0869679..138fb5ac 100755 --- a/src/dede/templets/article_add.htm +++ b/src/dede/templets/article_add.htm @@ -253,14 +253,7 @@ echo "【选择副栏目】"; } ?> - 　 - >是否同步远程发布 + diff --git a/src/dede/templets/article_edit.htm b/src/dede/templets/article_edit.htm index 4656c500..6018fc19 100755 --- a/src/dede/templets/article_edit.htm +++ b/src/dede/templets/article_edit.htm @@ -229,17 +229,7 @@ 快捷选择 - - > - 是否同步远程发布 - - + diff --git a/src/dede/templets/makehtml_archives.htm b/src/dede/templets/makehtml_archives.htm index 11d1ef15..45679dee 100755 --- a/src/dede/templets/makehtml_archives.htm +++ b/src/dede/templets/makehtml_archives.htm @@ -53,16 +53,7 @@ - - -是否同步远程发布到 - - +   diff --git a/src/dede/templets/makehtml_homepage.htm b/src/dede/templets/makehtml_homepage.htm index bce121bd..6a8f9974 100755 --- a/src/dede/templets/makehtml_homepage.htm +++ b/src/dede/templets/makehtml_homepage.htm @@ -87,14 +87,6 @@ function SelectTemplets(fname)   - 　 - -是否同步远程发布 diff --git a/src/dede/templets/makehtml_js.htm b/src/dede/templets/makehtml_js.htm index 59f4118b..f4d542e0 100755 --- a/src/dede/templets/makehtml_js.htm +++ b/src/dede/templets/makehtml_js.htm @@ -71,13 +71,6 @@ function SelectTemplets(fname) - 　 - 是否同步远程发发布 - - diff --git a/src/dede/templets/makehtml_list.htm b/src/dede/templets/makehtml_list.htm index aae0b7d4..f2a89a32 100755 --- a/src/dede/templets/makehtml_list.htm +++ b/src/dede/templets/makehtml_list.htm @@ -52,16 +52,7 @@ - 　 - 是否同步远程发布 - - - + diff --git a/src/dede/templets/makehtml_map_guide.htm b/src/dede/templets/makehtml_map_guide.htm index 1708649d..2c8c4ea9 100755 --- a/src/dede/templets/makehtml_map_guide.htm +++ b/src/dede/templets/makehtml_map_guide.htm @@ -30,13 +30,6 @@ - 　 - 是否同步远程发发布 - - diff --git a/src/dede/templets/makehtml_rss.htm b/src/dede/templets/makehtml_rss.htm index bb3ff960..f0f993a2 100755 --- a/src/dede/templets/makehtml_rss.htm +++ b/src/dede/templets/makehtml_rss.htm @@ -25,13 +25,6 @@ - 　 - 是否同步远程发发布 - - diff --git a/src/dede/templets/makehtml_spec.htm b/src/dede/templets/makehtml_spec.htm index 00bc1447..e71bf709 100755 --- a/src/dede/templets/makehtml_spec.htm +++ b/src/dede/templets/makehtml_spec.htm @@ -26,13 +26,6 @@ - 　 - 是否同步远程发发布 - - diff --git a/src/dede/templets/makeremote_all.htm b/src/dede/templets/makeremote_all.htm index 301d9ed4..465f513b 100755 --- a/src/dede/templets/makeremote_all.htm +++ b/src/dede/templets/makeremote_all.htm @@ -61,9 +61,7 @@ function changeDopost(postval) [系统]' : '' ;?> diff --git a/src/dede/templets/sys_multiserv.htm b/src/dede/templets/sys_multiserv.htm deleted file mode 100755 index cc86e0ab..00000000 --- a/src/dede/templets/sys_multiserv.htm +++ /dev/null @@ -1,139 +0,0 @@ - - - - -服务器分布/远程 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
服务器分布/远程设置： 
在开启分布/远程设置后需要在栏目中对相关的站点进行设置，例如子域名、后台栏目生成
- 附件服务器设置：
是否启用附件服务器： - /> - 启用 - /> - 不启用 - 开启后附件将同步远程发布到附件服务器中
附件服务器域名：
远程服务器(FTP)： - - - - - - - - - - - - - - - - -
主机IP：
FTP端口：
FTP用户名
FTP密码
- 远程服务器列表：(FTP镜像) 添加的服务器配置将在前台远程发布中可选
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
名称： - - - 自定义文本编辑框
服务器IP：
- (格式：名称|服务器IP|FTP端口|FTP用户名|FTP密码|管理员,每行一条，以","结束)
FTP端口：
FTP用户名：
FTP密码：
管理员： -
(多选)
- -
- 　　　　 - -
- - diff --git a/src/install/sql-dftables.txt b/src/install/sql-dftables.txt index 0fed4041..2f35898f 100755 --- a/src/install/sql-dftables.txt +++ b/src/install/sql-dftables.txt @@ -766,15 +766,6 @@ CREATE TABLE `#@__mtypes` ( PRIMARY KEY (`mtypeid`) ) TYPE=MyISAM; -DROP TABLE IF EXISTS `#@__multiserv_config`; -CREATE TABLE `#@__multiserv_config` ( - `remoteuploads` smallint(6) NOT NULL default '0', - `remoteupUrl` text NOT NULL, - `rminfo` text, - `servinfo` mediumtext, - PRIMARY KEY (`remoteuploads`) -) TYPE=MyISAM; - DROP TABLE IF EXISTS `#@__myad`; CREATE TABLE `#@__myad` ( `aid` mediumint(8) unsigned NOT NULL auto_increment,