问题修复

src/admin/archives_do.php

@@ -65,7 +65,7 @@ function viewArchives(){ }
 else if ($dopost == "viewArchives") {
     $aid = preg_replace("#[^0-9]#", '', $aid);
     //获取主表信息
-    $query = "SELECT arc.*,ch.maintable,ch.addtable,ch.issystem,ch.editcon,tp.typedir,tp.typename,tp.corank,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.sitepath,tp.siteurl FROM `#@__arctiny` arc LEFT JOIN `#@__arctype` tp ON tp.id=arc.typeid LEFT JOIN `#@__channeltype` ch ON ch.id=tp.channeltype WHERE arc.id='$aid' ";
+    $query = "SELECT arc.*,ch.maintable,ch.addtable,ch.issystem,ch.editcon,tp.typedir,tp.typename,tp.corank,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.sitepath,tp.siteurl FROM `#@__arctiny` arc LEFT JOIN `#@__arctype` tp ON tp.id=arc.typeid LEFT JOIN `#@__channeltype` ch ON ch.id=tp.channeltype WHERE arc.id='$aid'";
     $trow = $dsql->GetOne($query);
     $trow['maintable'] = (trim($trow['maintable']) == '' ? '#@__archives' : trim($trow['maintable']));
     if ($trow['issystem'] != -1) {

src/admin/templets/index_menu.htm

@@ -34,6 +34,10 @@
 				};
 			}	
 			var menu = new menu($('#menu'), false);
+			$(".submenu li a").click(function(e){
+				$(".submenu li").removeClass('active');
+				$(this).parent().addClass('active');
+			})
 		});
 		</script>
 	</body>

src/install/v57sp2_to_v6.txt → src/install/update.txt

@@ -1,19 +1,43 @@
-ALTER TABLE `#@__arctype` CHANGE `namegk` `cnoverview` CHAR(255) NOT NULL DEFAULT '';
-ALTER TABLE `#@__arctype` CHANGE `ennamegk` `enoverview` CHAR(255) NOT NULL DEFAULT '';
-DELETE FROM `#@__sysconfig` WHERE `#@__sysconfig`.`varname` = 'cfg_disable_funs';
-DELETE FROM `#@__sysconfig` WHERE `#@__sysconfig`.`varname` = 'cfg_disable_tags';
-DELETE FROM `#@__sysconfig` WHERE `#@__sysconfig`.`varname` = 'cfg_vdcode_member';
+-- 6.0.2
+ALTER TABLE `#@__tagindex` ADD COLUMN `keywords` VARCHAR(255) NULL DEFAULT NULL AFTER `tag`;
+ALTER TABLE `#@__tagindex` ADD COLUMN `description` VARCHAR(255) NULL DEFAULT NULL AFTER `keywords`;
+ALTER TABLE `#@__tagindex` ADD COLUMN `title` VARCHAR(255) NULL DEFAULT NULL AFTER `description`;
+ALTER TABLE `#@__tagindex` ADD COLUMN `tag_pinyin` VARCHAR(255) NULL DEFAULT NULL AFTER `title`;
 
-ALTER TABLE `#@__archives` MODIFY COLUMN `title` varchar(255) NOT NULL DEFAULT '' AFTER `money`;
-ALTER TABLE `#@__arctype` MODIFY COLUMN `typename` varchar(255) NOT NULL DEFAULT '' AFTER `sortrank`;
-ALTER TABLE `#@__admin` ADD COLUMN `pwd_new` varchar(120) NOT NULL DEFAULT '' AFTER `pwd`;
-ALTER TABLE `#@__member` ADD COLUMN `pwd_new` varchar(120) NOT NULL DEFAULT '' AFTER `pwd`;
+-- 6.0.3
+ALTER TABLE `#@__tagindex`
+  ADD COLUMN `uptime` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `addtime`,
+  ADD COLUMN `mktime` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `uptime`;
+ALTER TABLE `#@__feedback`
+  ADD COLUMN `fid` INT UNSIGNED NOT NULL DEFAULT 0 AFTER `aid`;
+ALTER TABLE `#@__feedback`
+  ADD COLUMN `replycount` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `dtime`;
+INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ( 'cfg_feedback_msglen', '评论内容字数限定', 5, 'number', '200');
+INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ( 'cfg_auth_code', '商业版授权码', 1, 'string', '');
+INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ( 'cfg_bizcore_hostname', 'DedeBIZ Core地址', 1, 'string', '127.0.0.1');
+INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ( 'cfg_bizcore_port', 'DedeBIZ Core端口', 1, 'number', '8181');
+INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ( 'cfg_bizcore_appid', 'DedeBIZ Core应用ID', 1, 'string', '');
+INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ( 'cfg_bizcore_key', 'DedeBIZ Core通信密钥', 1, 'string', '');
+CREATE TABLE `#@__feedback_goodbad` (
+  `fgid` INT(11) NOT NULL AUTO_INCREMENT,
+  `mid` INT(11) NOT NULL DEFAULT '0',
+  `fid` INT(11) NOT NULL DEFAULT '0',
+  `fgtype` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '0:good 1:bad',
+  PRIMARY KEY (`fgid`)
+) ENGINE=MyISAM;
+CREATE TABLE `#@__search_limits` (
+  `ip` VARCHAR(200) NOT NULL,
+  `searchtime` INT(11) NULL DEFAULT NULL,
+  PRIMARY KEY (`ip`)
+) ENGINE=MyISAM;
 
-INSERT INTO `#@__sysconfig` VALUES ('151', 'cfg_tags_dir', '标签生成目录', 7, 'string', '{cmspath}/a/tags');
-ALTER TABLE `#@__tagindex` DROP COLUMN `tag_pinyin`;
+-- 6.1.0
+ALTER TABLE `#@__arctype`
+  ADD COLUMN `namegk` varchar(255) NULL AFTER `typename`,
+  ADD COLUMN `enname` varchar(255) NULL AFTER `namegk`,
+  ADD COLUMN `ennamegk` varchar(255) NULL AFTER `enname`,
+  ADD COLUMN `litpic` varchar(255) NULL AFTER `ennamegk`,
+  ADD COLUMN `litimg` varchar(255) NULL AFTER `litpic`;
 
 -- 6.1.7
 CREATE TABLE `#@__statistics` (
@@ -61,43 +85,20 @@ ALTER TABLE `#@__dl_log` MODIFY COLUMN `ip` char(46) NOT NULL AFTER `id`;
 ALTER TABLE `#@__arctype` CHANGE `litpic` `bigpic` CHAR(255) NOT NULL DEFAULT '';
 ALTER TABLE `#@__addoninfos` MODIFY COLUMN `nativeplace` char(20) NOT NULL DEFAULT 0 AFTER `badpost`;
 
-ALTER TABLE `#@__arctype`
-  ADD COLUMN `namegk` varchar(255) NULL AFTER `typename`,
-  ADD COLUMN `enname` varchar(255) NULL AFTER `namegk`,
-  ADD COLUMN `ennamegk` varchar(255) NULL AFTER `enname`,
-  ADD COLUMN `litpic` varchar(255) NULL AFTER `ennamegk`,
-  ADD COLUMN `litimg` varchar(255) NULL AFTER `litpic`;
+-- 6.1.8
+INSERT INTO `#@__sysconfig` VALUES ('151', 'cfg_tags_dir', '标签生成目录', 7, 'string', '{cmspath}/a/tags');
+ALTER TABLE `#@__tagindex` DROP COLUMN `tag_pinyin`;
 
-ALTER TABLE `#@__tagindex`
-  ADD COLUMN `uptime` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `addtime`,
-  ADD COLUMN `mktime` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `uptime`;
-ALTER TABLE `#@__feedback`
-  ADD COLUMN `fid` INT UNSIGNED NOT NULL DEFAULT 0 AFTER `aid`;
-ALTER TABLE `#@__feedback`
-  ADD COLUMN `replycount` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `dtime`;
-INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ( 'cfg_feedback_msglen', '评论文档字数限定', 5, 'number', '200');
-INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ( 'cfg_auth_code', '商业版授权码', 1, 'string', '');
-INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ( 'cfg_bizcore_hostname', 'DedeBIZ Core地址', 1, 'string', '127.0.0.1');
-INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ( 'cfg_bizcore_port', 'DedeBIZ Core端口', 1, 'number', '8181');
-INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ( 'cfg_bizcore_appid', 'DedeBIZ Core应用ID', 1, 'string', '');
-INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ( 'cfg_bizcore_key', 'DedeBIZ Core通信密钥', 1, 'string', '');
-CREATE TABLE `#@__feedback_goodbad` (
-  `fgid` INT(11) NOT NULL AUTO_INCREMENT,
-  `mid` INT(11) NOT NULL DEFAULT '0',
-  `fid` INT(11) NOT NULL DEFAULT '0',
-  `fgtype` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '0:good 1:bad',
-  PRIMARY KEY (`fgid`)
-) ENGINE=MyISAM;
-CREATE TABLE `#@__search_limits` (
-  `ip` VARCHAR(200) NOT NULL,
-  `searchtime` INT(11) NULL DEFAULT NULL,
-  PRIMARY KEY (`ip`)
-) ENGINE=MyISAM;
+-- 6.1.9
+ALTER TABLE `#@__archives` MODIFY COLUMN `title` varchar(255) NOT NULL DEFAULT '' AFTER `money`;
+ALTER TABLE `#@__arctype` MODIFY COLUMN `typename` varchar(255) NOT NULL DEFAULT '' AFTER `sortrank`;
+ALTER TABLE `#@__admin` ADD COLUMN `pwd_new` varchar(120) NOT NULL DEFAULT '' AFTER `pwd`;
+ALTER TABLE `#@__member` ADD COLUMN `pwd_new` varchar(120) NOT NULL DEFAULT '' AFTER `pwd`;
+
+-- 6.1.10
+ALTER TABLE `#@__arctype` CHANGE `namegk` `cnoverview` CHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE `#@__arctype` CHANGE `ennamegk` `enoverview` CHAR(255) NOT NULL DEFAULT '';
+DELETE FROM `#@__sysconfig` WHERE `#@__sysconfig`.`varname` = 'cfg_disable_funs';
+DELETE FROM `#@__sysconfig` WHERE `#@__sysconfig`.`varname` = 'cfg_disable_tags';
+DELETE FROM `#@__sysconfig` WHERE `#@__sysconfig`.`varname` = 'cfg_vdcode_member';
 
-ALTER TABLE `#@__tagindex` ADD COLUMN `keywords` VARCHAR(255) NULL DEFAULT NULL AFTER `tag`;
-ALTER TABLE `#@__tagindex` ADD COLUMN `description` VARCHAR(255) NULL DEFAULT NULL AFTER `keywords`;
-ALTER TABLE `#@__tagindex` ADD COLUMN `title` VARCHAR(255) NULL DEFAULT NULL AFTER `description`;
-ALTER TABLE `#@__tagindex` ADD COLUMN `tag_pinyin` VARCHAR(255) NULL DEFAULT NULL AFTER `title`;

src/static/web/css/admin.css

@@ -297,6 +297,9 @@ body.hidemenu .body-right {
 	padding:0 10px 0 50px;
 	color:#fff
 }
+.submenu .active{
+	background-color: #1eb867;
+}
 .submenu-right {
 	float:right!important;
 	padding:0 20px 0 10px!important

src/system/common.func.php

@@ -509,6 +509,7 @@ function AddFilter($channelid, $type=1, $fieldsnamef=array(), $defaulttid=0, $to
         $tidsq = $dsql->GetOne("SELECT * FROM `#@__archives` WHERE id='$arcid'");
         $tid = $toptid==0 ? $tidsq["typeid"] : $tidsq["topid"];
     }
+    $fieldsnamef = count($fieldsnamef) > 0 ? implode(",", $fieldsnamef) : $fieldsnamef;
     $nofilter = (isset($_REQUEST['TotalResult']) ? "&TotalResult=".$_REQUEST['TotalResult'] : '').(isset($_REQUEST['PageNo']) ? "&PageNo=".$_REQUEST['PageNo'] : '');
     $filterarr = string_filter(stripos($_SERVER['REQUEST_URI'], "list.php?tid=") ? str_replace($nofilter, '', $_SERVER['REQUEST_URI']) : $GLOBALS['cfg_cmsurl']."/plus/list.php?tid=".$tid);
     $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid'");
@@ -562,6 +563,24 @@ function AddFilter($channelid, $type=1, $fieldsnamef=array(), $defaulttid=0, $to
     }
     echo $dede_addonfields;
 }
+
+/**
+ * 用于检测Dede版本
+ *
+ * @return string
+ */
+function CheckDedeVer()
+{
+    global $dsql;
+    $ver = '1.0.0';
+    $dsql->GetTableFields('#@__tagindex');
+    while ($fields = $dsql->GetFieldObject()) {
+        if ($fields->name === 'tag_pinyin') {
+            $ver = '6.0.2';
+        }
+    }
+    return $ver;
+}
 //自定义函数接口
 if (file_exists(DEDEINC.'/extend.func.php')) {
     require_once(DEDEINC.'/extend.func.php');