Merge branch 'master' into 20.x
This commit is contained in:
Yagami
+17
-5
@@ -3,7 +3,7 @@ $filter = new stdclass();
|
||||
$filter->rules = new stdclass();
|
||||
$filter->rules->md5 = '/^[a-z0-9]{32}$/';
|
||||
$filter->rules->base64 = '/^[a-zA-Z0-9\+\/\=]+$/';
|
||||
$filter->rules->checked = '/^[0-9,]+$/';
|
||||
$filter->rules->checked = '/^[0-9,\-]+$/';
|
||||
$filter->rules->idList = '/^[0-9\|]+$/';
|
||||
$filter->rules->lang = '/^[a-zA-Z_\-]+$/';
|
||||
$filter->rules->any = '/./';
|
||||
@@ -50,6 +50,7 @@ $filter->user = new stdclass();
|
||||
$filter->block = new stdclass();
|
||||
$filter->file = new stdclass();
|
||||
$filter->repo = new stdclass();
|
||||
$filter->webhook = new stdclass();
|
||||
|
||||
$filter->block->default = new stdclass();
|
||||
$filter->block->main = new stdclass();
|
||||
@@ -97,9 +98,13 @@ $filter->testtask->default = new stdclass();
|
||||
$filter->todo->export = new stdclass();
|
||||
$filter->upgrade->license = new stdclass();
|
||||
$filter->user->login = new stdclass();
|
||||
$filter->webhook->bind = new stdclass();
|
||||
$filter->user->ajaxgetmore = new stdclass();
|
||||
|
||||
$filter->bug->batchcreate->cookie['preBranch'] = 'int';
|
||||
$filter->bug->browse->cookie['bugModule'] = 'int';
|
||||
$filter->bug->browse->cookie['bugBranch'] = 'int';
|
||||
$filter->bug->browse->cookie['treeBranch'] = 'int';
|
||||
$filter->bug->browse->cookie['preBranch'] = 'int';
|
||||
$filter->bug->browse->cookie['qaBugOrder'] = 'reg::orderBy';
|
||||
$filter->bug->browse->cookie['windowWidth'] = 'int';
|
||||
@@ -127,6 +132,8 @@ $filter->product->browse->cookie['preBranch'] = 'int';
|
||||
$filter->product->browse->cookie['preProductID'] = 'int';
|
||||
$filter->product->browse->cookie['productStoryOrder'] = 'reg::orderBy';
|
||||
$filter->product->browse->cookie['storyModule'] = 'int';
|
||||
$filter->product->browse->cookie['storyBranch'] = 'int';
|
||||
$filter->product->browse->cookie['treeBranch'] = 'int';
|
||||
$filter->product->default->cookie['lastProduct'] = 'int';
|
||||
$filter->product->default->cookie['preProductID'] = 'int';
|
||||
$filter->product->index->cookie['preBranch'] = 'int';
|
||||
@@ -225,10 +232,12 @@ $filter->sso->logout->get['token'] = 'reg::md5';
|
||||
|
||||
$filter->upgrade->license->get['agree'] = 'equal::true';
|
||||
|
||||
$filter->user->login->get['account'] = 'account';
|
||||
$filter->user->login->get['lang'] = 'reg::lang';
|
||||
$filter->user->login->get['password'] = 'reg::any';
|
||||
$filter->user->edit->get['from'] = 'reg::word';
|
||||
$filter->user->login->get['account'] = 'account';
|
||||
$filter->user->login->get['lang'] = 'reg::lang';
|
||||
$filter->user->login->get['password'] = 'reg::any';
|
||||
$filter->user->edit->get['from'] = 'reg::word';
|
||||
$filter->user->ajaxgetmore->get['search'] = 'reg::any';
|
||||
$filter->user->ajaxgetmore->get['limit'] = 'int';
|
||||
|
||||
$filter->git->cat->get['repoUrl'] = 'reg::base64';
|
||||
$filter->git->diff->get['repoUrl'] = 'reg::base64';
|
||||
@@ -247,3 +256,6 @@ $filter->repo->diff->cookie['arrange'] = 'reg::word';
|
||||
$filter->repo->diff->cookie['repoPairs'] = 'array';
|
||||
$filter->repo->view->cookie['repoPairs'] = 'array';
|
||||
$filter->repo->ajaxsynccommit->cookie['syncBranch'] = 'reg::any';
|
||||
|
||||
$filter->webhook->bind->get['selectedDepts'] = 'reg::checked';
|
||||
$filter->webhook->bind->cookie['selectedDepts'] = 'reg::checked';
|
||||
|
||||
+13
-1
@@ -23,7 +23,9 @@ $config->checkVersion = true; // Auto check for new version or not.
|
||||
/* Set the wide window size and timeout(ms) and duplicate interval time(s). */
|
||||
$config->wideSize = 1400;
|
||||
$config->timeout = 30000;
|
||||
$config->duplicateTime = 60;
|
||||
$config->duplicateTime = 30;
|
||||
$config->maxCount = 500;
|
||||
$config->moreLinks = array();
|
||||
|
||||
/* Product common list. */
|
||||
$config->productCommonList['zh-cn'][0] = '产品';
|
||||
@@ -85,21 +87,30 @@ $config->storyCommonList['vi'][1] = 'Câu chuyện';
|
||||
/* Story common list. */
|
||||
$config->hourPointCommonList['zh-cn'][0] = '工时';
|
||||
$config->hourPointCommonList['zh-cn'][1] = '故事点';
|
||||
$config->hourPointCommonList['zh-cn'][2] = '功能点';
|
||||
|
||||
$config->hourPointCommonList['zh-tw'][0] = '工时';
|
||||
$config->hourPointCommonList['zh-tw'][1] = '故事点';
|
||||
$config->hourPointCommonList['zh-tw'][2] = '功能点';
|
||||
|
||||
$config->hourPointCommonList['en'][0] = 'hour';
|
||||
$config->hourPointCommonList['en'][1] = 'story point';
|
||||
$config->hourPointCommonList['en'][2] = 'function point';
|
||||
|
||||
$config->hourPointCommonList['de'][0] = 'hour';
|
||||
$config->hourPointCommonList['de'][1] = 'story point';
|
||||
$config->hourPointCommonList['de'][2] = 'function point';
|
||||
|
||||
$config->hourPointCommonList['fr'][0] = 'hour';
|
||||
$config->hourPointCommonList['fr'][1] = 'story point';
|
||||
$config->hourPointCommonList['fr'][2] = 'function point';
|
||||
|
||||
$config->hourPointCommonList['vi'][0] = 'giờ';
|
||||
$config->hourPointCommonList['vi'][1] = 'điểm';
|
||||
$config->hourPointCommonList['vi'][2] = 'function point';
|
||||
|
||||
$config->manualUrl['home'] = 'https://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao';
|
||||
$config->manualUrl['int'] = 'https://www.zentao.pm/book/zentaomanual/zentao-installation-11.html?fullScreen=zentao';
|
||||
|
||||
/* Supported charsets. */
|
||||
$config->charsets['zh-cn']['utf-8'] = 'UTF-8';
|
||||
@@ -149,6 +160,7 @@ define('TABLE_RELEASE', '`' . $config->db->prefix . 'release`');
|
||||
|
||||
define('TABLE_PROJECT', '`' . $config->db->prefix . 'project`');
|
||||
define('TABLE_TASK', '`' . $config->db->prefix . 'task`');
|
||||
define('TABLE_TASKSPEC', '`' . $config->db->prefix . 'taskspec`');
|
||||
define('TABLE_TEAM', '`' . $config->db->prefix . 'team`');
|
||||
define('TABLE_PROJECTPRODUCT','`' . $config->db->prefix . 'projectproduct`');
|
||||
define('TABLE_PROJECTSTORY', '`' . $config->db->prefix . 'projectstory`');
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser`(
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`gid`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,65 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser`(
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`gid`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,65 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser`(
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`gid`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,65 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser`(
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`gid`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,65 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser`(
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`gid`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,65 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser`(
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`gid`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,65 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser`(
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`gid`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,65 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`gid`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,65 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`gid`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,66 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`gid`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,66 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`gid`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,66 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`gid`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,66 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`gid`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,80 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(10) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,80 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(10) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,80 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(10) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,80 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(10) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,80 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(10) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,80 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(10) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,80 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(10) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,80 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(10) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,80 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(10) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,91 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`freeze` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(30) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object', 'code') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_queue` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`type` char(30) NOT NULL,
|
||||
`content` text NOT NULL,
|
||||
`addDate` datetime NOT NULL,
|
||||
`processDate` datetime NOT NULL,
|
||||
`result` text NOT NULL,
|
||||
`status` char(30) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,91 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`freeze` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(30) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object', 'code') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_queue` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`type` char(30) NOT NULL,
|
||||
`content` text NOT NULL,
|
||||
`addDate` datetime NOT NULL,
|
||||
`processDate` datetime NOT NULL,
|
||||
`result` text NOT NULL,
|
||||
`status` char(30) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,91 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`freeze` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(30) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object', 'code') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_queue` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`type` char(30) NOT NULL,
|
||||
`content` text NOT NULL,
|
||||
`addDate` datetime NOT NULL,
|
||||
`processDate` datetime NOT NULL,
|
||||
`result` text NOT NULL,
|
||||
`status` char(30) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,91 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`freeze` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(30) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object', 'code') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_queue` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`type` char(30) NOT NULL,
|
||||
`content` text NOT NULL,
|
||||
`addDate` datetime NOT NULL,
|
||||
`processDate` datetime NOT NULL,
|
||||
`result` text NOT NULL,
|
||||
`status` char(30) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,109 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`freeze` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(30) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object', 'code') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_queue` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`type` char(30) NOT NULL,
|
||||
`content` text NOT NULL,
|
||||
`addDate` datetime NOT NULL,
|
||||
`processDate` datetime NOT NULL,
|
||||
`result` text NOT NULL,
|
||||
`status` char(30) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_conference` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`rid` char(24) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('closed','open') NOT NULL DEFAULT 'closed',
|
||||
`participants` text NOT NULL,
|
||||
`openedBy` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`openedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_conferenceaction` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`rid` char(24) NOT NULL DEFAULT '',
|
||||
`type` enum('create','join','leave','close') NOT NULL DEFAULT 'create',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,109 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`freeze` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(30) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object', 'code') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_queue` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`type` char(30) NOT NULL,
|
||||
`content` text NOT NULL,
|
||||
`addDate` datetime NOT NULL,
|
||||
`processDate` datetime NOT NULL,
|
||||
`result` text NOT NULL,
|
||||
`status` char(30) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_conference` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`rid` char(24) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('closed','open') NOT NULL DEFAULT 'closed',
|
||||
`participants` text NOT NULL,
|
||||
`openedBy` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`openedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_conferenceaction` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`rid` char(24) NOT NULL DEFAULT '',
|
||||
`type` enum('create','join','leave','close') NOT NULL DEFAULT 'create',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,109 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`freeze` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(30) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object', 'code') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_queue` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`type` char(30) NOT NULL,
|
||||
`content` text NOT NULL,
|
||||
`addDate` datetime NOT NULL,
|
||||
`processDate` datetime NOT NULL,
|
||||
`result` text NOT NULL,
|
||||
`status` char(30) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_conference` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`rid` char(24) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('closed','open') NOT NULL DEFAULT 'closed',
|
||||
`participants` text NOT NULL,
|
||||
`openedBy` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`openedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_conferenceaction` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`rid` char(24) NOT NULL DEFAULT '',
|
||||
`type` enum('create','join','leave','close') NOT NULL DEFAULT 'create',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,109 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`freeze` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(30) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object', 'code') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_queue` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`type` char(30) NOT NULL,
|
||||
`content` text NOT NULL,
|
||||
`addDate` datetime NOT NULL,
|
||||
`processDate` datetime NOT NULL,
|
||||
`result` text NOT NULL,
|
||||
`status` char(30) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_conference` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`rid` char(24) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('closed','open') NOT NULL DEFAULT 'closed',
|
||||
`participants` text NOT NULL,
|
||||
`openedBy` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`openedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_conferenceaction` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`rid` char(24) NOT NULL DEFAULT '',
|
||||
`type` enum('create','join','leave','close') NOT NULL DEFAULT 'create',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,109 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`freeze` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(30) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object', 'code') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_queue` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`type` char(30) NOT NULL,
|
||||
`content` text NOT NULL,
|
||||
`addDate` datetime NOT NULL,
|
||||
`processDate` datetime NOT NULL,
|
||||
`result` text NOT NULL,
|
||||
`status` char(30) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_conference` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`rid` char(24) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('closed','open') NOT NULL DEFAULT 'closed',
|
||||
`participants` text NOT NULL,
|
||||
`openedBy` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`openedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_conferenceaction` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`rid` char(24) NOT NULL DEFAULT '',
|
||||
`type` enum('create','join','leave','close') NOT NULL DEFAULT 'create',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,109 @@
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chat` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`name` varchar(60) NOT NULL DEFAULT '',
|
||||
`type` varchar(20) NOT NULL DEFAULT 'group',
|
||||
`admins` varchar(255) NOT NULL DEFAULT '',
|
||||
`committers` varchar(255) NOT NULL DEFAULT '',
|
||||
`subject` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`public` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`createdDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`lastActiveTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`dismissDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `gid` (`gid`),
|
||||
KEY `name` (`name`),
|
||||
KEY `type` (`type`),
|
||||
KEY `public` (`public`),
|
||||
KEY `createdBy` (`createdBy`),
|
||||
KEY `editedBy` (`editedBy`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_chatuser` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`order` smallint(5) NOT NULL DEFAULT 0,
|
||||
`star` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`hide` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`mute` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`freeze` enum('0', '1') NOT NULL DEFAULT '0',
|
||||
`join` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`quit` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`category` varchar(40) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `cgid` (`cgid`),
|
||||
KEY `user` (`user`),
|
||||
KEY `order` (`order`),
|
||||
KEY `star` (`star`),
|
||||
KEY `hide` (`hide`),
|
||||
UNIQUE KEY `chatuser` (`cgid`, `user`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_client` (
|
||||
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`version` char(30) NOT NULL DEFAULT '',
|
||||
`desc` varchar(100) NOT NULL DEFAULT '',
|
||||
`changeLog` text NOT NULL,
|
||||
`strategy` varchar(10) NOT NULL DEFAULT '',
|
||||
`downloads` text NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`createdBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`editedDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL DEFAULT '',
|
||||
`status` enum('released','wait') NOT NULL DEFAULT 'wait',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_message` (
|
||||
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`gid` char(40) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`user` varchar(30) NOT NULL DEFAULT '',
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`order` bigint(8) unsigned NOT NULL,
|
||||
`type` enum('normal', 'broadcast', 'notify') NOT NULL DEFAULT 'normal',
|
||||
`content` text NOT NULL DEFAULT '',
|
||||
`contentType` enum('text', 'plain', 'emotion', 'image', 'file', 'object', 'code') NOT NULL DEFAULT 'text',
|
||||
`data` text NOT NULL DEFAULT '',
|
||||
`deleted` enum('0','1') NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `mgid` (`gid`),
|
||||
KEY `mcgid` (`cgid`),
|
||||
KEY `muser` (`user`),
|
||||
KEY `mtype` (`type`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_messagestatus` (
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`message` int(11) unsigned NOT NULL,
|
||||
`status` enum('waiting','sent','readed','deleted') NOT NULL DEFAULT 'waiting',
|
||||
UNIQUE KEY `user` (`user`,`message`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_queue` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`type` char(30) NOT NULL,
|
||||
`content` text NOT NULL,
|
||||
`addDate` datetime NOT NULL,
|
||||
`processDate` datetime NOT NULL,
|
||||
`result` text NOT NULL,
|
||||
`status` char(30) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_conference` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`rid` char(24) NOT NULL DEFAULT '',
|
||||
`cgid` char(40) NOT NULL DEFAULT '',
|
||||
`status` enum('closed','open') NOT NULL DEFAULT 'closed',
|
||||
`participants` text NOT NULL,
|
||||
`openedBy` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`openedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
CREATE TABLE IF NOT EXISTS `zt_im_conferenceaction` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`rid` char(24) NOT NULL DEFAULT '',
|
||||
`type` enum('create','join','leave','close') NOT NULL DEFAULT 'create',
|
||||
`user` mediumint(8) NOT NULL DEFAULT 0,
|
||||
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,8 @@
|
||||
UPDATE `zt_story` SET `plan` = '' WHERE `parent` = '-1' AND `plan` != '0' AND `plan` != '';
|
||||
|
||||
DELETE FROM `zt_grouppriv` WHERE `module` = 'api' AND `method` = 'getModel';
|
||||
DELETE FROM `zt_grouppriv` WHERE `module` = 'api' AND `method` = 'sql';
|
||||
|
||||
ALTER TABLE `zt_jenkins` CHANGE `password` `password` varchar(255) COLLATE 'utf8_general_ci' NOT NULL AFTER `account`;
|
||||
|
||||
ALTER TABLE `zt_group` ADD `program` mediumint(8) unsigned NOT NULL DEFAULT 0 AFTER `id`;
|
||||
@@ -0,0 +1,5 @@
|
||||
ALTER TABLE `zt_doccontent` CHANGE `content` `content` longtext NOT NULL AFTER `digest`;
|
||||
|
||||
update zt_storystage as a, zt_story as b set a.stage = 'closed', b.stage = 'closed' where a.story = b.id and b.status = 'closed';
|
||||
|
||||
update zt_story set stage = 'closed' where status = 'closed';
|
||||
@@ -0,0 +1,3 @@
|
||||
update zt_story set `plan`='' where `plan`=0;
|
||||
|
||||
ALTER TABLE `zt_compile` ADD `times` tinyint unsigned NOT NULL DEFAULT '0' AFTER `tag`;
|
||||
@@ -0,0 +1 @@
|
||||
update zt_action set `project` = `extra` where action = 'unlinkedfromproject' and `project` = 0;
|
||||
+3
-3
@@ -377,7 +377,7 @@ CREATE TABLE IF NOT EXISTS `zt_doccontent` (
|
||||
`doc` mediumint(8) unsigned NOT NULL,
|
||||
`title` varchar(255) NOT NULL,
|
||||
`digest` varchar(255) NOT NULL,
|
||||
`content` text NOT NULL,
|
||||
`content` longtext NOT NULL,
|
||||
`files` text NOT NULL,
|
||||
`type` varchar(10) NOT NULL,
|
||||
`version` smallint(5) unsigned NOT NULL,
|
||||
@@ -478,7 +478,7 @@ CREATE TABLE IF NOT EXISTS `zt_file` (
|
||||
-- DROP TABLE IF EXISTS `zt_group`;
|
||||
CREATE TABLE IF NOT EXISTS `zt_group` (
|
||||
`id` mediumint(8) unsigned NOT NULL auto_increment,
|
||||
`program` mediumint(8) NOT NULL DEFAULT '0',
|
||||
`program` mediumint(8) unsigned NOT NULL DEFAULT 0,
|
||||
`name` char(30) NOT NULL,
|
||||
`role` char(30) NOT NULL default '',
|
||||
`desc` char(255) NOT NULL default '',
|
||||
@@ -557,7 +557,7 @@ CREATE TABLE IF NOT EXISTS `zt_jenkins` (
|
||||
`name` varchar(50) NOT NULL,
|
||||
`url` varchar(255) DEFAULT NULL,
|
||||
`account` varchar(30) DEFAULT NULL,
|
||||
`password` varchar(30) NOT NULL,
|
||||
`password` varchar(255) NOT NULL,
|
||||
`token` varchar(255) DEFAULT NULL,
|
||||
`createdBy` varchar(30) NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
|
||||
+269
@@ -1,3 +1,254 @@
|
||||
2020-08-10 12.4.1
|
||||
完成的需求
|
||||
5113 将华宇的大数据优化代码合并到主干版本中对外发布
|
||||
5028 计划、发布、版本关联需求bug页面实现分页功能
|
||||
5027 将action模块的create拆分
|
||||
修复的Bug
|
||||
2480 统一我的地盘需求和产品需求下的文案
|
||||
2486 任务列表区块优先级长度优化
|
||||
2488 数据库字段属性是int，搜索条件使用0条件不生效
|
||||
2499 创建用例优先级默认问题
|
||||
2500 bug列表的简单表格样式里bug类型列不能自动调节宽度
|
||||
2502 编辑bug，解决版本丢失。
|
||||
2504 我的地盘中还可以对父任务操作开始、记录工时等动作
|
||||
2523 编辑测试单修改所属项目，项目下版本无法显示
|
||||
2525 用例设置相关需求为必填项，用例库还是可以创建用例
|
||||
2532 批量编辑任务提示总消耗不能为空
|
||||
2534 需求分解的任务创建子任务，树状图中子任务不显示
|
||||
2552 提示信息没有规范统一位置
|
||||
2553 title可以显示为中文标题
|
||||
2560 必填项相关需求后无法导入用例
|
||||
2564 测试任务关联需求逻辑错误
|
||||
2565 待办区块展示超过边界
|
||||
2574 创建用例的时候优先级默认是1
|
||||
2592 项目取消需求的关联，项目概况动态没有记录此操作
|
||||
3130 代码中CHANGELOG与官网发布的不一致
|
||||
3284 svn注释解决bug历史记录显示优化
|
||||
3293 用户不是多人任务当前指派人，人可以对任务进行批量操作
|
||||
3313 无法展示删除bug的动作
|
||||
3315 组织动态中会将去年同一天的操作展示为今天
|
||||
3324 在搜索的bug列表中指派后自动返回未搜索的页面
|
||||
3335 不勾选比较项直接进入比较差异页面有错误信息
|
||||
2818 密码强度检查不符
|
||||
3023 富文本编辑器超链接标题显示优化
|
||||
3295 发布关联需求可以连续关联需求多次
|
||||
3317 批量添加bug/项目任务/项目需求待办名称下拉部分遮挡
|
||||
3337 导入单元测试结果页面抄送给默认样式问题
|
||||
|
||||
2020-07-27 12.4.stable
|
||||
修复的Bug
|
||||
3196 内网快速开发平台第二期排版错行
|
||||
2784 用户可以修改他人记录的工时信息
|
||||
2785 用户可以修改他人待办内容
|
||||
2944 报表导出的饼状图图像不清晰
|
||||
2948 执行搜索之后点击左侧的模块，检索标签没有高亮
|
||||
2953 列表页选中时，会出现选不中的情况
|
||||
2957 需求分组下执行用例后显示为空
|
||||
2964 bug转为任务时，自定义的必填项未起效
|
||||
2973 项目概况的燃尽图展示日期数据错位
|
||||
2975 升级程序对数据库结构检查不彻底
|
||||
3279 搜索中输入null时无法按字符串处理
|
||||
2915 文档中插入的表格删除行后保存不生效
|
||||
2987 编辑器设置合并单元格后表格样式问题
|
||||
3016 一天发布多个版本，路线图显示不全
|
||||
3021 相关用例弹窗中删除操作后页面样式问题
|
||||
3055 某一次提交的全部比较功能异常
|
||||
3095 富文本编辑器图片空间功能异常
|
||||
3105 发布关联关闭需求后需求阶段显示为已发布
|
||||
3106 部门删除没有返回json的逻辑
|
||||
3119 用例编辑可以把待评审状态修改掉
|
||||
3133 编辑子需求时更改所属产品后，父需求列表不会跟着更改
|
||||
3166 使用任务工作管理方式时区块会显示bug和发布的统计
|
||||
3168 ALM8.8.1pro版本中手册页面跳转链接不对。
|
||||
3175 父需求修改所属产品后子需求还在原产品下
|
||||
3176 关闭状态的需求的阶段不是已关闭
|
||||
3188 子任务中有同名任务提示优化
|
||||
3189 先执行测试，再执行开发任务，需求阶段展示不正确
|
||||
3190 优化一下禅道邮件内容的样式
|
||||
3191 用户填写任务工时后，列表下方数据未更新，还需手动刷新页面才可更新
|
||||
3199 测试单修改起止时间后生成测试报告测试范围内容不更新
|
||||
3211 父子需求名称相同页面卡死
|
||||
3222 多分支、平台产品，创建bug页面只选择分支，没法通过模块上的分支标识查询
|
||||
3254 父需求可以批量关闭
|
||||
3256 批量创建需求不输入需求名称就可以直接保存
|
||||
3265 编辑待办不支持修改待办类型
|
||||
3267 搜索框中输入内容含有空格时页面报Bad Request错误
|
||||
3226 数字浙江反馈xss漏洞
|
||||
3111 禅道帮助手册显示优化
|
||||
2925 富文本编辑器中的表格添加列功能异常
|
||||
3069 关闭的任务编辑指派人问题
|
||||
2642 任务报表的每日完成统计统计，不能按照日期排序
|
||||
2873 创建富文本文档时，黏贴文档长度超过限制导致界面显示问题
|
||||
2956 用例执行失败转bug步骤和预实际情况的序号不对应
|
||||
2960 只关联某个产品分支的项目模块显示问题
|
||||
2962 测试单关联用例搜索功能保存搜索条件无效
|
||||
2967 通过编辑上传附件，历史记录中记录动作不正确
|
||||
2970 将创建发布的版本字段设置为必填没有起效
|
||||
2986 维护模块负责人后，新建bug时指派者没有自动显示
|
||||
3031 无产品和项目的时候增加的文档库无法看到
|
||||
3209 使用故事概念后无法显示用户需求和软件需求
|
||||
3235 项目管理员创建的公开项目在我的地盘中看不到
|
||||
3248 父需求标题不显示
|
||||
3252 用例导出的模版文件无法选择子需求
|
||||
3260 切换工作方式后测试单无法正常显示
|
||||
3277 触发动作详情页面返回上一级页面跳转错误
|
||||
3283 bug列表的影响版本会显示数字
|
||||
2513 文档功能上传图片附件优化
|
||||
2515 使用搜狗浏览器提示栏没有关闭按钮
|
||||
2920 产品区块数据统计不准确
|
||||
2950 二次开发数据库表展示页面有表没有显示描述
|
||||
2985 集成到zdoo后执行需求复制操作后一级导航会丢失
|
||||
2995 项目-任务模块设置显示产品模块设置后无效
|
||||
2996 需要评审的需求操作按钮有换行
|
||||
2999 项目测试单页面排版样式问题
|
||||
3005 测试单用例删除，测试单报表中的《按用例执行人统计表》中还是统计了删除的用例数据
|
||||
3007 项目维护模块空格显示异常
|
||||
3008 项目团队增加成员角色显示default
|
||||
3017 未关联需求时项目看板页面不显示分组选项
|
||||
3018 后台-二次开发-数据库点击zt_im_queue字段页面报错
|
||||
3024 关联相关bug搜索功能异常
|
||||
3031 无产品和项目的时候增加的文档库无法看到
|
||||
3042 两个用户分别启动任务，历史记录会记录两次启动
|
||||
3052 项目导入bug时，如果bug已经在之前导入了任务，无法再次导入
|
||||
3053 谷歌浏览器下富文本编辑器Bug
|
||||
3056 批量创建bug时所属类型下拉菜单不对
|
||||
3057 项目关联多个产品，选中某一个产品后无法取消模块选择
|
||||
3059 需求详情页面创建用例无法保存
|
||||
3063 测试-bug-导入弹窗显示整个页面
|
||||
3064 任务编辑页面可以将任务编辑为子任务+多人任务
|
||||
3075 测试报告页面中上传的附件无法在文档视图的附件库中查看
|
||||
3077 在零用例需求下创建用例不会自动关联需求
|
||||
3082 添加模块时填写&符合可以被解析
|
||||
3084 自定义 bug类型 第一次保存未验证格式规则
|
||||
3091 需求详情页面弹窗多层嵌套
|
||||
3101 批量关闭需求页面字段距离需要调整
|
||||
3108 禅道列表页面下拉滚动的时候页面不应该有这么高的空白
|
||||
3113 bug导入任务后，通过记录工时为0完成任务，不触发同步bug状态提示
|
||||
3114 一个项目还没关联需求，通过创建测试任务的时候勾选“选择测试需求”，会导致该任务无法关联需求
|
||||
3120 项目 - 需求批量创建用例页面，修改部门用例的相关需求，没有生效
|
||||
3121 多分支产品列表中阶段处下拉按钮方向请保持一致，均朝下。
|
||||
3124 需求api介绍文档中没有是否评审的变量展示
|
||||
3131 进入变更【用户需求】界面，页面“影响的用户需求”区域会加载全部软需
|
||||
3135 项目概况页面 剩余工时、项目进度展示不准确
|
||||
3141 关闭状态的子任务，编辑页面，父任务下拉框丢失默认值
|
||||
3143 截至日期显示样式不一致
|
||||
3147 输入重启服务命令后显示的启动信息中英文拼写错误
|
||||
3148 任务详情页点击需求，添加备注后关闭按钮消失
|
||||
3150 员工负载表显示的工作日天数不准确
|
||||
3151 修改密码时的提示语不合适
|
||||
3152 12.3 版本 多分支下需求阶段，上拉框不展示问题
|
||||
3153 需求编辑页面删除所属计划，需求的阶段还是已计划
|
||||
3159 测试单中标题颜色设置后不变
|
||||
3160 按影响版本搜索bug，条件选择包含无法自定义输入内容
|
||||
3161 ALM一键安装包从11.6.5升级到12.3.1后，后台自定义流程页面默认组合方式需修改下。
|
||||
3162 用例上传不显示标题
|
||||
3163 运维项目的提示需要修改一下
|
||||
3165 复制bug后，bug所属版本字段消失
|
||||
3167 直接完成任务时，没有记录实际开始时间
|
||||
3172 测试报告统计数据不一致
|
||||
3180 jenkins服务密码中使用@导致集成失败
|
||||
3182 项目主页拖动进行中的项目区块燃尽图消失
|
||||
3198 空文件上传问题
|
||||
3200 批量添加待办窗口关闭按钮显示问题
|
||||
3201 产品经理角色我的地盘用户需求和研发需求菜单建议调整下
|
||||
3203 测试单中按需求分组查看用例时移除按钮没有显示
|
||||
3209 使用故事概念后无法显示用户需求和软件需求
|
||||
3218 测试人员设置为项目受限用户后还可以编辑与自己无关的bug
|
||||
3220 单元测试页面执行时间显示错误
|
||||
3235 项目管理员创建的公开项目在我的地盘中看不到
|
||||
3240 除项目管理员分组外的其他分组，大项目的权限建议初始化默认值
|
||||
3241 可访问项目下拉窗口有遮挡
|
||||
3246 大项目未写入对应的项目管理员的可管理项目中
|
||||
3248 父需求标题不显示
|
||||
3277 触发动作详情页面返回上一级页面跳转错误
|
||||
3126 用户反馈测试报告页面存在反射型xss漏洞
|
||||
|
||||
2020-07-02 12.3.3
|
||||
修复的Bug
|
||||
2916 在php-fpm模式下 .htaccess 文件读取失败, 页面500错误
|
||||
2966 多人任务转交显示错误
|
||||
2969 创建需求页面添加计划页面报错
|
||||
2972 项目概况项目剩余工时统计异常
|
||||
3009 项目字段存在SQL注入的问题
|
||||
3010 处理file-module任意目录创建和逻辑绕过的问题
|
||||
3011 禅道-client-module-任意文件读取漏洞
|
||||
3015 禅道项目管理软件存在代码执行漏洞
|
||||
3032 11.6.2存在任意文件读取漏洞
|
||||
3033 11.6.2存在代码安全执行漏洞
|
||||
3034 11.6.3存在SQL注入漏洞
|
||||
3041 php日志报错定时任务启动报错
|
||||
3127 父需求不能关联进计划和项目
|
||||
3132 创建用例选择模块后可以关联到模块下已关闭的需求
|
||||
3137 父子需求关联进计划后排列顺序不对
|
||||
3138 referer跳转错误
|
||||
3139 用例失败转bug没有带入版本信息
|
||||
3140 可以创建无产品的版本
|
||||
3142 免密登录最后登录时间没有记录
|
||||
3145 编辑用户把所有权限分组都去掉保存后权限还在
|
||||
3146 超级管理员没有显示所有的动态
|
||||
3149 后台二次开发应用配置后调用客户端聊天相关函数报错没有权限
|
||||
3156 未登录用户可以直接使用图片链接查看图片
|
||||
3157 发布关联需求bug问题
|
||||
3169 项目-版本在解决bug弹窗中添加备注后没有关闭弹窗按钮
|
||||
3171 多分支产品提bug页面选择分支后所属项目必填项失效
|
||||
3177 必填验证逻辑错误
|
||||
3178 私有产品权限没有生效
|
||||
3179 提bug重现步骤中代码标签导出时被过滤掉了
|
||||
3183 集成钉钉工作消息通知拉取部门1588个后超时卡死
|
||||
3195 编辑用例界面中点击bug菜单，跳转地址有误
|
||||
3215 删除项目再次还原项目，项目团队成员的访问权限失效
|
||||
3223 构建任务会额外触发不满足条件的构建
|
||||
3236 上传危险类型的附件提示信息没有展示
|
||||
|
||||
2020-05-15 12.3.1
|
||||
完成的需求:
|
||||
4827 debug关闭状态网页上不显示任何报错信息
|
||||
4807 后台增加对用户需求和软件需求流程的自定义功能
|
||||
4771 安装的时候修改session path为空的语言提示
|
||||
4767 将然之改为zdoo
|
||||
4696 备份附件过程中记录文件的数量和文件的大小
|
||||
4668 子任务增加批量折叠和记忆功能
|
||||
4612 一键安装包默认的php内存改为512M
|
||||
4545 用例详情页面默认全屏
|
||||
修复的Bug
|
||||
2919 通过计划创建项目保存后页面空白
|
||||
2984 解决bug时填写解决版本设为必填项后，无法在解决页面创建版本
|
||||
2994 视图维护报错
|
||||
3019 解决在php7.4下面的语法兼容问题
|
||||
3030 客户端查看需求 - 报表，任务 - 报表 都报错
|
||||
3037 还原备份报错
|
||||
3048 多人任务转交按钮逻辑问题
|
||||
3050 产品视图首页的统计区块高亮的产品和右边的数据对不上
|
||||
3054 QQ浏览器支持不是很好
|
||||
3058 项目需求按照计划关联会把已经关闭的需求关联上
|
||||
3061 文档详情页面点击删除附件无反应
|
||||
3062 svn提交注释解析问题
|
||||
3066 编辑已关闭bug后指派用户会自动变为当前用户
|
||||
3067 任务复制页面比较大渲染时间容易超时
|
||||
3073 相关需求设置为必填项运维类型项目无法创建任务
|
||||
3074 私有项目修改项目负责人后没有项目访问权限
|
||||
3076 集成git库后同步代码库时卡住
|
||||
3080 父需求名称过长无法显示展开子需求按钮
|
||||
3081 用例关联需求选择弹窗样式问题
|
||||
3082 添加模块时填写&符合可以被解析
|
||||
3083 需求列表阶段下拉框被遮挡
|
||||
3086 在首页点击“然之协同”页面跳转到了禅道官网。
|
||||
3087 升级结果页面、首页相关logo需更新为最新logo。
|
||||
3092 完成任务时消耗工时检查问题
|
||||
3093 用例库用例列表的所属模块无法展示
|
||||
3094 开始任务时填写的备注信息无法显示
|
||||
3096 产品概况页面的路线图区块展示问题
|
||||
3098 无法导入大量测试用例
|
||||
3100 用例覆盖率的计算公式问题
|
||||
3102 提bug页面设置所属项目必填无效
|
||||
3103 创建项目超时
|
||||
3104 图片上传xss漏洞
|
||||
3107 多人任务关闭后重新激活指派人不生效
|
||||
3109 地盘指派给我的用例报错
|
||||
3110 软件需求编辑页面父需求下拉需要过滤用户需求
|
||||
3112 集成svn库报错
|
||||
3114 一个项目还没关联需求，通过创建测试任务的时候勾选“选择测试需求”，会导致该任务无法关联需求
|
||||
|
||||
2020-04-08 12.3
|
||||
完成的需求:
|
||||
4711 地址类型为GET时，导出用例提示没有数据
|
||||
@@ -307,7 +558,25 @@
|
||||
2744 添加用户页面和修改密码页面存在密码明文传输
|
||||
2748 禅道翻译功能，翻译日语时， 当翻译结果与原文一致时，无法保存。
|
||||
2754 翻译功能，新手教程中，创建账号，创建产品与创建需求，对照翻译时，复制到所翻译语言中的变量没有作用
|
||||
2756 测试单新关联的用例无法执行
|
||||
2757 创建项目关联产品计划会把未关联产品的需求关联到项目中
|
||||
2758 开始、完成任务时添加的备注无法在历史记录中显示
|
||||
2760 批量创建用户时密码无法使用
|
||||
2761 路线图名称显示优化
|
||||
2762 后台-二次开-发数据库 喧喧相关表显示异常
|
||||
2763 关闭测试单页面报错
|
||||
2764 批量创建任务及任务编辑页面没有检查起止日期是否合法
|
||||
2765 添加链接文档访问报错
|
||||
2767 翻译功能限制打开无效
|
||||
2768 我的地盘待办和组织用户待办状态正好相反
|
||||
2769 产品-需求编辑页面无法修改需求所处阶段
|
||||
2771 免密登录未进行时间戳的校验
|
||||
2772 未关闭的产品列表下展示的当前项目名称有误
|
||||
2773 产品同步到bug中的模块无法设置模块负责人
|
||||
2774 通过免密登录禅道不会记录登录系统的动态
|
||||
2776 测试报告导出后用例的链接错误
|
||||
2778 11.6.3版本上传.csv批量用例导入，提示没有数据错误
|
||||
2781 后台的数据备份显示大小错误
|
||||
|
||||
2019-09-24 11.6.3
|
||||
修复的Bug:
|
||||
|
||||
@@ -783,6 +783,7 @@ class baseControl
|
||||
$moduleControlFile = $modulePath . 'control.php';
|
||||
$actionExtPath = $this->app->getModuleExtPath($appName, $moduleName, 'control');
|
||||
$file2Included = $moduleControlFile;
|
||||
$classNameToFetch = $moduleName;
|
||||
|
||||
if(!empty($actionExtPath))
|
||||
{
|
||||
@@ -802,6 +803,9 @@ class baseControl
|
||||
$siteActionExtFile = $actionExtPath['site'] . strtolower($methodName) . '.php';
|
||||
$file2Included = file_exists($siteActionExtFile) ? $siteActionExtFile : $file2Included;
|
||||
}
|
||||
|
||||
/* If class name is my{$moduleName} then set classNameToFetch for include this file. */
|
||||
if(strpos($file2Included, DS . 'ext' . DS) !== false and stripos(file_get_contents($file2Included), "class my{$moduleName} extends $moduleName") !== false) $classNameToFetch = "my{$moduleName}";
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -809,7 +813,7 @@ class baseControl
|
||||
* Load the control file.
|
||||
*/
|
||||
if(!is_file($file2Included)) $this->app->triggerError("The control file $file2Included not found", __FILE__, __LINE__, $exit = true);
|
||||
if(!class_exists($moduleName))
|
||||
if(!class_exists($classNameToFetch))
|
||||
{
|
||||
chdir(dirname($file2Included));
|
||||
helper::import($file2Included);
|
||||
|
||||
@@ -257,6 +257,7 @@ class baseHelper
|
||||
return "IN ('" . join("','", $idList) . "')";
|
||||
}
|
||||
|
||||
if(!is_string($idList)) $idList = json_encode($idList);
|
||||
if(!function_exists('get_magic_quotes_gpc') or !get_magic_quotes_gpc()) $idList = addslashes($idList);
|
||||
return "IN ('" . str_replace(',', "','", str_replace(' ', '', $idList)) . "')";
|
||||
}
|
||||
|
||||
+40
-14
@@ -33,11 +33,12 @@ class control extends baseControl
|
||||
{
|
||||
parent::__construct($moduleName, $methodName, $appName);
|
||||
|
||||
if(!defined('IN_INSTALL') and !defined('IN_UPGRADE')) $this->setConcept();
|
||||
if(defined('IN_USE') or (defined('RUN_MODE') and RUN_MODE == 'api')) $this->setConcept();
|
||||
|
||||
if(!isset($this->config->bizVersion)) return false;
|
||||
|
||||
/* Code for task #9224. Set requiredFields for workflow. */
|
||||
if($this->dbh and $this->moduleName != 'upgrade' and $this->moduleName != 'install')
|
||||
if($this->dbh and (defined('IN_USE') or (defined('RUN_MODE') and RUN_MODE == 'api')))
|
||||
{
|
||||
$this->checkRequireFlowField();
|
||||
|
||||
@@ -235,9 +236,8 @@ class control extends baseControl
|
||||
{
|
||||
if(!isset($this->config->bizVersion)) return false;
|
||||
|
||||
$flow = $this->loadModel('workflow')->getByModule($this->moduleName);
|
||||
$action = $this->loadModel('workflowaction')->getByModuleAndAction($this->moduleName, $this->methodName);
|
||||
if($flow && $action) $this->loadModel('workflowhook')->execute($flow, $action, $objectID);
|
||||
$moduleName = $this->moduleName;
|
||||
return $this->$moduleName->executeHooks($objectID);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -302,21 +302,48 @@ class control extends baseControl
|
||||
if(!isset($this->config->bizVersion)) return false;
|
||||
if(empty($_POST)) return false;
|
||||
|
||||
$fields = $this->loadModel('workflowaction')->getFields($this->moduleName, $this->methodName);
|
||||
$layouts = $this->loadModel('workflowlayout')->getFields($this->moduleName, $this->methodName);
|
||||
$notEmptyRule = $this->loadModel('workflowrule')->getByTypeAndRule('system', 'notempty');
|
||||
$fields = $this->loadModel('workflowaction')->getFields($this->moduleName, $this->methodName);
|
||||
$layouts = $this->loadModel('workflowlayout')->getFields($this->moduleName, $this->methodName);
|
||||
$rules = $this->dao->select('*')->from(TABLE_WORKFLOWRULE)->orderBy('id_desc')->fetchAll('id');
|
||||
|
||||
$requiredFields = '';
|
||||
$mustPostFields = '';
|
||||
$numberFields = '';
|
||||
$message = array();
|
||||
foreach($fields as $field)
|
||||
{
|
||||
if($field->buildin or !$field->show or !isset($layouts[$field->field])) continue;
|
||||
if($notEmptyRule && strpos(",$field->rules,", ",$notEmptyRule->id,") !== false)
|
||||
|
||||
$fieldRules = explode(',', trim($field->rules, ','));
|
||||
$fieldRules = array_unique($fieldRules);
|
||||
foreach($fieldRules as $ruleID)
|
||||
{
|
||||
$requiredFields .= ",{$field->field}";
|
||||
if($field->control == 'radio' or $field->control == 'checkbox') $mustPostFields .= ",{$field->field}";
|
||||
if(strpos($field->type, 'int') !== false and $field->control == 'select') $numberFields .= ",{$field->field}";
|
||||
if(!isset($rules[$ruleID])) continue;
|
||||
if(!empty($_POST[$field->field]) and !is_string($_POST[$field->field])) continue;
|
||||
|
||||
$rule = $rules[$ruleID];
|
||||
if($rule->type == 'system' and $rule->rule == 'notempty')
|
||||
{
|
||||
$requiredFields .= ",{$field->field}";
|
||||
if($field->control == 'radio' or $field->control == 'checkbox') $mustPostFields .= ",{$field->field}";
|
||||
if(strpos($field->type, 'int') !== false and $field->control == 'select') $numberFields .= ",{$field->field}";
|
||||
}
|
||||
elseif($rule->type == 'system' and isset($_POST[$field->field]))
|
||||
{
|
||||
$checkFunc = 'check' . $rule->rule;
|
||||
if(!validater::$checkFunc($_POST[$field->field]))
|
||||
{
|
||||
$error = zget($this->lang->error, $rule->rule, '');
|
||||
if($error) $error = sprintf($error, $field->name);
|
||||
if(empty($error)) $error = sprintf($this->lang->error->reg, $field->name, $rule->rule);
|
||||
|
||||
$message[$field->field][] = $error;
|
||||
}
|
||||
}
|
||||
elseif($rule->type == 'regex' and isset($_POST[$field->field]))
|
||||
{
|
||||
if(!validater::checkREG($_POST[$field->field], $rule->rule)) $message[$field->field][] = sprintf($this->lang->error->reg, $field->name, $rule->rule);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -324,7 +351,6 @@ class control extends baseControl
|
||||
{
|
||||
if(isset($this->config->{$this->moduleName}->{$this->methodName}->requiredFields)) $requiredFields .= ',' . $this->config->{$this->moduleName}->{$this->methodName}->requiredFields;
|
||||
|
||||
$message = array();
|
||||
foreach(explode(',', $requiredFields) as $requiredField)
|
||||
{
|
||||
if(empty($requiredField)) continue;
|
||||
@@ -341,7 +367,7 @@ class control extends baseControl
|
||||
$message[$requiredField][] = sprintf($this->lang->error->notempty, $fields[$requiredField]->name);
|
||||
}
|
||||
}
|
||||
if($message) $this->send(array('result' => 'fail', 'message' => $message));
|
||||
}
|
||||
if($message) $this->send(array('result' => 'fail', 'message' => $message));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,4 +65,53 @@ class model extends baseModel
|
||||
|
||||
return $this->loadModel('workflowfield')->processSubStatus($module, $record);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get flow extend fields.
|
||||
*
|
||||
* @access public
|
||||
* @return array
|
||||
*/
|
||||
public function getFlowExtendFields()
|
||||
{
|
||||
if(!isset($this->config->bizVersion)) return array();
|
||||
|
||||
return $this->loadModel('flow')->getExtendFields($this->app->getModuleName(), $this->app->getMethodName());
|
||||
}
|
||||
|
||||
/**
|
||||
* Check flow rule.
|
||||
*
|
||||
* @param object $field
|
||||
* @param string $value
|
||||
* @access public
|
||||
* @return bool|string
|
||||
*/
|
||||
public function checkFlowRule($field, $value)
|
||||
{
|
||||
if(!isset($this->config->bizVersion)) return false;
|
||||
|
||||
return $this->loadModel('flow')->checkRule($field, $value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Execute Hooks
|
||||
*
|
||||
* @param int $objectID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function executeHooks($objectID)
|
||||
{
|
||||
if(!isset($this->config->bizVersion)) return false;
|
||||
|
||||
$moduleName = $this->app->getModuleName();
|
||||
$methodName = $this->app->getMethodName();
|
||||
|
||||
$action = $this->loadModel('workflowaction')->getByModuleAndAction($moduleName, $methodName);
|
||||
if(empty($action) or $action->extensionType == 'none') return false;
|
||||
|
||||
$flow = $this->loadModel('workflow')->getByModule($moduleName);
|
||||
if($flow && $action) $this->loadModel('workflowhook')->execute($flow, $action, $objectID);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,6 +47,14 @@ class router extends baseRouter
|
||||
*/
|
||||
public $rawParams;
|
||||
|
||||
/**
|
||||
* 原始URI
|
||||
*
|
||||
* @var string
|
||||
* @access public
|
||||
*/
|
||||
public $rawURI;
|
||||
|
||||
/**
|
||||
* 标记是否是工作流
|
||||
* Whether the tag is a workflow
|
||||
@@ -56,6 +64,18 @@ class router extends baseRouter
|
||||
*/
|
||||
public $isFlow = false;
|
||||
|
||||
/**
|
||||
* Get the $moduleRoot var.
|
||||
*
|
||||
* @param string $appName
|
||||
* @access public
|
||||
* @return string
|
||||
*/
|
||||
public function getModuleRoot($appName = '')
|
||||
{
|
||||
return $this->moduleRoot;
|
||||
}
|
||||
|
||||
/**
|
||||
* Merge system and translated langs.
|
||||
*
|
||||
@@ -106,7 +126,7 @@ class router extends baseRouter
|
||||
$commonSettings = array();
|
||||
try
|
||||
{
|
||||
$commonSettings = $this->dbh->query('SELECT `key`, value FROM' . TABLE_CONFIG . "WHERE `owner`='system' AND `module`='custom' and `key` in ('productProject','urAndSr','storyRequirement','hourPoint')")->fetchAll();
|
||||
$commonSettings = $this->dbh->query('SELECT `key`, value FROM' . TABLE_CONFIG . "WHERE `owner`='system' AND `module`='custom' and `key` in ('productProject','URAndSR','URSRName','storyRequirement','hourPoint')")->fetchAll();
|
||||
}
|
||||
catch (PDOException $exception)
|
||||
{
|
||||
@@ -134,7 +154,13 @@ class router extends baseRouter
|
||||
if($setting->key == 'productProject') list($productCommon, $projectCommon) = explode('_', $setting->value);
|
||||
if($setting->key == 'storyRequirement') $storyCommon = $setting->value;
|
||||
if($setting->key == 'hourPoint') $hourCommon = $setting->value;
|
||||
if($setting->key == 'urAndSr') $config->urAndSr = $setting->value;
|
||||
if($setting->key == 'URAndSR') $URAndSR = $setting->value;
|
||||
if($setting->key == 'URSRName')
|
||||
{
|
||||
$URSRName = json_decode($setting->value, true);
|
||||
if(isset($URSRName['urCommon'][$this->clientLang])) $lang->urCommon = $URSRName['urCommon'][$this->clientLang];
|
||||
if(isset($URSRName['srCommon'][$this->clientLang])) $lang->srCommon = $URSRName['srCommon'][$this->clientLang];
|
||||
}
|
||||
}
|
||||
|
||||
if($this->session->program)
|
||||
@@ -150,6 +176,19 @@ class router extends baseRouter
|
||||
$lang->projectCommon = isset($this->config->projectCommonList[$this->clientLang][(int)$projectCommon]) ? $this->config->projectCommonList[$this->clientLang][(int)$projectCommon] : $this->config->projectCommonList['en'][(int)$projectCommon];
|
||||
$lang->storyCommon = isset($this->config->storyCommonList[$this->clientLang][(int)$storyCommon]) ? $this->config->storyCommonList[$this->clientLang][(int)$storyCommon] : $this->config->storyCommonList['en'][(int)$storyCommon];
|
||||
$lang->hourCommon = isset($this->config->hourPointCommonList[$this->clientLang][(int)$hourCommon]) ? $this->config->hourPointCommonList[$this->clientLang][(int)$hourCommon] : $this->config->hourPointCommonList['en'][(int)$hourCommon];
|
||||
|
||||
if($storyCommon == 0 and isset($URAndSR))
|
||||
{
|
||||
$config->URAndSR = $URAndSR;
|
||||
if(!empty($URAndSR) and !empty($lang->srCommon)) $lang->storyCommon = $lang->srCommon;
|
||||
}
|
||||
}
|
||||
|
||||
/* When module is custom then reset storyCommon. */
|
||||
if($moduleName == 'custom')
|
||||
{
|
||||
global $config;
|
||||
$lang->storyCommon = isset($this->config->storyCommonList[$this->clientLang][(int)$config->storyCommon]) ? $this->config->storyCommonList[$this->clientLang][(int)$config->storyCommon] : $this->config->storyCommonList['en'][(int)$config->storyCommon];
|
||||
}
|
||||
|
||||
parent::loadLang($moduleName, $appName);
|
||||
@@ -328,6 +367,7 @@ class router extends baseRouter
|
||||
/* Check if the requested module is defined in workflow. */
|
||||
$flow = $this->dbh->query("SELECT * FROM " . TABLE_WORKFLOW . " WHERE `module` = '$this->moduleName'")->fetch();
|
||||
if(!$flow) return parent::setControlFile($exitIfNone);
|
||||
if($flow->status != 'normal') die("<html><head><meta charset='utf-8'></head><body>{$this->lang->flowNotRelease}</body></html>");
|
||||
|
||||
/**
|
||||
* 工作流中配置的标签应该请求browse方法，而某些内置流程本身包含browse方法。在这里处理请求的时候会无法区分是内置的browse方法还是工作
|
||||
@@ -404,6 +444,8 @@ class router extends baseRouter
|
||||
*/
|
||||
public function setFlowURI($moduleName, $methodName)
|
||||
{
|
||||
$this->rawURI = $this->URI;
|
||||
|
||||
$this->setModuleName($moduleName);
|
||||
$this->setMethodName($methodName);
|
||||
|
||||
@@ -477,6 +519,25 @@ class router extends baseRouter
|
||||
if($this->get->display == 'card') $this->viewType = 'xhtml';
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取$URL。
|
||||
* Get the $URL.
|
||||
*
|
||||
* @param bool $full true, the URI contains the webRoot, else only hte URI.
|
||||
* @access public
|
||||
* @return string
|
||||
*/
|
||||
public function getURI($full = false)
|
||||
{
|
||||
$URI = !empty($this->rawURI) ? $this->rawURI : $this->URI;
|
||||
if($full and $this->config->requestType == 'PATH_INFO')
|
||||
{
|
||||
if($URI) return $this->config->webRoot . $URI . '.' . $this->viewType;
|
||||
return $this->config->webRoot;
|
||||
}
|
||||
return $URI;
|
||||
}
|
||||
|
||||
/**
|
||||
* 如果$this->isFlow的值为true，说明这个请求需要工作流引擎来处理，则要根据工作流引擎的需要重新设置参数。
|
||||
* If the values of $this->isFlow is true, indicating that the request needs to be processed
|
||||
|
||||
@@ -1067,8 +1067,8 @@ class baseDAO
|
||||
{
|
||||
$table = strtolower($this->table);
|
||||
}
|
||||
$fieldLabel = isset($lang->$table->$fieldName) ? $lang->$table->$fieldName : $fieldName;
|
||||
$value = isset($this->sqlobj->data->$fieldName) ? $this->sqlobj->data->$fieldName : null;
|
||||
$fieldLabel = isset($lang->$table->$fieldName) ? $lang->$table->$fieldName : $fieldName;
|
||||
$value = isset($this->sqlobj->data->$fieldName) ? $this->sqlobj->data->$fieldName : null;
|
||||
|
||||
/*
|
||||
* 检查唯一性。
|
||||
@@ -1103,6 +1103,7 @@ class baseDAO
|
||||
{
|
||||
${"arg$i"} = isset($funcArgs[$i + 2]) ? $funcArgs[$i + 2] : null;
|
||||
}
|
||||
|
||||
$checkFunc = 'check' . $funcName;
|
||||
if(validater::$checkFunc($value, $arg0, $arg1, $arg2) === false)
|
||||
{
|
||||
|
||||
@@ -330,7 +330,7 @@ class baseValidater
|
||||
*/
|
||||
public static function checkNotEmpty($var)
|
||||
{
|
||||
return strlen(trim($var)) != 0;
|
||||
return !empty($var);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -989,7 +989,11 @@ class baseFixer
|
||||
$fields = $this->processFields($fieldName);
|
||||
foreach($fields as $fieldName)
|
||||
{
|
||||
if(empty($this->stripedFields) or !isset($this->stripedFields[$fieldName])) $this->data->$fieldName = $this->specialArray($this->data->$fieldName);
|
||||
if(empty($this->stripedFields) or !isset($this->stripedFields[$fieldName]))
|
||||
{
|
||||
$this->data->$fieldName = $this->specialArray($this->data->$fieldName);
|
||||
$this->stripedFields[$fieldName] = $fieldName;
|
||||
}
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
|
||||
@@ -800,6 +800,18 @@ class baseJS
|
||||
*/
|
||||
static public function alert($message = '', $full = true)
|
||||
{
|
||||
global $app;
|
||||
|
||||
if($app->viewType == 'json')
|
||||
{
|
||||
$output = array();
|
||||
$output['status'] = 'success';
|
||||
$output['data'] = json_encode(array('message' => $message));
|
||||
$output['md5'] = md5($output['data']);
|
||||
|
||||
return json_encode($output);
|
||||
}
|
||||
|
||||
return self::start($full) . "alert('" . $message . "')" . self::end() . self::resetForm();
|
||||
}
|
||||
|
||||
@@ -828,6 +840,18 @@ class baseJS
|
||||
*/
|
||||
static public function error($message, $full = true)
|
||||
{
|
||||
global $app;
|
||||
|
||||
if($app->viewType == 'json')
|
||||
{
|
||||
$output = array();
|
||||
$output['status'] = 'success';
|
||||
$output['data'] = json_encode(array('result' => 'fail', 'message' => $message));
|
||||
$output['md5'] = md5($output['data']);
|
||||
|
||||
return json_encode($output);
|
||||
}
|
||||
|
||||
$alertMessage = '';
|
||||
if(is_array($message))
|
||||
{
|
||||
@@ -871,6 +895,24 @@ class baseJS
|
||||
*/
|
||||
static public function confirm($message = '', $okURL = '', $cancleURL = '', $okTarget = "self", $cancleTarget = "self")
|
||||
{
|
||||
global $app;
|
||||
if($app->viewType == 'json')
|
||||
{
|
||||
$data = array();
|
||||
$data['message'] = $message;
|
||||
$data['okURL'] = common::getSysURL() . $okURL;
|
||||
$data['cancleURL'] = common::getSysURL() . $cancleURL;
|
||||
$data['okTarget'] = $okTarget;
|
||||
$data['cancleTarget'] = $cancleTarget;
|
||||
|
||||
$output = array();
|
||||
$output['status'] = 'success';
|
||||
$output['data'] = json_encode($data);
|
||||
$output['md5'] = md5($output['data']);
|
||||
|
||||
return json_encode($output);
|
||||
}
|
||||
|
||||
$js = self::start();
|
||||
|
||||
$confirmAction = '';
|
||||
@@ -919,6 +961,8 @@ EOT;
|
||||
*/
|
||||
static public function locate($url, $target = "self")
|
||||
{
|
||||
global $app;
|
||||
|
||||
/* If the url if empty, goto the home page. */
|
||||
if(!$url)
|
||||
{
|
||||
@@ -926,6 +970,18 @@ EOT;
|
||||
$url = $config->webRoot;
|
||||
}
|
||||
|
||||
if($app->viewType == 'json')
|
||||
{
|
||||
$data = strtolower($url) == 'back' ? array('locate' => 'back') : array('locate' => common::getSysURL() . $url);
|
||||
|
||||
$output = array();
|
||||
$output['status'] = 'success';
|
||||
$output['data'] = json_encode($data);
|
||||
$output['md5'] = md5($output['data']);
|
||||
|
||||
return json_encode($output);
|
||||
}
|
||||
|
||||
$js = self::start();
|
||||
if(strtolower($url) == "back")
|
||||
{
|
||||
|
||||
@@ -47,22 +47,29 @@ class dingapi
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all users.
|
||||
* Get users.
|
||||
*
|
||||
* @param string $selectedDepts
|
||||
* @access public
|
||||
* @return array
|
||||
*/
|
||||
public function getAllUsers()
|
||||
public function getUsers($selectedDepts = '')
|
||||
{
|
||||
$depts = $this->getAllDepts();
|
||||
if($this->isError()) return array('result' => 'fail', 'message' => $this->errors);
|
||||
$depts = trim($selectedDepts);
|
||||
if(empty($depts)) return array('result' => 'fail', 'message' => 'nodept');
|
||||
|
||||
set_time_limit(0);
|
||||
$users = array();
|
||||
foreach($depts as $deptID => $deptName)
|
||||
foreach(explode(',', $depts) as $deptID)
|
||||
{
|
||||
if(empty($deptID)) continue;
|
||||
|
||||
$response = $this->queryAPI($this->apiUrl . "user/simplelist?access_token={$this->token}&department_id={$deptID}");
|
||||
if($this->isError()) continue;
|
||||
if($this->isError())
|
||||
{
|
||||
$this->getErrors();
|
||||
continue;
|
||||
}
|
||||
|
||||
foreach($response->userlist as $user) $users[$user->name] = $user->userid;
|
||||
}
|
||||
@@ -71,19 +78,39 @@ class dingapi
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all depts.
|
||||
* Get dept tree.
|
||||
*
|
||||
* @access public
|
||||
* @return array
|
||||
*/
|
||||
public function getAllDepts()
|
||||
public function getDeptTree()
|
||||
{
|
||||
$response = $this->queryAPI($this->apiUrl . "department/list?access_token={$this->token}");
|
||||
if($this->isError()) return false;
|
||||
if($this->isError()) return array('result' => 'fail', 'message' => $this->errors);
|
||||
|
||||
$deptPairs = array();
|
||||
foreach($response->department as $dept) $deptPairs[$dept->id] = $dept->name;
|
||||
return $deptPairs;
|
||||
$parentDepts = array();
|
||||
foreach($response->department as $dept)
|
||||
{
|
||||
$parentID = isset($dept->parentid) ? $dept->parentid : 0;
|
||||
$parentDepts[$parentID][$dept->id] = $dept->name;
|
||||
}
|
||||
|
||||
$tree = array();
|
||||
foreach($parentDepts as $parentID => $depts)
|
||||
{
|
||||
foreach($depts as $deptID => $deptName)
|
||||
{
|
||||
$node = array();
|
||||
$node['id'] = $deptID;
|
||||
$node['pId'] = $parentID;
|
||||
$node['name'] = $deptName;
|
||||
if($parentID == 0) $node['open'] = true;
|
||||
|
||||
$tree[] = $node;
|
||||
}
|
||||
}
|
||||
|
||||
return array('result' => 'success', 'data' => $tree);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -60,6 +60,7 @@ class fixer extends baseFixer
|
||||
}
|
||||
if($canImplode) $this->data->$field = implode(',', $value);
|
||||
}
|
||||
if(isset($flowFields[$field]) and $flowFields[$field]->control == 'textarea') $this->skipSpecial($field);
|
||||
$this->specialChars($field);
|
||||
}
|
||||
|
||||
|
||||
@@ -164,13 +164,29 @@ class html extends baseHTML
|
||||
$id = "id='{$id}'";
|
||||
if(strpos($attrib, 'id=') !== false) $id = '';
|
||||
|
||||
$string = "<select name='$name' {$id} $attrib>\n";
|
||||
global $config;
|
||||
$string = '';
|
||||
if(count($options) >= $config->maxCount or isset($config->moreLinks[$name]))
|
||||
{
|
||||
if(strpos($attrib, 'chosen') !== false) $attrib = str_replace('chosen', 'picker-select', $attrib);
|
||||
if(isset($config->moreLinks[$name]))
|
||||
{
|
||||
$link = $config->moreLinks[$name];
|
||||
$attrib .= " data-pickertype='remote' data-pickerremote='" . $link . "'";
|
||||
}
|
||||
|
||||
$convertedPinYin = array();
|
||||
if(count($options) <= $config->maxCount) $convertedPinYin = (empty($config->isINT) and class_exists('common')) ? common::convert2Pinyin($options) : array();
|
||||
}
|
||||
else
|
||||
{
|
||||
$convertedPinYin = (empty($config->isINT) and class_exists('common')) ? common::convert2Pinyin($options) : array();
|
||||
}
|
||||
$string .= "<select name='$name' {$id} $attrib>\n";
|
||||
|
||||
/* The options. */
|
||||
global $config;
|
||||
if(is_array($selectedItems)) $selectedItems = implode(',', $selectedItems);
|
||||
$selectedItems = ",$selectedItems,";
|
||||
$convertedPinYin = (empty($config->isINT) and class_exists('common')) ? common::convert2Pinyin($options) : array();
|
||||
foreach($options as $key => $value)
|
||||
{
|
||||
$optionPinyin = zget($convertedPinYin, $value, '');
|
||||
|
||||
@@ -481,7 +481,7 @@ class SMTP {
|
||||
|
||||
$max_line_length = 998; // used below; set here for ease in change
|
||||
|
||||
while(list(,$line) = each($lines)) {
|
||||
foreach($lines as $line) {
|
||||
$lines_out = null;
|
||||
if($line == "" && $in_headers) {
|
||||
$in_headers = false;
|
||||
@@ -510,7 +510,7 @@ class SMTP {
|
||||
$lines_out[] = $line;
|
||||
|
||||
// send the lines to the server
|
||||
while(list(,$line_out) = each($lines_out)) {
|
||||
foreach($lines_out as $line_out) {
|
||||
if(strlen($line_out) > 0)
|
||||
{
|
||||
if(substr($line_out, 0, 1) == ".") {
|
||||
|
||||
@@ -328,6 +328,19 @@ class GitRepo
|
||||
return $info;
|
||||
}
|
||||
|
||||
/**
|
||||
* Exec git cmd.
|
||||
*
|
||||
* @param string $cmd
|
||||
* @access public
|
||||
* @return array
|
||||
*/
|
||||
public function exec($cmd)
|
||||
{
|
||||
chdir($this->root);
|
||||
return execCmd(escapeCmd("$this->client $cmd"), 'array');
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse diff.
|
||||
*
|
||||
|
||||
@@ -141,6 +141,18 @@ class scm
|
||||
return $this->engine->info($entry, $revision);
|
||||
}
|
||||
|
||||
/**
|
||||
* Exec scm cmd.
|
||||
*
|
||||
* @param string $cmd
|
||||
* @access public
|
||||
* @return array
|
||||
*/
|
||||
public function exec($cmd)
|
||||
{
|
||||
return $this->engine->exec($cmd);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get commit count
|
||||
*
|
||||
|
||||
@@ -8,6 +8,7 @@ class Subversion
|
||||
public $ssh;
|
||||
public $remote;
|
||||
public $encoding;
|
||||
public $svnVersion;
|
||||
|
||||
/**
|
||||
* Construct
|
||||
@@ -23,7 +24,7 @@ class Subversion
|
||||
public function __construct($client, $root, $account, $password, $encoding = 'UTF-8')
|
||||
{
|
||||
putenv('LC_CTYPE=en_US.UTF-8');
|
||||
$this->root = str_replace(array('%3A', '%2F'), array(':', '/'), urlencode(rtrim($root, '/')));
|
||||
$this->root = str_replace(array('%3A', '%2F', '+'), array(':', '/', ' '), urlencode(rtrim($root, '/')));
|
||||
$this->account = $account;
|
||||
$this->password = $password;
|
||||
$this->encoding = $encoding;
|
||||
@@ -31,6 +32,8 @@ class Subversion
|
||||
$this->remote = !(stripos($this->root, 'file') === 0);
|
||||
$this->client = $this->remote ? $client . " --username @account@ --password @password@" : $client;
|
||||
if($this->encoding == 'utf-8') $this->encoding = 'gbk';
|
||||
|
||||
$this->svnVersion = $this->getSVNVersion($client);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -44,7 +47,7 @@ class Subversion
|
||||
public function ls($path, $revision = 'HEAD')
|
||||
{
|
||||
$resourcePath = $path;
|
||||
$path = '"' . $this->root . '/' . str_replace('%2F', '/', urlencode($path)) . '"';
|
||||
$path = '"' . $this->root . '/' . str_replace(array('%2F', '+'), array('/', ' '), urlencode($path)) . '"';
|
||||
$cmd = $this->replaceAuth(escapeCmd($this->buildCMD($path, 'ls', "-r $revision --xml")));
|
||||
$list = execCmd($cmd, 'string', $result);
|
||||
if($result)
|
||||
@@ -142,7 +145,7 @@ class Subversion
|
||||
public function getLastLog($path, $count = 10)
|
||||
{
|
||||
$resourcePath = $path;
|
||||
$path = '"' . $this->root . '/' . str_replace('%2F', '/', urlencode($path)) . '"';
|
||||
$path = '"' . $this->root . '/' . str_replace(array('%2F', '+'), array('/', ' '), urlencode($path)) . '"';
|
||||
$cmd = $this->replaceAuth(escapeCmd($this->buildCMD($path, 'log', "--limit $count --xml")));
|
||||
$comments = execCmd($cmd, 'string', $result);
|
||||
if($result)
|
||||
@@ -195,7 +198,7 @@ class Subversion
|
||||
$resourcePath = $path;
|
||||
$count = $count == 0 ? '' : "--limit $count";
|
||||
$param = $quiet ? '-q' : '-v';
|
||||
$path = '"' . $this->root . '/' . str_replace('%2F', '/', urlencode($path)) . '"';
|
||||
$path = '"' . $this->root . '/' . str_replace(array('%2F', '+'), array('/', ' '), urlencode($path)) . '"';
|
||||
$cmd = $this->replaceAuth(escapeCmd($this->buildCMD($path, 'log', "$count $param -r $fromRevision:$toRevision --xml")));
|
||||
$comments = execCmd($cmd, 'string', $result);
|
||||
if($result)
|
||||
@@ -256,7 +259,7 @@ class Subversion
|
||||
public function blame($path, $revision)
|
||||
{
|
||||
$resourcePath = $path;
|
||||
$path = '"' . $this->root . '/' . str_replace('%2F', '/', urlencode($path)) . '"';
|
||||
$path = '"' . $this->root . '/' . str_replace(array('%2F', '+'), array('/', ' '), urlencode($path)) . '"';
|
||||
$file = $this->replaceAuth(escapeCmd($this->buildCMD($path, 'cat', "-r $revision")));
|
||||
$blame = $this->replaceAuth(escapeCmd($this->buildCMD($path, 'blame', "-r $revision --xml")));
|
||||
$output = execCmd($blame, 'string', $result);
|
||||
@@ -326,7 +329,7 @@ class Subversion
|
||||
{
|
||||
$resourcePath = $path;
|
||||
if($fromRevision == '^') $fromRevision = $toRevision - 1;
|
||||
$path = '"' . $this->root . '/' . str_replace('%2F', '/', urlencode($path)) . '"';
|
||||
$path = '"' . $this->root . '/' . str_replace(array('%2F', '+'), array('/', ' '), urlencode($path)) . '"';
|
||||
$cmd = $this->replaceAuth(escapeCmd($this->buildCMD($path, 'diff', "-r $fromRevision:$toRevision")));
|
||||
$lines = execCmd($cmd, 'array', $result);
|
||||
if($result)
|
||||
@@ -349,7 +352,7 @@ class Subversion
|
||||
public function cat($entry, $revision = 'HEAD')
|
||||
{
|
||||
$resourcePath = $entry;
|
||||
$entry = '"' . $this->root . '/' . str_replace('%2F', '/', urlencode($entry)) . '"';
|
||||
$entry = '"' . $this->root . '/' . str_replace(array('%2F', '+'), array('/', ' '), urlencode($entry)) . '"';
|
||||
$cmd = $this->replaceAuth(escapeCmd($this->buildCMD($entry, 'cat', "-r $revision")));
|
||||
$content = execCmd($cmd, 'string', $result);
|
||||
if($result)
|
||||
@@ -372,7 +375,7 @@ class Subversion
|
||||
public function info($entry, $revision = 'HEAD')
|
||||
{
|
||||
$resourcePath = $entry;
|
||||
$entry = '"' . $this->root . '/' . str_replace('%2F', '/', urlencode($entry)) . '"';
|
||||
$entry = '"' . $this->root . '/' . str_replace(array('%2F', '+'), array('/', ' '), urlencode($entry)) . '"';
|
||||
$svnInfo = $this->replaceAuth(escapeCmd($this->buildCMD($entry, 'info', "-r $revision --xml")));
|
||||
|
||||
$svninfo = execCmd($svnInfo, 'string', $result);
|
||||
@@ -400,6 +403,19 @@ class Subversion
|
||||
return $info;
|
||||
}
|
||||
|
||||
/**
|
||||
* Exec svn cmd.
|
||||
*
|
||||
* @param string $cmd
|
||||
* @access public
|
||||
* @return array
|
||||
*/
|
||||
public function exec($cmd)
|
||||
{
|
||||
$cmd = $this->replaceAuth(escapeCmd($this->buildCMD('', $cmd, '')));
|
||||
return execCmd($cmd, 'array');
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse diff.
|
||||
*
|
||||
@@ -552,6 +568,7 @@ class Subversion
|
||||
if(stripos($this->root, 'https') === 0 or stripos($this->root, 'svn') === 0)
|
||||
{
|
||||
$comments = str_replace("\\", "/", "$this->client log $count -v -r $version:0 --non-interactive --trust-server-cert-failures=cn-mismatch --trust-server-cert --no-auth-cache --xml $path");
|
||||
if($this->svnVersion and version_compare($this->svnVersion, '1.9', '<')) $comments = str_replace("\\", "/", "$this->client log $count -v -r $version:0 --non-interactive --trust-server-cert --no-auth-cache --xml $path");
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -619,6 +636,7 @@ class Subversion
|
||||
if($this->ssh)
|
||||
{
|
||||
$cmd = str_replace("\\", "/", "$this->client $action $param --non-interactive --trust-server-cert-failures=cn-mismatch --trust-server-cert --no-auth-cache $path");
|
||||
if($this->svnVersion and version_compare($this->svnVersion, '1.9', '<')) $cmd = str_replace("\\", "/", "$this->client $action $param --non-interactive --trust-server-cert --no-auth-cache $path");
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -627,4 +645,20 @@ class Subversion
|
||||
|
||||
return $cmd;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get SVN version.
|
||||
*
|
||||
* @param string $client
|
||||
* @access public
|
||||
* @return string
|
||||
*/
|
||||
public function getSVNVersion($client)
|
||||
{
|
||||
$versionCommand = "$client --version --quiet 2>&1";
|
||||
exec($versionCommand, $versionOutput, $versionResult);
|
||||
if($versionResult) return false;
|
||||
|
||||
return end($versionOutput);
|
||||
}
|
||||
}
|
||||
|
||||
+78
-20
@@ -16,50 +16,108 @@ class zfile
|
||||
*
|
||||
* @param string $from
|
||||
* @param string $to
|
||||
* @param bool $showDetails
|
||||
* @param bool $logLevel
|
||||
* @param string $logFile
|
||||
* @access public
|
||||
* @return array copied files.
|
||||
* @return array copied files, count, size or message.
|
||||
*/
|
||||
public function copyDir($from, $to, $showDetails = true)
|
||||
public function copyDir($from, $to, $logLevel = false, $logFile = '')
|
||||
{
|
||||
static $copiedFiles = array();
|
||||
static $errorFiles = array();
|
||||
$count = $size = 0;
|
||||
|
||||
if(!is_dir($from) or !is_readable($from)) return array($copiedFiles, $count, $size);
|
||||
if(!is_dir($to))
|
||||
$log['copiedFiles'] = array();
|
||||
$log['count'] = 0;
|
||||
$log['size'] = 0;
|
||||
|
||||
if(!is_dir($from) or !is_readable($from))
|
||||
{
|
||||
if(!is_writable(dirname($to))) return array($copiedFiles, $count, $size);
|
||||
mkdir($to);
|
||||
if(!is_dir($from)) $log['message'] = "$from: Dir is not exists";
|
||||
if(!is_readable($from)) $log['message'] = "$from: Permission denied";
|
||||
}
|
||||
if(!is_dir($to) and !@mkdir($to, 0777, true)) $log['message'] = "$to: Permission denied";
|
||||
if(is_dir($to) and !is_writeable($to)) $log['message'] = "$to: Permission denied";
|
||||
if($logFile and !file_exists($logFile)) touch($logFile);
|
||||
if(!empty($log['message'])) return $log;
|
||||
|
||||
$from = realpath($from) . '/';
|
||||
$to = realpath($to) . '/';
|
||||
|
||||
$from = realpath($from) . '/';
|
||||
$to = realpath($to) . '/';
|
||||
$entries = scandir($from);
|
||||
|
||||
foreach($entries as $entry)
|
||||
{
|
||||
if($entry == '.' or $entry == '..' or $entry == '.svn') continue;
|
||||
if($entry == '.' or $entry == '..' or $entry == '.svn' or $entry == '.git') continue;
|
||||
|
||||
$fullEntry = $from . $entry;
|
||||
if(is_file($fullEntry))
|
||||
{
|
||||
if(file_exists($to . $entry)) unlink($to . $entry);
|
||||
|
||||
copy($fullEntry, $to . $entry);
|
||||
if($showDetails) $copiedFiles[] = $to . $entry;
|
||||
$count += 1;
|
||||
$size += filesize($fullEntry);
|
||||
if(copy($fullEntry, $to . $entry))
|
||||
{
|
||||
if($logLevel) $copiedFiles[] = $to . $entry;
|
||||
$count += 1;
|
||||
$size += filesize($fullEntry);
|
||||
|
||||
if($logFile and file_exists($logFile))
|
||||
{
|
||||
$summary = json_decode(file_get_contents($logFile), true);
|
||||
|
||||
if(empty($summary)) $summary = array();
|
||||
if(empty($summary['count'])) $summary['count'] = 0;
|
||||
$summary['count'] += 1;
|
||||
|
||||
file_put_contents($logFile, json_encode($summary));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$errorFiles[] = $fullEntry;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$nextFrom = $from . $entry;
|
||||
$nextFrom = $fullEntry;
|
||||
$nextTo = $to . $entry;
|
||||
$result = $this->copyDir($nextFrom, $nextTo, $showDetails);
|
||||
$count += $result[1];
|
||||
$size += $result[2];
|
||||
$result = $this->copyDir($nextFrom, $nextTo, $logLevel, $logFile);
|
||||
$count += $result['count'];
|
||||
$size += $result['size'];
|
||||
}
|
||||
}
|
||||
return array($copiedFiles, $count, $size);
|
||||
|
||||
if($logLevel) $log['copiedFiles'] = $copiedFiles;
|
||||
$log['errorFiles'] = $errorFiles;
|
||||
$log['count'] = $count;
|
||||
$log['size'] = $size;
|
||||
$log['logFile'] = $logFile;
|
||||
|
||||
return $log;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get count.
|
||||
*
|
||||
* @param string $dir
|
||||
* @access public
|
||||
* @return int
|
||||
*/
|
||||
public function getCount($dir)
|
||||
{
|
||||
if(!file_exists($dir)) return 0;
|
||||
if(is_file($dir)) return 1;
|
||||
|
||||
$count = 0;
|
||||
$entries = scandir($dir);
|
||||
foreach($entries as $entry)
|
||||
{
|
||||
if($entry == '.' or $entry == '..' or $entry == '.svn' or $entry == '.git') continue;
|
||||
|
||||
$fullEntry = $dir . '/' . $entry;
|
||||
$count += $this->getCount($fullEntry);
|
||||
}
|
||||
|
||||
return $count;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -236,7 +236,6 @@ $lang->action->dynamicAction->todo['erased'] = 'Delete Todo';
|
||||
$lang->action->dynamicAction->todo['finished'] = 'Finish Todo';
|
||||
$lang->action->dynamicAction->todo['activated'] = 'Activate Todo';
|
||||
$lang->action->dynamicAction->todo['closed'] = 'Close Todo';
|
||||
$lang->action->dynamicAction->todo['deleted'] = 'Delete Todo';
|
||||
$lang->action->dynamicAction->todo['assigned'] = 'Assign Todo';
|
||||
$lang->action->dynamicAction->todo['undeleted'] = 'Restore Todo';
|
||||
$lang->action->dynamicAction->todo['hidden'] = 'Hide Todo';
|
||||
@@ -323,6 +322,7 @@ $lang->action->dynamicAction->bug['bugconfirmed'] = 'Confirm Bug';
|
||||
$lang->action->dynamicAction->bug['resolved'] = 'Resolve Bug';
|
||||
$lang->action->dynamicAction->bug['undeleted'] = 'Restore Bug';
|
||||
$lang->action->dynamicAction->bug['hidden'] = 'Hide Bug';
|
||||
$lang->action->dynamicAction->bug['deleted'] = 'Delete Bug';
|
||||
$lang->action->dynamicAction->bug['confirmed'] = 'Confirm Story Change';
|
||||
$lang->action->dynamicAction->bug['tostory'] = 'Convert to Story';
|
||||
$lang->action->dynamicAction->bug['totask'] = 'Convert to Task';
|
||||
|
||||
@@ -236,7 +236,6 @@ $lang->action->dynamicAction->todo['erased'] = 'Delete Todo';
|
||||
$lang->action->dynamicAction->todo['finished'] = 'Finish Todo';
|
||||
$lang->action->dynamicAction->todo['activated'] = 'Activate Todo';
|
||||
$lang->action->dynamicAction->todo['closed'] = 'Close Todo';
|
||||
$lang->action->dynamicAction->todo['deleted'] = 'Delete Todo';
|
||||
$lang->action->dynamicAction->todo['assigned'] = 'Assign Todo';
|
||||
$lang->action->dynamicAction->todo['undeleted'] = 'Restore Todo';
|
||||
$lang->action->dynamicAction->todo['hidden'] = 'Hide Todo';
|
||||
@@ -323,6 +322,7 @@ $lang->action->dynamicAction->bug['bugconfirmed'] = 'Confirm Bug';
|
||||
$lang->action->dynamicAction->bug['resolved'] = 'Resolve Bug';
|
||||
$lang->action->dynamicAction->bug['undeleted'] = 'Restore Bug';
|
||||
$lang->action->dynamicAction->bug['hidden'] = 'Hide Bug';
|
||||
$lang->action->dynamicAction->bug['deleted'] = 'Delete Bug';
|
||||
$lang->action->dynamicAction->bug['confirmed'] = 'Confirm Story Change';
|
||||
$lang->action->dynamicAction->bug['tostory'] = 'Convert to Story';
|
||||
$lang->action->dynamicAction->bug['totask'] = 'Convert to Task';
|
||||
|
||||
+26
-26
@@ -137,15 +137,15 @@ $lang->action->desc->linkchildtask = '$date, <strong>$actor</strong> a racc
|
||||
$lang->action->desc->unlinkchildrentask = '$date, <strong>$actor</strong> a décroché une sous-tâche <strong>$extra</strong>。' . "\n";
|
||||
$lang->action->desc->linkparenttask = '$date, <strong>$actor</strong> a accroché une tâche parent <strong>$extra</strong>。' . "\n";
|
||||
$lang->action->desc->unlinkparenttask = '$date, <strong>$actor</strong> a décroché une tâche parent <strong>$extra</strong>。' . "\n";
|
||||
$lang->action->desc->deletechildrentask = '$date, <strong>$actor</strong> deleted a child task <strong>$extra</strong>。' . "\n";
|
||||
$lang->action->desc->deletechildrentask = '$date, <strong>$actor</strong> a supprimé une sous-tâche <strong>$extra</strong>。' . "\n";
|
||||
|
||||
/* 用来描述和父子需求相关的操作历史记录。*/
|
||||
$lang->action->desc->createchildrenstory = '$date, <strong>$actor</strong> created a child story <strong>$extra</strong>。' . "\n";
|
||||
$lang->action->desc->linkchildstory = '$date, <strong>$actor</strong> linked a child story <strong>$extra</strong>。' . "\n";
|
||||
$lang->action->desc->unlinkchildrenstory = '$date, <strong>$actor</strong> unlinked a child story <strong>$extra</strong>。' . "\n";
|
||||
$lang->action->desc->linkparentstory = '$date, <strong>$actor</strong> linked to a parent story <strong>$extra</strong>。' . "\n";
|
||||
$lang->action->desc->unlinkparentstory = '$date, <strong>$actor</strong> unlinked a parent story <strong>$extra</strong>。' . "\n";
|
||||
$lang->action->desc->deletechildrenstory = '$date, <strong>$actor</strong> deleted a child story <strong>$extra</strong>。' . "\n";
|
||||
$lang->action->desc->createchildrenstory = '$date, <strong>$actor</strong> a créé une sous-tory <strong>$extra</strong>。' . "\n";
|
||||
$lang->action->desc->linkchildstory = '$date, <strong>$actor</strong> a raccroché une sous-story <strong>$extra</strong>。' . "\n";
|
||||
$lang->action->desc->unlinkchildrenstory = '$date, <strong>$actor</strong> a décroché une sous-story <strong>$extra</strong>。' . "\n";
|
||||
$lang->action->desc->linkparentstory = '$date, <strong>$actor</strong> a raccroché à une story parent <strong>$extra</strong>。' . "\n";
|
||||
$lang->action->desc->unlinkparentstory = '$date, <strong>$actor</strong> a décroché de la story parent <strong>$extra</strong>。' . "\n";
|
||||
$lang->action->desc->deletechildrenstory = '$date, <strong>$actor</strong> a supprimé une sous-story <strong>$extra</strong>。' . "\n";
|
||||
|
||||
/* 关联用例和移除用例时的历史操作记录。*/
|
||||
$lang->action->desc->linkrelatedcase = '$date, <strong>$actor</strong> a fait le lien avec un CasTest <strong>$extra</strong>.' . "\n";
|
||||
@@ -178,8 +178,8 @@ $lang->action->label->frombug = 'a converti du Bug ';
|
||||
$lang->action->label->fromlib = 'a importé de la Library ';
|
||||
$lang->action->label->totask = 'a converti en Tâche ';
|
||||
$lang->action->label->svncommited = 'a committé SVN ';
|
||||
$lang->action->label->gitcommited = 'a committé Git ';
|
||||
$lang->action->label->linked2plan = 'a racordé au Plan ';
|
||||
$lang->action->label->gitcommited = 'a committé GIT ';
|
||||
$lang->action->label->linked2plan = 'a raccordé au Plan ';
|
||||
$lang->action->label->unlinkedfromplan = 'a extrait du plan ';
|
||||
$lang->action->label->changestatus = 'a changé le statut ';
|
||||
$lang->action->label->marked = 'a marqué';
|
||||
@@ -218,13 +218,13 @@ $lang->action->label->unlinkparenttask = "a décroché de la tâche parent";
|
||||
$lang->action->label->batchcreate = "a créé tâches par lot";
|
||||
$lang->action->label->createchildren = "a créé sous-tâches par lot";
|
||||
$lang->action->label->managed = "a managé";
|
||||
$lang->action->label->deletechildrentask = "delete children task";
|
||||
$lang->action->label->createchildrenstory = "create child stories";
|
||||
$lang->action->label->linkchildstory = "linked a child story";
|
||||
$lang->action->label->unlinkchildrenstory = "unlinked a child story";
|
||||
$lang->action->label->linkparentstory = "linked a parent story";
|
||||
$lang->action->label->unlinkparentstory = "unlink from parent story";
|
||||
$lang->action->label->deletechildrenstory = "delete children story";
|
||||
$lang->action->label->deletechildrentask = "a supprimé une sous-tâche";
|
||||
$lang->action->label->createchildrenstory = "a créé une sous-story";
|
||||
$lang->action->label->linkchildstory = "a raccroché à une sous-story";
|
||||
$lang->action->label->unlinkchildrenstory = "a décroché de la sous-story";
|
||||
$lang->action->label->linkparentstory = "a raccroché à une story parent";
|
||||
$lang->action->label->unlinkparentstory = "a décroché de la story parent";
|
||||
$lang->action->label->deletechildrenstory = "a supprimé la sous-story";
|
||||
$lang->action->label->tracked = 'tracked';
|
||||
$lang->action->label->hangup = 'hangup';
|
||||
|
||||
@@ -236,7 +236,6 @@ $lang->action->dynamicAction->todo['erased'] = 'Détruire Todo';
|
||||
$lang->action->dynamicAction->todo['finished'] = 'Finir Todo';
|
||||
$lang->action->dynamicAction->todo['activated'] = 'Activer Todo';
|
||||
$lang->action->dynamicAction->todo['closed'] = 'Fermer Todo';
|
||||
$lang->action->dynamicAction->todo['deleted'] = 'Suppr Todo';
|
||||
$lang->action->dynamicAction->todo['assigned'] = 'Assigner Todo';
|
||||
$lang->action->dynamicAction->todo['undeleted'] = 'Restaurer Todo';
|
||||
$lang->action->dynamicAction->todo['hidden'] = 'Masquer Todo';
|
||||
@@ -302,15 +301,15 @@ $lang->action->dynamicAction->task['unlinkparenttask'] = 'Délier Tâche Par
|
||||
$lang->action->dynamicAction->task['deletechildrentask'] = 'Delete children task';
|
||||
$lang->action->dynamicAction->task['linkparenttask'] = 'Lier Tâche Parent';
|
||||
$lang->action->dynamicAction->task['linkchildtask'] = 'Lier sous-tâche';
|
||||
$lang->action->dynamicAction->task['createchildrenstory'] = 'Create Child Story';
|
||||
$lang->action->dynamicAction->task['unlinkparentstory'] = 'Unlink Parent Story';
|
||||
$lang->action->dynamicAction->task['deletechildrenstory'] = 'Delete children story';
|
||||
$lang->action->dynamicAction->task['linkparentstory'] = 'Link Parent Story';
|
||||
$lang->action->dynamicAction->task['linkchildstory'] = 'Link Child Story';
|
||||
$lang->action->dynamicAction->task['createchildrenstory'] = 'Créer sous-story';
|
||||
$lang->action->dynamicAction->task['unlinkparentstory'] = 'Délier Story Parent';
|
||||
$lang->action->dynamicAction->task['deletechildrenstory'] = 'Supprimer sous-story';
|
||||
$lang->action->dynamicAction->task['linkparentstory'] = 'Lier Story Parent';
|
||||
$lang->action->dynamicAction->task['linkchildstory'] = 'Lier sous-Story';
|
||||
$lang->action->dynamicAction->task['undeleted'] = 'Restaurer Tâche';
|
||||
$lang->action->dynamicAction->task['hidden'] = 'Masquer Tâche';
|
||||
$lang->action->dynamicAction->task['svncommited'] = 'SVN Commit';
|
||||
$lang->action->dynamicAction->task['gitcommited'] = 'GIT Commit';
|
||||
$lang->action->dynamicAction->task['svncommited'] = 'Committer SVN';
|
||||
$lang->action->dynamicAction->task['gitcommited'] = 'Committer GIT';
|
||||
$lang->action->dynamicAction->build['opened'] = 'Créer Build';
|
||||
$lang->action->dynamicAction->build['edited'] = 'Editer Build';
|
||||
|
||||
@@ -323,7 +322,8 @@ $lang->action->dynamicAction->bug['bugconfirmed'] = 'Confirmer Bug';
|
||||
$lang->action->dynamicAction->bug['resolved'] = 'Resolu Bug';
|
||||
$lang->action->dynamicAction->bug['undeleted'] = 'Restaurer Bug';
|
||||
$lang->action->dynamicAction->bug['hidden'] = 'Masquer Bug';
|
||||
$lang->action->dynamicAction->bug['confirmed'] = 'Confirme Chang Story';
|
||||
$lang->action->dynamicAction->bug['deleted'] = 'Supprimé Bug';
|
||||
$lang->action->dynamicAction->bug['confirmed'] = 'Confirme Chang.Story';
|
||||
$lang->action->dynamicAction->bug['tostory'] = 'Converti en Story';
|
||||
$lang->action->dynamicAction->bug['totask'] = 'Converti en Tâche';
|
||||
$lang->action->dynamicAction->bug['linked2plan'] = 'Lié au Plan';
|
||||
@@ -377,7 +377,7 @@ $lang->action->dynamicAction->user['login'] = 'Connexion';
|
||||
$lang->action->dynamicAction->user['logout'] = 'Déconnexion';
|
||||
$lang->action->dynamicAction->user['undeleted'] = 'Restaure User';
|
||||
$lang->action->dynamicAction->user['hidden'] = 'Masquer User';
|
||||
$lang->action->dynamicAction->user['loginxuanxuan'] = 'Login Desktop';
|
||||
$lang->action->dynamicAction->user['loginxuanxuan'] = 'Connexion Desktop';
|
||||
|
||||
$lang->action->dynamicAction->entry['created'] = 'Ajouter Application';
|
||||
$lang->action->dynamicAction->entry['edited'] = 'Editer Application';
|
||||
|
||||
@@ -236,7 +236,6 @@ $lang->action->dynamicAction->todo['erased'] = 'Xóa việc làm';
|
||||
$lang->action->dynamicAction->todo['finished'] = 'Kết thúc việc làm';
|
||||
$lang->action->dynamicAction->todo['activated'] = 'Kích hoạt việc làm';
|
||||
$lang->action->dynamicAction->todo['closed'] = 'Đóng việc làm';
|
||||
$lang->action->dynamicAction->todo['deleted'] = 'Xóa việc làm';
|
||||
$lang->action->dynamicAction->todo['assigned'] = 'Bàn giao việc làm';
|
||||
$lang->action->dynamicAction->todo['undeleted'] = 'Khôi phục việc làm';
|
||||
$lang->action->dynamicAction->todo['hidden'] = 'Ẩn việc làm';
|
||||
@@ -323,6 +322,7 @@ $lang->action->dynamicAction->bug['bugconfirmed'] = 'Xác nhận Bug';
|
||||
$lang->action->dynamicAction->bug['resolved'] = 'Giải quyết Bug';
|
||||
$lang->action->dynamicAction->bug['undeleted'] = 'Khôi phục Bug';
|
||||
$lang->action->dynamicAction->bug['hidden'] = 'Ẩn Bug';
|
||||
$lang->action->dynamicAction->bug['deleted'] = 'Xóa tìBug';
|
||||
$lang->action->dynamicAction->bug['confirmed'] = 'Xác nhận thay đổi câu chuyện';
|
||||
$lang->action->dynamicAction->bug['tostory'] = 'Chuyển thành câu chuyện';
|
||||
$lang->action->dynamicAction->bug['totask'] = 'Chuyển thành nhiệm vụ';
|
||||
|
||||
@@ -236,7 +236,6 @@ $lang->action->dynamicAction->todo['erased'] = '删除待办';
|
||||
$lang->action->dynamicAction->todo['finished'] = '完成待办';
|
||||
$lang->action->dynamicAction->todo['activated'] = '激活待办';
|
||||
$lang->action->dynamicAction->todo['closed'] = '关闭待办';
|
||||
$lang->action->dynamicAction->todo['deleted'] = '删除待办';
|
||||
$lang->action->dynamicAction->todo['assigned'] = '指派待办';
|
||||
$lang->action->dynamicAction->todo['undeleted'] = '还原待办';
|
||||
$lang->action->dynamicAction->todo['hidden'] = '隐藏待办';
|
||||
@@ -323,6 +322,7 @@ $lang->action->dynamicAction->bug['bugconfirmed'] = '确认Bug';
|
||||
$lang->action->dynamicAction->bug['resolved'] = '解决Bug';
|
||||
$lang->action->dynamicAction->bug['undeleted'] = '还原Bug';
|
||||
$lang->action->dynamicAction->bug['hidden'] = '隐藏Bug';
|
||||
$lang->action->dynamicAction->bug['deleted'] = '删除Bug';
|
||||
$lang->action->dynamicAction->bug['confirmed'] = "确认{$lang->storyCommon}变更";
|
||||
$lang->action->dynamicAction->bug['tostory'] = "转{$lang->storyCommon}";
|
||||
$lang->action->dynamicAction->bug['totask'] = '转任务';
|
||||
|
||||
@@ -235,7 +235,6 @@ $lang->action->dynamicAction->todo['erased'] = '刪除待辦';
|
||||
$lang->action->dynamicAction->todo['finished'] = '完成待辦';
|
||||
$lang->action->dynamicAction->todo['activated'] = '激活待辦';
|
||||
$lang->action->dynamicAction->todo['closed'] = '關閉待辦';
|
||||
$lang->action->dynamicAction->todo['deleted'] = '刪除待辦';
|
||||
$lang->action->dynamicAction->todo['assigned'] = '指派待辦';
|
||||
$lang->action->dynamicAction->todo['undeleted'] = '還原待辦';
|
||||
$lang->action->dynamicAction->todo['hidden'] = '隱藏待辦';
|
||||
@@ -322,6 +321,7 @@ $lang->action->dynamicAction->bug['bugconfirmed'] = '確認Bug';
|
||||
$lang->action->dynamicAction->bug['resolved'] = '解決Bug';
|
||||
$lang->action->dynamicAction->bug['undeleted'] = '還原Bug';
|
||||
$lang->action->dynamicAction->bug['hidden'] = '隱藏Bug';
|
||||
$lang->action->dynamicAction->bug['deleted'] = '刪除Bug';
|
||||
$lang->action->dynamicAction->bug['confirmed'] = "確認{$lang->storyCommon}變更";
|
||||
$lang->action->dynamicAction->bug['tostory'] = "轉{$lang->storyCommon}";
|
||||
$lang->action->dynamicAction->bug['totask'] = '轉任務';
|
||||
|
||||
+19
-17
@@ -51,18 +51,21 @@ class actionModel extends model
|
||||
$action->comment = fixer::stripDataTags($comment);
|
||||
|
||||
/* Process action. */
|
||||
$action = $this->loadModel('file')->processImgURL($action, 'comment', $this->post->uid);
|
||||
if($autoDelete) $this->file->autoDelete($this->post->uid);
|
||||
if($this->post->uid)
|
||||
{
|
||||
$action = $this->loadModel('file')->processImgURL($action, 'comment', $this->post->uid);
|
||||
if($autoDelete) $this->file->autoDelete($this->post->uid);
|
||||
}
|
||||
|
||||
/* Get product and project for this object. */
|
||||
$productAndProject = $this->getProductAndProject($action->objectType, $objectID);
|
||||
$action->product = $productAndProject['product'];
|
||||
$action->project = (int) $productAndProject['project'];
|
||||
$action->project = $actionType == 'unlinkedfromproject' ? (int)$extra : (int)$productAndProject['project'];
|
||||
|
||||
$this->dao->insert(TABLE_ACTION)->data($action)->autoCheck()->exec();
|
||||
$actionID = $this->dbh->lastInsertID();
|
||||
|
||||
$this->file->updateObjectID($this->post->uid, $objectID, $objectType);
|
||||
if($this->post->uid) $this->file->updateObjectID($this->post->uid, $objectID, $objectType);
|
||||
|
||||
$this->loadModel('message')->send($objectType, $objectID, $actionType, $actionID, $actor);
|
||||
|
||||
@@ -370,7 +373,7 @@ class actionModel extends model
|
||||
}
|
||||
}
|
||||
}
|
||||
elseif(($actionName == 'opened' or $actionName == 'managed') and $objectType == 'project')
|
||||
elseif(($actionName == 'opened' or $actionName == 'managed' or $actionName == 'edited') and $objectType == 'project')
|
||||
{
|
||||
$linkedProducts = $this->dao->select('id,name')->from(TABLE_PRODUCT)->where('id')->in($action->extra)->fetchPairs('id', 'name');
|
||||
$action->extra = '';
|
||||
@@ -677,6 +680,8 @@ class actionModel extends model
|
||||
*/
|
||||
public function getActionCondition()
|
||||
{
|
||||
if($this->app->user->admin) return '';
|
||||
|
||||
$actionCondition = '';
|
||||
if(isset($this->app->user->rights['acls']['actions']))
|
||||
{
|
||||
@@ -842,7 +847,7 @@ class actionModel extends model
|
||||
}
|
||||
|
||||
/* If action type is login or logout, needn't link. */
|
||||
if($actionType == 'svncommited')
|
||||
if($actionType == 'svncommited' or $actionType == 'gitcommited')
|
||||
{
|
||||
$action->actor = isset($commiters[$action->actor]) ? $commiters[$action->actor] : $action->actor;
|
||||
}
|
||||
@@ -851,12 +856,6 @@ class actionModel extends model
|
||||
if(strpos($action->objectLabel, '|') !== false)
|
||||
{
|
||||
list($objectLabel, $moduleName, $methodName, $vars) = explode('|', $action->objectLabel);
|
||||
$action->objectLink = '';
|
||||
if(!common::hasPriv($moduleName, $methodName))
|
||||
{
|
||||
unset($actions[$i]);
|
||||
continue;
|
||||
}
|
||||
|
||||
$action->objectLink = helper::createLink($moduleName, $methodName, sprintf($vars, $action->objectID));
|
||||
if($action->objectType == 'user') $action->objectLink = helper::createLink($moduleName, $methodName, sprintf($vars, $action->objectName));
|
||||
@@ -967,23 +966,25 @@ class actionModel extends model
|
||||
if($action->action != 'deleted') return;
|
||||
if($action->objectType == 'product')
|
||||
{
|
||||
$product = $this->dao->select('name,code')->from(TABLE_PRODUCT)->where('id')->eq($action->objectID)->fetch();
|
||||
$product = $this->dao->select('id,name,code,acl')->from(TABLE_PRODUCT)->where('id')->eq($action->objectID)->fetch();
|
||||
$count = $this->dao->select('COUNT(*) AS count')->from(TABLE_PRODUCT)->where('deleted')->eq('0')->andWhere("(`name`='{$product->name}' OR `code`='{$product->code}')")->fetch('count');
|
||||
if($count > 0)
|
||||
{
|
||||
echo js::alert(sprintf($this->lang->action->needEdit, $this->lang->action->objectTypes['product']));
|
||||
die(js::locate(helper::createLink('product', 'edit', "productID=$action->objectID&action=undelete&extra=$actionID"), 'parent'));
|
||||
}
|
||||
if($product->acl != 'open') $this->loadModel('user')->updateUserView($product->id, 'product');
|
||||
}
|
||||
elseif($action->objectType == 'project')
|
||||
{
|
||||
$project = $this->dao->select('name,code')->from(TABLE_PROJECT)->where('id')->eq($action->objectID)->fetch();
|
||||
$project = $this->dao->select('id,name,code,acl')->from(TABLE_PROJECT)->where('id')->eq($action->objectID)->fetch();
|
||||
$count = $this->dao->select('COUNT(*) AS count')->from(TABLE_PROJECT)->where('deleted')->eq('0')->andWhere("(`name`='{$project->name}' OR `code`='{$project->code}')")->fetch('count');
|
||||
if($count > 0)
|
||||
{
|
||||
echo js::alert(sprintf($this->lang->action->needEdit, $this->lang->action->objectTypes['project']));
|
||||
die(js::locate(helper::createLink('project', 'edit', "projectID=$action->objectID&action=undelete&extra=$actionID"), 'parent'));
|
||||
}
|
||||
if($project->acl != 'open') $this->loadModel('user')->updateUserView($project->id, 'project');
|
||||
}
|
||||
elseif($action->objectType == 'module')
|
||||
{
|
||||
@@ -1072,16 +1073,17 @@ class actionModel extends model
|
||||
*
|
||||
* @param array $actions
|
||||
* @param string $direction
|
||||
* @param string $type all|today|yesterday|thisweek|lastweek|thismonth|lastmonth
|
||||
* @access public
|
||||
* @return array
|
||||
*/
|
||||
public function buildDateGroup($actions, $direction = 'next')
|
||||
public function buildDateGroup($actions, $direction = 'next', $type = 'today')
|
||||
{
|
||||
$dateGroup = array();
|
||||
foreach($actions as $action)
|
||||
{
|
||||
$timeStamp = strtotime(isset($action->originalDate) ? $action->originalDate : $action->date);
|
||||
$date = date(DT_DATE4, $timeStamp);
|
||||
$date = $type == 'all' ? date(DT_DATE3, $timeStamp) : date(DT_DATE4, $timeStamp);
|
||||
$action->time = date(DT_TIME2, $timeStamp);
|
||||
$dateGroup[$date][] = $action;
|
||||
}
|
||||
@@ -1096,7 +1098,7 @@ class actionModel extends model
|
||||
foreach($lastDateActions as $action)
|
||||
{
|
||||
$timeStamp = strtotime(isset($action->originalDate) ? $action->originalDate : $action->date);
|
||||
$date = date(DT_DATE4, $timeStamp);
|
||||
$date = $type == 'all' ? date(DT_DATE3, $timeStamp) : date(DT_DATE4, $timeStamp);
|
||||
$action->time = date(DT_TIME2, $timeStamp);
|
||||
$dateGroup[$date][] = $action;
|
||||
}
|
||||
|
||||
@@ -328,7 +328,7 @@ class admin extends control
|
||||
|
||||
$this->loadModel('setting')->setItem('system.admin.log.saveDays', $this->post->days);
|
||||
if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
|
||||
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload'));
|
||||
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
|
||||
}
|
||||
|
||||
$this->loadModel('message');
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
$lang->admin->common = '后台管理';
|
||||
$lang->admin->index = '后台管理首页';
|
||||
$lang->admin->checkDB = '检查数据库';
|
||||
$lang->admin->sso = '然之集成';
|
||||
$lang->admin->ssoAction = '然之集成';
|
||||
$lang->admin->sso = 'ZDOO集成';
|
||||
$lang->admin->ssoAction = 'ZDOO集成';
|
||||
$lang->admin->safeIndex = '安全';
|
||||
$lang->admin->checkWeak = '弱口令检查';
|
||||
$lang->admin->certifyMobile = '认证手机';
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
$lang->admin->common = '後台管理';
|
||||
$lang->admin->index = '後台管理首頁';
|
||||
$lang->admin->checkDB = '檢查資料庫';
|
||||
$lang->admin->sso = '然之整合';
|
||||
$lang->admin->ssoAction = '然之整合';
|
||||
$lang->admin->sso = 'ZDOO整合';
|
||||
$lang->admin->ssoAction = 'ZDOO整合';
|
||||
$lang->admin->safeIndex = '安全';
|
||||
$lang->admin->checkWeak = '弱口令檢查';
|
||||
$lang->admin->certifyMobile = '認證手機';
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
<h2><?php echo $lang->webhook->setting;?></h2>
|
||||
</div>
|
||||
<div class='center-block mw-700px'>
|
||||
<form id='logForm' method='post' class='ajaxForm'>
|
||||
<form id='logForm' method='post' class='form-ajax'>
|
||||
<table class='table table-form'>
|
||||
<tr>
|
||||
<th class='w-100px'><?php echo $lang->admin->days;?></th>
|
||||
|
||||
+18
-10
@@ -53,13 +53,13 @@ class backup extends control
|
||||
$backupFile = new stdclass();
|
||||
$backupFile->time = filemtime($file);
|
||||
$backupFile->name = substr($fileName, 0, strpos($fileName, '.'));
|
||||
$backupFile->files[$file] = abs(filesize($file));
|
||||
$backupFile->files[$file] = $this->backup->getBackupSummary($file);
|
||||
|
||||
$fileBackup = $this->backup->getBackupFile($backupFile->name, 'file');
|
||||
if($fileBackup) $backupFile->files[$fileBackup] = $this->backup->getBackupSize($fileBackup);
|
||||
if($fileBackup) $backupFile->files[$fileBackup] = $this->backup->getBackupSummary($fileBackup);
|
||||
|
||||
$codeBackup = $this->backup->getBackupFile($backupFile->name, 'code');
|
||||
if($codeBackup) $backupFile->files[$codeBackup] = $this->backup->getBackupSize($codeBackup);
|
||||
if($codeBackup) $backupFile->files[$codeBackup] = $this->backup->getBackupSummary($codeBackup);
|
||||
|
||||
$backups[$backupFile->name] = $backupFile;
|
||||
}
|
||||
@@ -151,7 +151,7 @@ class backup extends control
|
||||
{
|
||||
$rmFunc = is_file($file) ? 'removeFile' : 'removeDir';
|
||||
$zfile->{$rmFunc}($file);
|
||||
if($rmFunc == 'removeDir') $this->backup->processSummary($file, 0, 0, 'delete');
|
||||
if($rmFunc == 'removeDir') $this->backup->processSummary($file, 0, 0, array(), 0, 'delete');
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -275,7 +275,7 @@ class backup extends control
|
||||
{
|
||||
$zfile = $this->app->loadClass('zfile');
|
||||
$zfile->removeDir($this->backupPath . $fileName . '.file');
|
||||
$this->backup->processSummary($this->backupPath . $fileName . '.file', 0, 0, 'delete');
|
||||
$this->backup->processSummary($this->backupPath . $fileName . '.file', 0, 0, array(), 0, 'delete');
|
||||
}
|
||||
|
||||
/* Delete code file. */
|
||||
@@ -291,7 +291,7 @@ class backup extends control
|
||||
{
|
||||
$zfile = $this->app->loadClass('zfile');
|
||||
$zfile->removeDir($this->backupPath . $fileName . '.code');
|
||||
$this->backup->processSummary($this->backupPath . $fileName . '.code', 0, 0, 'delete');
|
||||
$this->backup->processSummary($this->backupPath . $fileName . '.code', 0, 0, array(), 0, 'delete');
|
||||
}
|
||||
|
||||
die(js::reload('parent'));
|
||||
@@ -371,15 +371,23 @@ class backup extends control
|
||||
$sqlFileName = $this->backup->getBackupFile($fileName, 'sql');
|
||||
if($sqlFileName)
|
||||
{
|
||||
$fileSize = $this->backup->getBackupSize($sqlFileName);
|
||||
$message = sprintf($this->lang->backup->progressSQL, $this->backup->processFileSize($fileSize));
|
||||
$summary = $this->backup->getBackupSummary($sqlFileName);
|
||||
$message = sprintf($this->lang->backup->progressSQL, $this->backup->processFileSize($summary['size']));
|
||||
}
|
||||
|
||||
$attachFileName = $this->backup->getBackupFile($fileName, 'file');
|
||||
if($attachFileName) $message = sprintf($this->lang->backup->progressAttach);
|
||||
if($attachFileName)
|
||||
{
|
||||
$log = $this->backup->getBackupDirProgress($attachFileName);
|
||||
$message = sprintf($this->lang->backup->progressAttach, zget($log, 'allCount', 0), zget($log, 'count', 0));
|
||||
}
|
||||
|
||||
$codeFileName = $this->backup->getBackupFile($fileName, 'code');
|
||||
if($codeFileName) $message = sprintf($this->lang->backup->progressCode);
|
||||
if($codeFileName)
|
||||
{
|
||||
$log = $this->backup->getBackupDirProgress($codeFileName);
|
||||
$message = sprintf($this->lang->backup->progressCode, zget($log, 'allCount', 0), zget($log, 'count', 0));
|
||||
}
|
||||
|
||||
die($message);
|
||||
}
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
.errorFiles{text-align:left;padding:5px;}
|
||||
@@ -9,9 +9,15 @@ $lang->backup->change = 'Ablaufdatum';
|
||||
$lang->backup->changeAB = 'Bearbeiten';
|
||||
$lang->backup->rmPHPHeader = 'Remove PHP header';
|
||||
|
||||
$lang->backup->time = 'Datum';
|
||||
$lang->backup->files = 'Dateien';
|
||||
$lang->backup->size = 'Größe';
|
||||
$lang->backup->time = 'Datum';
|
||||
$lang->backup->files = 'Dateien';
|
||||
$lang->backup->allCount = 'All Count';
|
||||
$lang->backup->count = 'Backup Count';
|
||||
$lang->backup->size = 'Größe';
|
||||
$lang->backup->status = 'Status';
|
||||
|
||||
$lang->backup->statusList['success'] = 'Success';
|
||||
$lang->backup->statusList['fail'] = 'Fail';
|
||||
|
||||
$lang->backup->setting = 'Settings';
|
||||
$lang->backup->settingDir = 'Backup Directory';
|
||||
@@ -25,6 +31,7 @@ $lang->backup->progressCode = '<p>SQL backup is completed.</p><p>Attachment ba
|
||||
$lang->backup->confirmDelete = 'Möchten Sie das Backup löschen？';
|
||||
$lang->backup->confirmRestore = 'Möchten Sie das Backup wiederherstellen?';
|
||||
$lang->backup->holdDays = 'Behalten der letzen %s Tage der Backups';
|
||||
$lang->backup->copiedFail = 'Copy failed files: ';
|
||||
$lang->backup->restoreTip = 'Nur Dateien und Datenbanken können wiederhergestellt werden. Code kann manuell wieder hergestellt werden.';
|
||||
|
||||
$lang->backup->success = new stdclass();
|
||||
|
||||
@@ -9,9 +9,15 @@ $lang->backup->change = 'Edit Expiration';
|
||||
$lang->backup->changeAB = 'Edit';
|
||||
$lang->backup->rmPHPHeader = 'Remove PHP header';
|
||||
|
||||
$lang->backup->time = 'Date';
|
||||
$lang->backup->files = 'Files';
|
||||
$lang->backup->size = 'Size';
|
||||
$lang->backup->time = 'Date';
|
||||
$lang->backup->files = 'Files';
|
||||
$lang->backup->allCount = 'All Count';
|
||||
$lang->backup->count = 'Backup Count';
|
||||
$lang->backup->size = 'Size';
|
||||
$lang->backup->status = 'Status';
|
||||
|
||||
$lang->backup->statusList['success'] = 'Success';
|
||||
$lang->backup->statusList['fail'] = 'Fail';
|
||||
|
||||
$lang->backup->setting = 'Settings';
|
||||
$lang->backup->settingDir = 'Backup Directory';
|
||||
@@ -25,6 +31,7 @@ $lang->backup->progressCode = '<p>SQL backup is completed.</p><p>Attachment ba
|
||||
$lang->backup->confirmDelete = 'Do you want to delete the backup?';
|
||||
$lang->backup->confirmRestore = 'Do you want to restore the backup?';
|
||||
$lang->backup->holdDays = 'Hold last %s days of backup';
|
||||
$lang->backup->copiedFail = 'Copy failed files: ';
|
||||
$lang->backup->restoreTip = 'Only files and databases can be restored by clicking Restore. Code can be restored manually.';
|
||||
|
||||
$lang->backup->success = new stdclass();
|
||||
|
||||
@@ -9,9 +9,15 @@ $lang->backup->change = 'Editer Expiration';
|
||||
$lang->backup->changeAB = 'Editer';
|
||||
$lang->backup->rmPHPHeader = 'Enlever PHP header';
|
||||
|
||||
$lang->backup->time = 'Date';
|
||||
$lang->backup->files = 'Fichiers';
|
||||
$lang->backup->size = 'Taille';
|
||||
$lang->backup->time = 'Date';
|
||||
$lang->backup->files = 'Fichiers';
|
||||
$lang->backup->allCount = 'Tous les Compteurs';
|
||||
$lang->backup->count = 'Compteur Backup';
|
||||
$lang->backup->size = 'Taille';
|
||||
$lang->backup->status = 'Statut';
|
||||
|
||||
$lang->backup->statusList['success'] = 'Succès';
|
||||
$lang->backup->statusList['fail'] = 'Echec';
|
||||
|
||||
$lang->backup->setting = 'Paramétrage';
|
||||
$lang->backup->settingDir = 'Répertoire Backup';
|
||||
@@ -20,11 +26,12 @@ $lang->backup->settingList['nosafe'] = 'Ne pas prévenir du téléchargement par
|
||||
|
||||
$lang->backup->waitting = '<span id="backupType"></span> est en cours. Patientez s´il vous plait...';
|
||||
$lang->backup->progressSQL = '<p>SQL backup: %s est sauvegardé.</p>';
|
||||
$lang->backup->progressAttach = '<p>SQL backup est terminé.</p><p>Attachment backing up.</p>';
|
||||
$lang->backup->progressCode = '<p>SQL backup est terminé.</p><p>Attachment backup est terminé.</p><p>Code backing up.</p>';
|
||||
$lang->backup->progressAttach = '<p>SQL backup est terminé.</p><p>Les fichiers sont en cours de sauvegarde.</p>';
|
||||
$lang->backup->progressCode = '<p>SQL backup est terminé.</p><p>Sauvegarde des fichiers terminée.</p><p>Sauvegarde du code en cours.</p>';
|
||||
$lang->backup->confirmDelete = 'Voulez-vous supprimer la sauvegarde ?';
|
||||
$lang->backup->confirmRestore = 'Voulez-vous restaurer la sauvegarde ?';
|
||||
$lang->backup->holdDays = 'conserver les derniers %s jours de backup';
|
||||
$lang->backup->copiedFail = 'Fichiers en échec de copie : ';
|
||||
$lang->backup->restoreTip = 'Seulement les fichiers et les bases peuvent être restaurées en cliquant sur Restaurer. Le code doit être restauré manuellement.';
|
||||
|
||||
$lang->backup->success = new stdclass();
|
||||
|
||||
@@ -9,9 +9,15 @@ $lang->backup->change = 'Sửa Expiration';
|
||||
$lang->backup->changeAB = 'Sửa';
|
||||
$lang->backup->rmPHPHeader = 'Xóa PHP header';
|
||||
|
||||
$lang->backup->time = 'Ngày';
|
||||
$lang->backup->files = 'Files';
|
||||
$lang->backup->size = 'Size';
|
||||
$lang->backup->time = 'Ngày';
|
||||
$lang->backup->files = 'Files';
|
||||
$lang->backup->allCount = 'All Count';
|
||||
$lang->backup->count = 'Backup Count';
|
||||
$lang->backup->size = 'Size';
|
||||
$lang->backup->status = 'Status';
|
||||
|
||||
$lang->backup->statusList['success'] = 'Success';
|
||||
$lang->backup->statusList['fail'] = 'Fail';
|
||||
|
||||
$lang->backup->setting = 'Thiết lập';
|
||||
$lang->backup->settingDir = 'Thư mục sao lưu';
|
||||
@@ -25,6 +31,7 @@ $lang->backup->progressCode = '<p>Sao lưu SQL đã hoàn thành.</p><p>Sao l
|
||||
$lang->backup->confirmDelete = 'Bạn có muốn xóa sao lưu này?';
|
||||
$lang->backup->confirmRestore = 'Bạn có muốn khôi phục sao lưu này?';
|
||||
$lang->backup->holdDays = 'Giữ ít nhất %s ngày sao lưu';
|
||||
$lang->backup->copiedFail = 'Copy failed files: ';
|
||||
$lang->backup->restoreTip = 'Chỉ tập tin và CSDL có thể được khôi phục bằng cách Click Khôi phục. Mã nguồn có thể khôi phục thủ công.';
|
||||
|
||||
$lang->backup->success = new stdclass();
|
||||
|
||||
@@ -9,9 +9,15 @@ $lang->backup->change = '保留时间';
|
||||
$lang->backup->changeAB = '修改';
|
||||
$lang->backup->rmPHPHeader = '去除安全设置';
|
||||
|
||||
$lang->backup->time = '备份时间';
|
||||
$lang->backup->files = '备份文件';
|
||||
$lang->backup->size = '大小';
|
||||
$lang->backup->time = '备份时间';
|
||||
$lang->backup->files = '备份文件';
|
||||
$lang->backup->allCount = '总文件数';
|
||||
$lang->backup->count = '备份文件数';
|
||||
$lang->backup->size = '大小';
|
||||
$lang->backup->status = '状态';
|
||||
|
||||
$lang->backup->statusList['success'] = '成功';
|
||||
$lang->backup->statusList['fail'] = '失败';
|
||||
|
||||
$lang->backup->setting = '设置';
|
||||
$lang->backup->settingDir = '备份目录';
|
||||
@@ -20,11 +26,12 @@ $lang->backup->settingList['nosafe'] = '不需要防下载PHP文件头';
|
||||
|
||||
$lang->backup->waitting = '<span id="backupType"></span>正在进行中，请稍候...';
|
||||
$lang->backup->progressSQL = '<p>SQL备份中，已备份%s</p>';
|
||||
$lang->backup->progressAttach = '<p>SQL备份完成</p><p>附件备份中</p>';
|
||||
$lang->backup->progressCode = '<p>SQL备份完成</p><p>附件备份完成</p><p>代码备份中</p>';
|
||||
$lang->backup->progressAttach = '<p>SQL备份完成</p><p>附件备份中，共有%s个文件，已经备份%s个</p>';
|
||||
$lang->backup->progressCode = '<p>SQL备份完成</p><p>附件备份完成</p><p>代码备份中，共有%s个文件，已经备份%s个</p>';
|
||||
$lang->backup->confirmDelete = '是否删除备份？';
|
||||
$lang->backup->confirmRestore = '是否还原该备份？';
|
||||
$lang->backup->holdDays = '备份保留最近 %s 天';
|
||||
$lang->backup->copiedFail = '复制失败的文件：';
|
||||
$lang->backup->restoreTip = '还原功能只还原附件和数据库，如果需要还原代码，可以手动还原。';
|
||||
|
||||
$lang->backup->success = new stdclass();
|
||||
|
||||
@@ -9,9 +9,15 @@ $lang->backup->change = '保留時間';
|
||||
$lang->backup->changeAB = '修改';
|
||||
$lang->backup->rmPHPHeader = '去除安全設置';
|
||||
|
||||
$lang->backup->time = '備份時間';
|
||||
$lang->backup->files = '備份檔案';
|
||||
$lang->backup->size = '大小';
|
||||
$lang->backup->time = '備份時間';
|
||||
$lang->backup->files = '備份檔案';
|
||||
$lang->backup->allCount = '總檔案數';
|
||||
$lang->backup->count = '備份檔案數';
|
||||
$lang->backup->size = '大小';
|
||||
$lang->backup->status = '狀態';
|
||||
|
||||
$lang->backup->statusList['success'] = '成功';
|
||||
$lang->backup->statusList['fail'] = '失敗';
|
||||
|
||||
$lang->backup->setting = '設置';
|
||||
$lang->backup->settingDir = '備份目錄';
|
||||
@@ -20,11 +26,12 @@ $lang->backup->settingList['nosafe'] = '不需要防下載PHP檔案頭';
|
||||
|
||||
$lang->backup->waitting = '<span id="backupType"></span>正在進行中，請稍候...';
|
||||
$lang->backup->progressSQL = '<p>SQL備份中，已備份%s</p>';
|
||||
$lang->backup->progressAttach = '<p>SQL備份完成</p><p>附件備份中，已備份%s</p>';
|
||||
$lang->backup->progressCode = '<p>SQL備份完成</p><p>附件備份完成</p><p>代碼備份中，已備份%s</p>';
|
||||
$lang->backup->progressAttach = '<p>SQL備份完成</p><p>附件備份中，共有%s個檔案，已經備份%s個</p>';
|
||||
$lang->backup->progressCode = '<p>SQL備份完成</p><p>附件備份完成</p><p>代碼備份中，共有%s個檔案，已經備份%s個</p>';
|
||||
$lang->backup->confirmDelete = '是否刪除備份？';
|
||||
$lang->backup->confirmRestore = '是否還原該備份？';
|
||||
$lang->backup->holdDays = '備份保留最近 %s 天';
|
||||
$lang->backup->copiedFail = '複製失敗的檔案：';
|
||||
$lang->backup->restoreTip = '還原功能只還原附件和資料庫，如果需要還原代碼，可以手動還原。';
|
||||
|
||||
$lang->backup->success = new stdclass();
|
||||
|
||||
+84
-26
@@ -33,14 +33,21 @@ class backupModel extends model
|
||||
*/
|
||||
public function backFile($backupFile)
|
||||
{
|
||||
$zfile = $this->app->loadClass('zfile');
|
||||
$return = new stdclass();
|
||||
$return->result = true;
|
||||
$return->error = '';
|
||||
|
||||
if(!is_dir($backupFile)) mkdir($backupFile, 0777, true);
|
||||
$zfile = $this->app->loadClass('zfile');
|
||||
$result = $zfile->copyDir($this->app->getAppRoot() . 'www/data/', $backupFile, $showDetails = false);
|
||||
$this->processSummary($backupFile, $result[1], $result[2]);
|
||||
|
||||
$tmpLogFile = $this->getTmpLogFile($backupFile);
|
||||
$dataDir = $this->app->getAppRoot() . 'www/data/';
|
||||
$count = $zfile->getCount($dataDir);
|
||||
file_put_contents($tmpLogFile, json_encode(array('allCount' => $count)));
|
||||
|
||||
$result = $zfile->copyDir($dataDir, $backupFile, $logLevel = false, $tmpLogFile);
|
||||
$this->processSummary($backupFile, $result['count'], $result['size'], $result['errorFiles'], $count);
|
||||
unlink($tmpLogFile);
|
||||
|
||||
return $return;
|
||||
}
|
||||
@@ -54,10 +61,12 @@ class backupModel extends model
|
||||
*/
|
||||
public function backCode($backupFile)
|
||||
{
|
||||
$zfile = $this->app->loadClass('zfile');
|
||||
$return = new stdclass();
|
||||
$return->result = true;
|
||||
$return->error = '';
|
||||
|
||||
$tmpLogFile = $this->getTmpLogFile($backupFile);
|
||||
$appRoot = $this->app->getAppRoot();
|
||||
$fileList = glob($appRoot . '*');
|
||||
$wwwFileList = glob($appRoot . 'www/*');
|
||||
@@ -72,29 +81,43 @@ class backupModel extends model
|
||||
$fileList = array_merge($fileList, $wwwFileList);
|
||||
|
||||
if(!is_dir($backupFile)) mkdir($backupFile, 0777, true);
|
||||
$zfile = $this->app->loadClass('zfile');
|
||||
|
||||
$allCount = 0;
|
||||
$allSize = 0;
|
||||
foreach($fileList as $codeFile) $allCount += $zfile->getCount($codeFile);
|
||||
file_put_contents($tmpLogFile, json_encode(array('allCount' => $allCount)));
|
||||
|
||||
$copiedCount = 0;
|
||||
$copiedSize = 0;
|
||||
$errorFiles = array();
|
||||
foreach($fileList as $codeFile)
|
||||
{
|
||||
$file = trim(str_replace($appRoot, '', $codeFile), DS);
|
||||
if(is_dir($codeFile))
|
||||
{
|
||||
if(!is_dir($backupFile . DS . $file)) mkdir($backupFile . DS . $file, 0777, true);
|
||||
$result = $zfile->copyDir($codeFile, $backupFile . DS . $file, $showDetails = false);
|
||||
$allCount += $result[1];
|
||||
$allSize += $result[2];
|
||||
$result = $zfile->copyDir($codeFile, $backupFile . DS . $file, $logLevel = false, $tmpLogFile);
|
||||
$copiedCount += $result['count'];
|
||||
$copiedSize += $result['size'];
|
||||
$errorFiles += $result['errorFiles'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$dirName = dirname($file);
|
||||
if(!is_dir($backupFile . DS . $dirName)) mkdir($backupFile . DS . $dirName, 0777, true);
|
||||
$zfile->copyFile($codeFile, $backupFile . DS . $file);
|
||||
$allCount += 1;
|
||||
$allSize += filesize($codeFile);
|
||||
if($zfile->copyFile($codeFile, $backupFile . DS . $file))
|
||||
{
|
||||
$copiedCount += 1;
|
||||
$copiedSize += filesize($codeFile);
|
||||
}
|
||||
else
|
||||
{
|
||||
$errorFiles[] = $codeFile;
|
||||
}
|
||||
}
|
||||
}
|
||||
$this->processSummary($backupFile, $allCount, $allSize);
|
||||
|
||||
$this->processSummary($backupFile, $copiedCount, $copiedSize, $errorFiles, $allCount);
|
||||
unlink($tmpLogFile);
|
||||
|
||||
return $return;
|
||||
}
|
||||
@@ -255,24 +278,28 @@ class backupModel extends model
|
||||
/**
|
||||
* Get dir size.
|
||||
*
|
||||
* @param string $backupFile
|
||||
* @param string $backup
|
||||
* @access public
|
||||
* @return int
|
||||
*/
|
||||
public function getBackupSize($backupFile)
|
||||
public function getBackupSummary($backup)
|
||||
{
|
||||
$zfile = $this->app->loadClass('zfile');
|
||||
if(!is_dir($backupFile)) return $zfile->getFileSize($backupFile);
|
||||
|
||||
$summaryFile = dirname($backupFile) . DS . 'summary';
|
||||
if(file_exists($summaryFile))
|
||||
if(is_file($backup))
|
||||
{
|
||||
$summary = json_decode(file_get_contents(dirname($backupFile) . DS . 'summary'), 'true');
|
||||
$fileName = basename($backupFile);
|
||||
$summary = array();
|
||||
$summary['allCount'] = 1;
|
||||
$summary['count'] = 1;
|
||||
$summary['size'] = $zfile->getFileSize($backup);
|
||||
|
||||
if(isset($summary[$fileName])) return $summary[$fileName]['size'];
|
||||
return $summary;
|
||||
}
|
||||
return 0;
|
||||
|
||||
$summaryFile = dirname($backup) . DS . 'summary';
|
||||
if(!file_exists($summaryFile)) return array();
|
||||
|
||||
$summary = json_decode(file_get_contents(dirname($backup) . DS . 'summary'), 'true');
|
||||
return isset($summary[basename($backup)]) ? $summary[basename($backup)] : array();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -313,6 +340,33 @@ class backupModel extends model
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get tmp log file.
|
||||
*
|
||||
* @param string $backupFile
|
||||
* @access public
|
||||
* @return string
|
||||
*/
|
||||
public function getTmpLogFile($backupFile)
|
||||
{
|
||||
$backupDir = dirname($backupFile);
|
||||
return $backupDir . DS . basename($backupFile) . '.tmp.summary';
|
||||
}
|
||||
|
||||
/**
|
||||
* Get backup dir progress.
|
||||
*
|
||||
* @param string $backup
|
||||
* @access public
|
||||
* @return array
|
||||
*/
|
||||
public function getBackupDirProgress($backup)
|
||||
{
|
||||
$tmpLogFile = $this->getTmpLogFile($backup);
|
||||
if(file_exists($tmpLogFile)) return json_decode(file_get_contents($tmpLogFile), true);
|
||||
return array();
|
||||
}
|
||||
|
||||
/**
|
||||
* Process filesize.
|
||||
*
|
||||
@@ -344,11 +398,13 @@ class backupModel extends model
|
||||
* @param string $file
|
||||
* @param int $count
|
||||
* @param int $size
|
||||
* @param string $action
|
||||
* @param array $errorFiles
|
||||
* @param int $allCount
|
||||
* @param string $action add|delete
|
||||
* @access public
|
||||
* @return bool
|
||||
*/
|
||||
public function processSummary($file, $count, $size, $action = 'add')
|
||||
public function processSummary($file, $count, $size, $errorFiles = array(), $allCount = 0, $action = 'add')
|
||||
{
|
||||
$backupPath = dirname($file);
|
||||
$fileName = basename($file);
|
||||
@@ -361,8 +417,10 @@ class backupModel extends model
|
||||
|
||||
if($action == 'add')
|
||||
{
|
||||
$summary[$fileName]['count'] = $count;
|
||||
$summary[$fileName]['size'] = $size;
|
||||
$summary[$fileName]['allCount'] = $allCount;
|
||||
$summary[$fileName]['errorFiles'] = $errorFiles;
|
||||
$summary[$fileName]['count'] = $count;
|
||||
$summary[$fileName]['size'] = $size;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -35,7 +35,10 @@
|
||||
<tr>
|
||||
<th class='w-150px'><?php echo $lang->backup->time?></th>
|
||||
<th><?php echo $lang->backup->files?></th>
|
||||
<th class='w-150px'><?php echo $lang->backup->size?></th>
|
||||
<th class='w-100px'><?php echo $lang->backup->allCount?></th>
|
||||
<th class='w-100px'><?php echo $lang->backup->count?></th>
|
||||
<th class='w-100px'><?php echo $lang->backup->size?></th>
|
||||
<th class='w-100px'><?php echo $lang->backup->status?></th>
|
||||
<th class='actionWidth'><?php echo $lang->actions?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -44,14 +47,32 @@
|
||||
<?php $rowspan = count($backupFile->files);?>
|
||||
<?php $i = 0;?>
|
||||
<?php $isPHP = false;?>
|
||||
<?php foreach($backupFile->files as $file => $size):?>
|
||||
<?php foreach($backupFile->files as $file => $summary):?>
|
||||
<?php if(!$isPHP) $isPHP = strpos($file, '.php') !== false;?>
|
||||
<tr>
|
||||
<?php if($i == 0):?>
|
||||
<td <?php if($rowspan > 1) echo "rowspan='$rowspan'"?>><?php echo date(DT_DATETIME1, $backupFile->time);?></td>
|
||||
<?php endif;?>
|
||||
<td class='text-left' style='padding-left:5px;'><?php echo $file;?></td>
|
||||
<td><?php if(!empty($size)) echo $size / 1024 / 1024 >= 1024 ? round($size / 1024 / 1024 / 1024, 2) . 'GB' : ($size / 1024 >= 1024 ? round($size / 1024 / 1024, 2) . 'MB' : round($size / 1024, 2) . 'KB');?></td>
|
||||
<td><?php echo zget($summary, 'allCount', '');?></td>
|
||||
<td><?php echo zget($summary, 'count', '');?></td>
|
||||
<td>
|
||||
<?php
|
||||
$size = zget($summary, 'size', 0);
|
||||
if(!empty($size)) echo $this->backup->processFileSize($size);
|
||||
?>
|
||||
</td>
|
||||
<td style='overflow:visible'>
|
||||
<?php
|
||||
$status = zget($summary, 'count', 0) == zget($summary, 'allCount', 0) ? 'success' : 'fail';
|
||||
if(!empty($summary['errorFiles'])) $status = 'fail';
|
||||
if(!empty($summary['errorFiles'])):
|
||||
?>
|
||||
<div class="dropdown dropdown-hover"><?php echo $lang->backup->statusList[$status];?> <span class="caret"></span><div class="dropdown-menu pull-right errorFiles"><?php echo $lang->backup->copiedFail . '<br />' . join('<br />', $summary['errorFiles']);?></div></div>
|
||||
<?php else:?>
|
||||
<?php echo $lang->backup->statusList[$status];?>
|
||||
<?php endif;?>
|
||||
</td>
|
||||
<?php if($i == 0):?>
|
||||
<td <?php if($rowspan > 1) echo "rowspan='$rowspan'"?>>
|
||||
<?php
|
||||
@@ -79,7 +100,7 @@
|
||||
</h2>
|
||||
</div>
|
||||
<div class="modal fade" id="waitting" tabindex="-1" role="dialog" aria-hidden="true">
|
||||
<div class="modal-dialog w-300px">
|
||||
<div class="modal-dialog w-400px">
|
||||
<div class="modal-content">
|
||||
<div class="modal-body">
|
||||
<p><?php echo $lang->backup->waitting?></p>
|
||||
|
||||
+29
-13
@@ -902,6 +902,7 @@ class block extends control
|
||||
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
|
||||
->where('t1.product')->in($productIdList)
|
||||
->andWhere('t2.deleted')->eq(0)
|
||||
->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->projects)->fi()
|
||||
->fetchGroup('product');
|
||||
foreach($projects as $product => $productProjects)
|
||||
{
|
||||
@@ -989,25 +990,40 @@ class block extends control
|
||||
|
||||
$projectIdList = array_keys($projects);
|
||||
|
||||
|
||||
/* Get tasks. Fix bug #2918.*/
|
||||
$yesterday = date('Y-m-d', strtotime('-1 day'));
|
||||
$tasks = $this->dao->select("project, count(id) as totalTasks, count(status in ('wait','doing','pause') or null) as undoneTasks, count(finishedDate like '{$yesterday}%' or null) as yesterdayFinished, sum(if(status != 'cancel', estimate, 0)) as totalEstimate, sum(consumed) as totalConsumed, sum(if(status != 'cancel' and status != 'closed', `left`, 0)) as totalLeft")->from(TABLE_TASK)
|
||||
$yesterday = date('Y-m-d', strtotime('-1 day'));
|
||||
$taskGroups = $this->dao->select("id,parent,project,status,finishedDate,estimate,consumed,`left`")->from(TABLE_TASK)
|
||||
->where('project')->in($projectIdList)
|
||||
->andWhere('deleted')->eq(0)
|
||||
->andWhere('parent')->lt(1)
|
||||
->groupBy('project')
|
||||
->fetchAll('project');
|
||||
foreach($tasks as $projectID => $task)
|
||||
->fetchGroup('project', 'id');
|
||||
|
||||
$tasks = array();
|
||||
foreach($taskGroups as $projectID => $taskGroup)
|
||||
{
|
||||
$task->totalEstimate = round($task->totalEstimate, 2);
|
||||
$task->totalConsumed = round($task->totalConsumed, 2);
|
||||
$task->totalLeft = round($task->totalLeft, 2);
|
||||
foreach($task as $key => $value)
|
||||
$undoneTasks = 0;
|
||||
$yesterdayFinished = 0;
|
||||
$totalEstimate = 0;
|
||||
$totalConsumed = 0;
|
||||
$totalLeft = 0;
|
||||
|
||||
foreach($taskGroup as $taskID => $task)
|
||||
{
|
||||
if($key == 'project') continue;
|
||||
$projects[$projectID]->$key = $value;
|
||||
if(strpos('wait|doing|pause', $task->status) !== false) $undoneTasks ++;
|
||||
if(strpos($task->finishedDate, $yesterday) !== false) $yesterdayFinished ++;
|
||||
|
||||
if($task->parent == '-1') continue;
|
||||
|
||||
$totalConsumed += $task->consumed;
|
||||
if($task->status != 'cancel') $totalEstimate += $task->estimate;
|
||||
if($task->status != 'cancel' and $task->status != 'closed') $totalLeft += $task->left;
|
||||
}
|
||||
|
||||
$projects[$projectID]->totalTasks = count($taskGroup);
|
||||
$projects[$projectID]->undoneTasks = $undoneTasks;
|
||||
$projects[$projectID]->yesterdayFinished = $yesterdayFinished;
|
||||
$projects[$projectID]->totalEstimate = $totalEstimate;
|
||||
$projects[$projectID]->totalConsumed = $totalConsumed;
|
||||
$projects[$projectID]->totalLeft = $totalLeft;
|
||||
}
|
||||
|
||||
/* Get stories. */
|
||||
|
||||
@@ -66,6 +66,7 @@ function refreshBlock($panel, afterRefresh)
|
||||
{
|
||||
$panel.children('.panel-move-handler,style,script').remove();
|
||||
$panel.find('.panel-body,.empty-tip').first().replaceWith($data);
|
||||
$panel.find('.iframe').initIframeModal();
|
||||
}
|
||||
$panel.find('.progress-pie').progressPie();
|
||||
if($.isFunction(afterRefresh))
|
||||
|
||||
@@ -210,7 +210,7 @@ $lang->block->default['project']['4']['params']['num'] = 15;
|
||||
$lang->block->default['project']['4']['params']['orderBy'] = 'id_desc';
|
||||
$lang->block->default['project']['4']['params']['type'] = 'assignedTo';
|
||||
|
||||
$lang->block->default['qa']['1']['title'] = 'Testing Report';
|
||||
$lang->block->default['qa']['1']['title'] = 'Test Report';
|
||||
$lang->block->default['qa']['1']['block'] = 'statistic';
|
||||
$lang->block->default['qa']['1']['grid'] = 8;
|
||||
|
||||
@@ -318,7 +318,7 @@ $lang->block->availableBlocks->risk = 'My Risks';
|
||||
$lang->block->moduleList['program'] = $lang->projectCommon;
|
||||
$lang->block->moduleList['product'] = $lang->productCommon;
|
||||
$lang->block->moduleList['project'] = $lang->projectCommon;
|
||||
$lang->block->moduleList['qa'] = 'QA';
|
||||
$lang->block->moduleList['qa'] = 'Test';
|
||||
$lang->block->moduleList['todo'] = 'Todo';
|
||||
|
||||
$lang->block->modules['program'] = new stdclass();
|
||||
@@ -362,7 +362,7 @@ $lang->block->modules['project']->availableBlocks->task = 'Task';
|
||||
$lang->block->modules['project']->availableBlocks->build = 'Build';
|
||||
$lang->block->modules['qa'] = new stdclass();
|
||||
$lang->block->modules['qa']->availableBlocks = new stdclass();
|
||||
$lang->block->modules['qa']->availableBlocks->statistic = 'Testing Report';
|
||||
$lang->block->modules['qa']->availableBlocks->statistic = 'Test Report';
|
||||
//$lang->block->modules['qa']->availableBlocks->overview = 'Testcase Overview';
|
||||
$lang->block->modules['qa']->availableBlocks->bug = 'Bug';
|
||||
$lang->block->modules['qa']->availableBlocks->case = 'Case';
|
||||
@@ -512,8 +512,8 @@ $lang->block->gridOptions[8] = 'Left';
|
||||
$lang->block->gridOptions[4] = 'Right';
|
||||
|
||||
$lang->block->flowchart = array();
|
||||
$lang->block->flowchart['admin'] = array('Administrator', 'Add Department', 'Add User', 'Maintain Privileges');
|
||||
$lang->block->flowchart['admin'] = array('Administrator', 'Add Departments', 'Add Users', 'Maintain Privileges');
|
||||
$lang->block->flowchart['product'] = array($lang->productCommon . ' Owner', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Releases');
|
||||
$lang->block->flowchart['project'] = array('Scrum Master', 'Add ' . $lang->projectCommon, 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Create Tasks');
|
||||
$lang->block->flowchart['project'] = array('Scrum Master', 'Add ' . $lang->projectCommon . 's', 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Create Tasks');
|
||||
$lang->block->flowchart['dev'] = array('Dev Team', 'Claim Tasks/Bugs', 'Update Status', 'Finish Tasks/Bugs');
|
||||
$lang->block->flowchart['tester'] = array('QA Team', 'Write Cases', 'Run Cases', 'Report Bugs', 'Verify Bugs', 'Close Bugs');
|
||||
$lang->block->flowchart['tester'] = array('Test Team', 'Write Cases', 'Run Cases', 'Report Bugs', 'Verify Bugs', 'Close Bugs');
|
||||
|
||||
@@ -137,6 +137,7 @@ class blockModel extends model
|
||||
->andWhere('module')->eq($module)
|
||||
->andWhere('hidden')->eq(0)
|
||||
->beginIF($type)->andWhere('type')->eq($type)->fi()
|
||||
->beginIF($this->config->global->flow != 'full')->andWhere('block')->notin('flowchart')->fi()
|
||||
->beginIF($this->config->global->flow == 'onlyStory')->andWhere('source')->notin('project,qa')->fi()
|
||||
->beginIF($this->config->global->flow == 'onlyTask')->andWhere('source')->notin('product,qa')->fi()
|
||||
->beginIF($this->config->global->flow == 'onlyTest')->andWhere('source')->notin('product,project')->fi()
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<div class='panel-body scrollbar-hover'>
|
||||
<?php foreach ($lang->block->flowchart as $rowIndex => $flow):?>
|
||||
<?php foreach ($lang->block->flowchart as $flowName => $flow):?>
|
||||
<?php $idx = 0; ?>
|
||||
<div class='row row-<?php echo $rowIndex?>'>
|
||||
<div class='row row-<?php echo $flowName?>'>
|
||||
<?php foreach ($flow as $flowItem):?>
|
||||
<div class='flow-item flow-item-<?php echo $idx++ ?>'><div title='<?php echo $flowItem ?>'><?php echo $flowItem ?></div></div>
|
||||
<?php endforeach; ?>
|
||||
@@ -44,4 +44,4 @@
|
||||
.block-sm .flow-item > div:before, .block-sm .flow-item > div:after {border-width: 15px 0 15px 6px;}
|
||||
.block-sm .row-3 .flow-item-1, .block-sm .row-3 .flow-item-3 {width: 25%}
|
||||
.block-sm .flow-item > div:after {right: -6px;}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@@ -108,7 +108,8 @@ $(function()
|
||||
<div class="col col-nav">
|
||||
<ul class="nav nav-stacked nav-secondary scrollbar-hover" id='<?php echo $blockNavId;?>'>
|
||||
<li class='switch-icon prev'><a><i class='icon icon-arrow-left'></i></a></li>
|
||||
<?php $selected = empty($_SESSION['product']) ? key($products) : $this->session->product;?>
|
||||
<?php $selected = empty($_SESSION['product']) ? key($products) : $this->session->product;?>
|
||||
<?php $selected = !isset($products[$selected]) ? key($products) : $selected;?>
|
||||
<?php foreach($products as $product):?>
|
||||
<li <?php if($product->id == $selected) echo "class='active' id='activeProduct'";?> productID='<?php echo $product->id;?>'>
|
||||
<a href="javascript:;" data-target="#tabProduct<?php echo $product->id;?>" data-toggle="tab" title='<?php echo $product->name;?>'><?php echo $product->name;?></a>
|
||||
|
||||
@@ -92,10 +92,11 @@ $(function()
|
||||
<div class="col col-nav">
|
||||
<ul class="nav nav-stacked nav-secondary scrollbar-hover" id='<?php echo $blockNavId;?>'>
|
||||
<li class='switch-icon prev'><a><i class='icon icon-arrow-left'></i></a></li>
|
||||
<?php $selected = empty($_SESSION['project']) ? key($projects) : $this->session->project;?>
|
||||
<?php $selected = empty($_SESSION['project']) ? key($projects) : $this->session->project;?>
|
||||
<?php $selected = !isset($projects[$selected]) ? key($projects) : $selected;?>
|
||||
<?php foreach($projects as $project):?>
|
||||
<li <?php if($project->id == $selected) echo "class='active' id='activeProject'";?> projectID='<?php echo $project->id;?>'>
|
||||
<a href="###" data-target="#tab3Content<?php echo $project->id;?>" data-toggle="tab"><?php echo $project->name;?></a>
|
||||
<a href="###" data-target="#tab3Content<?php echo $project->id;?>" data-toggle="tab" title='<?php echo $project->name;?>'><?php echo $project->name;?></a>
|
||||
<?php echo html::a(helper::createLink('project', 'task', "projectID=$project->id"), "<i class='icon-arrow-right text-primary'></i>", '', "class='btn-view' title={$lang->project->task}");?>
|
||||
</li>
|
||||
<?php endforeach;?>
|
||||
@@ -153,6 +154,7 @@ $(function()
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php if($this->config->global->flow != 'onlyTask'): ?>
|
||||
<div class="product-info">
|
||||
<div class="progress-info"><i class="icon icon-check-circle text-success icon-sm"></i> <span class="text-muted"><?php echo $lang->story->released;?></span> <strong><?php echo $project->releasedStories;?></strong></div>
|
||||
<div class="progress">
|
||||
@@ -194,6 +196,7 @@ $(function()
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -92,7 +92,7 @@ $(function()
|
||||
<?php foreach($products as $product):?>
|
||||
<li <?php if($product == reset($products)) echo "class='active'";?> productID='<?php echo $product->id;?>'>
|
||||
<a href="javascript:;" data-target="#tabQaProduct<?php echo $product->id;?>" data-toggle="tab" title='<?php echo $product->name;?>'><?php echo $product->name;?></a>
|
||||
<?php echo html::a(helper::createLink('bug', 'browse', "productID=$product->id"), "<i class='icon-arrow-right text-primary'></i>", '', "class='btn-view' title={$lang->product->browse}");?></li>
|
||||
<?php echo html::a(helper::createLink('bug', 'browse', "productID=$product->id"), "<i class='icon-arrow-right text-primary'></i>", '', "class='btn-view' title={$lang->bug->browse}");?></li>
|
||||
<?php $index++;?>
|
||||
<?php endforeach;?>
|
||||
<li class='switch-icon next'><a><i class='icon icon-arrow-right'></i></a></li>
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
<style>
|
||||
.block-tasks .c-id {width: 55px;}
|
||||
.block-tasks .c-pri {width: 45px;text-align: center;}
|
||||
.block-tasks .c-pri-long {width: 80px;}
|
||||
.block-tasks .c-estimate {width: 60px;}
|
||||
.block-tasks .c-deadline {width: 95px;}
|
||||
.block-tasks .c-status {width: 80px;}
|
||||
@@ -26,7 +27,7 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th class='c-id'><?php echo $lang->idAB;?></th>
|
||||
<th class='c-pri'><?php echo $lang->priAB?></th>
|
||||
<th class='c-pri <?php if($longBlock) echo "c-pri-long"?>'><?php echo $lang->priAB?></th>
|
||||
<th class='c-name'> <?php echo $lang->task->name;?></th>
|
||||
<?php if($longBlock):?>
|
||||
<th class='c-estimate'><?php echo $lang->task->estimateAB;?></th>
|
||||
@@ -42,7 +43,7 @@
|
||||
?>
|
||||
<tr>
|
||||
<td class='c-id-xs'><?php echo sprintf('%03d', $task->id);?></td>
|
||||
<td class='c-pri'><span class='label-pri label-pri-<?php echo $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
|
||||
<td class='c-pri <?php if($longBlock) echo "c-pri-long"?>'><span class='label-pri label-pri-<?php echo $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
|
||||
<td class='c-name' style='color: <?php echo $task->color?>' title='<?php echo $task->name?>'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', '', $task->program), $task->name)?></td>
|
||||
<?php if($longBlock):?>
|
||||
<td class='c-estimate text-center'><?php echo $task->estimate?></td>
|
||||
|
||||
@@ -19,7 +19,7 @@ if(!$selfCall) die(include('./todolist.html.php'));
|
||||
.block-todoes .todoes-input .form-control:-ms-input-placeholder {font-size: 12px; line-height: 20px;color: #a4a8b6;}
|
||||
.block-todoes .todoes-input .form-control::placeholder {font-size: 12px; line-height: 20px; color: #a4a8b6;}
|
||||
.block-todoes .todoes {padding: 0 10px 10px 10px; margin: 0 -20px; max-height: 350px; overflow: auto; overflow-x:hidden}
|
||||
.block-todoes .todoes > li {position: relative; padding: 5px 10px 5px 35px; list-style: none; white-space:nowrap; overflow: auto; overflow-x:hidden;}
|
||||
.block-todoes .todoes > li {position: relative; padding: 5px 10px 5px 35px; list-style: none; white-space:nowrap; overflow: auto; overflow-x:hidden; width: 410px;}
|
||||
.block-todoes .todoes > li:hover {background-color: #e9f2fb;}
|
||||
.block-todoes .todo-title {padding: 5px 15px 5px 5px;}
|
||||
.block-todoes .todo-pri {margin: 0 5px;}
|
||||
|
||||
@@ -44,6 +44,7 @@
|
||||
<div class="col col-right">
|
||||
<h4><small class="text-muted"><?php echo date(DT_DATE3)?></small> <?php echo $lang->block->leftToday?></h4>
|
||||
<div class="row tiles">
|
||||
<?php if($this->config->global->flow == 'full' or $this->config->global->flow == 'onlyTask'):?>
|
||||
<div class="col tile">
|
||||
<div class="tile-title"><?php echo $lang->block->myTask?></div>
|
||||
<div class="tile-amount"><?php echo empty($tasks) ? 0 : html::a($this->createLink('my', 'task', 'type=assignedTo'), (int)$tasks);?></div>
|
||||
@@ -53,6 +54,8 @@
|
||||
</div>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
<?php endif;?>
|
||||
<?php if($this->config->global->flow == 'full' or $this->config->global->flow == 'onlyTest'):?>
|
||||
<div class="col tile">
|
||||
<div class="tile-title"><?php echo $lang->block->myBug?></div>
|
||||
<div class="tile-amount"><?php echo empty($bugs) ? 0 : html::a($this->createLink('my', 'bug', 'type=assignedTo'), (int)$bugs);?></div>
|
||||
@@ -62,6 +65,8 @@
|
||||
</div>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
<?php endif;?>
|
||||
<?php if($this->config->global->flow == 'full' or $this->config->global->flow == 'onlyStory'):?>
|
||||
<div class="col tile">
|
||||
<div class="tile-title"><?php echo $lang->block->myStory?></div>
|
||||
<div class="tile-amount"><?php echo empty($stories) ? 0 : html::a($this->createLink('my', 'story', 'type=assignedTo'), (int)$stories);?></div>
|
||||
|
||||
@@ -27,7 +27,7 @@ class branchModel extends model
|
||||
if(empty($product) or !isset($this->lang->product->branchName[$product->type])) return false;
|
||||
return $this->lang->branch->all . $this->lang->product->branchName[$product->type];
|
||||
}
|
||||
return $this->dao->select('*')->from(TABLE_BRANCH)->where('id')->eq($branchID)->fetch('name');
|
||||
return htmlspecialchars_decode($this->dao->select('*')->from(TABLE_BRANCH)->where('id')->eq($branchID)->fetch('name'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -41,6 +41,8 @@ class branchModel extends model
|
||||
public function getPairs($productID, $params = '')
|
||||
{
|
||||
$branches = $this->dao->select('*')->from(TABLE_BRANCH)->where('product')->eq($productID)->andWhere('deleted')->eq(0)->orderBy('`order`')->fetchPairs('id', 'name');
|
||||
foreach($branches as $branchID => $branchName) $branches[$branchID] = htmlspecialchars_decode($branchName);
|
||||
|
||||
if(strpos($params, 'noempty') === false)
|
||||
{
|
||||
$product = $this->loadModel('product')->getById($productID);
|
||||
@@ -71,7 +73,7 @@ class branchModel extends model
|
||||
$product = $products[$productID];
|
||||
foreach($branches as $branch)
|
||||
{
|
||||
$branchPairs[$branch->id] = $product->name . '/' . $branch->name;
|
||||
$branchPairs[$branch->id] = $product->name . '/' . htmlspecialchars_decode($branch->name);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -133,7 +135,7 @@ class branchModel extends model
|
||||
}
|
||||
else
|
||||
{
|
||||
$branchGroups[$branch->product][$branch->id] = $branch->name;
|
||||
$branchGroups[$branch->product][$branch->id] = htmlspecialchars_decode($branch->name);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -237,6 +237,11 @@ $config->bug->datatable->fieldList['task']['fixed'] = 'no';
|
||||
$config->bug->datatable->fieldList['task']['width'] = '120';
|
||||
$config->bug->datatable->fieldList['task']['required'] = 'no';
|
||||
|
||||
$config->bug->datatable->fieldList['toTask']['title'] = 'toTask';
|
||||
$config->bug->datatable->fieldList['toTask']['fixed'] = 'no';
|
||||
$config->bug->datatable->fieldList['toTask']['width'] = '120';
|
||||
$config->bug->datatable->fieldList['toTask']['required'] = 'no';
|
||||
|
||||
$config->bug->datatable->fieldList['keywords']['title'] = 'keywords';
|
||||
$config->bug->datatable->fieldList['keywords']['fixed'] = 'no';
|
||||
$config->bug->datatable->fieldList['keywords']['width'] = '100';
|
||||
|
||||
+75
-26
@@ -67,7 +67,7 @@ class bug extends control
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function browse($productID = 0, $branch = '', $browseType = 'unclosed', $param = 0, $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
|
||||
public function browse($productID = 0, $branch = '', $browseType = '', $param = 0, $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
|
||||
{
|
||||
$this->loadModel('datatable');
|
||||
|
||||
@@ -80,21 +80,43 @@ class bug extends control
|
||||
setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
|
||||
setcookie('preBranch', (int)$branch, $this->config->cookieLife, $this->config->webRoot, '', false, true);
|
||||
|
||||
if($this->cookie->preProductID != $productID or $this->cookie->preBranch != $branch)
|
||||
if($this->cookie->preProductID != $productID or $this->cookie->preBranch != $branch or $browseType == 'bybranch')
|
||||
{
|
||||
$_COOKIE['bugModule'] = 0;
|
||||
setcookie('bugModule', 0, 0, $this->config->webRoot, '', false, false);
|
||||
}
|
||||
if($browseType == 'bymodule') setcookie('bugModule', (int)$param, 0, $this->config->webRoot, '', false, false);
|
||||
if($browseType != 'bymodule') $this->session->set('bugBrowseType', $browseType);
|
||||
if($browseType == 'bymodule' or $browseType == '')
|
||||
{
|
||||
setcookie('bugModule', (int)$param, 0, $this->config->webRoot, '', false, false);
|
||||
$_COOKIE['bugBranch'] = 0;
|
||||
setcookie('bugBranch', 0, 0, $this->config->webRoot, '', false, false);
|
||||
if($browseType == '') setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', false, false);
|
||||
}
|
||||
if($browseType == 'bybranch') setcookie('bugBranch', (int)$branch, 0, $this->config->webRoot, '', false, false);
|
||||
if($browseType != 'bymodule' and $browseType != 'bybranch') $this->session->set('bugBrowseType', $browseType);
|
||||
|
||||
$moduleID = ($browseType == 'bymodule') ? (int)$param : ($browseType == 'bysearch' ? 0 : ($this->cookie->bugModule ? $this->cookie->bugModule : 0));
|
||||
$queryID = ($browseType == 'bysearch') ? (int)$param : 0;
|
||||
$moduleID = ($browseType == 'bymodule') ? (int)$param : (($browseType == 'bysearch' or $browseType == 'bybranch') ? 0 : ($this->cookie->bugModule ? $this->cookie->bugModule : 0));
|
||||
$queryID = ($browseType == 'bysearch') ? (int)$param : 0;
|
||||
|
||||
/* Set menu and save session. */
|
||||
$this->bug->setMenu($this->products, $productID, $branch, $moduleID, $browseType, $orderBy);
|
||||
$this->session->set('bugList', $this->app->getURI(true));
|
||||
|
||||
/* Set moduleTree. */
|
||||
if($browseType == '')
|
||||
{
|
||||
setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', false, false);
|
||||
$browseType = 'unclosed';
|
||||
$moduleTree = $this->tree->getTreeMenu($productID, $viewType = 'bug', $startModuleID = 0, array('treeModel', 'createBugLink'), '', $branch);
|
||||
}
|
||||
else
|
||||
{
|
||||
$moduleTree = $this->tree->getTreeMenu($productID, $viewType = 'bug', $startModuleID = 0, array('treeModel', 'createBugLink'), '', (int)$this->cookie->treeBranch);
|
||||
}
|
||||
|
||||
if(($browseType != 'bymodule' && $browseType != 'bybranch')) $this->session->set('bugBrowseType', $browseType);
|
||||
if(($browseType == 'bymodule' || $browseType == 'bybranch') and $this->session->bugBrowseType == 'bysearch') $this->session->set('bugBrowseType', 'unclosed');
|
||||
|
||||
/* Process the order by field. */
|
||||
if(!$orderBy) $orderBy = $this->cookie->qaBugOrder ? $this->cookie->qaBugOrder : 'id_desc';
|
||||
setcookie('qaBugOrder', $orderBy, 0, $this->config->webRoot, '', false, true);
|
||||
@@ -126,8 +148,9 @@ class bug extends control
|
||||
$storyIdList = $taskIdList = array();
|
||||
foreach($bugs as $bug)
|
||||
{
|
||||
if($bug->story) $storyIdList[$bug->story] = $bug->story;
|
||||
if($bug->task) $taskIdList[$bug->task] = $bug->task;
|
||||
if($bug->story) $storyIdList[$bug->story] = $bug->story;
|
||||
if($bug->task) $taskIdList[$bug->task] = $bug->task;
|
||||
if($bug->toTask) $taskIdList[$bug->toTask] = $bug->toTask;
|
||||
}
|
||||
$storyList = $storyIdList ? $this->loadModel('story')->getByList($storyIdList) : array();
|
||||
$taskList = $taskIdList ? $this->loadModel('task')->getByList($taskIdList) : array();
|
||||
@@ -149,7 +172,7 @@ class bug extends control
|
||||
$this->view->productName = $this->products[$productID];
|
||||
$this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID);
|
||||
$this->view->modules = $this->tree->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0, $branch);
|
||||
$this->view->moduleTree = $this->tree->getTreeMenu($productID, $viewType = 'bug', $startModuleID = 0, array('treeModel', 'createBugLink'), '', $branch);
|
||||
$this->view->moduleTree = $moduleTree;
|
||||
$this->view->moduleName = $moduleID ? $this->tree->getById($moduleID)->name : $this->lang->tree->all;
|
||||
$this->view->summary = $this->bug->summary($bugs);
|
||||
$this->view->browseType = $browseType;
|
||||
@@ -350,6 +373,11 @@ class bug extends control
|
||||
|
||||
if($runID and $resultID) extract($this->bug->getBugInfoFromResult($resultID, 0, 0, isset($stepIdList) ? $stepIdList : ''));// If set runID and resultID, get the result info by resultID as template.
|
||||
if(!$runID and $caseID) extract($this->bug->getBugInfoFromResult($resultID, $caseID, $version, isset($stepIdList) ? $stepIdList : ''));// If not set runID but set caseID, get the result info by resultID and case info.
|
||||
if($testtask)
|
||||
{
|
||||
$testtask = $this->loadModel('testtask')->getById($testtask);
|
||||
$buildID = $testtask->build;
|
||||
}
|
||||
|
||||
/* If bugID setted, use this bug as template. */
|
||||
if(isset($bugID))
|
||||
@@ -395,10 +423,14 @@ class bug extends control
|
||||
$stories = $this->story->getProductStoryPairs($productID, $branch);
|
||||
}
|
||||
|
||||
|
||||
$moduleID = $moduleID ? $moduleID : (int)$this->cookie->lastBugModule;
|
||||
$moduleOwner = $this->bug->getModuleOwner($moduleID, $productID);
|
||||
|
||||
/* Set team members of the latest project as assignedTo list. */
|
||||
$latestProject = $this->product->getLatestProject($productID);
|
||||
$projectMembers = array();
|
||||
if(!empty($latestProject)) $projectMembers = $this->loadModel('project')->getTeamMemberPairs($latestProject->id, 'nodeleted');
|
||||
if(!empty($latestProject)) $projectMembers = $this->loadModel('project')->getTeamMemberPairs($latestProject->id, 'nodeleted', $moduleOwner);
|
||||
if(empty($projectMembers)) $projectMembers = $this->view->users;
|
||||
if($assignedTo and !isset($projectMembers[$assignedTo]))
|
||||
{
|
||||
@@ -629,7 +661,7 @@ class bug extends control
|
||||
}
|
||||
if($this->post->comment != '' or !empty($changes) or !empty($files))
|
||||
{
|
||||
$action = !empty($changes) ? 'Edited' : 'Commented';
|
||||
$action = (!empty($changes) or !empty($files)) ? 'Edited' : 'Commented';
|
||||
$fileAction = '';
|
||||
if(!empty($files)) $fileAction = $this->lang->addFiles . join(',', $files) . "\n" ;
|
||||
$actionID = $this->action->create('bug', $bugID, $action, $fileAction . $this->post->comment);
|
||||
@@ -761,7 +793,7 @@ class bug extends control
|
||||
$branchProduct = $product->type == 'normal' ? false : true;
|
||||
|
||||
/* Set plans. */
|
||||
$plans = $this->loadModel('productplan')->getPairs($productID, $branch);
|
||||
$plans = $this->loadModel('productplan')->getPairs($productID, $branch);
|
||||
$plans = array('' => '', 'ditto' => $this->lang->bug->ditto) + $plans;
|
||||
|
||||
/* Set product menu. */
|
||||
@@ -795,7 +827,7 @@ class bug extends control
|
||||
$this->view->title = "BUG" . $this->lang->bug->batchEdit;
|
||||
}
|
||||
|
||||
/* Judge whether the editedTasks is too large and set session. */
|
||||
/* Judge whether the editedBugs is too large and set session. */
|
||||
$countInputVars = count($bugs) * (count(explode(',', $this->config->bug->custom->batchEditFields)) + 2);
|
||||
$showSuhosinInfo = common::judgeSuhosinSetting($countInputVars);
|
||||
if($showSuhosinInfo) $this->view->suhosinInfo = extension_loaded('suhosin') ? sprintf($this->lang->suhosinInfo, $countInputVars) : sprintf($this->lang->maxVarsInfo, $countInputVars);
|
||||
@@ -812,7 +844,7 @@ class bug extends control
|
||||
$appendUsers[$bug->assignedTo] = $bug->assignedTo;
|
||||
$appendUsers[$bug->resolvedBy] = $bug->resolvedBy;
|
||||
}
|
||||
$users = $this->user->getPairs('devfirst|nodeleted', $appendUsers);
|
||||
$users = $this->user->getPairs('devfirst|nodeleted', $appendUsers, $this->config->maxCount);
|
||||
$users = array('' => '', 'ditto' => $this->lang->bug->ditto) + $users;
|
||||
|
||||
/* Assign. */
|
||||
@@ -951,7 +983,7 @@ class bug extends control
|
||||
}
|
||||
$this->loadModel('score')->create('ajax', 'batchOther');
|
||||
}
|
||||
if($type == 'product') die(js::locate($this->createLink('bug', 'browse', "productID=$projectID"), 'parent'));
|
||||
if($type == 'product') die(js::locate($this->session->bugList, 'parent'));
|
||||
if($type == 'my') die(js::locate($this->createLink('my', 'bug')));
|
||||
die(js::locate($this->createLink('project', 'bug', "projectID=$projectID")));
|
||||
}
|
||||
@@ -1378,8 +1410,16 @@ class bug extends control
|
||||
*/
|
||||
public function ajaxGetModuleOwner($moduleID, $productID = 0)
|
||||
{
|
||||
$owner = $this->bug->getModuleOwner($moduleID, $productID);
|
||||
die($owner);
|
||||
$account = $this->bug->getModuleOwner($moduleID, $productID);
|
||||
$realName = '';
|
||||
if(!empty($account))
|
||||
{
|
||||
$user = $this->dao->select('realname')->from(TABLE_USER)->where('account')->eq($account)->fetch();
|
||||
$firstLetter = ucfirst(substr($account, 0, 1)) . ':';
|
||||
if(!empty($this->config->isINT)) $firstLetter = '';
|
||||
$realName = $firstLetter . ($user->realname ? $user->realname : $account);
|
||||
}
|
||||
die(json_encode(array($account, $realName)));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1392,7 +1432,7 @@ class bug extends control
|
||||
*/
|
||||
public function ajaxLoadAssignedTo($projectID, $selectedUser = '')
|
||||
{
|
||||
$projectMembers = $this->loadModel('project')->getTeamMemberPairs($projectID);
|
||||
$projectMembers = $this->loadModel('project')->getTeamMemberPairs($projectID, '', $selectedUser);
|
||||
|
||||
die(html::select('assignedTo', $projectMembers, $selectedUser, 'class="form-control"'));
|
||||
}
|
||||
@@ -1401,7 +1441,6 @@ class bug extends control
|
||||
* AJAX: get team members of the latest project of a product as assignedTo list.
|
||||
*
|
||||
* @param int $productID
|
||||
* x
|
||||
* @param string $selectedUser
|
||||
* @access public
|
||||
* @return string
|
||||
@@ -1411,7 +1450,7 @@ class bug extends control
|
||||
$latestProject = $this->product->getLatestProject($productID);
|
||||
if(!empty($latestProject))
|
||||
{
|
||||
$projectMembers = $this->loadModel('project')->getTeamMemberPairs($latestProject->id, 'nodeleted');
|
||||
$projectMembers = $this->loadModel('project')->getTeamMemberPairs($latestProject->id, 'nodeleted', $selectedUser);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1454,10 +1493,11 @@ class bug extends control
|
||||
* @param string $productID
|
||||
* @param string $orderBy
|
||||
* @param string $browseType
|
||||
* @param int $projectID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function export($productID, $orderBy, $browseType = '')
|
||||
public function export($productID, $orderBy, $browseType = '', $projectID = 0)
|
||||
{
|
||||
if($_POST)
|
||||
{
|
||||
@@ -1534,11 +1574,9 @@ class bug extends control
|
||||
{
|
||||
if($this->post->fileType == 'csv')
|
||||
{
|
||||
$bug->steps = htmlspecialchars_decode($bug->steps);
|
||||
$bug->steps = str_replace("<br />", "\n", $bug->steps);
|
||||
$bug->steps = str_replace('"', '""', $bug->steps);
|
||||
$bug->steps = str_replace(' ', ' ', $bug->steps);
|
||||
$bug->steps = strip_tags($bug->steps);
|
||||
}
|
||||
|
||||
/* fill some field with useful value. */
|
||||
@@ -1602,6 +1640,7 @@ class bug extends control
|
||||
}
|
||||
|
||||
/* Set related files. */
|
||||
$bug->files = '';
|
||||
if(isset($relatedFiles[$bug->id]))
|
||||
{
|
||||
foreach($relatedFiles[$bug->id] as $file)
|
||||
@@ -1636,10 +1675,20 @@ class bug extends control
|
||||
}
|
||||
|
||||
$fileName = $this->lang->bug->common;
|
||||
$productName = $this->dao->findById($productID)->from(TABLE_PRODUCT)->fetch('name');
|
||||
$browseType = isset($this->lang->bug->featureBar['browse'][$browseType]) ? $this->lang->bug->featureBar['browse'][$browseType] : zget($this->lang->bug->moreSelects, $browseType, '');
|
||||
if($projectID)
|
||||
{
|
||||
$projectName = $this->dao->findById($projectID)->from(TABLE_PROJECT)->fetch('name');
|
||||
$fileName = $projectName . $this->lang->dash . $fileName;
|
||||
}
|
||||
else
|
||||
{
|
||||
$productName = $this->dao->findById($productID)->from(TABLE_PRODUCT)->fetch('name');
|
||||
$browseType = isset($this->lang->bug->featureBar['browse'][$browseType]) ? $this->lang->bug->featureBar['browse'][$browseType] : zget($this->lang->bug->moreSelects, $browseType, '');
|
||||
|
||||
$this->view->fileName = $productName . $this->lang->dash . $browseType . $fileName;
|
||||
$fileName = $productName . $this->lang->dash . $browseType . $fileName;
|
||||
}
|
||||
|
||||
$this->view->fileName = $fileName;
|
||||
$this->view->allExportFields = $this->config->bug->list->exportFields;
|
||||
$this->view->customExport = true;
|
||||
$this->display();
|
||||
|
||||
@@ -9,6 +9,7 @@ html[lang='en'] #deadlineTd .input-group-addon{padding: 5px 18px}
|
||||
.bootbox-prompt .modal-dialog {width: 500px; margin-top: 10%;}
|
||||
|
||||
#buildBoxActions {padding-left: 15px;}
|
||||
#projectIdBox {display:block;}
|
||||
|
||||
#module + .chosen-container-single .chosen-single,
|
||||
#task + .chosen-container-single .chosen-single,
|
||||
|
||||
@@ -23,6 +23,7 @@ function setBranchRelated(branchID, productID, num)
|
||||
if(!modules) modules = '<select id="modules' + num + '" name="modules[' + num + ']" class="form-control"></select>';
|
||||
$('#modules' + num).replaceWith(modules);
|
||||
$("#modules" + num + "_chosen").remove();
|
||||
$("#modules" + num).next('.picker').remove();
|
||||
$("#modules" + num).chosen();
|
||||
});
|
||||
|
||||
@@ -32,6 +33,7 @@ function setBranchRelated(branchID, productID, num)
|
||||
if(!projects) projects = '<select id="projects' + num + '" name="projects[' + num + ']" class="form-control"></select>';
|
||||
$('#projects' + num).replaceWith(projects);
|
||||
$("#projects" + num + "_chosen").remove();
|
||||
$("#projects" + num).next('.picker').remove();
|
||||
$("#projects" + num).chosen();
|
||||
});
|
||||
|
||||
@@ -59,6 +61,7 @@ function setOpenedBuilds(link, index)
|
||||
$('#buildBox' + index).html(builds);
|
||||
$('#buildBox' + index).find('select').val(selected);
|
||||
$('#openedBuilds' + index + '_chosen').remove();
|
||||
$('#openedBuilds' + index).next('.picker').remove();
|
||||
$('#buildBox' + index + ' select').removeClass('select-3');
|
||||
$('#buildBox' + index + ' select').addClass('select-1');
|
||||
$('#buildBox' + index + ' select').attr('name','openedBuilds[' + index + '][]');
|
||||
|
||||
+32
-9
@@ -21,7 +21,6 @@ $(function()
|
||||
if(page == 'create' || page == 'edit' || page == 'assignedto' || page == 'confirmbug')
|
||||
{
|
||||
oldProductID = $('#product').val();
|
||||
$("#story, #task, #mailto").chosen();
|
||||
}
|
||||
|
||||
if(window.flow != 'full')
|
||||
@@ -48,7 +47,7 @@ function loadAll(productID)
|
||||
setAssignedTo();
|
||||
}
|
||||
|
||||
if(!changeProductConfirmed)
|
||||
if(typeof(changeProductConfirmed) != 'undefined' && !changeProductConfirmed)
|
||||
{
|
||||
firstChoice = confirm(confirmChangeProduct);
|
||||
changeProductConfirmed = true; // Only notice the user one time.
|
||||
@@ -146,6 +145,7 @@ function loadAllProjectBuilds(projectID, productID)
|
||||
if(!data) data = '<select id="openedBuild" name="openedBuild" class="form-control" multiple=multiple></select>';
|
||||
$('#openedBuild').replaceWith(data);
|
||||
$('#openedBuild_chosen').remove();
|
||||
$('#openedBuild').next('.picker').remove();
|
||||
$("#openedBuild").chosen();
|
||||
notice();
|
||||
})
|
||||
@@ -184,6 +184,7 @@ function loadAllProductBuilds(productID)
|
||||
if(!data) data = '<select id="openedBuild" name="openedBuild" class="form-control" multiple=multiple></select>';
|
||||
$('#openedBuild').replaceWith(data);
|
||||
$('#openedBuild_chosen').remove();
|
||||
$('#openedBuild').next('.picker').remove();
|
||||
$("#openedBuild").chosen();
|
||||
notice();
|
||||
})
|
||||
@@ -246,10 +247,16 @@ function loadProductStories(productID)
|
||||
*/
|
||||
function loadProductProjects(productID)
|
||||
{
|
||||
required = $('#project_chosen').hasClass('required');
|
||||
branch = $('#branch').val();
|
||||
if(typeof(branch) == 'undefined') branch = 0;
|
||||
|
||||
link = createLink('product', 'ajaxGetProjects', 'productID=' + productID + '&projectID=' + oldProjectID + '&branch=' + branch);
|
||||
$('#projectIdBox').load(link, function(){$(this).find('select').chosen()});
|
||||
$('#projectIdBox').load(link, function()
|
||||
{
|
||||
$(this).find('select').chosen();
|
||||
if(required) $(this).addClass('required');
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -287,6 +294,7 @@ function loadProductBuilds(productID)
|
||||
if(!data) data = '<select id="openedBuild" name="openedBuild" class="form-control" multiple=multiple></select>';
|
||||
$('#openedBuild').replaceWith(data);
|
||||
$('#openedBuild_chosen').remove();
|
||||
$('#openedBuild').next('.picker').remove();
|
||||
$("#openedBuild").chosen();
|
||||
notice();
|
||||
})
|
||||
@@ -338,6 +346,7 @@ function loadProjectTasks(projectID)
|
||||
if(!data) data = '<select id="task" name="task" class="form-control"></select>';
|
||||
$('#task').replaceWith(data);
|
||||
$('#task_chosen').remove();
|
||||
$('#task').next('.picker').remove();
|
||||
$("#task").chosen();
|
||||
})
|
||||
}
|
||||
@@ -378,7 +387,9 @@ function loadProjectBuilds(projectID)
|
||||
{
|
||||
if(!data) data = '<select id="openedBuild" name="openedBuild" class="form-control" multiple=multiple></select>';
|
||||
$('#openedBuild').replaceWith(data);
|
||||
$('#openedBuild').val(oldOpenedBuild);
|
||||
$('#openedBuild_chosen').remove();
|
||||
$('#openedBuild').next('.picker').remove();
|
||||
$("#openedBuild").chosen();
|
||||
notice();
|
||||
})
|
||||
@@ -386,11 +397,11 @@ function loadProjectBuilds(projectID)
|
||||
else
|
||||
{
|
||||
link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + '&branch=' + branch);
|
||||
$('#openedBuildBox').load(link, function(){$(this).find('select').chosen()});
|
||||
$('#openedBuildBox').load(link, function(){$(this).find('select').val(oldOpenedBuild).chosen()});
|
||||
|
||||
oldResolvedBuild = $('#resolvedBuild').val() ? $('#resolvedBuild').val() : 0;
|
||||
link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=resolvedBuild&build=' + oldResolvedBuild + '&branch=' + branch);
|
||||
$('#resolvedBuildBox').load(link, function(){$(this).find('select').chosen()});
|
||||
$('#resolvedBuildBox').load(link, function(){$(this).find('select').val(oldResolvedBuild).chosen()});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -412,6 +423,7 @@ function setStories(moduleID, productID)
|
||||
if(!stories) stories = '<select id="story" name="story" class="form-control"></select>';
|
||||
$('#story').replaceWith(stories);
|
||||
$('#story_chosen').remove();
|
||||
$('#story').next('.picker').remove();
|
||||
$("#story").chosen();
|
||||
});
|
||||
}
|
||||
@@ -427,6 +439,7 @@ function loadProductBranches(productID)
|
||||
{
|
||||
$('#branch').remove();
|
||||
$('#branch_chosen').remove();
|
||||
$('#branch').next('.picker').remove();
|
||||
$.get(createLink('branch', 'ajaxGetBranches', "productID=" + productID), function(data)
|
||||
{
|
||||
if(data)
|
||||
@@ -438,20 +451,29 @@ function loadProductBranches(productID)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
var oldAssignedToTitle = $("#assignedTo").find("option:selected").text();
|
||||
var oldAssignedTo = $("#assignedTo").find("option:selected").val();
|
||||
|
||||
/**
|
||||
* Load team members of the project as assignedTo list.
|
||||
*
|
||||
*
|
||||
* @param int $projectID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
function loadAssignedTo(projectID)
|
||||
function loadAssignedTo(projectID, selectedUser = '')
|
||||
{
|
||||
link = createLink('bug', 'ajaxLoadAssignedTo', 'projectID=' + projectID + '&selectedUser=' + $('#assignedTo').val());
|
||||
selectedUser = selectedUser ? selectedUser : $('#assignedTo').val();
|
||||
link = createLink('bug', 'ajaxLoadAssignedTo', 'projectID=' + projectID + '&selectedUser=' + selectedUser);
|
||||
$.get(link, function(data)
|
||||
{
|
||||
var defaultOption = '<option title="' + oldAssignedToTitle + '" value="' + oldAssignedTo + '" selected="selected">' + oldAssignedToTitle + '</option>';
|
||||
$('#assignedTo_chosen').remove();
|
||||
$('#assignedTo').next('.picker').remove();
|
||||
$('#assignedTo').replaceWith(data);
|
||||
var defaultAssignedTo = $('#assignedTo').val();
|
||||
if(defaultAssignedTo !== oldAssignedTo && selectedUser == '') $('#assignedTo').append(defaultOption);
|
||||
$('#assignedTo').chosen();
|
||||
});
|
||||
}
|
||||
@@ -474,7 +496,8 @@ function notice()
|
||||
if(typeof(branch) == 'undefined') branch = 0;
|
||||
var link = createLink('release', 'create', 'productID=' + $('#product').val() + '&branch=' + branch);
|
||||
if(typeof(flow) != 'undefined' && flow == 'onlyTest') link = createLink('build', 'create','projectID=' + $('#product').val());
|
||||
html += '<a href="' + link + '" target="_blank" style="padding-right:5px">' + createBuild + '</a> ';
|
||||
link += config.requestType == 'GET' ? '&onlybody=yes' : '?onlybody=yes';
|
||||
html += '<a href="' + link + '" data-toggle="modal" data-type="iframe" style="padding-right:5px">' + createBuild + '</a> ';
|
||||
html += '<a href="javascript:loadProductBuilds(' + $('#product').val() + ')">' + refresh + '</a>';
|
||||
}
|
||||
else
|
||||
|
||||
+19
-1
@@ -59,7 +59,25 @@ function setAssignedTo(moduleID, productID)
|
||||
var link = createLink('bug', 'ajaxGetModuleOwner', 'moduleID=' + moduleID + '&productID=' + productID);
|
||||
$.get(link, function(owner)
|
||||
{
|
||||
$('#assignedTo').val(owner);
|
||||
owner = JSON.parse(owner);
|
||||
var account = owner[0];
|
||||
var realName = owner[1];
|
||||
var isExist = false;
|
||||
var count = $('#assignedTo').find('option').length;
|
||||
for(var i=0; i < count; i++)
|
||||
{
|
||||
if($('#assignedTo').get(0).options[i].value == account)
|
||||
{
|
||||
isExist = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(!isExist && account)
|
||||
{
|
||||
option = "<option title='" + realName + "' value='" + account + "'>" + realName + "</option>";
|
||||
$("#assignedTo").append(option);
|
||||
}
|
||||
$('#assignedTo').val(account);
|
||||
$("#assignedTo").trigger("chosen:updated");
|
||||
});
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user