From 2d384e56331364db09729bfb9b50a9a16ffc13e3 Mon Sep 17 00:00:00 2001 From: tianya Date: Tue, 29 Apr 2025 23:11:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A1=A8=E6=B3=A8=E9=87=8A=EF=BC=8C=E6=96=B9=E4=BE=BF=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E8=80=85=E8=BF=9B=E8=A1=8C=E4=BA=8C=E6=AC=A1=E5=BC=80?= =?UTF-8?q?=E5=8F=91=EF=BC=8C=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/install/sql-dftables.txt | 1290 ++++++++++++++++------------------ 1 file changed, 588 insertions(+), 702 deletions(-) diff --git a/src/install/sql-dftables.txt b/src/install/sql-dftables.txt index 33899dc2..c500b57b 100755 --- a/src/install/sql-dftables.txt +++ b/src/install/sql-dftables.txt @@ -1,207 +1,188 @@ DROP TABLE IF EXISTS `#@__addonarticle`; CREATE TABLE `#@__addonarticle` ( - `aid` mediumint(8) unsigned NOT NULL default '0', - `typeid` smallint(5) unsigned NOT NULL default '0', - `body` mediumtext, - `redirecturl` varchar(255) NOT NULL default '', - `templet` varchar(30) NOT NULL default '', - `userip` char(46) NOT NULL default '', + `aid` mediumint(8) unsigned NOT NULL default '0' COMMENT '文档id', + `typeid` smallint(5) unsigned NOT NULL default '0' COMMENT '栏目id', + `body` mediumtext COMMENT '文档内容', + `redirecturl` varchar(255) NOT NULL default '' COMMENT '跳转地址', + `templet` varchar(30) NOT NULL default '' COMMENT '自定义模板', + `userip` char(46) NOT NULL default '' COMMENT '用户ip', PRIMARY KEY (`aid`), KEY `typeid` (`typeid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__addonimages`; CREATE TABLE `#@__addonimages` ( - `aid` mediumint(8) unsigned NOT NULL default '0', - `typeid` smallint(5) unsigned NOT NULL default '0', - `pagestyle` smallint(6) NOT NULL default '1', - `maxwidth` smallint(6) NOT NULL default '600', - `imgurls` text, - `row` smallint(6) NOT NULL default '0', - `col` smallint(6) NOT NULL default '0', - `isrm` smallint(6) NOT NULL default '0', - `ddmaxwidth` smallint(6) NOT NULL default '200', - `pagepicnum` smallint(6) NOT NULL default '12', - `templet` varchar(30) NOT NULL default '', - `userip` char(46) NOT NULL default '', - `redirecturl` varchar(255) NOT NULL default '', - `body` mediumtext, + `aid` mediumint(8) unsigned NOT NULL default '0' COMMENT '文档id', + `typeid` smallint(5) unsigned NOT NULL default '0' COMMENT '栏目id', + `pagestyle` smallint(6) NOT NULL default '1' COMMENT '表现方式', + `maxwidth` smallint(6) NOT NULL default '600' COMMENT '最大宽度', + `imgurls` text COMMENT '图片地址', + `row` smallint(6) NOT NULL default '0' COMMENT '行数', + `col` smallint(6) NOT NULL default '0' COMMENT '列数', + `isrm` smallint(6) NOT NULL default '0' COMMENT '是否远程 0:否 1:是', + `ddmaxwidth` smallint(6) NOT NULL default '200' COMMENT '图片宽度', + `pagepicnum` smallint(6) NOT NULL default '12' COMMENT '每页图片数', + `templet` varchar(30) NOT NULL default '' COMMENT '自定义模板', + `userip` char(46) NOT NULL default '' COMMENT '用户ip', + `redirecturl` varchar(255) NOT NULL default '' COMMENT '跳转地址', + `body` mediumtext COMMENT '文档内容', PRIMARY KEY (`aid`), KEY `imagesMain` (`typeid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__addoninfos`; CREATE TABLE `#@__addoninfos` ( - `aid` int(11) NOT NULL default '0', - `typeid` int(11) NOT NULL default '0', - `channel` smallint(6) NOT NULL default '0', - `arcrank` smallint(6) NOT NULL default '0', - `mid` mediumint(8) unsigned NOT NULL default '0', - `click` int(10) unsigned NOT NULL default '0', - `title` varchar(60) NOT NULL default '', - `litpic` varchar(120) NOT NULL default '', - `userip` varchar(46) NOT NULL default ' ', - `senddate` int(11) NOT NULL default '0', - `flag` set('c','h','p','f','s','j','a','b') default NULL, - `lastpost` int(10) unsigned NOT NULL default '0', - `scores` mediumint(8) NOT NULL default '0', - `goodpost` mediumint(8) unsigned NOT NULL default '0', - `badpost` mediumint(8) unsigned NOT NULL default '0', - `nativeplace` char(20) NOT NULL default '0', - `infotype` char(20) NOT NULL default '0', - `body` mediumtext, - `endtime` int(11) NOT NULL default '0', - `tel` varchar(50) NOT NULL default '', - `email` varchar(50) NOT NULL default '', - `address` varchar(100) NOT NULL default '', - `linkman` varchar(50) NOT NULL default '', + `aid` int(11) NOT NULL default '0' COMMENT '文档id', + `typeid` int(11) NOT NULL default '0' COMMENT '栏目id', + `channel` smallint(6) NOT NULL default '0' COMMENT '模型', + `arcrank` smallint(6) NOT NULL default '0' COMMENT '浏览权限', + `mid` mediumint(8) unsigned NOT NULL default '0' COMMENT '会员id', + `click` int(10) unsigned NOT NULL default '0' COMMENT '点击数', + `title` varchar(60) NOT NULL default '' COMMENT '标题', + `litpic` varchar(120) NOT NULL default '' COMMENT '缩略图', + `userip` varchar(46) NOT NULL default ' ' COMMENT '用户ip', + `senddate` int(11) NOT NULL default '0' COMMENT '投稿时间', + `flag` set('c','h','p','f','s','j','a','b') default NULL COMMENT '自定义属性', + `lastpost` int(10) unsigned NOT NULL default '0' COMMENT '最后评论时间', + `scores` mediumint(8) NOT NULL default '0' COMMENT '评论积分', + `goodpost` mediumint(8) unsigned NOT NULL default '0' COMMENT '顶', + `badpost` mediumint(8) unsigned NOT NULL default '0' COMMENT '踩', + `nativeplace` char(20) NOT NULL default '0' COMMENT '地区', + `infotype` char(20) NOT NULL default '0' COMMENT '信息类型', + `body` mediumtext COMMENT '内容', + `endtime` int(11) NOT NULL default '0' COMMENT '截止日期', + `tel` varchar(50) NOT NULL default '' COMMENT '联系电话', + `email` varchar(50) NOT NULL default '' COMMENT '联系邮箱', + `address` varchar(100) NOT NULL default '' COMMENT '联系地址', + `linkman` varchar(50) NOT NULL default '' COMMENT '联系人', PRIMARY KEY (`aid`), KEY `typeid` (`typeid`,`nativeplace`,`infotype`), KEY `channel` (`channel`,`arcrank`,`mid`,`click`,`title`,`litpic`,`senddate`,`flag`,`endtime`) ) TYPE=MyISAM; -DROP TABLE IF EXISTS `#@__addonshop`; -CREATE TABLE `#@__addonshop` ( - `aid` mediumint(8) unsigned NOT NULL default '0', - `typeid` smallint(5) unsigned NOT NULL default '0', - `body` mediumtext, - `price` float NOT NULL default '0', - `trueprice` float NOT NULL default '0', - `brand` varchar(255) NOT NULL default '', - `units` varchar(255) NOT NULL default '', - `templet` varchar(30) NOT NULL, - `userip` char(46) NOT NULL, - `redirecturl` varchar(255) NOT NULL, - `vocation` char(20) NOT NULL default '0', - `infotype` char(20) NOT NULL default '0', - `uptime` int(11) NOT NULL default '0', - PRIMARY KEY (`aid`), - KEY `typeid` (`typeid`) -) TYPE=MyISAM; - DROP TABLE IF EXISTS `#@__addonsoft`; CREATE TABLE `#@__addonsoft` ( - `aid` mediumint(8) unsigned NOT NULL default '0', - `typeid` smallint(5) unsigned NOT NULL default '0', - `filetype` varchar(10) NOT NULL default '', - `language` varchar(10) NOT NULL default '', - `softtype` varchar(10) NOT NULL default '', - `accredit` varchar(10) NOT NULL default '', - `os` varchar(30) NOT NULL default '', - `softrank` mediumint(8) unsigned NOT NULL default '0', - `officialUrl` varchar(255) NOT NULL default '', - `officialDemo` varchar(255) NOT NULL default '', - `softsize` varchar(10) NOT NULL default '', - `softlinks` text, - `introduce` text, - `daccess` smallint(5) NOT NULL default '0', - `needmoney` smallint(5) NOT NULL default '0', - `templet` varchar(30) NOT NULL default '', - `userip` char(46) NOT NULL default '', - `redirecturl` varchar(255) NOT NULL default '', + `aid` mediumint(8) unsigned NOT NULL default '0' COMMENT '文档id', + `typeid` smallint(5) unsigned NOT NULL default '0' COMMENT '栏目id', + `filetype` varchar(10) NOT NULL default '' COMMENT '文件类型', + `language` varchar(10) NOT NULL default '' COMMENT '语言', + `softtype` varchar(10) NOT NULL default '' COMMENT '软件类型', + `accredit` varchar(10) NOT NULL default '' COMMENT '授权方式', + `os` varchar(30) NOT NULL default '' COMMENT '操作系统', + `softrank` mediumint(8) unsigned NOT NULL default '0' COMMENT '软件等级', + `officialUrl` varchar(255) NOT NULL default '' COMMENT '官方网址', + `officialDemo` varchar(255) NOT NULL default '' COMMENT '演示网址', + `softsize` varchar(10) NOT NULL default '' COMMENT '软件大小', + `softlinks` text COMMENT '下载链接', + `introduce` text COMMENT '软件介绍', + `daccess` smallint(5) NOT NULL default '0' COMMENT '需会员权限', + `needmoney` smallint(5) NOT NULL default '0' COMMENT '金币', + `templet` varchar(30) NOT NULL default '' COMMENT '自定义模板', + `userip` char(46) NOT NULL default '' COMMENT '用户ip', + `redirecturl` varchar(255) NOT NULL default '' COMMENT '跳转地址', PRIMARY KEY (`aid`), KEY `softMain` (`typeid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__addonspec`; CREATE TABLE `#@__addonspec` ( - `aid` mediumint(8) unsigned NOT NULL default '0', - `typeid` smallint(5) unsigned NOT NULL default '0', - `note` text, - `templet` varchar(30) NOT NULL default '', - `userip` char(46) NOT NULL default '', - `redirecturl` varchar(255) NOT NULL default '', + `aid` mediumint(8) unsigned NOT NULL default '0' COMMENT '文档id', + `typeid` smallint(5) unsigned NOT NULL default '0' COMMENT '栏目id', + `note` text COMMENT '专题节点', + `templet` varchar(30) NOT NULL default '' COMMENT '自定义模板', + `userip` char(46) NOT NULL default '' COMMENT '用户ip', + `redirecturl` varchar(255) NOT NULL default '' COMMENT '跳转地址', PRIMARY KEY (`aid`), KEY `typeid` (`typeid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__admin`; CREATE TABLE `#@__admin` ( - `id` int(10) unsigned NOT NULL, - `usertype` float unsigned default '0', - `userid` char(30) NOT NULL default '', - `pwd` char(32) NOT NULL default '', - `pwd_new` varchar(120) NOT NULL DEFAULT '', - `uname` char(20) NOT NULL default '', - `tname` char(30) NOT NULL default '', - `email` char(30) NOT NULL default '', - `typeid` text, - `logintime` int(10) unsigned NOT NULL default '0', - `loginip` varchar(46) NOT NULL default '', - `loginerr` tinyint NULL DEFAULT 0, + `id` int(10) unsigned NOT NULL COMMENT '管理员id', + `usertype` float unsigned default '0' COMMENT '管理类型', + `userid` char(30) NOT NULL default '' COMMENT '账号', + `pwd` char(32) NOT NULL default '' COMMENT '密码', + `pwd_new` varchar(120) NOT NULL DEFAULT '' COMMENT '新密码', + `uname` char(20) NOT NULL default '' COMMENT '昵称', + `tname` char(30) NOT NULL default '' COMMENT '姓名', + `email` char(30) NOT NULL default '' COMMENT '邮箱', + `typeid` text COMMENT '栏目id', + `logintime` int(10) unsigned NOT NULL default '0' COMMENT '登录时间', + `loginip` varchar(46) NOT NULL default '' COMMENT '登录ip', + `loginerr` tinyint NULL DEFAULT 0 COMMENT '登录错误次数', PRIMARY KEY (`id`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__admintype`; CREATE TABLE `#@__admintype` ( - `rank` float NOT NULL default '1', - `typename` varchar(30) NOT NULL default '', - `system` smallint(6) NOT NULL default '0', - `purviews` text, + `rank` float NOT NULL default '1' COMMENT '权限值', + `typename` varchar(30) NOT NULL default '' COMMENT '组名称', + `system` smallint(6) NOT NULL default '0' COMMENT '系统组 0:用户 1:系统', + `purviews` text COMMENT '权限', PRIMARY KEY (`rank`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__advancedsearch`; CREATE TABLE `#@__advancedsearch` ( - `mid` int(11) NOT NULL, - `maintable` varchar(256) NOT NULL default '', - `mainfields` text, - `addontable` varchar(256) default NULL, - `addonfields` text, - `forms` text, - `template` varchar(256) NOT NULL default '', + `mid` int(11) NOT NULL COMMENT '会员id', + `maintable` varchar(256) NOT NULL default '' COMMENT '主表', + `mainfields` text COMMENT '主表字段', + `addontable` varchar(256) default NULL COMMENT '附加表', + `addonfields` text COMMENT '附加表字段', + `forms` text COMMENT '表单', + `template` varchar(256) NOT NULL default '' COMMENT '模板', UNIQUE KEY `mid` (`mid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__arcatt`; CREATE TABLE `#@__arcatt` ( - `sortid` smallint(6) NOT NULL default '0', - `att` char(10) NOT NULL default '', - `attname` char(30) NOT NULL default '', + `sortid` smallint(6) NOT NULL default '0' COMMENT '排序', + `att` char(10) NOT NULL default '' COMMENT '属性值', + `attname` char(30) NOT NULL default '' COMMENT '属性名', PRIMARY KEY (`att`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__arccache`; CREATE TABLE `#@__arccache` ( - `md5hash` char(32) NOT NULL default '', - `uptime` int(11) NOT NULL default '0', - `cachedata` mediumtext, + `md5hash` char(32) NOT NULL default '' COMMENT '哈希', + `uptime` int(11) NOT NULL default '0' COMMENT '更新时间', + `cachedata` mediumtext COMMENT '缓存数据', PRIMARY KEY (`md5hash`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__archives`; CREATE TABLE `#@__archives` ( - `id` mediumint(8) unsigned NOT NULL default '0', - `typeid` smallint(5) unsigned NOT NULL default '0', - `typeid2` varchar(90) NOT NULL default '0', - `sortrank` int(10) unsigned NOT NULL default '0', - `flag` set('c','h','p','f','s','j','a','b') default NULL, - `ismake` smallint(6) NOT NULL default '0', - `channel` smallint(6) NOT NULL default '1', - `arcrank` smallint(6) NOT NULL default '0', - `click` mediumint(8) unsigned NOT NULL default '0', - `money` smallint(6) NOT NULL default '0', - `title` varchar(255) NOT NULL default '', - `shorttitle` char(255) NOT NULL default '', - `color` char(7) NOT NULL default '', - `writer` char(255) NOT NULL default '', - `source` char(255) NOT NULL default '', - `litpic` char(100) NOT NULL default '', - `pubdate` int(10) unsigned NOT NULL default '0', - `senddate` int(10) unsigned NOT NULL default '0', - `mid` mediumint(8) unsigned NOT NULL default '0', - `keywords` char(255) NOT NULL default '', - `lastpost` int(10) unsigned NOT NULL default '0', - `scores` mediumint(8) NOT NULL default '0', - `goodpost` mediumint(8) unsigned NOT NULL default '0', - `badpost` mediumint(8) unsigned NOT NULL default '0', - `voteid` mediumint(8) NOT NULL default '0', - `notpost` tinyint(1) unsigned NOT NULL default '0', - `description` varchar(255) NOT NULL default '', - `filename` varchar(50) NOT NULL default '', - `dutyadmin` mediumint(8) unsigned NOT NULL default '0', - `mtype` mediumint(8) unsigned NOT NULL default '0', - `weight` int(10) NOT NULL default '0', + `id` mediumint(8) unsigned NOT NULL default '0' COMMENT '文档id', + `typeid` smallint(5) unsigned NOT NULL default '0' COMMENT '栏目id', + `typeid2` varchar(90) NOT NULL default '0' COMMENT '副栏目id', + `sortrank` int(10) unsigned NOT NULL default '0' COMMENT '排序', + `flag` set('c','h','p','f','s','j','a','b') default NULL COMMENT '自定义属性', + `ismake` smallint(6) NOT NULL default '0' COMMENT '是否生成 0:未生成 1:已生成 -1:动态', + `channel` smallint(6) NOT NULL default '1' COMMENT '模型', + `arcrank` smallint(6) NOT NULL default '0' COMMENT '浏览权限', + `click` mediumint(8) unsigned NOT NULL default '0' COMMENT '点击数', + `money` smallint(6) NOT NULL default '0' COMMENT '金币', + `title` varchar(255) NOT NULL default '' COMMENT '标题', + `shorttitle` char(255) NOT NULL default '' COMMENT '简略标题', + `color` char(7) NOT NULL default '' COMMENT '颜色', + `writer` char(255) NOT NULL default '' COMMENT '作者', + `source` char(255) NOT NULL default '' COMMENT '来源', + `litpic` char(100) NOT NULL default '' COMMENT '缩略图', + `pubdate` int(10) unsigned NOT NULL default '0' COMMENT '发布日期', + `senddate` int(10) unsigned NOT NULL default '0' COMMENT '投稿日期', + `mid` mediumint(8) unsigned NOT NULL default '0' COMMENT '会员id', + `keywords` char(255) NOT NULL default '' COMMENT '关键词', + `lastpost` int(10) unsigned NOT NULL default '0' COMMENT '最后评论时间', + `scores` mediumint(8) NOT NULL default '0' COMMENT '评论积分', + `goodpost` mediumint(8) unsigned NOT NULL default '0' COMMENT '顶', + `badpost` mediumint(8) unsigned NOT NULL default '0' COMMENT '踩', + `voteid` mediumint(8) NOT NULL default '0' COMMENT '投票id', + `notpost` tinyint(1) unsigned NOT NULL default '0' COMMENT '是否评论 0:允许 1:禁止', + `description` varchar(255) NOT NULL default '' COMMENT '描述', + `filename` varchar(50) NOT NULL default '' COMMENT '文件名', + `dutyadmin` mediumint(8) unsigned NOT NULL default '0' COMMENT '网站管理员', + `mtype` mediumint(8) unsigned NOT NULL default '0' COMMENT '投稿分类', + `weight` int(10) NOT NULL default '0' COMMENT '权重', PRIMARY KEY (`id`), KEY `sortrank` (`sortrank`), KEY `mainindex` (`arcrank`,`typeid`,`channel`,`flag`,`mid`), @@ -210,69 +191,69 @@ CREATE TABLE `#@__archives` ( DROP TABLE IF EXISTS `#@__arcrank`; CREATE TABLE `#@__arcrank` ( - `id` smallint(5) unsigned NOT NULL auto_increment, - `rank` smallint(6) NOT NULL default '0', - `membername` char(20) NOT NULL default '', - `adminrank` smallint(6) NOT NULL default '0', - `money` smallint(8) unsigned NOT NULL default '500', - `scores` mediumint(8) NOT NULL default '0', - `purviews` mediumtext, + `id` smallint(5) unsigned NOT NULL auto_increment COMMENT 'id', + `rank` smallint(6) NOT NULL default '0' COMMENT '会员等级编号 0:待审核 10:注册会员', + `membername` char(20) NOT NULL default '' COMMENT '等级名称', + `adminrank` smallint(6) NOT NULL default '0' COMMENT '管理员等级', + `money` smallint(8) unsigned NOT NULL default '500' COMMENT '初始拥有金币', + `scores` mediumint(8) NOT NULL default '0' COMMENT '初始拥有积分', + `purviews` mediumtext COMMENT '权限列表', PRIMARY KEY (`id`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__arctiny`; CREATE TABLE `#@__arctiny` ( - `id` mediumint(8) unsigned NOT NULL auto_increment, - `typeid` smallint(5) unsigned NOT NULL default '0', - `typeid2` varchar(90) NOT NULL default '0', - `arcrank` smallint(6) NOT NULL default '0', - `channel` smallint(5) NOT NULL default '1', - `senddate` int(10) unsigned NOT NULL default '0', - `sortrank` int(10) unsigned NOT NULL default '0', - `mid` mediumint(8) unsigned NOT NULL, + `id` mediumint(8) unsigned NOT NULL auto_increment COMMENT 'id', + `typeid` smallint(5) unsigned NOT NULL default '0' COMMENT '栏目id', + `typeid2` varchar(90) NOT NULL default '0' COMMENT '副栏目id', + `arcrank` smallint(6) NOT NULL default '0' COMMENT '浏览权限', + `channel` smallint(5) NOT NULL default '1' COMMENT '模型', + `senddate` int(10) unsigned NOT NULL default '0' COMMENT '投稿时间', + `sortrank` int(10) unsigned NOT NULL default '0' COMMENT '排序', + `mid` mediumint(8) unsigned NOT NULL COMMENT '会员id', PRIMARY KEY (`id`), KEY `sortrank` (`sortrank`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__arctype`; CREATE TABLE `#@__arctype` ( - `id` smallint(5) unsigned NOT NULL auto_increment, - `reid` smallint(5) unsigned NOT NULL default '0', - `topid` smallint(5) unsigned NOT NULL default '0', - `sortrank` smallint(5) unsigned NOT NULL default '50', - `typename` char(255) NOT NULL default '', - `cnoverview` char(255) NOT NULL default '', - `enname` char(255) NOT NULL default '', - `enoverview` char(255) NOT NULL default '', - `bigpic` char(255) NOT NULL default '', - `litimg` char(255) NOT NULL default '', - `typedir` char(60) NOT NULL default '', - `isdefault` smallint(6) NOT NULL default '0', - `defaultname` char(15) NOT NULL default 'index.html', - `issend` smallint(6) NOT NULL default '0', - `channeltype` smallint(6) default '1', - `maxpage` smallint(6) NOT NULL default '-1', - `ispart` smallint(6) NOT NULL default '0', - `corank` smallint(6) NOT NULL default '0', - `tempindex` char(50) NOT NULL default '', - `templist` char(50) NOT NULL default '', - `temparticle` char(50) NOT NULL default '', - `namerule` char(50) NOT NULL default '', - `namerule2` char(50) NOT NULL default '', - `modname` char(20) NOT NULL default '', - `description` varchar(255) NOT NULL default '', - `keywords` varchar(255) NOT NULL default '', - `seotitle` varchar(255) NOT NULL default '', - `moresite` tinyint(1) unsigned NOT NULL default '0', - `sitepath` char(60) NOT NULL default '', - `siteurl` char(50) NOT NULL default '', - `ishidden` smallint(6) NOT NULL default '0', - `cross` tinyint(1) NOT NULL default '0', - `crossid` text, - `content` text, - `smalltypes` text, - `apienabled` tinyint unsigned DEFAULT '0', - `apikey` varchar(64) DEFAULT NULL, + `id` smallint(5) unsigned NOT NULL auto_increment COMMENT '栏目id', + `reid` smallint(5) unsigned NOT NULL default '0' COMMENT '父栏目id', + `topid` smallint(5) unsigned NOT NULL default '0' COMMENT '顶级栏目id', + `sortrank` smallint(5) unsigned NOT NULL default '50' COMMENT '排列顺序', + `typename` char(255) NOT NULL default '' COMMENT '中文名称', + `cnoverview` char(255) NOT NULL default '' COMMENT '中文概述', + `enname` char(255) NOT NULL default '' COMMENT '英文名称', + `enoverview` char(255) NOT NULL default '' COMMENT '英文概述', + `bigpic` char(255) NOT NULL default '' COMMENT '栏目大图', + `litimg` char(255) NOT NULL default '' COMMENT '栏目小图', + `typedir` char(60) NOT NULL default '' COMMENT '栏目生成目录', + `isdefault` smallint(6) NOT NULL default '0' COMMENT '栏目列表选项，0:列表第一页浏览 1:静态浏览，-1:动态浏览，默认值为0', + `defaultname` char(15) NOT NULL default 'index.html' COMMENT '默认页的名称', + `issend` smallint(6) NOT NULL default '0' COMMENT '是否支持投稿，0:不支持，1:支持，默认值为不支持', + `channeltype` smallint(6) default '1' COMMENT '文档模型', + `maxpage` smallint(6) NOT NULL default '-1' COMMENT '最大页数，默认值为-1（可能表示无限制）', + `ispart` smallint(6) NOT NULL default '0' COMMENT '栏目属性，0:列表栏目（允许发布） 1:封面栏目（不允许发布）2:外部栏目（栏目生成目录填写链接），默认值为列表栏目', + `corank` smallint(6) NOT NULL default '0' COMMENT '浏览权限，关联不同的用户组权限，默认值为0', + `tempindex` char(50) NOT NULL default '' COMMENT '封面模板', + `templist` char(50) NOT NULL default '' COMMENT '列表模板', + `temparticle` char(50) NOT NULL default '' COMMENT '文档模板', + `namerule` char(50) NOT NULL default '' COMMENT '文档命名规则', + `namerule2` char(50) NOT NULL default '' COMMENT '列表命名规则', + `modname` char(20) NOT NULL default '' COMMENT '模块名称', + `description` varchar(255) NOT NULL default '' COMMENT '描述', + `keywords` varchar(255) NOT NULL default '' COMMENT '关键词', + `seotitle` varchar(255) NOT NULL default '' COMMENT 'SEO标题', + `moresite` tinyint(1) unsigned NOT NULL default '0' COMMENT '多站点支持，0:不启用，1:启用，默认值为不启用，启用时可能需要绑定二级域名并在系统变量中开启支持多站点', + `sitepath` char(60) NOT NULL default '' COMMENT '站点路径', + `siteurl` char(50) NOT NULL default '' COMMENT '绑定域名', + `ishidden` smallint(6) NOT NULL default '0' COMMENT '是否隐藏栏目，0:显示，1:隐藏，默认值为显示', + `cross` tinyint(1) NOT NULL default '0' COMMENT '栏目交叉，0:不交叉，1:自动获取同名栏目，2:指定交叉栏目id（英文逗号隔开），默认值为不交叉', + `crossid` text COMMENT '交叉栏目ID，当`cross`为2时，用于存储指定的交叉栏目id，以英文逗号隔开', + `content` text COMMENT '栏目文档', + `smalltypes` text COMMENT '信息联动类型', + `apienabled` tinyint unsigned DEFAULT '0' COMMENT '是否支持跨站调用，0:不支持，1:支持，默认值为不支持', + `apikey` varchar(64) DEFAULT NULL COMMENT '跨站调用秘钥', PRIMARY KEY (`id`), KEY `reid` (`reid`,`isdefault`,`channeltype`,`ispart`,`corank`,`topid`,`ishidden`), KEY `sortrank` (`sortrank`) @@ -280,396 +261,329 @@ CREATE TABLE `#@__arctype` ( DROP TABLE IF EXISTS `#@__area`; CREATE TABLE `#@__area` ( - `id` int(10) unsigned NOT NULL auto_increment, - `name` varchar(20) NOT NULL default '', - `reid` int(10) unsigned NOT NULL default '0', - `disorder` int(10) unsigned NOT NULL default '0', + `id` int(10) unsigned NOT NULL auto_increment COMMENT '地区id', + `name` varchar(20) NOT NULL default '' COMMENT '地区名称', + `reid` int(10) unsigned NOT NULL default '0' COMMENT '隶属id', + `disorder` int(10) unsigned NOT NULL default '0' COMMENT '排序', PRIMARY KEY (`id`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__channeltype`; CREATE TABLE `#@__channeltype` ( - `id` smallint(6) NOT NULL default '0', - `nid` varchar(20) NOT NULL default '', - `typename` varchar(30) NOT NULL default '', - `maintable` varchar(50) NOT NULL default '#@__archives', - `addtable` varchar(50) NOT NULL default '', - `addcon` varchar(30) NOT NULL default '', - `mancon` varchar(30) NOT NULL default '', - `editcon` varchar(30) NOT NULL default '', - `useraddcon` varchar(30) NOT NULL default '', - `usermancon` varchar(30) NOT NULL default '', - `usereditcon` varchar(30) NOT NULL default '', - `fieldset` text, - `listfields` text, - `allfields` text, - `issystem` smallint(6) NOT NULL default '0', - `isshow` smallint(6) NOT NULL default '1', - `issend` smallint(6) NOT NULL default '0', - `arcsta` smallint(6) NOT NULL default '-1', - `usertype` char(10) NOT NULL default '', - `sendrank` smallint(6) NOT NULL default '10', - `isdefault` smallint(6) NOT NULL default '0', - `needdes` tinyint(1) NOT NULL default '1', - `needpic` tinyint(1) NOT NULL default '1', - `titlename` varchar(20) NOT NULL default '标题', - `onlyone` smallint(6) NOT NULL default '0', - `dfcid` smallint(5) unsigned NOT NULL default '0', + `id` smallint(6) NOT NULL default '0' COMMENT '模型id', + `nid` varchar(20) NOT NULL default '' COMMENT '模型标识，由英文、数字或下划线组成，关联模板命名', + `typename` varchar(30) NOT NULL default '' COMMENT '前后台显示的模型名称', + `maintable` varchar(50) NOT NULL default '#@__archives' COMMENT '文档模型主表', + `addtable` varchar(50) NOT NULL default '' COMMENT '附加表', + `addcon` varchar(30) NOT NULL default '' COMMENT '发布程序', + `mancon` varchar(30) NOT NULL default '' COMMENT '管理程序', + `editcon` varchar(30) NOT NULL default '' COMMENT '修改程序', + `useraddcon` varchar(30) NOT NULL default '' COMMENT '会员发布程序', + `usermancon` varchar(30) NOT NULL default '' COMMENT '会员管理程序', + `usereditcon` varchar(30) NOT NULL default '' COMMENT '会员修改程序', + `fieldset` text COMMENT '模型字段', + `listfields` text COMMENT '列表字段', + `allfields` text COMMENT '所有字段', + `issystem` smallint(6) NOT NULL default '0' COMMENT '模型性质 0:自动 1:系统 -1:独立，系统模型禁删，独立有单独主表', + `isshow` smallint(6) NOT NULL default '1' COMMENT '是否显示 1:显示 0:隐藏', + `issend` smallint(6) NOT NULL default '0' COMMENT '支持会员投稿 0:否 1:是', + `arcsta` smallint(6) NOT NULL default '-1' COMMENT '投稿默认状态 -1:待审 0:已审（静）1:已审（动）', + `usertype` char(10) NOT NULL default '' COMMENT '会员投稿组', + `sendrank` smallint(6) NOT NULL default '10' COMMENT '会员投稿级别，0游客，其他对应不同等级', + `isdefault` smallint(6) NOT NULL default '0' COMMENT '是否为默认模型，0:否 1:是', + `needdes` tinyint(1) NOT NULL default '1' COMMENT '是否用摘要，1:用 0:不用', + `needpic` tinyint(1) NOT NULL default '1' COMMENT '是否用缩图，1:用 0:不用', + `titlename` varchar(20) NOT NULL default '标题' COMMENT '投稿标题字段名称', + `onlyone` smallint(6) NOT NULL default '0' COMMENT '投稿是否唯一，1:是 0:否', + `dfcid` smallint(5) unsigned NOT NULL default '0' COMMENT '默认栏目ID', PRIMARY KEY (`id`), KEY `nid` (`nid`,`isshow`,`arcsta`,`sendrank`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__diyforms`; CREATE TABLE `#@__diyforms` ( - `diyid` int(10) unsigned NOT NULL auto_increment, - `name` varchar(50) NOT NULL default '', - `posttemplate` varchar(50) NOT NULL, - `viewtemplate` varchar(50) NOT NULL, - `listtemplate` varchar(50) NOT NULL, - `table` varchar(50) NOT NULL default '', - `info` text, - `public` tinyint(1) NOT NULL default '1', + `diyid` int(10) unsigned NOT NULL auto_increment COMMENT '自定义表单id', + `name` varchar(50) NOT NULL default '' COMMENT '表单名称', + `posttemplate` varchar(50) NOT NULL COMMENT '发布模板', + `viewtemplate` varchar(50) NOT NULL COMMENT '文档模板', + `listtemplate` varchar(50) NOT NULL COMMENT '列表模板', + `table` varchar(50) NOT NULL default '' COMMENT '自定义表单数据的数据表名，不能重复已有表名，创建后不可修改', + `info` text COMMENT '表单相关信息，如字段配置等', + `public` tinyint(1) NOT NULL default '1' COMMENT '公开状态 0:不公开 1:审核公开 2:完全公开', PRIMARY KEY (`diyid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__downloads`; CREATE TABLE `#@__downloads` ( - `hash` char(32) NOT NULL, - `id` int(10) unsigned NOT NULL default '0', - `downloads` int(10) unsigned NOT NULL default '0', + `hash` char(32) NOT NULL COMMENT '下载哈希', + `id` int(10) unsigned NOT NULL default '0' COMMENT '下载id', + `downloads` int(10) unsigned NOT NULL default '0' COMMENT '下载次数', PRIMARY KEY (`hash`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__erradd`; CREATE TABLE `#@__erradd` ( - `id` int(10) unsigned NOT NULL auto_increment, - `aid` mediumint(8) unsigned NOT NULL, - `mid` mediumint(8) unsigned default NULL, - `title` char(60) NOT NULL default '', - `type` smallint(6) NOT NULL default '0', - `errtxt` mediumtext, - `oktxt` mediumtext, - `sendtime` int(10) unsigned NOT NULL default '0', + `id` int(10) unsigned NOT NULL auto_increment COMMENT '挑错id', + `aid` mediumint(8) unsigned NOT NULL COMMENT '文档id', + `mid` mediumint(8) unsigned default NULL COMMENT '会员id', + `title` char(60) NOT NULL default '' COMMENT '文章标题', + `type` smallint(6) NOT NULL default '0' COMMENT '出错类型 0:其他', + `errtxt` mediumtext COMMENT '错误描述', + `oktxt` mediumtext COMMENT '修改建议', + `sendtime` int(10) unsigned NOT NULL default '0' COMMENT '挑错时间', KEY `id` (`id`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__feedback`; CREATE TABLE `#@__feedback` ( - `id` int(10) unsigned NOT NULL auto_increment, - `aid` mediumint(8) unsigned NOT NULL default '0', - `fid` int(10) UNSIGNED NOT NULL DEFAULT '0', - `typeid` smallint(5) unsigned NOT NULL default '0', - `username` char(20) NOT NULL default '', - `arctitle` varchar(60) NOT NULL default '', - `ip` char(46) NOT NULL default '', - `ischeck` smallint(6) NOT NULL default '0', - `dtime` int(10) unsigned NOT NULL default '0', - `replycount` int(10) UNSIGNED NOT NULL DEFAULT '0', - `mid` mediumint(8) unsigned NOT NULL default '0', - `bad` mediumint(8) unsigned NOT NULL default '0', - `good` mediumint(8) unsigned NOT NULL default '0', - `ftype` set('feedback','good','bad') NOT NULL default 'feedback', - `face` smallint(5) unsigned NOT NULL default '0', - `msg` text, + `id` int(10) unsigned NOT NULL auto_increment COMMENT '评论id', + `aid` mediumint(8) unsigned NOT NULL default '0' COMMENT '文档id', + `fid` int(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '父评论的id', + `typeid` smallint(5) unsigned NOT NULL default '0' COMMENT '栏目id', + `username` char(20) NOT NULL default '' COMMENT '评论人的用户名', + `arctitle` varchar(60) NOT NULL default '' COMMENT '文档标题', + `ip` char(46) NOT NULL default '' COMMENT '评论人的ip地址', + `ischeck` smallint(6) NOT NULL default '0' COMMENT '评论审核状态 0:未审核 1:已审核', + `dtime` int(10) unsigned NOT NULL default '0' COMMENT '评论发布时间', + `replycount` int(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '评论的回复数量', + `mid` mediumint(8) unsigned NOT NULL default '0' COMMENT '评论人id', + `bad` mediumint(8) unsigned NOT NULL default '0' COMMENT '踩', + `good` mediumint(8) unsigned NOT NULL default '0' COMMENT '顶', + `ftype` set('feedback','good','bad') NOT NULL default 'feedback' COMMENT '评论类型 1:普通评论 2:好评 3:差评', + `face` smallint(5) unsigned NOT NULL default '0' COMMENT '评论表情', + `msg` text COMMENT '评论内容', PRIMARY KEY (`id`), KEY `aid` (`aid`,`ischeck`,`mid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__feedback_goodbad`; 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', + `fgid` int(11) NOT NULL AUTO_INCREMENT COMMENT '评论顶踩id', + `mid` int(11) NOT NULL DEFAULT '0' COMMENT '会员id', + `fid` int(11) NOT NULL DEFAULT '0' COMMENT '评论id', + `fgtype` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '顶踩类型 0:顶 1:踩', PRIMARY KEY (`fgid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__flink`; CREATE TABLE `#@__flink` ( - `id` smallint(5) unsigned NOT NULL auto_increment, - `sortrank` smallint(6) NOT NULL default '0', - `url` char(60) NOT NULL default '', - `webname` char(30) NOT NULL default '', - `msg` char(200) NOT NULL default '', - `email` char(50) NOT NULL default '', - `logo` char(60) NOT NULL default '', - `dtime` int(10) unsigned NOT NULL default '0', - `typeid` smallint(5) unsigned NOT NULL default '0', - `ischeck` smallint(6) NOT NULL default '1', + `id` smallint(5) unsigned NOT NULL auto_increment COMMENT '友情链接id', + `sortrank` smallint(6) NOT NULL default '0' COMMENT '排序，由小到大排列', + `url` char(60) NOT NULL default '' COMMENT '网址', + `webname` char(30) NOT NULL default '' COMMENT '网站名称', + `msg` char(200) NOT NULL default '' COMMENT '网站介绍', + `email` char(50) NOT NULL default '' COMMENT '邮箱', + `logo` char(60) NOT NULL default '' COMMENT 'Logo地址', + `dtime` int(10) unsigned NOT NULL default '0' COMMENT '添加时间', + `typeid` smallint(5) unsigned NOT NULL default '0' COMMENT '栏目id', + `ischeck` smallint(6) NOT NULL default '1' COMMENT '链接位置 1:内页 2:首页', PRIMARY KEY (`id`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__flinktype`; CREATE TABLE `#@__flinktype` ( - `id` mediumint(8) unsigned NOT NULL auto_increment, - `typename` varchar(50) NOT NULL default '', + `id` mediumint(8) unsigned NOT NULL auto_increment COMMENT '友情链接分类id', + `typename` varchar(50) NOT NULL default '' COMMENT '分类名称', PRIMARY KEY (`id`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__freelist`; CREATE TABLE `#@__freelist` ( - `aid` int(11) NOT NULL auto_increment, - `title` varchar(50) NOT NULL default '', - `namerule` varchar(50) NOT NULL default '', - `listdir` varchar(60) NOT NULL default '', - `defaultpage` varchar(20) NOT NULL default '', - `nodefault` smallint(6) NOT NULL default '0', - `templet` varchar(50) NOT NULL default '', - `edtime` int(11) NOT NULL default '0', - `maxpage` smallint(5) unsigned NOT NULL default '100', - `click` int(11) NOT NULL default '1', - `listtag` mediumtext, - `keywords` varchar(100) NOT NULL default '', - `description` varchar(255) NOT NULL default '', + `aid` int(11) NOT NULL auto_increment COMMENT '文档id', + `title` varchar(50) NOT NULL default '' COMMENT '标题', + `namerule` varchar(50) NOT NULL default '' COMMENT '命名规则，{listdir}表示列表存放目录', + `listdir` varchar(60) NOT NULL default '' COMMENT '生成目录', + `defaultpage` varchar(20) NOT NULL default '' COMMENT '默认页名称', + `nodefault` smallint(6) NOT NULL default '0' COMMENT '默认首页 0:使用 1:不使用', + `templet` varchar(50) NOT NULL default '' COMMENT '模板文件', + `edtime` int(11) NOT NULL default '0' COMMENT '编辑时间', + `maxpage` smallint(5) unsigned NOT NULL default '100' COMMENT '最大列出的页数', + `click` int(11) NOT NULL default '1' COMMENT '点击量', + `listtag` mediumtext COMMENT '标签信息，存储筛选、排序等配置', + `keywords` varchar(100) NOT NULL default '' COMMENT '关键词', + `description` varchar(255) NOT NULL default '' COMMENT '描述', PRIMARY KEY (`aid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__homepageset`; CREATE TABLE `#@__homepageset` ( - `templet` char(50) NOT NULL default '', - `position` char(30) NOT NULL default '', - `showmod` tinyint(2) NOT NULL default '1' + `templet` char(50) NOT NULL default '' COMMENT '模板', + `position` char(30) NOT NULL default '' COMMENT '位置', + `showmod` tinyint(2) NOT NULL default '1' COMMENT '浏览模式 0:动态 1:静态' ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__keywords`; CREATE TABLE `#@__keywords` ( - `aid` mediumint(8) unsigned NOT NULL auto_increment, - `keyword` char(16) NOT NULL default '', - `rank` mediumint(8) unsigned NOT NULL default '0', - `sta` smallint(6) NOT NULL default '1', - `rpurl` char(60) NOT NULL default '', + `aid` mediumint(8) unsigned NOT NULL auto_increment COMMENT '文档id', + `keyword` char(16) NOT NULL default '' COMMENT '关键词', + `rank` mediumint(8) unsigned NOT NULL default '0' COMMENT '频率', + `sta` smallint(6) NOT NULL default '1' COMMENT '状态 0:禁用 1:启用', + `rpurl` char(60) NOT NULL default '' COMMENT '链接网址', PRIMARY KEY (`aid`), KEY `keyword` (`keyword`,`rank`,`sta`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__log`; CREATE TABLE `#@__log` ( - `lid` mediumint(8) unsigned NOT NULL auto_increment, - `adminid` smallint(8) unsigned NOT NULL default '0', - `filename` char(60) NOT NULL default '', - `method` char(10) NOT NULL default '', - `query` char(200) NOT NULL default '', - `cip` char(46) NOT NULL default '', - `dtime` int(10) unsigned NOT NULL default '0', + `lid` mediumint(8) unsigned NOT NULL auto_increment COMMENT '日志id', + `adminid` smallint(8) unsigned NOT NULL default '0' COMMENT '管理员id', + `filename` char(60) NOT NULL default '' COMMENT '地址', + `method` char(10) NOT NULL default '' COMMENT '访问方式', + `query` char(200) NOT NULL default '' COMMENT '会员id', + `cip` char(46) NOT NULL default '' COMMENT '参数', + `dtime` int(10) unsigned NOT NULL default '0' COMMENT '时间', PRIMARY KEY (`lid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__member`; CREATE TABLE `#@__member` ( - `mid` mediumint(8) unsigned NOT NULL auto_increment, - `mtype` varchar(20) NOT NULL default '个人', - `userid` char(20) NOT NULL default '', - `pwd` char(32) NOT NULL default '', - `pwd_new` varchar(120) NOT NULL DEFAULT '', - `uname` char(36) NOT NULL default '', - `sex` enum('男','女','保密') NOT NULL default '保密', - `rank` smallint(5) unsigned NOT NULL default '0', - `uptime` int(11) NOT NULL default '0', - `exptime` smallint(6) NOT NULL default '0', - `money` mediumint(8) unsigned NOT NULL default '0', - `email` char(50) NOT NULL default '', - `scores` mediumint(8) unsigned NOT NULL default '0', - `matt` smallint(5) unsigned NOT NULL default '0', - `spacesta` smallint(6) NOT NULL default '0', - `face` char(50) NOT NULL default '', - `safequestion` smallint(5) unsigned NOT NULL default '0', - `safeanswer` char(30) NOT NULL default '', - `jointime` int(10) unsigned NOT NULL default '0', - `joinip` char(46) NOT NULL default '', - `logintime` int(10) unsigned NOT NULL default '0', - `loginip` char(46) NOT NULL default '', - `checkmail` smallint(6) NOT NULL default '-1', - `loginerr` tinyint NULL DEFAULT 0, - `send_max` int DEFAULT '0', - `user_money` decimal(10, 2) unsigned NULL default 0.00, - `pmid` int(8) UNSIGNED NULL DEFAULT 0, + `mid` mediumint(8) unsigned NOT NULL auto_increment COMMENT '会员id', + `mtype` varchar(20) NOT NULL default '个人' '会员类型，默认为个人', + `userid` char(20) NOT NULL default '' COMMENT '会员账号', + `pwd` char(32) NOT NULL default '' COMMENT '旧密码，32位字符', + `pwd_new` varchar(120) NOT NULL DEFAULT '' COMMENT '新密码', + `uname` char(36) NOT NULL default '' COMMENT '会员昵称', + `sex` enum('男','女','保密') NOT NULL default '保密' COMMENT '会员性别', + `rank` smallint(5) unsigned NOT NULL default '0' COMMENT '会员等级，关联arcrank表的rank字段', + `uptime` int(11) NOT NULL default '0' COMMENT '会员升级时间，时间戳格式', + `exptime` smallint(6) NOT NULL default '0' COMMENT '会员有效天数', + `money` mediumint(8) unsigned NOT NULL default '0' COMMENT '会员金币数量', + `email` char(50) NOT NULL default '' COMMENT '会员邮箱', + `scores` mediumint(8) unsigned NOT NULL default '0' COMMENT '会员积分', + `matt` smallint(5) unsigned NOT NULL default '0' COMMENT '推荐级别 0:普通 1:推荐 10:管理员', + `spacesta` smallint(6) NOT NULL default '0' COMMENT '资料状况，具体状态由staArr数组定义', + `face` char(50) NOT NULL default '' COMMENT '会员头像地址', + `safequestion` smallint(5) unsigned NOT NULL default '0' COMMENT '安全问题编号', + `safeanswer` char(30) NOT NULL default '' COMMENT '安全问题答案', + `jointime` int(10) unsigned NOT NULL default '0' COMMENT '会员注册时间，时间戳格式', + `joinip` char(46) NOT NULL default '' COMMENT '会员注册ip地址', + `logintime` int(10) unsigned NOT NULL default '0' COMMENT '会员最近登录时间', + `loginip` char(46) NOT NULL default '' COMMENT '会员最近登录ip地址', + `checkmail` smallint(6) NOT NULL default '-1' COMMENT '邮箱验证状态 -1:未验证', + `loginerr` tinyint NULL DEFAULT 0 COMMENT '登录错误次数', + `send_max` int DEFAULT '0' COMMENT '投稿限制 0:不能投稿 -1:无限次', + `user_money` decimal(10, 2) unsigned NULL default 0.00 COMMENT '会员余额，保留两位小数', + `pmid` int(8) UNSIGNED NULL DEFAULT 0 COMMENT '可能是父会员ID', PRIMARY KEY (`mid`), KEY `userid` (`userid`,`sex`), KEY `logintime` (`logintime`) ) TYPE=MyISAM; -DROP TABLE IF EXISTS `#@__member_company`; -CREATE TABLE `#@__member_company` ( - `mid` mediumint(8) NOT NULL auto_increment, - `company` varchar(36) NOT NULL default '', - `product` varchar(50) NOT NULL default '', - `place` smallint(5) unsigned NOT NULL default '0', - `vocation` smallint(5) unsigned NOT NULL default '0', - `cosize` smallint(5) unsigned NOT NULL default '0', - `tel` varchar(30) NOT NULL default '', - `fax` varchar(30) NOT NULL default '', - `linkman` varchar(20) NOT NULL default '', - `address` varchar(50) NOT NULL default '', - `mobile` varchar(30) NOT NULL default '', - `email` varchar(50) NOT NULL default '', - `url` varchar(50) NOT NULL default '', - `uptime` int(10) unsigned NOT NULL default '0', - `checked` tinyint(1) unsigned NOT NULL default '0', - `introduce` text, - `comface` varchar(255) NOT NULL default '', - PRIMARY KEY (`mid`) -) TYPE=MyISAM; - DROP TABLE IF EXISTS `#@__member_flink`; CREATE TABLE `#@__member_flink` ( - `aid` mediumint(8) unsigned NOT NULL auto_increment, - `mid` mediumint(8) unsigned NOT NULL default '0', - `title` varchar(30) NOT NULL default '', - `url` varchar(100) NOT NULL default '', + `aid` mediumint(8) unsigned NOT NULL auto_increment COMMENT '文档id', + `mid` mediumint(8) unsigned NOT NULL default '0' COMMENT '会员id', + `title` varchar(30) NOT NULL default '' COMMENT '标题', + `url` varchar(100) NOT NULL default '' COMMENT '链接', PRIMARY KEY (`aid`) ) TYPE=MyISAM; -DROP TABLE IF EXISTS `#@__member_model`; -CREATE TABLE `#@__member_model` ( - `id` int(10) NOT NULL auto_increment, - `name` varchar(20) NOT NULL, - `table` varchar(30) NOT NULL, - `description` varchar(255) NOT NULL, - `state` int(2) NOT NULL default '0', - `issystem` int(2) NOT NULL default '0', - `info` text NOT NULL, - PRIMARY KEY (`id`) -) TYPE=MyISAM; - DROP TABLE IF EXISTS `#@__member_operation`; CREATE TABLE `#@__member_operation` ( - `aid` int(11) NOT NULL auto_increment, - `buyid` varchar(80) NOT NULL default '', - `pname` varchar(50) NOT NULL default '', - `product` varchar(10) NOT NULL default '', - `money` int(11) NOT NULL default '0', - `mtime` int(11) NOT NULL default '0', - `pid` int(11) NOT NULL default '0', - `mid` int(11) NOT NULL default '0', - `sta` int(11) NOT NULL default '0', - `oldinfo` varchar(200) NOT NULL default '', + `aid` int(11) NOT NULL auto_increment COMMENT '文档id', + `buyid` varchar(80) NOT NULL default '' COMMENT '订单号', + `pname` varchar(50) NOT NULL default '' COMMENT '产品名称', + `product` varchar(10) NOT NULL default '' COMMENT '产品类型 card:点数卡 archive:购买文档 stc:兑换金币 空:会员升级 默认为会员升级', + `money` int(11) NOT NULL default '0' COMMENT '金币', + `mtime` int(11) NOT NULL default '0' COMMENT '时间', + `pid` int(11) NOT NULL default '0' COMMENT '产品id', + `mid` int(11) NOT NULL default '0' COMMENT '会员id', + `sta` int(11) NOT NULL default '0' COMMENT '状态 0:未付款 1:已付款 2:已完成', + `oldinfo` varchar(200) NOT NULL default '' COMMENT '操作信息', PRIMARY KEY (`aid`), KEY `buyid` (`buyid`), KEY `pid` (`pid`,`mid`,`sta`) ) TYPE=MyISAM; -DROP TABLE IF EXISTS `#@__member_person`; -CREATE TABLE `#@__member_person` ( - `mid` mediumint(8) unsigned NOT NULL default '0', - `onlynet` tinyint(1) unsigned NOT NULL default '1', - `sex` enum('男','女','保密') NOT NULL default '男', - `uname` char(30) NOT NULL default '', - `qq` char(12) NOT NULL default '', - `msn` char(50) NOT NULL default '', - `tel` varchar(15) NOT NULL default '', - `mobile` varchar(15) NOT NULL default '', - `place` smallint(5) unsigned NOT NULL default '0', - `oldplace` smallint(5) unsigned NOT NULL default '0', - `birthday` date NOT NULL default '1980-01-01', - `star` smallint(6) unsigned NOT NULL default '1', - `income` smallint(6) NOT NULL default '0', - `education` smallint(6) NOT NULL default '0', - `height` smallint(5) unsigned NOT NULL default '160', - `bodytype` smallint(6) NOT NULL default '0', - `blood` smallint(6) NOT NULL default '0', - `vocation` smallint(6) NOT NULL default '0', - `smoke` smallint(6) NOT NULL default '0', - `marital` smallint(6) NOT NULL default '0', - `house` smallint(6) NOT NULL default '0', - `drink` smallint(6) NOT NULL default '0', - `datingtype` smallint(6) NOT NULL default '0', - `language` set('普通话','上海话','广东话','英语','日语','韩语','法语','意大利语','德语','西班牙语','俄语','阿拉伯语') default NULL, - `nature` set('性格外向','性格内向','活泼开朗','豪放不羁','患得患失','冲动','幽默','稳重','轻浮','沉默寡言','多愁善感','时喜时悲','附庸风雅','能说会道','坚强','脆弱','幼稚','成熟','快言快语','损人利己','狡猾善变','交际广泛','优柔寡断','自私','真诚','独立','依赖','难以琢磨','悲观消极','郁郁寡欢','胆小怕事','乐观向上','任性','自负','自卑','拜金','温柔体贴','小心翼翼','暴力倾向','逆来顺受','不拘小节','暴躁','倔强','豪爽','害羞','婆婆妈妈','敢做敢当','助人为乐','耿直','虚伪','孤僻','老实','守旧','敏感','迟钝','婆婆妈妈','武断','果断','刻薄') default NULL, - `lovemsg` varchar(100) NOT NULL default '', - `address` varchar(50) NOT NULL default '', - `uptime` int(10) unsigned NOT NULL default '0', - PRIMARY KEY (`mid`) -) TYPE=MyISAM; - DROP TABLE IF EXISTS `#@__member_pms`; CREATE TABLE `#@__member_pms` ( - `id` int(10) unsigned NOT NULL auto_increment, - `floginid` varchar(20) NOT NULL default '', - `fromid` mediumint(8) unsigned NOT NULL default '0', - `toid` mediumint(8) unsigned NOT NULL default '0', - `tologinid` char(20) NOT NULL default '', - `folder` enum('inbox','outbox') default 'inbox', - `subject` varchar(60) NOT NULL default '', - `sendtime` int(10) unsigned NOT NULL default '0', - `writetime` int(10) unsigned NOT NULL default '0', - `hasview` tinyint(1) unsigned NOT NULL default '0', - `isadmin` tinyint(1) NOT NULL default '0', - `message` text, + `id` int(10) unsigned NOT NULL auto_increment COMMENT '短信id', + `floginid` varchar(20) NOT NULL default '' COMMENT '发送人用户名', + `fromid` mediumint(8) unsigned NOT NULL default '0' COMMENT '发送人id', + `toid` mediumint(8) unsigned NOT NULL default '0' COMMENT '接收人id', + `tologinid` char(20) NOT NULL default '' COMMENT '接收人用户名', + `folder` enum('inbox','outbox') default 'inbox' COMMENT '类型 inbox:收件箱 outbox:发件箱', + `subject` varchar(60) NOT NULL default '' COMMENT '主题', + `sendtime` int(10) unsigned NOT NULL default '0' COMMENT '发送时间', + `writetime` int(10) unsigned NOT NULL default '0' COMMENT '编写时间', + `hasview` tinyint(1) unsigned NOT NULL default '0' COMMENT '是否阅读 0:未阅读 1:已阅读', + `isadmin` tinyint(1) NOT NULL default '0' COMMENT '是否是管理信息 0:否 1:是 默认是', + `message` text COMMENT '消息内容', PRIMARY KEY (`id`), KEY `sendtime` (`sendtime`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__member_space`; CREATE TABLE `#@__member_space` ( - `mid` mediumint(8) unsigned NOT NULL default '0', - `pagesize` smallint(5) unsigned NOT NULL default '10', - `matt` smallint(6) NOT NULL default '0', - `spacename` varchar(50) NOT NULL default '', - `spacelogo` varchar(50) NOT NULL default '', - `spacestyle` varchar(20) NOT NULL default '', - `sign` varchar(100) NOT NULL default '没签名', + `mid` mediumint(8) unsigned NOT NULL default '0' COMMENT '会员id', + `pagesize` smallint(5) unsigned NOT NULL default '10' COMMENT '消息内容', + `matt` smallint(6) NOT NULL default '0' COMMENT '空间权限', + `spacename` varchar(50) NOT NULL default '' COMMENT '空间名称', + `spacelogo` varchar(50) NOT NULL default '' COMMENT '空间Logo', + `spacestyle` varchar(20) NOT NULL default '' COMMENT '空间主题', + `sign` varchar(100) NOT NULL default '没签名' COMMENT '用户签名', `spacenews` text, PRIMARY KEY (`mid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__member_stow`; CREATE TABLE `#@__member_stow` ( - `id` int(10) unsigned NOT NULL auto_increment, - `mid` mediumint(8) unsigned NOT NULL default '0', - `aid` mediumint(8) unsigned NOT NULL default '0', - `title` char(60) NOT NULL default '', - `addtime` int(10) unsigned NOT NULL default '0', - `type` varchar(10) default NULL, + `id` int(10) unsigned NOT NULL auto_increment COMMENT '收藏id', + `mid` mediumint(8) unsigned NOT NULL default '0' COMMENT '会员id', + `aid` mediumint(8) unsigned NOT NULL default '0' COMMENT '文档id', + `title` char(60) NOT NULL default '' COMMENT '标题', + `addtime` int(10) unsigned NOT NULL default '0' COMMENT '收藏时间', + `type` varchar(10) default NULL COMMENT '类型', PRIMARY KEY (`id`), KEY `uid` (`mid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__member_stowtype`; CREATE TABLE `#@__member_stowtype` ( - `stowname` varchar(30) NOT NULL, - `indexname` varchar(30) NOT NULL, - `indexurl` varchar(50) NOT NULL, + `stowname` varchar(30) NOT NULL COMMENT '收藏名称', + `indexname` varchar(30) NOT NULL COMMENT '名称', + `indexurl` varchar(50) NOT NULL COMMENT '地址', PRIMARY KEY (`stowname`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__member_tj`; CREATE TABLE `#@__member_tj` ( - `mid` mediumint(8) NOT NULL auto_increment, - `article` smallint(5) unsigned NOT NULL default '0', - `album` smallint(5) unsigned NOT NULL default '0', - `archives` smallint(5) unsigned NOT NULL default '0', - `homecount` int(10) unsigned NOT NULL default '0', - `pagecount` int(10) unsigned NOT NULL default '0', - `feedback` mediumint(8) unsigned NOT NULL default '0', - `friend` smallint(5) unsigned NOT NULL default '0', - `stow` smallint(5) unsigned NOT NULL default '0', - `soft` int(10) NOT NULL default '0', - `info` int(10) NOT NULL default '0', - `shop` int(10) NOT NULL default '0', + `mid` mediumint(8) NOT NULL auto_increment COMMENT '会员id', + `article` smallint(5) unsigned NOT NULL default '0' COMMENT '文章', + `album` smallint(5) unsigned NOT NULL default '0' COMMENT '相册', + `archives` smallint(5) unsigned NOT NULL default '0' COMMENT '文档', + `homecount` int(10) unsigned NOT NULL default '0' COMMENT '首页访问', + `pagecount` int(10) unsigned NOT NULL default '0' COMMENT '内容访问', + `feedback` mediumint(8) unsigned NOT NULL default '0' COMMENT '评论', + `friend` smallint(5) unsigned NOT NULL default '0' COMMENT '好友数', + `stow` smallint(5) unsigned NOT NULL default '0' COMMENT '收藏数', + `soft` int(10) NOT NULL default '0' COMMENT '软件', + `info` int(10) NOT NULL default '0' COMMENT '分类信息', + `shop` int(10) NOT NULL default '0' COMMENT '商品', PRIMARY KEY (`mid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__member_type`; CREATE TABLE `#@__member_type` ( - `aid` int(11) NOT NULL auto_increment, - `rank` int(11) NOT NULL default '0', - `pname` varchar(50) NOT NULL default '', - `money` int(11) NOT NULL default '0', - `exptime` int(11) NOT NULL default '30', + `aid` int(11) NOT NULL auto_increment COMMENT '文档id', + `rank` int(11) NOT NULL default '0' COMMENT '权值', + `pname` varchar(50) NOT NULL default '' COMMENT '类型名称', + `money` int(11) NOT NULL default '0' COMMENT '金币数', + `exptime` int(11) NOT NULL default '30' COMMENT '过期时间', PRIMARY KEY (`aid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__moneycard_record`; CREATE TABLE `#@__moneycard_record` ( - `aid` int(11) NOT NULL auto_increment, - `ctid` int(11) NOT NULL default '0', - `cardid` varchar(50) NOT NULL default '', - `uid` int(11) NOT NULL default '0', - `isexp` smallint(6) NOT NULL default '0', - `mtime` int(11) NOT NULL default '0', - `utime` int(11) NOT NULL default '0', - `money` int(11) NOT NULL default '0', - `num` int(11) NOT NULL default '0', + `aid` int(11) NOT NULL auto_increment COMMENT '积分卡id', + `ctid` int(11) NOT NULL default '0' COMMENT '类型', + `cardid` varchar(50) NOT NULL default '' COMMENT '卡号', + `uid` int(11) NOT NULL default '0' COMMENT '会员id', + `isexp` smallint(6) NOT NULL default '0' COMMENT '使用状态 0:未使用 1:已售出 -1:已使用', + `mtime` int(11) NOT NULL default '0' COMMENT '生成时间', + `utime` int(11) NOT NULL default '0' COMMENT '使用时间', + `money` int(11) NOT NULL default '0' COMMENT '积分数值', + `num` int(11) NOT NULL default '0' COMMENT '数量', PRIMARY KEY (`aid`), KEY `ctid` (`ctid`), KEY `cardid` (`cardid`), @@ -678,154 +592,145 @@ CREATE TABLE `#@__moneycard_record` ( DROP TABLE IF EXISTS `#@__moneycard_type`; CREATE TABLE `#@__moneycard_type` ( - `tid` int(11) NOT NULL auto_increment, - `num` int(11) NOT NULL default '500', - `money` int(11) NOT NULL default '50', - `pname` varchar(50) NOT NULL default '', + `tid` int(11) NOT NULL auto_increment COMMENT '类型id', + `num` int(11) NOT NULL default '500' COMMENT '积分卡数量', + `money` int(11) NOT NULL default '50' COMMENT '积分数值', + `pname` varchar(50) NOT NULL default '' COMMENT '名称', PRIMARY KEY (`tid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__mtypes`; CREATE TABLE `#@__mtypes` ( - `mtypeid` mediumint(8) unsigned NOT NULL auto_increment, - `mtypename` char(40) NOT NULL, - `channelid` smallint(6) NOT NULL default '1', - `mid` mediumint(8) unsigned NOT NULL default '0', + `mtypeid` mediumint(8) unsigned NOT NULL auto_increment COMMENT '会员分类id', + `mtypename` char(40) NOT NULL COMMENT '会员分类名称', + `channelid` smallint(6) NOT NULL default '1' COMMENT '模型id', + `mid` mediumint(8) unsigned NOT NULL default '0' COMMENT '会员id', PRIMARY KEY (`mtypeid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__myad`; CREATE TABLE `#@__myad` ( - `aid` mediumint(8) unsigned NOT NULL auto_increment, - `clsid` smallint(5) NOT NULL default 0, - `typeid` smallint(5) unsigned NOT NULL default '0', - `tagname` varchar(30) NOT NULL default '', - `adname` varchar(60) NOT NULL default '', - `timeset` smallint(6) NOT NULL default '0', - `starttime` int(10) unsigned NOT NULL default '0', - `endtime` int(10) unsigned NOT NULL default '0', - `normbody` text, - `expbody` text, + `aid` mediumint(8) unsigned NOT NULL auto_increment COMMENT '广告id', + `clsid` smallint(5) NOT NULL default 0 COMMENT '分类id', + `typeid` smallint(5) unsigned NOT NULL default '0' COMMENT '栏目id', + `tagname` varchar(30) NOT NULL default '' COMMENT '广告标记名称', + `adname` varchar(60) NOT NULL default '' COMMENT '广告名称', + `timeset` smallint(6) NOT NULL default '0' COMMENT '时间限制设置 0:不限时间 1:限制时间', + `starttime` int(10) unsigned NOT NULL default '0' COMMENT '开始投放时间', + `endtime` int(10) unsigned NOT NULL default '0' COMMENT '结束投放时间', + `normbody` text COMMENT '正常内容', + `expbody` text COMMENT '过期内容', PRIMARY KEY (`aid`), KEY `tagname` (`tagname`,`typeid`,`timeset`,`endtime`,`starttime`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__mytag`; CREATE TABLE `#@__mytag` ( - `aid` mediumint(8) unsigned NOT NULL auto_increment, - `typeid` smallint(5) unsigned NOT NULL default '0', - `tagname` varchar(30) NOT NULL default '', - `timeset` smallint(6) NOT NULL default '0', - `starttime` int(10) unsigned NOT NULL default '0', - `endtime` int(10) unsigned NOT NULL default '0', - `normbody` text, - `expbody` text, + `aid` mediumint(8) unsigned NOT NULL auto_increment COMMENT '标签id', + `typeid` smallint(5) unsigned NOT NULL default '0' COMMENT '栏目id', + `tagname` varchar(30) NOT NULL default '' COMMENT '标签名称', + `timeset` smallint(6) NOT NULL default '0' COMMENT '时间限制设置 0:不限时间 1:限制时间', + `starttime` int(10) unsigned NOT NULL default '0' COMMENT '开始时间', + `endtime` int(10) unsigned NOT NULL default '0' COMMENT '结束时间', + `normbody` text '正常内容', + `expbody` text COMMENT '过期内容', PRIMARY KEY (`aid`), KEY `tagname` (`tagname`,`typeid`,`timeset`,`endtime`,`starttime`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__plus`; CREATE TABLE `#@__plus` ( - `aid` mediumint(8) unsigned NOT NULL auto_increment, - `plusname` varchar(30) NOT NULL default '', - `menustring` varchar(200) NOT NULL default '', - `mainurl` varchar(50) NOT NULL default '', - `writer` varchar(30) NOT NULL default '', - `isshow` smallint(6) NOT NULL default '1', + `aid` mediumint(8) unsigned NOT NULL auto_increment COMMENT '插件id', + `plusname` varchar(30) NOT NULL default '' COMMENT '插件名称', + `menustring` varchar(200) NOT NULL default '' COMMENT '菜单', + `mainurl` varchar(50) NOT NULL default '' COMMENT '入口文件', + `writer` varchar(30) NOT NULL default '' COMMENT '开发者', + `isshow` smallint(6) NOT NULL default '1' COMMENT '是否显示 0:不显示 1:显示', `filelist` text, PRIMARY KEY (`aid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__purview`; CREATE TABLE `#@__purview` ( - `mid` mediumint(8) default '0', - `typeid` smallint(5) default '0', - `rank` smallint(6) default NULL, - `pkey` varchar(30) character set latin1 NOT NULL, - `pvalue` text NOT NULL, + `mid` mediumint(8) default '0' COMMENT '会员id', + `typeid` smallint(5) default '0' COMMENT '栏目id', + `rank` smallint(6) default NULL COMMENT '权限值', + `pkey` varchar(30) NOT NULL COMMENT '键名', + `pvalue` text NOT NULL COMMENT '键值', KEY `pkey` USING BTREE (`pkey`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__pwd_tmp`; CREATE TABLE `#@__pwd_tmp` ( - `mid` mediumint(8) NOT NULL, - `membername` char(16) NOT NULL default '', - `pwd` char(32) NOT NULL default '', - `mailtime` int(10) NOT NULL default '0', + `mid` mediumint(8) NOT NULL COMMENT '会员id', + `membername` char(16) NOT NULL default '' COMMENT '会员名称', + `pwd` char(32) NOT NULL default '' COMMENT '密码', + `mailtime` int(10) NOT NULL default '0' COMMENT '找回密码邮件时间', PRIMARY KEY (`mid`) ) TYPE=MyISAM; -DROP TABLE IF EXISTS `#@__ratings`; -CREATE TABLE `#@__ratings` ( - `id` varchar(11) NOT NULL, - `total_votes` int(11) NOT NULL default '0', - `total_value` int(11) NOT NULL default '0', - `used_ips` longtext, - PRIMARY KEY (`id`) -) TYPE=MyISAM; - DROP TABLE IF EXISTS `#@__scores`; CREATE TABLE `#@__scores` ( - `id` int(11) unsigned NOT NULL auto_increment, - `titles` char(15) NOT NULL, - `icon` smallint(6) unsigned default '0', - `integral` int(10) NOT NULL default '0', - `isdefault` tinyint(1) unsigned NOT NULL default '0', + `id` int(11) unsigned NOT NULL auto_increment '积分头衔id', + `titles` char(15) NOT NULL COMMENT '级别头衔', + `icon` smallint(6) unsigned default '0' COMMENT '星星数', + `integral` int(10) NOT NULL default '0' COMMENT '积分大于', + `isdefault` tinyint(1) unsigned NOT NULL default '0' COMMENT '是否默认 0:否 1:是', PRIMARY KEY (`id`), KEY `integral` (`integral`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__search_cache`; CREATE TABLE `#@__search_cache` ( - `hash` char(32) NOT NULL, - `lasttime` int(10) unsigned NOT NULL default '0', - `rsnum` mediumint(8) unsigned NOT NULL default '0', - `ids` mediumtext, + `hash` char(32) NOT NULL COMMENT '哈希', + `lasttime` int(10) unsigned NOT NULL default '0' COMMENT '最后搜索时间', + `rsnum` mediumint(8) unsigned NOT NULL default '0' COMMENT '结果数', + `ids` mediumtext COMMENT '内容id', PRIMARY KEY (`hash`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__search_keywords`; CREATE TABLE `#@__search_keywords` ( - `aid` mediumint(8) unsigned NOT NULL auto_increment, - `keyword` char(30) NOT NULL default '', - `spwords` char(50) NOT NULL default '', - `count` mediumint(8) unsigned NOT NULL default '1', - `result` mediumint(8) unsigned NOT NULL default '0', - `lasttime` int(10) unsigned NOT NULL default '0', - `channelid` smallint(5) unsigned NOT NULL default '0', - `typeid` smallint(5) unsigned NOT NULL default '0', + `aid` mediumint(8) unsigned NOT NULL auto_increment COMMENT '文档id', + `keyword` char(30) NOT NULL default '' COMMENT '关键词', + `spwords` char(50) NOT NULL default '' COMMENT '分词', + `count` mediumint(8) unsigned NOT NULL default '1' COMMENT '搜索次数', + `result` mediumint(8) unsigned NOT NULL default '0' COMMENT '结果数', + `lasttime` int(10) unsigned NOT NULL default '0' COMMENT '搜索时间', + `channelid` smallint(5) unsigned NOT NULL default '0' COMMENT '模型id', + `typeid` smallint(5) unsigned NOT NULL default '0' COMMENT '栏目id', PRIMARY KEY (`aid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__search_limits`; CREATE TABLE `#@__search_limits` ( - `ip` VARCHAR(200) NOT NULL, - `searchtime` int(11) NULL DEFAULT NULL, + `ip` VARCHAR(200) NOT NULL COMMENT '搜索ip', + `searchtime` int(11) NULL DEFAULT NULL COMMENT '搜索时间', PRIMARY KEY (`ip`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__search_sync`; CREATE TABLE `#@__search_sync` ( - `id` int unsigned NOT NULL auto_increment, - `aid` int NULL DEFAULT NULL, - `sync_status` tinyint NULL DEFAULT 0, - `add_at` int NULL DEFAULT NULL, - `update_at` int NULL DEFAULT NULL, + `id` int unsigned NOT NULL auto_increment COMMENT '同步id', + `aid` int NULL DEFAULT NULL COMMENT '文档id', + `sync_status` tinyint NULL DEFAULT 0 COMMENT '同步状态 0:未同步 9:已同步', + `add_at` int NULL DEFAULT NULL COMMENT '添加时间', + `update_at` int NULL DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`id`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__sgpage`; CREATE TABLE `#@__sgpage` ( - `aid` smallint(5) unsigned NOT NULL auto_increment, - `ismake` smallint(6) NOT NULL default '1', - `filename` varchar(60) NOT NULL default '', - `title` char(255) NOT NULL default '', - `keywords` varchar(255) NOT NULL default '', - `description` varchar(255) NOT NULL default '', - `template` varchar(30) NOT NULL default '', - `likeid` varchar(20) NOT NULL default '', - `uptime` int(10) unsigned NOT NULL default '0', - `body` mediumtext, + `aid` smallint(5) unsigned NOT NULL auto_increment COMMENT '文档id', + `ismake` smallint(6) NOT NULL default '1' COMMENT '是否生成 1:是 0:否', + `filename` varchar(60) NOT NULL default '' COMMENT '文件名称', + `title` char(255) NOT NULL default '' COMMENT '标题', + `keywords` varchar(255) NOT NULL default '' COMMENT '关键词', + `description` varchar(255) NOT NULL default '' COMMENT '描述', + `template` varchar(30) NOT NULL default '' COMMENT '模板', + `likeid` varchar(20) NOT NULL default '' COMMENT '关联id', + `uptime` int(10) unsigned NOT NULL default '0' COMMENT '创建时间', + `body` mediumtext COMMENT '内容', PRIMARY KEY (`aid`), KEY `ismake` (`ismake`,`uptime`), KEY `likeid` (`likeid`) @@ -833,47 +738,47 @@ CREATE TABLE `#@__sgpage` ( DROP TABLE IF EXISTS `#@__softconfig`; CREATE TABLE `#@__softconfig` ( - `downtype` smallint(6) NOT NULL default '0', - `ismoresite` smallint(6) NOT NULL default '0', - `gotojump` smallint(6) NOT NULL default '0', - `islocal` smallint(5) unsigned NOT NULL default '1', - `sites` text, - `downmsg` text, - `moresitedo` smallint(5) unsigned NOT NULL default '1', - `dfrank` smallint(5) unsigned NOT NULL default '0', - `dfywboy` smallint(5) unsigned NOT NULL default '0', - `argrange` smallint(5) unsigned NOT NULL default '0', + `downtype` smallint(6) NOT NULL default '0' COMMENT '下载类型', + `ismoresite` smallint(6) NOT NULL default '0' COMMENT '多站点', + `gotojump` smallint(6) NOT NULL default '0' COMMENT '是否跳转 0:否 1:是', + `islocal` smallint(5) unsigned NOT NULL default '1' COMMENT '是否本地 1:是 0:否', + `sites` text COMMENT '站点', + `downmsg` text COMMENT '下载提示', + `moresitedo` smallint(5) unsigned NOT NULL default '1' COMMENT '镜像上传 1:是 0:否', + `dfrank` smallint(5) unsigned NOT NULL default '0' COMMENT '需要权限', + `dfywboy` smallint(5) unsigned NOT NULL default '0' COMMENT '金币', + `argrange` smallint(5) unsigned NOT NULL default '0' COMMENT '参数限制方式 1:所有软件均使用此权限 0:所有软件重新选择权限', PRIMARY KEY (`downtype`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__statistics`; CREATE TABLE `#@__statistics` ( - `id` int(11) NOT NULL auto_increment, - `sdate` int(11) DEFAULT NULL, - `pv` int(11) DEFAULT NULL, - `uv` int(11) DEFAULT NULL, - `ip` int(11) DEFAULT NULL, - `vv` int(11) DEFAULT NULL, + `id` int(11) NOT NULL auto_increment COMMENT '统计id', + `sdate` int(11) DEFAULT NULL COMMENT '日期', + `pv` int(11) DEFAULT NULL COMMENT 'pv', + `uv` int(11) DEFAULT NULL COMMENT 'uv', + `ip` int(11) DEFAULT NULL COMMENT 'ip', + `vv` int(11) DEFAULT NULL COMMENT 'vv', PRIMARY KEY (`id`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__statistics_detail`; CREATE TABLE `#@__statistics_detail` ( - `id` mediumint(8) unsigned NOT NULL auto_increment, - `t` int(11) DEFAULT NULL, - `created_date` int(11) DEFAULT NULL, - `created_hour` int(11) DEFAULT NULL, - `dduuid` varchar(32) DEFAULT NULL, - `ssid` varchar(32) DEFAULT NULL, - `ip` varchar(46) DEFAULT NULL, - `browser` varchar(50) DEFAULT NULL, - `device` varchar(50) DEFAULT NULL, - `device_type` varchar(10) DEFAULT NULL, - `os` varchar(20) DEFAULT NULL, - `url_type` tinyint DEFAULT NULL, - `typeid` int(11) DEFAULT NULL, - `aid` int(11) DEFAULT NULL, - `value` varchar(50) DEFAULT NULL, + `id` mediumint(8) unsigned NOT NULL auto_increment COMMENT '统计id', + `t` int(11) DEFAULT NULL COMMENT '时间', + `created_date` int(11) DEFAULT NULL COMMENT '创建日期', + `created_hour` int(11) DEFAULT NULL COMMENT '创建时间', + `dduuid` varchar(32) DEFAULT NULL COMMENT '用户唯一id', + `ssid` varchar(32) DEFAULT NULL COMMENT 'sessionid', + `ip` varchar(46) DEFAULT NULL COMMENT 'ip', + `browser` varchar(50) DEFAULT NULL COMMENT '浏览器', + `device` varchar(50) DEFAULT NULL COMMENT '设备', + `device_type` varchar(10) DEFAULT NULL COMMENT '设备类型', + `os` varchar(20) DEFAULT NULL COMMENT '系统', + `url_type` tinyint DEFAULT NULL COMMENT '地址类型', + `typeid` int(11) DEFAULT NULL COMMENT '栏目id', + `aid` int(11) DEFAULT NULL COMMENT '文档id', + `value` varchar(50) DEFAULT NULL COMMENT '值', PRIMARY KEY (`id`), KEY `idx_created_date_dduuid` (`created_date`,`dduuid`), KEY `idx_created_date_ip` (`created_date`,`ip`), @@ -882,138 +787,119 @@ CREATE TABLE `#@__statistics_detail` ( DROP TABLE IF EXISTS `#@__stepselect`; CREATE TABLE `#@__stepselect` ( - `id` mediumint(8) unsigned NOT NULL auto_increment, - `itemname` char(30) default NULL, - `egroup` char(20) default NULL, - `issign` tinyint(1) unsigned default '0', - `issystem` tinyint(1) unsigned NOT NULL default '0', + `id` mediumint(8) unsigned NOT NULL auto_increment COMMENT 'id', + `itemname` char(30) default NULL COMMENT '名称', + `egroup` char(20) default NULL COMMENT '组', + `issign` tinyint(1) unsigned default '0' COMMENT '层级', + `issystem` tinyint(1) unsigned NOT NULL default '0' COMMENT '是否系统 0:否 1:是', PRIMARY KEY (`id`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__sys_enum`; CREATE TABLE `#@__sys_enum` ( - `id` smallint(5) unsigned NOT NULL auto_increment, - `ename` char(30) NOT NULL default '', - `evalue` char(20) NOT NULL default '0', - `egroup` char(20) NOT NULL default '', - `disorder` smallint(5) unsigned NOT NULL default '0', - `issign` tinyint(1) unsigned NOT NULL default '1', + `id` smallint(5) unsigned NOT NULL auto_increment COMMENT '枚举id', + `ename` char(30) NOT NULL default '' COMMENT '名称', + `evalue` char(20) NOT NULL default '0' COMMENT '值', + `egroup` char(20) NOT NULL default '' COMMENT '组', + `disorder` smallint(5) unsigned NOT NULL default '0' COMMENT '排序', + `issign` tinyint(1) unsigned NOT NULL default '1' COMMENT '层级', PRIMARY KEY (`id`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__sys_module`; CREATE TABLE `#@__sys_module` ( - `id` int(11) NOT NULL auto_increment, - `hashcode` char(32) NOT NULL default '', - `modname` varchar(30) NOT NULL default '', - `indexname` varchar(20) NOT NULL default '', - `indexurl` varchar(30) NOT NULL default '', - `ismember` tinyint(4) NOT NULL default '1', - `menustring` text, + `id` int(11) NOT NULL auto_increment COMMENT 'id', + `hashcode` char(32) NOT NULL default '' COMMENT '模型哈希', + `modname` varchar(30) NOT NULL default '' COMMENT '模块名称', + `indexname` varchar(20) NOT NULL default '' COMMENT '入口名', + `indexurl` varchar(30) NOT NULL default '' COMMENT '入口地址', + `ismember` tinyint(4) NOT NULL default '1' COMMENT '是否会员 0:官方 1:用户', + `menustring` text COMMENT '菜单配置', PRIMARY KEY (`id`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__sys_payment`; CREATE TABLE `#@__sys_payment` ( - `id` int(11) unsigned NOT NULL auto_increment, - `code` varchar(20) NOT NULL DEFAULT '', - `name` varchar(32) NOT NULL DEFAULT '', - `short_name` varchar(32) DEFAULT '', - `sortrank` int(3) unsigned NOT NULL DEFAULT '0', - `config` text NOT NULL, - `status` int(3) unsigned NOT NULL DEFAULT '0', + `id` int(11) unsigned NOT NULL auto_increment COMMENT 'id', + `code` varchar(20) NOT NULL DEFAULT '' COMMENT '代码', + `name` varchar(32) NOT NULL DEFAULT '' COMMENT '名称', + `short_name` varchar(32) DEFAULT '' COMMENT '简称', + `sortrank` int(3) unsigned NOT NULL DEFAULT '0' COMMENT '排序', + `config` text NOT NULL COMMENT '配置', + `status` int(3) unsigned NOT NULL DEFAULT '0' COMMENT '状态 0:禁用 1:启用', PRIMARY KEY (`id`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__sys_set`; CREATE TABLE `#@__sys_set` ( - `id` smallint(5) unsigned NOT NULL auto_increment, - `sname` char(20) NOT NULL default '', - `items` text, - PRIMARY KEY (`id`) -) TYPE=MyISAM; - -DROP TABLE IF EXISTS `#@__sys_task`; -CREATE TABLE `#@__sys_task` ( - `id` int(10) unsigned NOT NULL auto_increment, - `taskname` varchar(50) NOT NULL, - `dourl` varchar(100) NOT NULL, - `islock` tinyint(1) unsigned NOT NULL default '0', - `runtype` tinyint(1) unsigned NOT NULL default '0', - `runtime` varchar(10) default '0000', - `starttime` int(10) unsigned NOT NULL default '0', - `endtime` int(10) unsigned NOT NULL default '0', - `freq` tinyint(2) unsigned NOT NULL default '0', - `lastrun` int(10) unsigned NOT NULL default '0', - `description` varchar(255) NOT NULL, - `parameter` text, - `settime` int(10) unsigned NOT NULL default '0', - `sta` enum('运行','成功','失败') default NULL, + `id` smallint(5) unsigned NOT NULL auto_increment COMMENT 'id', + `sname` char(20) NOT NULL default '' COMMENT '名称', + `items` text COMMENT '项', PRIMARY KEY (`id`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__sysconfig`; CREATE TABLE `#@__sysconfig` ( - `aid` smallint(8) unsigned NOT NULL default '0', - `varname` varchar(20) NOT NULL default '', - `info` varchar(100) NOT NULL default '', - `groupid` smallint(6) NOT NULL default '1', - `type` varchar(10) NOT NULL default 'string', - `value` text, + `aid` smallint(8) unsigned NOT NULL default '0' COMMENT '配置id', + `varname` varchar(20) NOT NULL default '' COMMENT '名称', + `info` varchar(100) NOT NULL default '' COMMENT '介绍', + `groupid` smallint(6) NOT NULL default '1' COMMENT '组', + `type` varchar(10) NOT NULL default 'string' COMMENT '类型 string:文本 number:数字 bool:布尔 bstring:多行文本 img:图片', + `value` text COMMENT '值', PRIMARY KEY (`varname`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__tagindex`; CREATE TABLE `#@__tagindex` ( - `id` int(10) NOT NULL AUTO_INCREMENT, - `tag` varchar(255) NOT NULL DEFAULT '', - `title` varchar(255) DEFAULT NULL, - `keywords` varchar(255) DEFAULT NULL, - `description` varchar(255) DEFAULT NULL, - `typeid` smallint(5) UNSIGNED NOT NULL DEFAULT '0', - `count` int(10) UNSIGNED NOT NULL DEFAULT '0', - `total` int(10) UNSIGNED NOT NULL DEFAULT '0', - `weekcc` int(10) UNSIGNED NOT NULL DEFAULT '0', - `monthcc` int(10) UNSIGNED NOT NULL DEFAULT '0', - `weekup` int(10) UNSIGNED NOT NULL DEFAULT '0', - `monthup` int(10) UNSIGNED NOT NULL DEFAULT '0', - `addtime` int(10) UNSIGNED NOT NULL DEFAULT '0', - `uptime` int(10) UNSIGNED NOT NULL DEFAULT '0', - `mktime` int(10) UNSIGNED NOT NULL DEFAULT '0', + `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '标签id', + `tag` varchar(255) NOT NULL DEFAULT '' COMMENT 'tag', + `title` varchar(255) DEFAULT NULL COMMENT '标题', + `keywords` varchar(255) DEFAULT NULL COMMENT '关键词', + `description` varchar(255) DEFAULT NULL COMMENT '描述', + `typeid` smallint(5) UNSIGNED NOT NULL DEFAULT '0' COMMENT '栏目id', + `count` int(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '点击数', + `total` int(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '文章数', + `weekcc` int(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '周点击数', + `monthcc` int(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '月点击数', + `weekup` int(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '周更新数', + `monthup` int(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '月更新数', + `addtime` int(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '添加时间', + `uptime` int(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '更新时间', + `mktime` int(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '生成时间', PRIMARY KEY (`id`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__tagindex_infos`; CREATE TABLE `#@__tagindex_infos` ( - `tagid` int NOT NULL, - `litpic` varchar(255) DEFAULT NULL, - `body` mediumtext CHARACTER SET utf8 COLLATE utf8_general_ci, + `tagid` int NOT NULL COMMENT '标签id', + `litpic` varchar(255) DEFAULT NULL COMMENT '缩略图', + `body` mediumtext COMMENT '内容', PRIMARY KEY (`tagid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__taglist`; CREATE TABLE `#@__taglist` ( - `tid` int(10) unsigned NOT NULL default '0', - `aid` int(10) unsigned NOT NULL default '0', - `arcrank` smallint(6) NOT NULL default '0', - `typeid` smallint(5) unsigned NOT NULL default '0', - `tag` varchar(255) NOT NULL default '', + `tid` int(10) unsigned NOT NULL default '0' COMMENT '标签id', + `aid` int(10) unsigned NOT NULL default '0' COMMENT '文档id', + `arcrank` smallint(6) NOT NULL default '0' COMMENT '浏览权限', + `typeid` smallint(5) unsigned NOT NULL default '0' COMMENT '栏目id', + `tag` varchar(255) NOT NULL default '' COMMENT '标签', PRIMARY KEY (`tid`,`aid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__uploads`; CREATE TABLE `#@__uploads` ( - `aid` mediumint(8) unsigned NOT NULL auto_increment, - `arcid` mediumint(8) unsigned NOT NULL default '0', - `title` char(60) NOT NULL default '', - `url` char(80) NOT NULL default '', - `mediatype` smallint(6) NOT NULL default '1', - `width` char(10) NOT NULL default '', - `height` char(10) NOT NULL default '', - `playtime` char(10) NOT NULL default '', - `filesize` mediumint(8) unsigned NOT NULL default '0', - `uptime` int(10) unsigned NOT NULL default '0', - `mid` mediumint(8) unsigned NOT NULL default '0', + `aid` mediumint(8) unsigned NOT NULL auto_increment COMMENT '附件id', + `arcid` mediumint(8) unsigned NOT NULL default '0' COMMENT '文档id', + `title` char(60) NOT NULL default '' COMMENT '文件名称', + `url` char(80) NOT NULL default '' COMMENT '地址', + `mediatype` smallint(6) NOT NULL default '1' COMMENT '类型 1:图片 2:动画 3:视频 4:软件', + `width` char(10) NOT NULL default '' COMMENT '宽度', + `height` char(10) NOT NULL default '' COMMENT '高度', + `playtime` char(10) NOT NULL default '' COMMENT '播放时长', + `filesize` mediumint(8) unsigned NOT NULL default '0' COMMENT '文件尺寸', + `uptime` int(10) unsigned NOT NULL default '0' COMMENT '上传时间', + `mid` mediumint(8) unsigned NOT NULL default '0' COMMENT '会员id', PRIMARY KEY (`aid`), KEY `memberid` (`mid`), KEY `arcid` (`arcid`) @@ -1021,47 +907,47 @@ CREATE TABLE `#@__uploads` ( DROP TABLE IF EXISTS `#@__verifies`; CREATE TABLE `#@__verifies` ( - `nameid` char(32) NOT NULL default '', - `cthash` varchar(32) NOT NULL default '', - `method` enum('local','official') NOT NULL default 'official', - `filename` varchar(254) NOT NULL default '', + `nameid` char(32) NOT NULL default '' COMMENT '文件名', + `cthash` varchar(32) NOT NULL default '' COMMENT '文件哈希', + `method` enum('local','official') NOT NULL default 'official' COMMENT '类型 local:本地 official:官方', + `filename` varchar(254) NOT NULL default '' COMMENT '文件名', PRIMARY KEY (`nameid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__vote`; CREATE TABLE `#@__vote` ( - `aid` mediumint(8) unsigned NOT NULL auto_increment, - `votename` varchar(50) NOT NULL default '', - `starttime` int(10) unsigned NOT NULL default '0', - `endtime` int(10) unsigned NOT NULL default '0', - `totalcount` mediumint(8) unsigned NOT NULL default '0', - `ismore` tinyint(6) NOT NULL default '0', - `isallow` tinyint(6) NOT NULL default '0', - `view` tinyint(6) NOT NULL default '0', - `spec` int(20) unsigned NOT NULL default '0', - `isenable` tinyint(6) NOT NULL default '0', - `votenote` text, + `aid` mediumint(8) unsigned NOT NULL auto_increment COMMENT '投票id', + `votename` varchar(50) NOT NULL default '' COMMENT '投票名称', + `starttime` int(10) unsigned NOT NULL default '0' COMMENT '开始时间', + `endtime` int(10) unsigned NOT NULL default '0' COMMENT '结束时间', + `totalcount` mediumint(8) unsigned NOT NULL default '0' COMMENT '投票总人数', + `ismore` tinyint(6) NOT NULL default '0' COMMENT '是否允许多选 0:单选 1:多选'', + `isallow` tinyint(6) NOT NULL default '0' COMMENT '是否允许游客投票 0:允许 1:不允许', + `view` tinyint(6) NOT NULL default '0' COMMENT '是否允许查看投票 0:允许 1:不允许', + `spec` int(20) unsigned NOT NULL default '0' COMMENT '投票时间间隔（N天后可再次投票，0表示此ip地址只能投一次）', + `isenable` tinyint(6) NOT NULL default '0' COMMENT '是否启用该投票 0:启用 1:不启用', + `votenote` text COMMENT '投票项内容', PRIMARY KEY (`aid`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__vote_member`; CREATE TABLE `#@__vote_member` ( - `id` mediumint(8) unsigned NOT NULL auto_increment, - `voteid` int(10) unsigned NOT NULL default '0', - `userid` varchar(50) NOT NULL default '', - `uptime` int(10) unsigned NOT NULL default '0', + `id` mediumint(8) unsigned NOT NULL auto_increment COMMENT '投票记录id', + `voteid` int(10) unsigned NOT NULL default '0' COMMENT '投票id', + `userid` varchar(50) NOT NULL default '' COMMENT '用户id', + `uptime` int(10) unsigned NOT NULL default '0' COMMENT '投票时间', PRIMARY KEY (`id`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__dl_log`; CREATE TABLE `#@__dl_log` ( - `id` mediumint(10) unsigned NOT NULL auto_increment, - `ip` char(46) NOT NULL, - `lang` char(6) NOT NULL, - `dtype` varchar(10) NOT NULL, - `dltime` int(10) unsigned NOT NULL default '0', - `referrer` varchar(255) NOT NULL default '', - `user_agent` varchar(255) NOT NULL, + `id` mediumint(10) unsigned NOT NULL auto_increment COMMENT '下载id', + `ip` char(46) NOT NULL COMMENT 'ip', + `lang` char(6) NOT NULL COMMENT '语言', + `dtype` varchar(10) NOT NULL COMMENT '下载类型', + `dltime` int(10) unsigned NOT NULL default '0' COMMENT '下载时间', + `referrer` varchar(255) NOT NULL default '' COMMENT '来源', + `user_agent` varchar(255) NOT NULL COMMENT 'User-Agent', PRIMARY KEY (`id`), KEY `dltime` (`dltime`), KEY `dl_ip` (`ip`,`dltime`) @@ -1069,14 +955,14 @@ CREATE TABLE `#@__dl_log` ( DROP TABLE IF EXISTS `#@__myadtype`; CREATE TABLE `#@__myadtype` ( - `id` mediumint(8) unsigned NOT NULL auto_increment, - `typename` varchar(50) NOT NULL default '', + `id` mediumint(8) unsigned NOT NULL auto_increment COMMENT '广告类型id', + `typename` varchar(50) NOT NULL default '' COMMENT '类型名称', PRIMARY KEY (`id`) ) TYPE=MyISAM; DROP TABLE IF EXISTS `#@__ai`; CREATE TABLE `#@__ai` ( - `id` int NOT NULL AUTO_INCREMENT, + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', `title` varchar(255) DEFAULT NULL COMMENT '名称', `apikey` varchar(255) DEFAULT NULL COMMENT 'apikey', `baseurl` varchar(255) DEFAULT NULL COMMENT '接口地址', @@ -1088,7 +974,7 @@ CREATE TABLE `#@__ai` ( DROP TABLE IF EXISTS `#@__ai_log`; CREATE TABLE `#@__ai_log` ( - `lid` mediumint unsigned NOT NULL AUTO_INCREMENT, + `lid` mediumint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', `adminid` smallint unsigned NOT NULL DEFAULT '0' COMMENT '管理员ID', `aimid` int DEFAULT NULL COMMENT '模型ID', `model` varchar(100) DEFAULT NULL COMMENT '模型名称', @@ -1116,7 +1002,7 @@ CREATE TABLE `#@__ai_model` ( DROP TABLE IF EXISTS `#@__ai_prompt`; CREATE TABLE `#@__ai_prompt` ( - `id` int NOT NULL AUTO_INCREMENT, + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', `pname` varchar(60) NOT NULL COMMENT '标识', `title` varchar(255) DEFAULT NULL COMMENT '名称', `issystem` tinyint unsigned DEFAULT '0' COMMENT '系统内置 0:否 1:是', From d75e33573366dab827f676335930f9dfd98ef5d0 Mon Sep 17 00:00:00 2001 From: tianya Date: Tue, 29 Apr 2025 23:12:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/archives_do.php | 4 +- src/admin/dialog/select_images_post.php | 6 +- src/admin/inc/inc_archives_functions.php | 2 +- src/admin/member_do.php | 4 - src/admin/sys_admin_user_add.php | 5 +- src/admin/templets/ad_main.htm | 2 +- src/admin/templets/album_add.htm | 4 +- src/admin/templets/archives_add.htm | 8 +- src/admin/templets/article_add.htm | 8 +- .../templets/article_description_main.htm | 2 +- src/admin/templets/article_keywords_main.htm | 2 +- src/admin/templets/article_test_same.htm | 2 +- src/admin/templets/cards_make.htm | 2 +- src/admin/templets/catalog_add.htm | 16 +- src/admin/templets/catalog_edit.htm | 15 +- src/admin/templets/content_s_list.htm | 2 +- src/admin/templets/content_select_list.htm | 2 +- src/admin/templets/content_sg_list.htm | 2 +- src/admin/templets/diy_list.htm | 2 +- src/admin/templets/feedback_main.htm | 2 +- src/admin/templets/friendlink_main.htm | 2 +- src/admin/templets/log_list.htm | 2 +- src/admin/templets/media_main.htm | 2 +- src/admin/templets/member_main.htm | 2 +- src/admin/templets/member_operations.htm | 2 +- src/admin/templets/member_pm.htm | 2 +- src/admin/templets/member_pmall.htm | 2 +- src/admin/templets/member_pmone.htm | 2 +- src/admin/templets/mychannel_add.htm | 10 +- src/admin/templets/mychannel_edit.htm | 15 +- src/admin/templets/soft_add.htm | 2 +- src/admin/templets/spec_add.htm | 2 +- src/admin/templets/sys_data_replace.htm | 2 +- src/admin/templets/sys_data_revert.htm | 2 +- src/admin/templets/vote_getcode.htm | 2 +- src/static/web/js/admin.main.js | 17 +- src/system/archive/archives.class.php | 202 +++++++++++------- src/system/archive/freelist.class.php | 92 ++++---- src/system/archive/listview.class.php | 34 +-- src/system/archive/searchview.class.php | 18 +- src/system/archive/sglistview.class.php | 32 +-- src/system/archive/specview.class.php | 36 ++-- src/system/archive/taglist.class.php | 32 +-- src/system/dedecollection.func.php | 10 +- src/system/helpers/upload.helper.php | 2 +- src/system/libraries/dedehttpdown.class.php | 2 +- src/system/taglib/channel/img.lib.php | 4 +- src/theme/dedebiz/article_default.htm | 2 +- src/theme/dedebiz/article_default_sg.htm | 2 +- src/theme/dedebiz/article_image.htm | 22 +- src/user/inc/inc_archives_functions.php | 2 +- 51 files changed, 329 insertions(+), 323 deletions(-) diff --git a/src/admin/archives_do.php b/src/admin/archives_do.php index 0107ac8e..643ba2aa 100644 --- a/src/admin/archives_do.php +++ b/src/admin/archives_do.php @@ -113,8 +113,8 @@ else if ($dopost == "viewArchives") { $arcRow['money'], $arcRow['filename'] ); - if (preg_match("#^http:#", $arcfile)) { - $arcfile = preg_replace("#^http:\/\/([^\/]*)\/#i", '/', $arcfile); + if (preg_match("#^https?://#", $arcfile)) { + $arcfile = preg_replace("#^https?://[^/]+/#i", '/', $arcfile); } $truefile = GetTruePath().$arcfile; if (!file_exists($truefile)) { diff --git a/src/admin/dialog/select_images_post.php b/src/admin/dialog/select_images_post.php index b7e5bb14..21e2ea49 100644 --- a/src/admin/dialog/select_images_post.php +++ b/src/admin/dialog/select_images_post.php @@ -86,7 +86,11 @@ $fid = $dsql->GetLastID(); AddMyAddon($fid, $activepath.'/'.$filename); $CKUpload = isset($CKUpload) ? $CKUpload : FALSE; if ($GLOBALS['cfg_html_editor'] == 'ckeditor' && $CKUpload) { - $fileurl = $activepath.'/'.$filename; + if ($GLOBALS['cfg_multi_site'] == 'Y') { + $fileurl = $GLOBALS['cfg_mainsite'].$activepath.'/'.$filename; + } else { + $fileurl = $activepath.'/'.$filename; + } $result = array('url' => $fileurl, "uploaded" => 1, 'fileName' => $filename); echo json_encode($result); exit; diff --git a/src/admin/inc/inc_archives_functions.php b/src/admin/inc/inc_archives_functions.php index a566d257..164085d4 100644 --- a/src/admin/inc/inc_archives_functions.php +++ b/src/admin/inc/inc_archives_functions.php @@ -44,7 +44,7 @@ function GetCurContentAlbum($body, $rfurl, &$firstdd) foreach ($img_array as $key => $value) { $value = trim($value); if ( - preg_match("#".$basehost."#i", $value) || !preg_match("#^http:\/\/#i", $value) || ($cfg_basehost != $basehost && preg_match("#".$cfg_basehost."#i", $value))) { + preg_match("#".$basehost."#i", $value) || !preg_match("#^(http|https):\/\/#i", $value) || ($cfg_basehost != $basehost && preg_match("#".$cfg_basehost."#i", $value))) { continue; } $itype = substr($value, -4, 4); diff --git a/src/admin/member_do.php b/src/admin/member_do.php index 0250b2d3..8f666754 100644 --- a/src/admin/member_do.php +++ b/src/admin/member_do.php @@ -37,8 +37,6 @@ if ($dopost == "delmember") { if ($rs > 0) { $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_tj` WHERE mid='$id' LIMIT 1"); $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_space` WHERE mid='$id' LIMIT 1"); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_company` WHERE mid='$id' LIMIT 1"); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_person` WHERE mid='$id' LIMIT 1"); //删除会员相关数据 $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_stow` WHERE mid='$id' "); $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_flink` WHERE mid='$id' "); @@ -83,8 +81,6 @@ if ($dopost == "delmember") { if ($rs > 0) { $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_tj` WHERE mid IN (".str_replace("`", ",", $id).") "); $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_space` WHERE mid IN (".str_replace("`", ",", $id).") "); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_company` WHERE mid IN (".str_replace("`", ",", $id).") "); - $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_person` WHERE mid IN (".str_replace("`", ",", $id).") "); //删除会员相关数据 $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_stow` WHERE mid IN (".str_replace("`", ",", $id).") "); $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_flink` WHERE mid IN (".str_replace("`", ",", $id).") "); diff --git a/src/admin/sys_admin_user_add.php b/src/admin/sys_admin_user_add.php index 1d1464cc..b778ce8f 100644 --- a/src/admin/sys_admin_user_add.php +++ b/src/admin/sys_admin_user_add.php @@ -55,13 +55,10 @@ if ($dopost == 'add') { $inquery = "INSERT INTO `#@__admin`(id,usertype,userid,$pfd,uname,typeid,tname,email) VALUES ('$mid','$usertype','$userid','$pwd','$uname','$typeid','$tname','$email'); "; $rs = $dsql->ExecuteNoneQuery($inquery); - $adminquery = "INSERT INTO `#@__member_person` (`mid`,`onlynet`,`sex`,`uname`,`qq`,`msn`,`tel`,`mobile`,`place`,`oldplace`,`birthday`,`star`,`income`,`education`,`height`,`bodytype`,`blood`,`vocation`,`smoke`,`marital`,`house`,`drink`,`datingtype`,`language`,`nature`,`lovemsg`,`address`,`uptime`) - VALUES ('$mid', '1', '男', '{$userid}', '', '', '', '', '0', '0','1980-01-01', '1', '0', '0', '160', '0', '0', '0', '0', '0', '0','0', '0', '', '', '', '','0'); "; - $dsql->ExecuteNoneQuery($adminquery); $adminquery = "INSERT INTO `#@__member_tj` (`mid`,`article`,`album`,`archives`,`homecount`,`pagecount`,`feedback`,`friend`,`stow`) VALUES ('$mid','0','0','0','0','0','0','0','0'); "; $dsql->ExecuteNoneQuery($adminquery); - $adminquery = "Insert Into `#@__member_space` (`mid`,`pagesize`,`matt`,`spacename`,`spacelogo`,`spacestyle`,`sign`,`spacenews`) + $adminquery = "INSERT INTO `#@__member_space` (`mid`,`pagesize`,`matt`,`spacename`,`spacelogo`,`spacestyle`,`sign`,`spacenews`) VALUES ('$mid','10','0','{$uname}的主页','','person','',''); "; $dsql->ExecuteNoneQuery($adminquery); ShowMsg('成功添加一个账户', 'sys_admin_user.php'); diff --git a/src/admin/templets/ad_main.htm b/src/admin/templets/ad_main.htm index 63eba918..7d9d28aa 100644 --- a/src/admin/templets/ad_main.htm +++ b/src/admin/templets/ad_main.htm @@ -24,7 +24,7 @@ - + 添加广告 广告分类管理 diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index 0d079049..e22522af 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -65,7 +65,7 @@ 跳转网址 - + 标签 （英文逗号隔开，如：DedeBIZ,得德） 权重 @@ -124,7 +124,7 @@ 关键词 - + diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm index 4b3745a9..dc4af0ee 100644 --- a/src/admin/templets/archives_add.htm +++ b/src/admin/templets/archives_add.htm @@ -61,7 +61,7 @@ 跳转网址 - + 标签 （英文逗号隔开，如：DedeBIZ,得德） 权重 @@ -127,11 +127,11 @@ 关键词 - + - + 描述 @@ -195,7 +195,7 @@ 文件名称 （不包括文件扩展名） - + 发布时间 关键词 - + @@ -288,10 +288,10 @@ const chars = event.data.split(''); chars.forEach(char => { if (lastChar === '\\' && char === 'r') { - char = '
'; //替换为br标签 - lastChar = ""; //清空追踪字符 + char = '
'; //替换为br标签 + lastChar = ""; //清空追踪字符 } else { - lastChar = char; //记录当前字符 + lastChar = char; //记录当前字符 } if (char === '\\') { return; //如果是反斜杠，跳过处理 diff --git a/src/admin/templets/article_description_main.htm b/src/admin/templets/article_description_main.htm index 06c3ca6f..136e9bb0 100644 --- a/src/admin/templets/article_description_main.htm +++ b/src/admin/templets/article_description_main.htm @@ -60,7 +60,7 @@ - + diff --git a/src/admin/templets/article_keywords_main.htm b/src/admin/templets/article_keywords_main.htm index ed973483..fbd25973 100644 --- a/src/admin/templets/article_keywords_main.htm +++ b/src/admin/templets/article_keywords_main.htm @@ -21,7 +21,7 @@ - + diff --git a/src/admin/templets/article_test_same.htm b/src/admin/templets/article_test_same.htm index 32769c51..4888d191 100644 --- a/src/admin/templets/article_test_same.htm +++ b/src/admin/templets/article_test_same.htm @@ -49,7 +49,7 @@ - + diff --git a/src/admin/templets/cards_make.htm b/src/admin/templets/cards_make.htm index d27f3409..eda66b10 100644 --- a/src/admin/templets/cards_make.htm +++ b/src/admin/templets/cards_make.htm @@ -56,7 +56,7 @@ - + diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm index 9bfb19f3..221007f5 100644 --- a/src/admin/templets/catalog_add.htm +++ b/src/admin/templets/catalog_add.htm @@ -350,14 +350,12 @@ if (obj.style.display != "none") obj.style.display = "none"; else { - if (Nav() == 'IE') obj.style.display = "block"; - else obj.style.display = "block"; + obj.style.display = "block"; } } function ShowObj(objname) { var obj = document.getElementById(objname); - if (Nav() == 'IE') obj.style.display = "block"; - else obj.style.display = "block"; + obj.style.display = "block"; } function HideObj(objname) { var obj = document.getElementById(objname); @@ -381,8 +379,7 @@ templist[0].value = dfstyleValue + "/list_" + sevvalue + ".htm"; temparticle[0].value = dfstyleValue + "/article_" + sevvalue + ".htm"; if (obj.value < 0) { - if (Nav() == 'IE') tobj.style.display = "block"; - else tobj.style.display = "block"; + tobj.style.display = "block"; } else { tobj.style.display = "none"; } @@ -415,7 +412,6 @@ $("#mdlAI").modal('show'); } $("#btnAIAction").click(async function() { - let prompt = document.getElementById("prompt").value; let modelid = document.getElementById("modelid").value; let req = await fetch(`api.php?action=get_ai_server&pname=catalog_add&modelid=${modelid}&prompt=${prompt}`); @@ -438,10 +434,10 @@ const chars = event.data.split(''); chars.forEach(char => { if (lastChar === '\\' && char === 'r') { - char = '
'; //替换为br标签 - lastChar = ""; //清空追踪字符 + char = '
'; //替换为br标签 + lastChar = ""; //清空追踪字符 } else { - lastChar = char; //记录当前字符 + lastChar = char; //记录当前字符 } if (char === '\\') { return; //如果是反斜杠，跳过处理 diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm index f410e8fd..149ce7d5 100644 --- a/src/admin/templets/catalog_edit.htm +++ b/src/admin/templets/catalog_edit.htm @@ -380,14 +380,12 @@ if (obj.style.display != "none") obj.style.display = "none"; else { - if (Nav() == 'IE') obj.style.display = "block"; - else obj.style.display = "block"; + obj.style.display = "block"; } } function ShowObj(objname) { var obj = document.getElementById(objname); - if (Nav() == 'IE') obj.style.display = "block"; - else obj.style.display = "block"; + obj.style.display = "block"; } function HideObj(objname) { var obj = document.getElementById(objname); @@ -411,8 +409,7 @@ templist[0].value = dfstyleValue + "/list_" + sevvalue + ".htm"; temparticle[0].value = dfstyleValue + "/article_" + sevvalue + ".htm"; if (obj.value < 0) { - if (Nav() == 'IE') tobj.style.display = "block"; - else tobj.style.display = "block"; + tobj.style.display = "block"; } else { tobj.style.display = "none"; } @@ -468,10 +465,10 @@ const chars = event.data.split(''); chars.forEach(char => { if (lastChar === '\\' && char === 'r') { - char = '
'; //替换为br标签 - lastChar = ""; //清空追踪字符 + char = '
'; //替换为br标签 + lastChar = ""; //清空追踪字符 } else { - lastChar = char; //记录当前字符 + lastChar = char; //记录当前字符 } if (char === '\\') { return; //如果是反斜杠，跳过处理 diff --git a/src/admin/templets/content_s_list.htm b/src/admin/templets/content_s_list.htm index da9cd424..617b888f 100644 --- a/src/admin/templets/content_s_list.htm +++ b/src/admin/templets/content_s_list.htm @@ -38,7 +38,7 @@ - + diff --git a/src/admin/templets/content_select_list.htm b/src/admin/templets/content_select_list.htm index cd7ce7f1..13553389 100644 --- a/src/admin/templets/content_select_list.htm +++ b/src/admin/templets/content_select_list.htm @@ -19,7 +19,7 @@ - + diff --git a/src/admin/templets/content_sg_list.htm b/src/admin/templets/content_sg_list.htm index 3e7b0eb0..ab26dc91 100644 --- a/src/admin/templets/content_sg_list.htm +++ b/src/admin/templets/content_sg_list.htm @@ -47,7 +47,7 @@ {dede:global.optionarr/} - + diff --git a/src/admin/templets/diy_list.htm b/src/admin/templets/diy_list.htm index 61fd618d..029305ca 100644 --- a/src/admin/templets/diy_list.htm +++ b/src/admin/templets/diy_list.htm @@ -77,7 +77,7 @@ - + 预览 diff --git a/src/admin/templets/feedback_main.htm b/src/admin/templets/feedback_main.htm index 22ebb565..b0d250c6 100644 --- a/src/admin/templets/feedback_main.htm +++ b/src/admin/templets/feedback_main.htm @@ -26,7 +26,7 @@ {dede:global.openarray/} - + diff --git a/src/admin/templets/friendlink_main.htm b/src/admin/templets/friendlink_main.htm index 9a263aa6..1e0579c3 100644 --- a/src/admin/templets/friendlink_main.htm +++ b/src/admin/templets/friendlink_main.htm @@ -31,7 +31,7 @@ } ?> - + 添加链接 网站类型管理 申请链接 diff --git a/src/admin/templets/log_list.htm b/src/admin/templets/log_list.htm index 223f01d7..b4a7c29c 100644 --- a/src/admin/templets/log_list.htm +++ b/src/admin/templets/log_list.htm @@ -29,7 +29,7 @@ - + diff --git a/src/admin/templets/media_main.htm b/src/admin/templets/media_main.htm index b8c0ad3d..ab394fed 100644 --- a/src/admin/templets/media_main.htm +++ b/src/admin/templets/media_main.htm @@ -30,7 +30,7 @@ - + 添加附件 diff --git a/src/admin/templets/member_main.htm b/src/admin/templets/member_main.htm index 2495c0e7..422c9410 100644 --- a/src/admin/templets/member_main.htm +++ b/src/admin/templets/member_main.htm @@ -43,7 +43,7 @@ } ?> - + 所有会员 禁言会员 推荐会员 diff --git a/src/admin/templets/member_operations.htm b/src/admin/templets/member_operations.htm index 91dc90aa..b4101d70 100644 --- a/src/admin/templets/member_operations.htm +++ b/src/admin/templets/member_operations.htm @@ -18,7 +18,7 @@
- + 未付款 已付款 已完成 diff --git a/src/admin/templets/member_pm.htm b/src/admin/templets/member_pm.htm index 0f20c5c4..16382a01 100644 --- a/src/admin/templets/member_pm.htm +++ b/src/admin/templets/member_pm.htm @@ -24,7 +24,7 @@ - + 短信列表 群发短信 单独短信 diff --git a/src/admin/templets/member_pmall.htm b/src/admin/templets/member_pmall.htm index fbeeb563..09a544ee 100644 --- a/src/admin/templets/member_pmall.htm +++ b/src/admin/templets/member_pmall.htm @@ -23,7 +23,7 @@ - + 短信列表 群发短信 单独短信 diff --git a/src/admin/templets/member_pmone.htm b/src/admin/templets/member_pmone.htm index acf99806..0093afa3 100644 --- a/src/admin/templets/member_pmone.htm +++ b/src/admin/templets/member_pmone.htm @@ -23,7 +23,7 @@ - + 短信列表 群发短信 单独短信 diff --git a/src/admin/templets/mychannel_add.htm b/src/admin/templets/mychannel_add.htm index 753202fe..90c8a5d2 100644 --- a/src/admin/templets/mychannel_add.htm +++ b/src/admin/templets/mychannel_add.htm @@ -79,14 +79,8 @@ 会员投稿组 - SetQuery("SELECT * FROM `#@__member_model`"); - $dsql->Execute(); - while($row3 = $dsql->GetObject()) - { - echo " "; - } - ?> + + diff --git a/src/admin/templets/mychannel_edit.htm b/src/admin/templets/mychannel_edit.htm index c578fdb7..f1a56241 100644 --- a/src/admin/templets/mychannel_edit.htm +++ b/src/admin/templets/mychannel_edit.htm @@ -80,15 +80,9 @@ 会员投稿组 - SetQuery("SELECT * FROM `#@__member_model`"); - $dsql->Execute(); - while($row3 = $dsql->GetObject()) - { - echo " "; - } - ?> - + + + @@ -273,8 +267,7 @@ } function ShowObj(objname) { var obj = document.getElementById(objname); - if (Nav() == 'IE') { obj.style.display = "block"; obj.style.display = "block"; } - else obj.style.display = "table"; + obj.style.display = "table"; } function HideObj(objname) { var obj = document.getElementById(objname); diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm index dcc4446a..357c0dd1 100644 --- a/src/admin/templets/soft_add.htm +++ b/src/admin/templets/soft_add.htm @@ -136,7 +136,7 @@ 关键词 - + diff --git a/src/admin/templets/spec_add.htm b/src/admin/templets/spec_add.htm index e2951cac..5804caa1 100644 --- a/src/admin/templets/spec_add.htm +++ b/src/admin/templets/spec_add.htm @@ -127,7 +127,7 @@ 关键词 - + diff --git a/src/admin/templets/sys_data_replace.htm b/src/admin/templets/sys_data_replace.htm index 5601d11d..c0e27c6e 100644 --- a/src/admin/templets/sys_data_replace.htm +++ b/src/admin/templets/sys_data_replace.htm @@ -76,7 +76,7 @@ - + diff --git a/src/admin/templets/sys_data_revert.htm b/src/admin/templets/sys_data_revert.htm index 03382d3d..4c83f75e 100644 --- a/src/admin/templets/sys_data_revert.htm +++ b/src/admin/templets/sys_data_revert.htm @@ -53,7 +53,7 @@ 全选 反选 取消 - + diff --git a/src/admin/templets/vote_getcode.htm b/src/admin/templets/vote_getcode.htm index 98beeffa..6871e073 100644 --- a/src/admin/templets/vote_getcode.htm +++ b/src/admin/templets/vote_getcode.htm @@ -38,7 +38,7 @@ - + diff --git a/src/static/web/js/admin.main.js b/src/static/web/js/admin.main.js index d461331d..3e2aadcc 100644 --- a/src/static/web/js/admin.main.js +++ b/src/static/web/js/admin.main.js @@ -67,14 +67,6 @@ function ColorSel(c, oname) { return true; } } -function ShowColor(e, o) { - LoadNewDiv(e, "../theme/system/colornew.htm", "colordlg"); -} -function ShowHide(objname) { - var obj = $Obj(objname); - if (obj.style.display != "none") obj.style.display = "none"; - else obj.style.display = "inline-block"; -} function ShowObj(objname) { var obj = $Obj(objname); if (obj == null) return false; @@ -84,9 +76,6 @@ function ShowObjRow(objname) { var obj = $Obj(objname); obj.style.display = "table-row"; } -function AddTypeid2() { - ShowObjRow("typeid2tr"); -} function HideObj(objname) { var obj = $Obj(objname); if (obj == null) return false; @@ -110,12 +99,18 @@ function ClearDivCt(objname) { $Obj(objname).style.display = "none"; ChangeFullDiv("hide"); } +function AddTypeid2() { + ShowObjRow("typeid2tr"); +} function SelectSource(e) { LoadNewDiv(e, "article_select_sw.php?t=source&k=8&rnd=" + Math.random(), "mysource"); } function SelectWriter(e) { LoadNewDiv(e, "article_select_sw.php?t=writer&k=8&rnd=" + Math.random(), "mywriter"); } +function ShowColor(e, o) { + LoadNewDiv(e, "../theme/system/colornew.htm", "colordlg"); +} function ShowUrlTr() { var jumpTest = $Obj("flagsj"); var jtr = $Obj("redirecturltr"); diff --git a/src/system/archive/archives.class.php b/src/system/archive/archives.class.php index 21d11c27..f86c8120 100755 --- a/src/system/archive/archives.class.php +++ b/src/system/archive/archives.class.php @@ -84,10 +84,10 @@ class Archives $this->FixedValues = ''; $this->TempSource = ''; $this->remoteDir = ''; - if (empty($GLOBALS['pageno'])) { + if (empty($GLOBALS['PageNo'])) { $this->NowPage = 1; } else { - $this->NowPage = $GLOBALS['pageno']; + $this->NowPage = $GLOBALS['PageNo']; } //特殊的字段数据处理 $this->Fields['aid'] = $aid; @@ -340,7 +340,7 @@ class Archives for ($i = 1; $i <= $this->TotalPage; $i++) { if ($this->TotalPage > 1) { $this->Fields['tmptitle'] = (empty($this->Fields['tmptitle']) ? $this->Fields['title'] : $this->Fields['tmptitle']); - if ($i > 1) $this->Fields['title'] = $this->Fields['tmptitle']."($i)"; + if ($i > 1) $this->Fields['title'] = $this->Fields['tmptitle']."-第"."$i"."页"; } if ($i > 1) { $TRUEfilename = $this->GetTruePath().$fileFirst."-".$i.".".$this->ShortName; @@ -469,7 +469,7 @@ class Archives return ''; } $this->Fields["displaytype"] = "dm"; - if ($this->NowPage > 1) $this->Fields["title"] = $this->Fields["title"]."({$this->NowPage})"; + if ($this->NowPage > 1) $this->Fields["title"] = $this->Fields["title"]."-第"."{$this->NowPage}"."页"; //预编译 $this->LoadTemplet(); $this->ParAddTable(); @@ -545,17 +545,17 @@ class Archives * 解析模板，对文档里的变动进行赋值 * * @access public - * @param string $pageNo 页码数 + * @param string $PageNo 页码数 * @param string $ismake 是否生成 * @return string */ - function ParseDMFields($pageNo, $ismake = 1) + function ParseDMFields($PageNo, $ismake = 1) { - $this->NowPage = $pageNo; + $this->NowPage = $PageNo; $this->Fields['nowpage'] = $this->NowPage; if ($this->SplitPageField != '' && isset($this->Fields[$this->SplitPageField])) { - $this->Fields[$this->SplitPageField] = $this->SplitFields[$pageNo - 1]; - if ($pageNo > 1) $this->Fields['description'] = trim(preg_replace("/[\r\n\t]/", ' ', cn_substr(html2text($this->Fields[$this->SplitPageField]), 200))); + $this->Fields[$this->SplitPageField] = $this->SplitFields[$PageNo - 1]; + if ($PageNo > 1) $this->Fields['description'] = trim(preg_replace("/[\r\n\t]/", ' ', cn_substr(html2text($this->Fields[$this->SplitPageField]), 200))); } //解析模板 if (is_array($this->dtp->CTags)) { @@ -570,9 +570,9 @@ class Archives } } else if ($ctag->GetName() == 'pagetitle') { if ($ismake == 0) { - $this->dtp->Assign($i, $this->GetPageTitlesDM($ctag->GetAtt("style"), $pageNo)); + $this->dtp->Assign($i, $this->GetPageTitlesDM($ctag->GetAtt("style"), $PageNo)); } else { - $this->dtp->Assign($i, $this->GetPageTitlesST($ctag->GetAtt("style"), $pageNo)); + $this->dtp->Assign($i, $this->GetPageTitlesST($ctag->GetAtt("style"), $PageNo)); } } else if ($ctag->GetName() == 'prenext') { $this->dtp->Assign($i, $this->GetPreNext($ctag->GetAtt('get'))); @@ -745,10 +745,10 @@ class Archives * * @access public * @param string $styleName 类型名称 - * @param string $pageNo 页码数 + * @param string $PageNo 页码数 * @return string */ - function GetPageTitlesST($styleName, $pageNo) + function GetPageTitlesST($styleName, $PageNo) { if ($this->TotalPage == 1) { return ""; @@ -761,12 +761,12 @@ class Archives $revalue = ''; foreach ($this->SplitTitles as $k => $v) { if ($i == 1) { - $revalue .= "$v"; + $revalue .= "{$v}"; } else { - if ($pageNo == $i) { + if ($PageNo == $i) { $revalue .= "$v"; } else { - $revalue .= "$v"; + $revalue .= "{$v}"; } } $i++; @@ -775,12 +775,12 @@ class Archives $revalue = ""; for ($fl = 1; $fl <= $totalpage; $fl++) { if ($fl == $this->PageNo) { - $optionlist .= ""; + $optionlist .= ""; } else { - $optionlist .= ""; + $optionlist .= ""; } } $optionlist .= ""; @@ -688,33 +688,19 @@ class FreeList } for ($j; $j <= $total_list; $j++) { if ($j == $this->PageNo) { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } else { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } } $plist = ''; - if (preg_match('#info#i', $listitem)) { - $plist .= $maininfo.' '; - } - if (preg_match('#index#i', $listitem)) { - $plist .= $indexpage.' '; - } - if (preg_match('#pre#i', $listitem)) { - $plist .= $prepage.' '; - } - if (preg_match('#pageno#i', $listitem)) { - $plist .= $listdd.' '; - } - if (preg_match('#next#i', $listitem)) { - $plist .= $nextpage.' '; - } - if (preg_match('#end#i', $listitem)) { - $plist .= $endpage.' '; - } - if (preg_match('#option#i', $listitem)) { - $plist .= $optionlist; - } + $plist .= preg_match('/index/i', $listitem)? $indexpage : ""; + $plist .= preg_match('/pre/i', $listitem)? $prepage : ""; + $plist .= preg_match('/pageno/i', $listitem)? $listdd : ""; + $plist .= preg_match('/next/i', $listitem)? $nextpage : ""; + $plist .= preg_match('/end/i', $listitem)? $endpage : ""; + $plist .= preg_match('/option/i', $listitem)? $optionlist : ""; + $plist .= preg_match('/info/i', $listitem)? $maininfo : ""; return $plist; } /** @@ -736,27 +722,32 @@ class FreeList } $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage <= 1 && $this->TotalResult > 0) { - return "
  • 1页".$this->TotalResult."条
    • "; + return "
  • 1页{$this->TotalResult}条
    • "; } if ($this->TotalResult == 0) { - return "
  • 0页".$this->TotalResult."条
    • "; + return "
  • 0页{$this->TotalResult}条
    • "; } - $maininfo = "
  • {$totalpage}页".$this->TotalResult."条
    • "; + $maininfo = "
  • {$totalpage}页{$this->TotalResult}条
    • "; $purl = $this->GetCurUrl(); - $geturl = "lid=".$this->FreeID."&TotalResult=".$this->TotalResult."&"; - $hidenform = ""; - $hidenform .= ""; - $purl .= "?".$geturl; + //开启伪静态对规则替换 + if ($cfg_rewrite == 'Y') { + $purl = str_replace("/apps", "", $purl); + $nowurls = preg_replace("/", ".php?", $purl); + $nowurls = explode("?", $nowurls); + $purl = $nowurls[0]; + } + $geturl = "tid={$this->TypeID}&TotalResult={$this->TotalResult}&"; + $purl .= '?'.$geturl; //获得上页和下页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上页
    • "; - $indexpage = "
  • 首页"; + $prepage .= "
  • 上页
    • "; + $indexpage = "
  • 首页"; } else { $indexpage = "
  • 首页
    • "; } if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下页
    • "; - $endpage = "
  • 末页
    • "; + $nextpage .= "
  • 下页
    • "; + $endpage = "
  • 末页
    • "; } else { $endpage = "
  • 末页
    • "; } @@ -773,18 +764,25 @@ class FreeList } for ($j; $j <= $total_list; $j++) { if ($j == $this->PageNo) { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } else { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } } - $plist = "$hidenform"; - $plist .= $maininfo.$indexpage.$prepage.$listdd.$nextpage.$endpage; - if ($totalpage > $total_list) { - $plist .= ""; - $plist .= ""; + $plist = ''; + if (preg_match('/index/i', $listitem)) $plist .= $indexpage; + if (preg_match('/pre/i', $listitem)) $plist .= $prepage; + if (preg_match('/pageno/i', $listitem)) $plist .= $listdd; + if (preg_match('/next/i', $listitem)) $plist .= $nextpage; + if (preg_match('/end/i', $listitem)) $plist .= $endpage; + if (preg_match('/option/i', $listitem)) $plist .= $optionlist; + if (preg_match('/info/i', $listitem)) $plist .= $maininfo; + //伪静态栏目分页 + if ($cfg_rewrite == 'Y') { + $plist = str_replace("?tid=", "", $plist); + $plist = preg_replace("/&pageno=(\d+)/i", "-\\1", $plist); + $plist = preg_replace("/&TotalResult=(\d+)/i", "", $plist);//去掉分页数值 } - $plist .= "
    "; return $plist; } /** diff --git a/src/system/archive/listview.class.php b/src/system/archive/listview.class.php index 22f88137..2b1adf90 100755 --- a/src/system/archive/listview.class.php +++ b/src/system/archive/listview.class.php @@ -986,13 +986,13 @@ class ListView } $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage <= 1 && $this->TotalResult > 0) { - return "
  • 1页".$this->TotalResult."条
    • "; + return "
  • 1页{$this->TotalResult}条
    • "; } if ($this->TotalResult == 0) { - return "
  • 0页".$this->TotalResult."条
    • "; + return "
  • 0页{$this->TotalResult}条
    • "; } $purl = $this->GetCurUrl(); - $maininfo = "
  • {$totalpage}页".$this->TotalResult."条
    • "; + $maininfo = "
  • {$totalpage}页{$this->TotalResult}条
    • "; $tnamerule = $this->GetMakeFileRule($this->Fields['id'], "list", $this->Fields['typedir'], $this->Fields['defaultname'], $this->Fields['namerule2']); $tnamerule = preg_replace("/^(.*)\//", '', $tnamerule); //获得上页和首页的链接 @@ -1018,9 +1018,9 @@ class ListView $optionlist = "
    • "; @@ -1041,9 +1041,9 @@ class ListView } for ($j; $j <= $total_list; $j++) { if ($j == $this->PageNo) { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } else { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } } $plist = ''; @@ -1075,12 +1075,12 @@ class ListView } $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage <= 1 && $this->TotalResult > 0) { - return "
  • 1页".$this->TotalResult."条
    • "; + return "
  • 1页{$this->TotalResult}条
    • "; } if ($this->TotalResult == 0) { - return "
  • 0页".$this->TotalResult."条
    • "; + return "
  • 0页{$this->TotalResult}条
    • "; } - $maininfo = "
  • {$totalpage}页".$this->TotalResult."条
    • "; + $maininfo = "
  • {$totalpage}页{$this->TotalResult}条
    • "; $purl = $this->GetCurUrl(); //开启伪静态对规则替换 if ($cfg_rewrite == 'Y') { @@ -1089,19 +1089,19 @@ class ListView $nowurls = explode("?", $nowurls); $purl = $nowurls[0]; } - $geturl = "tid=".$this->TypeID."&TotalResult=".$this->TotalResult."&"; + $geturl = "tid={$this->TypeID}&TotalResult={$this->TotalResult}&"; $purl .= '?'.$geturl; $optionlist = ''; //获得上页和下页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上页
    • "; - $indexpage = "
  • 首页
    • "; + $prepage .= "
  • 上页
    • "; + $indexpage = "
  • 首页
    • "; } else { $indexpage = "
  • 首页
    • "; } if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下页
    • "; - $endpage = "
  • 末页
    • "; + $nextpage .= "
  • 下页
    • "; + $endpage = "
  • 末页
    • "; } else { $endpage = "
  • 末页
    • "; } @@ -1122,9 +1122,9 @@ class ListView } for ($j; $j <= $total_list; $j++) { if ($j == $this->PageNo) { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } else { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } } $plist = ''; diff --git a/src/system/archive/searchview.class.php b/src/system/archive/searchview.class.php index 51be3876..c824fcc8 100755 --- a/src/system/archive/searchview.class.php +++ b/src/system/archive/searchview.class.php @@ -635,10 +635,10 @@ class SearchView } $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage <= 1 && $this->TotalResult > 0) { - return "
  • 1页".$this->TotalResult."条
    • "; + return "
  • 1页{$this->TotalResult}条
    • "; } if ($this->TotalResult == 0) { - return "
  • 0页".$this->TotalResult."条
    • "; + return "
  • 0页{$this->TotalResult}条
    • "; } $purl = $this->GetCurUrl(); $oldkeyword = (empty($oldkeyword) ? $this->Keyword : $oldkeyword); @@ -646,7 +646,7 @@ class SearchView if ($this->TotalResult > $this->SearchMaxRc) { $totalpage = ceil($this->SearchMaxRc / $this->pagesize); } - $infos = "
  • {$totalpage}页".$this->TotalResult."条
    • "; + $infos = "
  • {$totalpage}页{$this->TotalResult}条
    • "; $geturl = ""; //$geturl = "keyword=".urlencode($oldkeyword)."&searchtype=".$this->SearchType; //$geturl .= "&channeltype=".$this->ChannelType."&orderby=".$this->OrderBy; @@ -655,14 +655,14 @@ class SearchView $purl .= "?".$geturl; //获得上页和下页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上页
    • "; - $indexpage = "
  • 首页
    • "; + $prepage .= "
  • 上页
    • "; + $indexpage = "
  • 首页
    • "; } else { $indexpage = "
  • 首页
    • "; } if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下页
    • "; - $endpage = "
  • 末页
    • "; + $nextpage .= "
  • 下页
    • "; + $endpage = "
  • 末页
    • "; } else { $endpage = "
  • 末页
    • "; } @@ -683,9 +683,9 @@ class SearchView } for ($j; $j <= $total_list; $j++) { if ($j == $this->PageNo) { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } else { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } } $plist = ''; diff --git a/src/system/archive/sglistview.class.php b/src/system/archive/sglistview.class.php index bf4b1030..ee3e838d 100755 --- a/src/system/archive/sglistview.class.php +++ b/src/system/archive/sglistview.class.php @@ -575,7 +575,7 @@ class SgListView */ function GetTrueUrl($nurl) { - if (preg_match("/^http[s]?:\/\//", $nurl)) return $nurl; + if (preg_match("/^(http|https):\/\//i", $nurl)) return $nurl; if ($this->Fields['moresite'] == 1) { if ($this->Fields['sitepath'] != '') { $nurl = preg_replace("/^".$this->Fields['sitepath']."/", '', $nurl); @@ -880,13 +880,13 @@ class SgListView } $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage <= 1 && $this->TotalResult > 0) { - return "
  • 1页".$this->TotalResult."条
    • "; + return "
  • 1页{$this->TotalResult}条
    • "; } if ($this->TotalResult == 0) { - return "
  • 0页".$this->TotalResult."条
    • "; + return "
  • 0页{$this->TotalResult}条
    • "; } $purl = $this->GetCurUrl(); - $maininfo = "
  • {$totalpage}页".$this->TotalResult."条
    • "; + $maininfo = "
  • {$totalpage}页{$this->TotalResult}条
    • "; $tnamerule = $this->GetMakeFileRule($this->Fields['id'], "list", $this->Fields['typedir'], $this->Fields['defaultname'], $this->Fields['namerule2']); $tnamerule = preg_replace("/^(.*)\//", '', $tnamerule); //获得上页和首页的链接 @@ -922,9 +922,9 @@ class SgListView } for ($j; $j <= $total_list; $j++) { if ($j == $this->PageNo) { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } else { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } } $plist = ''; @@ -958,12 +958,12 @@ class SgListView $list_len = 3; } $totalpage = ceil($this->TotalResult / $this->pagesize); - $maininfo = "
  • {$totalpage}页".$this->TotalResult."条
    • "; + $maininfo = "
  • {$totalpage}页{$this->TotalResult}条
    • "; if ($totalpage <= 1 && $this->TotalResult > 0) { - return "
  • 1页".$this->TotalResult."条
    • "; + return "
  • 1页{$this->TotalResult}条
    • "; } if ($this->TotalResult == 0) { - return "
  • 0页".$this->TotalResult."条
    • "; + return "
  • 0页{$this->TotalResult}条
    • "; } $purl = $this->GetCurUrl(); //开启伪静态对规则替换 @@ -973,19 +973,19 @@ class SgListView $nowurls = explode("?", $nowurls); $purl = $nowurls[0]; } - $geturl = "tid=".$this->TypeID."&TotalResult=".$this->TotalResult."&"; + $geturl = "tid={$this->TypeID}&TotalResult={$this->TotalResult}&"; $purl .= '?'.$geturl; $optionlist = ''; //获得上页和下页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上页
    • "; - $indexpage = "
  • 首页
    • "; + $prepage .= "
  • 上页
    • "; + $indexpage = "
  • 首页
    • "; } else { $indexpage = "
  • 首页
    • "; } if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下页
    • "; - $endpage = "
  • 末页
    • "; + $nextpage .= "
  • 下页
    • "; + $endpage = "
  • 末页
    • "; } else { $endpage = "
  • 末页
    • "; } @@ -1006,9 +1006,9 @@ class SgListView } for ($j; $j <= $total_list; $j++) { if ($j == $this->PageNo) { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } else { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } } $plist = ''; diff --git a/src/system/archive/specview.class.php b/src/system/archive/specview.class.php index 847f402e..1f26b605 100755 --- a/src/system/archive/specview.class.php +++ b/src/system/archive/specview.class.php @@ -437,23 +437,23 @@ class SpecView } $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage <= 1 && $this->TotalResult > 0) { - return "
  • 1页".$this->TotalResult."条
    • "; + return "
  • 1页{$this->TotalResult}条
    • "; } if ($this->TotalResult == 0) { - return "
  • 0页".$this->TotalResult."条
    • "; + return "
  • 0页{$this->TotalResult}条
    • "; } $purl = $this->GetCurUrl(); $tnamerule = "spec_"; //获得上页和下页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上页
    • "; - $indexpage = "
  • 首页
    • "; + $prepage .= "
  • 上页
    • "; + $indexpage = "
  • 首页
    • "; } else { $indexpage = "
  • 首页
    • "; } if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下页
    • "; - $endpage = "
  • 末页
    • "; + $nextpage .= "
  • 下页
    • "; + $endpage = "
  • 末页
    • "; } else { $endpage = "
  • 末页
    • "; } @@ -474,9 +474,9 @@ class SpecView } for ($j; $j <= $total_list; $j++) { if ($j == $this->PageNo) { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } else { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } } $plist = $indexpage.$prepage.$listdd.$nextpage.$endpage; @@ -501,26 +501,26 @@ class SpecView } $totalpage = ceil($this->TotalResult / $this->pagesize); if ($totalpage <= 1 && $this->TotalResult > 0) { - return "
  • 1页".$this->TotalResult."条
    • "; + return "
  • 1页{$this->TotalResult}条
    • "; } if ($this->TotalResult == 0) { - return "
  • 0页".$this->TotalResult."条
    • "; + return "
  • 0页{$this->TotalResult}条
    • "; } $purl = $this->GetCurUrl(); $geturl = "typeid=".$this->TypeID."&TotalResult=".$this->TotalResult."&"; - $hidenform = ""; - $hidenform .= ""; + //$hidenform = ""; + //$hidenform .= ""; $purl .= "?".$geturl; //获得上页和下页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上页
    • "; - $indexpage = "
  • 首页
    • "; + $prepage .= "
  • 上页
    • "; + $indexpage = "
  • 首页
    • "; } else { $indexpage = "
  • 首页
    • "; } if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下页
    • "; - $endpage = "
  • 末页
    • "; + $nextpage .= "
  • 下页
    • "; + $endpage = "
  • 末页
    • "; } else { $endpage = "
  • 末页
    • "; } @@ -541,9 +541,9 @@ class SpecView } for ($j; $j <= $total_list; $j++) { if ($j == $this->PageNo) { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } else { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } } $plist = $indexpage.$prepage.$listdd.$nextpage.$endpage; diff --git a/src/system/archive/taglist.class.php b/src/system/archive/taglist.class.php index ff06cfc3..f3d4a248 100755 --- a/src/system/archive/taglist.class.php +++ b/src/system/archive/taglist.class.php @@ -411,23 +411,23 @@ class TagList } $totalpage = $this->TotalPage; if ($totalpage <= 1 && $this->TotalResult > 0) { - return "
  • 1页".$this->TotalResult."条
    • "; + return "
  • 1页{$this->TotalResult}条
    • "; } if ($this->TotalResult == 0) { - return "
  • 0页".$this->TotalResult."条
    • "; + return "
  • 0页{$this->TotalResult}条
    • "; } - $maininfo = "
  • {$totalpage}页".$this->TotalResult."条
    • "; + $maininfo = "
  • {$totalpage}页{$this->TotalResult}条
    • "; $purl = $this->tagsDir.'/'.$this->TagInfos['id']; //获得上页和下页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上页
    • "; - $indexpage = "
  • 首页
    • "; + $prepage .= "
  • 上页
    • "; + $indexpage = "
  • 首页
    • "; } else { $indexpage = "
  • 首页
    • "; } if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下页
    • "; - $endpage = "
  • 末页
    • "; + $nextpage .= "
  • 下页
    • "; + $endpage = "
  • 末页
    • "; } else { $endpage = "
  • 末页
    • "; } @@ -540,26 +540,26 @@ class TagList } $totalpage = $this->TotalPage; if ($totalpage <= 1 && $this->TotalResult > 0) { - return "
  • 1页".$this->TotalResult."条
    • "; + return "
  • 1页{$this->TotalResult}条
    • "; } if ($this->TotalResult == 0) { - return "
  • 0页".$this->TotalResult."条
    • "; + return "
  • 0页{$this->TotalResult}条
    • "; } - $maininfo = "
  • {$totalpage}页".$this->TotalResult."条
    • "; + $maininfo = "
  • {$totalpage}页{$this->TotalResult}条
    • "; $purl = $this->GetCurUrl(); //开启伪静态对规则替换 if ($cfg_rewrite == 'Y') $purl = "/tags/"; $purl .= "?/".urlencode($this->Tag); //获得上页和下页的链接 if ($this->PageNo != 1) { - $prepage .= "
  • 上页
    • "; - $indexpage = "
  • 首页
    • "; + $prepage .= "
  • 上页
    • "; + $indexpage = "
  • 首页
    • "; } else { $indexpage = "
  • 首页
    • "; } if ($this->PageNo != $totalpage && $totalpage > 1) { - $nextpage .= "
  • 下页
    • "; - $endpage = "
  • 末页
    • "; + $nextpage .= "
  • 下页
    • "; + $endpage = "
  • 末页
    • "; } else { $endpage = "
  • 末页
    • "; } @@ -580,9 +580,9 @@ class TagList } for ($j; $j <= $total_list; $j++) { if ($j == $this->PageNo) { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } else { - $listdd .= "
  • $j
    • "; + $listdd .= "
  • {$j}
    • "; } } $plist = ''; diff --git a/src/system/dedecollection.func.php b/src/system/dedecollection.func.php index 9eb4b0a3..01a9fbed 100644 --- a/src/system/dedecollection.func.php +++ b/src/system/dedecollection.func.php @@ -180,7 +180,7 @@ function RefurlCookie($gurl) */ function GetHostInfo($gurl) { - $gurl = preg_replace("/^http:\/\//i", "", trim($gurl)); + $gurl = preg_replace("/^(http|https):\/\//i", "", trim($gurl)); $garr['host'] = preg_replace("/\/(.*)$/i", "", $gurl); $garr['query'] = "/".preg_replace("/^([^\/]*)\//i", "", $gurl); return $garr; @@ -318,7 +318,7 @@ function FillUrl($refurl, $surl) $basehost = ((!isset($urls['port']) || $urls['port'] == '80') ? $urls['host'] : $urls['host'].':'.$urls['port']); //由于直接获得的path在处理 http://xxxx/nnn/aaa?fdsafd 这种情况时会有错误，因此用其它方式处理 $basepath = $basehost; - $paths = explode('/', preg_replace("/^http:\/\//i", "", $refurl)); + $paths = explode('/', preg_replace("/^(http|https):\/\//i", "", $refurl)); $n = count($paths); for ($i = 1; $i < ($n - 1); $i++) { if (!preg_match("/[\?]/", $paths[$i])) $basepath .= '/'.$paths[$i]; @@ -347,13 +347,13 @@ function FillUrl($refurl, $surl) } else { if (strlen($surl) < 7) { $okurl = $basepath.'/'.$surl; - } else if (preg_match("/^http:\/\//i", $surl)) { + } else if (preg_match("/^(http|https):\/\//i", $surl)) { $okurl = $surl; } else { $okurl = $basepath.'/'.$surl; } } - $okurl = preg_replace("/^http:\/\//i", '', $okurl); + $okurl = preg_replace("/^(http|https):\/\//i", '', $okurl); $okurl = 'http://'.preg_replace("/\/{1,}/", '/', $okurl); return $okurl; } @@ -380,7 +380,7 @@ function GetUrlFromListRule($regxurl = '', $handurl = '', $startid = 0, $endid = $handurls = explode("\n", $handurl); foreach ($handurls as $handurl) { $handurl = trim($handurl); - if (preg_match("/^http:\/\//i", $handurl)) { + if (preg_match("/^(http|https):\/\//i", $handurl)) { $lists[$n][0] = $handurl; $lists[$n][1] = 0; $n++; diff --git a/src/system/helpers/upload.helper.php b/src/system/helpers/upload.helper.php index ca2e5bc4..a5ebb04f 100755 --- a/src/system/helpers/upload.helper.php +++ b/src/system/helpers/upload.helper.php @@ -181,7 +181,7 @@ if (!function_exists('MemberUploads')) { exit('Not allow filename for not safe!'); } else if (!preg_match("/\.(".$allAllowType.")$/", $handname)) { exit('Not allow filename for filetype!'); - } else if (!preg_match('#^http:#', $handname) && !preg_match('#^'.$cfg_user_dir.'/'.$userid."#", $handname) && !$isadmin) { + } else if (!preg_match('#^(http|https):#', $handname) && !preg_match('#^'.$cfg_user_dir.'/'.$userid."#", $handname) && !$isadmin) { exit('Not allow filename for not userdir!'); } return $handname; diff --git a/src/system/libraries/dedehttpdown.class.php b/src/system/libraries/dedehttpdown.class.php index 46d042bf..45653805 100755 --- a/src/system/libraries/dedehttpdown.class.php +++ b/src/system/libraries/dedehttpdown.class.php @@ -484,7 +484,7 @@ class DedeHttpDown } if (isset($this->m_httphead["location"])) { $newurl = $this->m_httphead["location"]; - if (preg_match("/^http/i", $newurl)) { + if (preg_match("/^(http|https):\/\//i", $newurl)) { $this->JumpOpenUrl($newurl); } else { $newurl = $this->FillUrl($newurl); diff --git a/src/system/taglib/channel/img.lib.php b/src/system/taglib/channel/img.lib.php index b91aed4e..c75c5a54 100755 --- a/src/system/taglib/channel/img.lib.php +++ b/src/system/taglib/channel/img.lib.php @@ -82,10 +82,10 @@ function ch_img($fvalue, &$arcTag, &$refObj, $fname = '') } if ($cfg_multi_site == 'Y') { //$cfg_basehost) - if (!preg_match('#^http:#i', $fields['imgsrc'])) { + if (!preg_match('#^(http|https):#i', $fields['imgsrc'])) { $fields['imgsrc'] = $cfg_basehost.$fields['imgsrc']; } - if (!preg_match('#^http:#i', $fields['ddimg'])) { + if (!preg_match('#^(http|https):#i', $fields['ddimg'])) { $fields['ddimg'] = $cfg_basehost.$fields['ddimg']; } } diff --git a/src/theme/dedebiz/article_default.htm b/src/theme/dedebiz/article_default.htm index ef309da8..83a8f4a3 100644 --- a/src/theme/dedebiz/article_default.htm +++ b/src/theme/dedebiz/article_default.htm @@ -33,7 +33,7 @@ {dede:field.writer/} 次
    -
    您会看到这个提示，因为某个栏目无法应用模板或您的模型没对应模板，不同模型的文档浏览页的模板为：article_模型名字标识.htm更多的信息，您可以在栏目修改查看
    +
    您看到这个提示，因为某个栏目对应模板不存在，不同模型的文档模板为：article_模型标识.htm，在后台-网站栏目管理-修改栏目查看
    {dede:fieldlist} diff --git a/src/theme/dedebiz/article_default_sg.htm b/src/theme/dedebiz/article_default_sg.htm index 53d3fd2c..92986d45 100644 --- a/src/theme/dedebiz/article_default_sg.htm +++ b/src/theme/dedebiz/article_default_sg.htm @@ -34,7 +34,7 @@ {dede:field.writer/}次 -
    您会看到这个提示，因为某个栏目无法应用模板或您的模型没对应模板，不同模型的文档浏览页的模板为：article_模型名字标识.htm更多的信息，您可以在栏目修改查看
    +
    您看到这个提示，因为某个栏目对应模板不存在，不同模型的文档模板为：article_模型标识.htm，在后台-网站栏目管理-修改栏目查看
    {dede:fieldlist}
    diff --git a/src/theme/dedebiz/article_image.htm b/src/theme/dedebiz/article_image.htm index ac45be6f..cdd35a21 100644 --- a/src/theme/dedebiz/article_image.htm +++ b/src/theme/dedebiz/article_image.htm @@ -11,8 +11,8 @@ @@ -82,7 +82,7 @@ 次
    - {dede:field name='pagestyle' alt='输出不同的图片头信息' runphp='yes'} + {dede:field name='pagestyle' alt='图片头部调用' runphp='yes'} if (@me==3) { @me = '
    '; } else if (@me==2) { @@ -96,14 +96,14 @@ @me = ''; } {/dede:field} - - {dede:field name='imgurls' alt='输出不同的图片信息'} - [field:pagestyle runphp='yes'] @me= (@me==3 ? '
    ' : '');[/field:pagestyle] + + {dede:field name='imgurls' alt='图片信息调用'} + [field:pagestyle runphp='yes'] @me=(@me==3 ? '
    ' : '');[/field:pagestyle]

    [field:alttext/]

    -

    （[field:alttext/]）

    - [field:pagestyle runphp='yes'] @me = (@me==3 ? '
    ' : ''); [/field:pagestyle] +

    [field:alttext/]

    + [field:pagestyle runphp='yes'] @me=(@me==3 ? '
    ' : ''); [/field:pagestyle] {/dede:field} - {dede:field name='pagestyle' alt='输出不同的图片尾信息' runphp='yes'} + {dede:field name='pagestyle' alt='图片底部调用' runphp='yes'} if (@me==3) { @me = '
    '; } else if (@me==2) { diff --git a/src/user/inc/inc_archives_functions.php b/src/user/inc/inc_archives_functions.php index e56de959..c35f1269 100755 --- a/src/user/inc/inc_archives_functions.php +++ b/src/user/inc/inc_archives_functions.php @@ -89,7 +89,7 @@ function GetCurContentAlbum($body, $rfurl, &$firstdd) */ function GetImageMapDD($filename, $ddm, $oldname = '') { - if ($oldname != '' && !preg_match("#^http:\/\/#i", $oldname)) { + if ($oldname != '' && !preg_match("#^(http|https):\/\/#i", $oldname)) { $ddpicok = $oldname; } else { $ddn = substr($filename, -3); From b6c12d42c6e0d03443c0cde978b873a43146719e Mon Sep 17 00:00:00 2001 From: tianya Date: Tue, 29 Apr 2025 23:13:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E6=95=88?= =?UTF-8?q?=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/data/admin/update.txt | 1 - src/install/sql-dfdata.txt | 3 --- 2 files changed, 4 deletions(-) diff --git a/src/data/admin/update.txt b/src/data/admin/update.txt index 3439edd3..9674e6b4 100644 --- a/src/data/admin/update.txt +++ b/src/data/admin/update.txt @@ -68,7 +68,6 @@ CREATE TABLE `#@__statistics_detail` (`id` int NOT NULL AUTO_INCREMENT, ALTER TABLE `#@__addonarticle` MODIFY COLUMN `userip` char(46) NOT NULL DEFAULT '' AFTER `templet`; ALTER TABLE `#@__addonimages` MODIFY COLUMN `userip` char(46) NOT NULL DEFAULT '' AFTER `templet`; ALTER TABLE `#@__addoninfos` MODIFY COLUMN `userip` varchar(46) NOT NULL DEFAULT '' AFTER `litpic`; -ALTER TABLE `#@__addonshop` MODIFY COLUMN `userip` char(46) NOT NULL DEFAULT '' AFTER `templet`; ALTER TABLE `#@__addonsoft` MODIFY COLUMN `userip` char(46) NOT NULL DEFAULT '' AFTER `templet`; ALTER TABLE `#@__addonspec` MODIFY COLUMN `userip` char(46) NOT NULL DEFAULT '' AFTER `templet`; ALTER TABLE `#@__admin` MODIFY COLUMN `loginip` varchar(46) NOT NULL DEFAULT '' AFTER `logintime`; diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt index 1bd361db..ede86a6f 100755 --- a/src/install/sql-dfdata.txt +++ b/src/install/sql-dfdata.txt @@ -533,9 +533,6 @@ INSERT INTO `#@__moneycard_type` VALUES ('1','100','30','金币套餐一'), ('2','200','55','金币套餐二'), ('3','300','75','金币套餐三'); -INSERT INTO `#@__member_model` VALUES ('1','个人','#@__member_person','个人会员模型','1','1','\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n'), -('2','企业','#@__member_company','公司企业会员模型','1','1','\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n'); - INSERT INTO `#@__scores` VALUES ('2','列兵','1','0','1'), ('3','班长','2','1000','1'), ('4','少尉','3','2000','1'), From 3ce9eb377f5b6fded634103b7bbab8a6c4f1deaa Mon Sep 17 00:00:00 2001 From: tianya Date: Tue, 29 Apr 2025 23:13:27 +0800 Subject: [PATCH 4/4] bump 6.5.9 --- docs/changelog.md | 10 ++++++++++ src/install/index.php | 2 +- src/system/common.inc.php | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index bdf5ee59..ccc41095 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,6 +1,16 @@ # 更新记录 通过访问 https://www.dedebiz.com/git 获取完整更新记录 +# V6.5.9 +- 支持设置是否开启自动检查更新； +- 增加数据表注释，方便开发者进行二次开发，移除无用表； +- 全面移除IE浏览器多余代码； +- 调整文档分页过多导致的手机端前台适配问题； +- 优化文档分页title标题； +- 修正自动提取关键词功能； +- 修正开启绝对链接文档正文上传图片问题； +- 其他常规问题修复； + # V6.5.8 - 流量统计功能增加蜘蛛判断及查询； - 修复自定义模型中字段禁止会员投稿的问题； diff --git a/src/install/index.php b/src/install/index.php index 8f69cc4a..9091aed0 100644 --- a/src/install/index.php +++ b/src/install/index.php @@ -11,7 +11,7 @@ error_reporting(E_ALL || ~E_NOTICE); define('INSLOCKFILE', dirname(__FILE__).'/install_lock.txt'); $verMsg = 'V6'; $dfDbname = 'DedeBIZ'; -$cfg_version_detail = '6.5.8'; //详细版本号 +$cfg_version_detail = '6.5.9'; //详细版本号 $errmsg = ''; if (version_compare(PHP_VERSION, '8.0.0', '>=') && function_exists("mysqli_report")) { mysqli_report(MYSQLI_REPORT_OFF); diff --git a/src/system/common.inc.php b/src/system/common.inc.php index 2cbcba3f..cd52cf78 100755 --- a/src/system/common.inc.php +++ b/src/system/common.inc.php @@ -202,7 +202,7 @@ $cfg_medias_dir = $cfg_cmspath.$cfg_medias_dir; $cfg_mediasurl = $cfg_mainsite.$cfg_medias_dir; //程序信息摘要，请不要删除则系统无法接收升级信息 $cfg_version = 'V6'; -$cfg_version_detail = '6.5.8';//详细版本号 +$cfg_version_detail = '6.5.9';//详细版本号 $cfg_soft_lang = 'utf-8'; $cfg_soft_public = 'base'; $cfg_softname = '得德系统';