Merge branch 'adminstyle' into develop

src/system/archive/listview.class.php

@@ -1155,7 +1155,7 @@ class ListView
         $optionlist = '';
         //添加联动单筛选
         $pageaddurl = '';
-        foreach($_GET as $key => $value) {
+        foreach ($_GET as $key => $value) {
             $pageaddurl .= ($key!="tid" && $key!="TotalResult" && $key!="PageNo" && $key!="PageSize" && $key!="mod") ? "&".RemoveXSS($key)."=".RemoveXSS($value) : '';
         }
         //获得上页和下页的链接

src/system/extend.func.php

@@ -74,7 +74,7 @@ function obtainalt($newalt)
 //联动单筛选{dede:php}obtainfilter(模型id,类型,'字段1,字段2');{/dede:php}类型表示前台展现方式，对应case值，例如：文档模型style字段radio选项卡类型，列表附加字段类别添加style，标签调用{dede:php}obtainfilter(1,1,'style');{/dede:php}
 function obtainfilter($channelid, $type = 1, $fieldsnamef = '', $defaulttid = 0, $toptid = 0, $loadtype = 'autofield')
 {
-    global $dsql, $tid, $id, $aid;
+    global $dsql, $tid, $id, $aid, $cfg_rewrite;
     $tid = $defaulttid ? $defaulttid : $tid;
     if ($id != "" || $aid != "") {
         $arcid = $id != "" ? $id : $aid;
@@ -82,7 +82,11 @@ function obtainfilter($channelid, $type = 1, $fieldsnamef = '', $defaulttid = 0,
         $tid = $toptid == 0 ? $tidsq["typeid"] : $tidsq["topid"];
     }
     $nofilter = (isset($_REQUEST['TotalResult']) ? "&TotalResult=".$_REQUEST['TotalResult'] : '').(isset($_REQUEST['PageNo']) ? "&PageNo=".$_REQUEST['PageNo'] : '');
-    $filterarr = stripos($_SERVER['REQUEST_URI'], "list.php?tid=") ? str_replace($nofilter, '', $_SERVER['REQUEST_URI']) : $GLOBALS['cfg_cmsurl']."/apps/list.php?tid=".$tid;
+    if ($cfg_rewrite == 'Y') {
+        $filterarr = stripos($_SERVER['REQUEST_URI'], "list/") ? str_replace($nofilter, '', $_SERVER['REQUEST_URI']) : $GLOBALS['cfg_cmsurl']."/list/".$tid;
+    } else {
+        $filterarr = stripos($_SERVER['REQUEST_URI'], "list.php?tid=") ? str_replace($nofilter, '', $_SERVER['REQUEST_URI']) : $GLOBALS['cfg_cmsurl']."/apps/list.php?tid=".$tid;
+    }
     $cInfos = $dsql->GetOne("SELECT * FROM  `#@__channeltype` WHERE id='$channelid'");
     $fieldset=$cInfos['fieldset'];
     $dtp = new DedeTagParse();
@@ -93,7 +97,7 @@ function obtainfilter($channelid, $type = 1, $fieldsnamef = '', $defaulttid = 0,
         foreach($dtp->CTags as $tida=>$ctag)
         {
             $fieldsname = $fieldsnamef ? explode(",", $fieldsnamef) : explode(",", $ctag->GetName());
-            if (($loadtype!='autofield' || ($loadtype=='autofield' && $ctag->GetAtt('autofield')==1)) && in_array($ctag->GetName(), $fieldsname)) {
+            if (($loadtype != 'autofield' || ($loadtype == 'autofield' && $ctag->GetAtt('autofield') == 1)) && in_array($ctag->GetName(), $fieldsname)) {
                 $href1 = explode($ctag->GetName().'=', $filterarr);
                 $href2 = explode('&', $href1[1]);
                 $fields_value = $href2[0];