diff --git a/src/admin/catalog_edit.php b/src/admin/catalog_edit.php index acbf3df3..33493aaa 100644 --- a/src/admin/catalog_edit.php +++ b/src/admin/catalog_edit.php @@ -15,7 +15,7 @@ $id = isset($id) ? intval($id) : 0; //检查权限许可 CheckPurview('t_Edit,t_AccEdit'); //检查栏目操作许可 -CheckCatalog($id, '您无权更改本栏目'); +CheckCatalog($id, '您无权修改本栏目'); /*----------------------- function action_save() ----------------------*/ @@ -57,7 +57,7 @@ if ($dopost == "save") { $uptopsql WHERE id='$id' "; if (!$dsql->ExecuteNoneQuery($upquery)) { - ShowMsg("保存当前栏目更改时失败,请检查您的输入资料是否存在问题", "-1"); + ShowMsg("保存当前栏目修改时失败,请检查您的输入资料是否存在问题", "-1"); exit(); } //如果选择子栏目可投稿,更新顶级栏目为可投稿 @@ -70,7 +70,7 @@ if ($dopost == "save") { $upquery = "UPDATE `#@__arctype` SET moresite='$moresite', siteurl='$siteurl',sitepath='$sitepath',ishidden='$ishidden' WHERE 1=1 AND $slinks"; $dsql->ExecuteNoneQuery($upquery); } - //更改子栏目属性 + //修改子栏目属性 if (!empty($upnext)) { $upquery = "UPDATE `#@__arctype` SET issend='$issend', @@ -84,12 +84,12 @@ if ($dopost == "save") { ishidden='$ishidden' WHERE 1=1 AND $slinks"; if (!$dsql->ExecuteNoneQuery($upquery)) { - ShowMsg("更改当前栏目成功,但更改下级栏目属性时失败", "-1"); + ShowMsg("修改当前栏目成功,但修改下级栏目属性时失败", "-1"); exit(); } } UpDateCatCache(); - ShowMsg("成功更改一个分类", "catalog_main.php"); + ShowMsg("成功修改一个分类", "catalog_main.php"); exit(); } //End Save Action else if ($dopost == "savetime") { @@ -119,11 +119,11 @@ else if ($dopost == "savetime") { corank='$corank' $uptopsql WHERE id='$id' "; if (!$dsql->ExecuteNoneQuery($upquery)) { - ShowMsg("保存当前栏目更改时失败,请检查您的输入资料是否存在问题", "-1"); + ShowMsg("保存当前栏目修改时失败,请检查您的输入资料是否存在问题", "-1"); exit(); } UpDateCatCache(); - ShowMsg("成功更改一个分类", "catalog_main.php"); + ShowMsg("成功修改一个分类", "catalog_main.php"); exit(); } //读取栏目信息 diff --git a/src/admin/content_list.php b/src/admin/content_list.php index f6b21fe6..660ce0e9 100644 --- a/src/admin/content_list.php +++ b/src/admin/content_list.php @@ -14,22 +14,17 @@ require_once(dirname(__FILE__).'/config.php'); require_once(DEDEINC.'/typelink.class.php'); require_once(DEDEINC.'/datalistcp.class.php'); require_once(DEDEADMIN.'/inc/inc_list_functions.php'); - $cid = isset($cid) ? intval($cid) : 0; $channelid = isset($channelid) ? intval($channelid) : 0; $mid = isset($mid) ? intval($mid) : 0; - if (!isset($keyword)) $keyword = ''; if (!isset($flag)) $flag = ''; if (!isset($f)) $f = ''; if (!isset($arcrank)) $arcrank = ''; if (!isset($dopost)) $dopost = ''; - $arcrank = RemoveXSS($arcrank); - //检查权限许可,总权限 CheckPurview('a_List,a_AccList,a_MyList'); - //栏目浏览许可 $userCatalogSql = ''; if (TestPurview('a_List')) {; @@ -47,7 +42,6 @@ $adminid = $cuserLogin->getUserID(); $maintable = '#@__archives'; setcookie('ENV_GOBACK_URL', $dedeNowurl, time() + 3600, '/'); $tl = new TypeLink($cid); - //---------------------------------------- //在不指定排序条件和关键字的情况下直接统计微表 //---------------------------------------- @@ -86,7 +80,6 @@ if (empty($totalresult) && empty($keyword) && empty($orderby) && empty($flag)) { $arr = $dsql->GetOne($sql); $totalresult = $arr['dd']; } - if ($cid == 0) { if ($channelid == 0) { $positionname = '所有栏目>'; @@ -99,7 +92,6 @@ if ($cid == 0) { } else { $positionname = str_replace($cfg_list_symbol, " > ", $tl->GetPositionName())." > "; } - //当选择的是单表模型栏目时,直接跳转到单表模型管理区 if ( empty($channelid) @@ -111,12 +103,9 @@ if ($channelid < -1) { header("location:content_sg_list.php?f=$f&cid=$cid&channelid=$channelid&keyword=$keyword"); exit(); } - - //栏目大于800则需要缓存数据 $optHash = md5($cid.serialize($admin_catalogs).$channelid); $optCache = DEDEDATA."/tplcache/inc_option_$optHash.inc"; - $typeCount = 0; if (file_exists($cache1)) require_once($cache1); else $cfg_Cs = array(); @@ -131,16 +120,12 @@ if ($typeCount > 800) { } else { $optionarr = $tl->GetOptionArray($cid, $admin_catalogs, $channelid); } - $whereSql = empty($channelid) ? " WHERE arc.channel > 0 AND arc.arcrank > -2 " : " WHERE arc.channel = '$channelid' AND arc.arcrank > -2 "; - $flagsArr = ''; $dsql->Execute('f', 'SELECT * FROM `#@__arcatt` ORDER BY sortid ASC'); while ($frow = $dsql->GetArray('f')) { $flagsArr .= ($frow['att'] == $flag ? "\r\n" : "\r\n"); } - - if (!empty($userCatalogSql)) { $whereSql .= " AND ".$userCatalogSql; } @@ -162,22 +147,17 @@ if ($arcrank != '') { } else { $CheckUserSend = ""; } - $orderby = empty($orderby) ? 'id' : preg_replace("#[^a-z0-9]#", "", $orderby); $orderbyField = 'arc.'.$orderby; - $query = "SELECT arc.id,arc.typeid,arc.senddate,arc.flag,arc.ismake, arc.channel,arc.arcrank,arc.click,arc.title,arc.color,arc.litpic,arc.pubdate,arc.mid FROM `$maintable` arc $whereSql ORDER BY $orderbyField DESC"; - if (empty($f) || !preg_match("#form#", $f)) $f = 'form1.arcid1'; - //初始化 $dlist = new DataListCP(); -$dlist->pageSize = 30; - +$dlist->pageSize = 40; //GET参数 $dlist->SetParameter('dopost', 'listArchives'); $dlist->SetParameter('keyword', $keyword); @@ -188,15 +168,11 @@ $dlist->SetParameter('orderby', $orderby); $dlist->SetParameter('arcrank', $arcrank); $dlist->SetParameter('channelid', $channelid); $dlist->SetParameter('f', $f); - //模板 if (empty($s_tmplets)) $s_tmplets = 'templets/content_list.htm'; $dlist->SetTemplate(DEDEADMIN.'/'.$s_tmplets); - //查询 $dlist->SetSource($query); - //显示 $dlist->Display(); -//echo $dlist->queryTime; -$dlist->Close(); +$dlist->Close(); \ No newline at end of file