diff --git a/src/admin/archives_do.php b/src/admin/archives_do.php index c20860ad..8fdb41f7 100644 --- a/src/admin/archives_do.php +++ b/src/admin/archives_do.php @@ -227,7 +227,11 @@ else if ($dopost == "checkArchives") { while ($row = $dsql->GetArray('ckall')) { $aid = $row['id']; $maintable = (trim($row['maintable']) == '' ? '#@__archives' : trim($row['maintable'])); - $dsql->ExecuteNoneQuery("UPDATE `#@__arctiny` SET arcrank='0' WHERE id='$aid' "); + $indexedsql = ""; + if (TableHasField("#@__arctiny", "indexed")) { + $indexedsql = ", `indexed`=2 "; + } + $dsql->ExecuteNoneQuery("UPDATE `#@__arctiny` SET arcrank='0'{$indexedsql} WHERE id='$aid' "); if ($row['issystem'] == -1) { $dsql->ExecuteNoneQuery("UPDATE `".trim($row['addtable'])."` SET arcrank='0' WHERE aid='$aid' "); } else { @@ -235,6 +239,7 @@ else if ($dopost == "checkArchives") { } $dsql->ExecuteNoneQuery("UPDATE `#@__taglist` SET arcrank='0' WHERE aid='$aid' "); $pageurl = MakeArt($aid, false); + DedeSearchDo("add", array("id" => $aid)); } ShowMsg("成功审核指定文档", $ENV_GOBACK_URL); exit(); @@ -319,6 +324,7 @@ else if ($dopost == "checkArchives") { //更新网页 foreach ($okids as $aid) { $arc = new Archives($aid); + DedeSearchDo("update", array("id" => $aid)); $arc->MakeHtml(); } ShowMsg("成功移动".$j."个文档", $ENV_GOBACK_URL); @@ -340,6 +346,7 @@ else if ($dopost == 'return') { foreach ($qstrs as $aid) { $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET arcrank='-1',ismake='0' WHERE id='$aid'"); $dsql->ExecuteNoneQuery("UPDATE `#@__arctiny` SET `arcrank` = '-1' WHERE id = '$aid';"); + DedeSearchDo("add", array("id" => $aid)); } ShowMsg("成功还原指定文档", "recycling.php"); exit(); diff --git a/src/admin/inc/inc_batchup.php b/src/admin/inc/inc_batchup.php index 2d8d8932..3ab12731 100644 --- a/src/admin/inc/inc_batchup.php +++ b/src/admin/inc/inc_batchup.php @@ -97,6 +97,9 @@ function DelArc($aid, $type = 'ON', $onlyfile = FALSE, $recycle = 0) $intime = time(); $insql = "INSERT INTO `#@__search_sync` (`aid`, `add_at`) VALUES ({$aid}, $intime)"; $dsql->ExecuteNoneQuery($insql); + if (DEDEBIZSEARCH) { + DedeSearchDo("delete",array('id'=>$aid)); + } } if (empty($arcRow['money'])) $arcRow['money'] = 0; if (empty($arcRow['ismake'])) $arcRow['ismake'] = 1; diff --git a/src/admin/sys_admin_user_add.php b/src/admin/sys_admin_user_add.php index 4be80f23..1d1464cc 100644 --- a/src/admin/sys_admin_user_add.php +++ b/src/admin/sys_admin_user_add.php @@ -71,7 +71,7 @@ $randcode = mt_rand(10000, 99999); $safecode = substr(md5($cfg_cookie_encode.$randcode), 0, 24); $typeOptions = ''; //递归获取分类 -function getTypeOptions($id=0,$sep="└") +function getTypeOptions($id=0,$sep="└─") { global $dsql,$typeOptions; $dsql->SetQuery("SELECT id,typename,ispart FROM `#@__arctype` WHERE reid={$id} AND (ispart=0 OR ispart=1 OR ispart=2) ORDER BY sortrank"); diff --git a/src/admin/sys_admin_user_edit.php b/src/admin/sys_admin_user_edit.php index d8783a60..b8c1e176 100644 --- a/src/admin/sys_admin_user_edit.php +++ b/src/admin/sys_admin_user_edit.php @@ -111,7 +111,7 @@ if ($dopost == 'saveedit') { $randcode = mt_rand(10000, 99999); $safecode = substr(md5($cfg_cookie_encode.$randcode), 0, 24); //递归获取分类 -function getTypeOptions($id=0,$sep="└") +function getTypeOptions($id=0,$sep="└─") { global $dsql,$typeOptions,$typeids; $dsql->SetQuery("SELECT id,typename,ispart FROM `#@__arctype` WHERE reid={$id} AND (ispart=0 OR ispart=1 OR ispart=2) ORDER BY sortrank"); diff --git a/src/admin/sys_safetest.php b/src/admin/sys_safetest.php index ff7bef75..1158ead6 100644 --- a/src/admin/sys_safetest.php +++ b/src/admin/sys_safetest.php @@ -19,7 +19,7 @@ $del = new DedeHttpDown(); $del->OpenUrl($fileHashURL); $filelist = $del->GetJSON(); $offFiles = array(); -foreach ($filelist as $key => $ff) { +foreach ((array)$filelist as $key => $ff) { $offFiles[$ff->filename] = $ff->hash; } $alter = ''; diff --git a/src/admin/templets/index.htm b/src/admin/templets/index.htm index 40cfb104..e8d05977 100644 --- a/src/admin/templets/index.htm +++ b/src/admin/templets/index.htm @@ -46,7 +46,7 @@ -
+