Skip to content

Commit

Permalink
更新到11.6.3
Browse files Browse the repository at this point in the history
  • Loading branch information
wenchaojun committed Oct 12, 2019
1 parent 20f474b commit 094aebe
Show file tree
Hide file tree
Showing 1,368 changed files with 79,279 additions and 53,625 deletions.
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
11.4.stable
11.6.3
42 changes: 41 additions & 1 deletion bin/init.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ if %requestType% == 'PATH_INFO' (
echo %syncsvn% > %baseDir%syncsvn.bat
echo syncsvn.bat ok

:: create syncgit.bat
:: create syncgit.bat.
if %requestType% == 'PATH_INFO' (
SET syncgit= %phpcli% %baseDir%ztcli "%pmsRoot%/git-run"
)else (
Expand All @@ -92,6 +92,42 @@ if %requestType% == 'PATH_INFO' (
echo %syncgit% > %baseDir%syncgit.bat
echo syncgit.bat ok

:: async send mail.
if %requestType% == 'PATH_INFO' (
SET sendmail= %phpcli% %baseDir%ztcli "%pmsRoot%/mail-asyncSend"
)else (
SET sendmail= %phpcli% %baseDir%ztcli "%pmsRoot%/index.php?m=mail&f=asyncSend"
)
echo %sendmail% > %baseDir%sendmail.bat
echo sendmail.bat ok

:: async send webhook.
if %requestType% == 'PATH_INFO' (
SET sendwebhook= %phpcli% %baseDir%ztcli "%pmsRoot%/webhook-asyncSend"
)else (
SET sendwebhook= %phpcli% %baseDir%ztcli "%pmsRoot%/index.php?m=webhook&f=asyncSend"
)
echo %sendwebhook% > %baseDir%sendwebhook.bat
echo sendwebhook.bat ok

:: create cycle todo.
if %requestType% == 'PATH_INFO' (
SET createcycle= %phpcli% %baseDir%ztcli "%pmsRoot%/todo-createCycle"
)else (
SET createcycle= %phpcli% %baseDir%ztcli "%pmsRoot%/index.php?m=todo&f=createCycle"
)
echo %createcycle% > %baseDir%createcycle.bat
echo createcycle.bat ok

:: delete log.
if %requestType% == 'PATH_INFO' (
SET deletelog= %phpcli% %baseDir%ztcli "%pmsRoot%/admin-deleteLog"
)else (
SET deletelog= %phpcli% %baseDir%ztcli "%pmsRoot%/index.php?m=admin&f=deleteLog"
)
echo %deletelog% > %baseDir%deletelog.bat
echo deletelog.bat ok

:: create crond.bat
SET cron= %phpcli% %baseDir%php\crond.php
echo %cron% > %baseDir%crond.bat
Expand All @@ -106,6 +142,10 @@ echo 1 1 * * * %baseDir%backup.bat # backup database an
echo 1 23 * * * %baseDir%computeburn.bat # compute burndown chart. >> %sysCron%
echo 1-59/2 * * * * %baseDir%syncsvn.bat # sync subversion. >> %sysCron%
echo 1-59/2 * * * * %baseDir%syncgit.bat # sync git. >> %sysCron%
echo 1-59/5 * * * * %baseDir%sendmail.bat # async send mail. >> %sysCron%
echo 1-59/5 * * * * %baseDir%sendwebhook.bat # async send webhook. >> %sysCron%
echo 1 1 * * * %baseDir%createcycle.bat # create cycle todo. >> %sysCron%
echo 30 1 * * * %baseDir%deletelog.bat # delete log. >> %sysCron%

:: return 0 when success.
exit /b 0
42 changes: 41 additions & 1 deletion bin/init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,42 @@ fi
echo $syncgit > $basePath/syncgit.sh
echo "syncgit.sh ok"

# async send mail.
if [ $requestType == 'PATH_INFO' ]; then
mailsend="$phpcli $basePath/ztcli '$pmsRoot/mail-asyncSend'";
else
mailsend="$phpcli $basePath/ztcli '$pmsRoot/index.php?m=mail&f=asyncSend'";
fi
echo $mailsend > $basePath/sendmail.sh
echo "sendmail.sh ok"

# async send webhook.
if [ $requestType == 'PATH_INFO' ]; then
sendwebhook="$phpcli $basePath/ztcli '$pmsRoot/webhook-asyncSend'";
else
sendwebhook="$phpcli $basePath/ztcli '$pmsRoot/index.php?m=webhook&f=asyncSend'";
fi
echo $sendwebhook > $basePath/sendwebhook.sh
echo "sendwebhook.sh ok"

# create cycle todo.
if [ $requestType == 'PATH_INFO' ]; then
createcycle="$phpcli $basePath/ztcli '$pmsRoot/todo-createCycle'";
else
createcycle="$phpcli $basePath/ztcli '$pmsRoot/index.php?m=todo&f=createCycle'";
fi
echo $createcycle > $basePath/createcycle.sh
echo "createcycle.sh ok"

# delete log.
if [ $requestType == 'PATH_INFO' ]; then
deletelog="$phpcli $basePath/ztcli '$pmsRoot/admin-deleteLog'";
else
deletelog="$phpcli $basePath/ztcli '$pmsRoot/index.php?m=admin&f=deleteLog'";
fi
echo $deletelog > $basePath/deletelog.sh
echo "deletelog.sh ok"

# cron
if [ ! -d "$basePath/cron" ]; then
mkdir $basePath/cron
Expand All @@ -105,7 +141,11 @@ echo "0 1 * * * $basePath/dailyreminder.sh # dailyreminder."
echo "1 1 * * * $basePath/backup.sh # backup database and file." >> $basePath/cron/sys.cron
echo "1 23 * * * $basePath/computeburn.sh # compute burndown chart." >> $basePath/cron/sys.cron
echo "1-59/2 * * * * $basePath/syncsvn.sh # sync subversion." >> $basePath/cron/sys.cron
echo "1-59/2 * * * * $basePath/syncgit.sh # sync git" >> $basePath/cron/sys.cron
echo "1-59/2 * * * * $basePath/syncgit.sh # sync git." >> $basePath/cron/sys.cron
echo "1-59/5 * * * * $basePath/sendmail.sh # async send mail." >> $basePath/cron/sys.cron
echo "1-59/5 * * * * $basePath/sendwebhook.sh # async send webhook." >> $basePath/cron/sys.cron
echo "1 1 * * * $basePath/createcycle.sh # create cycle todo." >> $basePath/cron/sys.cron
echo "30 1 * * * $basePath/deletelog.sh # delete log." >> $basePath/cron/sys.cron
cron="$phpcli $basePath/php/crond.php"
echo $cron > $basePath/cron.sh
echo "cron.sh ok"
Expand Down
3 changes: 2 additions & 1 deletion config/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
if(!function_exists('getWebRoot')){function getWebRoot(){}}

/* 基本设置。Basic settings. */
$config->version = '11.4'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->version = '11.6.3'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
$config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time.
$config->timezone = 'Asia/Shanghai'; // 时区设置。 The time zone setting, for more see http://www.php.net/manual/en/timezones.php.
Expand All @@ -36,6 +36,7 @@
$config->langs['zh-cn'] = '简体';
$config->langs['zh-tw'] = '繁體';
$config->langs['en'] = 'English';
$config->langs['de'] = 'Deutsch';

/* 设备类型视图文件前缀。The prefix for view file for different device. */
$config->devicePrefix['mhtml'] = '';
Expand Down
61 changes: 33 additions & 28 deletions config/ext/xuanxuan.php
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,49 @@
<?php
$config->xuanxuan = new stdclass();
$config->xuanxuan->version = '2.4.0';
$config->xuanxuan->xxbLang = 'zh-cn';
$config->xuanxuan->key = ''; //Set a 32 byte string as your key.
$config->xuanxuan->version = '2.5.7';
$config->xuanxuan->backend = 'zentao';
$config->xuanxuan->backendLang = 'zh-cn';
$config->xuanxuan->key = ''; //Set a 32 byte string as your key.

$config->xxd = new stdclass();

if(!defined('TABLE_IM_CHAT')) define('TABLE_IM_CHAT', '`' . $config->db->prefix . 'im_chat`');
if(!defined('TABLE_IM_MESSAGE')) define('TABLE_IM_MESSAGE', '`' . $config->db->prefix . 'im_message`');
if(!defined('TABLE_IM_CHATUSER')) define('TABLE_IM_CHATUSER', '`' . $config->db->prefix . 'im_chatuser`');
if(!defined('TABLE_IM_CLIENT')) define('TABLE_IM_CLIENT', '`' . $config->db->prefix . 'im_client`');
if(!defined('TABLE_IM_MESSAGE')) define('TABLE_IM_MESSAGE', '`' . $config->db->prefix . 'im_message`');
if(!defined('TABLE_IM_MESSAGESTATUS')) define('TABLE_IM_MESSAGESTATUS', '`' . $config->db->prefix . 'im_messagestatus`');

$config->xuanxuan->enabledMethods['chat']['serverstart'] = 'serverStart';
$config->xuanxuan->enabledMethods['chat']['addmember'] = 'addMember';
$config->xuanxuan->enabledMethods['chat']['category'] = 'category';
$config->xuanxuan->enabledMethods['chat']['changename'] = 'changeName';
$config->xuanxuan->enabledMethods['chat']['changepublic'] = 'changePublic';
$config->xuanxuan->enabledMethods['chat']['checkuserchange'] = 'checkUserChange';
$config->xuanxuan->enabledMethods['chat']['create'] = 'create';
$config->xuanxuan->enabledMethods['chat']['dismiss'] = 'dismiss';
$config->xuanxuan->enabledMethods['chat']['extensions'] = 'extensions';
$config->xuanxuan->enabledMethods['chat']['getlist'] = 'getList';
$config->xuanxuan->enabledMethods['chat']['getofflinemessages'] = 'getOfflineMessages';
$config->xuanxuan->enabledMethods['chat']['getofflinenotify'] = 'getofflinenotify';
$config->xuanxuan->enabledMethods['chat']['getpubliclist'] = 'getPublicList';
$config->xuanxuan->enabledMethods['chat']['gettodoes'] = 'getTodoes';
$config->xuanxuan->enabledMethods['chat']['hide'] = 'hide';
$config->xuanxuan->enabledMethods['chat']['history'] = 'history';
$config->xuanxuan->enabledMethods['chat']['joinchat'] = 'joinChat';
$config->xuanxuan->enabledMethods['chat']['login'] = 'login';
$config->xuanxuan->enabledMethods['chat']['logout'] = 'logout';
$config->xuanxuan->enabledMethods['chat']['usergetlist'] = 'userGetList';
$config->xuanxuan->enabledMethods['chat']['userchange'] = 'userChange';
$config->xuanxuan->enabledMethods['chat']['ping'] = 'ping';
$config->xuanxuan->enabledMethods['chat']['getpubliclist'] = 'getPublicList';
$config->xuanxuan->enabledMethods['chat']['getlist'] = 'getList';
$config->xuanxuan->enabledMethods['chat']['members'] = 'members';
$config->xuanxuan->enabledMethods['chat']['getofflinemessages'] = 'getOfflineMessages';
$config->xuanxuan->enabledMethods['chat']['create'] = 'create';
$config->xuanxuan->enabledMethods['chat']['message'] = 'message';
$config->xuanxuan->enabledMethods['chat']['mute'] = 'mute';
$config->xuanxuan->enabledMethods['chat']['notify'] = 'notify';
$config->xuanxuan->enabledMethods['chat']['ping'] = 'ping';
$config->xuanxuan->enabledMethods['chat']['serverstart'] = 'serverStart';
$config->xuanxuan->enabledMethods['chat']['setadmin'] = 'setAdmin';
$config->xuanxuan->enabledMethods['chat']['joinchat'] = 'joinChat';
$config->xuanxuan->enabledMethods['chat']['changename'] = 'changeName';
$config->xuanxuan->enabledMethods['chat']['dismiss'] = 'dismiss';
$config->xuanxuan->enabledMethods['chat']['setcommitters'] = 'setCommitters';
$config->xuanxuan->enabledMethods['chat']['changepublic'] = 'changePublic';
$config->xuanxuan->enabledMethods['chat']['star'] = 'star';
$config->xuanxuan->enabledMethods['chat']['hide'] = 'hide';
$config->xuanxuan->enabledMethods['chat']['mute'] = 'mute';
$config->xuanxuan->enabledMethods['chat']['category'] = 'category';
$config->xuanxuan->enabledMethods['chat']['addmember'] = 'addMember';
$config->xuanxuan->enabledMethods['chat']['message'] = 'message';
$config->xuanxuan->enabledMethods['chat']['history'] = 'history';
$config->xuanxuan->enabledMethods['chat']['settings'] = 'settings';
$config->xuanxuan->enabledMethods['chat']['star'] = 'star';
$config->xuanxuan->enabledMethods['chat']['updatelastpoll'] = 'updateLastPoll';
$config->xuanxuan->enabledMethods['chat']['uploadfile'] = 'uploadFile';
$config->xuanxuan->enabledMethods['chat']['getofflinenotify'] = 'getofflinenotify';
$config->xuanxuan->enabledMethods['chat']['notify'] = 'notify';
$config->xuanxuan->enabledMethods['chat']['upserttodo'] = 'upsertTodo';
$config->xuanxuan->enabledMethods['chat']['gettodoes'] = 'getTodoes';
$config->xuanxuan->enabledMethods['chat']['checkuserchange'] = 'checkUserChange';
$config->xuanxuan->enabledMethods['chat']['extensions'] = 'extensions';
$config->xuanxuan->enabledMethods['chat']['userchange'] = 'userChange';
$config->xuanxuan->enabledMethods['chat']['usergetlist'] = 'userGetList';
$config->xuanxuan->enabledMethods['entry']['visit'] = 'visit';
7 changes: 7 additions & 0 deletions config/filter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
$filter->user = new stdclass();
$filter->block = new stdclass();
$filter->file = new stdclass();
$filter->translate = new stdclass();

$filter->block->default = new stdclass();
$filter->block->main = new stdclass();
Expand Down Expand Up @@ -120,6 +121,10 @@

$filter->project->default->cookie['lastProject'] = 'int';
$filter->project->default->cookie['projectMode'] = 'code';
$filter->project->story->cookie['storyModuleParam'] = 'int';
$filter->project->story->cookie['storyPreProjectID'] = 'int';
$filter->project->story->cookie['storyProductParam'] = 'int';
$filter->project->story->cookie['storyBranchParam'] = 'reg::checked';
$filter->project->story->cookie['projectStoryOrder'] = 'reg::orderBy';
$filter->project->task->cookie['moduleBrowseParam'] = 'int';
$filter->project->task->cookie['preProjectID'] = 'int';
Expand Down Expand Up @@ -210,3 +215,5 @@
$filter->git->diff->get['repoUrl'] = 'reg::base64';
$filter->svn->cat->get['repoUrl'] = 'reg::base64';
$filter->svn->diff->get['repoUrl'] = 'reg::base64';

$filter->translate->module->cookie['translateView'] = 'equal::split';
7 changes: 7 additions & 0 deletions config/zentaopms.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
$config->productCommonList['zh-tw'][1] = '項目';
$config->projectCommonList['zh-tw'][0] = '項目';
$config->projectCommonList['zh-tw'][1] = '迭代';
$config->productCommonList['de'][0] = 'Produkt';
$config->productCommonList['de'][1] = 'Projekt';
$config->projectCommonList['de'][0] = 'Projekt';
$config->projectCommonList['de'][1] = 'Iteration';

/* Supported charsets. */
$config->charsets['zh-cn']['utf-8'] = 'UTF-8';
Expand All @@ -44,6 +48,8 @@
$config->charsets['zh-tw']['big5'] = 'BIG5';
$config->charsets['en']['utf-8'] = 'UTF-8';
$config->charsets['en']['GBK'] = 'GBK';
$config->charsets['de']['utf-8'] = 'UTF-8';
$config->charsets['de']['GBK'] = 'GBK';

/* IP white list settings.*/
$config->ipWhiteList = '*';
Expand Down Expand Up @@ -107,6 +113,7 @@
define('TABLE_LOG', '`' . $config->db->prefix . 'log`');
define('TABLE_SCORE', '`' . $config->db->prefix . 'score`');
define('TABLE_NOTIFY', '`' . $config->db->prefix . 'notify`');
define('TABLE_TRANSLATION', '`' . $config->db->prefix . 'translation`');
if(!defined('TABLE_LANG')) define('TABLE_LANG', '`' . $config->db->prefix . 'lang`');

$config->objectTables['product'] = TABLE_PRODUCT;
Expand Down
73 changes: 0 additions & 73 deletions db/standard/zentao10.2.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -943,76 +943,3 @@ CREATE TABLE `zt_score` (
KEY `model` (`module`),
KEY `method` (`method`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;

-- DROP TABLE IF EXISTS `zt_im_chat`;
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;

-- DROP TABLE IF EXISTS `zt_im_message`;
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;

-- DROP TABLE IF EXISTS `zt_im_chatuser`;
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;

-- DROP TABLE IF EXISTS `zt_im_messagestatus`;
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;
Loading

0 comments on commit 094aebe

Please sign in to comment.