安全模式调整

src/admin/css/frame.css

@@ -1 +1 @@
-*{margin:0;padding:0;letter-spacing:.4px;box-sizing:border-box}body{line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;overflow:hidden}body.hidemenu{background:none}a,a:hover{text-decoration:none}ul{list-style:none}input[type="text"],input[type="password"]{padding:.2rem;width:140px;height:20px;line-height:20px;font-size:12px;border-width:1px;border-style:solid;border-color:#fff;background:#fff;vertical-align:middle}input[type="text"]:focus,input[type="password"]:focus{box-shadow:none;outline:none}.head{position:relative;width:100%;height:90px;overflow:hidden;z-index:8}.top{height:50px;width:100%;background:linear-gradient(45deg,#008e38,#57960f 50%);overflow:hidden;clear:both}.top .top_logo{float:left;margin-left:30px}.top .top_dedebiz a{float:left;height:50px;line-height:50px;font-size:18px;font-weight:600;color:#fff}.top .top_version{float:left;margin-top:16px;margin-left:10px;color:#fff}.top .btn-primary{float:left;margin-top:8px;margin-left:10px;font-size:12px;color:#fff}.top .btn-warning{float:left;margin-top:8px;margin-left:10px;font-size:12px;color:#fff}.top .top_link{float:right;margin-right:30px}.top .top_link ul{float:left;height:50px;line-height:50px;overflow:hidden}.top .top_link ul li.welcome img{margin-right:10px;width:30px;height:30px;border-radius:50%;vertical-align:middle}.top .top_link ul li{float:left;color:#fff}.top .top_link ul li a{color:#fff;padding-left:20px}.top .top_link ul li a:hover{color:#ccc}.topnav{width:100%;height:40px;line-height:40px;background:#424b51;overflow:hidden}.topnav .menuact{float:left;padding-left:30px;overflow:hidden}.topnav .menuact a{padding-right:10px;color:#dee2e6;overflow:hidden}.topnav .menuact a:hover{color:#fff}.sysmsg{float:right;padding-right:30px;overflow:hidden}.scroll a{padding-left:10px;color:#dee2e6}body.showmenu .left{display:block}body.hidemenu .left{display:none}body.showmenu .right{left:220px}body.hidemenu .right{left:0}.left{position:absolute;top:90px;width:220px;left:0;bottom:0;z-index:7}.menu{height:100%}.menu iframe{height:100%;width:99.99%;z-index:20}.right{position:absolute;right:0;top:90px;bottom:0;z-index:7}.main{height:100%}.main iframe{width:99.99%;height:100%;z-index:20}.qucikmenu{position:absolute;right:10px;top:32px;z-index:9;display:none}.qucikmenu ul{width:110px;list-style:none;border:1px solid #E7E7E7;background:#fff}.qucikmenu ul li{display:block;text-align:left}.qucikmenu ul li a{display:block;padding:0 10px;height:30px;line-height:30px;color:#424b51}.qucikmenu ul li a:hover{background:#f8f8f8}.pagemask{position:absolute;display:none;width:100%;height:100%;background:#cdcdcd;opacity:.6;z-index:100}.iframemask{position:absolute;display:none;z-index:80;top:0;left:0;width:100%;height:100%;background:#fff;border:none;opacity:0}.allmenu{position:absolute;display:none;margin-left:-400px;padding:10px;width:800px;top:76px;left:50%;background:#fff;border-radius:.2rem;z-index:999}.allmenu .allmenu-box{margin:0 auto;text-align:left;overflow:hidden;padding-left:2px}.maptop{margin-left:-1px;padding-right:6px;padding-left:6px;float:left;width:130px;overflow:hidden}.maptop dt.bigitem{padding:6px 10px;line-height:18px;color:#fff;background:#424b51}.mapitem dt{line-height:30px;text-indent:10px;background:#EFF1F1}.mapitem ul{margin-top:10px;margin-bottom:10px}.mapitem ul li{text-indent:20px;line-height:24px;background:url(../../static/web/img/arrr.gif)0 8px no-repeat}.allmenu a{color:#424b51}.allmenu a:hover{color:#dc3545}#login .theme{margin-top:20px;padding:10px;width:70%;clear:both}#login .theme li{margin:10px 0;overflow:hidden}#login .theme span{display:inline-block;float:left;width:150px;height:26px;line-height:26px;color:#424b51;text-align:right}.allsearch{border:1px solid #fff;border-radius:.2rem}.np{margin-left:10px;width:40px;height:20px;line-height:20px;font-size:12px;color:#fff;background:#57960f;border-radius:.2rem;border:0;cursor:pointer}
+*{margin:0;padding:0;letter-spacing:.4px;box-sizing:border-box}body{line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;overflow:hidden}body.hidemenu{background:none}a,a:hover{text-decoration:none}ul{list-style:none}input[type="text"],input[type="password"]{padding:.2rem;width:140px;height:20px;line-height:20px;font-size:12px;border-width:1px;border-style:solid;border-color:#fff;background:#fff;vertical-align:middle}input[type="text"]:focus,input[type="password"]:focus{box-shadow:none;outline:none}.head{position:relative;width:100%;height:90px;overflow:hidden;z-index:8}.top{height:50px;width:100%;background:linear-gradient(45deg,#008e38,#57960f 50%);overflow:hidden;clear:both}.top .top_logo a{float:left;margin-left:30px;height:50px;line-height:50px;font-size:18px;font-weight:600;color:#fff}.top .top_version{float:left;margin-top:14px;margin-left:10px;color:#fff}.top .btn-primary{padding:1px 2px;line-height:12px;font-size:12px;color:#fff}.top .btn-warning{padding:1px 2px;line-height:12px;font-size:12px;color:#fff}.top .top_link{float:right;margin-right:30px}.top .top_link ul{float:left;height:50px;line-height:50px;overflow:hidden}.top .top_link ul li.welcome img{margin-right:10px;width:30px;height:30px;border-radius:50%;vertical-align:middle}.top .top_link ul li{float:left;color:#fff}.top .top_link ul li a{color:#fff;padding-left:20px}.top .top_link ul li a:hover{color:#ccc}.topnav{width:100%;height:40px;line-height:40px;background:#424b51;overflow:hidden}.topnav .menuact{float:left;padding-left:30px;overflow:hidden}.topnav .menuact a{padding-right:10px;color:#dee2e6;overflow:hidden}.topnav .menuact a:hover{color:#fff}.sysmsg{float:right;padding-right:30px;overflow:hidden}.scroll a{padding-left:10px;color:#dee2e6}body.showmenu .left{display:block}body.hidemenu .left{display:none}body.showmenu .right{left:220px}body.hidemenu .right{left:0}.left{position:absolute;top:90px;width:220px;left:0;bottom:0;z-index:7}.menu{height:100%}.menu iframe{height:100%;width:99.99%;z-index:20}.right{position:absolute;right:0;top:90px;bottom:0;z-index:7}.main{height:100%}.main iframe{width:99.99%;height:100%;z-index:20}.qucikmenu{position:absolute;right:10px;top:32px;z-index:9;display:none}.qucikmenu ul{width:110px;list-style:none;border:1px solid #E7E7E7;background:#fff}.qucikmenu ul li{display:block;text-align:left}.qucikmenu ul li a{display:block;padding:0 10px;height:30px;line-height:30px;color:#424b51}.qucikmenu ul li a:hover{background:#f8f8f8}.pagemask{position:absolute;display:none;width:100%;height:100%;background:#cdcdcd;opacity:.6;z-index:100}.iframemask{position:absolute;display:none;z-index:80;top:0;left:0;width:100%;height:100%;background:#fff;border:none;opacity:0}.allmenu{position:absolute;display:none;margin-left:-400px;padding:10px;width:800px;top:76px;left:50%;background:#fff;border-radius:.2rem;z-index:999}.allmenu .allmenu-box{margin:0 auto;text-align:left;overflow:hidden;padding-left:2px}.maptop{margin-left:-1px;padding-right:6px;padding-left:6px;float:left;width:130px;overflow:hidden}.maptop dt.bigitem{padding:6px 10px;line-height:18px;color:#fff;background:#424b51}.mapitem dt{line-height:30px;text-indent:10px;background:#EFF1F1}.mapitem ul{margin-top:10px;margin-bottom:10px}.mapitem ul li{text-indent:20px;line-height:24px;background:url(../../static/web/img/arrr.gif)0 8px no-repeat}.allmenu a{color:#424b51}.allmenu a:hover{color:#dc3545}#login .theme{margin-top:20px;padding:10px;width:70%;clear:both}#login .theme li{margin:10px 0;overflow:hidden}#login .theme span{display:inline-block;float:left;width:150px;height:26px;line-height:26px;color:#424b51;text-align:right}.allsearch{border:1px solid #fff;border-radius:.2rem}.np{margin-left:10px;width:40px;height:20px;line-height:20px;font-size:12px;color:#fff;background:#57960f;border-radius:.2rem;border:0;cursor:pointer}

src/admin/templets/index.htm

@@ -84,14 +84,13 @@
 		</div>
 		<div class="head">
 			<div class="top">
-				<div class="top_logo">
-					<span class="top_dedebiz"><a target="main" href="index_body.php"><?php echo $cfg_webname; ?>系统</a></span>
-					<span class="top_version">V<?php echo $cfg_version_detail; ?></span>
-					<span class="btn btn-primary btn-sm">安全</span>
-					<!-- <span class="btn btn-warning btn-sm">非安全</span> -->
+				<div class="top_logo"><a target="main" href="index_body.php"><?php echo $cfg_webname; ?>系统</a></div>
+				<div class="top_version">
+					<span class="btn btn-primary btn-sm">V<?php echo $cfg_version_detail; ?><span class="ml-1">安全<span></span>
+					<!-- <span class="btn btn-warning btn-sm">V<?php echo $cfg_version_detail; ?><span class="ml-1">非安全<span></span> -->
 				</div>
 				<div class="top_link">
-					<ul>
+					<ul class="mb-0">
 						<li class="welcome">
 							<a target="main" href="sys_admin_user_edit.php?id=<?php echo $cuserLogin->getUserID(); ?>&dopost=edit"><img src="../static/web/img/avatar.png" title="<?php echo $cuserLogin->getUserName(); ?>"><?php echo $cuserLogin->getUserName(); ?><?php if($cuserLogin->getUserType()==10) {echo "管理员";} else if($cuserLogin->getUserType()==5) {echo "频道员";} else {echo "信息员";}?></a>
 							<a href="exit.php">退出</a>

src/system/common.func.php

@@ -1,6 +1,6 @@
 <?php
 if (!defined('DEDEINC')) exit('dedebiz');
-// 显示类似BS的提示信息
+//显示类似BS的提示信息
 define('ALERT_PRIMARY', 1);
 define('ALERT_SECONDARY', 2);
 define('ALERT_SUCCESS', 3);
@@ -20,7 +20,7 @@ define('ALERT_COLORS', array(
     ALERT_DARK => array('#d3d3d4','#bcbebf','#141619'),
 ));
 define("ALERT_TPL", '<div style="width: 98%;margin: 0 auto;"><div style="font-size:12px;margin:1rem auto;color:~color~;background:~background~;border-color:~border~;position:relative;padding:.75rem 1.25rem;border:1px solid transparent;border-radius:.2rem">~content~</div></div>');
-// $content:内容 $type:alert类型
+//$content:内容 $type:alert类型
 function DedeAlert($content, $type = ALERT_PRIMARY)
 {
     $content = htmlspecialchars($content);
@@ -80,7 +80,7 @@ if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
         }
     }
 }
-// 一个支持在PHP Cli Server打印的方法
+//一个支持在PHP Cli Server打印的方法
 function var_dump_cli($val)
 {
     ob_start();
@@ -173,13 +173,13 @@ function helper($helpers)
     if (isset($_helpers[$helpers])) {
         return;
     }
-    if (file_exists(DEDEINC . '/helpers/' . $helpers . '.helper.php')) {
-        include_once(DEDEINC . '/helpers/' . $helpers . '.helper.php');
+    if (file_exists(DEDEINC.'/helpers/'.$helpers.'.helper.php')) {
+        include_once(DEDEINC.'/helpers/'.$helpers.'.helper.php');
         $_helpers[$helpers] = TRUE;
     }
     //无法载入小助手
     if (!isset($_helpers[$helpers])) {
-        exit('Unable to load the requested file: helpers/' . $helpers . '.helper.php');
+        exit('Unable to load the requested file: helpers/'.$helpers.'.helper.php');
     }
 }
 function dede_htmlspecialchars($str)
@@ -221,7 +221,7 @@ if (!function_exists('file_put_contents')) {
  */
 function UpdateStat()
 {
-    include_once(DEDEINC . "/inc/inc_stat.php");
+    include_once(DEDEINC."/inc/inc_stat.php");
     return SpUpdateStat();
 }
 $arrs1 = array();
@@ -249,7 +249,7 @@ function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0)
         $gourl = "javascript:history.go(-1);";
     }
     if ($gourl == '' || $onlymsg == 1) {
-        $msg = "<script>alert(\"" . str_replace("\"", "“", $msg) . "\");</script>";
+        $msg = "<script>alert(\"".str_replace("\"", "“", $msg)."\");</script>";
     } else {
         //当网址为:close::objname 时, 关闭父框架的id=objname元素
         if (preg_match('/close::/', $gourl)) {
@@ -263,7 +263,7 @@ function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0)
         $rmsg .= "document.write(\"<div class='tips'>";
         $rmsg .= "<div class='tips-head'><p>提示信息</p></div>\");";
         $rmsg .= "document.write(\"<div class='tips-box'>\");";
-        $rmsg .= "document.write(\"" . str_replace("\"", "“", $msg) . "\");";
+        $rmsg .= "document.write(\"".str_replace("\"", "“", $msg)."\");";
         $rmsg .= "document.write(\"";
         if ($onlymsg == 0) {
             if ($gourl != 'javascript:;' && $gourl != '') {
@@ -275,7 +275,7 @@ function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0)
         } else {
             $rmsg .= "</div>\");";
         }
-        $msg  = $htmlhead . $rmsg . $htmlfoot;
+        $msg  = $htmlhead.$rmsg.$htmlfoot;
     }
     echo $msg;
 }
@@ -329,8 +329,8 @@ function IsSSL()
 }
 //自定义函数接口
 //这里主要兼容早期的用户扩展,v5.7之后我们建议使用小助手helper进行扩展
-if (file_exists(DEDEINC . '/extend.func.php')) {
-    require_once(DEDEINC . '/extend.func.php');
+if (file_exists(DEDEINC.'/extend.func.php')) {
+    require_once(DEDEINC.'/extend.func.php');
 }
 /**
  * 添加多选联动筛选
@@ -380,8 +380,8 @@ function AddFilter($channelid, $type = 1, $fieldsnamef = "", $defaulttid = 0, $l
         $tidsq = $dsql->GetOne("SELECT typeid FROM `#@__archives` WHERE id='$id' ");
         $tid = $tidsq["typeid"];
     }
-    $nofilter = (isset($_REQUEST['TotalResult']) ? "&TotalResult=" . (int)$_REQUEST['TotalResult'] : '') . (isset($_REQUEST['PageNo']) ? "&PageNo=" . (int)$_REQUEST['PageNo'] : '');
-    $filterarr = string_filter(stripos($_SERVER['REQUEST_URI'], "list.php?tid=") ? str_replace($nofilter, '', $_SERVER['REQUEST_URI']) : $GLOBALS['cfg_cmsurl'] . "/apps/list.php?tid=" . $tid);
+    $nofilter = (isset($_REQUEST['TotalResult']) ? "&TotalResult=".(int)$_REQUEST['TotalResult'] : '').(isset($_REQUEST['PageNo']) ? "&PageNo=".(int)$_REQUEST['PageNo'] : '');
+    $filterarr = string_filter(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 = stripslashes($cInfos['fieldset']);
     $dtp = new DedeTagParse();
@@ -392,45 +392,45 @@ function AddFilter($channelid, $type = 1, $fieldsnamef = "", $defaulttid = 0, $l
         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)) {
-                $href1 = explode($ctag->GetName() . '=', $filterarr);
+                $href1 = explode($ctag->GetName().'=', $filterarr);
                 $href2 = explode('&', $href1[1]);
                 $fields_value = $href2[0];
                 $fields_value1 = explode('|', $fields_value);
-                $dede_addonfields .= '' . $ctag->GetAtt('itemname') . '：';
+                $dede_addonfields .= ''.$ctag->GetAtt('itemname').'：';
                 switch ($type) {
                     case 1:
-                        $dede_addonfields .= (preg_match("/&" . $ctag->GetName() . "=/is", $filterarr, $regm) ? '<a href="' . str_replace("&" . $ctag->GetName() . "=" . $fields_value, "", $filterarr) . '" style="display:inline-block;padding:.25rem .5rem;line-height:1.5;color:#fff;background:#28a745;border-color:#28a745;border-radius:.2rem">全部</a>' : '<span style="display:inline-block;padding:.25rem .5rem;line-height:1.5;color:#fff;background:#dc3545;border-color:#dc3545;border-radius:.2rem">全部</span>') . '&nbsp;';
+                        $dede_addonfields .= (preg_match("/&".$ctag->GetName()."=/is", $filterarr, $regm) ? '<a href="'.str_replace("&".$ctag->GetName()."=".$fields_value, "", $filterarr).'" style="display:inline-block;padding:.25rem .5rem;line-height:1.5;color:#fff;background:#28a745;border-color:#28a745;border-radius:.2rem">全部</a>' : '<span style="display:inline-block;padding:.25rem .5rem;line-height:1.5;color:#fff;background:#dc3545;border-color:#dc3545;border-radius:.2rem">全部</span>').'&nbsp;';
                         $addonfields_items = explode(",", $ctag->GetAtt('default'));
                         for ($i = 0; $i < count($addonfields_items); $i++) {
-                            $href = stripos($filterarr, $ctag->GetName() . '=') ? str_replace("=" . $fields_value, "=" . $fields_value . "|" . urlencode($addonfields_items[$i]), $filterarr) : $filterarr . '&' . $ctag->GetName() . '=' . urlencode($addonfields_items[$i]);
+                            $href = stripos($filterarr, $ctag->GetName().'=') ? str_replace("=".$fields_value, "=".$fields_value."|".urlencode($addonfields_items[$i]), $filterarr) : $filterarr.'&'.$ctag->GetName().'='.urlencode($addonfields_items[$i]);
                             $is_select = in_array(urlencode($addonfields_items[$i]), $fields_value1) ? 1 : 0;
                             $fields_value2 = "";
                             for ($j = 0; $j < count($fields_value1); $j++) {
-                                $fields_value2 .= $fields_value1[$j] != urlencode($addonfields_items[$i]) ? $fields_value1[$j] . ($j < count($fields_value1) - 1 ? "|" : "") : "";
+                                $fields_value2 .= $fields_value1[$j] != urlencode($addonfields_items[$i]) ? $fields_value1[$j].($j < count($fields_value1) - 1 ? "|" : "") : "";
                             }
                             $fields_value2 = rtrim($fields_value2, "|");
-                            $href3 = str_replace(array("&" . $ctag->GetName() . "=" . $fields_value, $ctag->GetName() . "=" . $fields_value, "&" . $ctag->GetName() . "=&"), array("&" . $ctag->GetName() . "=" . $fields_value2, $ctag->GetName() . "=" . $fields_value2, "&"), $filterarr);
-                            $href3 = !end(explode("=", $href3)) ? str_replace("&" . end(explode("&", $href3)), "", $href3) : $href3;
+                            $href3 = str_replace(array("&".$ctag->GetName()."=".$fields_value, $ctag->GetName()."=".$fields_value, "&".$ctag->GetName()."=&"), array("&".$ctag->GetName()."=".$fields_value2, $ctag->GetName()."=".$fields_value2, "&"), $filterarr);
+                            $href3 = !end(explode("=", $href3)) ? str_replace("&".end(explode("&", $href3)), "", $href3) : $href3;
 
-                            $dede_addonfields .= ($fields_value != urlencode($addonfields_items[$i]) && $is_select != 1 ? '<a title="' . $addonfields_items[$i] . '" href="' . $href . '" style="display:inline-block;padding:.25rem .5rem;line-height:1.5;color:#fff;background:#28a745;border-color:#28a745;border-radius:.2rem">' . $addonfields_items[$i] . '</a>' : '<a title="' . $addonfields_items[$i] . '" href="' . $href3 . '" style="display:inline-block;padding:.25rem .5rem;line-height:1.5;color:#fff;background:#dc3545;border-color:#dc3545;border-radius:.2rem">' . $addonfields_items[$i] . '<span style="margin-left:6px;color:#fff">×</span></a>') . "&nbsp;";
+                            $dede_addonfields .= ($fields_value != urlencode($addonfields_items[$i]) && $is_select != 1 ? '<a title="'.$addonfields_items[$i].'" href="'.$href.'" style="display:inline-block;padding:.25rem .5rem;line-height:1.5;color:#fff;background:#28a745;border-color:#28a745;border-radius:.2rem">'.$addonfields_items[$i].'</a>' : '<a title="'.$addonfields_items[$i].'" href="'.$href3.'" style="display:inline-block;padding:.25rem .5rem;line-height:1.5;color:#fff;background:#dc3545;border-color:#dc3545;border-radius:.2rem">'.$addonfields_items[$i].'<span style="margin-left:6px;color:#fff">×</span></a>')."&nbsp;";
                         }
                         $dede_addonfields .= '<br><br>';
                         break;
                     case 2:
-                        $dede_addonfields .= (preg_match("/&" . $ctag->GetName() . "=/is", $filterarr, $regm) ? '<a href="' . str_replace("&" . $ctag->GetName() . "=" . $fields_value, "", $filterarr) . '">全部</a>' : '<span>全部</span>') . '&nbsp;';
+                        $dede_addonfields .= (preg_match("/&".$ctag->GetName()."=/is", $filterarr, $regm) ? '<a href="'.str_replace("&".$ctag->GetName()."=".$fields_value, "", $filterarr).'">全部</a>' : '<span>全部</span>').'&nbsp;';
                         $addonfields_items = explode(",", $ctag->GetAtt('default'));
                         for ($i = 0; $i < count($addonfields_items); $i++) {
-                            $href = stripos($filterarr, $ctag->GetName() . '=') ? str_replace("=" . $fields_value, "=" . $fields_value . "|" . urlencode($addonfields_items[$i]), $filterarr) : $filterarr . '&' . $ctag->GetName() . '=' . urlencode($addonfields_items[$i]);
+                            $href = stripos($filterarr, $ctag->GetName().'=') ? str_replace("=".$fields_value, "=".$fields_value."|".urlencode($addonfields_items[$i]), $filterarr) : $filterarr.'&'.$ctag->GetName().'='.urlencode($addonfields_items[$i]);
                             $is_select = in_array(urlencode($addonfields_items[$i]), $fields_value1) ? 1 : 0;
                             $fields_value2 = "";
                             for ($j = 0; $j < count($fields_value1); $j++) {
-                                $fields_value2 .= $fields_value1[$j] != urlencode($addonfields_items[$i]) ? $fields_value1[$j] . ($j < count($fields_value1) - 1 ? "|" : "") : "";
+                                $fields_value2 .= $fields_value1[$j] != urlencode($addonfields_items[$i]) ? $fields_value1[$j].($j < count($fields_value1) - 1 ? "|" : "") : "";
                             }
                             $fields_value2 = rtrim($fields_value2, "|");
-                            $href3 = str_replace(array("&" . $ctag->GetName() . "=" . $fields_value, $ctag->GetName() . "=" . $fields_value, "&" . $ctag->GetName() . "=&"), array("&" . $ctag->GetName() . "=" . $fields_value2, $ctag->GetName() . "=" . $fields_value2, "&"), $filterarr);
-                            $href3 = !end(explode("=", $href3)) ? str_replace("&" . end(explode("&", $href3)), "", $href3) : $href3;
+                            $href3 = str_replace(array("&".$ctag->GetName()."=".$fields_value, $ctag->GetName()."=".$fields_value, "&".$ctag->GetName()."=&"), array("&".$ctag->GetName()."=".$fields_value2, $ctag->GetName()."=".$fields_value2, "&"), $filterarr);
+                            $href3 = !end(explode("=", $href3)) ? str_replace("&".end(explode("&", $href3)), "", $href3) : $href3;
 
-                            $dede_addonfields .= ($fields_value != urlencode($addonfields_items[$i]) && $is_select != 1 ? '<input type="checkbox" title="' . $addonfields_items[$i] . '" value="' . $href . '" onclick="window.location=this.value">&nbsp;<a title="' . $addonfields_items[$i] . '" href="' . $href . '">' . $addonfields_items[$i] . '</a>' : '<input type="checkbox" checked="checked" title="' . $addonfields_items[$i] . '" value="' . $href3 . '" onclick="window.location=this.value">&nbsp;<a title="' . $addonfields_items[$i] . '" href="' . $href3 . '" class="cur">' . $addonfields_items[$i] . '</a>') . "&nbsp;";
+                            $dede_addonfields .= ($fields_value != urlencode($addonfields_items[$i]) && $is_select != 1 ? '<input type="checkbox" title="'.$addonfields_items[$i].'" value="'.$href.'" onclick="window.location=this.value">&nbsp;<a title="'.$addonfields_items[$i].'" href="'.$href.'">'.$addonfields_items[$i].'</a>' : '<input type="checkbox" checked="checked" title="'.$addonfields_items[$i].'" value="'.$href3.'" onclick="window.location=this.value">&nbsp;<a title="'.$addonfields_items[$i].'" href="'.$href3.'" class="cur">'.$addonfields_items[$i].'</a>')."&nbsp;";
                         }
                         $dede_addonfields .= '<br><br>';
                         break;