Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

+ tag of 3.3.

Browse Source
This commit is contained in:
wangchunsheng
2012-09-03 05:49:47 +00:00
parent cbc9dbd8af 1621d6c5e1
commit 5c4c146bac
17 changed files with 185 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
build/windows/xampp/build.php
View File

@@ -238,14 +238,16 @@ $file->batchRemoveFile('./xampp/php/phpunit');
$file->batchRemoveFile('./xampp/php/phpunit');
$file->batchRemoveFile('./xampp/php/*.php');
$file->rename('./xampp/php/php5apache2_2.dll', './xampp/php/php5apache2_2.bak');
$file->rename('./xampp/php/php5apache2_2.dll', './xampp/php/php5apache2_2.bak');
$file->rename('./xampp/php/php5ts.dll', './xampp/php/php5ts.bak');
$file->rename('./xampp/php/ssleay32.dll', './xampp/php/ssleay32.dll.bak');
$file->rename('./xampp/php/libeay32.dll', './xampp/php/libeay32.dll.bak');
$file->rename('./xampp/php/libsasl.dll', './xampp/php/libsasl.dll.bak');
$file->batchRemoveFile('./xampp/php/*.dll');
$file->rename('./xampp/php/php5apache2_2.bak', './xampp/php/php5apache2_2.dll');
$file->rename('./xampp/php/php5ts.bak', './xampp/php/php5ts.dll');
$file->rename('./xampp/php/ssleay32.dll.bak', './xampp/php/ssleay32.dll');
$file->rename('./xampp/php/libeay32.dll.bak', './xampp/php/libeay32.dll');
$file->rename('./xampp/php/libsasl.dll.bak', './xampp/apache/bin/libsasl.dll');
/* Process php ini file. */
@@ -256,7 +258,7 @@ $phpConfig = str_replace('extension=php_pdo_odbc.dll',';extension=php_pdo_odbc.d
$phpConfig = str_replace('extension=php_pdo_odbc.dll',';extension=php_pdo_odbc.dll', $phpConfig);
$phpConfig = str_replace('extension=php_pdo_sqlite.dll',';extension=php_pdo_sqlite.dll', $phpConfig);
$phpConfig = str_replace('extension=php_soap.dll',';extension=php_soap.dll', $phpConfig);
$phpConfig = str_replace('extension=php_sqlite.dll',';extension=php_sqlite.dll', $phpConfig);
$phpConfig = str_replace('extension=php_sqlite.dll',';extension=php_sqlite.dll', $phpConfig);
$phpConfig = str_replace('extension=php_sqlite3.dll','extension=php_ldap.dll', $phpConfig); // load ldap extension.
$phpConfig = str_replace('extension=php_xmlrpc.dll','extension=php_openssl.dll', $phpConfig); // load openssl extension.
@@ -287,15 +289,16 @@ file_put_contents('./xampp/php/php.ini', str_replace(' ', '', $phpConfig));
', '', $phpConfig));
/* Process php's ext directory. */
$file->rename('./xampp/php/ext', './xampp/php/extold');
$file->mkdir('./xampp/php/ext');
$file->copyFile('./xampp/php/extold/php_bz2.dll', './xampp/php/ext/php_bz2.dll');
$file->copyFile('./xampp/php/extold/php_gd2.dll', './xampp/php/ext/php_gd2.dll');
$file->copyFile('./xampp/php/extold/php_imap.dll', './xampp/php/ext/php_imap.dll');
$file->copyFile('./xampp/php/extold/php_mbstring.dll', './xampp/php/ext/php_mbstring.dll');
$file->copyFile('./xampp/php/extold/php_mysql.dll', './xampp/php/ext/php_mysql.dll');
$file->copyFile('./xampp/php/extold/php_mysqli.dll', './xampp/php/ext/php_mysqli.dll');
$file->copyFile('./xampp/php/extold/php_pdo_mysql.dll', './xampp/php/ext/php_pdo_mysql.dll');
$file->rename('./xampp/php/ext', './xampp/php/extold');
$file->mkdir('./xampp/php/ext');
$file->copyFile('./xampp/php/extold/php_bz2.dll', './xampp/php/ext/php_bz2.dll');
$file->copyFile('./xampp/php/extold/php_gd2.dll', './xampp/php/ext/php_gd2.dll');
$file->copyFile('./xampp/php/extold/php_imap.dll', './xampp/php/ext/php_imap.dll');
$file->copyFile('./xampp/php/extold/php_mbstring.dll', './xampp/php/ext/php_mbstring.dll');
$file->copyFile('./xampp/php/extold/php_mysql.dll', './xampp/php/ext/php_mysql.dll');
$file->copyFile('./xampp/php/extold/php_mysqli.dll', './xampp/php/ext/php_mysqli.dll');
$file->copyFile('./xampp/php/extold/php_pdo_mysql.dll', './xampp/php/ext/php_pdo_mysql.dll');
$file->copyFile('./xampp/php/extold/php_sockets.dll', './xampp/php/ext/php_sockets.dll');
$file->copyFile('./xampp/php/extold/php_openssl.dll', './xampp/php/ext/php_openssl.dll');
$file->copyFile('./xampp/php/extold/php_ldap.dll', './xampp/php/ext/php_ldap.dll');
$file->removeDir('./xampp/php/extold');
@@ -325,7 +328,7 @@ $file->copyFile($buildDir . '/ioncube_loader_win_5.3.dll', './xampp/php/ext/ionc
/* Copy serive bat file. */
$file->copyFile($buildDir . '/apache_installservice.bat', './xampp/apache_installservice.bat');
$file->copyFile($buildDir . '/apache_uninstallservice.bat', './xampp/apache_uninstallservice.bat');
$file->copyFile($buildDir . '/apache_uninstallservice.bat', './xampp/apache_uninstallservice.bat');
$file->copyFile($buildDir . '/mysql_installservice.bat', './xampp/mysql_installservice.bat');
$file->copyFile($buildDir . '/mysql_uninstallservice.bat', './xampp/mysql_uninstallservice.bat');

2
config/config.php
View File

@@ -12,7 +12,7 @@
* @link http://www.zentao.net
*/
/* Basic settings. */
$config->version = '3.3.stable'; // The version of zentaopms. Don't change it.
$config->version = '3.3'; // The version of zentaopms. Don't change it.
$config->encoding = 'UTF-8'; // The encoding of zentaopms.
$config->cookieLife = time() + 2592000; // The cookie life time.
$config->timezone = 'Asia/Shanghai'; // The time zone setting, for more see http://www.php.net/manual/en/timezones.php

103
db/update1.1.sql
View File

@@ -1,48 +1,55 @@
ALTER TABLE `zt_effort` ADD `consumed` FLOAT NOT NULL AFTER `date`;
INSERT INTO `zt_groupPriv` (`company`, `group`, `module`, `method`) VALUES
(1, 1, 'company', 'effort'),
(1, 2, 'company', 'effort'),
(1, 3, 'company', 'effort'),
(1, 4, 'company', 'effort'),
(1, 5, 'company', 'effort'),
(1, 1, 'effort', 'export'),
(1, 2, 'effort', 'export'),
(1, 3, 'effort', 'export'),
(1, 4, 'effort', 'export'),
(1, 5, 'effort', 'export'),
(1, 1, 'effort', 'view'),
(1, 2, 'effort', 'view'),
(1, 3, 'effort', 'view'),
(1, 4, 'effort', 'view'),
(1, 5, 'effort', 'view'),
(1, 1, 'effort', 'edit'),
(1, 2, 'effort', 'edit'),
(1, 3, 'effort', 'edit'),
(1, 4, 'effort', 'edit'),
(1, 5, 'effort', 'edit'),
(1, 1, 'effort', 'batchCreate'),
(1, 2, 'effort', 'batchCreate'),
(1, 3, 'effort', 'batchCreate'),
(1, 4, 'effort', 'batchCreate'),
(1, 5, 'effort', 'batchCreate'),
(1, 1, 'effort', 'delete'),
(1, 2, 'effort', 'delete'),
(1, 3, 'effort', 'delete'),
(1, 4, 'effort', 'delete'),
(1, 5, 'effort', 'delete'),
(1, 1, 'effort', 'createForObject'),
(1, 2, 'effort', 'createForObject'),
(1, 3, 'effort', 'createForObject'),
(1, 4, 'effort', 'createForObject'),
(1, 5, 'effort', 'createForObject'),
(1, 1, 'my', 'effort'),
(1, 2, 'my', 'effort'),
(1, 3, 'my', 'effort'),
(1, 4, 'my', 'effort'),
(1, 5, 'my', 'effort'),
(1, 1, 'project', 'effort'),
(1, 2, 'project', 'effort'),
(1, 3, 'project', 'effort'),
(1, 4, 'project', 'effort'),
(1, 5, 'project', 'effort'),
(1, 1, 'user', 'effort');
-- doc
CREATE TABLE IF NOT EXISTS `zt_doc` (
`id` mediumint(8) unsigned NOT NULL auto_increment,
`company` smallint(5) unsigned NOT NULL,
`product` mediumint(8) unsigned NOT NULL,
`project` mediumint(8) unsigned NOT NULL,
`lib` varchar(30) NOT NULL,
`module` varchar(30) NOT NULL,
`title` varchar(120) NOT NULL,
`digest` varchar(255) NOT NULL,
`type` varchar(30) NOT NULL,
`content` text NOT NULL,
`url` varchar(255) NOT NULL,
`views` smallint(5) unsigned NOT NULL,
`addedBy` varchar(30) NOT NULL,
`addedDate` datetime NOT NULL,
`editedBy` varchar(30) NOT NULL,
`editedDate` datetime NOT NULL,
`deleted` enum('0','1') NOT NULL default '0',
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- doc lib
CREATE TABLE IF NOT EXISTS `zt_docLib` (
`id` smallint(5) unsigned NOT NULL auto_increment,
`company` smallint(5) unsigned NOT NULL,
`name` varchar(60) NOT NULL,
`deleted` enum('0','1') NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
KEY `company` (`company`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- module
ALTER TABLE `zt_module` CHANGE `product` `root` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `zt_module` CHANGE `view` `type` CHAR( 30 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
ALTER TABLE `zt_module` ADD `owner` VARCHAR( 30 ) NOT NULL ;
update zt_module set `type` = 'story' where `type` = 'product';
-- tpl
CREATE TABLE IF NOT EXISTS `zt_userTPL` (
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
`company` mediumint(8) unsigned NOT NULL,
`account` char(30) NOT NULL,
`type` char(30) NOT NULL,
`title` varchar(150) NOT NULL,
`content` text NOT NULL,
PRIMARY KEY (`id`),
KEY `company` (`company`),
KEY `account` (`account`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- product acl
ALTER TABLE `zt_product` ADD `acl` ENUM( 'open', 'private', 'custom' ) NOT NULL DEFAULT 'open' AFTER `desc` ,
ADD `whitelist` VARCHAR( 255 ) NOT NULL AFTER `acl` ;
-- product owner.
ALTER TABLE `zt_product` ADD `productOwner` VARCHAR( 30 ) NOT NULL AFTER `desc` ,
ADD `bugOwner` VARCHAR( 30 ) NOT NULL AFTER `productOwner` ;

0
db/update3.2.sql Executable file
View File

53
doc/CHANGELOG
View File

@@ -1,3 +1,56 @@
2012-9-3 3.3发布
需求：
447 完善详情页面的标题处理
541 优化sql查询
544 创建发布的时候，build可以为空
555 用户可以自动添加附件上传框
691 优化前端性能
692 压缩css，js文件
693 合并样式表中用到的图片文件
711 安装禅道的时候，提供语言的选择
712 在生成model的缓存文件的时候，判断tmp/model是否存在可写
715 导入任务的时候，增加对项目的筛选
719 调整权限分组的用户管理，以适应用户很多的情况
747 调整变更需求时影响范围的排版
749 调整组织视图用户todo的界面
751 添加todo的时候，增加对暂不指定的处理
752 featurebar的字体还是调成大字体
753 调整图标样式
754 调整产品下拉菜单
755 批量添加todo的时候，自动计算时间间隔
756 调整批量添加todo时候日期选择框的样式
757 当图片太大的时候，自动增加链接，点击可以查看完整尺寸的图
760 调整附件下载代码的逻辑
761 如果没有扩展名的附件，不要增加扩展名
763 处理完善测试数据的权限
安装的时候改为检查数据表是否存在。
优化性能
调整组织视图用户todo页面。
汉化ioncube load wizard.
调整todo的批量添加批量编辑页面。
调整任务的批量添加和批量编辑页面。
重新组织项目视图的菜单列表。
调整统计报表页面的内容和样式。
bug:
345 计划的开始和结束日期没有比较
344 删除用户后，权限分组页面仍可分配权限
343 项目创建项目起止时间会有提示“请填写合法的日期”
339 testtask模块create.html.php没有考虑值为空的情况
338 testcase模块的create.html.php错误
337 批量添加todo之后跳转的页面参数不对
336 选中某一个模块之后，点击创建bug链接，没有把模块字段带过来
334 批量添加todo的时候，todo标签没有高亮
333 report模块的model.php的getProject函数没有考虑值为空的情况
321 统计视图版面乱码
317 添加项目出现是否停止运行此脚本的对话框
315 在IE8下编辑bug时，选择所属项目后，影响版本列表没有反应。
307 测试用例列表，用例标题没有悬停提示完整标题的功能。
2012-7-16 3.2.1 发布
调整:

2
module/group/lang/en.php
View File

@@ -40,7 +40,7 @@ $lang->group->copyOptions['copyPriv'] = 'Copy priviledge';
$lang->group->copyOptions['copyUser'] = 'Copy user';
$lang->group->versions[''] = 'Show methods added in every release';
$lang->group->versions['3.3.stable']= '3.3.stable';
$lang->group->versions['3.3'] = '3.3';
$lang->group->versions['3.2.1'] = '3.2.1';
$lang->group->versions['3.2'] = '3.2';
$lang->group->versions['3.1'] = '3.1';

2
module/group/lang/resource.php
View File

@@ -682,4 +682,4 @@ $lang->changelog['3.2'][] = 'report-bugSummary';
$lang->changelog['3.2'][] = 'report-workload';
$lang->changelog['3.2'][] = 'tree-fix';
$lang->changelog['3.3.stable'][] = 'report-bugAssign';
$lang->changelog['3.3'][] = 'report-bugAssign';

2
module/group/lang/zh-cn.php
View File

@@ -40,7 +40,7 @@ $lang->group->copyOptions['copyPriv'] = '复制权限';
$lang->group->copyOptions['copyUser'] = '复制用户';
$lang->group->versions[''] = '显示各版本新增权限';
$lang->group->versions['3.3.stable']= '禅道3.3.stable';
$lang->group->versions['3.3'] = '禅道3.3';
$lang->group->versions['3.2.1'] = '禅道3.2.1';
$lang->group->versions['3.2'] = '禅道3.2';
$lang->group->versions['3.1'] = '禅道3.1';

4
module/group/lang/zh-tw.php
View File

@@ -6,7 +6,7 @@
* @license LGPL (http://www.gnu.org/licenses/lgpl.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package group
* @version $Id: zh-tw.php 3347 2012-07-16 01:58:48Z shiyangyangwork@yahoo.cn $
* @version $Id: zh-tw.php 3492 2012-09-02 07:44:37Z shiyangyangwork@yahoo.cn $
* @link http://www.zentao.net
*/
$lang->group->common = '權限分組';
@@ -40,7 +40,7 @@ $lang->group->copyOptions['copyPriv'] = '複製權限';
$lang->group->copyOptions['copyUser'] = '複製用戶';
$lang->group->versions[''] = '顯示各版本新增權限';
$lang->group->versions['3.3.stable']= '禪道3.3.stable';
$lang->group->versions['3.3'] = '禪道3.3';
$lang->group->versions['3.2.1'] = '禪道3.2.1';
$lang->group->versions['3.2'] = '禪道3.2';
$lang->group->versions['3.1'] = '禪道3.1';

3
module/story/config.php
View File

@@ -1,5 +1,6 @@
<?php
$config->story->batchCreate = 10;
$config->story->batchCreate = 10;
$config->story->affectedFixedNum = 7;
$config->story->create->requiredFields = 'title';
$config->story->edit->requiredFields = 'title';
$config->story->change->requiredFields = 'title';

2
module/story/css/change.css Normal file
View File

@@ -0,0 +1,2 @@
.headerTable {border-bottom:none; margin-bottom:0px}
.contentTable {border-top:none}

37
module/story/view/affected.html.php
View File

@@ -1,7 +1,6 @@
<div style='<?php if(count($story->projects)==0) echo "display:none";?>'>
<table class='table-1 mt-10px'>
<caption><?php echo $lang->story->affectedProjects;?></caption>
<?php foreach($story->projects as $projectID => $project):?>
<tr>
<td class='a-center'><?php echo "<strong>$project->name</strong><br />"; ?> </td>
@@ -18,7 +17,7 @@
</tr>
</table>
<?php if(isset($story->tasks[$projectID])):?>
<div class='<?php if(count($story->tasks[$projectID]) > 5) echo "linkbox";?>'>
<div class='<?php if(count($story->tasks[$projectID]) > $config->story->affectedFixedNum) echo "linkbox";?>'>
<table class='table-1'>
<?php foreach($story->tasks[$projectID] as $task):?>
<tr class='a-center'>
@@ -38,22 +37,23 @@
<?php endforeach;?>
</table>
</div>
<div style='<?php if(count($story->bugs)==0) echo "display:none";?>'>
<table class='table-1'>
<table class='table-1 headerTable'>
<caption><?php echo $lang->story->affectedBugs;?></caption>
<tr>
<th class='w-p10'><?php echo $lang->bug->id;?></th>
<th class='w-p40'><?php echo $lang->bug->title;?></th>
<th class='w-p10'><?php echo $lang->bug->status;?></th>
<th class='w-p10'><?php echo $lang->bug->openedBy;?></th>
<th><?php echo $lang->bug->resolvedBy;?></th>
<th><?php echo $lang->bug->resolution;?></th>
<th><?php echo $lang->bug->lastEditedBy;?></th>
</tr>
<tr>
<th class='w-p10'><?php echo $lang->bug->id;?></th>
<th class='w-p40'><?php echo $lang->bug->title;?></th>
<th class='w-p10'><?php echo $lang->bug->status;?></th>
<th class='w-p10'><?php echo $lang->bug->openedBy;?></th>
<th><?php echo $lang->bug->resolvedBy;?></th>
<th><?php echo $lang->bug->resolution;?></th>
<th><?php echo $lang->bug->lastEditedBy;?></th>
</tr>
</table>
<div class= '<?php if(count($story->bugs) > 7) echo "linkbox";?>'>
<table class='table-1'>
<?php foreach($story->bugs as $bug):?>
<div class= '<?php if(count($story->bugs) > $config->story->affectedFixedNum) echo "linkbox";?>'>
<table class='table-1 contentTable'>
<?php foreach($story->bugs as $bug):?>
<tr class='a-center'>
<td class='w-p10'><?php echo $bug->id;?></td>
<td class='w-p40'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '_blank');?></td>
@@ -67,8 +67,9 @@
</table>
</div>
</div>
<div style='<?php if(count($story->cases)==0) echo "display:none";?>'>
<table class='table-1'>
<table class='table-1 headerTable'>
<caption><?php echo $lang->story->affectedCases;?></caption>
<tr>
<th class='w-p10'><?php echo $lang->testcase->id;?></th>
@@ -78,8 +79,8 @@
<th><?php echo $lang->testcase->lastEditedBy;?></th>
</tr>
</table>
<div class='<?php if(count($story->cases) > 7) echo "linkbox";?>'>
<table class='table-1'>
<div class='<?php if(count($story->cases) > $config->story->affectedFixedNum) echo "linkbox";?>'>
<table class='table-1 contentTable'>
<?php foreach($story->cases as $case):?>
<tr class='a-center'>
<td class='w-p10'><?php echo $case->id;?></td>

3
module/task/model.php
View File

@@ -90,9 +90,10 @@ class taskModel extends model
{
$now = helper::now();
$tasks = fixer::input('post')->get();
$mails = array();
for($i = 0; $i < $this->config->task->batchCreate; $i++)
{
if($tasks->type[$i] != '' and $tasks->name[$i] != '' and $tasks->pri[$i] != 0 and $tasks->estimate[$i] != '')
if($tasks->type[$i] != '' and $tasks->name[$i] != '' and $tasks->pri[$i] != 0)
{
$data[$i]->story = $tasks->story[$i] != 'ditto' ? $tasks->story[$i] : ($i == 0 ? 0 : $data[$i-1]->story);
$data[$i]->type = $tasks->type[$i] == 'ditto' ? ($i == 0 ? '' : $data[$i-1]->type) : $tasks->type[$i];

4
module/task/view/batchcreate.html.php
View File

@@ -21,8 +21,8 @@
<th><?php echo $lang->task->story;?></th>
<th class='red'><?php echo $lang->task->name;?></th>
<th class='w-60px red'><?php echo $lang->typeAB;?></th>
<th class='w-80px red'><?php echo $lang->task->assignedTo;?></th>
<th class='w-50px red'><?php echo $lang->task->estimateAB;?></th>
<th class='w-80px'><?php echo $lang->task->assignedTo;?></th>
<th class='w-50px'><?php echo $lang->task->estimateAB;?></th>
<th class='w-200px'><?php echo $lang->task->desc;?></th>
<th class='w-50px'><?php echo $lang->task->pri;?></th>
</tr>

2
module/upgrade/lang/zh-tw.php
View File

@@ -6,7 +6,7 @@
* @license LGPL (http://www.gnu.org/licenses/lgpl.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package upgrade
* @version $Id: zh-tw.php 3361 2012-07-17 01:24:02Z shiyangyangwork@yahoo.cn $
* @version $Id: zh-tw.php 3492 2012-09-02 07:44:37Z shiyangyangwork@yahoo.cn $
* @link http://www.zentao.net
*/
$lang->upgrade->common = '升級';

54
module/upgrade/model.php
View File

@@ -56,7 +56,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '0_4beta')
{
@@ -83,7 +83,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '0_5beta')
{
@@ -108,7 +108,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '0_6beta')
{
@@ -132,7 +132,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '1_0beta')
{
@@ -156,7 +156,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '1_0rc1')
{
@@ -179,7 +179,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '1_0rc2')
{
@@ -201,7 +201,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '1_0')
{
@@ -222,7 +222,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '1_0_1')
{
@@ -242,7 +242,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '1_1')
{
@@ -261,7 +261,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '1_2')
{
@@ -279,7 +279,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '1_3')
{
@@ -296,7 +296,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '1_4')
{
@@ -312,7 +312,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '1_5')
{
@@ -327,7 +327,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '2_0')
{
@@ -341,7 +341,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '2_1')
{
@@ -354,7 +354,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '2_2')
{
@@ -366,7 +366,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '2_3')
{
@@ -377,7 +377,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '2_4')
{
@@ -387,7 +387,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '3_0_beta1')
{
@@ -396,7 +396,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '3_0_beta2')
{
@@ -404,29 +404,29 @@ class upgradeModel extends model
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '3_0')
{
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '3_1')
{
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '3_2')
{
$this->upgradeFrom3_2To3_2_1();
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
elseif($fromVersion == '3_2_1')
{
$this->upgradeFrom3_2_1To3_3_stable();
$this->upgradeFrom3_2_1To3_3();
}
$this->deletePatch();
@@ -1051,10 +1051,10 @@ class upgradeModel extends model
* @access public
* @return void
*/
public function upgradeFrom3_2_1To3_3_stable()
public function upgradeFrom3_2_1To3_3()
{
$this->execSQL($this->getUpgradeFile('3.2.1'));
if(!$this->isError()) $this->setting->updateVersion('3.3.stable');
if(!$this->isError()) $this->setting->updateVersion('3.3');
}
/**

2
www/js/my.full.js
View File

@@ -526,7 +526,7 @@ function setImageSize(image, maxWidth)
{
if($(this).width() > maxWidth) $(this).attr('width', maxWidth);
});
$(image).wrap('<a href="' + $(image).attr('src') + '" target="_blank"></a>')
$(image).wrap('<a href="' + $(image).attr('src') + '" target="_blank"></a>')
}
/**