From 069f009b6da67f34be18a93118367c7af2cccc0d Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Thu, 17 Feb 2022 14:34:11 +0800
Subject: [PATCH 01/41] *Finish task 49283

---
 module/execution/view/bug.html.php        | 2 +-
 module/execution/view/grouptask.html.php  | 2 +-
 module/execution/view/importbug.html.php  | 2 +-
 module/execution/view/importtask.html.php | 2 +-
 module/execution/view/linkstory.html.php  | 2 +-
 module/execution/view/story.html.php      | 2 +-
 module/execution/view/testcase.html.php   | 2 +-
 module/my/view/requirement.html.php       | 2 +-
 module/my/view/story.html.php             | 2 +-
 module/my/view/task.html.php              | 2 +-
 module/my/view/testcase.html.php          | 2 +-
 module/my/view/todo.html.php              | 2 +-
 module/project/view/bug.html.php          | 2 +-
 module/story/view/batchedit.html.php      | 2 +-
 module/story/view/bugs.html.php           | 2 +-
 module/story/view/cases.html.php          | 2 +-
 module/story/view/linkstory.html.php      | 2 +-
 module/story/view/tasks.html.php          | 2 +-
 module/story/view/view.html.php           | 2 +-
 module/story/view/zerocase.html.php       | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/module/execution/view/bug.html.php b/module/execution/view/bug.html.php
index f55bda92a8..8a600fa219 100644
--- a/module/execution/view/bug.html.php
+++ b/module/execution/view/bug.html.php
@@ -80,7 +80,7 @@
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
           <th class='c-severity'><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
-          <th class='c-pri'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri' title=<?php echo $lang->execution->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
           <th><?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
           <th class='c-user'><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
           <th class='c-date text-center'><?php common::printOrderLink('deadline', $orderBy, $vars, $lang->bug->deadlineAB);?></th>
diff --git a/module/execution/view/grouptask.html.php b/module/execution/view/grouptask.html.php
index 1b02351e56..870f20d676 100644
--- a/module/execution/view/grouptask.html.php
+++ b/module/execution/view/grouptask.html.php
@@ -112,7 +112,7 @@
           </div>
         </th>
         <th class="c-id-sm"><?php echo $lang->task->id;?></th>
-        <th class="c-pri"><?php echo $lang->priAB;?></th>
+        <th class="c-pri" title=<?php echo $lang->execution->pri;?>><?php echo $lang->priAB;?></th>
         <th class="c-name text-left"><?php echo $lang->task->name;?></th>
         <th class="c-status"><?php echo $lang->task->status;?></th>
         <th class="text-left c-user"><?php echo $lang->task->assignedTo;?></th>
diff --git a/module/execution/view/importbug.html.php b/module/execution/view/importbug.html.php
index b2fc7eafb1..4eaf81a875 100755
--- a/module/execution/view/importbug.html.php
+++ b/module/execution/view/importbug.html.php
@@ -38,7 +38,7 @@ var browseType = '<?php echo $browseType;?>';
             <?php echo $lang->idAB;?>
           </th>
           <th class='c-severity'> <?php echo $lang->bug->severityAB;?></th>
-          <th class='c-pri'>      <?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->execution->pri;?>><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->bug->title;?></th>
           <th class='c-status'><?php echo $lang->bug->statusAB;?></th>
           <th class='c-pri-box <?php echo in_array('pri',        $requiredFields) ? 'required' : ''?>'><?php echo $lang->task->pri;?></th>
diff --git a/module/execution/view/importtask.html.php b/module/execution/view/importtask.html.php
index 836c8f5f8d..5baf2ceadd 100644
--- a/module/execution/view/importtask.html.php
+++ b/module/execution/view/importtask.html.php
@@ -33,7 +33,7 @@
             <?php echo $lang->idAB;?>
           </th>
           <th class='c-name'><?php echo $lang->execution->name ?></th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->execution->pri;?>><?php echo $lang->priAB;?></th>
           <th class='w-p30'><?php echo $lang->task->name;?></th>
           <th class='c-user'><?php echo $lang->task->assignedTo;?></th>
           <th class='c-hour'><?php echo $lang->task->leftAB;?></th>
diff --git a/module/execution/view/linkstory.html.php b/module/execution/view/linkstory.html.php
index 0a6d336e56..b19a0ad488 100644
--- a/module/execution/view/linkstory.html.php
+++ b/module/execution/view/linkstory.html.php
@@ -39,7 +39,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->execution->pri;?>><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->story->title;?></th>
           <th class='c-object'><?php echo $lang->story->product;?></th>
           <th class='c-module'><?php echo $lang->story->module;?></th>
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 313eab805f..c394332710 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -199,7 +199,7 @@
             <?php if($canOrder):?>
             <th class='c-sort {sorter:false}'><?php common::printOrderLink('order', $orderBy, $vars, $lang->execution->orderAB);?></th>
             <?php endif;?>
-            <th class='c-pri {sorter:false}'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+            <th class='c-pri {sorter:false}' title=<?php echo $lang->execution->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
             <th class='c-name {sorter:false}'><?php common::printOrderLink('title', $orderBy, $vars, $lang->execution->storyTitle);?></th>
             <th class='c-category {sorter:false}'><?php common::printOrderLink('category', $orderBy, $vars, $lang->story->category);?></th>
             <th class='c-user {sorter:false}'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
diff --git a/module/execution/view/testcase.html.php b/module/execution/view/testcase.html.php
index 2de4640de5..6ae9d094b1 100644
--- a/module/execution/view/testcase.html.php
+++ b/module/execution/view/testcase.html.php
@@ -24,7 +24,7 @@
       <thead>
         <tr>
           <th class='w-id'>    <?php common::printOrderLink('id',            $orderBy, $vars, $lang->idAB);?></th>
-          <th class='c-pri'>   <?php common::printOrderLink('pri',           $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri' title=<?php echo $lang->execution->pri;?>>   <?php common::printOrderLink('pri',           $orderBy, $vars, $lang->priAB);?></th>
           <th>                 <?php common::printOrderLink('title',         $orderBy, $vars, $lang->testcase->title);?></th>
           <th class='c-type'>  <?php common::printOrderLink('type',          $orderBy, $vars, $lang->typeAB);?></th>
           <th class='c-user'>  <?php common::printOrderLink('openedBy',      $orderBy, $vars, $lang->openedByAB);?></th>
diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php
index 891d7f6926..48e090ede7 100644
--- a/module/my/view/requirement.html.php
+++ b/module/my/view/requirement.html.php
@@ -58,7 +58,7 @@
             <?php endif;?>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
-          <th class='c-pri w-40px'><?php common::printOrderLink('pri',          $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri w-40px' title=<?php echo $lang->task->pri;?>><?php common::printOrderLink('pri',          $orderBy, $vars, $lang->priAB);?></th>
           <th class='c-name'>      <?php common::printOrderLink('title',        $orderBy, $vars, $lang->my->name);?></th>
           <th class='c-product'>   <?php common::printOrderLink('productTitle', $orderBy, $vars, $lang->story->product);?></th>
           <th class='c-user'>      <?php common::printOrderLink('openedBy',     $orderBy, $vars, $lang->openedByAB);?></th>
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index 029b2dfe62..dd6b6ece46 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -58,7 +58,7 @@
             <?php endif;?>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
-          <th class='c-pri'>      <?php common::printOrderLink('pri',          $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri' title=<?php echo $lang->task->pri;?>><?php common::printOrderLink('pri',          $orderBy, $vars, $lang->priAB);?></th>
           <th class='c-name'>     <?php common::printOrderLink('title',        $orderBy, $vars, $lang->my->name);?></th>
           <th class='c-product'>  <?php common::printOrderLink('productTitle', $orderBy, $vars, $lang->story->product);?></th>
           <th class='c-plan'>     <?php common::printOrderLink('plan',         $orderBy, $vars, $lang->story->plan);?></th>
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 4432aea57a..ca0ef8eade 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -48,7 +48,7 @@
             <?php endif;?>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
-          <th class='c-pri'><?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri' title=<?php echo $lang->task->pri;?>><?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
           <th class='c-name'><?php common::printOrderLink('name',       $orderBy, $vars, $lang->task->name);?></th>
           <?php if($config->systemMode == 'new'):?>
           <th class='c-project'><?php common::printOrderLink('project',    $orderBy, $vars, $lang->my->projects);?></th>
diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php
index a46451540a..5fb935aa04 100644
--- a/module/my/view/testcase.html.php
+++ b/module/my/view/testcase.html.php
@@ -48,7 +48,7 @@
             <?php endif;?>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
-          <th class='c-pri'>      <?php common::printOrderLink('pri',           $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri' title=<?php echo $lang->testcase->pri;?>>      <?php common::printOrderLink('pri',           $orderBy, $vars, $lang->priAB);?></th>
           <th>                    <?php common::printOrderLink('title',         $orderBy, $vars, $lang->testcase->title);?></th>
           <?php if($type == 'assigntome'):?>
           <th class='c-task'>     <?php common::printOrderLink('task',          $orderBy, $vars, $lang->testtask->common);?></th>
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index de64d4e4bc..260d154b23 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -74,7 +74,7 @@
           <th class="c-date">     <?php common::printOrderLink('date',       $orderBy, $vars, $lang->todo->date);?></th>
           <th class="c-type">     <?php common::printOrderLink('type',       $orderBy, $vars, $lang->todo->type);?></th>
           <?php $style = $this->app->clientLang == 'en' ? "style='width:80px'" : '';?>
-          <th class="c-pri" <?php echo $style;?>> <?php common::printOrderLink('pri',    $orderBy, $vars, $lang->priAB);?></th>
+          <th class="c-pri" <?php echo $style;?> title=<?php echo $lang->todo->pri;?>> <?php common::printOrderLink('pri',    $orderBy, $vars, $lang->priAB);?></th>
           <th class="c-name">     <?php common::printOrderLink('name',       $orderBy, $vars, $lang->todo->name);?></th>
           <th class="c-user">     <?php common::printOrderLink('assignedBy', $orderBy, $vars, $lang->todo->assignedBy);?></th>
           <th class="c-begin">    <?php common::printOrderLink('begin',      $orderBy, $vars, $lang->todo->beginAB);?></th>
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index d4d985bfc6..bd0167764a 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -57,7 +57,7 @@
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
           <th class='c-severity'><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
-          <th class='c-pri'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri' title=<?php echo $lang->project->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
           <th><?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
           <th class='c-user'><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
           <th class='c-user'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php
index 09f99ddc88..4dc2268e8a 100644
--- a/module/story/view/batchedit.html.php
+++ b/module/story/view/batchedit.html.php
@@ -50,7 +50,7 @@ foreach(explode(',', $showFields) as $field)
           <th class='c-title required'><?php echo $lang->story->title;?></th>
           <th class='c-estimate<?php echo zget($visibleFields, 'estimate', ' hidden')?>'> <?php echo $lang->story->estimateAB;?></th>
           <th class='c-category'><?php echo $lang->story->category;?></th>
-          <th class='c-pri<?php echo zget($visibleFields, 'pri', ' hidden')?>'> <?php echo $lang->priAB;?></th>
+          <th class='c-pri<?php echo zget($visibleFields, 'pri', ' hidden')?>' title=<?php echo $lang->story->pri;?>> <?php echo $lang->priAB;?></th>
           <th class='c-user<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>'> <?php echo $lang->story->assignedTo;?></th>
           <th class='c-source<?php echo zget($visibleFields, 'source', ' hidden')?>'> <?php echo $lang->story->source;?></th>
           <th class='c-note<?php echo zget($visibleFields, 'source', ' hidden')?>'> <?php echo $lang->story->sourceNote;?></th>
diff --git a/module/story/view/bugs.html.php b/module/story/view/bugs.html.php
index 9edbb6ed71..8101b47228 100644
--- a/module/story/view/bugs.html.php
+++ b/module/story/view/bugs.html.php
@@ -12,7 +12,7 @@
         <tr class='text-center'>
           <th class='c-id'>        <?php echo $lang->idAB;?></th>
           <th class='w-p30'>       <?php echo $lang->bug->title;?></th>
-          <th class='c-pri'>       <?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->story->pri;?>><?php echo $lang->priAB;?></th>
           <th class='c-type'>      <?php echo $lang->bug->type;?></th>
           <th class='c-status'>    <?php echo $lang->statusAB;?></th>
           <th class='c-user'>      <?php echo $lang->bug->assignedTo;?></th>
diff --git a/module/story/view/cases.html.php b/module/story/view/cases.html.php
index 154e24dcf9..d36a419aef 100644
--- a/module/story/view/cases.html.php
+++ b/module/story/view/cases.html.php
@@ -12,7 +12,7 @@
         <tr class='text-center'>
           <th class='c-id'>    <?php echo $lang->idAB;?></th>
           <th class='w-p30'>   <?php echo $lang->testcase->title;?></th>
-          <th class='c-pri'>   <?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->story->pri;?>><?php echo $lang->priAB;?></th>
           <th class='c-type'>  <?php echo $lang->testcase->type;?></th>
           <th class='c-status'><?php echo $lang->statusAB;?></th>
           <th class='c-user'>  <?php echo $lang->testcase->lastRunner;?></th>
diff --git a/module/story/view/linkstory.html.php b/module/story/view/linkstory.html.php
index 0260e58510..3c9d8effda 100644
--- a/module/story/view/linkstory.html.php
+++ b/module/story/view/linkstory.html.php
@@ -35,7 +35,7 @@
           </div>
           <?php echo $lang->idAB;?>
         </th>
-        <th class='c-pri'><?php echo $lang->priAB;?></th>
+        <th class='c-pri' title=<?php echo $lang->story->pri;?>><?php echo $lang->priAB;?></th>
         <th><?php echo $lang->story->title;?></th>
         <th class='c-status'><?php echo $lang->story->status;?></th>
         <?php if($story->type == 'requirement'):?>
diff --git a/module/story/view/tasks.html.php b/module/story/view/tasks.html.php
index 64ef8d78a9..8f6d580a05 100644
--- a/module/story/view/tasks.html.php
+++ b/module/story/view/tasks.html.php
@@ -15,7 +15,7 @@ include '../../common/view/chart.html.php';
         <tr class='text-center'>
           <th class='c-id'>      <?php echo $lang->idAB;?></th>
           <th class='w-p30'>     <?php echo $lang->task->name;?></th>
-          <th class='c-pri'>     <?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->story->pri;?>><?php echo $lang->priAB;?></th>
           <th class='c-status'>  <?php echo $lang->statusAB;?></th>
           <th class='c-user'>    <?php echo $lang->task->assignedToAB;?></th>
           <th class='c-estimate'><?php echo $lang->task->estimateAB;?></th>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 16be21d237..553e702396 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -150,7 +150,7 @@
             <thead>
               <tr class='text-center'>
                 <th class='w-50px'> <?php echo $lang->story->id;?></th>
-                <th class='w-40px'> <?php echo $lang->priAB;?></th>
+                <th class='w-40px' title=<?php echo $lang->story->pri;?>><?php echo $lang->priAB;?></th>
                 <th>                <?php echo $lang->story->title;?></th>
                 <th class='w-100px'><?php echo $lang->story->assignedTo;?></th>
                 <th class='w-90px'> <?php echo $lang->story->estimate;?></th>
diff --git a/module/story/view/zerocase.html.php b/module/story/view/zerocase.html.php
index e90d63132c..cab2b83887 100644
--- a/module/story/view/zerocase.html.php
+++ b/module/story/view/zerocase.html.php
@@ -33,7 +33,7 @@
           </div>
           <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
         </th>
-        <th class='c-pri'>     <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+        <th class='c-pri' title=<?php echo $lang->story->pri;?>><?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
         <th class='w-p30'>     <?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
         <th>                   <?php common::printOrderLink('plan',       $orderBy, $vars, $lang->story->planAB);?></th>
         <th class='thWidth'>   <?php common::printOrderLink('source',     $orderBy, $vars, $lang->story->source);?></th>

From aa444513d6a5e6db7bd1fac27177795752874f59 Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Thu, 17 Feb 2022 16:13:24 +0800
Subject: [PATCH 02/41] * Finish task 49283.

---
 module/bug/config.php      | 1 +
 module/story/config.php    | 1 +
 module/task/config.php     | 1 +
 module/testcase/config.php | 1 +
 4 files changed, 4 insertions(+)

diff --git a/module/bug/config.php b/module/bug/config.php
index 034f24bc42..df5a1739bf 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -167,6 +167,7 @@ $config->bug->datatable->fieldList['pri']['title']    = 'P';
 $config->bug->datatable->fieldList['pri']['fixed']    = 'left';
 $config->bug->datatable->fieldList['pri']['width']    = '50';
 $config->bug->datatable->fieldList['pri']['required'] = 'no';
+$config->bug->datatable->fieldList['pri']['name']     = $lang->bug->pri;
 
 $config->bug->datatable->fieldList['confirmed']['title']    = 'confirmedAB';
 $config->bug->datatable->fieldList['confirmed']['fixed']    = 'left';
diff --git a/module/story/config.php b/module/story/config.php
index 67bec65085..616c9c9126 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -60,6 +60,7 @@ $config->story->datatable->fieldList['pri']['title']    = 'priAB';
 $config->story->datatable->fieldList['pri']['fixed']    = 'left';
 $config->story->datatable->fieldList['pri']['width']    = '50';
 $config->story->datatable->fieldList['pri']['required'] = 'no';
+$config->story->datatable->fieldList['pri']['name']     = $this->lang->story->pri;
 
 $config->story->datatable->fieldList['title']['title']    = 'title';
 $config->story->datatable->fieldList['title']['fixed']    = 'left';
diff --git a/module/task/config.php b/module/task/config.php
index 17bb90c08f..c5baf56e79 100644
--- a/module/task/config.php
+++ b/module/task/config.php
@@ -60,6 +60,7 @@ $config->task->datatable->fieldList['pri']['title']    = 'priAB';
 $config->task->datatable->fieldList['pri']['fixed']    = 'left';
 $config->task->datatable->fieldList['pri']['width']    = '50';
 $config->task->datatable->fieldList['pri']['required'] = 'no';
+$config->task->datatable->fieldList['pri']['name']     = $lang->task->pri;
 
 $config->task->datatable->fieldList['name']['title']    = 'name';
 $config->task->datatable->fieldList['name']['fixed']    = 'left';
diff --git a/module/testcase/config.php b/module/testcase/config.php
index be18fd7b87..74c780eb55 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -87,6 +87,7 @@ $config->testcase->datatable->fieldList['pri']['title']    = 'priAB';
 $config->testcase->datatable->fieldList['pri']['fixed']    = 'left';
 $config->testcase->datatable->fieldList['pri']['width']    = '40';
 $config->testcase->datatable->fieldList['pri']['required'] = 'no';
+$config->testcase->datatable->fieldList['pri']['name']     = $lang->testcase->pri;
 
 $config->testcase->datatable->fieldList['title']['title']    = 'title';
 $config->testcase->datatable->fieldList['title']['fixed']    = 'left';

From 22f29fd8d4afe3019c323ed8db0f27dbf6efa7e9 Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Fri, 18 Feb 2022 10:40:09 +0800
Subject: [PATCH 03/41] *Fix bug 49283

---
 db/update16.4.sql                       | 23 +++++++++++++++++++++++
 module/my/lang/en.php                   |  1 +
 module/my/lang/zh-cn.php                |  1 +
 module/my/view/story.html.php           |  2 +-
 module/testcase/view/groupcase.html.php |  2 +-
 module/testsuite/lang/en.php            |  1 +
 module/testsuite/lang/zh-cn.php         |  1 +
 module/testsuite/view/view.html.php     |  2 +-
 8 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 db/update16.4.sql

diff --git a/db/update16.4.sql b/db/update16.4.sql
new file mode 100644
index 0000000000..aecc125c66
--- /dev/null
+++ b/db/update16.4.sql
@@ -0,0 +1,23 @@
+ALTER TABLE `zt_userquery` ADD`common` enum('0','1') NOT NULL DEFAULT '0';
+
+ALTER TABLE `zt_project` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `order`;
+ALTER TABLE `zt_product` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `order`;
+ALTER TABLE `zt_task` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `deleted`;
+ALTER TABLE `zt_projectstory` ADD INDEX `story` (`story`);
+ALTER TABLE `zt_group` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `project`;
+ALTER TABLE `zt_lang` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `system`;
+ALTER TABLE `zt_lang` DROP INDEX `lang`, ADD UNIQUE `lang` (`lang`,`module`,`section`,`key`,`vision`);
+ALTER TABLE `zt_doc` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`;
+ALTER TABLE `zt_doclib` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `type`;
+ALTER TABLE `zt_action` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `read`;
+ALTER TABLE `zt_searchindex` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`;
+ALTER TABLE `zt_config` ADD `vision` varchar(10) NOT NULL DEFAULT '' AFTER `id`;
+ALTER TABLE `zt_config` DROP INDEX `unique`, ADD UNIQUE `unique` (`vision`,`owner`,`module`,`section`,`key`);
+ALTER TABLE `zt_todo` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `deleted`;
+ALTER TABLE `zt_block` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `account`;
+ALTER TABLE `zt_block` DROP INDEX `account_module_type_order`, ADD UNIQUE `account_vision_module_type_order` (`account`, `vision`, `module`, `type`, `order`);
+ALTER TABLE `zt_effort` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`;
+ALTER TABLE `zt_story` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`;
+
+ALTER TABLE `zt_user` ADD `visions` varchar(20) NOT NULL AFTER `visits`;
+UPDATE `zt_user` SET `visions`='rnd,lite';
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index d40d1fe11a..b2cb72f428 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -41,6 +41,7 @@ $lang->my->requirement     = "My {$lang->URCommon}";
 $lang->my->testtask        = 'My Test Task';
 $lang->my->testcase        = 'My Case';
 $lang->my->storyConcept    = 'Story Concept';
+$lang->my->pri             = 'Priority';
 
 $lang->my->indexAction      = 'My Index';
 $lang->my->calendarAction   = 'My Calendar';
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index f0fa0775d2..5de4dcf78e 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -41,6 +41,7 @@ $lang->my->requirement     = "我的{$lang->URCommon}";
 $lang->my->testtask        = '我的测试单';
 $lang->my->testcase        = '我的用例';
 $lang->my->storyConcept    = $config->URAndSR ? '默认需求概念组合' : '默认需求概念';
+$lang->my->pri             = '优先级';
 
 $lang->my->indexAction      = '地盘仪表盘';
 $lang->my->calendarAction   = '我的日程';
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index dd6b6ece46..d410598f76 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -58,7 +58,7 @@
             <?php endif;?>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
-          <th class='c-pri' title=<?php echo $lang->task->pri;?>><?php common::printOrderLink('pri',          $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri' title=<?php echo $lang->my->pri;?>><?php common::printOrderLink('pri',          $orderBy, $vars, $lang->priAB);?></th>
           <th class='c-name'>     <?php common::printOrderLink('title',        $orderBy, $vars, $lang->my->name);?></th>
           <th class='c-product'>  <?php common::printOrderLink('productTitle', $orderBy, $vars, $lang->story->product);?></th>
           <th class='c-plan'>     <?php common::printOrderLink('plan',         $orderBy, $vars, $lang->story->plan);?></th>
diff --git a/module/testcase/view/groupcase.html.php b/module/testcase/view/groupcase.html.php
index e863be5027..e0f3adfddb 100644
--- a/module/testcase/view/groupcase.html.php
+++ b/module/testcase/view/groupcase.html.php
@@ -35,7 +35,7 @@
           </div>
         </th>
         <th class='c-id-sm'><?php echo $lang->idAB;?></th>
-        <th class='c-pri'>  <?php echo $lang->priAB;?></th>
+        <th class='c-pri' title=<?php echo $lang->testcase->pri;?>>  <?php echo $lang->priAB;?></th>
         <th class='c-title text-left'><?php echo $lang->testcase->title;?></th>
         <th class='c-type'> <?php echo $lang->typeAB;?></th>
         <th class='c-user'> <?php echo $lang->testtask->lastRunAccount;?></th>
diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php
index 0b64a3e23d..3171bf426d 100644
--- a/module/testsuite/lang/en.php
+++ b/module/testsuite/lang/en.php
@@ -24,6 +24,7 @@ $lang->testsuite->deleted          = 'Deleted';
 $lang->testsuite->successSaved     = 'Saved';
 
 $lang->testsuite->id             = 'ID';
+$lang->testsuite->pri            = 'Priority';
 $lang->testsuite->common         = 'Test Suite';
 $lang->testsuite->project        = 'Project';
 $lang->testsuite->product        = $lang->productCommon;
diff --git a/module/testsuite/lang/zh-cn.php b/module/testsuite/lang/zh-cn.php
index 1103d4f9eb..349fe18e86 100644
--- a/module/testsuite/lang/zh-cn.php
+++ b/module/testsuite/lang/zh-cn.php
@@ -24,6 +24,7 @@ $lang->testsuite->deleted          = '已删除';
 $lang->testsuite->successSaved     = '保存成功';
 
 $lang->testsuite->id             = '编号';
+$lang->testsuite->pri            = '优先级';
 $lang->testsuite->common         = '套件';
 $lang->testsuite->project        = '所属项目';
 $lang->testsuite->product        = '所属' . $lang->productCommon;
diff --git a/module/testsuite/view/view.html.php b/module/testsuite/view/view.html.php
index 7c5c3d60d5..f4962e9033 100644
--- a/module/testsuite/view/view.html.php
+++ b/module/testsuite/view/view.html.php
@@ -60,7 +60,7 @@
                 <?php endif;?>
                 <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></nobr>
               </th>
-              <th class='c-pri w-50px'><?php common::printOrderLink('pri',     $orderBy, $vars, $lang->priAB);?></th>
+              <th class='c-pri w-50px' title=<?php echo $lang->testsuite->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
               <th class='w-100px'><?php common::printOrderLink('module',       $orderBy, $vars, $lang->testcase->module);?></th>
               <th class='c-name'><?php common::printOrderLink('title',         $orderBy, $vars, $lang->testcase->title);?></th>
               <th class='w-90px'><?php common::printOrderLink('type',          $orderBy, $vars, $lang->testcase->type);?></th>

From 0805d2573592d696a959cbefe8b56bda1c9ae717 Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Mon, 21 Feb 2022 10:47:27 +0800
Subject: [PATCH 04/41] * Finish task 49283.

---
 module/bug/view/linkbugs.html.php             | 2 +-
 module/build/view/linkbug.html.php            | 2 +-
 module/build/view/linkstory.html.php          | 2 +-
 module/build/view/view.html.php               | 2 +-
 module/caselib/view/browse.html.php           | 2 +-
 module/common/lang/en.php                     | 2 ++
 module/common/lang/zh-cn.php                  | 2 ++
 module/kanban/view/importcard.html.php        | 2 +-
 module/mr/view/link.html.php                  | 6 +++---
 module/mr/view/linkbug.html.php               | 2 +-
 module/mr/view/linkstory.html.php             | 2 +-
 module/mr/view/linktask.html.php              | 2 +-
 module/productplan/view/linkbug.html.php      | 2 +-
 module/productplan/view/linkstory.html.php    | 2 +-
 module/productplan/view/view.html.php         | 8 ++++----
 module/projectrelease/view/linkbug.html.php   | 2 +-
 module/projectrelease/view/linkstory.html.php | 2 +-
 module/projectrelease/view/view.html.php      | 2 +-
 module/release/view/linkbug.html.php          | 2 +-
 module/release/view/linkstory.html.php        | 2 +-
 module/release/view/view.html.php             | 2 +-
 module/testcase/view/bugs.html.php            | 2 +-
 module/testcase/view/importfromlib.html.php   | 4 ++--
 module/testcase/view/linkcases.html.php       | 2 +-
 module/testsuite/view/linkcase.html.php       | 2 +-
 module/testtask/view/groupcase.html.php       | 2 +-
 module/testtask/view/linkcase.html.php        | 2 +-
 module/testtask/view/unitgroup.html.php       | 2 +-
 module/user/view/bug.html.php                 | 2 +-
 module/user/view/story.html.php               | 2 +-
 module/user/view/task.html.php                | 2 +-
 module/user/view/testcase.html.php            | 2 +-
 module/user/view/todo.html.php                | 2 +-
 33 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/module/bug/view/linkbugs.html.php b/module/bug/view/linkbugs.html.php
index b3ec18fa85..7ead53687b 100644
--- a/module/bug/view/linkbugs.html.php
+++ b/module/bug/view/linkbugs.html.php
@@ -32,7 +32,7 @@
             </div>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->bug->product;?></th>
           <th><?php echo $lang->bug->title;?></th>
           <th class='c-status'><?php echo $lang->bug->statusAB;?></th>
diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php
index b4364e65d8..bdd39c2c5a 100644
--- a/module/build/view/linkbug.html.php
+++ b/module/build/view/linkbug.html.php
@@ -27,7 +27,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-status'> <?php echo $lang->priAB;?></th>
+          <th class='c-status' title=<?php echo $lang->pri;?>> <?php echo $lang->priAB;?></th>
           <th class='text-left'><?php echo $lang->bug->title;?></th>
           <th class='c-user'>   <?php echo $lang->openedByAB;?></th>
           <th class='c-user'>   <?php echo $lang->bug->resolvedBy;?></th>
diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php
index 3ce47e1e51..d874361a28 100644
--- a/module/build/view/linkstory.html.php
+++ b/module/build/view/linkstory.html.php
@@ -27,7 +27,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'>    <?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th class="text-left"><?php echo $lang->story->title;?></th>
           <th class='c-user'>   <?php echo $lang->openedByAB;?></th>
           <th class='c-user'>   <?php echo $lang->assignedToAB;?></th>
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index d10b01c3e0..d23b4ea3ae 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -89,7 +89,7 @@ tbody tr td:first-child input {display: none;}
                   <?php endif;?>
                   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </th>
-                <th class='c-id'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+                <th class='c-id' title=<?php echo $lang->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                 <th class='text-left'><?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
                 <th class='c-user'><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
                 <th class='c-id text-right'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
diff --git a/module/caselib/view/browse.html.php b/module/caselib/view/browse.html.php
index e4e94f5217..5fc8f8174d 100644
--- a/module/caselib/view/browse.html.php
+++ b/module/caselib/view/browse.html.php
@@ -124,7 +124,7 @@ js::set('flow',          $config->global->flow);
                 <?php endif;?>
                 <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
               </th>
-              <th class='c-pri'>   <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
+              <th class='c-pri' title=<?php echo $lang->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
               <th class='text-left'><?php common::printOrderLink('title',   $orderBy, $vars, $lang->testcase->title);?></th>
               <th class='c-type'>  <?php common::printOrderLink('type',     $orderBy, $vars, $lang->typeAB);?></th>
               <th class='c-user'>  <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index e6fdabf436..9849859a23 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -145,6 +145,8 @@ $lang->assignedToAB = 'AssignedTo';
 $lang->typeAB       = 'Type';
 $lang->nameAB       = 'Name';
 
+$lang->pri = 'Priority';
+
 $lang->common->common     = 'Common Module';
 $lang->my->common         = 'My';
 $lang->program->common    = 'Program';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 2bd0ba479d..0c99f1773e 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -145,6 +145,8 @@ $lang->assignedToAB = '指派';
 $lang->typeAB       = '类型';
 $lang->nameAB       = '名称';
 
+$lang->pri = '优先级';
+
 $lang->common->common     = '公有模块';
 $lang->my->common         = '地盘';
 $lang->program->common    = '项目集';
diff --git a/module/kanban/view/importcard.html.php b/module/kanban/view/importcard.html.php
index 15a8441a92..98c28ea56f 100644
--- a/module/kanban/view/importcard.html.php
+++ b/module/kanban/view/importcard.html.php
@@ -40,7 +40,7 @@
             <?php echo $lang->idAB;?>
           </th>
           <th class='c-name'><?php echo $lang->kanban->name;?></th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th class='c-name'><?php echo $lang->kanbancard->name;?></th>
           <th class='c-user'><?php echo $lang->kanbancard->assignedTo;?></th>
           <th class='c-date'><?php echo $lang->kanbancard->end;?></th>
diff --git a/module/mr/view/link.html.php b/module/mr/view/link.html.php
index 65d7a17826..86411732ed 100644
--- a/module/mr/view/link.html.php
+++ b/module/mr/view/link.html.php
@@ -72,7 +72,7 @@
                 <?php if($canOrder):?>
                 <th class='w-70px'><?php common::printOrderLink('order', $orderBy, $vars, $lang->productplan->updateOrder);?></th>
                 <?php endif;?>
-                <th class='w-70px'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+                <th class='w-70px' title=<?php echo $lang->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                 <th class='w-150px text-left'><?php common::printOrderLink('module',     $orderBy, $vars, $lang->story->module);?></th>
                 <th class='text-left'><?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
                 <th class='c-user'> <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
@@ -153,7 +153,7 @@
                 <th class='c-id text-left'>
                   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </th>
-                <th class='w-70px'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+                <th class='w-70px' title=<?php echo $lang->pri;?>> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                 <th class='text-left'><?php common::printOrderLink('title',      $orderBy, $vars, $lang->bug->title);?></th>
                 <th class='c-user'> <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
                 <th class='c-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->bug->assignedToAB);?></th>
@@ -215,7 +215,7 @@
                 <th class='c-id text-left'>
                   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </th>
-                <th class='w-70px'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+                <th class='w-70px' title=<?php echo $lang->pri;?>> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                 <th class='text-left'><?php common::printOrderLink('name',      $orderBy, $vars, $lang->task->name);?></th>
                 <th class='c-user'> <?php common::printOrderLink('finishedBy',   $orderBy, $vars, $lang->task->finishedByAB);?></th>
                 <th class='c-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->task->assignedToAB);?></th>
diff --git a/module/mr/view/linkbug.html.php b/module/mr/view/linkbug.html.php
index 49daaa7865..e070284cb2 100644
--- a/module/mr/view/linkbug.html.php
+++ b/module/mr/view/linkbug.html.php
@@ -27,7 +27,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th class='text-left'><?php echo $lang->bug->title;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
           <th class='c-user'><?php echo $lang->bug->assignedToAB;?></th>
diff --git a/module/mr/view/linkstory.html.php b/module/mr/view/linkstory.html.php
index 9d334b9bdc..e12ac68d2f 100644
--- a/module/mr/view/linkstory.html.php
+++ b/module/mr/view/linkstory.html.php
@@ -27,7 +27,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th class='c-plan'><?php echo $lang->story->plan;?></th>
           <th class='c-module'><?php echo $lang->story->module;?></th>
           <th class='text-left'><?php echo $lang->story->title;?></th>
diff --git a/module/mr/view/linktask.html.php b/module/mr/view/linktask.html.php
index e231dee43e..a22da0aeec 100644
--- a/module/mr/view/linktask.html.php
+++ b/module/mr/view/linktask.html.php
@@ -27,7 +27,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th class='text-left'><?php echo $lang->task->name;?></th>
           <th class='c-user'><?php echo $lang->task->finishedByAB;?></th>
           <th class='c-user'><?php echo $lang->task->assignedToAB;?></th>
diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php
index 2b235ca1f4..5468ec1fd4 100644
--- a/module/productplan/view/linkbug.html.php
+++ b/module/productplan/view/linkbug.html.php
@@ -27,7 +27,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title='<?php echo $lang->pri;?>'><?php echo $lang->priAB;?></th>
           <th class='text-left'><?php echo $lang->bug->title;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
           <th class='c-user'><?php echo $lang->bug->assignedToAB;?></th>
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index c026b12eef..b2c29697fc 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -27,7 +27,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title='<?php echo $lang->pri;?>'><?php echo $lang->priAB;?></th>
           <th class='c-plan'><?php echo $lang->story->plan;?></th>
           <th class='c-module'><?php echo $lang->story->module;?></th>
           <th class='text-left'><?php echo $lang->story->title;?></th>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index e842979fa6..e306c8034e 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -157,7 +157,7 @@
                 <th class='c-id text-left'>
                   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </th>
-                <th class='w-70px'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+                <th class='w-70px' title='<?php echo $lang->pri;?>'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
                 <th class='text-left'><?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
                 <th class='w-70px'> <?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
                 <?php else:?>
@@ -172,7 +172,7 @@
                 <?php if($canOrder):?>
                 <th class='w-70px'><?php common::printOrderLink('order', $orderBy, $vars, $lang->productplan->updateOrder);?></th>
                 <?php endif;?>
-                <th class='w-70px'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+                <th class='w-70px' title='<?php echo $lang->pri;?>'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                 <th class='w-150px text-left'><?php common::printOrderLink('module',     $orderBy, $vars, $lang->story->module);?></th>
                 <th class='text-left'><?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
                 <th class='c-user'> <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
@@ -452,7 +452,7 @@
                 <th class='c-id text-left'>
                   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </th>
-                <th class='w-70px'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+                <th class='w-70px' title='<?php echo $lang->pri;?>'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
                 <th class='text-left'><?php common::printOrderLink('title',    $orderBy, $vars, $lang->bug->title);?></th>
                 <th class='w-100px'><?php common::printOrderLink('status',     $orderBy, $vars, $lang->bug->status);?></th>
                 <?php else:?>
@@ -464,7 +464,7 @@
                   <?php endif;?>
                   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </th>
-                <th class='w-70px'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+                <th class='w-70px' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                 <th class='text-left'><?php common::printOrderLink('title',    $orderBy, $vars, $lang->bug->title);?></th>
                 <th class='c-user'> <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
                 <th class='c-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->bug->assignedToAB);?></th>
diff --git a/module/projectrelease/view/linkbug.html.php b/module/projectrelease/view/linkbug.html.php
index a5b8652488..9ed6c81f62 100644
--- a/module/projectrelease/view/linkbug.html.php
+++ b/module/projectrelease/view/linkbug.html.php
@@ -31,7 +31,7 @@ $formID      = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title='<?php echo $lang->pri;?>'><?php echo $lang->priAB;?></th>
           <th class='text-left'><?php echo $lang->bug->title;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
           <th class='c-user'><?php echo $lang->bug->resolvedBy;?></th>
diff --git a/module/projectrelease/view/linkstory.html.php b/module/projectrelease/view/linkstory.html.php
index f75c38af81..c6caa3ac06 100644
--- a/module/projectrelease/view/linkstory.html.php
+++ b/module/projectrelease/view/linkstory.html.php
@@ -27,7 +27,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title='<?php echo $lang->pri;?>'><?php echo $lang->priAB;?></th>
           <th class='text-left'><?php echo $lang->story->title;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
           <th class='c-user'><?php echo $lang->assignedToAB;?></th>
diff --git a/module/projectrelease/view/view.html.php b/module/projectrelease/view/view.html.php
index 0ebf95a796..3dc3c86f29 100644
--- a/module/projectrelease/view/view.html.php
+++ b/module/projectrelease/view/view.html.php
@@ -85,7 +85,7 @@
                       <?php endif;?>
                       <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                     </th>
-                    <th class='c-pri'>    <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
+                    <th class='c-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                     <th class="text-left"><?php common::printOrderLink('title',    $orderBy, $vars, $lang->story->title);?></th>
                     <th class='c-user'>   <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
                     <th class='w-80px text-right'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
diff --git a/module/release/view/linkbug.html.php b/module/release/view/linkbug.html.php
index 874436fbd0..ac3effbfe9 100644
--- a/module/release/view/linkbug.html.php
+++ b/module/release/view/linkbug.html.php
@@ -31,7 +31,7 @@ $formID      = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th class='text-left'><?php echo $lang->bug->title;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
           <th class='c-user'><?php echo $lang->bug->resolvedBy;?></th>
diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php
index c8d9ca1e8f..0b10f22482 100644
--- a/module/release/view/linkstory.html.php
+++ b/module/release/view/linkstory.html.php
@@ -27,7 +27,7 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th class='text-left'><?php echo $lang->story->title;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
           <th class='c-user'><?php echo $lang->assignedToAB;?></th>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index cb7b8bc7d0..1c41e9bc21 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -85,7 +85,7 @@
                       <?php endif;?>
                       <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                     </th>
-                    <th class='c-pri'>    <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
+                    <th class='c-pri' title=<?php echo $lang->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
                     <th class="text-left"><?php common::printOrderLink('title',    $orderBy, $vars, $lang->story->title);?></th>
                     <th class='c-user'>   <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
                     <th class='w-80px text-right'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
diff --git a/module/testcase/view/bugs.html.php b/module/testcase/view/bugs.html.php
index 84da9259f5..93e36b1534 100644
--- a/module/testcase/view/bugs.html.php
+++ b/module/testcase/view/bugs.html.php
@@ -9,7 +9,7 @@
         <tr class='text-center'>
           <th class='c-id'><?php echo $lang->idAB;?></th>
           <th class='w-p30'> <?php echo $lang->bug->title;?></th>
-          <th class='c-pri'> <?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th class='c-type'><?php echo $lang->bug->type;?></th>
           <th class='c-status'><?php echo $lang->statusAB;?></th>
           <th class='c-user'><?php echo $lang->bug->assignedTo;?></th>
diff --git a/module/testcase/view/importfromlib.html.php b/module/testcase/view/importfromlib.html.php
index df10fd4979..c0e7e814b8 100644
--- a/module/testcase/view/importfromlib.html.php
+++ b/module/testcase/view/importfromlib.html.php
@@ -36,8 +36,8 @@
           <?php if($product->type != 'normal'):?>
           <th class='c-branch'><?php echo $lang->testcase->branch ?></th>
           <?php endif;?>
-          <th class='c-pri'>  <?php common::printOrderLink('pri',   $orderBy, $vars, $lang->priAB);?></th>
-          <th>                <?php common::printOrderLink('title', $orderBy, $vars, $lang->testcase->title);?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php common::printOrderLink('pri',   $orderBy, $vars, $lang->priAB);?></th>
+          <th><?php common::printOrderLink('title', $orderBy, $vars, $lang->testcase->title);?></th>
           <th class='c-module'><?php echo $lang->testcase->fromModule ?></th>
           <th class='c-module'><?php echo $lang->testcase->module ?></th>
           <th class='c-type'><?php common::printOrderLink('type',  $orderBy, $vars, $lang->testcase->type)?></th>
diff --git a/module/testcase/view/linkcases.html.php b/module/testcase/view/linkcases.html.php
index 0bd00d0d17..ab5e4db49f 100644
--- a/module/testcase/view/linkcases.html.php
+++ b/module/testcase/view/linkcases.html.php
@@ -32,7 +32,7 @@
             </div>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->testcase->product;?></th>
           <th><?php echo $lang->testcase->title;?></th>
           <th class='c-type'><?php echo $lang->testcase->type;?></th>
diff --git a/module/testsuite/view/linkcase.html.php b/module/testsuite/view/linkcase.html.php
index 1324d49758..67dced905a 100644
--- a/module/testsuite/view/linkcase.html.php
+++ b/module/testsuite/view/linkcase.html.php
@@ -40,7 +40,7 @@
             <?php echo $lang->idAB;?>
           </th>
           <th class='w-70px text-center'><nobr><?php echo $lang->testsuite->linkVersion;?></nobr></th>
-          <th class='w-70px'><?php echo $lang->priAB;?></th>
+          <th class='w-70px' title=<?php echo $lang->pri;?>><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->testcase->title;?></th>
           <th class='w-90px'><?php echo $lang->testcase->type;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
diff --git a/module/testtask/view/groupcase.html.php b/module/testtask/view/groupcase.html.php
index b5af67b4ab..2e5857f15f 100644
--- a/module/testtask/view/groupcase.html.php
+++ b/module/testtask/view/groupcase.html.php
@@ -26,7 +26,7 @@
           </div>
         </th>
         <th class='c-id-sm'><?php echo $lang->idAB;?></th>
-        <th class='w-80px'>  <?php echo $lang->priAB;?></th>
+        <th class='w-80px' title='<?php echo $lang->pri;?>'>  <?php echo $lang->priAB;?></th>
         <th><?php echo $lang->testcase->title;?></th>
         <th class='w-80px'> <?php echo $lang->typeAB;?></th>
         <th class='w-user'> <?php echo $lang->testtask->assignedTo;?></th>
diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php
index 4b58c7ff0f..f2a0a97316 100644
--- a/module/testtask/view/linkcase.html.php
+++ b/module/testtask/view/linkcase.html.php
@@ -84,7 +84,7 @@
             <?php echo $lang->idAB;?>
           </th>
           <th class='c-version text-center'><nobr><?php echo $lang->testtask->linkVersion;?></nobr></th>
-          <th class='c-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri' title='<?php echo $lang->pri;?>'><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->testcase->title;?></th>
           <th class='c-type'><?php echo $lang->testcase->type;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
diff --git a/module/testtask/view/unitgroup.html.php b/module/testtask/view/unitgroup.html.php
index 9b4bed3164..b27448e517 100644
--- a/module/testtask/view/unitgroup.html.php
+++ b/module/testtask/view/unitgroup.html.php
@@ -15,7 +15,7 @@
         </div>
       </th>
       <th class='c-id-sm'><?php echo $lang->idAB;?></th>
-      <th class='w-pri'>  <?php echo $lang->priAB;?></th>
+      <th class='w-pri' title='<?php echo $lang->pri;?>'>  <?php echo $lang->priAB;?></th>
       <th><?php echo $lang->testcase->title;?></th>
       <th class='w-80px'> <?php echo $lang->testtask->lastRunAccount;?></th>
       <th class='w-120px'><?php echo $lang->testtask->lastRunTime;?></th>
diff --git a/module/user/view/bug.html.php b/module/user/view/bug.html.php
index 7543feadf9..08d097a804 100644
--- a/module/user/view/bug.html.php
+++ b/module/user/view/bug.html.php
@@ -40,7 +40,7 @@
         <tr class='text-center'>
           <th class='c-id'>        <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
           <th class='c-severity'>  <?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
-          <th class='c-pri'>       <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
           <th class='c-type'>      <?php common::printOrderLink('type', $orderBy, $vars, $lang->typeAB);?></th>
           <th class='text-left'>   <?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
           <th class='c-user'>      <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
diff --git a/module/user/view/story.html.php b/module/user/view/story.html.php
index 6968bf2550..6cdab3107f 100644
--- a/module/user/view/story.html.php
+++ b/module/user/view/story.html.php
@@ -42,7 +42,7 @@
       <thead>
         <tr class='colhead'>
           <th class='w-id'>   <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
-          <th class='w-pri'>  <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+          <th class='w-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
           <th class='w-200px'><?php common::printOrderLink('product', $orderBy, $vars, $lang->story->product);?></th>
           <th>                <?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
           <?php if($storyType != 'requirement'):?>
diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php
index 1c6f51ab38..c52df556c1 100644
--- a/module/user/view/task.html.php
+++ b/module/user/view/task.html.php
@@ -42,7 +42,7 @@
       <thead>
         <tr class='colhead'>
           <th class='w-id'><?php echo $lang->idAB;?></th>
-          <th class='w-pri'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+          <th class='w-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
           <th><?php common::printOrderLink('execution', $orderBy, $vars, $lang->task->execution);?></th>
           <th><?php common::printOrderLink('name', $orderBy, $vars, $lang->task->name);?></th>
           <th class='w-70px hours'><?php echo $lang->task->estimateAB;?></th>
diff --git a/module/user/view/testcase.html.php b/module/user/view/testcase.html.php
index dbecfbcd54..9e3cb8914f 100755
--- a/module/user/view/testcase.html.php
+++ b/module/user/view/testcase.html.php
@@ -35,7 +35,7 @@
       <thead>
         <tr class='colhead'>
           <th class='c-id'>    <?php common::printOrderLink('id',       $orderBy, $vars, $lang->idAB);?></th>
-          <th class='c-pri'>   <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
           <th>                 <?php common::printOrderLink('title',    $orderBy, $vars, $lang->testcase->title);?></th>
           <th class='c-type'>  <?php common::printOrderLink('type',     $orderBy, $vars, $lang->typeAB);?></th>
           <th class='c-user'>  <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
diff --git a/module/user/view/todo.html.php b/module/user/view/todo.html.php
index 6abf82aebc..2fd685e39a 100644
--- a/module/user/view/todo.html.php
+++ b/module/user/view/todo.html.php
@@ -38,7 +38,7 @@
         <th class='c-id'>    <?php common::printOrderLink('id',     $orderBy, $vars, $lang->idAB);?></th>
         <th class='c-date'>  <?php common::printOrderLink('date',   $orderBy, $vars, $lang->todo->date);?></th>
         <th class='c-type'>  <?php common::printOrderLink('type',   $orderBy, $vars, $lang->todo->type);?></th>
-        <th class='c-pri'>   <?php common::printOrderLink('pri',    $orderBy, $vars, $lang->priAB);?></th>
+        <th class='c-pri' title='<?php echo $lang->pri;?>'>   <?php common::printOrderLink('pri',    $orderBy, $vars, $lang->priAB);?></th>
         <th>                 <?php common::printOrderLink('name',   $orderBy, $vars, $lang->todo->name);?></th>
         <th class='c-date'>  <?php common::printOrderLink('begin',  $orderBy, $vars, $lang->todo->beginAB);?></th>
         <th class='c-date'>  <?php common::printOrderLink('end',    $orderBy, $vars, $lang->todo->endAB);?></th>

From 751fec28e866323034b0336b3b844bb86dd6d2a5 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Mon, 21 Feb 2022 08:53:25 +0000
Subject: [PATCH 05/41] Finish task #49302.

---
 module/group/lang/resource.php                | 34 ++++++++++---------
 module/productplan/control.php                | 25 ++++++++++++++
 module/productplan/js/browse.js               |  2 ++
 module/productplan/lang/en.php                | 33 +++++++++++-------
 module/productplan/lang/zh-cn.php             | 33 +++++++++++-------
 module/productplan/model.php                  | 27 +++++++++++++++
 module/productplan/view/browsebylist.html.php | 24 ++++++++++---
 7 files changed, 131 insertions(+), 47 deletions(-)

diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index e34fe1783b..3dd57b32c0 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -563,22 +563,23 @@ $lang->story->methodOrder[140] = 'processStoryChange';
 
 /* Product plan. */
 $lang->resource->productplan = new stdclass();
-$lang->resource->productplan->browse           = 'browse';
-$lang->resource->productplan->create           = 'create';
-$lang->resource->productplan->edit             = 'edit';
-$lang->resource->productplan->delete           = 'delete';
-$lang->resource->productplan->view             = 'view';
-$lang->resource->productplan->linkStory        = 'linkStory';
-$lang->resource->productplan->unlinkStory      = 'unlinkStory';
-$lang->resource->productplan->batchUnlinkStory = 'batchUnlinkStory';
-$lang->resource->productplan->linkBug          = 'linkBug';
-$lang->resource->productplan->unlinkBug        = 'unlinkBug';
-$lang->resource->productplan->batchUnlinkBug   = 'batchUnlinkBug';
-$lang->resource->productplan->batchEdit        = 'batchEdit';
-$lang->resource->productplan->start            = 'start';
-$lang->resource->productplan->finish           = 'finish';
-$lang->resource->productplan->close            = 'close';
-$lang->resource->productplan->activate         = 'activate';
+$lang->resource->productplan->browse            = 'browse';
+$lang->resource->productplan->create            = 'create';
+$lang->resource->productplan->edit              = 'edit';
+$lang->resource->productplan->delete            = 'delete';
+$lang->resource->productplan->view              = 'view';
+$lang->resource->productplan->linkStory         = 'linkStory';
+$lang->resource->productplan->unlinkStory       = 'unlinkStory';
+$lang->resource->productplan->batchUnlinkStory  = 'batchUnlinkStory';
+$lang->resource->productplan->linkBug           = 'linkBug';
+$lang->resource->productplan->unlinkBug         = 'unlinkBug';
+$lang->resource->productplan->batchUnlinkBug    = 'batchUnlinkBug';
+$lang->resource->productplan->batchEdit         = 'batchEdit';
+$lang->resource->productplan->start             = 'start';
+$lang->resource->productplan->finish            = 'finish';
+$lang->resource->productplan->close             = 'close';
+$lang->resource->productplan->activate          = 'activate';
+$lang->resource->productplan->batchChangeStatus = 'batchChangeStatus';
 
 $lang->productplan->methodOrder[5]  = 'browse';
 $lang->productplan->methodOrder[10] = 'create';
@@ -596,6 +597,7 @@ $lang->productplan->methodOrder[65] = 'start';
 $lang->productplan->methodOrder[70] = 'finish';
 $lang->productplan->methodOrder[75] = 'close';
 $lang->productplan->methodOrder[80] = 'activate';
+$lang->productplan->methodOrder[85] = 'batchChangeStatus';
 
 /* Release. */
 $lang->resource->release = new stdclass();
diff --git a/module/productplan/control.php b/module/productplan/control.php
index 0eae192bfb..73249c0e97 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -181,6 +181,31 @@ class productplan extends control
         $this->display();
     }
 
+    /**
+     * Batch change the status of productplan.
+     *
+     * @param  string $status
+     * @access public
+     * @return void
+     */
+    public function batchChangeStatus($status)
+    {
+        if($this->post->planIDList)
+        {
+            $planIDList = $this->post->planIDList;
+            unset($_POST['planIDList']);
+            $allChanges = $this->productplan->batchChangeStatus($planIDList, $status);
+            if(dao::isError()) die(js::error(dao::getError()));
+            foreach($allChanges as $planID => $changes)
+            {
+                $this->loadModel('action');
+                $actionID = $this->action->create('productplan', $planID, 'edited');
+                $this->action->logHistory($actionID, $changes);
+            }
+            die(js::reload('parent'));
+        }
+    }
+
     /**
      * Delete a plan.
      *
diff --git a/module/productplan/js/browse.js b/module/productplan/js/browse.js
index b41b74cf9c..3df6eb3021 100644
--- a/module/productplan/js/browse.js
+++ b/module/productplan/js/browse.js
@@ -455,3 +455,5 @@ if(!window.kanbanDropRules)
         closed: ['doing']
     }
 }
+
+$('#submit').attr('id', 'submitButton');
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
index 8c86a68aaf..bb93a6bbe9 100644
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -33,19 +33,20 @@ $lang->productplan->allAB      = 'All';
 $lang->productplan->to         = 'To';
 $lang->productplan->more       = 'More';
 
-$lang->productplan->batchUnlink      = "Batch Unlink";
-$lang->productplan->unlinkAB         = "Unlink";
-$lang->productplan->linkStory        = "Link Story";
-$lang->productplan->unlinkStory      = "Unlink Story";
-$lang->productplan->unlinkStoryAB    = "Unlink";
-$lang->productplan->batchUnlinkStory = "Batch Unlink";
-$lang->productplan->linkedStories    = 'Linked Stories';
-$lang->productplan->unlinkedStories  = 'Unlinked Stories';
-$lang->productplan->updateOrder      = 'Order';
-$lang->productplan->createChildren   = "Create Child Plans";
-$lang->productplan->createExecution  = "Create {$lang->execution->common}";
-$lang->productplan->list             = 'List';
-$lang->productplan->kanban           = 'Kanban';
+$lang->productplan->batchUnlink       = "Batch Unlink";
+$lang->productplan->batchChangeStatus = "Batch Change Status";
+$lang->productplan->unlinkAB          = "Unlink";
+$lang->productplan->linkStory         = "Link Story";
+$lang->productplan->unlinkStory       = "Unlink Story";
+$lang->productplan->unlinkStoryAB     = "Unlink";
+$lang->productplan->batchUnlinkStory  = "Batch Unlink";
+$lang->productplan->linkedStories     = 'Linked Stories';
+$lang->productplan->unlinkedStories   = 'Unlinked Stories';
+$lang->productplan->updateOrder       = 'Order';
+$lang->productplan->createChildren    = "Create Child Plans";
+$lang->productplan->createExecution   = "Create {$lang->execution->common}";
+$lang->productplan->list              = 'List';
+$lang->productplan->kanban            = 'Kanban';
 
 $lang->productplan->linkBug          = "Link Bug";
 $lang->productplan->unlinkBug        = "Unlink Bug";
@@ -91,6 +92,7 @@ $lang->productplan->order      = "Order";
 $lang->productplan->deleted    = "Deleted";
 $lang->productplan->mailto     = "Mailto";
 $lang->productplan->status     = "Plan Status";
+$lang->productplan->planStatus = "Status";
 
 $lang->productplan->statusList['wait']   = 'Wait';
 $lang->productplan->statusList['doing']  = 'Doing';
@@ -132,6 +134,11 @@ $lang->productplan->featureBar['browse']['doing']  = 'Doing';
 $lang->productplan->featureBar['browse']['done']   = 'Done';
 $lang->productplan->featureBar['browse']['closed'] = 'Closed';
 
+$lang->productplan->statusList['wait']   = 'Wait';
+$lang->productplan->statusList['doing']  = 'Doing';
+$lang->productplan->statusList['done']   = 'Done';
+$lang->productplan->statusList['closed'] = 'Closed';
+
 $lang->productplan->orderList['begin_desc'] = 'Begin Descend';
 $lang->productplan->orderList['begin_asc']  = 'Begin Ascend';
 $lang->productplan->orderList['title_desc'] = 'Title Descend';
diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php
index 46f523b6c9..e36caf8863 100644
--- a/module/productplan/lang/zh-cn.php
+++ b/module/productplan/lang/zh-cn.php
@@ -33,19 +33,20 @@ $lang->productplan->allAB      = '所有';
 $lang->productplan->to         = '至';
 $lang->productplan->more       = '更多操作';
 
-$lang->productplan->batchUnlink      = "批量移除";
-$lang->productplan->unlinkAB         = "移除";
-$lang->productplan->linkStory        = "关联{$lang->SRCommon}";
-$lang->productplan->unlinkStory      = "移除{$lang->SRCommon}";
-$lang->productplan->unlinkStoryAB    = "移除";
-$lang->productplan->batchUnlinkStory = "批量移除{$lang->SRCommon}";
-$lang->productplan->linkedStories    = $lang->SRCommon;
-$lang->productplan->unlinkedStories  = "未关联{$lang->SRCommon}";
-$lang->productplan->updateOrder      = '排序';
-$lang->productplan->createChildren   = "创建子计划";
-$lang->productplan->createExecution  = "创建{$lang->execution->common}";
-$lang->productplan->list             = '列表';
-$lang->productplan->kanban           = '看板';
+$lang->productplan->batchUnlink       = "批量移除";
+$lang->productplan->batchChangeStatus = "批量修改状态";
+$lang->productplan->unlinkAB          = "移除";
+$lang->productplan->linkStory         = "关联{$lang->SRCommon}";
+$lang->productplan->unlinkStory       = "移除{$lang->SRCommon}";
+$lang->productplan->unlinkStoryAB     = "移除";
+$lang->productplan->batchUnlinkStory  = "批量移除{$lang->SRCommon}";
+$lang->productplan->linkedStories     = $lang->SRCommon;
+$lang->productplan->unlinkedStories   = "未关联{$lang->SRCommon}";
+$lang->productplan->updateOrder       = '排序';
+$lang->productplan->createChildren    = "创建子计划";
+$lang->productplan->createExecution   = "创建{$lang->execution->common}";
+$lang->productplan->list              = '列表';
+$lang->productplan->kanban            = '看板';
 
 $lang->productplan->linkBug          = "关联Bug";
 $lang->productplan->unlinkBug        = "移除Bug";
@@ -91,6 +92,7 @@ $lang->productplan->order      = "排序";
 $lang->productplan->deleted    = "已删除";
 $lang->productplan->mailto     = "抄送给";
 $lang->productplan->status     = "计划状态";
+$lang->productplan->planStatus = "状态";
 
 $lang->productplan->statusList['wait']   = '未开始';
 $lang->productplan->statusList['doing']  = '进行中';
@@ -132,6 +134,11 @@ $lang->productplan->featureBar['browse']['doing']  = '进行中';
 $lang->productplan->featureBar['browse']['done']   = '已完成';
 $lang->productplan->featureBar['browse']['closed'] = '已关闭';
 
+$lang->productplan->statusList['wait']   = '未开始';
+$lang->productplan->statusList['doing']  = '进行中';
+$lang->productplan->statusList['done']   = '已完成';
+$lang->productplan->statusList['closed'] = '已关闭';
+
 $lang->productplan->orderList['begin_desc'] = '计划开始时间倒序';
 $lang->productplan->orderList['begin_asc']  = '计划开始时间正序';
 $lang->productplan->orderList['title_desc'] = '计划名称倒序';
diff --git a/module/productplan/model.php b/module/productplan/model.php
index 3a4202134b..a8cd30660c 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -693,6 +693,33 @@ class productplanModel extends model
         return $changes;
     }
 
+    /**
+     * Batch change the status of productplan.
+     *
+     * @param  array   $planIDList
+     * @param  string  $status
+     * @access public
+     * @return array
+     */
+    public function batchChangeStatus($planIDList, $status)
+    {
+        $now = helper::now();
+        $allChanges = array();
+        $oldPlans = $this->getByIDList($planIDList, $status);
+        foreach($planIDList as $planID)
+        {
+            $oldPlan = $oldPlans[$planID];
+            if($status == $oldPlan->status) continue;
+
+            $plan = new stdclass();
+            $plan->status         = $status;
+
+            $this->dao->update(TABLE_PRODUCTPLAN)->data($plan)->autoCheck()->where('id')->eq((int)$planID)->exec();
+            if(!dao::isError()) $allChanges[$planID] = common::createChanges($oldPlan, $plan);
+        }
+        return $allChanges;
+    }
+
     /**
      * Check date for plan.
      *
diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php
index e49427f137..598fdb75df 100644
--- a/module/productplan/view/browsebylist.html.php
+++ b/module/productplan/view/browsebylist.html.php
@@ -48,7 +48,7 @@
       <?php $vars = "productID=$productID&branch=$branch&browseType=$browseType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
       <tr>
         <th class='c-id'>
-          <?php if(common::hasPriv('productplan', 'batchEdit')):?>
+          <?php if(common::hasPriv('productplan', 'batchEdit') or common::hasPriv('productplan', 'batchChangeStatus')):?>
           <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
             <label></label>
           </div>
@@ -104,7 +104,7 @@
       ?>
       <tr class='<?php echo $class;?>'>
         <td class='cell-id'>
-          <?php if(common::hasPriv('productplan', 'batchEdit')):?>
+          <?php if(common::hasPriv('productplan', 'batchEdit') or common::hasPriv('productplan', 'batchChangeStatus')):?>
           <?php echo html::checkbox('planIDList', array($plan->id => ''), '', $attribute) . html::a(helper::createLink('productplan', 'view', "planID=$plan->id"), sprintf('%03d', $plan->id));?>
           <?php else:?>
           <?php echo sprintf('%03d', $plan->id);?>
@@ -211,12 +211,26 @@
       </tbody>
     </table>
     <div class="table-footer">
-      <?php if(common::hasPriv('productplan', 'batchEdit')):?>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class="table-actions btn-toolbar">
-        <?php echo html::submitButton($lang->edit, '', 'btn');?>
-      </div>
+      <?php if(common::hasPriv('productplan', 'batchEdit')):?>
+      <?php $actionLink = $this->inlink('batchEdit', "productID=$product->id&branch=$branch");?>
+      <?php echo html::submitButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"", 'btn');?>
       <?php endif;?>
+      <?php if(common::hasPriv('productplan', 'batchChangeStatus')):?>
+        <button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->productplan->planStatus;?> <span class="caret"></span></button>
+        <div class="dropdown-menu search-list">
+        <div class="list-group">
+          <?php
+          foreach($lang->productplan->statusList as $key => $status)
+          {
+              $actionLink = $this->createLink('productplan', 'batchChangeStatus', "status=$key");
+              echo html::a('javascript:;', $status, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"");
+          }
+          ?>
+        </div>
+      <?php endif;?>
+      </div>
       <?php $pager->show('right', 'pagerjs');?>
     </div>
   </form>

From 9e85e74822ab79a4420410a85daf2200a3351c5e Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Mon, 21 Feb 2022 17:22:34 +0800
Subject: [PATCH 06/41] * Finish task #49459.

---
 module/upgrade/config.php                 |   2 +
 module/upgrade/control.php                |  14 +++
 module/upgrade/css/moveextfiles.css       |   7 ++
 module/upgrade/js/moveextfiles.js         |  28 +++++
 module/upgrade/lang/en.php                |  37 ++++---
 module/upgrade/lang/zh-cn.php             |  37 ++++---
 module/upgrade/model.php                  | 120 ++++++++++++++++++++++
 module/upgrade/view/moveextfiles.html.php |  44 ++++++++
 8 files changed, 255 insertions(+), 34 deletions(-)
 create mode 100644 module/upgrade/css/moveextfiles.css
 create mode 100644 module/upgrade/js/moveextfiles.js
 create mode 100644 module/upgrade/view/moveextfiles.html.php

diff --git a/module/upgrade/config.php b/module/upgrade/config.php
index 3f1b722dc8..a6f2839d5b 100644
--- a/module/upgrade/config.php
+++ b/module/upgrade/config.php
@@ -50,3 +50,5 @@ $config->upgrade->discardedBugTypes['zh-tw']['trackthings']  = '事務跟蹤';
 
 $config->delete['10.6'][]   = 'module/chat/ext/control/extensions.php';
 $config->delete['12.4.2'][] = 'www/js/ueditor';
+
+$config->upgrade->allModule = array('action','common','execution','job','productplan','search','testtask','admin','company','extension','kanban','program','setting','todo','api','compile','file','license','programplan','sonarqube','tree','automation','convert','git','mail','project','sso','tutorial','backup','cron','gitlab','message','projectbuild','stage','upgrade','block','custom','group','misc','projectrelease','stakeholder','user','branch','datatable','holiday','mr','projectstory','story','webhook','bug','dept','im','my','qa','svn','weekly','build','design','index','owt','release','task','caselib','dev','personnel','repo','testcase','ci','doc','install','pipeline','report','testreport','client','entry','jenkins','product','score','testsuite');
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index fc29abaa09..94440f0dc1 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -863,4 +863,18 @@ class upgrade extends control
     {
         die($this->dao->select('status')->from(TABLE_PROGRAM)->where('id')->eq($programID)->fetch('status'));
     }
+
+    /**
+     * Move Extent files.
+     *
+     * @access public
+     * @return void
+     */
+    public function moveEXTFiles()
+    {
+        if(!empty($_POST)) $this->upgrade->moveEXTFiles();
+
+        $this->view->files = $this->upgrade->getEXTFiles();
+        $this->display();
+    }
 }
diff --git a/module/upgrade/css/moveextfiles.css b/module/upgrade/css/moveextfiles.css
new file mode 100644
index 0000000000..8c1e7088ce
--- /dev/null
+++ b/module/upgrade/css/moveextfiles.css
@@ -0,0 +1,7 @@
+.modal-dialog {margin-top: 5px;}
+.modal-body {overflow-y: scroll;}
+@media screen and (max-width: 1920px) {.modal-body {height:550px}}
+@media screen and (max-width: 1366px) {.modal-body {height:450px}}
+
+.modal-body .panel-heading {padding: 0px;}
+.modal-body #collapseOne {margin-left: 20px;} 
diff --git a/module/upgrade/js/moveextfiles.js b/module/upgrade/js/moveextfiles.js
new file mode 100644
index 0000000000..13c70891a2
--- /dev/null
+++ b/module/upgrade/js/moveextfiles.js
@@ -0,0 +1,28 @@
+$('#checkAll').click(function()
+{
+    if($(this).is(':checked'))
+    {
+        $("[name^='files']").prop('checked', true);
+    }
+    else
+    {
+        $("[name^='files']").prop('checked', false);
+    }
+})
+
+$("[name^='files']").click(function()
+{
+    if($(this).is(':checked'))
+    {
+        var checked = true;
+        $("[name^='files']").each(function()
+        {
+            if(!$(this).is(':checked')) checked = false;
+        });
+        $('#checkAll').prop('checked', checked);
+    }
+    else
+    {
+        $('#checkAll').prop('checked', false);
+    }
+})
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index 42d691c634..f94fa42bfa 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -96,23 +96,26 @@ $lang->upgrade->to15Mode['new']     = 'Use the program mode';
 $lang->upgrade->selectedModeTips['classic'] = 'You can also switch to the Program mode in the Admin-Custom-Custom later.';
 $lang->upgrade->selectedModeTips['new']     = 'Switching to the program management mode requires merging the previous data, and the system will guide you to complete this operation.';
 
-$lang->upgrade->line          = 'Product Line';
-$lang->upgrade->allLines      = "All Product Lines";
-$lang->upgrade->program       = 'Merge Project';
-$lang->upgrade->existProgram  = 'Existing programs';
-$lang->upgrade->existProject  = 'Existing projects';
-$lang->upgrade->existLine     = 'Existing' . $lang->productCommon . ' lines';
-$lang->upgrade->product       = $lang->productCommon;
-$lang->upgrade->project       = 'Iteration';
-$lang->upgrade->repo          = 'Repo';
-$lang->upgrade->mergeRepo     = 'Merge Repo';
-$lang->upgrade->setProgram    = 'Set the project to which the program belongs';
-$lang->upgrade->dataMethod    = 'Data migration method';
-$lang->upgrade->begin         = 'Begin Date';
-$lang->upgrade->end           = 'End Date';
-$lang->upgrade->selectProject = 'The target project';
-$lang->upgrade->programName   = 'Program Name';
-$lang->upgrade->projectName   = 'Project Name';
+$lang->upgrade->line           = 'Product Line';
+$lang->upgrade->allLines       = "All Product Lines";
+$lang->upgrade->program        = 'Merge Project';
+$lang->upgrade->existProgram   = 'Existing programs';
+$lang->upgrade->existProject   = 'Existing projects';
+$lang->upgrade->existLine      = 'Existing' . $lang->productCommon . ' lines';
+$lang->upgrade->product        = $lang->productCommon;
+$lang->upgrade->project        = 'Iteration';
+$lang->upgrade->repo           = 'Repo';
+$lang->upgrade->mergeRepo      = 'Merge Repo';
+$lang->upgrade->setProgram     = 'Set the project to which the program belongs';
+$lang->upgrade->dataMethod     = 'Data migration method';
+$lang->upgrade->begin          = 'Begin Date';
+$lang->upgrade->end            = 'End Date';
+$lang->upgrade->selectProject  = 'The target project';
+$lang->upgrade->programName    = 'Program Name';
+$lang->upgrade->projectName    = 'Project Name';
+$lang->upgrade->moveEXTFiles   = 'Migrate Expansion Files';
+$lang->upgrade->fileName       = 'File Name';
+$lang->upgrade->viewChargeFile = 'View Charge Version Files';
 
 $lang->upgrade->newProgram         = 'Create';
 $lang->upgrade->editedName         = 'New Name';
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index 5dd59ab9f9..ca9a8dccaa 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -96,23 +96,26 @@ $lang->upgrade->to15Mode['new']     = '全新项目集管理模式';
 $lang->upgrade->selectedModeTips['classic'] = '后续您还可以在后台-自定义里面切换为全新项目集管理的模式。';
 $lang->upgrade->selectedModeTips['new']     = '切换为项目集管理模式需要对之前的数据进行归并处理，系统会引导您完成这个操作。';
 
-$lang->upgrade->line          = '产品线';
-$lang->upgrade->allLines      = "所有{$lang->productCommon}线";
-$lang->upgrade->program       = '目标项目集和项目';
-$lang->upgrade->existProgram  = '已有项目集';
-$lang->upgrade->existProject  = '已有项目';
-$lang->upgrade->existLine     = '已有' . $lang->productCommon . '线';
-$lang->upgrade->product       = $lang->productCommon;
-$lang->upgrade->project       = '迭代';
-$lang->upgrade->repo          = '版本库';
-$lang->upgrade->mergeRepo     = '归并版本库';
-$lang->upgrade->setProgram    = '设置项目所属项目集';
-$lang->upgrade->dataMethod    = '数据迁移方式';
-$lang->upgrade->begin         = '开始日期';
-$lang->upgrade->end           = '结束日期';
-$lang->upgrade->selectProject = '目标项目';
-$lang->upgrade->programName   = '项目集名称';
-$lang->upgrade->projectName   = '项目名称';
+$lang->upgrade->line           = '产品线';
+$lang->upgrade->allLines       = "所有{$lang->productCommon}线";
+$lang->upgrade->program        = '目标项目集和项目';
+$lang->upgrade->existProgram   = '已有项目集';
+$lang->upgrade->existProject   = '已有项目';
+$lang->upgrade->existLine      = '已有' . $lang->productCommon . '线';
+$lang->upgrade->product        = $lang->productCommon;
+$lang->upgrade->project        = '迭代';
+$lang->upgrade->repo           = '版本库';
+$lang->upgrade->mergeRepo      = '归并版本库';
+$lang->upgrade->setProgram     = '设置项目所属项目集';
+$lang->upgrade->dataMethod     = '数据迁移方式';
+$lang->upgrade->begin          = '开始日期';
+$lang->upgrade->end            = '结束日期';
+$lang->upgrade->selectProject  = '目标项目';
+$lang->upgrade->programName    = '项目集名称';
+$lang->upgrade->projectName    = '项目名称';
+$lang->upgrade->moveEXTFiles   = '迁移插件文件';
+$lang->upgrade->fileName       = '文件名称';
+$lang->upgrade->viewChargeFile = '查看收费版本文件';
 
 $lang->upgrade->newProgram         = '新建';
 $lang->upgrade->editedName         = '调整后名称';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 458aa13d3b..2afe6592c7 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -5633,4 +5633,124 @@ class upgradeModel extends model
         }
         return true;
     }
+
+    /**
+     * Get extent files.
+     *
+     * @access public
+     * @return array
+     */
+    public function getEXTFiles()
+    {
+        $files           = array();
+        $files['custom'] = array();
+        $files['charge'] = array();
+
+        $dirs = array('control', 'model', 'css', 'js', 'view', 'config', 'lang');
+        foreach($this->config->upgrade->allModule as $module)
+        {
+            $extRoot = $this->app->moduleRoot . $module . DIRECTORY_SEPARATOR . 'ext';
+            if(!is_dir($extRoot)) continue;
+            
+            foreach($dirs as $dir)
+            {
+                $realPath = $extRoot . DIRECTORY_SEPARATOR . $dir;
+                $path     = $module . DIRECTORY_SEPARATOR . 'ext' . DIRECTORY_SEPARATOR . $dir;
+
+                if(is_dir($realPath))
+                {
+                    /* If both the control and model files are encrypted, the current module is not customized. */
+                    if($dir != 'control' and $dir != 'model' and empty($files['custom'])) continue;
+
+                    $extFiles = $this->getPluginFiles($module, $dir, $realPath, $path);
+                    $files['custom'] += $extFiles['custom'];
+                    $files['charge'] += $extFiles['charge'];
+                }
+            }
+        }
+
+        return $files;
+    }
+
+    /**
+     * Get plugin files.
+     *
+     * @param  string $module
+     * @param  string $dir
+     * @param  string $realPath
+     * @param  string $path
+     * @access public
+     * @return array
+     */
+    public function getPluginFiles($module, $dir, $realPath, $path)
+    {
+        $files = array();
+        $files['custom'] = array();
+        $files['charge'] = array();
+
+        $extFiles = scandir($realPath);
+        foreach($extFiles as $extFile)
+        {
+            if($extFile === '.' or $extFile === '..') continue;
+
+            $filePath = $realPath . DIRECTORY_SEPARATOR . $extFile;
+            $fileName = $path . DIRECTORY_SEPARATOR . $extFile;
+
+            /* If the current point to a directory, traverse the files in the directory. */
+            if(is_dir($filePath))
+            {
+                $pluginFiles = $this->getPluginFiles($module, $dir, $filePath, $fileName);
+
+                $files['custom'] += $pluginFiles['custom'];
+                $files['charge'] += $pluginFiles['charge'];
+            }
+            else
+            {
+                $handle = fopen($filePath, 'r');
+                $i      = 0;
+                $line   = '';
+                while(!feof($handle))
+                {
+                    $line = fgets($handle);
+                    if(++ $i > 1) break;
+                }
+                fclose($handle);
+
+                /* Determine whether the current file is encrypted. */
+                if(($dir == 'control' or $dir == 'model') and strpos($line, "extension_loaded('ionCube Loader')") !== false)
+                {
+                    $files['charge'][$fileName] = $fileName;
+                }
+                else
+                {
+                    $files['custom'][$fileName] = $fileName;
+                }
+            }
+        }
+
+        return $files;
+    }
+
+    /**
+     * Move extent files.
+     * 
+     * @access public
+     * @return void
+     */
+    public function moveEXTFiles()
+    {
+        $data       = fixer::input('post')->get();
+        $customRoot = $this->app->appRoot . 'extension' . DIRECTORY_SEPARATOR . 'custom';
+        if(!is_dir($customRoot)) @mkdir($customRoot, 0777);
+
+        foreach($data->files as $file)
+        {
+            $dirRoot  = $customRoot . DIRECTORY_SEPARATOR . dirname($file);
+            $fileName = basename($file);
+            $fromPath = $this->app->getModuleRoot() . $file;
+            $toPath   = $dirRoot . DIRECTORY_SEPARATOR . $fileName;
+            if(!is_dir($dirRoot)) @mkdir($dirRoot, 0777, true);
+            copy($fromPath, $toPath);
+        }
+    }
 }
diff --git a/module/upgrade/view/moveextfiles.html.php b/module/upgrade/view/moveextfiles.html.php
new file mode 100644
index 0000000000..6872d39285
--- /dev/null
+++ b/module/upgrade/view/moveextfiles.html.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * The moveextfiles view file of upgrade module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Shujie Tian <tianshujie@cnezsoft.com>
+ * @package     upgrade
+ * @version     $Id: moveextfiles.html.php 5119 2022-02-21 13:22:42Z $
+ */
+?>
+<?php include '../../common/view/header.lite.html.php';?>
+<div class='container'>
+  <form method='post' target='hiddenwin'>
+    <div class='modal-dialog'>
+      <div class='modal-header'>
+        <strong><?php echo $lang->upgrade->moveEXTFiles;?></strong>
+      </div>
+      <div class='modal-body'>
+        <div>
+          <div class="checkbox-primary" title="<?php echo $lang->selectAll?>">
+            <input type='checkbox' id='checkAll' checked><label for='checkAll'><strong><?php echo $lang->upgrade->fileName;?></strong></label>
+          </div>
+          <?php echo html::checkbox('files', $files['custom'], '', 'checked');?>
+          <?php if(empty($files['charge'])):?>
+          <div class="panel">
+            <div class="panel-heading" id="headingOne">
+              <h4 class="panel-title">
+                <a data-toggle="collapse" href="#collapseOne"><?php echo $lang->upgrade->viewChargeFile;?></a>
+              </h4>
+            </div>
+            <div id="collapseOne" class="collapse">
+              <?php echo html::checkbox('files', $files['custom'], '', 'checked');?>
+            </div>
+          </div>
+          <?php endif;?>
+          <div></div>
+        </div>
+      </div>
+      <div class='modal-footer text-center'><?php echo html::submitButton();?></div>
+    </div>
+  </form>
+</div>
+<?php include '../../common/view/footer.lite.html.php';?>

From 9b6903f6eb97ddcb321c23fefa4a9c9c1a886660 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Mon, 21 Feb 2022 17:23:09 +0800
Subject: [PATCH 07/41] * Finish task#49418.

---
 module/kanban/control.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index 20e39ebe11..46fb4c5eef 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1692,6 +1692,8 @@ class kanban extends control
      *
      * @param  int    $regionID
      * @param  string $type all|story|task|bug
+     * @param  string $field otherLane|lane
+     * @param  int    $i
      * @access public
      * @return string
      */

From b17c3c82069665e39535983d044d30870131fb25 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Tue, 22 Feb 2022 08:42:32 +0800
Subject: [PATCH 08/41] * Move die to return print.

---
 framework/helper.class.php   |  2 +-
 module/backup/control.php    | 38 ++++++++---------
 module/block/control.php     | 46 ++++++++++-----------
 module/branch/control.php    | 38 ++++++++---------
 module/branch/model.php      |  4 +-
 module/bug/control.php       | 48 +++++++++++-----------
 module/bug/model.php         | 18 ++++----
 module/build/control.php     | 60 +++++++++++++--------------
 module/caselib/control.php   | 34 ++++++++--------
 module/caselib/model.php     |  6 +--
 module/common/model.php      | 16 ++++----
 module/company/control.php   | 10 ++---
 module/convert/control.php   | 66 +++++++++++++++---------------
 module/cron/control.php      | 62 ++++++++++++++--------------
 module/custom/control.php    | 36 ++++++++--------
 module/datatable/control.php |  4 +-
 module/dept/control.php      | 18 ++++----
 module/doc/control.php       | 44 ++++++++++----------
 module/doc/model.php         |  6 +--
 module/execution/control.php | 79 +++++++++++++++++-------------------
 module/execution/model.php   | 20 ++++-----
 module/extension/control.php | 40 +++++++++---------
 module/file/control.php      | 36 ++++++++--------
 module/file/model.php        | 10 ++---
 module/git/control.php       |  5 +--
 module/gitlab/control.php    | 42 +++++++++----------
 module/gitlab/model.php      |  2 +-
 module/group/control.php     | 26 ++++++------
 28 files changed, 405 insertions(+), 411 deletions(-)

diff --git a/framework/helper.class.php b/framework/helper.class.php
index 91d903476a..ddc4aecb30 100644
--- a/framework/helper.class.php
+++ b/framework/helper.class.php
@@ -255,7 +255,7 @@ class helper extends baseHelper
      * @param string $content
      * @return void
      */
-    public static function end($content)
+    public static function end($content = '')
     {
         throw EndResponseException::create($content);
     }
diff --git a/module/backup/control.php b/module/backup/control.php
index 62144de15a..40f081973d 100644
--- a/module/backup/control.php
+++ b/module/backup/control.php
@@ -98,7 +98,7 @@ class backup extends control
             if($reload == 'yes')
             {
                 echo js::alert(sprintf($this->lang->backup->error->noWritable, $this->backupPath));
-                die(js::reload('parent'));
+                return print(js::reload('parent'));
             }
             else
             {
@@ -117,7 +117,7 @@ class backup extends control
                 if($reload == 'yes')
                 {
                     echo js::alert(sprintf($this->lang->backup->error->backupFile, $result->error));
-                    die(js::reload('parent'));
+                    return print(js::reload('parent'));
                 }
                 else
                 {
@@ -133,7 +133,7 @@ class backup extends control
                 if($reload == 'yes')
                 {
                     echo js::alert(sprintf($this->lang->backup->error->backupCode, $result->error));
-                    die(js::reload('parent'));
+                    return print(js::reload('parent'));
                 }
                 else
                 {
@@ -164,7 +164,7 @@ class backup extends control
             }
         }
 
-        if($reload == 'yes') die(js::reload('parent'));
+        if($reload == 'yes') return print(js::reload('parent'));
         echo $this->lang->backup->success->backup . "\n";
     }
 
@@ -245,7 +245,7 @@ class backup extends control
             rename($this->backupPath . $fileName . '.code.zip.php', $this->backupPath . $fileName . '.code.zip');
         }
 
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
@@ -258,26 +258,26 @@ class backup extends control
      */
     public function delete($fileName, $confirm = 'no')
     {
-        if($confirm == 'no') die(js::confirm($this->lang->backup->confirmDelete, inlink('delete', "fileName=$fileName&confirm=yes")));
+        if($confirm == 'no') return print(js::confirm($this->lang->backup->confirmDelete, inlink('delete', "fileName=$fileName&confirm=yes")));
 
         /* Delete database file. */
         if(file_exists($this->backupPath . $fileName . '.sql.php') and !unlink($this->backupPath . $fileName . '.sql.php'))
         {
-            die(js::alert(sprintf($this->lang->backup->error->noDelete, $this->backupPath . $fileName . '.sql.php')));
+            return print(js::alert(sprintf($this->lang->backup->error->noDelete, $this->backupPath . $fileName . '.sql.php')));
         }
         if(file_exists($this->backupPath . $fileName . '.sql') and !unlink($this->backupPath . $fileName . '.sql'))
         {
-            die(js::alert(sprintf($this->lang->backup->error->noDelete, $this->backupPath . $fileName . '.sql')));
+            return print(js::alert(sprintf($this->lang->backup->error->noDelete, $this->backupPath . $fileName . '.sql')));
         }
 
         /* Delete attatchments file. */
         if(file_exists($this->backupPath . $fileName . '.file.zip.php') and !unlink($this->backupPath . $fileName . '.file.zip.php'))
         {
-            die(js::alert(sprintf($this->lang->backup->error->noDelete, $this->backupPath . $fileName . '.file.zip.php')));
+            return print(js::alert(sprintf($this->lang->backup->error->noDelete, $this->backupPath . $fileName . '.file.zip.php')));
         }
         if(file_exists($this->backupPath . $fileName . '.file.zip') and !unlink($this->backupPath . $fileName . '.file.zip'))
         {
-            die(js::alert(sprintf($this->lang->backup->error->noDelete, $this->backupPath . $fileName . '.file.zip')));
+            return print(js::alert(sprintf($this->lang->backup->error->noDelete, $this->backupPath . $fileName . '.file.zip')));
         }
         if(file_exists($this->backupPath . $fileName . '.file'))
         {
@@ -289,11 +289,11 @@ class backup extends control
         /* Delete code file. */
         if(file_exists($this->backupPath . $fileName . '.code.zip.php') and !unlink($this->backupPath . $fileName . '.code.zip.php'))
         {
-            die(js::alert(sprintf($this->lang->backup->error->noDelete, $this->backupPath . $fileName . '.code.zip.php')));
+            return print(js::alert(sprintf($this->lang->backup->error->noDelete, $this->backupPath . $fileName . '.code.zip.php')));
         }
         if(file_exists($this->backupPath . $fileName . '.code.zip') and !unlink($this->backupPath . $fileName . '.code.zip'))
         {
-            die(js::alert(sprintf($this->lang->backup->error->noDelete, $this->backupPath . $fileName . '.code.zip')));
+            return print(js::alert(sprintf($this->lang->backup->error->noDelete, $this->backupPath . $fileName . '.code.zip')));
         }
         if(file_exists($this->backupPath . $fileName . '.code'))
         {
@@ -302,7 +302,7 @@ class backup extends control
             $this->backup->processSummary($this->backupPath . $fileName . '.code', 0, 0, array(), 0, 'delete');
         }
 
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
@@ -317,7 +317,7 @@ class backup extends control
         {
             $data = fixer::input('post')->get();
             $this->loadModel('setting')->setItem('system.backup.holdDays', $data->holdDays);
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $this->display();
@@ -337,7 +337,7 @@ class backup extends control
         {
             $this->app->loadLang('extension');
             $this->view->error = sprintf($this->lang->extension->noticeOkFile, str_replace(dirname($this->app->getBasePath()) . DS, '', $statusFile));
-            die($this->display());
+            return print($this->display());
         }
 
         if(strtolower($this->server->request_method) == "post")
@@ -355,14 +355,14 @@ class backup extends control
             if($settingDir)
             {
                 $settingDir = rtrim($settingDir, DS) . DS;
-                if(!is_dir($settingDir) and mkdir($settingDir, 0777, true)) die(js::alert($this->lang->backup->error->noCreateDir));
-                if(!is_writable($settingDir)) die(js::alert(strip_tags(sprintf($this->lang->backup->error->noWritable, $settingDir))));
+                if(!is_dir($settingDir) and mkdir($settingDir, 0777, true)) return print(js::alert($this->lang->backup->error->noCreateDir));
+                if(!is_writable($settingDir)) return print(js::alert(strip_tags(sprintf($this->lang->backup->error->noWritable, $settingDir))));
                 if($data->settingDir == $this->app->getTmpRoot() . 'backup' . DS) $settingDir = '';
             }
 
             $this->setting->setItem('system.backup.settingDir', $settingDir);
 
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
         $this->display();
     }
@@ -406,6 +406,6 @@ class backup extends control
             $message = sprintf($this->lang->backup->progressCode, zget($log, 'allCount', 0), zget($log, 'count', 0));
         }
 
-        die($message);
+        return print($message);
     }
 }
diff --git a/module/block/control.php b/module/block/control.php
index f0c3690fb1..5be2e40f64 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -22,7 +22,7 @@ class block extends control
         parent::__construct($moduleName, $methodName);
         /* Mark the call from zentao or ranzhi. */
         $this->selfCall = !isset($_GET['hash']);
-        if($this->methodName != 'admin' and $this->methodName != 'dashboard' and !$this->selfCall and !$this->loadModel('sso')->checkKey()) die('');
+        if($this->methodName != 'admin' and $this->methodName != 'dashboard' and !$this->selfCall and !$this->loadModel('sso')->checkKey()) helper::end('');
     }
 
     /**
@@ -103,8 +103,8 @@ class block extends control
         {
             $source = isset($this->lang->block->moduleList[$source]) ? $source : '';
             $this->block->save($id, $source, $type, $this->session->blockModule);
-            if(dao::isError()) die(js::error(dao::geterror()));
-            die(js::reload('parent'));
+            if(dao::isError()) return print(js::error(dao::geterror()));
+            return print(js::reload('parent'));
         }
 
         $block = $this->block->getByID($id);
@@ -245,7 +245,7 @@ class block extends control
         /* Init block when vist index first. */
         if((empty($blocks) and !$inited and !defined('TUTORIAL')))
         {
-            if($this->block->initBlock($module, $type)) die(js::reload());
+            if($this->block->initBlock($module, $type)) return print(js::reload());
         }
 
         $acls = $this->app->user->rights['acls'];
@@ -313,7 +313,7 @@ class block extends control
         $this->view->shortBlocks = $shortBlocks;
         $this->view->module      = $module;
 
-        if($this->app->getViewType() == 'json') die(json_encode($blocks));
+        if($this->app->getViewType() == 'json') return print(json_encode($blocks));
 
         $this->display();
     }
@@ -455,7 +455,7 @@ class block extends control
             $this->app->loadLang('common');
             $this->app->loadLang('block');
 
-            if(!$this->block->checkAPI($this->get->hash)) die();
+            if(!$this->block->checkAPI($this->get->hash)) return print();
         }
 
         $mode = strtolower($this->get->mode);
@@ -567,7 +567,7 @@ class block extends control
                 $output['status'] = is_object($this->view) ? 'success' : 'fail';
                 $output['data']   = json_encode($this->view);
                 $output['md5']    = md5(json_encode($this->view));
-                die(json_encode($output));
+                return print(json_encode($output));
             }
 
             $this->display();
@@ -629,7 +629,7 @@ class block extends control
     public function printTaskBlock()
     {
         $this->session->set('taskList',  $this->app->getURI(true), 'execution');
-        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
+        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
 
         $account = $this->app->user->account;
         $type    = $this->params->type;
@@ -647,7 +647,7 @@ class block extends control
     public function printBugBlock()
     {
         $this->session->set('bugList', $this->app->getURI(true), 'qa');
-        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
+        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
 
         $projectID = $this->lang->navGroup->qa  == 'project' ? $this->session->project : 0;
         $projectID = $this->view->block->module == 'my' ? 0 : $projectID;
@@ -710,7 +710,7 @@ class block extends control
         $this->session->set('productList',  $this->app->getURI(true), 'product');
         $this->session->set('testtaskList', $this->app->getURI(true), 'qa');
         $this->session->set('buildList',    $this->app->getURI(true), 'execution');
-        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
+        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
 
         $this->view->testtasks = $this->dao->select('distinct t1.*,t2.name as productName,t3.name as buildName,t4.name as projectName')->from(TABLE_TESTTASK)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
@@ -736,7 +736,7 @@ class block extends control
     public function printStoryBlock()
     {
         $this->session->set('storyList', $this->app->getURI(true), 'product');
-        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
+        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
 
         $this->app->loadClass('pager', $static = true);
         $count   = isset($this->params->count) ? (int)$this->params->count : 0;
@@ -840,7 +840,7 @@ class block extends control
     public function printProductBlock()
     {
         $this->app->loadClass('pager', $static = true);
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
         $count = isset($this->params->count) ? (int)$this->params->count : 0;
         $type  = isset($this->params->type) ? $this->params->type : '';
         $pager = pager::init(0, $count , 1);
@@ -881,7 +881,7 @@ class block extends control
      */
     public function printProjectStatisticBlock()
     {
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
 
         /* Load models and langs. */
         $this->loadModel('project');
@@ -956,7 +956,7 @@ class block extends control
      */
     public function printProductStatisticBlock($storyType = 'story')
     {
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
 
         $status = isset($this->params->type) ? $this->params->type : '';
         $count  = isset($this->params->count) ? $this->params->count : '';
@@ -1055,7 +1055,7 @@ class block extends control
      */
     public function printExecutionStatisticBlock()
     {
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
 
         $this->app->loadLang('task');
         $this->app->loadLang('story');
@@ -1238,7 +1238,7 @@ class block extends control
     {
         $uri = $this->app->getURI(true);
         $this->session->set('issueList', $uri, 'project');
-        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
+        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
         $this->view->users  = $this->loadModel('user')->getPairs('noletter');
         $this->view->issues = $this->loadModel('issue')->getBlockIssues($this->session->project, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
     }
@@ -1347,7 +1347,7 @@ class block extends control
      */
     public function printScrumListBlock()
     {
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
         $count = isset($this->params->count) ? (int)$this->params->count : 15;
         $type  = isset($this->params->type) ? $this->params->type : 'undone';
 
@@ -1505,7 +1505,7 @@ class block extends control
      */
     public function printQaStatisticBlock()
     {
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
 
         $this->app->loadLang('bug');
         $status = isset($this->params->type)  ? $this->params->type : '';
@@ -1680,7 +1680,7 @@ class block extends control
     public function printExecutionBlock()
     {
         $this->app->loadClass('pager', $static = true);
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
         $count  = isset($this->params->count) ? (int)$this->params->count : 0;
         $status = isset($this->params->type)  ? $this->params->type : 'all';
         $pager  = pager::init(0, $count, 1);
@@ -1866,7 +1866,7 @@ class block extends control
         $closedBlock = isset($this->config->block->closed) ? $this->config->block->closed : '';
         $this->dao->delete()->from(TABLE_BLOCK)->where('source')->eq($block->source)->andWhere('block')->eq($block->block)->exec();
         $this->loadModel('setting')->setItem('system.block.closed', $closedBlock . ",{$block->source}|{$block->block}");
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
@@ -1879,7 +1879,7 @@ class block extends control
      */
     public function ajaxReset($module, $confirm = 'no')
     {
-        if($confirm != 'yes') die(js::confirm($this->lang->block->confirmReset, inlink('ajaxReset', "module=$module&confirm=yes")));
+        if($confirm != 'yes') return print(js::confirm($this->lang->block->confirmReset, inlink('ajaxReset', "module=$module&confirm=yes")));
 
         $this->dao->delete()->from(TABLE_BLOCK)
             ->where('module')->eq($module)
@@ -1893,7 +1893,7 @@ class block extends control
             ->andWhere('owner')->eq($this->app->user->account)
             ->andWhere('`key`')->eq('blockInited')
             ->exec();
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
@@ -1910,7 +1910,7 @@ class block extends control
         {
             $this->dao->delete()->from(TABLE_BLOCK)->where('module')->eq($module)->andWhere('account')->eq($this->app->user->account)->exec();
             $this->dao->delete()->from(TABLE_CONFIG)->where('module')->eq($module)->andWhere('owner')->eq($this->app->user->account)->andWhere('`key`')->eq('blockInited')->exec();
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
         elseif($confirm == 'no')
         {
diff --git a/module/branch/control.php b/module/branch/control.php
index 25a6266d33..a544658112 100644
--- a/module/branch/control.php
+++ b/module/branch/control.php
@@ -62,10 +62,10 @@ class branch extends control
         if($_POST)
         {
             $branchID = $this->branch->create($productID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             $this->loadModel('action')->create('branch', $branchID, 'Opened');
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $this->view->product = $this->loadModel('product')->getById($productID);
@@ -84,10 +84,10 @@ class branch extends control
         if($_POST)
         {
             $changes = $this->branch->update($branchID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($changes) $this->loadModel('action')->create('branch', $branchID, 'Edited');
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $this->view->product = $this->loadModel('product')->getById($productID);
@@ -116,12 +116,12 @@ class branch extends control
                 if($change) $this->action->create('branch', $branchID, 'Edited', '', $extra);
             }
 
-            die(js::locate($this->session->branchManage, 'parent'));
+            return print(js::locate($this->session->branchManage, 'parent'));
         }
 
         $branchList   = $this->branch->getList($productID, 0, 'all');
         $branchIDList = $this->post->branchIDList;
-        if(empty($branchIDList)) die(js::locate($this->session->branchManage, 'parent'));
+        if(empty($branchIDList)) return print(js::locate($this->session->branchManage, 'parent'));
 
         foreach($branchList as $branch)
         {
@@ -148,14 +148,14 @@ class branch extends control
 
         if($confirm == 'no')
         {
-            die(js::confirm(str_replace('@branch@', $this->lang->product->branchName[$productType], $this->lang->branch->confirmClose), inlink('close', "branchID=$branchID&confirm=yes")));
+            return print(js::confirm(str_replace('@branch@', $this->lang->product->branchName[$productType], $this->lang->branch->confirmClose), inlink('close', "branchID=$branchID&confirm=yes")));
         }
 
         $this->branch->close($branchID);
-        if(dao::isError()) die(js::error(dao::getError()));
+        if(dao::isError()) return print(js::error(dao::getError()));
 
         $this->loadModel('action')->create('branch', $branchID, 'Closed');
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
@@ -173,14 +173,14 @@ class branch extends control
 
         if($confirm == 'no')
         {
-            die(js::confirm(str_replace('@branch@', $this->lang->product->branchName[$productType], $this->lang->branch->confirmActivate), inlink('activate', "branchID=$branchID&confirm=yes")));
+            return print(js::confirm(str_replace('@branch@', $this->lang->product->branchName[$productType], $this->lang->branch->confirmActivate), inlink('activate', "branchID=$branchID&confirm=yes")));
         }
 
         $this->branch->activate($branchID);
-        if(dao::isError()) die(js::error(dao::getError()));
+        if(dao::isError()) return print(js::error(dao::getError()));
 
         $this->loadModel('action')->create('branch', $branchID, 'Activated');
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
@@ -236,14 +236,14 @@ class branch extends control
     {
         $this->app->loadLang('product');
         $productType = $this->branch->getProductType($branchID);
-        if(!$this->branch->checkBranchData($branchID)) die(js::alert(str_replace('@branch@', $this->lang->product->branchName[$productType], $this->lang->branch->canNotDelete)));
+        if(!$this->branch->checkBranchData($branchID)) return print(js::alert(str_replace('@branch@', $this->lang->product->branchName[$productType], $this->lang->branch->canNotDelete)));
         if($confirm == 'no')
         {
-            die(js::confirm(str_replace('@branch@', $this->lang->product->branchName[$productType], $this->lang->branch->confirmDelete), inlink('delete', "branchID=$branchID&confirm=yes")));
+            return print(js::confirm(str_replace('@branch@', $this->lang->product->branchName[$productType], $this->lang->branch->confirmDelete), inlink('delete', "branchID=$branchID&confirm=yes")));
         }
 
         $this->branch->delete(TABLE_BRANCH, $branchID);
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
@@ -260,7 +260,7 @@ class branch extends control
     {
         $param   = $param ? $param : 'all';
         $product = $this->loadModel('product')->getById($productID);
-        if(empty($product) or $product->type == 'normal') die();
+        if(empty($product) or $product->type == 'normal') return print();
 
         $branches = $this->loadModel('branch')->getList($productID, $projectID, $param);
         $branchOption    = array();
@@ -270,7 +270,7 @@ class branch extends control
             $branchOption[$branchInfo->id]    = $branchInfo->name;
             $branchTagOption[$branchInfo->id] = $branchInfo->name . ($branchInfo->status == 'closed' ? ' (' . $this->lang->branch->statusList['closed'] . ')' : '');
         }
-        die(html::select('branch', strpos($param, 'active') !== false ? $branchOption : $branchTagOption, $oldBranch, "class='form-control' onchange='loadBranch(this)'"));
+        return print(html::select('branch', strpos($param, 'active') !== false ? $branchOption : $branchTagOption, $oldBranch, "class='form-control' onchange='loadBranch(this)'"));
     }
 
     /**
@@ -288,14 +288,14 @@ class branch extends control
         {
             $this->app->loadLang('product');
             $productType = $this->dao->findById($productID)->from(TABLE_PRODUCT)->fetch('type');
-            die(js::confirm(str_replace('@branch@', $this->lang->product->branchName[$productType], $this->lang->branch->confirmSetDefault), inlink('setDefault', "productID=$productID&branchID=$branchID&confirm=yes")));
+            return print(js::confirm(str_replace('@branch@', $this->lang->product->branchName[$productType], $this->lang->branch->confirmSetDefault), inlink('setDefault', "productID=$productID&branchID=$branchID&confirm=yes")));
         }
 
         $this->branch->setDefault($productID, $branchID);
 
         $this->loadModel('action')->create('branch', $branchID, 'SetDefaultBranch', '', $productID);
 
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
diff --git a/module/branch/model.php b/module/branch/model.php
index d32b12b34a..01dff6d983 100644
--- a/module/branch/model.php
+++ b/module/branch/model.php
@@ -271,7 +271,7 @@ class branchModel extends model
                     ->where('id')->eq($branchID)
                     ->exec();
 
-                if(dao::isError()) die(js::error('branch#' . $branchID . dao::getError(true)));
+                if(dao::isError()) return print(js::error('branch#' . $branchID . dao::getError(true)));
 
                 $changes[$branchID] = common::createChanges($oldBranchList[$branchID], $branch);
             }
@@ -331,7 +331,7 @@ class branchModel extends model
         {
             foreach($data->branch as $branchID => $branch)
             {
-                if(!$branch) die(js::alert($this->lang->branch->nameNotEmpty));
+                if(!$branch) return print(js::alert($this->lang->branch->nameNotEmpty));
                 if($oldBranches[$branchID] != $branch) $this->dao->update(TABLE_BRANCH)->set('name')->eq($branch)->where('id')->eq($branchID)->exec();
             }
         }
diff --git a/module/bug/control.php b/module/bug/control.php
index 502bedb543..7860b7dd81 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -1448,7 +1448,7 @@ class bug extends control
         if(!empty($_POST))
         {
             $changes = $this->bug->resolve($bugID, $extra);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
             $files = $this->loadModel('file')->saveUpload('bug', $bugID);
 
             $fileAction = !empty($files) ? $this->lang->addFiles . join(',', $files) . "\n" : '';
@@ -1468,7 +1468,7 @@ class bug extends control
                     $confirmURL = $this->createLink('task', 'view', "taskID=$bug->toTask");
                     unset($_GET['onlybody']);
                     $cancelURL  = $this->createLink('bug', 'view', "bugID=$bugID");
-                    die(js::confirm(sprintf($this->lang->bug->remindTask, $bug->toTask), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
+                    return print(js::confirm(sprintf($this->lang->bug->remindTask, $bug->toTask), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
                 }
             }
 
@@ -1530,11 +1530,11 @@ class bug extends control
      */
     public function batchResolve($resolution, $resolvedBuild = '')
     {
-        $bugIDList = $this->post->bugIDList ? $this->post->bugIDList : die(js::locate($this->session->bugList, 'parent'));
+        $bugIDList = $this->post->bugIDList ? $this->post->bugIDList : return print(js::locate($this->session->bugList, 'parent'));
         $bugIDList = array_unique($bugIDList);
 
         $changes   = $this->bug->batchResolve($bugIDList, $resolution, $resolvedBuild);
-        if(dao::isError()) die(js::error(dao::getError()));
+        if(dao::isError()) return print(js::error(dao::getError()));
 
         foreach($changes as $bugID => $bugChanges)
         {
@@ -1543,7 +1543,7 @@ class bug extends control
         }
 
         $this->loadModel('score')->create('ajax', 'batchOther');
-        die(js::locate($this->session->bugList, 'parent'));
+        return print(js::locate($this->session->bugList, 'parent'));
     }
 
     /**
@@ -1560,7 +1560,7 @@ class bug extends control
         if(!empty($_POST))
         {
             $changes = $this->bug->activate($bugID, $extra);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             $files = $this->loadModel('file')->saveUpload('bug', $bugID);
 
@@ -1587,7 +1587,7 @@ class bug extends control
                     return print(js::closeModal('parent.parent'));
                 }
             }
-            die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent'));
+            return print(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent'));
         }
 
         $productID = $bug->product;
@@ -1620,7 +1620,7 @@ class bug extends control
         if(!empty($_POST))
         {
             $changes = $this->bug->close($bugID, $extra);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             $actionID = $this->action->create('bug', $bugID, 'Closed', $this->post->comment);
             $this->action->logHistory($actionID, $changes);
@@ -1747,7 +1747,7 @@ class bug extends control
             $this->loadModel('score')->create('ajax', 'batchOther');
             if(isset($skipBugs)) echo js::alert(sprintf($this->lang->bug->skipClose, join(',', $skipBugs)));
         }
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
@@ -1763,10 +1763,10 @@ class bug extends control
             $activateBugs = $this->bug->batchActivate();
             foreach($activateBugs as $bugID => $bug) $this->action->create('bug', $bugID, 'Activated', $bug['comment']);
             $this->loadModel('score')->create('ajax', 'batchOther');
-            die(js::locate($this->session->bugList, 'parent'));
+            return print(js::locate($this->session->bugList, 'parent'));
         }
 
-        $bugIDList = $this->post->bugIDList ? $this->post->bugIDList : die(js::locate($this->session->bugList, 'parent'));
+        $bugIDList = $this->post->bugIDList ? $this->post->bugIDList : return print(js::locate($this->session->bugList, 'parent'));
         $bugIDList = array_unique($bugIDList);
         $bugs = $this->dao->select('id, title, status, resolvedBy, openedBuild')->from(TABLE_BUG)->where('id')->in($bugIDList)->fetchAll('id');
 
@@ -1796,7 +1796,7 @@ class bug extends control
         $this->bug->checkBugExecutionPriv($bug);
         $this->dao->update(TABLE_BUG)->set('storyVersion')->eq($bug->latestStoryVersion)->where('id')->eq($bugID)->exec();
         $this->loadModel('action')->create('bug', $bugID, 'confirmed', '', $bug->latestStoryVersion);
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
@@ -1812,7 +1812,7 @@ class bug extends control
         $bug = $this->bug->getById($bugID);
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->bug->confirmDelete, inlink('delete', "bugID=$bugID&confirm=yes")));
+            return print(js::confirm($this->lang->bug->confirmDelete, inlink('delete', "bugID=$bugID&confirm=yes")));
         }
         else
         {
@@ -1825,7 +1825,7 @@ class bug extends control
                     $confirmURL = $this->createLink('task', 'view', "taskID=$bug->toTask");
                     unset($_GET['onlybody']);
                     $cancelURL  = $this->createLink('bug', 'view', "bugID=$bugID");
-                    die(js::confirm(sprintf($this->lang->bug->remindTask, $bug->toTask), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
+                    return print(js::confirm(sprintf($this->lang->bug->remindTask, $bug->toTask), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
                 }
             }
 
@@ -1834,7 +1834,7 @@ class bug extends control
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess));
 
             $locateLink = $this->session->bugList ? $this->session->bugList : inlink('browse', "productID={$bug->product}");
-            die(js::locate($locateLink, 'parent'));
+            return print(js::locate($locateLink, 'parent'));
         }
     }
 
@@ -1853,8 +1853,8 @@ class bug extends control
         $account = $user->account;
         $bugs    = $this->bug->getUserBugPairs($account);
 
-        if($id) die(html::select("bugs[$id]", $bugs, '', 'class="form-control"'));
-        die(html::select('bug', $bugs, '', 'class=form-control'));
+        if($id) return print(html::select("bugs[$id]", $bugs, '', 'class="form-control"'));
+        return print(html::select('bug', $bugs, '', 'class=form-control'));
     }
 
     /**
@@ -1876,7 +1876,7 @@ class bug extends control
             if(!empty($this->config->isINT)) $firstLetter = '';
             $realName = $firstLetter . ($user->realname ? $user->realname : $account);
         }
-        die(json_encode(array($account, $realName)));
+        return print(json_encode(array($account, $realName)));
     }
 
     /**
@@ -1891,7 +1891,7 @@ class bug extends control
     {
         $executionMembers = $this->user->getTeamMemberPairs($executionID, 'execution', '', $selectedUser);
 
-        die(html::select('assignedTo', $executionMembers, $selectedUser, 'class="form-control"'));
+        return print(html::select('assignedTo', $executionMembers, $selectedUser, 'class="form-control"'));
     }
 
     /**
@@ -1906,7 +1906,7 @@ class bug extends control
     {
         $productMembers = $this->bug->getProductMemberPairs($productID);
 
-        die(html::select('assignedTo', $productMembers, $selectedUser, 'class="form-control"'));
+        return print(html::select('assignedTo', $productMembers, $selectedUser, 'class="form-control"'));
     }
 
     /**
@@ -1920,7 +1920,7 @@ class bug extends control
     {
         $allUsers = $this->loadModel('user')->getPairs('devfirst|noclosed');
 
-        die(html::select('assignedTo', $allUsers, $selectedUser, 'class="form-control"'));
+        return print(html::select('assignedTo', $allUsers, $selectedUser, 'class="form-control"'));
     }
 
     /**
@@ -2152,7 +2152,7 @@ class bug extends control
         $bug = $this->dao->select('*')->from(TABLE_BUG)->where('id')->eq($bugID)->fetch();
         $realname = $this->dao->select('*')->from(TABLE_USER)->where('account')->eq($bug->assignedTo)->fetch('realname');
         $bug->assignedTo = $realname ? $realname : ($bug->assignedTo == 'closed' ? 'Closed' : $bug->assignedTo);
-        die(json_encode($bug));
+        return print(json_encode($bug));
     }
 
     /**
@@ -2171,7 +2171,7 @@ class bug extends control
         $pri      = $this->lang->bug->priList;
         $severity = $this->lang->bug->severityList;
 
-        die(json_encode(array('modules' => $modules, 'categories' => $type, 'versions' => $builds, 'severities' => $severity, 'priorities' => $pri)));
+        return print(json_encode(array('modules' => $modules, 'categories' => $type, 'versions' => $builds, 'severities' => $severity, 'priorities' => $pri)));
     }
 
     /**
@@ -2213,7 +2213,7 @@ class bug extends control
         $users       = $this->loadModel('user')->getPairs('noclosed');
         $teamMembers = empty($projectID) ? array() : $this->loadModel('project')->getTeamMemberPairs($projectID);
         foreach($teamMembers as $account => $member) $teamMembers[$account] = $users[$account];
-        die(html::select('assignedTo', $teamMembers, '', 'class="form-control"'));
+        return print(html::select('assignedTo', $teamMembers, '', 'class="form-control"'));
     }
 
 
diff --git a/module/bug/model.php b/module/bug/model.php
index ad7f3f6425..22254220c0 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -217,7 +217,7 @@ class bugModel extends model
 
                 $bug->{$extendField->field} = htmlSpecialString($bug->{$extendField->field});
                 $message = $this->checkFlowRule($extendField, $bug->{$extendField->field});
-                if($message) die(js::alert($message));
+                if($message) return print(js::alert($message));
             }
 
             /* Required field check. */
@@ -226,7 +226,7 @@ class bugModel extends model
                 $field = trim($field);
                 if($field and empty($bug->$field))
                 {
-                    die(js::alert(sprintf($this->lang->error->notempty, $this->lang->bug->$field)));
+                    return print(js::alert(sprintf($this->lang->error->notempty, $this->lang->bug->$field)));
                 }
             }
 
@@ -266,7 +266,7 @@ class bugModel extends model
                 ->autoCheck()
                 ->batchCheck($this->config->bug->create->requiredFields, 'notempty')
                 ->exec();
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             $bugID = $this->dao->lastInsertID();
 
@@ -290,7 +290,7 @@ class bugModel extends model
                 unset($file);
             }
 
-            if(dao::isError()) die(js::error('bug#' . ($i+1) . dao::getError(true)));
+            if(dao::isError()) return print(js::error('bug#' . ($i+1) . dao::getError(true)));
             $actions[$bugID] = $this->action->create('bug', $bugID, 'Opened');
         }
 
@@ -430,8 +430,8 @@ class bugModel extends model
         {
             echo(js::alert($this->lang->bug->executionAccessDenied));
             $loginLink = $this->config->requestType == 'GET' ? "?{$this->config->moduleVar}=user&{$this->config->methodVar}=login" : "user{$this->config->requestFix}login";
-            if(strpos($this->server->http_referer, $loginLink) !== false) die(js::locate(helper::createLink('bug', 'index', '')));
-            die(js::locate('back'));
+            if(strpos($this->server->http_referer, $loginLink) !== false) return print(js::locate(helper::createLink('bug', 'index', '')));
+            return print(js::locate('back'));
         }
     }
 
@@ -804,7 +804,7 @@ class bugModel extends model
 
                     $bug->{$extendField->field} = htmlSpecialString($bug->{$extendField->field});
                     $message = $this->checkFlowRule($extendField, $bug->{$extendField->field});
-                    if($message) die(js::alert($message));
+                    if($message) return print(js::alert($message));
                 }
 
                 $bugs[$bugID] = $bug;
@@ -834,7 +834,7 @@ class bugModel extends model
                 }
                 else
                 {
-                    die(js::error('bug#' . $bugID . dao::getError(true)));
+                    return print(js::error('bug#' . $bugID . dao::getError(true)));
                 }
             }
         }
@@ -887,7 +887,7 @@ class bugModel extends model
         {
             $oldBug = $bugs[$bugID];
             $this->dao->update(TABLE_BUG)->data($bug, $skipFields = 'comment')->autoCheck()->where('id')->eq((int)$bugID)->exec();
-            if(dao::isError()) die(js::error('bug#' . $bugID . dao::getError(true)));
+            if(dao::isError()) return print(js::error('bug#' . $bugID . dao::getError(true)));
 
             $this->dao->update(TABLE_BUG)->set('activatedCount = activatedCount + 1')->where('id')->eq((int)$bugID)->exec();
         }
diff --git a/module/build/control.php b/module/build/control.php
index 7d4ebf4b1e..b4ec04530f 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -217,7 +217,7 @@ class build extends control
         if(!$build)
         {
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'code' => 404, 'message' => '404 Not found'));
-            die(js::error($this->lang->notFound) . js::locate($this->createLink('execution', 'all')));
+            return print(js::error($this->lang->notFound) . js::locate($this->createLink('execution', 'all')));
         }
         $this->session->project = $build->project;
 
@@ -306,7 +306,7 @@ class build extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->build->confirmDelete, $this->createLink('build', 'delete', "buildID=$buildID&confirm=yes")));
+            return print(js::confirm($this->lang->build->confirmDelete, $this->createLink('build', 'delete', "buildID=$buildID&confirm=yes")));
         }
         else
         {
@@ -333,7 +333,7 @@ class build extends control
 
             $link = $this->app->tab == 'project' ? $this->createLink('project', 'build', "projectID=$build->project") : $this->createLink('execution', 'build', "executionID=$build->execution");
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'success'));
-            die(js::locate($link, 'parent'));
+            return print(js::locate($link, 'parent'));
         }
     }
 
@@ -356,21 +356,21 @@ class build extends control
         {
             $params = ($type == 'all') ? 'noempty,withbranch' : 'noempty, noterminate, nodone, withbranch';
             $builds = $this->build->getBuildPairs($productID, $branch, $params);
-            if($isJsonView) die(json_encode($builds));
-            else die(html::select($varName . '[]', $builds, $build, 'size=4 class=form-control multiple'));
+            if($isJsonView) return print(json_encode($builds));
+            return print(html::select($varName . '[]', $builds, $build, 'size=4 class=form-control multiple'));
         }
         if($varName == 'openedBuilds' )
         {
             $builds = $this->build->getBuildPairs($productID, $branch, 'noempty');
-            if($isJsonView) die(json_encode($builds));
-            else die(html::select($varName . "[$index][]", $builds, $build, 'size=4 class=form-control multiple'));
+            if($isJsonView) return print(json_encode($builds));
+            return print(html::select($varName . "[$index][]", $builds, $build, 'size=4 class=form-control multiple'));
         }
         if($varName == 'resolvedBuild')
         {
             $params = ($type == 'all') ? 'withbranch' : 'noterminate, nodone, withbranch';
             $builds = $this->build->getBuildPairs($productID, $branch, $params);
-            if($isJsonView) die(json_encode($builds));
-            else die(html::select($varName, $builds, $build, "class='form-control'"));
+            if($isJsonView) return print(json_encode($builds));
+            return print(html::select($varName, $builds, $build, "class='form-control'"));
         }
     }
 
@@ -396,8 +396,8 @@ class build extends control
 
             $params = ($type == 'all') ? 'noempty, withbranch' : 'noempty, noterminate, nodone, withbranch';
             $builds = $this->build->getBuildPairs($productID, $branch, $params, $projectID, 'project', $build);
-            if($isJsonView)  die(json_encode($builds));
-            die(html::select($varName . '[]', $builds , '', 'size=4 class=form-control multiple'));
+            if($isJsonView)  return print(json_encode($builds));
+            return print(html::select($varName . '[]', $builds , '', 'size=4 class=form-control multiple'));
         }
         if($varName == 'resolvedBuild')
         {
@@ -405,8 +405,8 @@ class build extends control
 
             $params = ($type == 'all') ? 'withbranch' : 'noterminate, nodone, withbranch';
             $builds = $this->build->getBuildPairs($productID, $branch, $params, $projectID, 'project', $build);
-            if($isJsonView)  die(json_encode($builds));
-            die(html::select($varName, $builds, $build, "class='form-control'"));
+            if($isJsonView)  return print(json_encode($builds));
+            return print(html::select($varName, $builds, $build, "class='form-control'"));
         }
     }
 
@@ -432,16 +432,16 @@ class build extends control
 
             $params = ($type == 'all') ? 'noempty' : 'noempty, noterminate, nodone';
             $builds = $this->build->getBuildPairs($productID, $branch, $params, $executionID, 'execution', $build);
-            if($isJsonView) die(json_encode($builds));
-            else die(html::select($varName . '[]', $builds , '', 'size=4 class=form-control multiple'));
+            if($isJsonView) return print(json_encode($builds));
+            return print(html::select($varName . '[]', $builds , '', 'size=4 class=form-control multiple'));
         }
         if($varName == 'openedBuilds')
         {
             if(empty($executionID)) $this->ajaxGetProductBuilds($productID, $varName, $build, $branch, $index, $type);
 
             $builds = $this->build->getBuildPairs($productID, $branch, 'noempty', $executionID, 'execution');
-            if($isJsonView) die(json_encode($builds));
-            else die(html::select($varName . "[$index][]", $builds , $build, 'size=4 class=form-control multiple'));
+            if($isJsonView) return print(json_encode($builds));
+            return print(html::select($varName . "[$index][]", $builds , $build, 'size=4 class=form-control multiple'));
         }
         if($varName == 'resolvedBuild')
         {
@@ -449,13 +449,13 @@ class build extends control
 
             $params = ($type == 'all') ? '' : 'noterminate, nodone';
             $builds = $this->build->getBuildPairs($productID, $branch, $params, $executionID, 'execution', $build);
-            if($isJsonView) die(json_encode($builds));
-            else die(html::select($varName, $builds, $build, "class='form-control'"));
+            if($isJsonView) return print(json_encode($builds));
+            return print(html::select($varName, $builds, $build, "class='form-control'"));
         }
         if($varName == 'testTaskBuild')
         {
             $builds = $this->build->getBuildPairs($productID, $branch, 'noempty,notrunk', $executionID, 'execution');
-            if($isJsonView) die(json_encode($builds));
+            if($isJsonView) return print(json_encode($builds));
 
             if(empty($builds))
             {
@@ -464,20 +464,20 @@ class build extends control
                 $html  = html::a($this->createLink('build', 'create', "executionID=$executionID&productID=$productID&projectID=$projectID", '', $onlybody = true), $this->lang->build->create, '', "data-toggle='modal' data-type='iframe'");
                 $html .= '&nbsp; ';
                 $html .= html::a("javascript:loadExecutionBuilds($executionID)", $this->lang->refresh);
-                die($html);
+                return print($html);
             }
-            die(html::select('build', array('') + $builds, $build, "class='form-control'"));
+            return print(html::select('build', array('') + $builds, $build, "class='form-control'"));
         }
         if($varName == 'dropdownList')
         {
             $builds = $this->build->getBuildPairs($productID, $branch, 'noempty,notrunk', $executionID, 'execution');
-            if($isJsonView) die(json_encode($builds));
+            if($isJsonView) return print(json_encode($builds));
 
             $list  = "<div class='list-group'>";
             foreach($builds as $buildID => $buildName) $list .= html::a(inlink('view', "buildID={$buildID}"), $buildName);
             $list .= '</div>';
 
-            die($list);
+            return print($list);
         }
     }
 
@@ -498,7 +498,7 @@ class build extends control
         if(!empty($_POST['stories']))
         {
             $this->build->linkStory($buildID);
-            die(js::locate(inlink('view', "buildID=$buildID&type=story"), 'parent'));
+            return print(js::locate(inlink('view', "buildID=$buildID&type=story"), 'parent'));
         }
 
         $this->session->set('storyList', inlink('view', "buildID=$buildID&type=story&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")), $this->app->tab);
@@ -588,7 +588,7 @@ class build extends control
             }
             return $this->send($response);
         }
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
@@ -601,7 +601,7 @@ class build extends control
     public function batchUnlinkStory($buildID)
     {
         $this->build->batchUnlinkStory($buildID);
-        die(js::locate($this->createLink('build', 'view', "buildID=$buildID&type=story"), 'parent'));
+        return print(js::locate($this->createLink('build', 'view', "buildID=$buildID&type=story"), 'parent'));
     }
 
     /**
@@ -621,7 +621,7 @@ class build extends control
         if(!empty($_POST['bugs']))
         {
             $this->build->linkBug($buildID);
-            die(js::locate(inlink('view', "buildID=$buildID&type=bug"), 'parent'));
+            return print(js::locate(inlink('view', "buildID=$buildID&type=bug"), 'parent'));
         }
 
         $this->session->set('bugList', inlink('view', "buildID=$buildID&type=bug&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")), 'qa');
@@ -711,7 +711,7 @@ class build extends control
             }
             return $this->send($response);
         }
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
@@ -724,6 +724,6 @@ class build extends control
     public function batchUnlinkBug($buildID)
     {
         $this->build->batchUnlinkBug($buildID);
-        die(js::locate($this->createLink('build', 'view', "buildID=$buildID&type=bug"), 'parent'));
+        return print(js::locate($this->createLink('build', 'view', "buildID=$buildID&type=bug"), 'parent'));
     }
 }
diff --git a/module/caselib/control.php b/module/caselib/control.php
index 8aae891edf..586b756ccb 100644
--- a/module/caselib/control.php
+++ b/module/caselib/control.php
@@ -124,7 +124,7 @@ class caselib extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->caselib->libraryDelete, inlink('delete', "libID=$libID&confirm=yes")));
+            return print(js::confirm($this->lang->caselib->libraryDelete, inlink('delete', "libID=$libID&confirm=yes")));
         }
         else
         {
@@ -147,7 +147,7 @@ class caselib extends control
                 }
                 return $this->send($response);
             }
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -252,20 +252,20 @@ class caselib extends control
             $this->config->testcase->create->requiredFields = $this->config->caselib->createcase->requiredFields;
             setcookie('lastLibCaseModule', (int)$this->post->module, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, false);
             $caseResult = $this->testcase->create($bugID = 0);
-            if(!$caseResult or dao::isError()) die(js::error(dao::getError()));
+            if(!$caseResult or dao::isError()) return print(js::error(dao::getError()));
 
             $caseID = $caseResult['id'];
             if($caseResult['status'] == 'exists')
             {
                 echo js::alert(sprintf($this->lang->duplicate, $this->lang->testcase->common));
-                die(js::locate($this->createLink('testcase', 'view', "caseID=$caseID"), 'parent'));
+                return print(js::locate($this->createLink('testcase', 'view', "caseID=$caseID"), 'parent'));
             }
 
             $this->loadModel('action')->create('case', $caseID, 'Opened');
 
             /* If link from no head then reload. */
-            if(isonlybody()) die(js::reload('parent'));
-            die(js::locate($this->createLink('caselib', 'browse', "libID={$libID}&browseType=byModule&param={$_POST['module']}"), 'parent'));
+            if(isonlybody()) return print(js::reload('parent'));
+            return print(js::locate($this->createLink('caselib', 'browse', "libID={$libID}&browseType=byModule&param={$_POST['module']}"), 'parent'));
         }
         /* Set lib menu. */
         $libraries = $this->caselib->getLibraries();
@@ -340,9 +340,9 @@ class caselib extends control
         if(!empty($_POST))
         {
             $caseID = $this->caselib->batchCreateCase($libID);
-            if(dao::isError()) die(js::error(dao::getError()));
-            if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
-            die(js::locate($this->createLink('caselib', 'browse', "libID=$libID&browseType=byModule&param=$moduleID"), 'parent'));
+            if(dao::isError()) return print(js::error(dao::getError()));
+            if(isonlybody()) return print(js::closeModal('parent.parent', 'this'));
+            return print(js::locate($this->createLink('caselib', 'browse', "libID=$libID&browseType=byModule&param=$moduleID"), 'parent'));
         }
 
         $libraries = $this->caselib->getLibraries();
@@ -378,7 +378,7 @@ class caselib extends control
     {
         $libID = (int)$libID;
         $lib   = $this->caselib->getById($libID, true);
-        if(!isset($lib->id)) die(js::error($this->lang->notFound) . js::locate($this->createLink('qa', 'index')));
+        if(!isset($lib->id)) return print(js::error($this->lang->notFound) . js::locate($this->createLink('qa', 'index')));
 
         /* Set lib menu. */
         $libraries = $this->caselib->getLibraries();
@@ -555,12 +555,12 @@ class caselib extends control
                     if(!isset($fields[$title])) continue;
                     $columnKey[] = $fields[$title];
                 }
-                if(count($columnKey) != count($header)) die(js::alert($this->lang->testcase->errorEncode));
+                if(count($columnKey) != count($header)) return print(js::alert($this->lang->testcase->errorEncode));
             }
 
             $this->session->set('fileImport', $fileName);
 
-            die(js::locate(inlink('showImport', "libID=$libID"), 'parent.parent'));
+            return print(js::locate(inlink('showImport', "libID=$libID"), 'parent.parent'));
         }
         $this->display();
     }
@@ -589,11 +589,11 @@ class caselib extends control
             if($this->post->isEndPage)
             {
                 unlink($tmpFile);
-                die(js::locate(inlink('browse', "libID=$libID"), 'parent'));
+                return print(js::locate(inlink('browse', "libID=$libID"), 'parent'));
             }
             else
             {
-                die(js::locate(inlink('showImport', "libID=$libID&pagerID=" . ($this->post->pagerID + 1) . "&maxImport=$maxImport&insert=" . zget($_POST, 'insert', '')), 'parent'));
+                return print(js::locate(inlink('showImport', "libID=$libID&pagerID=" . ($this->post->pagerID + 1) . "&maxImport=$maxImport&insert=" . zget($_POST, 'insert', '')), 'parent'));
             }
         }
 
@@ -759,7 +759,7 @@ class caselib extends control
             unlink($this->session->fileImport);
             unset($_SESSION['fileImport']);
             echo js::alert($this->lang->error->noData);
-            die(js::locate($this->createLink('caselib', 'browse', "libID=$libID")));
+            return print(js::locate($this->createLink('caselib', 'browse', "libID=$libID")));
         }
 
         $allCount = count($caseData);
@@ -771,13 +771,13 @@ class caselib extends control
                 $this->view->allCount  = $allCount;
                 $this->view->maxImport = $maxImport;
                 $this->view->libID     = $libID;
-                die($this->display());
+                return print($this->display());
             }
 
             $allPager = ceil($allCount / $maxImport);
             $caseData = array_slice($caseData, ($pagerID - 1) * $maxImport, $maxImport, true);
         }
-        if(empty($caseData)) die(js::locate(inlink('browse', "libID=$libID")));
+        if(empty($caseData)) return print(js::locate(inlink('browse', "libID=$libID")));
 
         /* Judge whether the items is too large and set session. */
         $countInputVars  = count($caseData) * 9 + (isset($stepVars) ? $stepVars : 0);
diff --git a/module/caselib/model.php b/module/caselib/model.php
index 89ed3045e2..c7f3d043ba 100644
--- a/module/caselib/model.php
+++ b/module/caselib/model.php
@@ -389,7 +389,7 @@ class caselibModel extends model
             $cases[$key] = $caseData;
             $line++;
         }
-        if(dao::isError()) die(js::error(dao::getError()));
+        if(dao::isError()) return print(js::error(dao::getError()));
 
         $forceNotReview = $this->testcase->forceNotReview();
         foreach($cases as $key => $caseData)
@@ -537,7 +537,7 @@ class caselibModel extends model
 
         foreach($cases->title as $i => $title)
         {
-            if(!empty($cases->title[$i]) and empty($cases->type[$i])) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->testcase->type)));
+            if(!empty($cases->title[$i]) and empty($cases->type[$i])) return print(js::alert(sprintf($this->lang->error->notempty, $this->lang->testcase->type)));
         }
 
         $module = 0;
@@ -582,7 +582,7 @@ class caselibModel extends model
                 if(dao::isError())
                 {
                     echo js::error(dao::getError());
-                    die(js::reload('parent'));
+                    return print(js::reload('parent'));
                 }
 
                 $caseID   = $this->dao->lastInsertID();
diff --git a/module/common/model.php b/module/common/model.php
index 3b141fdbbb..c98df68a1c 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -31,7 +31,7 @@ class commonModel extends model
             $this->loadConfigFromDB();
             $this->app->setTimezone();
             $this->loadCustomFromDB();
-            if(!$this->checkIP()) die($this->lang->ipLimited);
+            if(!$this->checkIP()) return print($this->lang->ipLimited);
             $this->app->loadLang('company');
         }
     }
@@ -2144,7 +2144,7 @@ EOD;
             echo "<html><head><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /></head><body>";
             echo "<table align='center' style='margin-top:100px; border:1px solid gray; font-size:14px;padding:8px;'><tr><td>";
             printf($this->lang->upgrade->setStatusFile, $cmd, $statusFile);
-            die('</td></tr></table></body></html>');
+            return print('</td></tr></table></body></html>');
         }
     }
 
@@ -2164,7 +2164,7 @@ EOD;
             $method = $this->app->rawMethod;
         }
 
-        if(!empty($this->app->user->modifyPassword) and (($module != 'user' or $method != 'deny') and ($module != 'my' or $method != 'changepassword') and ($module != 'user' or $method != 'logout'))) die(js::locate(helper::createLink('my', 'changepassword', '', '', true)));
+        if(!empty($this->app->user->modifyPassword) and (($module != 'user' or $method != 'deny') and ($module != 'my' or $method != 'changepassword') and ($module != 'user' or $method != 'logout'))) return print(js::locate(helper::createLink('my', 'changepassword', '', '', true)));
         if($this->isOpenMethod($module, $method)) return true;
         if(!$this->loadModel('user')->isLogon() and $this->server->php_auth_user) $this->user->identifyByPhpAuth();
         if(!$this->loadModel('user')->isLogon() and $this->cookie->za) $this->user->identifyByCookie();
@@ -2179,7 +2179,7 @@ EOD;
         else
         {
             $referer  = helper::safe64Encode($this->app->getURI(true));
-            die(js::locate(helper::createLink('user', 'login', "referer=$referer")));
+            return print(js::locate(helper::createLink('user', 'login', "referer=$referer")));
         }
     }
 
@@ -2526,7 +2526,7 @@ EOD;
         $this->loadModel('action')->create('user', $user->id, 'login');
         $this->loadModel('score')->create('user', 'login');
 
-        if($isFreepasswd) die(js::locate($this->config->webRoot));
+        if($isFreepasswd) return print(js::locate($this->config->webRoot));
 
         $this->session->set('ENTRY_CODE', $this->get->code);
         $this->session->set('VALID_ENTRY', md5(md5($this->get->code) . $this->server->remote_addr));
@@ -2665,12 +2665,12 @@ EOD;
             $response->errcode = $this->config->entry->errcode[$code];
             $response->errmsg  = urlencode($this->lang->entry->errmsg[$code]);
 
-            die(urldecode(json_encode($response)));
+            return print(urldecode(json_encode($response)));
         }
         else
         {
             $response->error = $code;
-            die(urldecode(json_encode($response)));
+            return print(urldecode(json_encode($response)));
         }
     }
 
@@ -2774,7 +2774,7 @@ EOD;
         global $lang, $app;
         if(!extension_loaded('curl'))
         {
-             if($dataType == 'json') die($lang->error->noCurlExt);
+             if($dataType == 'json') return print($lang->error->noCurlExt);
              return json_encode(array('result' => 'fail', 'message' => $lang->error->noCurlExt));
         }
 
diff --git a/module/company/control.php b/module/company/control.php
index 9ed86a6e94..928951ca2d 100644
--- a/module/company/control.php
+++ b/module/company/control.php
@@ -100,8 +100,8 @@ class company extends control
         if(!empty($_POST))
         {
             $this->company->create();
-            if(dao::isError()) die(js::error(dao::getError()));
-            die(js::reload('parent.parent'));
+            if(dao::isError()) return print(js::error(dao::getError()));
+            return print(js::reload('parent.parent'));
         }
 
         $this->view->title     = $this->lang->company->common . $this->lang->colon . $this->lang->company->create;
@@ -121,13 +121,13 @@ class company extends control
         if(!empty($_POST))
         {
             $this->company->update();
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             /* reset company in session. */
             $company = $this->loadModel('company')->getFirst();
             $this->session->set('company', $company);
 
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $this->company->setMenu();
@@ -304,6 +304,6 @@ class company extends control
     public function ajaxGetOutsideCompany()
     {
         $companies = $this->company->getOutsideCompanies();
-        die(html::select('company', $companies, '', "class='form-control chosen'"));
+        return print(html::select('company', $companies, '', "class='form-control chosen'"));
     }
 }
diff --git a/module/convert/control.php b/module/convert/control.php
index b6f5c54f86..d46e7ca465 100644
--- a/module/convert/control.php
+++ b/module/convert/control.php
@@ -13,7 +13,7 @@ class convert extends control
 {
     /**
      * Index page of convert.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -27,7 +27,7 @@ class convert extends control
 
     /**
      * Select the source system.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -43,16 +43,16 @@ class convert extends control
      * Set configs of converter.
      *
      * This is the extrance of every system. It will call the set function of corresponding module.
-     * 
+     *
      * @access public
      * @return void
      */
     public function setConfig()
     {
-        if(!$this->post->source) 
+        if(!$this->post->source)
         {
             echo js::alert($this->lang->convert->mustSelectSource);
-            die(js::locate('back'));
+            return print(js::locate('back'));
         }
         list($sourceName, $version) = explode('_', $this->post->source);
         $setFunc = "set$sourceName";
@@ -67,8 +67,8 @@ class convert extends control
 
     /**
      * The setting page of bugfree.
-     * 
-     * @param  string    $version 
+     *
+     * @param  string    $version
      * @access public
      * @return void
      */
@@ -84,8 +84,8 @@ class convert extends control
 
     /**
      * The setting page of Redmine.
-     * 
-     * @param  string    $version 
+     *
+     * @param  string    $version
      * @access public
      * @return void
      */
@@ -100,7 +100,7 @@ class convert extends control
 
     /**
      * Check config. Same as setConfig.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -117,8 +117,8 @@ class convert extends control
 
     /**
      * Check settings of bugfree.
-     * 
-     * @param  int    $version 
+     *
+     * @param  int    $version
      * @access public
      * @return void
      */
@@ -146,8 +146,8 @@ class convert extends control
 
     /**
      * Check settings of Redmine.
-     * 
-     * @param  int    $version 
+     *
+     * @param  int    $version
      * @access public
      * @return void
      */
@@ -184,7 +184,7 @@ class convert extends control
 
    /**
      * Execute the converting.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -203,8 +203,8 @@ class convert extends control
 
     /**
      * Convert bugfree.
-     * 
-     * @param  int    $version 
+     *
+     * @param  int    $version
      * @access public
      * @return void
      */
@@ -221,9 +221,9 @@ class convert extends control
     }
 
     /**
-     * convert redmine 
-     * 
-     * @param  int    $version 
+     * convert redmine
+     *
+     * @param  int    $version
      * @access public
      * @return void
      */
@@ -250,7 +250,7 @@ class convert extends control
 
     /**
      * Import jira index.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -262,7 +262,7 @@ class convert extends control
 
     /**
      * Import jira notice.
-     * 
+     *
      * @param  string $mehotd db|file
      * @access public
      * @return void
@@ -274,7 +274,7 @@ class convert extends control
             if($method == 'db')
             {
                 $dbName = $this->post->dbName;
-                if(!$dbName) 
+                if(!$dbName)
                 {
                     $response['result']  = 'fail';
                     $response['message'] = $this->lang->convert->jira->dbNameEmpty;
@@ -332,9 +332,9 @@ class convert extends control
 
     /**
      * Map jira objects to zentao.
-     * 
+     *
      * @param  string $method db|file
-     * @param  string $dbName 
+     * @param  string $dbName
      * @param  int    $step
      * @access public
      * @return void
@@ -387,7 +387,7 @@ class convert extends control
 
     /**
      * Init jira user.
-     * 
+     *
      * @param  string $method db|file
      * @access public
      * @return void
@@ -437,28 +437,28 @@ class convert extends control
 
     /**
      * Import jira main logic.
-     * 
+     *
      * @param  string $method db|file
      * @param  string $type user|issue|project|attachment
-     * @param  int    $lastID 
+     * @param  int    $lastID
      * @access public
      * @return void
      */
     public function importJira($method = 'db', $type = 'user', $lastID = 0, $createTable = false)
     {
         set_time_limit(0);
-        
+
         if(helper::isAjaxRequest())
-        {   
+        {
             $result = $method == 'db' ? $this->convert->importJiraFromDB($type, $lastID, $createTable) : $this->convert->importJiraFromFile($type, $lastID, $createTable);
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
             if(isset($result['finished']) and $result['finished'])
             {
                 $message = $method == 'db' ? $this->lang->convert->jira->importSuccessfully : $this->lang->convert->jira->importSuccessfully . sprintf($this->lang->convert->jira->removeFile, $this->app->getTmpRoot() . 'jirafile/');
                 return print $this->send(array('result' => 'finished', 'message' => $message));
-            }   
+            }
             else
-            {   
+            {
                 $type = zget($this->lang->convert->jira->objectList, $result['type'], $result['type']);
 
                 $response['result']  = 'unfinished';
@@ -467,7 +467,7 @@ class convert extends control
                 $response['count']   = $result['count'];
                 $response['next']    = inlink('importJira', "method=$method&type={$result['type']}&lastID={$result['lastID']}");
                 return print $this->send($response);
-            }   
+            }
         }
 
         $this->view->type   = $type;
diff --git a/module/cron/control.php b/module/cron/control.php
index ca2bfd7f84..71f1a21e88 100644
--- a/module/cron/control.php
+++ b/module/cron/control.php
@@ -13,7 +13,7 @@ class cron extends control
 {
     /**
      * Index page.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -27,22 +27,22 @@ class cron extends control
     }
 
     /**
-     * Turnon cron. 
-     * 
+     * Turnon cron.
+     *
      * @access public
      * @return void
      */
     public function turnon($confirm = 'no')
     {
         $turnon = empty($this->config->global->cron) ? 1 : 0;
-        if(!$turnon and $confirm == 'no') die(js::confirm($this->lang->cron->confirmTurnon, inlink('turnon', "confirm=yes")));
+        if(!$turnon and $confirm == 'no') return print(js::confirm($this->lang->cron->confirmTurnon, inlink('turnon', "confirm=yes")));
         $this->loadModel('setting')->setItem('system.common.global.cron', $turnon);
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
      * Open cron process.
-     * 
+     *
      * @access public
      * @return void
      */
@@ -52,8 +52,8 @@ class cron extends control
     }
 
     /**
-     * Create cron. 
-     * 
+     * Create cron.
+     *
      * @access public
      * @return void
      */
@@ -62,8 +62,8 @@ class cron extends control
         if($_POST)
         {
             $this->cron->create();
-            if(dao::isError()) die(js::error(dao::getError()));
-            die(js::locate(inlink('index'), 'parent'));
+            if(dao::isError()) return print(js::error(dao::getError()));
+            return print(js::locate(inlink('index'), 'parent'));
         }
         $this->view->title      = $this->lang->cron->create . $this->lang->cron->common;
         $this->view->position[] = html::a(inlink('index'), $this->lang->cron->common);
@@ -73,9 +73,9 @@ class cron extends control
     }
 
     /**
-     * Edit cron. 
-     * 
-     * @param  int    $cronID 
+     * Edit cron.
+     *
+     * @param  int    $cronID
      * @access public
      * @return void
      */
@@ -84,8 +84,8 @@ class cron extends control
         if($_POST)
         {
             $this->cron->update($cronID);
-            if(dao::isError()) die(js::error(dao::getError()));
-            die(js::locate(inlink('index'), 'parent'));
+            if(dao::isError()) return print(js::error(dao::getError()));
+            return print(js::locate(inlink('index'), 'parent'));
         }
         $this->view->title      = $this->lang->cron->edit . $this->lang->cron->common;
         $this->view->position[] = html::a(inlink('index'), $this->lang->cron->common);
@@ -96,39 +96,39 @@ class cron extends control
     }
 
     /**
-     * Toggle run cron. 
-     * 
-     * @param  int    $cronID 
-     * @param  int    $status 
+     * Toggle run cron.
+     *
+     * @param  int    $cronID
+     * @param  int    $status
      * @access public
      * @return void
      */
     public function toggle($cronID, $status)
     {
         $this->cron->changeStatus($cronID, $status);
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
-     * Delete cron. 
-     * 
-     * @param  int    $cronID 
-     * @param  string $confirm 
+     * Delete cron.
+     *
+     * @param  int    $cronID
+     * @param  string $confirm
      * @access public
      * @return void
      */
     public function delete($cronID, $confirm = 'no')
     {
-        if($confirm == 'no') die(js::confirm($this->lang->cron->confirmDelete, inlink('delete', "cronID=$cronID&confirm=yes")));
+        if($confirm == 'no') return print(js::confirm($this->lang->cron->confirmDelete, inlink('delete', "cronID=$cronID&confirm=yes")));
 
         $this->dao->delete()->from(TABLE_CRON)->where('id')->eq($cronID)->exec();
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
      * Ajax exec cron.
-     * 
-     * @param  bool    $restart 
+     *
+     * @param  bool    $restart
      * @access public
      * @return void
      */
@@ -141,7 +141,7 @@ class cron extends control
             session_write_close();
         }
         /* Check cron turnon. */
-        if(empty($this->config->global->cron)) die();
+        if(empty($this->config->global->cron)) return;
 
         /* Create restart tag file. */
         $restartTag = $this->app->getCacheRoot() . 'restartcron';
@@ -169,7 +169,7 @@ class cron extends control
             if(!$this->cron->getTurnon()) break;
 
             /* Die old process when restart. */
-            if(file_exists($restartTag) and !$restart) die(unlink($restartTag));
+            if(file_exists($restartTag) and !$restart) return unlink($restartTag);
             $restart = false;
 
             /* Run crons. */
@@ -192,7 +192,7 @@ class cron extends control
                 }
                 else
                 {
-                    if($cronInfo->lastTime > $cron['time']->format(DT_DATETIME1)) die();
+                    if($cronInfo->lastTime > $cron['time']->format(DT_DATETIME1)) return;
                 }
 
                 if($now > $cron['time'])
diff --git a/module/custom/control.php b/module/custom/control.php
index 4812e65684..4fdb708923 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -21,15 +21,15 @@ class custom extends control
     {
         if(($this->config->systemMode == 'new') and common::hasPriv('custom', 'set'))
         {
-            die(js::locate(inlink('set', "module=project&field=" . key($this->lang->custom->project->fields))));
+            return print(js::locate(inlink('set', "module=project&field=" . key($this->lang->custom->project->fields))));
         }
 
-        if(common::hasPriv('custom', 'product'))   die(js::locate(inlink('product')));
-        if(common::hasPriv('custom', 'execution')) die(js::locate(inlink('execution')));
+        if(common::hasPriv('custom', 'product'))   return print(js::locate(inlink('product')));
+        if(common::hasPriv('custom', 'execution')) return print(js::locate(inlink('execution')));
 
         foreach($this->lang->custom->system as $sysObject)
         {
-            if(common::hasPriv('custom', $sysObject)) die(js::locate(inlink($sysObject)));
+            if(common::hasPriv('custom', $sysObject)) return print(js::locate(inlink($sysObject)));
         }
     }
 
@@ -249,7 +249,7 @@ class custom extends control
      */
     public function restore($module, $field, $confirm = 'no')
     {
-        if($confirm == 'no') die(js::confirm($this->lang->custom->confirmRestore, inlink('restore', "module=$module&field=$field&confirm=yes")));
+        if($confirm == 'no') return print(js::confirm($this->lang->custom->confirmRestore, inlink('restore', "module=$module&field=$field&confirm=yes")));
 
         if($module == 'user' and $field == 'contactField')
         {
@@ -259,7 +259,7 @@ class custom extends control
         {
             $this->custom->deleteItems("module=$module&section=$field");
         }
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
@@ -439,7 +439,7 @@ class custom extends control
     public function setDefaultConcept($key = 0)
     {
         $this->loadModel('setting')->setItem('system.custom.URSR', $key);
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
@@ -470,7 +470,7 @@ class custom extends control
                 ->andWhere('`value`')->eq($key)
                 ->exec();
 
-            die(js::locate(inlink('browseStoryConcept'), 'parent'));
+            return print(js::locate(inlink('browseStoryConcept'), 'parent'));
         }
     }
 
@@ -561,19 +561,19 @@ class custom extends control
             {
                 if($sprintConcept == 2) $this->setting->setItem('system.custom.sprintConcept', 1);
                 if($sprintConcept == 1) $this->setting->setItem('system.custom.sprintConcept', 0);
-                die(js::locate($this->createLink('upgrade', 'mergeTips'), 'parent'));
+                return print(js::locate($this->createLink('upgrade', 'mergeTips'), 'parent'));
             }
             else
             {
                 if($sprintConcept == 0) $this->setting->setItem('system.custom.sprintConcept', 1);
                 if($sprintConcept == 1) $this->setting->setItem('system.custom.sprintConcept', 2);
-                die(js::reload('top'));
+                return print(js::reload('top'));
             }
         }
 
         if($mode == 'new')
         {
-            if(isset($this->config->global->upgradeStep) and $this->config->global->upgradeStep == 'mergeProgram') die(js::locate($this->createLink('upgrade', 'mergeProgram'), 'parent'));
+            if(isset($this->config->global->upgradeStep) and $this->config->global->upgradeStep == 'mergeProgram') return print(js::locate($this->createLink('upgrade', 'mergeProgram'), 'parent'));
 
             unset($_SESSION['upgrading']);
         }
@@ -611,7 +611,7 @@ class custom extends control
         {
             $this->loadModel('setting')->deleteItems("owner=$account&module=$module&section=$section&key=$key");
         }
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
@@ -715,7 +715,7 @@ class custom extends control
         {
             $menu = !empty($method) ? customModel::getFeatureMenu($module, $method) : customModel::getModuleMenu($module, true);
         }
-        die(str_replace("'", '\u0027', json_encode(array('result' => $menu ? 'success' : 'fail', 'menu' => $menu))));
+        return print(str_replace("'", '\u0027', json_encode(array('result' => $menu ? 'success' : 'fail', 'menu' => $menu))));
     }
 
     /**
@@ -727,12 +727,12 @@ class custom extends control
      */
     public function ajaxRestoreMenu($setPublic = 0, $confirm = 'no')
     {
-        if($confirm == 'no') die(js::confirm($this->lang->custom->confirmRestore, inlink('ajaxRestoreMenu', "setPublic=$setPublic&confirm=yes")));
+        if($confirm == 'no') return print(js::confirm($this->lang->custom->confirmRestore, inlink('ajaxRestoreMenu', "setPublic=$setPublic&confirm=yes")));
 
         $account = $this->app->user->account;
         $this->loadModel('setting')->deleteItems("owner={$account}&module=common&section=customMenu");
         if($setPublic) $this->setting->deleteItems("owner=system&module=common&section=customMenu");
-        die(js::reload('parent.parent'));
+        return print(js::reload('parent.parent'));
     }
 
     /**
@@ -748,7 +748,7 @@ class custom extends control
             $data = fixer::input('post')->join('showLibs', ',')->get();
             if(isset($data->showLibs)) $data = $data->showLibs;
             $this->loadModel('setting')->setItem("{$this->app->user->account}.doc.custom.showLibs", $data);
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -762,9 +762,9 @@ class custom extends control
      */
     public function resetRequired($module, $confirm = 'no')
     {
-        if($confirm == 'no') die(js::confirm($this->lang->custom->confirmRestore, inlink('resetRequired', "module=$module&confirm=yes")));
+        if($confirm == 'no') return print(js::confirm($this->lang->custom->confirmRestore, inlink('resetRequired', "module=$module&confirm=yes")));
 
         $this->loadModel('setting')->deleteItems("owner=system&module={$module}&key=requiredFields");
-        die(js::reload('parent.parent'));
+        return print(js::reload('parent.parent'));
     }
 }
diff --git a/module/datatable/control.php b/module/datatable/control.php
index d625a087f7..1ef379422c 100644
--- a/module/datatable/control.php
+++ b/module/datatable/control.php
@@ -110,7 +110,7 @@ class datatable extends control
      */
     public function ajaxReset($module, $method, $system = 0, $confirm = 'no')
     {
-        if($confirm == 'no') die(js::confirm($this->lang->datatable->confirmReset, inlink('ajaxReset', "module=$module&method=$method&system=$system&confirm=yes")));
+        if($confirm == 'no') return print(js::confirm($this->lang->datatable->confirmReset, inlink('ajaxReset', "module=$module&method=$method&system=$system&confirm=yes")));
 
         $account = $this->app->user->account;
         $target  = $module . ucfirst($method);
@@ -119,6 +119,6 @@ class datatable extends control
 
         $this->loadModel('setting')->deleteItems("owner=$account&module=datatable&section=$target&key=$key");
         if($system) $this->setting->deleteItems("owner=system&module=datatable&section=$target&key=$key");
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 }
diff --git a/module/dept/control.php b/module/dept/control.php
index a23040e95f..c68439a309 100644
--- a/module/dept/control.php
+++ b/module/dept/control.php
@@ -56,7 +56,7 @@ class dept extends control
         if(!empty($_POST))
         {
             $this->dept->updateOrder($_POST['orders']);
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -72,7 +72,7 @@ class dept extends control
         {
             $deptIDList = $this->dept->manageChild($_POST['parentDeptID'], $_POST['depts']);
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $deptIDList));
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -89,7 +89,7 @@ class dept extends control
         {
             $this->dept->update($deptID);
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'success'));
-            die(js::alert($this->lang->dept->successSave) . js::reload('parent'));
+            return print(js::alert($this->lang->dept->successSave) . js::reload('parent'));
         }
 
         $dept  = $this->dept->getById($deptID);
@@ -105,7 +105,7 @@ class dept extends control
         $childs = $this->dept->getAllChildId($deptID);
         foreach($childs as $childModuleID) unset($this->view->optionMenu[$childModuleID]);
 
-        die($this->display());
+        $this->display();
     }
 
     /**
@@ -124,23 +124,23 @@ class dept extends control
         if($sons)
         {
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'message' => $this->lang->dept->error->hasSons));
-            die(js::alert($this->lang->dept->error->hasSons));
+            return print(js::alert($this->lang->dept->error->hasSons));
         }
         if($users)
         {
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'message' => $this->lang->dept->error->hasUsers));
-            die(js::alert($this->lang->dept->error->hasUsers));
+            return print(js::alert($this->lang->dept->error->hasUsers));
         }
 
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->dept->confirmDelete, $this->createLink('dept', 'delete', "deptID=$deptID&confirm=yes")));
+            return print(js::confirm($this->lang->dept->confirmDelete, $this->createLink('dept', 'delete', "deptID=$deptID&confirm=yes")));
         }
         else
         {
             $this->dept->delete($deptID);
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'success'));
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -155,6 +155,6 @@ class dept extends control
     public function ajaxGetUsers($dept, $user = '')
     {
         $users = array('' => '') + $this->dept->getDeptUserPairs($dept);
-        die(html::select('user', $users, $user, "class='form-control chosen'"));
+        return print(html::select('user', $users, $user, "class='form-control chosen'"));
     }
 }
diff --git a/module/doc/control.php b/module/doc/control.php
index 1850e42ea5..3fcdebb6f2 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -142,7 +142,7 @@ class doc extends control
                 $this->action->create('docLib', $libID, 'Created');
 
                 if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $libID));
-                die(js::locate($this->createLink('doc', 'objectLibs', "type=$objectType&objectID=$objectID&libID=$libID"), 'parent.parent'));
+                return print(js::locate($this->createLink('doc', 'objectLibs', "type=$objectType&objectID=$objectID&libID=$libID"), 'parent.parent'));
             }
             else
             {
@@ -174,7 +174,7 @@ class doc extends control
         $this->view->type        = $type;
         $this->view->libTypeList = $libTypeList;
         $this->view->objectID    = $objectID;
-        die($this->display());
+        $this->display();
     }
 
     /**
@@ -231,7 +231,7 @@ class doc extends control
         $this->view->users  = $this->user->getPairs('noletter|noclosed', $lib->users);
         $this->view->libID  = $libID;
 
-        die($this->display());
+        $this->display();
     }
 
     /**
@@ -245,22 +245,22 @@ class doc extends control
      */
     public function deleteLib($libID, $confirm = 'no', $from = 'lib')
     {
-        if($libID == 'product' or $libID == 'execution') die();
+        if($libID == 'product' or $libID == 'execution') return;
         if($confirm == 'no')
         {
             $deleteTip = $from == 'book' ? $this->lang->doc->confirmDeleteBook : $this->lang->doc->confirmDeleteLib;
-            die(js::confirm($deleteTip, $this->createLink('doc', 'deleteLib', "libID=$libID&confirm=yes")));
+            return print(js::confirm($deleteTip, $this->createLink('doc', 'deleteLib', "libID=$libID&confirm=yes")));
         }
         else
         {
             $lib = $this->doc->getLibByID($libID);
-            if(!empty($lib->main)) die(js::alert($this->lang->doc->errorMainSysLib));
+            if(!empty($lib->main)) return print(js::alert($this->lang->doc->errorMainSysLib));
 
             $this->doc->delete(TABLE_DOCLIB, $libID);
             if(isonlybody())
             {
                 unset($_GET['onlybody']);
-                die(js::locate($this->createLink('doc', 'objectLibs', 'type=book'), 'parent.parent'));
+                return print(js::locate($this->createLink('doc', 'objectLibs', 'type=book'), 'parent.parent'));
             }
 
             $browseLink = $this->createLink('doc', 'index');
@@ -271,7 +271,7 @@ class doc extends control
                 $browseLink = $this->createLink('doc', 'objectLibs', "type=$objectType&objectID=$objectID");
             }
 
-            die(js::locate($browseLink, 'parent'));
+            return print(js::locate($browseLink, 'parent'));
         }
     }
 
@@ -492,7 +492,7 @@ class doc extends control
         if(!$doc)
         {
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'code' => 404, 'message' => '404 Not found'));
-            die(js::error($this->lang->notFound) . js::locate($this->createLink('doc', 'index')));
+            return print(js::error($this->lang->notFound) . js::locate($this->createLink('doc', 'index')));
         }
 
         /* The global search opens in the document library. */
@@ -557,7 +557,7 @@ class doc extends control
         {
             $type = $this->dao->select('type')->from(TABLE_DOC)->where('id')->eq($docID)->fetch('type');
             $tips = $type == 'chapter' ? $this->lang->doc->confirmDeleteChapter : $this->lang->doc->confirmDelete;
-            die(js::confirm($tips, inlink('delete', "docID=$docID&confirm=yes")));
+            return print(js::confirm($tips, inlink('delete', "docID=$docID&confirm=yes")));
         }
         else
         {
@@ -587,7 +587,7 @@ class doc extends control
                 return $this->send($response);
             }
 
-            die(js::locate($this->session->docList, 'parent'));
+            return print(js::locate($this->session->docList, 'parent'));
         }
     }
 
@@ -605,7 +605,7 @@ class doc extends control
         $this->loadModel('file');
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->file->confirmDelete, inlink('deleteFile', "docID=$docID&fileID=$fileID&confirm=yes")));
+            return print(js::confirm($this->lang->file->confirmDelete, inlink('deleteFile', "docID=$docID&fileID=$fileID&confirm=yes")));
         }
         else
         {
@@ -621,7 +621,7 @@ class doc extends control
 
             $file = $this->file->getById($fileID);
             $this->action->create($file->objectType, $file->objectID, 'deletedFile', '', $extra = $file->title);
-            die(js::locate($this->createLink('doc', 'view', "docID=$docID"), 'parent'));
+            return print(js::locate($this->createLink('doc', 'view', "docID=$docID"), 'parent'));
         }
     }
 
@@ -694,7 +694,7 @@ class doc extends control
     public function ajaxGetModules($libID)
     {
         $moduleOptionMenu = $this->tree->getOptionMenu($libID, 'doc', $startModuleID = 0);
-        die(html::select('module', $moduleOptionMenu, 0, "class='form-control'"));
+        return print(html::select('module', $moduleOptionMenu, 0, "class='form-control'"));
     }
 
     /**
@@ -712,7 +712,7 @@ class doc extends control
         if($customMenus) $customMenus = json_decode($customMenus);
         if(empty($customMenus))
         {
-            if($type == 'remove') die(js::reload('parent'));
+            if($type == 'remove') return print(js::reload('parent'));
             $customMenus = array();
             $i           = 0;
             foreach($this->lang->doc->menu as $name => $item)
@@ -739,7 +739,7 @@ class doc extends control
         $customMenu->float = 'right';
         if($type == 'fixed') $customMenus[] = $customMenu;
         $this->setting->setItem("{$this->app->user->account}.common.customMenu.{$customMenuKey}", json_encode($customMenus));
-        die(js::reload('parent'));
+        return print(js::reload('parent'));
     }
 
     /**
@@ -750,7 +750,7 @@ class doc extends control
      */
     public function ajaxGetAllLibs()
     {
-        die(json_encode($this->doc->getAllLibGroups()));
+        return print(json_encode($this->doc->getAllLibGroups()));
     }
 
     /**
@@ -763,7 +763,7 @@ class doc extends control
     {
         $childModules = $this->tree->getOptionMenu($libID, 'doc');
         $select       = ($type == 'module') ? html::select('module', $childModules, '', "class='form-control chosen'") : html::select('parent', $childModules, '', "class='form-control chosen'");
-        die($select);
+        return print($select);
     }
 
     /**
@@ -919,12 +919,12 @@ class doc extends control
     {
         echo(js::alert($this->lang->doc->accessDenied));
 
-        if(!$this->server->http_referer) die(js::locate(inlink('index')));
+        if(!$this->server->http_referer) return print(js::locate(inlink('index')));
 
         $loginLink = $this->config->requestType == 'GET' ? "?{$this->config->moduleVar}=user&{$this->config->methodVar}=login" : "user{$this->config->requestFix}login";
-        if(strpos($this->server->http_referer, $loginLink) !== false) die(js::locate(inlink('index')));
+        if(strpos($this->server->http_referer, $loginLink) !== false) return print(js::locate(inlink('index')));
 
-        die(js::locate('back'));
+        return print(js::locate('back'));
     }
 
     /**
@@ -959,7 +959,7 @@ class doc extends control
         if($docID)
         {
             $doc = $this->doc->getById($docID, $version, true);
-            if(!$doc) die(js::error($this->lang->notFound));
+            if(!$doc) return print(js::error($this->lang->notFound));
 
             if($doc->keywords)
             {
diff --git a/module/doc/model.php b/module/doc/model.php
index 3d646519ef..dec1789a16 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -507,8 +507,8 @@ class docModel extends model
         {
             echo(js::alert($this->lang->doc->accessDenied));
             $loginLink = $this->config->requestType == 'GET' ? "?{$this->config->moduleVar}=user&{$this->config->methodVar}=login" : "user{$this->config->requestFix}login";
-            if(strpos($this->server->http_referer, $loginLink) !== false) die(js::locate(inlink('index')));
-            die(js::locate('back'));
+            if(strpos($this->server->http_referer, $loginLink) !== false) return print(js::locate(inlink('index')));
+            return print(js::locate('back'));
         }
         $version    = $version ? $version : $doc->version;
         $docContent = $this->dao->select('*')->from(TABLE_DOCCONTENT)->where('doc')->eq($doc->id)->andWhere('version')->eq($version)->fetch();
@@ -2611,7 +2611,7 @@ EOT;
 
             $object = $this->dao->select('id,name,status')->from($table)->where('id')->eq($objectID)->fetch();
 
-            if(empty($object)) die(js::locate(helper::createLink($type, 'create')));
+            if(empty($object)) return print(js::locate(helper::createLink($type, 'create')));
         }
 
         $tab = strpos(',doc,product,project,execution,', ",{$this->app->tab},") !== false ? $this->app->tab : 'doc';
diff --git a/module/execution/control.php b/module/execution/control.php
index 5d73250ea5..8f73c5b2f1 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -458,7 +458,7 @@ class execution extends control
         if(!empty($_POST))
         {
             $this->execution->importTask($toExecution);
-            die(js::locate(inlink('importTask', "toExecution=$toExecution&fromExecution=$fromExecution"), 'parent'));
+            return print(js::locate(inlink('importTask', "toExecution=$toExecution&fromExecution=$fromExecution"), 'parent'));
         }
 
         $execution   = $this->commonAction($toExecution);
@@ -513,9 +513,9 @@ class execution extends control
         if(!empty($_POST))
         {
             $mails = $this->execution->importBug($executionID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
-            die(js::locate($this->createLink('execution', 'importBug', "executionID=$executionID"), 'parent'));
+            return print(js::locate($this->createLink('execution', 'importBug', "executionID=$executionID"), 'parent'));
         }
 
         /* Set browseType, productID, moduleID and queryID. */
@@ -1179,7 +1179,7 @@ class execution extends control
     public function computeBurn($reload = 'no')
     {
         $this->view->burns = $this->execution->computeBurn();
-        if($reload == 'yes') die(js::reload('parent'));
+        if($reload == 'yes') return print(js::reload('parent'));
         $this->display();
     }
 
@@ -1195,7 +1195,7 @@ class execution extends control
         if($_POST)
         {
             $this->execution->fixFirst($executionID);
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $execution = $this->execution->getById($executionID);
@@ -1292,7 +1292,7 @@ class execution extends control
                 }
                 else
                 {
-                    die(js::confirm($this->lang->execution->importPlanStory, inlink('create', "projectID=$projectID&executionID=$executionID&copyExecutionID=&planID=$planID&confirm=yes"), inlink('create', "projectID=$projectID&executionID=$executionID")));
+                    return print(js::confirm($this->lang->execution->importPlanStory, inlink('create', "projectID=$projectID&executionID=$executionID&copyExecutionID=&planID=$planID&confirm=yes"), inlink('create', "projectID=$projectID&executionID=$executionID")));
                 }
             }
 
@@ -1662,7 +1662,7 @@ class execution extends control
                     $this->loadModel('common')->syncPPEStatus($syncExecution);
                 }
             }
-            die(js::locate($this->session->executionList, 'parent'));
+            return print(js::locate($this->session->executionList, 'parent'));
         }
 
         if($this->app->tab == 'project')
@@ -1671,7 +1671,7 @@ class execution extends control
             $this->view->project = $this->project->getById($this->session->project);
         }
 
-        $executionIDList = $this->post->executionIDList ? $this->post->executionIDList : die(js::locate($this->session->executionList, 'parent'));
+        $executionIDList = $this->post->executionIDList ? $this->post->executionIDList : return print(js::locate($this->session->executionList, 'parent'));
         $executions      = $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->in($executionIDList)->fetchAll('id');
 
         $appendPoUsers = $appendPmUsers = $appendQdUsers = $appendRdUsers = array();
@@ -1732,7 +1732,7 @@ class execution extends control
         {
             $this->loadModel('action');
             $changes = $this->execution->start($executionID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -1777,7 +1777,7 @@ class execution extends control
         {
             $this->loadModel('action');
             $changes = $this->execution->putoff($executionID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -1821,7 +1821,7 @@ class execution extends control
         {
             $this->loadModel('action');
             $changes = $this->execution->suspend($executionID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -1865,7 +1865,7 @@ class execution extends control
         {
             $this->loadModel('action');
             $changes = $this->execution->activate($executionID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -1916,7 +1916,7 @@ class execution extends control
         {
             $this->loadModel('action');
             $changes = $this->execution->close($executionID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -1953,7 +1953,7 @@ class execution extends control
     {
         $executionID = $this->execution->saveState((int)$executionID, $this->executions);
         $execution   = $this->execution->getById($executionID, true);
-        if(empty($execution) || strpos('stage,sprint', $execution->type) === false) die(js::error($this->lang->notFound) . js::locate('back'));
+        if(empty($execution) || strpos('stage,sprint', $execution->type) === false) return print(js::error($this->lang->notFound) . js::locate('back'));
 
         $this->app->loadLang('program');
 
@@ -2257,7 +2257,7 @@ class execution extends control
         $this->app->session->set('caseList', $uri, 'qa');
         $this->app->session->set('bugList', $uri, 'qa');
 
-        if($type === 'json') die(helper::jsonEncode4Parse($tree, JSON_HEX_QUOT | JSON_HEX_APOS));
+        if($type === 'json') return print(helper::jsonEncode4Parse($tree, JSON_HEX_QUOT | JSON_HEX_APOS));
 
         $this->view->title      = $this->lang->execution->tree;
         $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
@@ -2354,7 +2354,7 @@ class execution extends control
             {
                 if(!empty($data)) $hasData = true;
             }
-            if(!$hasData) die(js::alert($this->lang->execution->noPrintData) . js::close());
+            if(!$hasData) return print(js::alert($this->lang->execution->noPrintData) . js::close());
 
             $this->execution->saveKanbanData($executionID, $originalDatas);
 
@@ -2374,8 +2374,7 @@ class execution extends control
             $this->view->realnames  = $this->loadModel('user')->getRealNameAndEmails($users);
             $this->view->executionID  = $executionID;
 
-            die($this->display());
-
+            return $this->display();
         }
 
         $this->execution->setMenu($executionID);
@@ -2507,9 +2506,9 @@ class execution extends control
             $executionType = $this->dao->findById($executionID)->from(TABLE_EXECUTION)->fetch('type');
             if($executionType == 'stage')
             {
-                if(!isset($_POST['products'])) die(js::alert($this->lang->execution->noLinkProduct) . js::locate($this->createLink('execution', 'manageProducts', "executionID=$executionID&from=$from")));
+                if(!isset($_POST['products'])) return print(js::alert($this->lang->execution->noLinkProduct) . js::locate($this->createLink('execution', 'manageProducts', "executionID=$executionID&from=$from")));
 
-                if(count($_POST['products']) > 1) die(js::alert($this->lang->execution->oneProduct) . js::locate($this->createLink('execution', 'manageProducts', "executionID=$executionID&from=$from")));
+                if(count($_POST['products']) > 1) return print(js::alert($this->lang->execution->oneProduct) . js::locate($this->createLink('execution', 'manageProducts', "executionID=$executionID&from=$from")));
             }
 
             $oldProducts = $this->product->getProducts($executionID);
@@ -2517,7 +2516,7 @@ class execution extends control
             if($from == 'buildCreate' && $this->session->buildCreate) $browseExecutionLink = $this->session->buildCreate;
 
             $this->execution->updateProducts($executionID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             $oldProducts  = array_keys($oldProducts);
             $newProducts  = $this->product->getProducts($executionID);
@@ -2528,7 +2527,7 @@ class execution extends control
             if(isonlybody())
             {
                 unset($_GET['onlybody']);
-                die(js::locate($this->createLink('build', 'create', "executionID=$executionID&productID=0&projectID=$execution->project"), 'parent'));
+                return print(js::locate($this->createLink('build', 'create', "executionID=$executionID&productID=0&projectID=$execution->project"), 'parent'));
             }
         }
 
@@ -2594,7 +2593,7 @@ class execution extends control
         {
             $this->execution->manageMembers($executionID);
             $this->loadModel('action')->create('team', $executionID, 'managedTeam');
-            die(js::locate($this->createLink('execution', 'team', "executionID=$executionID"), 'parent'));
+            return print(js::locate($this->createLink('execution', 'team', "executionID=$executionID"), 'parent'));
         }
 
         /* Load model. */
@@ -2654,7 +2653,7 @@ class execution extends control
      */
     public function unlinkMember($executionID, $userID, $confirm = 'no')
     {
-        if($confirm == 'no') die(js::confirm($this->lang->execution->confirmUnlinkMember, $this->inlink('unlinkMember', "executionID=$executionID&userID=$userID&confirm=yes")));
+        if($confirm == 'no') return print(js::confirm($this->lang->execution->confirmUnlinkMember, $this->inlink('unlinkMember', "executionID=$executionID&userID=$userID&confirm=yes")));
 
         $user    = $this->loadModel('user')->getById($userID, 'id');
         $account = $user->account;
@@ -2677,7 +2676,7 @@ class execution extends control
             }
             return $this->send($response);
         }
-        die(js::locate($this->inlink('team', "executionID=$executionID"), 'parent'));
+        return print(js::locate($this->inlink('team', "executionID=$executionID"), 'parent'));
     }
 
     /**
@@ -2829,7 +2828,7 @@ class execution extends control
         if($confirm == 'no')
         {
             $tip = $this->app->rawModule == 'projectstory' ? $this->lang->execution->confirmUnlinkExecutionStory : $this->lang->execution->confirmUnlinkStory;
-            die(js::confirm($tip, $this->createLink('execution', 'unlinkstory', "executionID=$executionID&storyID=$storyID&confirm=yes")));
+            return print(js::confirm($tip, $this->createLink('execution', 'unlinkstory', "executionID=$executionID&storyID=$storyID&confirm=yes")));
         }
         else
         {
@@ -2838,7 +2837,7 @@ class execution extends control
             /* if kanban then reload and if ajax request then send result. */
             if(isonlybody())
             {
-                die(js::reload('parent'));
+                return print(js::reload('parent'));
             }
             elseif(helper::isAjaxRequest())
             {
@@ -2854,7 +2853,7 @@ class execution extends control
                 }
                 return $this->send($response);
             }
-            die(js::locate($this->app->session->storyList, 'parent'));
+            return print(js::locate($this->app->session->storyList, 'parent'));
         }
     }
 
@@ -2883,7 +2882,7 @@ class execution extends control
             }
         }
         if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
-        die(js::locate($this->createLink('execution', 'story', "executionID=$executionID")));
+        return print(js::locate($this->createLink('execution', 'story', "executionID=$executionID")));
     }
 
     /**
@@ -2970,7 +2969,7 @@ class execution extends control
     public function ajaxGetProducts($executionID)
     {
         $products = $this->loadModel('product')->getProducts($executionID, 'all', '', false);
-        die(html::select('product', $products, '', 'class="form-control"'));
+        return print(html::select('product', $products, '', 'class="form-control"'));
     }
 
     /**
@@ -2986,12 +2985,12 @@ class execution extends control
         $users = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution');
         if($this->app->getViewType() === 'json')
         {
-            die(json_encode($users));
+            return print(json_encode($users));
         }
         else
         {
             $assignedTo = isset($users[$assignedTo]) ? $assignedTo : '';
-            die(html::select('assignedTo', $users, $assignedTo, "class='form-control'"));
+            return print(html::select('assignedTo', $users, $assignedTo, "class='form-control'"));
         }
     }
 
@@ -3014,7 +3013,7 @@ class execution extends control
         $users   = $this->loadModel('user')->getPairs('nodeleted|noclosed');
         $members = $this->user->getTeamMemberPairs($objectID, $type);
 
-        die(html::select('teamMembers[]', $users, array_keys($members), "class='form-control chosen' multiple"));
+        return print(html::select('teamMembers[]', $users, array_keys($members), "class='form-control chosen' multiple"));
     }
 
     /**
@@ -3414,7 +3413,7 @@ class execution extends control
             }
             if(common::hasPriv('execution', 'kanbanColsColor')) $this->setting->setItem("system.execution.kanbanSetting.colorList", json_encode($data->colorList));
 
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $this->app->loadLang('task');
@@ -3434,7 +3433,7 @@ class execution extends control
      */
     public function ajaxResetKanban($executionID, $confirm = 'no')
     {
-        if($confirm != 'yes') die(js::confirm($this->lang->kanbanSetting->noticeReset, inlink('ajaxResetKanban', "executionID=$executionID&confirm=yes")));
+        if($confirm != 'yes') return print(js::confirm($this->lang->kanbanSetting->noticeReset, inlink('ajaxResetKanban', "executionID=$executionID&confirm=yes")));
 
         $this->loadModel('setting');
 
@@ -3450,7 +3449,7 @@ class execution extends control
 
         if(common::hasPriv('execution', 'kanbanColsColor')) $this->setting->deleteItems("owner=system&module=execution&section=kanbanSetting&key=colorList");
 
-        die(js::reload('parent.parent'));
+        return print(js::reload('parent.parent'));
     }
 
     /**
@@ -3606,7 +3605,7 @@ class execution extends control
         $this->app->loadLang('kanban');
         $groups = array();
         $groups = $this->lang->kanban->group->$type;
-        die(html::select("group", $groups, $group, 'class="form-control chosen" data-max_drop_width="215"'));
+        return print(html::select("group", $groups, $group, 'class="form-control chosen" data-max_drop_width="215"'));
     }
 
     /**
@@ -3628,11 +3627,7 @@ class execution extends control
         if($lastEditedTime > $enterTime or $groupBy != 'default')
         {
             $kanbanGroup = $from == 'execution' ? $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType, $groupBy) : $this->loadModel('kanban')->getRDKanban($executionID, $browseType, 'id_asc', 0, $groupBy);
-            die(json_encode($kanbanGroup));
-        }
-        else
-        {
-            die('');
+            return print(json_encode($kanbanGroup));
         }
     }
 
diff --git a/module/execution/model.php b/module/execution/model.php
index 64e192bdbd..7a380f8a79 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -44,12 +44,12 @@ class executionModel extends model
 
         echo(js::alert($this->lang->execution->accessDenied));
 
-        if(!$this->server->http_referer) die(js::locate(helper::createLink('execution', 'index')));
+        if(!$this->server->http_referer) return print(js::locate(helper::createLink('execution', 'index')));
 
         $loginLink = $this->config->requestType == 'GET' ? "?{$this->config->moduleVar}=user&{$this->config->methodVar}=login" : "user{$this->config->requestFix}login";
-        if(strpos($this->server->http_referer, $loginLink) !== false) die(js::locate(helper::createLink('execution', 'index')));
+        if(strpos($this->server->http_referer, $loginLink) !== false) return print(js::locate(helper::createLink('execution', 'index')));
 
-        die(js::locate(helper::createLink('execution', 'all')));
+        return print(js::locate(helper::createLink('execution', 'all')));
     }
 
     /**
@@ -70,7 +70,7 @@ class executionModel extends model
             $this->lang->execution->accessDenied = str_replace($this->lang->executionCommon, $this->lang->execution->kanban, $this->lang->execution->accessDenied);
         }
 
-        if(!$this->app->user->admin and strpos(",{$this->app->user->view->sprints},", ",$executionID,") === false and !defined('TUTORIAL') and $executionID != 0) die(js::error($this->lang->execution->accessDenied) . js::locate('back'));
+        if(!$this->app->user->admin and strpos(",{$this->app->user->view->sprints},", ",$executionID,") === false and !defined('TUTORIAL') and $executionID != 0) return print(js::error($this->lang->execution->accessDenied) . js::locate('back'));
 
         $executions = $this->getPairs(0, 'all', 'nocode');
         if(!$executionID and $this->session->execution) $executionID = $this->session->execution;
@@ -649,10 +649,10 @@ class executionModel extends model
 
                 $executions[$executionID]->{$extendField->field} = htmlSpecialString($executions[$executionID]->{$extendField->field});
                 $message = $this->checkFlowRule($extendField, $executions[$executionID]->{$extendField->field});
-                if($message) die(js::alert($message));
+                if($message) return print(js::alert($message));
             }
         }
-        if(dao::isError()) die(js::error(dao::getError()));
+        if(dao::isError()) return print(js::error(dao::getError()));
 
         foreach($executions as $executionID => $execution)
         {
@@ -671,7 +671,7 @@ class executionModel extends model
                 ->where('id')->eq($executionID)
                 ->limit(1)
                 ->exec();
-            if(dao::isError()) die(js::error('execution#' . $executionID . dao::getError(true)));
+            if(dao::isError()) return print(js::error('execution#' . $executionID . dao::getError(true)));
 
             if(!empty($execution->project) and $oldExecution->project != $execution->project)
             {
@@ -2107,7 +2107,7 @@ class executionModel extends model
             if(dao::isError())
             {
                 echo js::error(dao::getError());
-                die(js::reload('parent'));
+                return print(js::reload('parent'));
             }
 
             $taskID = $this->dao->lastInsertID();
@@ -2152,7 +2152,7 @@ class executionModel extends model
                 $newBug->assignedTo     = $task->assignedTo;
                 $newBug->assignedDate   = $now;
                 $this->dao->update(TABLE_BUG)->data($newBug)->where('id')->eq($key)->exec();
-                if(dao::isError()) die(js::error(dao::getError()));
+                if(dao::isError()) return print(js::error(dao::getError()));
                 $changes = common::createChanges($bug, $newBug);
 
                 $actionID = $this->action->create('bug', $key, 'Assigned', '', $newBug->assignedTo);
@@ -2412,7 +2412,7 @@ class executionModel extends model
         {
             $executions       = $this->dao->select('*')->from(TABLE_EXECUTION)->where('parent')->eq($executionID)->fetchAll('id');
             $executionStories = $this->dao->select('project,story')->from(TABLE_PROJECTSTORY)->where('story')->eq($storyID)->andWhere('project')->in(array_keys($executions))->fetchAll();
-            if(!empty($executionStories)) die(js::alert($this->lang->execution->notAllowedUnlinkStory));
+            if(!empty($executionStories)) return print(js::alert($this->lang->execution->notAllowedUnlinkStory));
         }
         $this->dao->delete()->from(TABLE_PROJECTSTORY)->where('project')->eq($executionID)->andWhere('story')->eq($storyID)->limit(1)->exec();
 
diff --git a/module/extension/control.php b/module/extension/control.php
index 07a87c4a28..2b4b8c1aca 100644
--- a/module/extension/control.php
+++ b/module/extension/control.php
@@ -30,7 +30,7 @@ class extension extends control
             $this->view->position[] = $this->lang->extension->browse;
 
             $this->view->error = sprintf($this->lang->extension->noticeOkFile, str_replace('\\', '/', $statusFile));
-            die($this->display('extension', 'safe'));
+            return $this->display('extension', 'safe');
         }
     }
 
@@ -148,7 +148,7 @@ class extension extends control
         if($statusFile)
         {
             $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile);
-            die($this->display());
+            return $this->display();
         }
         /* Get the package file name. */
         $packageFile = $this->extension->getPackageFile($extension);
@@ -157,7 +157,7 @@ class extension extends control
         if(!file_exists($packageFile))
         {
             $this->view->error = sprintf($this->lang->extension->errorPackageNotFound, $packageFile);
-            die($this->display());
+            return $this->display();
         }
 
         /* Checking the extension paths. */
@@ -166,7 +166,7 @@ class extension extends control
         if($return->result != 'ok')
         {
             $this->view->error = $return->errors;
-            die($this->display());
+            return $this->display();
         }
 
         /* Extract the package. */
@@ -174,7 +174,7 @@ class extension extends control
         if($return->result != 'ok')
         {
             $this->view->error = sprintf($this->lang->extension->errorExtracted, $packageFile, $return->error);
-            die($this->display());
+            return $this->display();
         }
         /* Get condition. e.g. zentao|depends|conflicts. */
         $condition = $this->extension->getCondition($extension);
@@ -185,7 +185,7 @@ class extension extends control
         if($this->extension->checkVersion($incompatible))
         {
             $this->view->error = sprintf($this->lang->extension->errorIncompatible);
-            die($this->display());
+            return $this->display();
         }
 
         /* Check conflicts. */
@@ -204,7 +204,7 @@ class extension extends control
             if($conflictsExt)
             {
                 $this->view->error = sprintf($this->lang->extension->errorConflicts, $conflictsExt);
-                die($this->display());
+                return $this->display();
             }
         }
 
@@ -239,7 +239,7 @@ class extension extends control
             if($noDepends)
             {
                 $this->view->error = sprintf($this->lang->extension->errorDepends, $dependsExt);
-                die($this->display());
+                return $this->display();
             }
         }
 
@@ -250,7 +250,7 @@ class extension extends control
             $ignoreLink = inlink('install', "extension=$extension&downLink=&md5=$md5&type=$type&overridePackage=$overridePackage&ignoreCompatible=yes&overrideFile=$overrideFile&agreeLicense=$agreeLicense&upgrade=$upgrade");
             $returnLink = inlink('obtain');
             $this->view->error = sprintf($this->lang->extension->errorCheckIncompatible, $installType, $ignoreLink, $installType, $returnLink);
-            die($this->display());
+            return $this->display();
         }
 
         /* Check files in the package conflicts with exists files or not. */
@@ -262,7 +262,7 @@ class extension extends control
                 $overrideLink = inlink('install', "extension=$extension&downLink=&md5=$md5&type=$type&overridePackage=$overridePackage&ignoreCompatible=$ignoreCompatible&overrideFile=yes&agreeLicense=$agreeLicense&upgrade=$upgrade");
                 $returnLink   = inlink('obtain');
                 $this->view->error = sprintf($this->lang->extension->errorFileConflicted, $return->error, $overrideLink, $returnLink);
-                die($this->display());
+                return $this->display();
             }
         }
 
@@ -283,7 +283,7 @@ class extension extends control
             $this->view->license   = $license;
             $this->view->author    = $extensionInfo->author;
             $this->view->agreeLink = $agreeLink;
-            die($this->display());
+            return $this->display();
         }
 
         /* The preInstall hook file. */
@@ -311,7 +311,7 @@ class extension extends control
             if($return->result != 'ok')
             {
                 $this->view->error = sprintf($this->lang->extension->errorInstallDB, $return->error);
-                die($this->display());
+                return $this->display();
             }
         }
 
@@ -342,14 +342,14 @@ class extension extends control
             $this->view->title   = $this->lang->extension->waring;
             $this->view->confirm = 'no';
             $this->view->code    = $extension;
-            die($this->display());
+            return $this->display();
         }
 
         $dependsExts = $this->extension->checkDepends($extension);
         if($dependsExts)
         {
             $this->view->error = sprintf($this->lang->extension->errorUninstallDepends, join(' ', $dependsExts));
-            die($this->display());
+            return $this->display();
         }
 
         if($preUninstallHook = $this->extension->getHookFile($extension, 'preuninstall')) include $preUninstallHook;
@@ -382,7 +382,7 @@ class extension extends control
                 $ignoreLink = inlink('activate', "extension=$extension&ignore=yes");
                 $resetLink  = inlink('browse', 'type=deactivated');
                 $this->view->error = sprintf($this->lang->extension->errorFileConflicted, $return->error, $ignoreLink, $resetLink);
-                die($this->display());
+                return $this->display();
             }
         }
 
@@ -421,12 +421,12 @@ class extension extends control
         if($statusFile)
         {
             $this->view->error = sprintf($this->lang->extension->noticeOkFile, $statusFile);
-            die($this->display());
+            return $this->display();
         }
 
         if($_FILES)
         {
-            if($_FILES['file']['size'] == 0) die(js::alert(str_replace("'", "\'", sprintf($this->lang->extension->errorFileNotEmpty, $fileName, $return->error))));
+            if($_FILES['file']['size'] == 0) return print(js::alert(str_replace("'", "\'", sprintf($this->lang->extension->errorFileNotEmpty, $fileName, $return->error))));
 
             $tmpName   = $_FILES['file']['tmp_name'];
             $fileName  = $_FILES['file']['name'];
@@ -435,7 +435,7 @@ class extension extends control
             {
                 $downloadPath = $this->app->getTmpRoot() . 'extension/';
                 $errorMessage = strip_tags(sprintf($this->lang->extension->errorDownloadPathNotWritable, $downloadPath, $downloadPath));
-                die(js::alert($errorMessage));
+                return print(js::alert($errorMessage));
             }
 
             $extension = basename($fileName, '.zip');
@@ -443,7 +443,7 @@ class extension extends control
             if($return->result != 'ok')
             {
                 unlink($dest);
-                die(js::alert(str_replace("'", "\'", sprintf($this->lang->extension->errorExtracted, $fileName, $return->error))));
+                return print(js::alert(str_replace("'", "\'", sprintf($this->lang->extension->errorExtracted, $fileName, $return->error))));
             }
 
             $info = $this->extension->parseExtensionCFG($extension);
@@ -458,7 +458,7 @@ class extension extends control
             $info = $this->extension->getInfoFromDB($extension);
             $type = (!empty($info) and ($info->status == 'installed' or $info->status == 'deactivated')) ? 'upgrade' : 'install';
             $link = $type == 'install' ? inlink('install', "extension=$extension") : inlink('upgrade', "extension=$extension");
-            die(js::locate($link, 'parent'));
+            return print(js::locate($link, 'parent'));
         }
 
         $this->display();
diff --git a/module/file/control.php b/module/file/control.php
index cb23328f8b..b9796bb774 100644
--- a/module/file/control.php
+++ b/module/file/control.php
@@ -56,11 +56,11 @@ class file extends control
             {
                 if(defined('RUN_MODE') && RUN_MODE == 'api')
                 {
-                    die(json_encode(array('status' => 'error', 'message' => $this->lang->file->errorFileUpload)));
+                    return print(json_encode(array('status' => 'error', 'message' => $this->lang->file->errorFileUpload)));
                 }
                 else
                 {
-                    die(json_encode(array('error' => 1, 'message' => $this->lang->file->errorFileUpload)));
+                    return print(json_encode(array('error' => 1, 'message' => $this->lang->file->errorFileUpload)));
                 }
             }
             if(@move_uploaded_file($file['tmpname'], $this->file->savePath . $this->file->getSaveName($file['pathname'])))
@@ -84,7 +84,7 @@ class file extends control
                 }
                 else
                 {
-                    die(json_encode(array('error' => 0, 'url' => $url)));
+                    return print(json_encode(array('error' => 0, 'url' => $url)));
                 }
             }
             else
@@ -96,7 +96,7 @@ class file extends control
                 }
                 else
                 {
-                    die(json_encode(array('error' => 1, 'message' => $error)));
+                    return print(json_encode(array('error' => 1, 'message' => $error)));
                 }
             }
         }
@@ -118,7 +118,7 @@ class file extends control
         if(empty($file))
         {
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'code' => 404, 'message' => $this->lang->file->fileNotFound));
-            die("<html><head><meta charset='utf-8'></head><body>{$this->lang->file->fileNotFound}</body></html>");
+            return print("<html><head><meta charset='utf-8'></head><body>{$this->lang->file->fileNotFound}</body></html>");
         }
 
         /* Judge the mode, down or open. */
@@ -161,7 +161,7 @@ class file extends control
         else
         {
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'code' => 404, 'message' => $this->lang->file->fileNotFound));
-            die("<html><head><meta charset='utf-8'></head><body>{$this->lang->file->fileNotFound}</body></html>");
+            return print("<html><head><meta charset='utf-8'></head><body>{$this->lang->file->fileNotFound}</body></html>");
         }
     }
 
@@ -267,7 +267,7 @@ class file extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->file->confirmDelete, inlink('delete', "fileID=$fileID&confirm=yes")));
+            return print(js::confirm($this->lang->file->confirmDelete, inlink('delete', "fileID=$fileID&confirm=yes")));
         }
         else
         {
@@ -277,7 +277,7 @@ class file extends control
             /* Fix Bug #1518. */
             $fileRecord = $this->dao->select('id')->from(TABLE_FILE)->where('pathname')->eq($file->pathname)->fetch();
             if(empty($fileRecord)) @unlink($file->realPath);
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -315,7 +315,7 @@ class file extends control
             if(validater::checkLength($data->fileName, 80, 1) == false)
             {
                 $errTip = $this->lang->error->length;
-                die(js::alert(sprintf($errTip[1], $this->lang->file->title, 80, 1)));
+                return print(js::alert(sprintf($errTip[1], $this->lang->file->title, 80, 1)));
             }
             $fileName = $data->fileName . '.' . $data->extension;
             $this->dao->update(TABLE_FILE)->set('title')->eq($fileName)->where('id')->eq($fileID)->exec();
@@ -325,7 +325,7 @@ class file extends control
             $changes[] = array('field' => 'fileName', 'old' => $file->title . $extension, 'new' => $fileName);
             $this->action->logHistory($actionID, $changes);
 
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $this->view->file = $this->file->getById($fileID);
@@ -340,7 +340,7 @@ class file extends control
      */
     public function ajaxPasteImg($uid = '')
     {
-        if($_POST) die($this->file->pasteImage($this->post->editor, $uid));
+        if($_POST) return print($this->file->pasteImage($this->post->editor, $uid));
     }
 
     /**
@@ -359,22 +359,22 @@ class file extends control
             $imageFiles  = $this->session->$sessionName;
             $this->session->set($module . 'ImagesFile', $imageFiles);
             unset($_SESSION[$sessionName]);
-            die(js::locate($this->createLink($module, 'batchCreate', helper::safe64Decode($params)), 'parent'));
+            return print(js::locate($this->createLink($module, 'batchCreate', helper::safe64Decode($params)), 'parent'));
         }
 
         if($_FILES)
         {
             $file = $this->file->getUploadFile('file');
-            if(!$file) die(json_encode(array('result' => 'fail', 'message' => $this->lang->error->noData)));
+            if(!$file) return print(json_encode(array('result' => 'fail', 'message' => $this->lang->error->noData)));
             if(empty($file['extension']) or !in_array($file['extension'], $this->config->file->imageExtensions))
             {
-                die(json_encode(array('result' => 'fail', 'message' => $this->lang->file->errorFileFormate)));
+                return print(json_encode(array('result' => 'fail', 'message' => $this->lang->file->errorFileFormate)));
             }
 
             $imageFile = $this->file->saveUploadFile($file, $uid);
             if($imageFile === false)
             {
-                die(json_encode(array('result' => 'fail', 'message' => $this->lang->file->errorFileMove)));
+                return print(json_encode(array('result' => 'fail', 'message' => $this->lang->file->errorFileMove)));
             }
             else
             {
@@ -386,7 +386,7 @@ class file extends control
                     $imageFiles[$fileName] = $imageFile;
                     $this->session->set($sessionName, $imageFiles);
                 }
-                die(json_encode(array('result' => 'success', 'file' => $file, 'message' => $this->lang->file->uploadSuccess)));
+                return print(json_encode(array('result' => 'success', 'file' => $file, 'message' => $this->lang->file->uploadSuccess)));
             }
         }
 
@@ -432,7 +432,7 @@ class file extends control
             echo js::error(dao::getError(), $full = false);
             $templateID = 0;
         }
-        die($this->fetch('file', 'buildExportTPL', "module=$module&templateID=$templateID"));
+        return print($this->fetch('file', 'buildExportTPL', "module=$module&templateID=$templateID"));
     }
 
     /**
@@ -445,7 +445,7 @@ class file extends control
     public function ajaxDeleteTemplate($templateID)
     {
         $this->dao->delete()->from(TABLE_USERTPL)->where('id')->eq($templateID)->andWhere('account')->eq($this->app->user->account)->exec();
-        die();
+        return print();
     }
 
     /**
diff --git a/module/file/model.php b/module/file/model.php
index ce16cf9ba1..399f895d1c 100644
--- a/module/file/model.php
+++ b/module/file/model.php
@@ -545,7 +545,7 @@ class fileModel extends model
             foreach($out[3] as $key => $base64Image)
             {
                 $extension = strtolower($out[2][$key]);
-                if(!in_array($extension, $this->config->file->imageExtensions)) die();
+                if(!in_array($extension, $this->config->file->imageExtensions)) helper::end();
                 $imageData = base64_decode($base64Image);
 
                 $file['extension'] = $extension;
@@ -946,7 +946,7 @@ class fileModel extends model
         setcookie('downloading', 1, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
 
         /* Only download upload file that is in zentao. */
-        if($type == 'file' and stripos($content, $this->savePath) !== 0) die();
+        if($type == 'file' and stripos($content, $this->savePath) !== 0) return;
 
         /* Append the extension name auto. */
         $extension = '.' . $fileType;
@@ -963,17 +963,17 @@ class fileModel extends model
         header("Content-Disposition: attachment; filename=\"$fileName\"");
         header("Pragma: no-cache");
         header("Expires: 0");
-        if($type == 'content') die($content);
+        if($type == 'content') return print($content);
         if($type == 'file' and file_exists($content))
         {
-            if(stripos($content, $this->app->getBasePath()) !== 0) die();
+            if(stripos($content, $this->app->getBasePath()) !== 0) return;
 
             set_time_limit(0);
             $chunkSize = 10 * 1024 * 1024;
             $handle    = fopen($content, "r");
             while(!feof($handle)) echo fread($handle, $chunkSize);
             fclose($handle);
-            die();
+            return;
         }
     }
 
diff --git a/module/git/control.php b/module/git/control.php
index 01c9075c13..b0e8ee4733 100644
--- a/module/git/control.php
+++ b/module/git/control.php
@@ -154,7 +154,7 @@ class git extends control
         $message  = trim($this->post->message);
         $revision = trim($this->post->revision);
         $files    = $this->post->files;
-        if(empty($repoUrl)) die();
+        if(empty($repoUrl)) return;
         $repoUrl = rtrim($repoUrl, '/') . '/';
 
         $parsedFiles = array();
@@ -193,7 +193,6 @@ class git extends control
             $log->files    = $parsedFiles;
             $this->git->saveAction2PMS($objects, $log, $repoUrl);
         }
-        die();
     }
 
     /**
@@ -205,6 +204,6 @@ class git extends control
     public function ajaxGetRepos()
     {
         $repos = $this->git->getRepos();
-        die(json_encode($repos));
+        echo json_encode($repos);
     }
 }
diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index 509b95ca54..888577a641 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -147,7 +147,7 @@ class gitlab extends control
 
         $gitlab = $this->gitlab->getByID($gitlabID);
         $user   = $this->gitlab->apiGetCurrentUser($gitlab->url, $gitlab->token);
-        if(!isset($user->is_admin) or !$user->is_admin) die(js::alert($this->lang->gitlab->tokenLimit) . js::locate($this->createLink('gitlab', 'edit', array('gitlabID' => $gitlabID))));
+        if(!isset($user->is_admin) or !$user->is_admin) return print(js::alert($this->lang->gitlab->tokenLimit) . js::locate($this->createLink('gitlab', 'edit', array('gitlabID' => $gitlabID))));
 
         if($_POST)
         {
@@ -221,7 +221,7 @@ class gitlab extends control
      */
     public function delete($id, $confirm = 'no')
     {
-        if($confirm != 'yes') die(js::confirm($this->lang->gitlab->confirmDelete, inlink('delete', "id=$id&confirm=yes")));
+        if($confirm != 'yes') return print(js::confirm($this->lang->gitlab->confirmDelete, inlink('delete', "id=$id&confirm=yes")));
 
         $oldGitLab = $this->gitlab->getByID($id);
         $this->loadModel('action');
@@ -231,7 +231,7 @@ class gitlab extends control
         $actionID = $this->action->create('gitlab', $id, 'deleted');
         $changes  = common::createChanges($oldGitLab, $gitLab);
         $this->action->logHistory($actionID, $changes);
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -615,7 +615,7 @@ class gitlab extends control
      */
     public function deleteUser($gitlabID, $userID, $confirm = 'no')
     {
-        if($confirm != 'yes') die(js::confirm($this->lang->gitlab->user->confirmDelete , inlink('deleteUser', "gitlabID=$gitlabID&userID=$userID&confirm=yes")));
+        if($confirm != 'yes') return print(js::confirm($this->lang->gitlab->user->confirmDelete , inlink('deleteUser', "gitlabID=$gitlabID&userID=$userID&confirm=yes")));
 
         $user    = $this->gitlab->apiGetSingleUser($gitlabID, $userID);
         $reponse = $this->gitlab->apiDeleteUser($gitlabID, $userID);
@@ -628,10 +628,10 @@ class gitlab extends control
             /* Delete user bind. */
             $this->dao->delete()->from(TABLE_OAUTH)->where('providerType')->eq('gitlab')->andWhere('providerID')->eq($gitlabID)->andWhere('openID')->eq($userID)->exec();
 
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
 
-        die(js::alert($reponse->message));
+        echo js::alert($reponse->message);
     }
 
     /**
@@ -758,7 +758,7 @@ class gitlab extends control
      */
     public function deleteProject($gitlabID, $projectID, $confirm = 'no')
     {
-        if($confirm != 'yes') die(js::confirm($this->lang->gitlab->project->confirmDelete , inlink('deleteProject', "gitlabID=$gitlabID&projectID=$projectID&confirm=yes")));
+        if($confirm != 'yes') return print(js::confirm($this->lang->gitlab->project->confirmDelete , inlink('deleteProject', "gitlabID=$gitlabID&projectID=$projectID&confirm=yes")));
 
         $project = $this->gitlab->apiGetSingleProject($gitlabID, $projectID);
         $reponse = $this->gitlab->apiDeleteProject($gitlabID, $projectID);
@@ -767,10 +767,10 @@ class gitlab extends control
         if(!$reponse or substr($reponse->message, 0, 2) == '20')
         {
             $this->loadModel('action')->create('gitlabproject', $projectID, 'deleted', '', $project->name);
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
 
-        die(js::alert($reponse->message));
+        echo js::alert($reponse->message);
     }
 
     /**
@@ -1007,7 +1007,7 @@ class gitlab extends control
         if($confirm != 'yes')
         {
             $branch = urlencode($branch);
-            die(js::confirm($this->lang->gitlab->branch->confirmDelete , inlink('deleteBranchPriv', "gitlabID=$gitlabID&projectID=$projectID&branch=$branch&confirm=yes")));
+            return print(js::confirm($this->lang->gitlab->branch->confirmDelete , inlink('deleteBranchPriv', "gitlabID=$gitlabID&projectID=$projectID&branch=$branch&confirm=yes")));
         }
 
         /* Fix error when request type is PATH_INFO and the branch name contains '-'.*/
@@ -1018,10 +1018,10 @@ class gitlab extends control
         if(!$reponse or substr($reponse->message, 0, 2) == '20')
         {
             $this->loadModel('action')->create('gitlabbranchPriv', $branch, 'deleted', '', $branch);
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
 
-        die(js::alert($reponse->message));
+        echo js::alert($reponse->message);
     }
 
     /**
@@ -1272,10 +1272,10 @@ class gitlab extends control
         if(!$reponse or substr($reponse->message, 0, 2) == '20')
         {
             $this->loadModel('action')->create('gitlabtagpriv', 0, 'deleted', '', $tag);
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
 
-        die(js::alert($reponse->message));
+        echo js::alert($reponse->message);
     }
 
     /**
@@ -1294,7 +1294,7 @@ class gitlab extends control
 
         $gitlab = $this->gitlab->getByID($gitlabID);
         if($gitlab) $user = $this->gitlab->apiGetCurrentUser($gitlab->url, $gitlab->token);
-        if(empty($user->is_admin)) die(js::alert($this->lang->gitlab->tokenLimit) . js::locate($this->createLink('gitlab', 'edit', array('gitlabID' => $gitlabID))));
+        if(empty($user->is_admin)) return print(js::alert($this->lang->gitlab->tokenLimit) . js::locate($this->createLink('gitlab', 'edit', array('gitlabID' => $gitlabID))));
 
         if($_POST)
         {
@@ -1395,7 +1395,7 @@ class gitlab extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->gitlab->confirmAddWebhook, $this->createLink('gitlab', 'createWebhook', "repoID=$repoID&confirm=yes")));
+            return print(js::confirm($this->lang->gitlab->confirmAddWebhook, $this->createLink('gitlab', 'createWebhook', "repoID=$repoID&confirm=yes")));
         }
         else
         {
@@ -1404,11 +1404,11 @@ class gitlab extends control
 
             if($res or is_array($res))
             {
-                die(js::alert($this->lang->gitlab->addWebhookSuccess));
+                return print(js::alert($this->lang->gitlab->addWebhookSuccess));
             }
             else
             {
-                die(js::error($this->lang->gitlab->failCreateWebhook));
+                return print(js::error($this->lang->gitlab->failCreateWebhook));
             }
         }
     }
@@ -1674,7 +1674,7 @@ class gitlab extends control
      */
     public function deleteTag($gitlabID, $projectID, $tagName = '', $confirm = 'no')
     {
-        if($confirm != 'yes') die(js::confirm($this->lang->gitlab->tag->confirmDelete , inlink('deleteTag', "gitlabID=$gitlabID&projectID=$projectID&tagName=$tagName&confirm=yes")));
+        if($confirm != 'yes') return print(js::confirm($this->lang->gitlab->tag->confirmDelete , inlink('deleteTag', "gitlabID=$gitlabID&projectID=$projectID&tagName=$tagName&confirm=yes")));
 
         /* Fix error when request type is PATH_INFO and the tag name contains '-'.*/
         $tagName = str_replace('*', '-', $tagName);
@@ -1684,9 +1684,9 @@ class gitlab extends control
         if(!$reponse or substr($reponse->message, 0, 2) == '20')
         {
             $this->loadModel('action')->create('gitlabtag', $projectID, 'deleted', '', $project->name);
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
 
-        die(js::alert($reponse->message));
+        echo js::alert($reponse->message);
     }
 }
diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index ef13b9d87b..6d175b7acf 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -1647,7 +1647,7 @@ class gitlabModel extends model
     public function webhookCheckToken()
     {
         $gitlab = $this->getByID($this->get->gitlab);
-        if($gitlab->private != $_SERVER["HTTP_X_GITLAB_TOKEN"]) die('Token error.');
+        if($gitlab->private != $_SERVER["HTTP_X_GITLAB_TOKEN"]) echo 'Token error.';
     }
 
     /**
diff --git a/module/group/control.php b/module/group/control.php
index 81ff98af2d..8d83ca966a 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -58,10 +58,10 @@ class group extends control
         if(!empty($_POST))
         {
             $groupID = $this->group->create();
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $groupID));
-            if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
-            die(js::locate($this->createLink('group', 'browse'), 'parent'));
+            if(isonlybody()) return print(js::closeModal('parent.parent', 'this'));
+            return print(js::locate($this->createLink('group', 'browse'), 'parent'));
         }
 
         $this->view->title      = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->create;
@@ -81,8 +81,8 @@ class group extends control
        if(!empty($_POST))
         {
             $this->group->update($groupID);
-            if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
-            die(js::locate($this->createLink('group', 'browse'), 'parent'));
+            if(isonlybody()) return print(js::closeModal('parent.parent', 'this'));
+            return print(js::locate($this->createLink('group', 'browse'), 'parent'));
         }
 
         $title      = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->edit;
@@ -107,9 +107,9 @@ class group extends control
        if(!empty($_POST))
         {
             $this->group->copy($groupID);
-            if(dao::isError()) die(js::error(dao::getError()));
-            if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
-            die(js::locate($this->createLink('group', 'browse'), 'parent'));
+            if(dao::isError()) return print(js::error(dao::getError()));
+            if(isonlybody()) return print(js::closeModal('parent.parent', 'this'));
+            return print(js::locate($this->createLink('group', 'browse'), 'parent'));
         }
 
         $this->view->title      = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->copy;
@@ -251,8 +251,8 @@ class group extends control
         if(!empty($_POST))
         {
             $this->group->updateUser($groupID);
-            if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
-            die(js::locate($this->createLink('group', 'browse'), 'parent'));
+            if(isonlybody()) return print(js::closeModal('parent.parent', 'this'));
+            return print(js::locate($this->createLink('group', 'browse'), 'parent'));
         }
         $group        = $this->group->getById($groupID);
         $groupUsers   = $this->group->getUserPairs($groupID);
@@ -291,7 +291,7 @@ class group extends control
         if(!empty($_POST))
         {
             $this->group->updateProjectAdmin($groupID);
-            die(js::locate(inlink('manageProjectAdmin', "group=$groupID"), 'parent'));
+            return print(js::locate(inlink('manageProjectAdmin', "group=$groupID"), 'parent'));
         }
         $group        = $this->group->getById($groupID);
         $groupUsers   = $this->group->getUserPairs($groupID);
@@ -326,7 +326,7 @@ class group extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->group->confirmDelete, $this->createLink('group', 'delete', "groupID=$groupID&confirm=yes")));
+            return print(js::confirm($this->lang->group->confirmDelete, $this->createLink('group', 'delete', "groupID=$groupID&confirm=yes")));
         }
         else
         {
@@ -347,7 +347,7 @@ class group extends control
                 }
                 return $this->send($response);
             }
-            die(js::locate($this->createLink('group', 'browse'), 'parent'));
+            return print(js::locate($this->createLink('group', 'browse'), 'parent'));
         }
     }
 }

From 002e215a3d9c05ff0d00f3974c9ff280ffbc5440 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Tue, 22 Feb 2022 09:02:00 +0800
Subject: [PATCH 09/41] * Move die to return.

---
 module/index/control.php   |  2 +-
 module/install/control.php | 10 ++---
 module/install/model.php   |  4 +-
 module/jenkins/control.php | 10 ++---
 module/jenkins/model.php   |  1 -
 module/job/control.php     | 13 +++----
 module/kanban/control.php  | 78 ++++++++++++++++++-------------------
 module/mail/control.php    | 80 +++++++++++++++++++-------------------
 module/message/control.php |  4 +-
 module/misc/control.php    | 18 ++++-----
 module/mr/control.php      | 26 ++++++-------
 11 files changed, 122 insertions(+), 124 deletions(-)

diff --git a/module/index/control.php b/module/index/control.php
index 889aab0ef8..93e7920ba7 100644
--- a/module/index/control.php
+++ b/module/index/control.php
@@ -126,6 +126,6 @@ class index extends control
                 }
             }
         }
-        die($method);
+        echo $method;
     }
 }
diff --git a/module/install/control.php b/module/install/control.php
index 03750ec5c7..fa7a6771fb 100644
--- a/module/install/control.php
+++ b/module/install/control.php
@@ -19,7 +19,7 @@ class install extends control
      */
     public function __construct()
     {
-        if(!defined('IN_INSTALL')) die();
+        if(!defined('IN_INSTALL')) helper::end();
         parent::__construct();
         $this->app->loadLang('user');
         $this->app->loadLang('admin');
@@ -178,7 +178,7 @@ class install extends control
         if(!empty($_POST))
         {
             $this->loadModel('setting')->setItem('system.common.global.mode', $this->post->mode); // Update mode.
-            die(js::locate(inlink('step5'), 'parent'));
+            return print(js::locate(inlink('step5'), 'parent'));
         }
 
         $this->app->loadLang('upgrade');
@@ -198,10 +198,10 @@ class install extends control
         if(!empty($_POST))
         {
             $this->install->grantPriv();
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             $this->install->updateLang();
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->importDemoData) $this->install->importDemoData();
             if(dao::isError()) echo js::alert($this->lang->install->errorImportDemoData);
@@ -212,7 +212,7 @@ class install extends control
             $this->loadModel('setting')->setItem('system.common.safe.changeWeak', '1');
             $this->loadModel('setting')->setItem('system.common.global.cron', 1);
             $this->loadModel('api')->createDemoData($this->lang->api->zentaoAPI, 'http://' . $_SERVER['HTTP_HOST'] . $this->app->config->webRoot . 'api.php/v1', '16.0');
-            die(js::locate(inlink('step6'), 'parent'));
+            return print(js::locate(inlink('step6'), 'parent'));
         }
 
         $this->app->loadLang('upgrade');
diff --git a/module/install/model.php b/module/install/model.php
index ceb03986e6..68f5df36e9 100644
--- a/module/install/model.php
+++ b/module/install/model.php
@@ -489,7 +489,7 @@ class installModel extends model
         catch (PDOException $exception)
         {
             echo $exception->getMessage();
-            die();
+            helper::end();
         }
         return true;
     }
@@ -502,7 +502,7 @@ class installModel extends model
      */
     public function grantPriv()
     {
-        if($this->post->password == '') die(js::error($this->lang->install->errorEmptyPassword));
+        if($this->post->password == '') return print(js::error($this->lang->install->errorEmptyPassword));
 
         /* Insert a company. */
         $company = new stdclass();
diff --git a/module/jenkins/control.php b/module/jenkins/control.php
index baae37b4bf..d63e246350 100644
--- a/module/jenkins/control.php
+++ b/module/jenkins/control.php
@@ -109,13 +109,13 @@ class jenkins extends control
      */
     public function delete($id, $confim = 'no')
     {
-        if($confim != 'yes') die(js::confirm($this->lang->jenkins->confirmDelete, inlink('delete', "id=$id&confirm=yes")));
+        if($confim != 'yes') return print(js::confirm($this->lang->jenkins->confirmDelete, inlink('delete', "id=$id&confirm=yes")));
 
         $jobs = $this->dao->select('*')->from(TABLE_JOB)->where('server')->eq($id)->andWhere('engine')->eq('jenkins')->andWhere('deleted')->eq('0')->fetchAll();
-        if($jobs) die(js::alert($this->lang->jenkins->error->linkedJob));
+        if($jobs) return print(js::alert($this->lang->jenkins->error->linkedJob));
 
         $this->jenkins->delete(TABLE_PIPELINE, $id);
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -127,9 +127,9 @@ class jenkins extends control
      */
     public function ajaxGetJenkinsTasks($id)
     {
-        if(empty($id)) die(json_encode(array('' => '')));
+        if(empty($id)) return print(json_encode(array('' => '')));
 
         $tasks = $this->jenkins->getTasks($id);
-        die(json_encode($tasks));
+        echo json_encode($tasks);
     }
 }
diff --git a/module/jenkins/model.php b/module/jenkins/model.php
index 48eaa13a1b..bb8a8f5dce 100644
--- a/module/jenkins/model.php
+++ b/module/jenkins/model.php
@@ -72,7 +72,6 @@ class jenkinsModel extends model
             foreach($response->jobs as $job) $tasks[basename($job->url)] = $job->name;
         }
         return $tasks;
-
     }
 
     /**
diff --git a/module/job/control.php b/module/job/control.php
index 332b0a695a..bb24c79ccd 100644
--- a/module/job/control.php
+++ b/module/job/control.php
@@ -219,10 +219,10 @@ class job extends control
      */
     public function delete($id, $confirm = 'no')
     {
-        if($confirm != 'yes') die(js::confirm($this->lang->job->confirmDelete, inlink('delete', "jobID=$id&confirm=yes")));
+        if($confirm != 'yes') return print(js::confirm($this->lang->job->confirmDelete, inlink('delete', "jobID=$id&confirm=yes")));
 
         $this->job->delete(TABLE_JOB, $id);
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -343,7 +343,7 @@ class job extends control
     public function ajaxGetProductByRepo($repoID)
     {
         $repo = $this->loadModel('repo')->getRepoByID($repoID);
-        if(empty($repo)) die(json_encode(array(""=>"")));
+        if(empty($repo)) return print(json_encode(array(""=>"")));
 
         $product = $repo->product;
         if(strpos($product, ','))
@@ -359,11 +359,11 @@ class job extends control
                     if($productLeft == $productRight) $matchedProducts[$productName] = $productRight;
                 }
             }
-            die(json_encode($matchedProducts));
+            return print(json_encode($matchedProducts));
         }
 
         $productName = $this->loadModel('product')->getByID($repo->product)->name;
-        die(json_encode(array($productName => $repo->product)));
+        ehco json_encode(array($productName => $repo->product));
     }
 
     /**
@@ -405,7 +405,6 @@ class job extends control
             }
         }
         echo html::select('repo', $repoPairs, '', "class='form-control chosen'");
-        die();
     }
 
     /**
@@ -431,7 +430,7 @@ class job extends control
     public function ajaxCheckSonarqubeLink($repoID, $jobID = 0)
     {
         $repo = $this->loadModel('job')->getSonarqubeByRepo(array($repoID), $jobID, true);
-        if(!empty($repo)) 
+        if(!empty($repo))
         {
             $message = $repo[$repoID]->deleted ? $this->lang->job->jobIsDeleted : sprintf($this->lang->job->repoExists, $repo[$repoID]->id . '-' . $repo[$repoID]->name);
             $this->send(array('result' => 'fail', 'message' => $message));
diff --git a/module/kanban/control.php b/module/kanban/control.php
index 20e39ebe11..03add9506f 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -110,12 +110,12 @@ class kanban extends control
         {
             $changes = $this->kanban->closeSpace($spaceID);
 
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             $actionID = $this->action->create('kanbanSpace', $spaceID, 'closed', $this->post->comment);
             $this->action->logHistory($actionID, $changes);
 
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $this->view->space   = $this->kanban->getSpaceById($spaceID);
@@ -137,12 +137,12 @@ class kanban extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->kanban->confirmDelete, $this->createLink('kanban', 'deleteSpace', "spaceID=$spaceID&confirm=yes")));
+            return print(js::confirm($this->lang->kanban->confirmDelete, $this->createLink('kanban', 'deleteSpace', "spaceID=$spaceID&confirm=yes")));
         }
         else
         {
             $this->kanban->delete(TABLE_KANBANSPACE, $spaceID);
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -235,12 +235,12 @@ class kanban extends control
         {
             $changes = $this->kanban->close($kanbanID);
 
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             $actionID = $this->action->create('kanban', $kanbanID, 'closed', $this->post->comment);
             $this->action->logHistory($actionID, $changes);
 
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $this->view->kanban  = $this->kanban->getByID($kanbanID);
@@ -265,11 +265,11 @@ class kanban extends control
         if(!$kanban)
         {
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'code' => 404, 'message' => '404 Not found'));
-            die(js::error($this->lang->notFound) . js::locate($this->createLink('kanban', 'space')));
+            return print(js::error($this->lang->notFound) . js::locate($this->createLink('kanban', 'space')));
         }
 
         $kanbanIdList = $this->kanban->getCanViewObjects();
-        if(!$this->app->user->admin and !in_array($kanbanID, $kanbanIdList)) die(js::error($this->lang->kanban->accessDenied) . js::locate('back'));
+        if(!$this->app->user->admin and !in_array($kanbanID, $kanbanIdList)) return print(js::error($this->lang->kanban->accessDenied) . js::locate('back'));
 
         $space = $this->kanban->getSpaceByID($kanban->space);
 
@@ -305,12 +305,12 @@ class kanban extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->kanban->confirmDelete, $this->createLink('kanban', 'delete', "kanbanID=$kanbanID&confirm=yes")));
+            return print(js::confirm($this->lang->kanban->confirmDelete, $this->createLink('kanban', 'delete', "kanbanID=$kanbanID&confirm=yes")));
         }
         else
         {
             $this->kanban->delete(TABLE_KANBAN, $kanbanID);
-            die(js::locate($this->createLink('kanban', 'space'), 'parent'));
+            return print(js::locate($this->createLink('kanban', 'space'), 'parent'));
         }
     }
 
@@ -428,12 +428,12 @@ class kanban extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->kanbanregion->confirmDelete, $this->createLink('kanban', 'deleteRegion', "regionID=$regionID&confirm=yes")));
+            return print(js::confirm($this->lang->kanbanregion->confirmDelete, $this->createLink('kanban', 'deleteRegion', "regionID=$regionID&confirm=yes")));
         }
         else
         {
             $this->kanban->delete(TABLE_KANBANREGION, $regionID);
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -579,12 +579,12 @@ class kanban extends control
             $laneType   = $this->kanban->getLaneById($laneID)->type;
             $confirmTip = in_array($laneType, array('story', 'task', 'bug')) ? sprintf($this->lang->kanbanlane->confirmDeleteTip, $this->lang->{$laneType}->common) : $this->lang->kanbanlane->confirmDelete;
 
-            die(js::confirm($confirmTip, $this->createLink('kanban', 'deleteLane', "laneID=$laneID&confirm=yes"), ''));
+            return print(js::confirm($confirmTip, $this->createLink('kanban', 'deleteLane', "laneID=$laneID&confirm=yes"), ''));
         }
         else
         {
             $this->kanban->delete(TABLE_KANBANLANE, $laneID);
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -646,7 +646,7 @@ class kanban extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->kanbancolumn->confirmArchive, $this->createLink('kanban', 'archiveColumn', "columnID=$columnID&confirm=yes")));
+            return print(js::confirm($this->lang->kanbancolumn->confirmArchive, $this->createLink('kanban', 'archiveColumn', "columnID=$columnID&confirm=yes")));
         }
         else
         {
@@ -664,12 +664,12 @@ class kanban extends control
             }
 
             $this->kanban->archiveColumn($columnID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             $this->loadModel('action')->create('kanbancolumn', $columnID, 'archived');
 
-            if(isonlybody()) die(js::reload('parent.parent'));
-            die(js::reload('parent'));
+            if(isonlybody()) return print(js::reload('parent.parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -685,15 +685,15 @@ class kanban extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->kanbancolumn->confirmRestore, $this->createLink('kanban', 'restoreColumn', "columnID=$columnID&confirm=yes"), ''));
+            return print(js::confirm($this->lang->kanbancolumn->confirmRestore, $this->createLink('kanban', 'restoreColumn', "columnID=$columnID&confirm=yes"), ''));
         }
         else
         {
             $this->kanban->restoreColumn($columnID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             $this->loadModel('action')->create('kanbancolumn', $columnID, 'restore');
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -741,7 +741,7 @@ class kanban extends control
         if($confirm == 'no')
         {
             $confirmLang = $column->parent > 0 ? $this->lang->kanbancolumn->confirmDeleteChild : $this->lang->kanbancolumn->confirmDelete;
-            die(js::confirm($confirmLang, $this->createLink('kanban', 'deleteColumn', "columnID=$columnID&confirm=yes")));
+            return print(js::confirm($confirmLang, $this->createLink('kanban', 'deleteColumn', "columnID=$columnID&confirm=yes")));
         }
         else
         {
@@ -749,7 +749,7 @@ class kanban extends control
 
             $this->dao->delete()->from(TABLE_KANBANCOLUMN)->where('id')->eq($columnID)->exec();
 
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -956,7 +956,7 @@ class kanban extends control
         $this->kanban->moveCard($cardID, $fromColID, $toColID, $fromLaneID, $toLaneID, $kanbanID);
         if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
         $kanbanGroup = $this->kanban->getKanbanData($kanbanID);
-        die(json_encode($kanbanGroup));
+        echo json_encode($kanbanGroup);
     }
 
     /**
@@ -1239,7 +1239,7 @@ class kanban extends control
         $this->kanban->updateCardColor($cardID, $color);
         if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
         $kanbanGroup = $this->kanban->getKanbanData($kanbanID);
-        die(json_encode($kanbanGroup));
+        echo json_encode($kanbanGroup);
     }
 
     /**
@@ -1274,7 +1274,7 @@ class kanban extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->kanbancard->confirmArchive, $this->createLink('kanban', 'archiveCard', "cardID=$cardID&confirm=yes")));
+            return print(js::confirm($this->lang->kanbancard->confirmArchive, $this->createLink('kanban', 'archiveCard', "cardID=$cardID&confirm=yes")));
         }
         else
         {
@@ -1284,8 +1284,8 @@ class kanban extends control
             $actionID = $this->loadModel('action')->create('kanbancard', $cardID, 'archived');
             $this->action->logHistory($actionID, $changes);
 
-            if(isonlybody()) die(js::reload('parent.parent'));
-            die(js::reload('parent'));
+            if(isonlybody()) return print(js::reload('parent.parent'));
+            echo js::reload('parent');
         }
     }
 
@@ -1320,21 +1320,21 @@ class kanban extends control
         {
             $card   = $this->kanban->getCardByID($cardID);
             $column = $this->dao->select('*')->from(TABLE_KANBANCOLUMN)->where('id')->eq($card->column)->fetch();
-            if($column->archived or $column->deleted) die(js::alert(sprintf($this->lang->kanbancard->confirmRestoreTip, $column->name)));
+            if($column->archived or $column->deleted) return print(js::alert(sprintf($this->lang->kanbancard->confirmRestoreTip, $column->name)));
 
-            die(js::confirm(sprintf($this->lang->kanbancard->confirmRestore, $column->name), $this->createLink('kanban', 'restoreCard', "cardID=$cardID&confirm=yes"), ''));
+            return print(js::confirm(sprintf($this->lang->kanbancard->confirmRestore, $column->name), $this->createLink('kanban', 'restoreCard', "cardID=$cardID&confirm=yes"), ''));
         }
         else
         {
             $this->kanban->restoreCard($cardID);
 
             $changes = $this->kanban->restoreCard($cardID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             $actionID = $this->loadModel('action')->create('kanbancard', $cardID, 'restore');
             $this->action->logHistory($actionID, $changes);
 
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -1350,14 +1350,14 @@ class kanban extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->kanbancard->confirmDelete, $this->createLink('kanban', 'deleteCard', "cardID=$cardID&confirm=yes")));
+            return print(js::confirm($this->lang->kanbancard->confirmDelete, $this->createLink('kanban', 'deleteCard', "cardID=$cardID&confirm=yes")));
         }
         else
         {
             $this->kanban->delete(TABLE_KANBANCARD, $cardID);
 
-            if(isonlybody()) die(js::reload('parent.parent'));
-            die(js::reload('parent'));
+            if(isonlybody()) return print(js::reload('parent.parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -1395,7 +1395,7 @@ class kanban extends control
 
         $this->app->loadLang('story');
 
-        if(!$column) die(js::error($this->lang->notFound) . js::locate($this->createLink('execution', 'kanban', "executionID=$executionID")));
+        if(!$column) return print(js::error($this->lang->notFound) . js::locate($this->createLink('execution', 'kanban', "executionID=$executionID")));
 
         $title  = isset($column->parentName) ? $column->parentName . '/' . $column->name : $column->name;
 
@@ -1429,7 +1429,7 @@ class kanban extends control
         }
 
         $lane = $this->kanban->getLaneById($laneID);
-        if(!$lane) die(js::error($this->lang->notFound) . js::locate($this->createLink('execution', 'kanban', "executionID=$executionID")));
+        if(!$lane) return print(js::error($this->lang->notFound) . js::locate($this->createLink('execution', 'kanban', "executionID=$executionID")));
 
         $this->view->title = $from == 'kanban' ? $this->lang->edit . '“' . $lane->name . '”' . $this->lang->kanbanlane->common : zget($this->lang->kanban->laneTypeList, $lane->type) . $this->lang->colon . $this->lang->kanban->setLane;
         $this->view->lane  = $lane;
@@ -1614,7 +1614,7 @@ class kanban extends control
             ->exec();
 
         $kanbanGroup = $regionID == 0 ? $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy) : $this->kanban->getRDKanban($executionID, $browseType, $orderBy, $regionID, $groupBy);
-        die(json_encode($kanbanGroup));
+        echo json_encode($kanbanGroup);
     }
 
     /**
@@ -1638,7 +1638,7 @@ class kanban extends control
             $this->loadModel('action')->create('kanbanlane', $laneID, 'Moved');
         }
 
-        die(js::locate($this->createLink('execution', 'kanban', 'executionID=' . $executionID . '&type=all'), 'parent'));
+        echo js::locate($this->createLink('execution', 'kanban', 'executionID=' . $executionID . '&type=all'), 'parent');
     }
 
     /**
diff --git a/module/mail/control.php b/module/mail/control.php
index 30f7d41a92..a44486851e 100755
--- a/module/mail/control.php
+++ b/module/mail/control.php
@@ -26,7 +26,7 @@ class mail extends control
         if(isset($this->config->mail->mta) and $this->config->mail->mta != 'sendcloud' and !function_exists('fsockopen'))
         {
             echo js::alert($this->lang->mail->nofsocket);
-            die(js::locate('back'));
+            return print(js::locate('back'));
         }
     }
 
@@ -65,7 +65,7 @@ class mail extends control
             if($this->post->fromAddress == false) $error = sprintf($this->lang->error->notempty, $this->lang->mail->fromAddress);
             if(!validater::checkEmail($this->post->fromAddress)) $error .= '\n' . sprintf($this->lang->error->email, $this->lang->mail->fromAddress);
 
-            if($error) die(js::alert($error));
+            if($error) return print(js::alert($error));
 
             echo "<script>setTimeout(function(){parent.location.href='" . inlink('edit') . "'}, 10000)</script>";
             $mailConfig = $this->mail->autoDetect($this->post->fromAddress);
@@ -73,7 +73,7 @@ class mail extends control
             $mailConfig->domain      = common::getSysURL();
             $this->session->set('mailConfig',  $mailConfig);
 
-            die(js::locate(inlink('edit'), 'parent'));
+            return print(js::locate(inlink('edit'), 'parent'));
         }
 
         $this->view->title      = $this->lang->mail->common . $this->lang->colon . $this->lang->mail->detect;
@@ -152,7 +152,7 @@ class mail extends control
             if(empty($mailConfig->fromName))
             {
                 echo js::alert(sprintf($this->lang->error->notempty, $this->lang->mail->fromName));
-                die(js::locate($this->server->http_referer));
+                return print(js::locate($this->server->http_referer));
             }
 
             /* The mail need openssl and curl extension when secure is tls. */
@@ -161,17 +161,17 @@ class mail extends control
                 if(!extension_loaded('openssl'))
                 {
                     echo js::alert($this->lang->mail->noOpenssl);
-                    die(js::locate($this->server->http_referer));
+                    return print(js::locate($this->server->http_referer));
                 }
                 if(!extension_loaded('curl'))
                 {
                     echo js::alert($this->lang->mail->noCurl);
-                    die(js::locate($this->server->http_referer));
+                    return print(js::locate($this->server->http_referer));
                 }
             }
 
             $this->loadModel('setting')->setItems('system.mail', $mailConfig);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             $this->session->set('mailConfig', '');
 
@@ -206,13 +206,13 @@ class mail extends control
             $mailConfig->sendcloud->accessKey = trim($this->post->accessKey);
             $mailConfig->sendcloud->secretKey = trim($this->post->secretKey);
 
-            if(empty($mailConfig->sendcloud->accessKey)) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->mail->accessKey)));
-            if(empty($mailConfig->sendcloud->secretKey)) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->mail->secretKey)));
+            if(empty($mailConfig->sendcloud->accessKey)) return print(js::alert(sprintf($this->lang->error->notempty, $this->lang->mail->accessKey)));
+            if(empty($mailConfig->sendcloud->secretKey)) return print(js::alert(sprintf($this->lang->error->notempty, $this->lang->mail->secretKey)));
 
             $this->loadModel('setting')->setItems('system.mail', $mailConfig);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
 
         $mailConfig = new stdclass();
@@ -245,7 +245,7 @@ class mail extends control
     {
         if(!$this->config->mail->turnon)
         {
-            die(js::alert($this->lang->mail->needConfigure) . js::locate('back'));
+            return print(js::alert($this->lang->mail->needConfigure) . js::locate('back'));
         }
 
         if($_POST)
@@ -257,12 +257,12 @@ class mail extends control
                 if(!extension_loaded('openssl'))
                 {
                     $this->view->error = array($this->lang->mail->noOpenssl);
-                    die($this->display());
+                    return print($this->display());
                 }
                 if(!extension_loaded('curl'))
                 {
                     $this->view->error = array($this->lang->mail->noCurl);
-                    die($this->display());
+                    return print($this->display());
                 }
             }
 
@@ -270,9 +270,9 @@ class mail extends control
             if($this->mail->isError())
             {
                 $this->view->error = $this->mail->getError();
-                die($this->display());
+                return print($this->display());
             }
-            die(js::alert($this->lang->mail->successSended) . js::locate(inlink('test'), 'parent'));
+            return print(js::alert($this->lang->mail->successSended) . js::locate(inlink('test'), 'parent'));
         }
 
         $this->view->title      = $this->lang->mail->common . $this->lang->colon . $this->lang->mail->test;
@@ -359,7 +359,7 @@ class mail extends control
         if($queue and $queue->status == 'sended')
         {
             echo js::alert($this->lang->mail->noticeResend);
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
 
         if(isset($this->config->mail->async)) $this->config->mail->async = 0;
@@ -376,9 +376,9 @@ class mail extends control
         }
         $this->dao->update(TABLE_NOTIFY)->data($data)->where('id')->in($queue->id)->exec();
 
-        if($data->status == 'fail') die(js::alert($data->failReason));
+        if($data->status == 'fail') return print(js::alert($data->failReason));
         echo js::alert($this->lang->mail->noticeResend);
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -417,10 +417,10 @@ class mail extends control
      */
     public function delete($id, $confirm = 'no')
     {
-        if($confirm == 'no') die(js::confirm($this->lang->mail->confirmDelete, inlink('delete', "id=$id&confirm=yes")));
+        if($confirm == 'no') return print(js::confirm($this->lang->mail->confirmDelete, inlink('delete', "id=$id&confirm=yes")));
 
         $this->dao->delete()->from(TABLE_NOTIFY)->where('id')->eq($id)->exec();
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -434,15 +434,15 @@ class mail extends control
     {
         if($confirm == 'no')
         {
-            if(empty($_POST)) die(js::reload('parent'));
+            if(empty($_POST)) return print(js::reload('parent'));
             $idList = join('|', $this->post->mailIDList);
-            die(js::confirm($this->lang->mail->confirmDelete, inlink('batchDelete', "confirm=yes") . ($this->config->requestType == 'GET' ? '&' : '?') . "idList=$idList"));
+            return print(js::confirm($this->lang->mail->confirmDelete, inlink('batchDelete', "confirm=yes") . ($this->config->requestType == 'GET' ? '&' : '?') . "idList=$idList"));
         }
         $idList = array();
         if(isset($_GET['idList'])) $idList = explode('|', $_GET['idList']);
 
         if($idList) $this->dao->delete()->from(TABLE_NOTIFY)->where('id')->in($idList)->exec();
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -453,7 +453,7 @@ class mail extends control
      */
     public function sendcloudUser()
     {
-        if($this->config->mail->mta != 'sendcloud') die(js::locate('back'));
+        if($this->config->mail->mta != 'sendcloud') return print(js::locate('back'));
 
         $this->mta = $this->mail->setMTA();
         if($_POST)
@@ -463,7 +463,7 @@ class mail extends control
             $listName = $action == 'delete' ? 'syncedList' : 'unsyncList';
 
             $users = array_unique($data->$listName);
-            if(empty($users)) die(js::reload('parent'));
+            if(empty($users)) return print(js::reload('parent'));
 
             $realnameAndEmails = $this->loadModel('user')->getRealNameAndEmails($users);
             $actionedEmail = array();
@@ -476,14 +476,14 @@ class mail extends control
                 if(!$result->result)
                 {
                     echo(js::alert($this->lang->mail->sendCloudFail . str_replace("'", '"', $result->message) . "(CODE: $result->statusCode)"));
-                    die(js::reload('parent'));
+                    return print(js::reload('parent'));
                 }
 
                 $actionedEmail[$email] = $email;
             }
 
             echo(js::alert($this->lang->mail->sendCloudSuccess));
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
 
         $this->view->title      = $this->lang->mail->sendcloudUser;
@@ -515,10 +515,10 @@ class mail extends control
             $mailConfig->fromName    = $this->post->fromName;
             $mailConfig->domain      = trim($this->post->domain);
 
-            if(empty($mailConfig->fromName)) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->mail->fromName)));
+            if(empty($mailConfig->fromName)) return print(js::alert(sprintf($this->lang->error->notempty, $this->lang->mail->fromName)));
 
             $this->loadModel('setting')->setItems('system.mail', $mailConfig);
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
 
         $this->view->title      = $this->lang->mail->ztCloud;
@@ -536,24 +536,24 @@ class mail extends control
             $this->view->mailExist  = $this->mail->mailExist();
             $this->view->mailConfig = $mailConfig;
             $this->view->step       = 'config';
-            die($this->display());
+            return print($this->display());
         }
 
         if(empty($this->config->global->ztPrivateKey) or $this->config->global->community == 'na' or empty($this->config->global->community))
         {
-            if(!empty($this->config->global->community) and $this->config->global->community != 'na') die(js::locate($this->createLink('admin', 'bind', 'from=mail')));
-            die(js::locate($this->createLink('admin', 'register', 'from=mail')));
+            if(!empty($this->config->global->community) and $this->config->global->community != 'na') return print(js::locate($this->createLink('admin', 'bind', 'from=mail')));
+            return print(js::locate($this->createLink('admin', 'register', 'from=mail')));
         }
 
         if($this->cookie->ztCloudLicense != 'yes')
         {
             $this->view->step = 'license';
-            die($this->display());
+            return print($this->display());
         }
 
         $result = $this->loadModel('admin')->getSecretKey();
-        if(empty($result))die(js::alert($this->lang->mail->connectFail) . js::locate($this->createLink('admin', 'register', "from=mail")));
-        if($result->result == 'fail' and empty($result->data)) die(js::alert($this->lang->mail->centifyFail) . js::locate($this->createLink('admin', 'register', "from=mail")));
+        if(empty($result))return print(js::alert($this->lang->mail->connectFail) . js::locate($this->createLink('admin', 'register', "from=mail")));
+        if($result->result == 'fail' and empty($result->data)) return print(js::alert($this->lang->mail->centifyFail) . js::locate($this->createLink('admin', 'register', "from=mail")));
 
         $data = $result->data;
         if((isset($data->qq) and empty($data->qq)) or (isset($data->company) and empty($data->company)))
@@ -561,15 +561,15 @@ class mail extends control
             $params = '';
             if(empty($data->qq)) $params .= 'qq,';
             if(empty($data->company)) $params .= 'company,';
-            die(js::locate($this->createLink('admin', 'ztCompany', 'fields=' . trim($params, ','))));
+            return print(js::locate($this->createLink('admin', 'ztCompany', 'fields=' . trim($params, ','))));
         }
         if($result->result == 'fail' and empty($data->emailCertified))
         {
-            die(js::locate($this->createLink('admin', 'certifyZtEmail', 'email=' . helper::safe64Encode($data->email))));
+            return print(js::locate($this->createLink('admin', 'certifyZtEmail', 'email=' . helper::safe64Encode($data->email))));
         }
         if($result->result == 'fail' and empty($data->mobileCertified))
         {
-            die(js::locate($this->createLink('admin', 'certifyZtMobile', 'mobile=' . helper::safe64Encode($data->mobile))));
+            return print(js::locate($this->createLink('admin', 'certifyZtMobile', 'mobile=' . helper::safe64Encode($data->mobile))));
         }
         if($result->result == 'success')
         {
@@ -584,7 +584,7 @@ class mail extends control
 
             $this->view->mailConfig = $mailConfig;
             $this->view->step       = 'config';
-            die($this->display());
+            return print($this->display());
         }
     }
 }
diff --git a/module/message/control.php b/module/message/control.php
index f791f5e9aa..39dd149033 100644
--- a/module/message/control.php
+++ b/module/message/control.php
@@ -114,11 +114,11 @@ class message extends control
      */
     public function ajaxGetMessage($windowBlur = false)
     {
-        if($this->config->message->browser->turnon == 0) die();
+        if($this->config->message->browser->turnon == 0) return;
 
         $waitMessages = $this->message->getMessages('wait');
         $todos = $this->message->getNoticeTodos();
-        if(empty($waitMessages) and empty($todos)) die();
+        if(empty($waitMessages) and empty($todos)) return;
 
         $messages = '';
         $newline  = $windowBlur ? "\n" : '<br />';
diff --git a/module/misc/control.php b/module/misc/control.php
index 0767ea4031..5806605e9e 100644
--- a/module/misc/control.php
+++ b/module/misc/control.php
@@ -20,7 +20,7 @@ class misc extends control
     public function ping()
     {
         if(mt_rand(0, 1) == 1) $this->loadModel('setting')->setSN();
-        die("<html><head><meta http-equiv=refresh' content='600' /></head><body></body></html>");
+        echo "<html><head><meta http-equiv=refresh' content='600' /></head><body></body></html>";
     }
 
     /**
@@ -31,7 +31,7 @@ class misc extends control
      */
     public function phpinfo()
     {
-        die(phpinfo());
+        phpinfo();
     }
 
     /**
@@ -42,7 +42,7 @@ class misc extends control
      */
     public function about()
     {
-        die($this->display());
+        $this->display();
     }
 
     /**
@@ -130,10 +130,10 @@ class misc extends control
         /* remove the old config.json, add a new one. */
         $archive = new pclzip($packageFile);
         $result = $archive->delete(PCLZIP_OPT_BY_NAME, 'config.json');
-        if($result == 0) die("Error : " . $archive->errorInfo(true));
+        if($result == 0) return print("Error : " . $archive->errorInfo(true));
 
         $result = $archive->add($loginFile, PCLZIP_OPT_REMOVE_ALL_PATH, PCLZIP_OPT_ADD_PATH, 'notify');
-        if($result == 0) die("Error : " . $archive->errorInfo(true));
+        if($result == 0) return print("Error : " . $archive->errorInfo(true));
 
         $zipContent = file_get_contents($packageFile);
         unlink($loginFile);
@@ -155,7 +155,7 @@ class misc extends control
         if(!extension_loaded('gd'))
         {
             $this->view->noGDLib = sprintf($this->lang->misc->noGDLib, $loginAPI);
-            die($this->display());
+            return print($this->display());
         }
 
         $this->app->loadClass('qrcode');
@@ -214,7 +214,7 @@ class misc extends control
     {
         $this->app->loadConfig('extension');
         $check = @fopen(dirname($this->config->extension->apiRoot), "r");
-        die($check ? 'success' : 'fail');
+        print($check ? 'success' : 'fail');
     }
 
     /**
@@ -262,7 +262,7 @@ class misc extends control
         $this->loadModel('setting');
         $setting     = $this->setting->createDAO($this->setting->parseItemParam($condition), 'select')->fetch();
         $newUnfoldID = $this->post->newUnfoldID;
-        if(empty($newUnfoldID)) die();
+        if(empty($newUnfoldID)) return;
 
         $newUnfoldID  = json_decode($newUnfoldID);
         $unfoldIdList = $setting ? json_decode($setting->value, true) : array();
@@ -280,7 +280,7 @@ class misc extends control
         {
             $this->dao->update(TABLE_CONFIG)->set('value')->eq(json_encode($unfoldIdList))->where('id')->eq($setting->id)->exec();
         }
-        die('success');
+        echo 'success';
     }
 
     /**
diff --git a/module/mr/control.php b/module/mr/control.php
index 41563b98e4..5afc835349 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -209,7 +209,7 @@ class mr extends control
      */
     public function delete($id, $confirm = 'no')
     {
-        if($confirm != 'yes') die(js::confirm($this->lang->mr->confirmDelete, inlink('delete', "id=$id&confirm=yes")));
+        if($confirm != 'yes') return print(js::confirm($this->lang->mr->confirmDelete, inlink('delete', "id=$id&confirm=yes")));
 
         $MR = $this->mr->getByID($id);
 
@@ -220,7 +220,7 @@ class mr extends control
         }
         $this->dao->delete()->from(TABLE_MR)->where('id')->eq($id)->exec();
 
-        die(js::locate(inlink('browse'), 'parent'));
+        echo js::locate(inlink('browse'), 'parent');
     }
 
     /**
@@ -233,7 +233,7 @@ class mr extends control
     public function view($id)
     {
         $MR = $this->mr->getByID($id);
-        if(!$MR) die(js::error($this->lang->notFound) . js::locate($this->createLink('mr', 'browse')));
+        if(!$MR) return print(js::error($this->lang->notFound) . js::locate($this->createLink('mr', 'browse')));
         if(isset($MR->gitlabID)) $rawMR = $this->mr->apiGetSingleMR($MR->gitlabID, $MR->targetProject, $MR->mriid);
         if($MR->synced and (!isset($rawMR->id) or (isset($rawMR->message) and $rawMR->message == '404 Not found') or empty($rawMR))) return $this->display();
 
@@ -560,8 +560,8 @@ class mr extends control
         {
             $this->mr->link($MRID, $productID, 'story');
 
-            if(dao::isError()) die(js::error(dao::getError()));
-            die(js::locate(inlink('link', "MRID=$MRID&type=story&orderBy=$orderBy"), 'parent'));
+            if(dao::isError()) return print(js::error(dao::getError()));
+            return print(js::locate(inlink('link', "MRID=$MRID&type=story&orderBy=$orderBy"), 'parent'));
         }
 
         $this->loadModel('story');
@@ -648,8 +648,8 @@ class mr extends control
         {
             $this->mr->link($MRID, $productID, 'bug');
 
-            if(dao::isError()) die(js::error(dao::getError()));
-            die(js::locate(inlink('link', "MRID=$MRID&type=bug&orderBy=$orderBy"), 'parent'));
+            if(dao::isError()) return print(js::error(dao::getError()));
+            return print(js::locate(inlink('link', "MRID=$MRID&type=bug&orderBy=$orderBy"), 'parent'));
         }
 
         $this->loadModel('bug');
@@ -734,8 +734,8 @@ class mr extends control
         {
             $this->mr->link($MRID, $productID, 'task');
 
-            if(dao::isError()) die(js::error(dao::getError()));
-            die(js::locate(inlink('link', "MRID=$MRID&type=task&orderBy=$orderBy"), 'parent'));
+            if(dao::isError()) return print(js::error(dao::getError()));
+            return print(js::locate(inlink('link', "MRID=$MRID&type=task&orderBy=$orderBy"), 'parent'));
         }
 
         $this->loadModel('execution');
@@ -827,7 +827,7 @@ class mr extends control
 
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->productplan->confirmUnlinkStory, $this->createLink('mr', 'unlink', "MRID=$MRID&productID=$productID&linkID=$linkID&type=$type&confirm=yes")));
+            return print(js::confirm($this->lang->productplan->confirmUnlinkStory, $this->createLink('mr', 'unlink', "MRID=$MRID&productID=$productID&linkID=$linkID&type=$type&confirm=yes")));
         }
         else
         {
@@ -848,7 +848,7 @@ class mr extends control
                 }
                 return $this->send($response);
             }
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -872,7 +872,7 @@ class mr extends control
         {
             if($this->post->reviewType == 'bug')  $result = $this->mr->saveBug($repoID, $mr, $v1, $v2);
             if($this->post->reviewType == 'task') $result = $this->mr->saveTask($repoID, $mr, $v1, $v2);
-            if($result['result'] == 'fail') die(json_encode($result));
+            if($result['result'] == 'fail') return print(json_encode($result));
 
             $objectID = $result['id'];
             $repo     = $this->repo->getRepoById($repoID);
@@ -1004,6 +1004,6 @@ class mr extends control
        $targetBranch  = $this->post->targetBranch;
 
        $result = $this->mr->checkSameOpened($gitlabID, $sourceProject, $sourceBranch, $targetProject, $targetBranch);
-       die(json_encode($result));
+       echo json_encode($result);
    }
 }

From ae8d371efb3e534b98a53c381c2484b42eed82e0 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Tue, 22 Feb 2022 01:12:41 +0000
Subject: [PATCH 10/41] Fix bug. .

---
 module/productplan/view/browsebylist.html.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php
index 598fdb75df..e9977c4a75 100644
--- a/module/productplan/view/browsebylist.html.php
+++ b/module/productplan/view/browsebylist.html.php
@@ -229,6 +229,7 @@
           }
           ?>
         </div>
+        </div>
       <?php endif;?>
       </div>
       <?php $pager->show('right', 'pagerjs');?>

From f650bc44c77cfd4fb9b374adb2929f0c44c886e0 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Tue, 22 Feb 2022 09:19:27 +0800
Subject: [PATCH 11/41] * Finish task #49415,49418,49425.

---
 extension/lite/product/ext/control/browse.php           | 1 +
 extension/lite/product/ext/view/browse.html.php         | 4 ++--
 extension/lite/project/ext/view/edit.lite.html.hook.php | 3 ++-
 module/story/control.php                                | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/extension/lite/product/ext/control/browse.php b/extension/lite/product/ext/control/browse.php
index cd03b2dc0b..60aff52c61 100644
--- a/extension/lite/product/ext/control/browse.php
+++ b/extension/lite/product/ext/control/browse.php
@@ -160,6 +160,7 @@ class product extends control
         $this->view->parentModules   = $this->tree->getParents($moduleID);
         $this->view->pager           = $pager;
         $this->view->users           = $this->user->getPairs('noletter|pofirst|nodeleted');
+        $this->view->teamMembers     = $this->user->getTeamMemberPairs($projectID);
         $this->view->orderBy         = $orderBy;
         $this->view->browseType      = $browseType;
         $this->view->modules         = $this->tree->getOptionMenu($productID, 'story', 0, $branchID);
diff --git a/extension/lite/product/ext/view/browse.html.php b/extension/lite/product/ext/view/browse.html.php
index 4734be72ee..7920a0dc86 100644
--- a/extension/lite/product/ext/view/browse.html.php
+++ b/extension/lite/product/ext/view/browse.html.php
@@ -438,7 +438,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
             <?php
             $withSearch = count($users) > 10;
             $actionLink = $this->createLink('story', 'batchAssignTo', "productID=$productID");
-            echo html::select('assignedTo', $users, '', 'class="hidden"');
+            echo html::select('assignedTo', $teamMembers, '', 'class="hidden"');
             ?>
             <div class="dropdown-menu search-list<?php if($withSearch) echo ' search-box-sink';?>" data-ride="searchList">
               <?php if($withSearch):?>
@@ -450,7 +450,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
               </div>
               <?php endif;?>
               <div class="list-group">
-              <?php foreach ($users as $key => $value):?>
+              <?php foreach ($teamMembers as $key => $value):?>
               <?php
               if(empty($key) or $key == 'closed') continue;
               $searchKey = $withSearch ? ('data-key="' . zget($usersPinYin, $value, '') . " @$key\"") : "data-key='@$key'";
diff --git a/extension/lite/project/ext/view/edit.lite.html.hook.php b/extension/lite/project/ext/view/edit.lite.html.hook.php
index 34dd0ee86d..46e8e1f046 100644
--- a/extension/lite/project/ext/view/edit.lite.html.hook.php
+++ b/extension/lite/project/ext/view/edit.lite.html.hook.php
@@ -1,6 +1,7 @@
 <script>
 $('#dataform table tbody tr:first-child').hide();
+$('#dataform table tbody tr:nth-child(5)').hide();
 $('#dataform table tbody tr:nth-child(7)').hide();
 $('#dataform table tbody tr:nth-child(8)').hide();
-$('#dataform table tbody tr:nth-child(12)').hide();
+$('#dataform table tbody tr:nth-child(13)').hide();
 </script>
diff --git a/module/story/control.php b/module/story/control.php
index 24f65342ef..21685129a8 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1691,7 +1691,7 @@ class story extends control
         $this->view->position[] = $this->lang->story->assign;
         $this->view->story      = $story;
         $this->view->actions    = $this->action->getList('story', $storyID);
-        $this->view->users      = $this->loadModel('user')->getPairs('nodeleted|noclosed|pofirst|noletter');
+        $this->view->users      = $this->loadModel('user')->getTeamMemberPairs($this->session->project);
         $this->display();
     }
 

From 5a334ccb86dea0bfda82c62e47e6953adfe1a428 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Tue, 22 Feb 2022 09:26:31 +0800
Subject: [PATCH 12/41] * Fix bug: return error.

---
 module/execution/control.php |  3 ++-
 module/personnel/control.php |  6 +++---
 module/product/control.php   | 42 ++++++++++++++++++------------------
 module/product/model.php     | 14 ++++++------
 4 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 8f73c5b2f1..65c887caee 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1671,7 +1671,8 @@ class execution extends control
             $this->view->project = $this->project->getById($this->session->project);
         }
 
-        $executionIDList = $this->post->executionIDList ? $this->post->executionIDList : return print(js::locate($this->session->executionList, 'parent'));
+        if(!$this->post->executionIDList) return print(js::locate($this->session->executionList, 'parent'));
+        $executionIDList = $this->post->executionIDList;
         $executions      = $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->in($executionIDList)->fetchAll('id');
 
         $appendPoUsers = $appendPmUsers = $appendQdUsers = $appendRdUsers = array();
diff --git a/module/personnel/control.php b/module/personnel/control.php
index 012c907c8e..aa29526bac 100644
--- a/module/personnel/control.php
+++ b/module/personnel/control.php
@@ -230,12 +230,12 @@ class personnel extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->personnel->confirmDelete, inLink('unbindWhitelist',"id=$id&confirm=yes")));
+            return print(js::confirm($this->lang->personnel->confirmDelete, inLink('unbindWhitelist',"id=$id&confirm=yes")));
         }
         else
         {
             $acl = $this->dao->select('*')->from(TABLE_ACL)->where('id')->eq($id)->fetch();
-            if(empty($acl)) die(js::reload('parent'));
+            if(empty($acl)) return print(js::reload('parent'));
 
             $objectTable  = $acl->objectType == 'product' ? TABLE_PRODUCT : TABLE_PROJECT;
             $whitelist    = $this->dao->select('whitelist')->from($objectTable)->where('id')->eq($acl->objectID)->fetch('whitelist');
@@ -254,7 +254,7 @@ class personnel extends control
 
             $this->loadModel('action')->create('whitelist', $acl->objectID, 'managedWhitelist', '', $acl->objectType);
 
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 }
diff --git a/module/product/control.php b/module/product/control.php
index c2f9bbfb4c..4d2dfe9014 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -596,11 +596,11 @@ class product extends control
             }
 
             $locate = $this->app->tab == 'product' ? $this->createLink('product', 'all') : $this->createLink('program', 'product', "programID=$programID");
-            die(js::locate($locate, 'parent'));
+            return print(js::locate($locate, 'parent'));
         }
 
         $productIDList = $this->post->productIDList;
-        if(empty($productIDList)) die(js::locate($this->session->productList, 'parent'));
+        if(empty($productIDList)) return print(js::locate($this->session->productList, 'parent'));
 
         /* Set menu when page come from program. */
         if($this->app->tab == 'program') $this->loadModel('program')->setMenu(0);
@@ -689,7 +689,7 @@ class product extends control
         if(!empty($_POST))
         {
             $changes = $this->product->close($productID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -699,7 +699,7 @@ class product extends control
 
             $this->executeHooks($productID);
 
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $this->product->setMenu($productID);
@@ -727,7 +727,7 @@ class product extends control
         if(!$product)
         {
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'code' => 404, 'message' => '404 Not found'));
-            die(js::error($this->lang->notFound) . js::locate($this->createLink('product', 'index')));
+            return print(js::error($this->lang->notFound) . js::locate($this->createLink('product', 'index')));
         }
 
         $product->desc = $this->loadModel('file')->setImgSize($product->desc);
@@ -765,7 +765,7 @@ class product extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->product->confirmDelete, $this->createLink('product', 'delete', "productID=$productID&confirm=yes")));
+            return print(js::confirm($this->lang->product->confirmDelete, $this->createLink('product', 'delete', "productID=$productID&confirm=yes")));
         }
         else
         {
@@ -775,7 +775,7 @@ class product extends control
             $this->executeHooks($productID);
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess));
-            die(js::locate($this->createLink('product', 'all'), 'parent'));
+            return print(js::locate($this->createLink('product', 'all'), 'parent'));
         }
     }
 
@@ -898,7 +898,7 @@ class product extends control
 
         $productID = $this->product->saveState($productID, $this->products);
         $product   = $this->product->getStatByID($productID);
-        if(!$product) die(js::locate('product', 'all'));
+        if(!$product) return print(js::locate('product', 'all'));
 
         $product->desc = $this->loadModel('file')->setImgSize($product->desc);
         $this->product->setMenu($productID);
@@ -934,11 +934,11 @@ class product extends control
         $products = $this->product->getProductPairsByProject($executionID);
         if(empty($products))
         {
-            die(printf($this->lang->build->noProduct, $this->createLink('execution', 'manageproducts', "executionID=$executionID&from=buildCreate", '', 'true'), 'project'));
+            return print(printf($this->lang->build->noProduct, $this->createLink('execution', 'manageproducts', "executionID=$executionID&from=buildCreate", '', 'true'), 'project'));
         }
         else
         {
-            die(html::select('product', $products, empty($product) ? '' : $product->id, "onchange='loadBranches(this.value);' class='form-control chosen' required data-toggle='modal' data-type='iframe'"));
+            return print(html::select('product', $products, empty($product) ? '' : $product->id, "onchange='loadBranches(this.value);' class='form-control chosen' required data-toggle='modal' data-type='iframe'"));
         }
     }
 
@@ -955,9 +955,9 @@ class product extends control
     {
         $projects  = array('' => '');
         $projects += $this->product->getProjectPairsByProduct($productID, $branch);
-        if($this->app->getViewType() == 'json') die(json_encode($projects));
+        if($this->app->getViewType() == 'json') return print(json_encode($projects));
 
-        die(html::select('project', $projects, $projectID, "class='form-control' onchange='loadProductExecutions({$productID}, this.value)'"));
+        return print(html::select('project', $projects, $projectID, "class='form-control' onchange='loadProductExecutions({$productID}, this.value)'"));
     }
 
     /**
@@ -974,17 +974,17 @@ class product extends control
     public function ajaxGetExecutions($productID, $projectID = 0, $branch = 0, $number = '', $executionID = 0)
     {
         $executions = $this->product->getExecutionPairsByProduct($productID, $branch, 'id_desc', $projectID);
-        if($this->app->getViewType() == 'json') die(json_encode($executions));
+        if($this->app->getViewType() == 'json') return print(json_encode($executions));
 
         if($number === '')
         {
-            die(html::select('execution', array('' => '') + $executions, $executionID, "class='form-control' onchange='loadExecutionRelated(this.value)'"));
+            return print(html::select('execution', array('' => '') + $executions, $executionID, "class='form-control' onchange='loadExecutionRelated(this.value)'"));
         }
         else
         {
             $executionsName = "executions[$number]";
             $executions     = empty($executions) ? array('' => '') : $executions;
-            die(html::select($executionsName, $executions, '', "class='form-control' onchange='loadExecutionBuilds($executionID, this.value, $number)'"));
+            return print(html::select($executionsName, $executions, '', "class='form-control' onchange='loadExecutionBuilds($executionID, this.value, $number)'"));
         }
     }
 
@@ -1015,7 +1015,7 @@ class product extends control
             $output .= html::a("javascript:void(0)", "<i class='icon icon-refresh'></i>", '', "class='btn btn-icon refresh' data-toggle='tooltip' title='{$this->lang->refresh}' onclick='loadProductPlans($productID)'");
             $output .= '</div>';
         }
-        die($output);
+        echo $output;
     }
 
     /**
@@ -1031,8 +1031,8 @@ class product extends control
         $lines = array();
         if(empty($productID) or $programID) $lines = $this->product->getLinePairs($programID);
 
-        if($productID)  die(html::select("lines[$productID]", array('' => '') + $lines, '', "class='form-control picker-select'"));
-        if(!$productID) die(html::select('line', array('' => '') + $lines, '', "class='form-control chosen'"));
+        if($productID)  return print(html::select("lines[$productID]", array('' => '') + $lines, '', "class='form-control picker-select'"));
+        if(!$productID) return print(html::select('line', array('' => '') + $lines, '', "class='form-control chosen'"));
     }
 
     /**
@@ -1060,7 +1060,7 @@ class product extends control
 
         $reviewers = $this->loadModel('user')->getPairs('noclosed|nodeleted', $storyReviewers, 0, $productReviewers);
 
-        die(html::select("reviewer[]", $reviewers, $storyReviewers, "class='form-control chosen' multiple"));
+        echo html::select("reviewer[]", $reviewers, $storyReviewers, "class='form-control chosen' multiple");
     }
 
     /**
@@ -1279,8 +1279,8 @@ class product extends control
         if($_POST)
         {
             $this->product->manageLine();
-            if(dao::isError()) die(js::error(dao::getError()));
-            die(js::reload('parent'));
+            if(dao::isError()) return print(js::error(dao::getError()));
+            return print(js::reload('parent'));
         }
 
         $this->view->title      = $this->lang->product->line;
diff --git a/module/product/model.php b/module/product/model.php
index 0b879ebb0d..e8686aa1ce 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -198,12 +198,12 @@ class productModel extends model
 
         echo(js::alert($this->lang->product->accessDenied));
 
-        if(!$this->server->http_referer) die(js::locate(helper::createLink('product', 'index')));
+        if(!$this->server->http_referer) return print(js::locate(helper::createLink('product', 'index')));
 
         $loginLink = $this->config->requestType == 'GET' ? "?{$this->config->moduleVar}=user&{$this->config->methodVar}=login" : "user{$this->config->requestFix}login";
-        if(strpos($this->server->http_referer, $loginLink) !== false) die(js::locate(helper::createLink('product', 'index')));
+        if(strpos($this->server->http_referer, $loginLink) !== false) return print(js::locate(helper::createLink('product', 'index')));
 
-        die(js::locate('back'));
+        echo js::locate('back');
     }
 
     /**
@@ -739,10 +739,10 @@ class productModel extends model
 
                 $products[$productID]->{$extendField->field} = htmlSpecialString($products[$productID]->{$extendField->field});
                 $message = $this->checkFlowRule($extendField, $products[$productID]->{$extendField->field});
-                if($message) die(js::alert($message));
+                if($message) return print(js::alert($message));
             }
         }
-        if(dao::isError()) die(js::error(dao::getError()));
+        if(dao::isError()) return print(js::error(dao::getError()));
 
         $unlinkProducts = array();
         foreach($products as $productID => $product)
@@ -757,7 +757,7 @@ class productModel extends model
                 ->checkIF((!empty($product->name) and $this->config->systemMode == 'new'), 'name', 'unique', "id != $productID and `program` = $programID")
                 ->where('id')->eq($productID)
                 ->exec();
-            if(dao::isError()) die(js::error('product#' . $productID . dao::getError(true)));
+            if(dao::isError()) return print(js::error('product#' . $productID . dao::getError(true)));
 
             /* When acl is open, white list set empty. When acl is private,update user view. */
             if($product->acl == 'open') $this->loadModel('personnel')->updateWhitelist('', 'product', $productID);
@@ -2175,7 +2175,7 @@ class productModel extends model
      */
     public function setMenu($productID, $branch = '', $module = 0, $moduleType = '', $extra = '')
     {
-        if(!$this->app->user->admin and strpos(",{$this->app->user->view->products},", ",$productID,") === false and $productID != 0 and !defined('TUTORIAL')) die(js::error($this->lang->product->accessDenied) . js::locate('back'));
+        if(!$this->app->user->admin and strpos(",{$this->app->user->view->products},", ",$productID,") === false and $productID != 0 and !defined('TUTORIAL')) return print(js::error($this->lang->product->accessDenied) . js::locate('back'));
 
         $product = $this->getByID($productID);
         $params  = array('branch' => $branch);

From 1f8e1b0021c72df95e2882d9590a55808c9bb066 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Tue, 22 Feb 2022 09:35:25 +0800
Subject: [PATCH 13/41] * Fix return print() -> return.

---
 module/block/control.php       | 26 +++++++++++++-------------
 module/branch/control.php      |  2 +-
 module/file/control.php        |  1 -
 module/productplan/control.php |  8 ++++----
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/module/block/control.php b/module/block/control.php
index 5be2e40f64..5c271ded29 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -455,7 +455,7 @@ class block extends control
             $this->app->loadLang('common');
             $this->app->loadLang('block');
 
-            if(!$this->block->checkAPI($this->get->hash)) return print();
+            if(!$this->block->checkAPI($this->get->hash)) return;
         }
 
         $mode = strtolower($this->get->mode);
@@ -629,7 +629,7 @@ class block extends control
     public function printTaskBlock()
     {
         $this->session->set('taskList',  $this->app->getURI(true), 'execution');
-        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
+        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
 
         $account = $this->app->user->account;
         $type    = $this->params->type;
@@ -647,7 +647,7 @@ class block extends control
     public function printBugBlock()
     {
         $this->session->set('bugList', $this->app->getURI(true), 'qa');
-        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
+        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
 
         $projectID = $this->lang->navGroup->qa  == 'project' ? $this->session->project : 0;
         $projectID = $this->view->block->module == 'my' ? 0 : $projectID;
@@ -710,7 +710,7 @@ class block extends control
         $this->session->set('productList',  $this->app->getURI(true), 'product');
         $this->session->set('testtaskList', $this->app->getURI(true), 'qa');
         $this->session->set('buildList',    $this->app->getURI(true), 'execution');
-        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
+        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
 
         $this->view->testtasks = $this->dao->select('distinct t1.*,t2.name as productName,t3.name as buildName,t4.name as projectName')->from(TABLE_TESTTASK)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
@@ -736,7 +736,7 @@ class block extends control
     public function printStoryBlock()
     {
         $this->session->set('storyList', $this->app->getURI(true), 'product');
-        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
+        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
 
         $this->app->loadClass('pager', $static = true);
         $count   = isset($this->params->count) ? (int)$this->params->count : 0;
@@ -840,7 +840,7 @@ class block extends control
     public function printProductBlock()
     {
         $this->app->loadClass('pager', $static = true);
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
         $count = isset($this->params->count) ? (int)$this->params->count : 0;
         $type  = isset($this->params->type) ? $this->params->type : '';
         $pager = pager::init(0, $count , 1);
@@ -881,7 +881,7 @@ class block extends control
      */
     public function printProjectStatisticBlock()
     {
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
 
         /* Load models and langs. */
         $this->loadModel('project');
@@ -956,7 +956,7 @@ class block extends control
      */
     public function printProductStatisticBlock($storyType = 'story')
     {
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
 
         $status = isset($this->params->type) ? $this->params->type : '';
         $count  = isset($this->params->count) ? $this->params->count : '';
@@ -1055,7 +1055,7 @@ class block extends control
      */
     public function printExecutionStatisticBlock()
     {
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
 
         $this->app->loadLang('task');
         $this->app->loadLang('story');
@@ -1238,7 +1238,7 @@ class block extends control
     {
         $uri = $this->app->getURI(true);
         $this->session->set('issueList', $uri, 'project');
-        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
+        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
         $this->view->users  = $this->loadModel('user')->getPairs('noletter');
         $this->view->issues = $this->loadModel('issue')->getBlockIssues($this->session->project, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
     }
@@ -1347,7 +1347,7 @@ class block extends control
      */
     public function printScrumListBlock()
     {
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
         $count = isset($this->params->count) ? (int)$this->params->count : 15;
         $type  = isset($this->params->type) ? $this->params->type : 'undone';
 
@@ -1505,7 +1505,7 @@ class block extends control
      */
     public function printQaStatisticBlock()
     {
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
 
         $this->app->loadLang('bug');
         $status = isset($this->params->type)  ? $this->params->type : '';
@@ -1680,7 +1680,7 @@ class block extends control
     public function printExecutionBlock()
     {
         $this->app->loadClass('pager', $static = true);
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return print();
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
         $count  = isset($this->params->count) ? (int)$this->params->count : 0;
         $status = isset($this->params->type)  ? $this->params->type : 'all';
         $pager  = pager::init(0, $count, 1);
diff --git a/module/branch/control.php b/module/branch/control.php
index a544658112..f6c04f8425 100644
--- a/module/branch/control.php
+++ b/module/branch/control.php
@@ -260,7 +260,7 @@ class branch extends control
     {
         $param   = $param ? $param : 'all';
         $product = $this->loadModel('product')->getById($productID);
-        if(empty($product) or $product->type == 'normal') return print();
+        if(empty($product) or $product->type == 'normal') return;
 
         $branches = $this->loadModel('branch')->getList($productID, $projectID, $param);
         $branchOption    = array();
diff --git a/module/file/control.php b/module/file/control.php
index b9796bb774..4c65f809f1 100644
--- a/module/file/control.php
+++ b/module/file/control.php
@@ -445,7 +445,6 @@ class file extends control
     public function ajaxDeleteTemplate($templateID)
     {
         $this->dao->delete()->from(TABLE_USERTPL)->where('id')->eq($templateID)->andWhere('account')->eq($this->app->user->account)->exec();
-        return print();
     }
 
     /**
diff --git a/module/productplan/control.php b/module/productplan/control.php
index 0eae192bfb..e7696c797e 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -498,7 +498,7 @@ class productplan extends control
         $plans    = $this->productplan->getPairs($productID, $branch, $expired, true);
         $planName = $number === '' ? 'plan' : "plan[$number]";
         $plans    = empty($plans) ? array('' => '') : $plans;
-        die(html::select($planName, $plans, '', "class='form-control'"));
+        echo html::select($planName, $plans, '', "class='form-control'");
     }
 
     /**
@@ -531,7 +531,7 @@ class productplan extends control
     public function ajaxGetProjects($productID, $branch = 0)
     {
         $projects = $this->loadModel('product')->getProjectPairsByProduct($productID, $branch);
-        die(html::select('project', $projects, key($projects), "class='form-control chosen'"));
+        echo html::select('project', $projects, key($projects), "class='form-control chosen'");
     }
 
     /**
@@ -670,7 +670,7 @@ class productplan extends control
     public function batchUnlinkStory($planID, $orderBy = 'id_desc')
     {
         foreach($this->post->storyIdList as $storyID) $this->productplan->unlinkStory($storyID, $planID);
-        die(js::locate($this->createLink('productplan', 'view', "planID=$planID&type=story&orderBy=$orderBy"), 'parent'));
+        echo js::locate($this->createLink('productplan', 'view', "planID=$planID&type=story&orderBy=$orderBy"), 'parent');
     }
 
     /**
@@ -810,7 +810,7 @@ class productplan extends control
     public function batchUnlinkBug($planID, $orderBy = 'id_desc')
     {
         foreach($this->post->bugIDList as $bugID) $this->productplan->unlinkBug($bugID);
-        die(js::locate($this->createLink('productplan', 'view', "planID=$planID&type=bug&orderBy=$orderBy"), 'parent'));
+        echo js::locate($this->createLink('productplan', 'view', "planID=$planID&type=bug&orderBy=$orderBy"), 'parent');
     }
 
     /**

From 4ffb8c996ce69e0af42eed05cb69ffa21a40f134 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Tue, 22 Feb 2022 09:46:00 +0800
Subject: [PATCH 14/41] * Finish task #49402.

---
 extension/lite/task/ext/view/view.lite.html.hook.php | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 extension/lite/task/ext/view/view.lite.html.hook.php

diff --git a/extension/lite/task/ext/view/view.lite.html.hook.php b/extension/lite/task/ext/view/view.lite.html.hook.php
new file mode 100644
index 0000000000..7149e646d9
--- /dev/null
+++ b/extension/lite/task/ext/view/view.lite.html.hook.php
@@ -0,0 +1,3 @@
+<script>
+$("a[href^='#legendMisc']").parent().remove();
+</script>

From 63be4b0948e980c6d0c40b05ab163a14e66afdca Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Tue, 22 Feb 2022 01:56:44 +0000
Subject: [PATCH 15/41] Adjust code.

---
 module/productplan/js/browse.js               |  2 --
 module/productplan/view/browsebylist.html.php | 20 +++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/module/productplan/js/browse.js b/module/productplan/js/browse.js
index 3df6eb3021..b41b74cf9c 100644
--- a/module/productplan/js/browse.js
+++ b/module/productplan/js/browse.js
@@ -455,5 +455,3 @@ if(!window.kanbanDropRules)
         closed: ['doing']
     }
 }
-
-$('#submit').attr('id', 'submitButton');
diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php
index e9977c4a75..2c96e7ae15 100644
--- a/module/productplan/view/browsebylist.html.php
+++ b/module/productplan/view/browsebylist.html.php
@@ -215,20 +215,20 @@
       <div class="table-actions btn-toolbar">
       <?php if(common::hasPriv('productplan', 'batchEdit')):?>
       <?php $actionLink = $this->inlink('batchEdit', "productID=$product->id&branch=$branch");?>
-      <?php echo html::submitButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"", 'btn');?>
+      <?php echo html::commonButton($lang->edit, "data-form-action='$actionLink'");?>
       <?php endif;?>
       <?php if(common::hasPriv('productplan', 'batchChangeStatus')):?>
         <button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->productplan->planStatus;?> <span class="caret"></span></button>
         <div class="dropdown-menu search-list">
-        <div class="list-group">
-          <?php
-          foreach($lang->productplan->statusList as $key => $status)
-          {
-              $actionLink = $this->createLink('productplan', 'batchChangeStatus', "status=$key");
-              echo html::a('javascript:;', $status, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"");
-          }
-          ?>
-        </div>
+          <div class="list-group">
+            <?php
+            foreach($lang->productplan->statusList as $key => $status)
+            {
+                $actionLink = $this->createLink('productplan', 'batchChangeStatus', "status=$key");
+                echo html::a('javascript:;', $status, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"");
+            }
+            ?>
+          </div>
         </div>
       <?php endif;?>
       </div>

From c053468aa65687e07de50931029b0b5d1a89ac2b Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 22 Feb 2022 11:05:45 +0800
Subject: [PATCH 16/41] * Fix bug.

---
 module/bug/control.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 7860b7dd81..fbb370ca21 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -1530,9 +1530,9 @@ class bug extends control
      */
     public function batchResolve($resolution, $resolvedBuild = '')
     {
-        $bugIDList = $this->post->bugIDList ? $this->post->bugIDList : return print(js::locate($this->session->bugList, 'parent'));
-        $bugIDList = array_unique($bugIDList);
+        if(!isset($this->post->bugIDList)) return print(js::locate($this->session->bugList, 'parent'));
 
+        $bugIDList = array_unique($this->post->bugIDList);
         $changes   = $this->bug->batchResolve($bugIDList, $resolution, $resolvedBuild);
         if(dao::isError()) return print(js::error(dao::getError()));
 
@@ -1766,8 +1766,9 @@ class bug extends control
             return print(js::locate($this->session->bugList, 'parent'));
         }
 
-        $bugIDList = $this->post->bugIDList ? $this->post->bugIDList : return print(js::locate($this->session->bugList, 'parent'));
-        $bugIDList = array_unique($bugIDList);
+        if(!isset($this->post->bugIDList)) return print(js::locate($this->session->bugList, 'parent'));
+
+        $bugIDList = array_unique($$this->post->bugIDList);
         $bugs = $this->dao->select('id, title, status, resolvedBy, openedBuild')->from(TABLE_BUG)->where('id')->in($bugIDList)->fetchAll('id');
 
         $this->qa->setMenu($this->products, $productID, $branch);

From 8cac8975bbdf23e53c16255c7dbc7de3f720e40d Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 22 Feb 2022 11:09:16 +0800
Subject: [PATCH 17/41] * Adjust code.

---
 module/bug/control.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index fbb370ca21..b9027f4e94 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -1530,7 +1530,7 @@ class bug extends control
      */
     public function batchResolve($resolution, $resolvedBuild = '')
     {
-        if(!isset($this->post->bugIDList)) return print(js::locate($this->session->bugList, 'parent'));
+        if(!$this->post->bugIDList) return print(js::locate($this->session->bugList, 'parent'));
 
         $bugIDList = array_unique($this->post->bugIDList);
         $changes   = $this->bug->batchResolve($bugIDList, $resolution, $resolvedBuild);
@@ -1766,7 +1766,7 @@ class bug extends control
             return print(js::locate($this->session->bugList, 'parent'));
         }
 
-        if(!isset($this->post->bugIDList)) return print(js::locate($this->session->bugList, 'parent'));
+        if(!$this->post->bugIDList) return print(js::locate($this->session->bugList, 'parent'));
 
         $bugIDList = array_unique($$this->post->bugIDList);
         $bugs = $this->dao->select('id, title, status, resolvedBy, openedBuild')->from(TABLE_BUG)->where('id')->in($bugIDList)->fetchAll('id');

From da00225feb027d3e2394bc97875b5a14c6ed5dda Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 22 Feb 2022 11:11:43 +0800
Subject: [PATCH 18/41] * Fix bug.

---
 module/bug/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index b9027f4e94..29c7483a65 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -1768,7 +1768,7 @@ class bug extends control
 
         if(!$this->post->bugIDList) return print(js::locate($this->session->bugList, 'parent'));
 
-        $bugIDList = array_unique($$this->post->bugIDList);
+        $bugIDList = array_unique($this->post->bugIDList);
         $bugs = $this->dao->select('id, title, status, resolvedBy, openedBuild')->from(TABLE_BUG)->where('id')->in($bugIDList)->fetchAll('id');
 
         $this->qa->setMenu($this->products, $productID, $branch);

From 408f8d4d9105412945a94fe43b6304451e3c043b Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Tue, 22 Feb 2022 14:15:00 +0800
Subject: [PATCH 19/41] * Move die to return.

---
 module/productplan/model.php    |  16 ++---
 module/program/control.php      |  36 +++++------
 module/program/model.php        |   6 +-
 module/programplan/model.php    |   2 +-
 module/project/control.php      |  62 +++++++++---------
 module/project/model.php        |   6 +-
 module/projectstory/control.php |   4 +-
 module/qa/control.php           |   2 +-
 module/qa/model.php             |   2 +-
 module/release/control.php      |  32 +++++-----
 module/repo/control.php         |  34 +++++-----
 module/repo/model.php           |   4 +-
 module/report/control.php       |   3 +-
 module/search/control.php       |  14 ++--
 module/search/model.php         |   2 +-
 module/sonarqube/control.php    |   4 +-
 module/sso/control.php          |  36 +++++------
 module/sso/model.php            |   6 +-
 module/stage/control.php        |   4 +-
 module/stakeholder/control.php  |  22 +++----
 module/story/control.php        | 109 +++++++++++++++++---------------
 module/story/model.php          |  18 +++---
 module/svn/control.php          |   5 +-
 module/task/control.php         |  87 ++++++++++++-------------
 module/task/model.php           |  16 ++---
 module/testcase/control.php     |  99 +++++++++++++++--------------
 module/testcase/model.php       |  18 +++---
 module/testreport/control.php   |  44 ++++++-------
 module/testsuite/control.php    |  18 +++---
 module/todo/control.php         |  65 +++++++++----------
 module/todo/model.php           |   8 +--
 module/tree/control.php         |  10 +--
 module/tree/model.php           |   6 +-
 module/tutorial/control.php     |  12 ++--
 module/upgrade/control.php      |  32 +++++-----
 module/upgrade/model.php        |   8 +--
 module/user/control.php         |  55 ++++++++--------
 module/user/model.php           |  46 +++++++-------
 module/webhook/control.php      |  16 ++---
 module/webhook/model.php        |   2 +-
 40 files changed, 489 insertions(+), 482 deletions(-)

diff --git a/module/productplan/model.php b/module/productplan/model.php
index 3a4202134b..5001a01933 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -626,8 +626,8 @@ class productplanModel extends model
             $plan->status = isset($data->status[$planID]) ? $data->status[$planID] : $oldPlans[$planID]->status;
             $plan->parent = $oldPlans[$planID]->parent;
 
-            if(empty($plan->title)) die(js::alter(sprintf($this->lang->productplan->errorNoTitle, $planID)));
-            if($plan->begin > $plan->end and !empty($plan->end)) die(js::alert(sprintf($this->lang->productplan->beginGeEnd, $planID)));
+            if(empty($plan->title)) return print(js::alter(sprintf($this->lang->productplan->errorNoTitle, $planID)));
+            if($plan->begin > $plan->end and !empty($plan->end)) return print(js::alert(sprintf($this->lang->productplan->beginGeEnd, $planID)));
 
             if($plan->begin == '') $plan->begin = $this->config->productplan->future;
             if($plan->end   == '') $plan->end   = $this->config->productplan->future;
@@ -639,7 +639,7 @@ class productplanModel extends model
 
                 $plan->{$extendField->field} = htmlSpecialString($plan->{$extendField->field});
                 $message = $this->checkFlowRule($extendField, $plan->{$extendField->field});
-                if($message) die(js::alert($message));
+                if($message) return print(js::alert($message));
             }
 
             $plans[$planID] = $plan;
@@ -656,11 +656,11 @@ class productplanModel extends model
                 $parent   = isset($plans[$parentID]) ? $plans[$parentID] : $this->getByID($parentID);
                 if($parent->begin != $this->config->productplan->future and $plan->begin != $this->config->productplan->future and $plan->begin < $parent->begin)
                 {
-                    die(js::alert(sprintf($this->lang->productplan->beginLetterParentTip, $planID, $plan->begin, $parent->begin)));
+                    return print(js::alert(sprintf($this->lang->productplan->beginLetterParentTip, $planID, $plan->begin, $parent->begin)));
                 }
                 elseif($parent->end != $this->config->productplan->future and $plan->end != $this->config->productplan->future and $plan->end > $parent->end)
                 {
-                    die(js::alert(sprintf($this->lang->productplan->endGreaterParentTip, $planID, $plan->end, $parent->end)));
+                    return print(js::alert(sprintf($this->lang->productplan->endGreaterParentTip, $planID, $plan->end, $parent->end)));
                 }
             }
             elseif($parentID == -1 and $plan->begin != $this->config->productplan->future)
@@ -674,8 +674,8 @@ class productplanModel extends model
                     if($childPlan->begin < $minBegin and $minBegin != $this->config->productplan->future) $minBegin = $childPlan->begin;
                     if($childPlan->end > $maxEnd and $maxEnd != $this->config->productplan->future) $maxEnd = $childPlan->end;
                 }
-                if($minBegin < $plan->begin and $minBegin != $this->config->productplan->future) die(js::alert(sprintf($this->lang->productplan->beginGreaterChildTip, $planID, $plan->begin, $minBegin)));
-                if($maxEnd > $plan->end and $maxEnd != $this->config->productplan->future) die(js::alert(sprintf($this->lang->productplan->endLetterChildTip, $planID, $plan->end, $maxEnd)));
+                if($minBegin < $plan->begin and $minBegin != $this->config->productplan->future) return print(js::alert(sprintf($this->lang->productplan->beginGreaterChildTip, $planID, $plan->begin, $minBegin)));
+                if($maxEnd > $plan->end and $maxEnd != $this->config->productplan->future) return print(js::alert(sprintf($this->lang->productplan->endLetterChildTip, $planID, $plan->end, $maxEnd)));
             }
 
             $change = common::createChanges($oldPlans[$planID], $plan);
@@ -683,7 +683,7 @@ class productplanModel extends model
             {
                 if($parentID > 0 and !isset($parents[$parentID])) $parents[$parentID] = $parentID;
                 $this->dao->update(TABLE_PRODUCTPLAN)->data($plan)->autoCheck()->where('id')->eq($planID)->exec();
-                if(dao::isError()) die(js::error(dao::getError()));
+                if(dao::isError()) return print(js::error(dao::getError()));
                 $changes[$planID] = $change;
             }
         }
diff --git a/module/program/control.php b/module/program/control.php
index 6c8e8d9cf6..5404e5a6c8 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -243,10 +243,10 @@ class program extends control
         {
             /* Only when all subprograms and subprojects are closed can the program be closed. */
             $hasUnfinished = $this->program->hasUnfinished($program);
-            if($hasUnfinished) die(js::error($this->lang->program->closeErrorMessage));
+            if($hasUnfinished) return print(js::error($this->lang->program->closeErrorMessage));
 
             $changes = $this->project->close($programID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -255,7 +255,7 @@ class program extends control
             }
 
             $this->executeHooks($programID);
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $this->view->title      = $this->lang->program->close;
@@ -281,7 +281,7 @@ class program extends control
         if(!empty($_POST))
         {
             $changes = $this->project->start($programID, 'program');
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -291,7 +291,7 @@ class program extends control
 
             $this->loadModel('common')->syncPPEStatus($programID);
             $this->executeHooks($programID);
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $this->view->title      = $this->lang->program->start;
@@ -317,14 +317,14 @@ class program extends control
         if(!empty($_POST))
         {
             $changes = $this->project->activate($programID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
                 $actionID = $this->action->create('program', $programID, 'Activated', $this->post->comment);
                 $this->action->logHistory($actionID, $changes);
             }
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $newBegin = date('Y-m-d');
@@ -355,7 +355,7 @@ class program extends control
         if(!empty($_POST))
         {
             $changes = $this->project->suspend($programID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -363,7 +363,7 @@ class program extends control
                 $this->action->logHistory($actionID, $changes);
             }
             $this->executeHooks($programID);
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $this->view->title      = $this->lang->program->suspend;
@@ -389,19 +389,19 @@ class program extends control
         if($childrenCount)
         {
             if($this->viewType == 'json' or (defined('RUN_MODE') && RUN_MODE == 'api')) return $this->send(array('result' => 'fail', 'message' => 'Cannot delete the program has children'));
-            die(js::alert($this->lang->program->hasChildren));
+            return print(js::alert($this->lang->program->hasChildren));
         }
 
         $productCount = $this->dao->select('count(*) as count')->from(TABLE_PRODUCT)->where('program')->eq($programID)->andWhere('deleted')->eq(0)->fetch('count');
-        if($productCount) die(js::alert($this->lang->program->hasProduct));
+        if($productCount) return print(js::alert($this->lang->program->hasProduct));
 
         $program = $this->dao->select('*')->from(TABLE_PROGRAM)->where('id')->eq($programID)->fetch();
-        if($confirm == 'no') die(js::confirm($this->lang->program->confirmDelete, $this->createLink('program', 'delete', "programID=$programID&confirm=yes")));
+        if($confirm == 'no') return print(js::confirm($this->lang->program->confirmDelete, $this->createLink('program', 'delete', "programID=$programID&confirm=yes")));
 
         $this->dao->update(TABLE_PROGRAM)->set('deleted')->eq(1)->where('id')->eq($programID)->exec();
         $this->loadModel('action')->create('program', $programID, 'deleted', '', ACTIONMODEL::CAN_UNDELETED);
 
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -508,7 +508,7 @@ class program extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->program->confirmDelete, $this->inlink('unlinkStakeholder', "stakeholderID=$stakeholderID&programID=$programID&confirm=yes")));
+            return print(js::confirm($this->lang->program->confirmDelete, $this->inlink('unlinkStakeholder', "stakeholderID=$stakeholderID&programID=$programID&confirm=yes")));
         }
         else
         {
@@ -518,7 +518,7 @@ class program extends control
             $this->loadModel('user')->updateUserView($programID, 'program', array($account));
             $this->updateChildUserView($programID, $account);
 
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
          }
     }
 
@@ -537,7 +537,7 @@ class program extends control
 
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->program->confirmBatchUnlink, $this->inlink('batchUnlinkStakeholders', "programID=$programID&stakeholderIDList=$stakeholderIDList&confirm=yes")));
+            return print(js::confirm($this->lang->program->confirmBatchUnlink, $this->inlink('batchUnlinkStakeholders', "programID=$programID&stakeholderIDList=$stakeholderIDList&confirm=yes")));
         }
         else
         {
@@ -547,7 +547,7 @@ class program extends control
             $this->loadModel('user')->updateUserView($programID, 'program', $account);
             $this->updateChildUserView($programID, $account);
 
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -723,7 +723,7 @@ class program extends control
     {
         $programID = (int)$programID;
         $program   = $this->program->getByID($programID);
-        if(!$program) die(js::error($this->lang->notFound) . js::locate('back'));
+        if(!$program) return print(js::error($this->lang->notFound) . js::locate('back'));
 
         echo $this->fetch('program', 'product', "programID=$programID");
     }
diff --git a/module/program/model.php b/module/program/model.php
index 6f886c80c2..455a2ef3d0 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -11,12 +11,12 @@ class programModel extends model
     {
         echo(js::alert($this->lang->program->accessDenied));
 
-        if(!$this->server->http_referer) die(js::locate(helper::createLink('my', 'index')));
+        if(!$this->server->http_referer) return print(js::locate(helper::createLink('my', 'index')));
 
         $loginLink = $this->config->requestType == 'GET' ? "?{$this->config->moduleVar}=user&{$this->config->methodVar}=login" : "user{$this->config->requestFix}login";
-        if(strpos($this->server->http_referer, $loginLink) !== false) die(js::locate(helper::createLink('my', 'index')));
+        if(strpos($this->server->http_referer, $loginLink) !== false) return print(js::locate(helper::createLink('my', 'index')));
 
-        die(js::locate('back'));
+        echo js::locate('back');
     }
 
     /**
diff --git a/module/programplan/model.php b/module/programplan/model.php
index e87070e9eb..387e554187 100644
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -627,7 +627,7 @@ class programplanModel extends model
             /* If child plans has milestone, update parent plan set milestone eq 0 . */
             if($parentID and $milestone) $this->dao->update(TABLE_PROJECT)->set('milestone')->eq(0)->where('id')->eq($parentID)->exec();
 
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
         }
     }
 
diff --git a/module/project/control.php b/module/project/control.php
index a25329f7ee..2bf7da8198 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -178,7 +178,7 @@ class project extends control
             ->andWhere('t1.type')->eq('execution')
             ->andWhere('t1.account')->eq($account)
             ->fetchPairs();
-        if(empty($executionMembers)) die();
+        if(empty($executionMembers)) return;
 
         $executionNames = '';
         $count          = 0;
@@ -198,7 +198,7 @@ class project extends control
         {
             $this->lang->project->unlinkExecutionMember = sprintf($this->lang->project->unlinkExecutionMember, count($executionMembers), $executionNames, $this->lang->project->etc);
         }
-        die($this->lang->project->unlinkExecutionMember);
+        echo $this->lang->project->unlinkExecutionMember;
     }
 
     /**
@@ -238,7 +238,7 @@ class project extends control
         $this->project->setMenu($projectID);
 
         $project = $this->project->getByID($projectID);
-        if(empty($project) || $project->type != 'project') die(js::error($this->lang->notFound) . js::locate('back'));
+        if(empty($project) || $project->type != 'project') return print(js::error($this->lang->notFound) . js::locate('back'));
 
         if(!$projectID) $this->locate($this->createLink('project', 'browse'));
         setCookie("lastProject", $projectID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
@@ -355,7 +355,7 @@ class project extends control
         {
             $programTitle = $this->post->programTitle;
             $this->setting->setItem($this->app->user->account . '.project.programTitle', $programTitle);
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $status = $this->setting->getItem('owner=' . $this->app->user->account . '&module=project&key=programTitle');
@@ -665,12 +665,13 @@ class project extends control
                     $this->action->logHistory($actionID, $changes);
                 }
             }
-            die(js::locate($this->session->projectList, 'parent'));
+            return print(js::locate($this->session->projectList, 'parent'));
         }
 
         if($this->app->tab == 'program') $this->loadModel('program')->setMenu(0);
 
-        $projectIdList = $this->post->projectIdList ? $this->post->projectIdList : die(js::locate($this->session->projectList, 'parent'));
+        if(!$this->post->projectIdList) return print(js::locate($this->session->projectList, 'parent'));
+        $projectIdList = $this->post->projectIdList;
         $projects      = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->in($projectIdList)->fetchAll('id');
 
         /* Get program list. */
@@ -709,7 +710,7 @@ class project extends control
         if(empty($project) || strpos('scrum,waterfall,kanban', $project->model) === false)
         {
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'code' => 404, 'message' => '404 Not found'));
-            die(js::error($this->lang->notFound) . js::locate($this->createLink('project', 'browse')));
+            return print(js::error($this->lang->notFound) . js::locate($this->createLink('project', 'browse')));
         }
 
         $this->project->setMenu($projectID);
@@ -791,9 +792,9 @@ class project extends control
         {
             $_POST['project'] = $projectID;
             $groupID = $this->group->create();
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $groupID));
-            die(js::closeModal('parent.parent'));
+            return print(js::closeModal('parent.parent'));
         }
 
         $this->view->title      = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->create;
@@ -1296,7 +1297,7 @@ class project extends control
      */
     public function unlinkMember($projectID, $userID, $confirm = 'no', $removeExecution = 'no')
     {
-        if($confirm == 'no') die(js::confirm($this->lang->project->confirmUnlinkMember, $this->inlink('unlinkMember', "projectID=$projectID&userID=$userID&confirm=yes")));
+        if($confirm == 'no') return print(js::confirm($this->lang->project->confirmUnlinkMember, $this->inlink('unlinkMember', "projectID=$projectID&userID=$userID&confirm=yes")));
 
         $user    = $this->loadModel('user')->getById($userID, 'id');
         $account = $user->account;
@@ -1319,7 +1320,7 @@ class project extends control
             }
             return $this->send($response);
         }
-        die(js::locate($this->inlink('team', "projectID=$projectID"), 'parent'));
+        echo js::locate($this->inlink('team', "projectID=$projectID"), 'parent');
     }
 
     /**
@@ -1388,8 +1389,8 @@ class project extends control
         if(!empty($_POST))
         {
             $this->group->updateUser($groupID);
-            if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
-            die(js::locate($this->createLink('group', 'browse'), 'parent'));
+            if(isonlybody()) return print(js::closeModal('parent.parent', 'this'));
+            return print(js::locate($this->createLink('group', 'browse'), 'parent'));
         }
 
         $group      = $this->group->getById($groupID);
@@ -1432,8 +1433,8 @@ class project extends control
              $group = $this->group->getByID($groupID);
              $_POST['project'] = $group->project;
              $this->group->copy($groupID);
-             if(dao::isError()) die(js::error(dao::getError()));
-             die(js::closeModal('parent.parent', 'this'));
+             if(dao::isError()) return print(js::error(dao::getError()));
+             return print(js::closeModal('parent.parent', 'this'));
          }
 
          $this->view->title      = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->copy;
@@ -1456,7 +1457,7 @@ class project extends control
         if(!empty($_POST))
         {
             $this->group->update($groupID);
-            die(js::closeModal('parent.parent', 'this'));
+            return print(js::closeModal('parent.parent', 'this'));
         }
 
         $this->view->title      = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->edit;
@@ -1481,7 +1482,7 @@ class project extends control
         if(!empty($_POST))
         {
             $changes = $this->project->start($projectID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -1501,7 +1502,7 @@ class project extends control
                     if($project->status == 'wait' || $project->status == 'suspended')
                     {
                         $changes = $this->project->start($projectID);
-                        if(dao::isError()) die(js::error(dao::getError()));
+                        if(dao::isError()) return print(js::error(dao::getError()));
 
                         if($this->post->comment != '' or !empty($changes))
                         {
@@ -1514,7 +1515,7 @@ class project extends control
             $this->loadModel('common')->syncPPEStatus($projectID);
 
             $this->executeHooks($projectID);
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $this->view->title      = $this->lang->project->start;
@@ -1539,7 +1540,7 @@ class project extends control
         if(!empty($_POST))
         {
             $changes = $this->project->suspend($projectID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -1547,7 +1548,7 @@ class project extends control
                 $this->action->logHistory($actionID, $changes);
             }
             $this->executeHooks($projectID);
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $this->view->title      = $this->lang->project->suspend;
@@ -1573,7 +1574,7 @@ class project extends control
         if(!empty($_POST))
         {
             $changes = $this->project->close($projectID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -1581,7 +1582,7 @@ class project extends control
                 $this->action->logHistory($actionID, $changes);
             }
             $this->executeHooks($projectID);
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $this->view->title      = $this->lang->project->close;
@@ -1609,7 +1610,7 @@ class project extends control
         if(!empty($_POST))
         {
             $changes = $this->project->activate($projectID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -1617,7 +1618,7 @@ class project extends control
                 $this->action->logHistory($actionID, $changes);
             }
             $this->executeHooks($projectID);
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $newBegin = date('Y-m-d');
@@ -1648,8 +1649,7 @@ class project extends control
         if($confirm == 'no')
         {
             $project = $this->project->getByID($projectID);
-            echo js::confirm(sprintf($this->lang->project->confirmDelete, $project->name), $this->createLink('project', 'delete', "projectID=$projectID&confirm=yes"));
-            die();
+            return print(js::confirm(sprintf($this->lang->project->confirmDelete, $project->name), $this->createLink('project', 'delete', "projectID=$projectID&confirm=yes")));
         }
         else
         {
@@ -1669,7 +1669,7 @@ class project extends control
             if(empty($executionIdList))
             {
                 if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess));
-                die(js::locate($url, 'parent'));
+                return print(js::locate($url, 'parent'));
             }
 
             $this->dao->update(TABLE_EXECUTION)->set('deleted')->eq(1)->where('id')->in(array_keys($executionIdList))->exec();
@@ -1679,7 +1679,7 @@ class project extends control
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess));
 
             $this->session->set('project', '');
-            die(js::locate($url, 'parent'));
+            return print(js::locate($url, 'parent'));
         }
     }
 
@@ -1862,7 +1862,7 @@ class project extends control
         $oldTopPGM = $this->loadModel('program')->getTopByID($project->parent);
         $newTopPGM = $this->program->getTopByID($programID);
 
-        if($oldTopPGM == $newTopPGM) die();
+        if($oldTopPGM == $newTopPGM) return;
 
         $response  = array();
         $response['result']  = true;
@@ -1884,6 +1884,6 @@ class project extends control
             $response['message']             = $multiLinkedProducts;
             $response['multiLinkedProjects'] = $multiLinkedProjects;
         }
-        die(json_encode($response));
+        echo json_encode($response);
     }
 }
diff --git a/module/project/model.php b/module/project/model.php
index 6d034a9093..3a24e89449 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1223,10 +1223,10 @@ class projectModel extends model
 
                 $projects[$projectID]->{$extendField->field} = htmlSpecialString($projects[$projectID]->{$extendField->field});
                 $message = $this->checkFlowRule($extendField, $projects[$projectID]->{$extendField->field});
-                if($message) die(js::alert($message));
+                if($message) hepler::end(js::alert($message));
             }
         }
-        if(dao::isError()) die(js::error(dao::getError()));
+        if(dao::isError()) helper::end(js::error(dao::getError()));
 
         foreach($projects as $projectID => $project)
         {
@@ -1244,7 +1244,7 @@ class projectModel extends model
                 ->where('id')->eq($projectID)
                 ->exec();
 
-            if(dao::isError()) die(js::error('project#' . $projectID . dao::getError(true)));
+            if(dao::isError()) helper::end(js::error('project#' . $projectID . dao::getError(true)));
             if(!dao::isError())
             {
                 $linkedProducts = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetchPairs();
diff --git a/module/projectstory/control.php b/module/projectstory/control.php
index 652b9de23b..4f5db62636 100644
--- a/module/projectstory/control.php
+++ b/module/projectstory/control.php
@@ -37,7 +37,7 @@ class projectStory extends control
     public function story($projectID = 0, $productID = 0, $branch = 0, $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $this->products = $this->loadModel('product')->getProductPairsByProject($projectID);
-        if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', 'moduleName=project&activeMenu=story&projectID=' . $projectID)));
+        if(empty($this->products)) return print($this->locate($this->createLink('product', 'showErrorNone', 'moduleName=project&activeMenu=story&projectID=' . $projectID)));
         echo $this->fetch('product', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=$param&storyType=$storyType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&projectID=$projectID");
     }
 
@@ -140,7 +140,7 @@ ETO;
         }
 
         if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
-        die($html);
+        echo $html;
     }
 
     /**
diff --git a/module/qa/control.php b/module/qa/control.php
index b2b35c4e3e..f520f1c4d6 100644
--- a/module/qa/control.php
+++ b/module/qa/control.php
@@ -20,7 +20,7 @@ class qa extends control
     public function index($locate = 'auto', $productID = 0, $projectID = 0)
     {
         $products = $this->loadModel('product')->getProductPairsByProject($projectID, 'noclosed');
-        if(empty($products)) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName=qa&activeMenu=index")));
+        if(empty($products)) return print($this->locate($this->createLink('product', 'showErrorNone', "moduleName=qa&activeMenu=index")));
         if($locate == 'yes') $this->locate($this->createLink('bug', 'browse'));
 
         $productID = $this->product->saveState($productID, $products);
diff --git a/module/qa/model.php b/module/qa/model.php
index f69a0797b7..92e8924375 100644
--- a/module/qa/model.php
+++ b/module/qa/model.php
@@ -26,7 +26,7 @@ class qaModel extends model
         if(!$this->app->user->admin and strpos(",{$this->app->user->view->products},", ",$productID,") === false and $productID != 0 and !defined('TUTORIAL'))
         {
             $this->app->loadLang('product');
-            die(js::error($this->lang->product->accessDenied) . js::locate('back'));
+            return print(js::error($this->lang->product->accessDenied) . js::locate('back'));
         }
 
         $branch = ($this->cookie->preBranch !== '' and $branch === '') ? $this->cookie->preBranch : $branch;
diff --git a/module/release/control.php b/module/release/control.php
index 702c8f053c..d2c5d103f3 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -162,7 +162,7 @@ class release extends control
     {
         $releaseID = (int)$releaseID;
         $release   = $this->release->getByID($releaseID, true);
-        if(!$release) die(js::error($this->lang->notFound) . js::locate($this->createLink('product', 'index')));
+        if(!$release) return print(js::error($this->lang->notFound) . js::locate($this->createLink('product', 'index')));
 
         if($type == 'story') $this->session->set('storyList', $this->app->getURI(true), 'product');
         if($type == 'bug' or $type == 'leftBug') $this->session->set('bugList', $this->app->getURI(true), 'qa');
@@ -224,8 +224,8 @@ class release extends control
 
     /**
      * Notify for release.
-     * 
-     * @param  int    $releaseID 
+     *
+     * @param  int    $releaseID
      * @access public
      * @return void
      */
@@ -235,7 +235,7 @@ class release extends control
         {
             if(isset($_POST['notify']))
             {
-                $notify = implode(',', $this->post->notify); 
+                $notify = implode(',', $this->post->notify);
                 $this->dao->update(TABLE_RELEASE)->set('notify')->eq($notify)->where('id')->eq($releaseID)->exec();
 
                 $this->release->sendmail($releaseID);
@@ -244,7 +244,7 @@ class release extends control
 
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
         }
-    
+
         $this->view->release = $this->release->getById($releaseID);
         $this->view->actions = $this->loadModel('action')->getList('release', $releaseID);
         $this->view->users   = $this->loadModel('user')->getPairs('noletter|noclosed');
@@ -263,7 +263,7 @@ class release extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->release->confirmDelete, $this->createLink('release', 'delete', "releaseID=$releaseID&confirm=yes")));
+            return print(js::confirm($this->lang->release->confirmDelete, $this->createLink('release', 'delete', "releaseID=$releaseID&confirm=yes")));
         }
         else
         {
@@ -297,7 +297,7 @@ class release extends control
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess));
 
             $locateLink = $this->session->releaseList ? $this->session->releaseList : inlink('browse', "productID={$release->product}");
-            die(js::locate($locateLink, 'parent'));
+            return print(js::locate($locateLink, 'parent'));
         }
     }
 
@@ -404,7 +404,7 @@ class release extends control
             }
 
             $html = "<html><head><meta charset='utf-8'><title>{$this->post->fileName}</title><style>table, th, td{font-size:12px; border:1px solid gray; border-collapse:collapse;}</style></head><body>$html</body></html>";
-            die($this->fetch('file', 'sendDownHeader', array('fileName' => $this->post->fileName, 'html', $html)));
+            return print($this->fetch('file', 'sendDownHeader', array('fileName' => $this->post->fileName, 'html', $html)));
         }
 
         $this->display();
@@ -427,7 +427,7 @@ class release extends control
         if(!empty($_POST['stories']))
         {
             $this->release->linkStory($releaseID);
-            die(js::locate(inlink('view', "releaseID=$releaseID&type=story"), 'parent'));
+            return print(js::locate(inlink('view', "releaseID=$releaseID&type=story"), 'parent'));
         }
         $this->session->set('storyList', inlink('view', "releaseID=$releaseID&type=story&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")), 'product');
 
@@ -512,7 +512,7 @@ class release extends control
             }
             return $this->send($response);
         }
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -525,7 +525,7 @@ class release extends control
     public function batchUnlinkStory($releaseID)
     {
         $this->release->batchUnlinkStory($releaseID);
-        die(js::locate($this->createLink('release', 'view', "releaseID=$releaseID&type=story"), 'parent'));
+        echo js::locate($this->createLink('release', 'view', "releaseID=$releaseID&type=story"), 'parent');
     }
 
     /**
@@ -546,7 +546,7 @@ class release extends control
         if(!empty($_POST['bugs']))
         {
             $this->release->linkBug($releaseID, $type);
-            die(js::locate(inlink('view', "releaseID=$releaseID&type=$type"), 'parent'));
+            return print(js::locate(inlink('view', "releaseID=$releaseID&type=$type"), 'parent'));
         }
 
         $this->session->set('bugList', inlink('view', "releaseID=$releaseID&type=$type&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")), 'qa');
@@ -643,7 +643,7 @@ class release extends control
             }
             return $this->send($response);
         }
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -657,7 +657,7 @@ class release extends control
     public function batchUnlinkBug($releaseID, $type = 'bug')
     {
         $this->release->batchUnlinkBug($releaseID, $type);
-        die(js::locate($this->createLink('release', 'view', "releaseID=$releaseID&type=$type"), 'parent'));
+        echo js::locate($this->createLink('release', 'view', "releaseID=$releaseID&type=$type"), 'parent');
     }
 
     /**
@@ -671,8 +671,8 @@ class release extends control
     public function changeStatus($releaseID, $status)
     {
         $this->release->changeStatus($releaseID, $status);
-        if(dao::isError()) die(js::error(dao::getError()));
+        if(dao::isError()) return print(js::error(dao::getError()));
         $actionID = $this->loadModel('action')->create('release', $releaseID, 'changestatus', '', $status);
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 }
diff --git a/module/repo/control.php b/module/repo/control.php
index 09d2d5b55b..dc39bad950 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -26,7 +26,7 @@ class repo extends control
         if(stripos(",$disFuncs,", ',exec,') !== false or stripos(",$disFuncs,", ',shell_exec,') !== false)
         {
             echo js::alert($this->lang->repo->error->useless);
-            die(js::locate('back'));
+            return print(js::locate('back'));
         }
 
         $this->projectID = $this->session->project ? $this->session->project : 0;
@@ -61,7 +61,7 @@ class repo extends control
             $this->repo->setMenu($this->repos, $repoID);
         }
 
-        if(empty($this->repos) and $this->methodName != 'create') die($this->locate($this->repo->createLink('create', "objectID=$objectID")));
+        if(empty($this->repos) and $this->methodName != 'create') return print($this->locate($this->repo->createLink('create', "objectID=$objectID")));
     }
 
     /**
@@ -216,7 +216,7 @@ class repo extends control
      */
     public function delete($repoID, $objectID = 0, $confirm = 'no')
     {
-        if($confirm == 'no') die(js::confirm($this->lang->repo->notice->delete, $this->repo->createLink('delete', "repoID=$repoID&objectID=$objectID&confirm=yes")));
+        if($confirm == 'no') return print(js::confirm($this->lang->repo->notice->delete, $this->repo->createLink('delete', "repoID=$repoID&objectID=$objectID&confirm=yes")));
 
         $relationID = $this->dao->select('id')->from(TABLE_RELATION)
             ->where('extra')->eq($repoID)
@@ -228,15 +228,15 @@ class repo extends control
         $jobs = $this->dao->select('*')->from(TABLE_JOB)->where('repo')->eq($repoID)->andWhere('deleted')->eq('0')->fetchAll();
         if($jobs) $error .= ($error ? '\n' : '') . $this->lang->repo->error->linkedJob;
 
-        if($error) die(js::alert($error));
+        if($error) return print(js::alert($error));
 
         $this->dao->delete()->from(TABLE_REPO)->where('id')->eq($repoID)->exec();
         $this->dao->delete()->from(TABLE_REPOHISTORY)->where('repo')->eq($repoID)->exec();
         $this->dao->delete()->from(TABLE_REPOFILES)->where('repo')->eq($repoID)->exec();
         $this->dao->delete()->from(TABLE_REPOBRANCH)->where('repo')->eq($repoID)->exec();
 
-        if(dao::isError()) die(js::error(dao::getError()));
-        die(js::reload('parent'));
+        if(dao::isError()) return print(js::error(dao::getError()));
+        echo js::reload('parent');
     }
 
     /**
@@ -907,8 +907,8 @@ class repo extends control
     {
         set_time_limit(0);
         $repo = $this->repo->getRepoByID($repoID);
-        if(empty($repo)) die();
-        if($repo->synced) die('finish');
+        if(empty($repo)) return;
+        if($repo->synced) return print('finish');
 
         $this->commonAction($repoID);
         $this->scm->setEngine($repo);
@@ -979,7 +979,7 @@ class repo extends control
                 if(empty($branchID))
                 {
                     $this->repo->markSynced($repoID);
-                    die('finish');
+                    return print('finish');
                 }
             }
         }
@@ -1000,8 +1000,8 @@ class repo extends control
     {
         set_time_limit(0);
         $repo = $this->repo->getRepoByID($repoID);
-        if(empty($repo)) die();
-        if(strpos($repo->SCM, 'Git') === false) die('finish');
+        if(empty($repo)) return;
+        if(strpos($repo->SCM, 'Git') === false) return print('finish');
         if($branch) $branch = base64_decode($branch);
 
         $this->scm->setEngine($repo);
@@ -1030,7 +1030,7 @@ class repo extends control
 
             setcookie("syncBranch", $branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
             $this->repo->markSynced($repoID);
-            die('finish');
+            return print('finish');
         }
 
         $this->dao->update(TABLE_REPO)->set('commits=commits + ' . $commitCount)->where('id')->eq($repoID)->exec();
@@ -1083,7 +1083,7 @@ class repo extends control
     public function ajaxGetSVNDirs($repoID, $path = '')
     {
         $repo = $this->repo->getRepoByID($repoID);
-        if($repo->SCM != 'Subversion') die(json_encode(array()));
+        if($repo->SCM != 'Subversion') return print(json_encode(array()));
 
         $path = $this->repo->decodePath($path);
         $dirs = array();
@@ -1099,7 +1099,7 @@ class repo extends control
             $dirs['/'] = $this->repo->encodePath($path);
             foreach($tags as $dirPath => $dirName) $dirs[$dirPath] = $this->repo->encodePath($dirPath);
         }
-        die(json_encode($dirs));
+        return print(json_encode($dirs));
     }
 
     /**
@@ -1122,7 +1122,7 @@ class repo extends control
         }
         $reposHtml .= '</div></div></div>';
 
-        die($reposHtml);
+        return print($reposHtml);
     }
 
     /**
@@ -1167,7 +1167,7 @@ class repo extends control
             $options .= "<option value='{$project->id}' data-name='{$project->name}'>{$project->name_with_namespace}</option>";
         }
 
-        die($options);
+        return print($options);
     }
 
     /**
@@ -1193,7 +1193,7 @@ class repo extends control
         }
         $branchesHtml .= '</div></div></div>';
 
-        die($branchesHtml);
+        return print($branchesHtml);
     }
 
     /**
diff --git a/module/repo/model.php b/module/repo/model.php
index 4a3245d85c..ab12ca3c29 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -46,13 +46,13 @@ class repoModel extends model
             if(empty($repo))
             {
                 echo(js::alert($this->lang->repo->error->noFound));
-                die(js::locate('back'));
+                return print(js::locate('back'));
             }
 
             if(!$this->checkPriv($repo))
             {
                 echo(js::alert($this->lang->repo->error->accessDenied));
-                die(js::locate('back'));
+                return print(js::locate('back'));
             }
         }
 
diff --git a/module/report/control.php b/module/report/control.php
index 984a13d518..a793b4ee35 100644
--- a/module/report/control.php
+++ b/module/report/control.php
@@ -369,6 +369,7 @@ class report extends control
         $this->view->dept   = $dept;
         $this->view->userID = $userID;
         $this->view->months = $this->report->getYearMonths($year);
-        die($this->display());
+
+        $this->display();
     }
 }
diff --git a/module/search/control.php b/module/search/control.php
index 89673a6f17..75b12ab794 100644
--- a/module/search/control.php
+++ b/module/search/control.php
@@ -73,21 +73,21 @@ class search extends control
 
         $actionURL = $this->post->actionURL;
         $parsedURL = parse_url($actionURL);
-        if(isset($parsedURL['host'])) die();
+        if(isset($parsedURL['host'])) return;
         if($this->config->requestType != 'GET')
         {
             $path = $parsedURL['path'];
             $path = str_replace($this->config->webRoot, '', $path);
             if(strpos($path, '.') !== false) $path = substr($path, 0, strpos($path, '.'));
-            if(preg_match("/^\w+{$this->config->requestFix}\w+/", $path) == 0) die();
+            if(preg_match("/^\w+{$this->config->requestFix}\w+/", $path) == 0) return;
         }
         else
         {
             $query = $parsedURL['query'];
-            if(preg_match("/^{$this->config->moduleVar}=\w+\&{$this->config->methodVar}=\w+/", $query) == 0) die();
+            if(preg_match("/^{$this->config->moduleVar}=\w+\&{$this->config->methodVar}=\w+/", $query) == 0) return;
         }
 
-        die(js::locate($actionURL, 'parent'));
+        echo js::locate($actionURL, 'parent');
     }
 
     /**
@@ -125,8 +125,8 @@ class search extends control
     public function deleteQuery($queryID)
     {
         $this->search->deleteQuery($queryID);
-        if(dao::isError()) die(js::error(dao::getError()));
-        die('success');
+        if(dao::isError()) return print(js::error(dao::getError()));
+        echo 'success';
     }
 
     /**
@@ -149,7 +149,7 @@ class search extends control
             if(empty($queryID)) continue;
             $html .= '<li>' . html::a("javascript:executeQuery({$queryID})", $queryName . (common::hasPriv('search', 'deleteQuery') ? '<i class="icon icon-close"></i>' : ''), '', "class='label user-query' data-query-id='$queryID'") . '</li>';
         }
-        die($html);
+        echo $html;
     }
 
     /**
diff --git a/module/search/model.php b/module/search/model.php
index ceb44431d2..eaaa6dd92c 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -389,7 +389,7 @@ class searchModel extends model
     public function deleteQuery($queryID)
     {
         $this->dao->delete()->from(TABLE_USERQUERY)->where('id')->eq($queryID)->andWhere('account')->eq($this->app->user->account)->exec();
-        die('success');
+        echo 'success';
     }
 
     /**
diff --git a/module/sonarqube/control.php b/module/sonarqube/control.php
index 5f77e03a9c..02f617ed4e 100644
--- a/module/sonarqube/control.php
+++ b/module/sonarqube/control.php
@@ -210,7 +210,7 @@ class sonarqube extends control
      */
     public function delete($sonarqubeID, $confirm = 'no')
     {
-        if($confirm != 'yes') die(js::confirm($this->lang->sonarqube->confirmDelete, inlink('delete', "sonarqubeID=$sonarqubeID&confirm=yes")));
+        if($confirm != 'yes') return print(js::confirm($this->lang->sonarqube->confirmDelete, inlink('delete', "sonarqubeID=$sonarqubeID&confirm=yes")));
 
         $oldSonarQube = $this->loadModel('pipeline')->getByID($sonarqubeID);
         $this->loadModel('action');
@@ -319,7 +319,7 @@ class sonarqube extends control
      */
     public function deleteProject($sonarqubeID, $projectKey, $confirm = 'no')
     {
-        if($confirm != 'yes') die(js::confirm($this->lang->sonarqube->confirmDeleteProject, inlink('deleteProject', "sonarqubeID=$sonarqubeID&projectKey=$projectKey&confirm=yes")));
+        if($confirm != 'yes') return print(js::confirm($this->lang->sonarqube->confirmDeleteProject, inlink('deleteProject', "sonarqubeID=$sonarqubeID&projectKey=$projectKey&confirm=yes")));
 
         /* Fix error when request type is PATH_INFO and the tag name contains '-'.*/
         $projectKey = str_replace('*', '-', $projectKey);
diff --git a/module/sso/control.php b/module/sso/control.php
index f813258261..9b744832a6 100644
--- a/module/sso/control.php
+++ b/module/sso/control.php
@@ -24,7 +24,7 @@ class sso extends control
         $locate  = empty($referer) ? getWebRoot() : base64_decode($referer);
 
         $this->app->loadConfig('sso');
-        if(!$this->config->sso->turnon) die($this->locate($locate));
+        if(!$this->config->sso->turnon) return print($this->locate($locate));
 
         $userIP = $this->server->remote_addr;
         $code   = $this->config->sso->code;
@@ -92,7 +92,7 @@ class sso extends control
 
                 if($this->loadModel('user')->isLogon())
                 {
-                    if($this->session->user && $this->session->user->account == $user->account) die($this->locate($locate));
+                    if($this->session->user && $this->session->user->account == $user->account) return print($this->locate($locate));
                 }
 
                 $this->user->cleanLocked($user->account);
@@ -116,7 +116,8 @@ class sso extends control
                 $this->session->set('user', $user);
                 $this->app->user = $this->session->user;
                 $this->loadModel('action')->create('user', $user->id, 'login');
-                die($this->locate($locate));
+
+                return print($this->locate($locate));
             }
         }
         $this->locate($this->createLink('user', 'login', empty($referer) ? '' : "referer=$referer"));
@@ -170,7 +171,7 @@ class sso extends control
      */
     public function ajaxSetConfig()
     {
-        if(!$this->app->user->admin) die('deny');
+        if(!$this->app->user->admin) return print('deny');
 
         if($_POST)
         {
@@ -181,8 +182,8 @@ class sso extends control
             $ssoConfig->key    = trim($this->post->key);
 
             $this->loadModel('setting')->setItems('system.sso', $ssoConfig);
-            if(dao::isError()) die('fail');
-            die('success');
+            if(dao::isError()) return print('fail');
+            echo 'success';
         }
     }
 
@@ -195,19 +196,19 @@ class sso extends control
      */
     public function bind($referer = '')
     {
-        if(!$this->session->ssoData) die();
+        if(!$this->session->ssoData) return;
 
         $ssoData = $this->session->ssoData;
         $userIP  = $this->server->remote_addr;
         $code    = $this->config->sso->code;
         $key     = $this->config->sso->key;
-        if($ssoData->auth != md5($code . $userIP . $ssoData->token . $key))die();
+        if($ssoData->auth != md5($code . $userIP . $ssoData->token . $key)) return;
 
         $this->loadModel('user');
         if($_POST)
         {
             $user = $this->sso->bind();
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             /* Authorize him and save to session. */
             $user->rights = $this->user->authorize($user->account);
@@ -219,7 +220,7 @@ class sso extends control
             $this->app->user = $this->session->user;
             $this->loadModel('action')->create('user', $user->id, 'login');
             unset($_SESSION['ssoData']);
-            die(js::locate(helper::safe64Decode($referer), 'parent'));
+            return print(js::locate(helper::safe64Decode($referer), 'parent'));
         }
         $this->view->title = $this->lang->sso->bind;
         $this->view->users = $this->user->getPairs('noclosed|nodeleted');
@@ -237,7 +238,7 @@ class sso extends control
     {
         if(!$this->sso->checkKey()) return false;
         $users = $this->loadModel('user')->getPairs('noclosed|nodeleted');
-        die(json_encode($users));
+        echo json_encode($users);
     }
 
     /**
@@ -250,7 +251,7 @@ class sso extends control
     {
         if(!$this->sso->checkKey()) return false;
         $users = $this->sso->getBindUsers();
-        die(json_encode($users));
+        echo json_encode($users);
     }
 
     /**
@@ -265,8 +266,8 @@ class sso extends control
         {
             $this->dao->update(TABLE_USER)->set('ranzhi')->eq('')->where('ranzhi')->eq($this->post->ranzhiAccount)->exec();
             $this->dao->update(TABLE_USER)->set('ranzhi')->eq($this->post->ranzhiAccount)->where('account')->eq($this->post->zentaoAccount)->exec();
-            if(dao::isError()) die(dao::getError());
-            die('success');
+            if(dao::isError()) return print(dao::getError());
+            return print('success');
         }
     }
 
@@ -282,8 +283,8 @@ class sso extends control
         {
             $result = $this->sso->createUser();
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $result['id']));
-            if($result['status'] != 'success') die($result['data']);
-            die('success');
+            if($result['status'] != 'success') return print($result['data']);
+            return print('success');
         }
     }
 
@@ -303,7 +304,7 @@ class sso extends control
         $datas = array();
         $datas['task'] = $this->dao->select("id, name")->from(TABLE_TASK)->where('assignedTo')->eq($account)->andWhere('status')->in('wait,doing')->andWhere('deleted')->eq(0)->fetchPairs();
         $datas['bug']  = $this->dao->select("id, title")->from(TABLE_BUG)->where('assignedTo')->eq($account)->andWhere('status')->eq('active')->andWhere('deleted')->eq(0)->fetchPairs();
-        die(json_encode($datas));
+        echo json_encode($datas);
     }
 
     /**
@@ -426,6 +427,5 @@ class sso extends control
         $this->view->title   = $this->lang->sso->deny;
         $this->view->message = $message;
         $this->display('sso', 'error');
-        die();
     }
 }
diff --git a/module/sso/model.php b/module/sso/model.php
index 80a73e9938..d49d26cfc8 100644
--- a/module/sso/model.php
+++ b/module/sso/model.php
@@ -48,10 +48,10 @@ class ssoModel extends model
         $data = fixer::input('post')->get();
         if($data->bindType == 'bind')
         {
-            if(empty($data->bindPassword))die(js::alert($this->lang->sso->bindNoPassword));
+            if(empty($data->bindPassword)) return print(js::alert($this->lang->sso->bindNoPassword));
             $password = md5($data->bindPassword);
             $user = $this->dao->select('*')->from(TABLE_USER)->where('account')->eq($data->bindUser)->andWhere('password')->eq($password)->andWhere('deleted')->eq('0')->fetch();
-            if(empty($user))die(js::alert($this->lang->sso->bindNoUser));
+            if(empty($user)) return print(js::alert($this->lang->sso->bindNoUser));
             $user->ranzhi = $this->session->ssoData->account;
             $this->dao->update(TABLE_USER)->set('ranzhi')->eq($user->ranzhi)->where('id')->eq($user->id)->exec();
         }
@@ -59,7 +59,7 @@ class ssoModel extends model
         {
             if(!$this->loadModel('user')->checkPassword()) return;
             $user = $this->dao->select('*')->from(TABLE_USER)->where('account')->eq($data->account)->fetch();
-            if($user) die(js::alert($this->lang->sso->bindHasAccount));
+            if($user) return print(js::alert($this->lang->sso->bindHasAccount));
 
             $user = new stdclass();
             $user->account    = $data->account;
diff --git a/module/stage/control.php b/module/stage/control.php
index 6fa1d394ae..73eca224db 100644
--- a/module/stage/control.php
+++ b/module/stage/control.php
@@ -173,13 +173,13 @@ class stage extends control
 
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->stage->confirmDelete, inlink('delete', "stageID=$stageID&confirm=yes")));
+            return print(js::confirm($this->lang->stage->confirmDelete, inlink('delete', "stageID=$stageID&confirm=yes")));
         }
         else
         {
             $this->stage->delete(TABLE_STAGE, $stageID);
 
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 }
diff --git a/module/stakeholder/control.php b/module/stakeholder/control.php
index cb4a237340..b3d0e9afbd 100644
--- a/module/stakeholder/control.php
+++ b/module/stakeholder/control.php
@@ -105,7 +105,7 @@ class stakeholder extends control
         {
             $stakeholderList = $this->stakeholder->batchCreate($projectID);
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $stakeholderList));
-            die(js::locate($this->createLink('stakeholder', 'browse', "projectID=$projectID"), 'parent'));
+            return print(js::locate($this->createLink('stakeholder', 'browse', "projectID=$projectID"), 'parent'));
         }
 
         if($this->app->tab == 'program')
@@ -206,7 +206,7 @@ class stakeholder extends control
         {
             $members = $this->loadModel('user')->getTeamMemberPairs($projectID, 'project');
         }
-        die(html::select('user', $members, $user, "class='form-control chosen'"));
+        echo html::select('user', $members, $user, "class='form-control chosen'");
     }
 
     /**
@@ -232,7 +232,7 @@ class stakeholder extends control
         $users = $this->loadModel('user')->getPairs('noclosed');
         $companyUsers = array('' => '') + array_diff($users, $members);
 
-        die(html::select('user', $companyUsers, $user, "class='form-control chosen'"));
+        echo html::select('user', $companyUsers, $user, "class='form-control chosen'");
     }
 
     /**
@@ -245,7 +245,7 @@ class stakeholder extends control
     {
         $users = $this->loadModel('user')->getPairs('noclosed|outside|noletter');
 
-        die(html::select('user', $users, '', "class='form-control chosen' onchange=changeUser(this.value);"));
+        echo html::select('user', $users, '', "class='form-control chosen' onchange=changeUser(this.value);");
     }
 
     /**
@@ -288,7 +288,7 @@ class stakeholder extends control
 
         $partakeList = array_merge($insideList, $outsideList);
 
-        die(json_encode(array('begin' => $begin, 'realBegin' => $realBegin, 'status' => $status, 'situation' => $situation, 'partakeList' => $partakeList)));
+        echo json_encode(array('begin' => $begin, 'realBegin' => $realBegin, 'status' => $status, 'situation' => $situation, 'partakeList' => $partakeList));
     }
 
     /**
@@ -303,7 +303,7 @@ class stakeholder extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->stakeholder->confirmDelete, inLink('delete', "userID=$userID&confirm=yes")));
+            return print(js::confirm($this->lang->stakeholder->confirmDelete, inLink('delete', "userID=$userID&confirm=yes")));
         }
         else
         {
@@ -316,7 +316,7 @@ class stakeholder extends control
             {
                 $this->loadModel('project')->updateInvolvedUserView($stakeholder->objectID, $stakeholder->user);
             }
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -393,8 +393,8 @@ class stakeholder extends control
         if(!empty($_POST))
         {
             $result = $this->stakeholder->communicate($userID);
-            if(dao::isError()) die(js::error(dao::getError()));
-            if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
+            if(dao::isError()) return print(js::error(dao::getError()));
+            if(isonlybody()) return print(js::closeModal('parent.parent', 'this'));
         }
 
         $this->view->title      = $this->lang->stakeholder->common . $this->lang->colon . $this->lang->stakeholder->communicate;
@@ -418,9 +418,9 @@ class stakeholder extends control
         if(!empty($_POST))
         {
             $expectID = $this->stakeholder->expect($user->id);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
-            die(js::closeModal('parent.parent', 'this'));
+            return print(js::closeModal('parent.parent', 'this'));
         }
 
         $this->view->title      = $this->lang->stakeholder->common . $this->lang->colon . $this->lang->stakeholder->communicate;
diff --git a/module/story/control.php b/module/story/control.php
index 24f65342ef..64eedf623a 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -83,7 +83,7 @@ class story extends control
         if(isset($fromObjectID))
         {
             $fromObject = $this->loadModel($fromObjectName)->getById($fromObjectID);
-            if(!$fromObject) die(js::error($this->lang->notFound) . js::locate('back', 'parent'));
+            if(!$fromObject) return print(js::error($this->lang->notFound) . js::locate('back', 'parent'));
 
             $this->view->$fromObjectIDKey = $fromObjectID;
             $this->view->$fromObjectName  = $fromObject;
@@ -222,7 +222,7 @@ class story extends control
 
         $users = $this->user->getPairs('pdfirst|noclosed|nodeleted');
         $moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'story', 0, $branch === 'all' ? 0 : $branch);
-        if(empty($moduleOptionMenu)) die(js::locate(helper::createLink('tree', 'browse', "productID=$productID&view=story")));
+        if(empty($moduleOptionMenu)) return print(js::locate(helper::createLink('tree', 'browse', "productID=$productID&view=story")));
 
         /* Init vars. */
         $source     = '';
@@ -437,7 +437,7 @@ class story extends control
             if($storyID and !empty($mails))
             {
                 $this->story->subdivide($storyID, $stories);
-                if(dao::isError()) die(js::error(dao::getError()));
+                if(dao::isError()) return print(js::error(dao::getError()));
             }
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $stories));
@@ -644,7 +644,7 @@ class story extends control
         if(!empty($_POST))
         {
             $changes = $this->story->update($storyID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
             if($this->post->comment != '' or !empty($changes))
             {
                 $action   = !empty($changes) ? 'Edited' : 'Commented';
@@ -657,9 +657,9 @@ class story extends control
 
             $this->executeHooks($storyID);
 
-            if(isonlybody()) die(js::reload('parent.parent'));
+            if(isonlybody()) return print(js::reload('parent.parent'));
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'success', 'data' => $storyID));
-            die(js::locate($this->createLink($this->app->rawModule, 'view', "storyID=$storyID"), 'parent'));
+            return print(js::locate($this->createLink($this->app->rawModule, 'view', "storyID=$storyID"), 'parent'));
         }
 
         $this->commonAction($storyID);
@@ -791,10 +791,11 @@ class story extends control
                     $this->action->logHistory($actionID, $changes);
                 }
             }
-            die(js::locate($this->session->storyList, 'parent'));
+            return print(js::locate($this->session->storyList, 'parent'));
         }
 
-        $storyIdList = $this->post->storyIdList ? $this->post->storyIdList : die(js::locate($this->session->storyList, 'parent'));
+        if(!$this->post->storyIdList) return print(js::locate($this->session->storyList, 'parent'));
+        $storyIdList = $this->post->storyIdList;
         $storyIdList = array_unique($storyIdList);
 
         /* Get edited stories. */
@@ -934,7 +935,7 @@ class story extends control
             if(dao::isError())
             {
                 if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'message' => dao::getError()));
-                die(js::error(dao::getError()));
+                return print(js::error(dao::getError()));
             }
             $story   = $this->story->getByID($storyID);
             $version = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch('version');
@@ -1011,7 +1012,7 @@ class story extends control
         if(!empty($_POST))
         {
             $changes = $this->story->activate($storyID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($changes)
             {
@@ -1065,7 +1066,7 @@ class story extends control
 
         $storyID = (int)$storyID;
         $story   = $this->story->getById($storyID, $version, true);
-        if(!$story) die(js::error($this->lang->notFound) . js::locate($this->createLink('product', 'index')));
+        if(!$story) return print(js::error($this->lang->notFound) . js::locate($this->createLink('product', 'index')));
 
         $story = $this->story->mergeReviewer($story, true);
 
@@ -1148,7 +1149,7 @@ class story extends control
     public function delete($storyID, $confirm = 'no')
     {
         $story = $this->story->getById($storyID);
-        if($story->parent < 0) die(js::alert($this->lang->story->cannotDeleteParent));
+        if($story->parent < 0) return print(js::alert($this->lang->story->cannotDeleteParent));
 
         if($confirm == 'no')
         {
@@ -1169,7 +1170,7 @@ class story extends control
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'success'));
 
             $locateLink = $this->session->storyList ? $this->session->storyList : $this->createLink('product', 'browse', "productID={$story->product}");
-            die(js::locate($locateLink, 'parent'));
+            return print(js::locate($locateLink, 'parent'));
         }
     }
 
@@ -1188,7 +1189,7 @@ class story extends control
         if(!empty($_POST))
         {
             $changes = $this->story->review($storyID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($changes)
             {
@@ -1199,10 +1200,10 @@ class story extends control
 
             $this->executeHooks($storyID);
 
-            if(isonlybody()) die(js::reload('parent.parent'));
+            if(isonlybody()) return print(js::reload('parent.parent'));
 
             $module = $from == 'project' ? 'projectstory' : 'story';
-            die(js::locate($this->createLink($module, 'view', "storyID=$storyID"), 'parent'));
+            return print(js::locate($this->createLink($module, 'view', "storyID=$storyID"), 'parent'));
         }
 
         /* Get story and product. */
@@ -1266,13 +1267,14 @@ class story extends control
      */
     public function batchReview($result, $reason = '')
     {
-        $storyIdList = $this->post->storyIdList ? $this->post->storyIdList : die(js::locate($this->session->storyList, 'parent'));
+        if(!$this->post->storyIdList) return print(js::locate($this->session->storyList, 'parent'));
+        $storyIdList = $this->post->storyIdList;
         $storyIdList = array_unique($storyIdList);
         $actions     = $this->story->batchReview($storyIdList, $result, $reason);
 
-        if(dao::isError()) die(js::error(dao::getError()));
+        if(dao::isError()) return print(js::error(dao::getError()));
         if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -1289,7 +1291,7 @@ class story extends control
         $this->loadModel('action')->create('story', $storyID, 'Recalled');
 
         $locateLink = $this->session->storyList ? $this->session->storyList : $this->createLink('product', 'browse', "productID={$story->product}");
-        die(js::locate($locateLink, 'parent'));
+        echo js::locate($locateLink, 'parent');
     }
 
     /**
@@ -1393,10 +1395,11 @@ class story extends control
             }
 
             if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
-            die(js::locate($this->session->storyList, 'parent'));
+            return print(js::locate($this->session->storyList, 'parent'));
         }
 
-        $storyIdList = $this->post->storyIdList ? $this->post->storyIdList : die(js::locate($this->session->storyList, 'parent'));
+        if(!$this->post->storyIdList) return print(js::locate($this->session->storyList, 'parent'));
+        $storyIdList = $this->post->storyIdList;
         $storyIdList = array_unique($storyIdList);
 
         /* Get edited stories. */
@@ -1488,17 +1491,18 @@ class story extends control
      */
     public function batchChangeModule($moduleID)
     {
-        $storyIdList = !empty($_POST['storyIdList']) ? $this->post->storyIdList : die(js::locate($this->session->storyList, 'parent'));
+        if(empty($_POST['storyIdList'])) return print(js::locate($this->session->storyList, 'parent'));
+        $storyIdList = $this->post->storyIdList;
         $storyIdList = array_unique($storyIdList);
         $allChanges  = $this->story->batchChangeModule($storyIdList, $moduleID);
-        if(dao::isError()) die(js::error(dao::getError()));
+        if(dao::isError()) return print(js::error(dao::getError()));
         foreach($allChanges as $storyID => $changes)
         {
             $actionID = $this->action->create('story', $storyID, 'Edited');
             $this->action->logHistory($actionID, $changes);
         }
         if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
-        die(js::locate($this->session->storyList, 'parent'));
+        echo js::locate($this->session->storyList, 'parent');
     }
 
     /**
@@ -1539,17 +1543,18 @@ class story extends control
      */
     public function batchChangePlan($planID, $oldPlanID = 0)
     {
-        $storyIdList = !empty($_POST['storyIdList']) ? $this->post->storyIdList : die(js::locate($this->session->storyList, 'parent'));
+        if(empty($_POST['storyIdList'])) return print(js::locate($this->session->storyList, 'parent'));
+        $storyIdList = $this->post->storyIdList;
         $storyIdList = array_unique($storyIdList);
         $allChanges  = $this->story->batchChangePlan($storyIdList, $planID, $oldPlanID);
-        if(dao::isError()) die(js::error(dao::getError()));
+        if(dao::isError()) return print(js::error(dao::getError()));
         foreach($allChanges as $storyID => $changes)
         {
             $actionID = $this->action->create('story', $storyID, 'Edited');
             $this->action->logHistory($actionID, $changes);
         }
         if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
-        die(js::locate($this->session->storyList, 'parent'));
+        echo js::locate($this->session->storyList, 'parent');
     }
 
     /**
@@ -1563,8 +1568,8 @@ class story extends control
      */
     public function batchChangeBranch($branchID, $confirm = '', $storyIdList = '')
     {
-        if(!empty($_POST['storyIdList'])) $storyIdList = $_POST['storyIdList'];
-        $storyIdList = !empty($storyIdList) ? $storyIdList : die(js::locate($this->session->storyList, 'parent'));
+        if(empty($_POST['storyIdList'])) return print(js::locate($this->session->storyList, 'parent'));
+        $storyIdList = $this->post->storyIdList;
         $plans       = $this->loadModel('productplan')->getPlansByStories($storyIdList);
         if(empty($confirm))
         {
@@ -1598,21 +1603,21 @@ class story extends control
                 $storyIdList       = implode(',', $storyIdList);
                 $confirmURL        = $this->createLink('story', 'batchChangeBranch', "branchID=$branchID&confirm=yes&storyIdList=$storyIdList");
                 $cancelURL         = $this->createLink('story', 'batchChangeBranch', "branchID=$branchID&confirm=no&storyIdList=$normalStotyIdList");
-                die(js::confirm(sprintf($this->lang->story->confirmChangeBranch, $conflictStoryIdList ), $confirmURL, $cancelURL));
+                return print(js::confirm(sprintf($this->lang->story->confirmChangeBranch, $conflictStoryIdList ), $confirmURL, $cancelURL));
             }
         }
 
         if(is_string($storyIdList)) $storyIdList = array_filter(explode(',', $storyIdList));
         $storyIdList = array_unique($storyIdList);
         $allChanges  = $this->story->batchChangeBranch($storyIdList, $branchID, $confirm, $plans);
-        if(dao::isError()) die(js::error(dao::getError()));
+        if(dao::isError()) return print(js::error(dao::getError()));
         foreach($allChanges as $storyID => $changes)
         {
             $actionID = $this->action->create('story', $storyID, 'Edited');
             $this->action->logHistory($actionID, $changes);
         }
         if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -1625,11 +1630,11 @@ class story extends control
     public function batchChangeStage($stage)
     {
         $storyIdList = $this->post->storyIdList;
-        if(empty($storyIdList)) die(js::locate($this->session->storyList, 'parent'));
+        if(empty($storyIdList)) return print(js::locate($this->session->storyList, 'parent'));
 
         $storyIdList = array_unique($storyIdList);
         $allChanges  = $this->story->batchChangeStage($storyIdList, $stage);
-        if(dao::isError()) die(js::error(dao::getError()));
+        if(dao::isError()) return print(js::error(dao::getError()));
 
         $action = $stage == 'verified' ? 'Verified' : 'Edited';
         foreach($allChanges as $storyID => $changes)
@@ -1638,7 +1643,7 @@ class story extends control
             $this->action->logHistory($actionID, $changes);
         }
         if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
-        die(js::locate($this->session->storyList, 'parent'));
+        echo js::locate($this->session->storyList, 'parent');
     }
 
     /**
@@ -1653,7 +1658,7 @@ class story extends control
         if(!empty($_POST))
         {
             $changes = $this->story->assign($storyID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
             if($changes)
             {
                 $actionID = $this->loadModel('action')->create('story', $storyID, 'Assigned', $this->post->comment, $this->post->assignedTo);
@@ -1706,7 +1711,7 @@ class story extends control
         if(!empty($_POST) && isset($_POST['storyIdList']))
         {
             $allChanges  = $this->story->batchAssignTo();
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
             foreach($allChanges as $storyID => $changes)
             {
                 $actionID = $this->action->create('story', $storyID, 'Assigned', '', $this->post->assignedTo);
@@ -1714,7 +1719,7 @@ class story extends control
             }
         }
         if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
-        die(js::locate($this->session->storyList, 'parent'));
+        echo js::locate($this->session->storyList, 'parent');
     }
 
     /**
@@ -1893,15 +1898,15 @@ class story extends control
         if($type == 'remove')
         {
             $result = $this->story->unlinkStory($storyID, $linkedStoryID);
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
 
         if($_POST)
         {
             $this->story->linkStories($storyID);
 
-            if(dao::isError()) die(js::error(dao::getError()));
-            die(js::closeModal('parent.parent', 'this'));
+            if(dao::isError()) return print(js::error(dao::getError()));
+            return print(js::closeModal('parent.parent', 'this'));
         }
 
         /* Get story, product, products, and queryID. */
@@ -1953,7 +1958,7 @@ class story extends control
         if($result == 'no')
         {
             $this->dao->update(TABLE_STORY)->set('URChanged')->eq(0)->where('id')->eq($storyID)->exec();
-            die(js::reload('parent', 'this'));
+            return print(js::reload('parent', 'this'));
         }
 
         $this->view->changedStories = $this->story->getChangedStories($story);
@@ -1983,16 +1988,16 @@ class story extends control
         $stories = $this->story->getExecutionStoryPairs($executionID, $productID, $branch, $moduleID, $type);
         if($this->app->getViewType() === 'json')
         {
-            die(json_encode($stories));
+            return print(json_encode($stories));
         }
         elseif($this->app->getViewType() == 'mhtml')
         {
-            die(html::select('story', empty($stories) ? array('' => '') : $stories, $storyID, 'onchange=setStoryRelated()'));
+            return print(html::select('story', empty($stories) ? array('' => '') : $stories, $storyID, 'onchange=setStoryRelated()'));
         }
         else
         {
             $storyName = $number === '' ? 'story' : "story[$number]";
-            die(html::select($storyName, empty($stories) ? array('' => '') : $stories, $storyID, 'class=form-control onchange=setStoryRelated(' . $number . ');'));
+            return print(html::select($storyName, empty($stories) ? array('' => '') : $stories, $storyID, 'class=form-control onchange=setStoryRelated(' . $number . ');'));
         }
     }
 
@@ -2044,8 +2049,8 @@ class story extends control
         $select  = html::select('story' . $number, empty($stories) ? array('' => '') : $stories, $storyID, "class='form-control'");
 
         /* If only need options, remove select wrap. */
-        if($onlyOption == 'true') die(substr($select, strpos($select, '>') + 1, -10));
-        die($select);
+        if($onlyOption == 'true') return print(substr($select, strpos($select, '>') + 1, -10));
+        echo $select;
     }
 
     /**
@@ -2093,7 +2098,7 @@ class story extends control
             $result['info'] = $this->lang->noResultsMatch;
         }
 
-        die(json_encode($result));
+        echo json_encode($result);
     }
 
     /**
@@ -2476,8 +2481,8 @@ class story extends control
         $user    = $this->loadModel('user')->getById($userID, 'id');
         $stories = $this->story->getUserStoryPairs($user->account);
 
-        if($id) die(html::select("stories[$id]", $stories, '', 'class="form-control"'));
-        die(html::select('story', $stories, '', 'class=form-control'));
+        if($id) return print(html::select("stories[$id]", $stories, '', 'class="form-control"'));
+        echo html::select('story', $stories, '', 'class=form-control');
     }
 
     /**
@@ -2513,6 +2518,6 @@ class story extends control
             $status   = $oldStory->status;
             if($params['result'] == 'revert') $status = 'active';
         }
-        die($status);
+        echo $status;
     }
 }
diff --git a/module/story/model.php b/module/story/model.php
index 8f34c62857..3cbdb10482 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -487,7 +487,7 @@ class storyModel extends model
 
                 $story->{$extendField->field} = htmlSpecialString($story->{$extendField->field});
                 $message = $this->checkFlowRule($extendField, $story->{$extendField->field});
-                if($message) die(js::alert($message));
+                if($message) return print(js::alert($message));
             }
 
             foreach(explode(',', $this->config->story->create->requiredFields) as $field)
@@ -514,7 +514,7 @@ class storyModel extends model
             if(dao::isError())
             {
                 echo js::error(dao::getError());
-                die(js::reload('parent'));
+                return print(js::reload('parent'));
             }
 
             $storyID = $this->dao->lastInsertID();
@@ -1206,7 +1206,7 @@ class storyModel extends model
 
                     $story->{$extendField->field} = htmlSpecialString($story->{$extendField->field});
                     $message = $this->checkFlowRule($extendField, $story->{$extendField->field});
-                    if($message) die(js::alert($message));
+                    if($message) return print(js::alert($message));
                 }
 
                 $stories[$storyID] = $story;
@@ -1246,7 +1246,7 @@ class storyModel extends model
                 }
                 else
                 {
-                    die(js::error('story#' . $storyID . dao::getError(true)));
+                    return print(js::error('story#' . $storyID . dao::getError(true)));
                 }
             }
         }
@@ -1263,8 +1263,8 @@ class storyModel extends model
      */
     public function review($storyID)
     {
-        if($this->post->result == false)   die(js::alert($this->lang->story->mustChooseResult));
-        if($this->post->result == 'revert' and $this->post->preVersion == false) die(js::alert($this->lang->story->mustChoosePreVersion));
+        if($this->post->result == false)   return print(js::alert($this->lang->story->mustChooseResult));
+        if($this->post->result == 'revert' and $this->post->preVersion == false) return print(js::alert($this->lang->story->mustChoosePreVersion));
 
         if(strpos($this->config->story->review->requiredFields, 'comment') !== false and !$this->post->comment)
         {
@@ -1457,11 +1457,11 @@ class storyModel extends model
                 $this->dao->insert(TABLE_RELATION)->data($data)->autoCheck()->exec();
             }
 
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             $isonlybody = isonlybody();
             unset($_GET['onlybody']);
-            die(js::locate(helper::createLink('product', 'browse', "productID=$oldStory->product&branch=0&browseType=unclosed&queryID=0&type=story"), $isonlybody ? 'parent.parent' : 'parent'));
+            return print(js::locate(helper::createLink('product', 'browse', "productID=$oldStory->product&branch=0&browseType=unclosed&queryID=0&type=story"), $isonlybody ? 'parent.parent' : 'parent'));
         }
         else
         {
@@ -1591,7 +1591,7 @@ class storyModel extends model
             }
             else
             {
-                die(js::error('story#' . $storyID . dao::getError(true)));
+                return print(js::error('story#' . $storyID . dao::getError(true)));
             }
             if(!dao::isError()) $this->loadModel('score')->create('story', 'close', $storyID);
         }
diff --git a/module/svn/control.php b/module/svn/control.php
index 2ffa0bab50..d33d5a9531 100644
--- a/module/svn/control.php
+++ b/module/svn/control.php
@@ -144,7 +144,7 @@ class svn extends control
         $files    = $this->post->files;
 
         /* Ignore git. */
-        if(strpos($repoUrl, '://') === false) die();
+        if(strpos($repoUrl, '://') === false) return;
 
         $parsedFiles = array();
         $repoDirs    = explode('/', trim($repoUrl, '/'));
@@ -182,7 +182,6 @@ class svn extends control
             $log->files    = $parsedFiles;
             $this->repo->saveAction2PMS($objects, $log, $repoUrl);
         }
-        die();
     }
 
     /**
@@ -194,6 +193,6 @@ class svn extends control
     public function ajaxGetRepos()
     {
         $repos = $this->svn->getRepos();
-        die(json_encode($repos));
+        echo json_encode($repos);
     }
 }
diff --git a/module/task/control.php b/module/task/control.php
index e02ea9544d..f1bb5cdfcc 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -53,7 +53,7 @@ class task extends control
         if(strpos(",{$limitedExecutions},", ",$executionID,") !== false)
         {
             echo js::alert($this->lang->task->createDenied);
-            die(js::locate($this->createLink('execution', 'task', "executionID=$executionID")));
+            return print(js::locate($this->createLink('execution', 'task', "executionID=$executionID")));
         }
 
         $task = new stdClass();
@@ -284,7 +284,7 @@ class task extends control
         if(strpos(",{$limitedExecutions},", ",$executionID,") !== false)
         {
             echo js::alert($this->lang->task->createDenied);
-            die(js::locate($this->createLink('execution', 'task', "executionID=$executionID")));
+            return print(js::locate($this->createLink('execution', 'task', "executionID=$executionID")));
         }
 
         $execution = $this->execution->getById($executionID);
@@ -449,7 +449,7 @@ class task extends control
                     {
                         $confirmURL = $this->createLink('bug', 'view', "id=$task->fromBug");
                         $cancelURL  = $this->server->HTTP_REFERER;
-                        die(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent'));
+                        return print(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent'));
                     }
                 }
             }
@@ -476,7 +476,7 @@ class task extends control
             }
             else
             {
-                die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
+                return print(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
             }
         }
 
@@ -525,7 +525,7 @@ class task extends control
         if($this->post->names)
         {
             $allChanges = $this->task->batchUpdate();
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if(!empty($allChanges))
             {
@@ -560,7 +560,7 @@ class task extends control
                             {
                                 $confirmURL = $this->createLink('bug', 'view', "id=$task->fromBug");
                                 $cancelURL  = $this->server->HTTP_REFERER;
-                                die(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent'));
+                                return print(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent'));
                             }
                         }
                     }
@@ -568,10 +568,10 @@ class task extends control
                 }
             }
             $this->loadModel('score')->create('ajax', 'batchOther');
-            die(js::locate($this->session->taskList, 'parent'));
+            return print(js::locate($this->session->taskList, 'parent'));
         }
 
-        $taskIDList = $this->post->taskIDList ? $this->post->taskIDList : die(js::locate($this->session->taskList, 'parent'));
+        $taskIDList = $this->post->taskIDList ? $this->post->taskIDList : return print(js::locate($this->session->taskList, 'parent'));
         $taskIDList = array_unique($taskIDList);
 
         /* The tasks of execution. */
@@ -658,7 +658,7 @@ class task extends control
             if(dao::isError())
             {
                 if($this->viewType == 'json' or (defined('RUN_MODE') && RUN_MODE == 'api')) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
-                die(js::error(dao::getError()));
+                return print(js::error(dao::getError()));
             }
 
             $actionID = $this->action->create('task', $taskID, 'Assigned', $this->post->comment, $this->post->assignedTo);
@@ -722,7 +722,7 @@ class task extends control
             $taskIDList = array_unique($taskIDList);
             unset($_POST['taskIDList']);
             $allChanges = $this->task->batchChangeModule($taskIDList, $moduleID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
             foreach($allChanges as $taskID => $changes)
             {
                 $this->loadModel('action');
@@ -731,7 +731,7 @@ class task extends control
             }
             if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
         }
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -749,7 +749,7 @@ class task extends control
             $taskIDList = $this->post->taskIDList;
             $taskIDList = array_unique($taskIDList);
             unset($_POST['taskIDList']);
-            if(!is_array($taskIDList)) die(js::locate($this->createLink('execution', 'task', "executionID=$execution"), 'parent'));
+            if(!is_array($taskIDList)) return print(js::locate($this->createLink('execution', 'task', "executionID=$execution"), 'parent'));
             $taskIDList = array_unique($taskIDList);
 
             $muletipleTasks = $this->dao->select('root , account')->from(TABLE_TEAM)->where('type')->eq('task')->andWhere('root')->in($taskIDList)->fetchGroup('root', 'account');
@@ -761,12 +761,12 @@ class task extends control
                 if(isset($muletipleTasks[$taskID]) and !isset($muletipleTasks[$taskID][$this->post->assignedTo])) continue;
 
                 $changes = $this->task->assign($taskID);
-                if(dao::isError()) die(js::error(dao::getError()));
+                if(dao::isError()) return print(js::error(dao::getError()));
                 $actionID = $this->action->create('task', $taskID, 'Assigned', $this->post->comment, $this->post->assignedTo);
                 $this->action->logHistory($actionID, $changes);
             }
             if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -788,7 +788,7 @@ class task extends control
         if(!$task)
         {
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'code' => 404, 'message' => '404 Not found'));
-            die(js::error($this->lang->notFound) . js::locate($this->createLink('execution', 'all')));
+            return print(js::error($this->lang->notFound) . js::locate($this->createLink('execution', 'all')));
         }
 
         $this->session->project = $task->project;
@@ -856,7 +856,7 @@ class task extends control
 
         $this->executeHooks($taskID);
 
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -884,7 +884,7 @@ class task extends control
             if(dao::isError())
             {
                 if($this->viewType == 'json' or (defined('RUN_MODE') && RUN_MODE == 'api')) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
-                die(js::error(dao::getError()));
+                return print(js::error(dao::getError()));
             }
 
             if($this->post->comment != '' or !empty($changes))
@@ -907,7 +907,7 @@ class task extends control
                         $confirmURL = $this->createLink('bug', 'view', "id=$task->fromBug");
                         unset($_GET['onlybody']);
                         $cancelURL  = $this->createLink('task', 'view', "taskID=$taskID");
-                        die(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
+                        return print(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
                     }
                 }
             }
@@ -930,7 +930,7 @@ class task extends control
                     return print(js::closeModal('parent.parent', 'this', "function(){parent.parent.location.reload();}"));
                 }
             }
-            die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
+            return print(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
         }
 
         $this->view->title      = $this->view->execution->name . $this->lang->colon .$this->lang->task->start;
@@ -956,7 +956,7 @@ class task extends control
         if(!empty($_POST))
         {
             $changes = $this->task->recordEstimate($taskID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             $this->loadModel('common')->syncPPEStatus($taskID);
 
@@ -971,7 +971,7 @@ class task extends control
                         $confirmURL = $this->createLink('bug', 'view', "id=$task->fromBug");
                         unset($_GET['onlybody']);
                         $cancelURL  = $this->createLink('task', 'view', "taskID=$taskID");
-                        die(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
+                        return print(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
                     }
                 }
             }
@@ -1016,13 +1016,13 @@ class task extends control
         if(!empty($_POST))
         {
             $changes = $this->task->updateEstimate($estimateID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             $actionID = $this->loadModel('action')->create('task', $estimate->task, 'EditEstimate', $this->post->work);
             $this->action->logHistory($actionID, $changes);
 
             $url = $this->session->estimateList ? $this->session->estimateList : inlink('record', "taskID={$estimate->task}");
-            die(js::locate($url, 'parent'));
+            return print(js::locate($url, 'parent'));
         }
 
         $estimate = $this->task->getEstimateById($estimateID);
@@ -1045,17 +1045,17 @@ class task extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->task->confirmDeleteEstimate, $this->createLink('task', 'deleteEstimate', "estimateID=$estimateID&confirm=yes")));
+            return print(js::confirm($this->lang->task->confirmDeleteEstimate, $this->createLink('task', 'deleteEstimate', "estimateID=$estimateID&confirm=yes")));
         }
         else
         {
             $estimate = $this->task->getEstimateById($estimateID);
             $changes  = $this->task->deleteEstimate($estimateID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             $actionID = $this->loadModel('action')->create('task', $estimate->task, 'DeleteEstimate');
             $this->action->logHistory($actionID, $changes);
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -1081,7 +1081,7 @@ class task extends control
             if(dao::isError())
             {
                 if($this->viewType == 'json' or (defined('RUN_MODE') && RUN_MODE == 'api')) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
-                die(js::error(dao::getError()));
+                return print(js::error(dao::getError()));
             }
             $files = $this->loadModel('file')->saveUpload('task', $taskID);
 
@@ -1104,7 +1104,7 @@ class task extends control
                         $confirmURL = $this->createLink('bug', 'view', "id=$task->fromBug", '', true);
                         unset($_GET['onlybody']);
                         $cancelURL  = $this->createLink('task', 'view', "taskID=$taskID");
-                        die(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
+                        return print(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
                     }
                 }
             }
@@ -1133,7 +1133,7 @@ class task extends control
             }
             else
             {
-                die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
+                return print(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
             }
         }
 
@@ -1186,7 +1186,7 @@ class task extends control
         {
             $this->loadModel('action');
             $changes = $this->task->pause($taskID, $extra);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -1241,7 +1241,7 @@ class task extends control
         {
             $this->loadModel('action');
             $changes = $this->task->start($taskID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -1300,7 +1300,7 @@ class task extends control
             $this->loadModel('action');
             $changes = $this->task->close($taskID, $extra);
 
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -1334,7 +1334,7 @@ class task extends control
             }
             else
             {
-                die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
+                return print(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
             }
         }
 
@@ -1377,7 +1377,7 @@ class task extends control
             }
         }
 
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -1425,11 +1425,12 @@ class task extends control
                 $skipTasks = join(',', $skipTasks);
                 $confirmURL = $this->createLink('task', 'batchClose', "skipTaskIdList=$skipTasks");
                 $cancelURL  = $this->server->HTTP_REFERER;
-                die(js::confirm(sprintf($this->lang->task->error->skipClose, $skipTasks), $confirmURL, $cancelURL, 'self', 'parent'));
+                return print(js::confirm(sprintf($this->lang->task->error->skipClose, $skipTasks), $confirmURL, $cancelURL, 'self', 'parent'));
             }
             if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
         }
-        die(js::reload('parent'));
+
+        echo js::reload('parent');
     }
 
     /**
@@ -1451,7 +1452,7 @@ class task extends control
         {
             $this->loadModel('action');
             $changes = $this->task->cancel($taskID, $extra);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -1478,7 +1479,7 @@ class task extends control
                     return print(js::closeModal('parent.parent', 'this'));
                 }
             }
-            die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
+            return print(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
         }
 
         $this->view->title      = $this->view->execution->name . $this->lang->colon .$this->lang->task->cancel;
@@ -1507,7 +1508,7 @@ class task extends control
         {
             $this->loadModel('action');
             $changes = $this->task->activate($taskID, $extra);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -1609,8 +1610,8 @@ class task extends control
             if(isset($suspendedTasks[$taskid])) unset($tasks[$taskid]);
         }
 
-        if($id) die(html::select("tasks[$id]", $tasks, '', 'class="form-control"'));
-        die(html::select('task', $tasks, '', 'class=form-control'));
+        if($id) return print(html::select("tasks[$id]", $tasks, '', 'class="form-control"'));
+        echo html::select('task', $tasks, '', 'class=form-control');
     }
 
     /**
@@ -1624,7 +1625,7 @@ class task extends control
     public function ajaxGetExecutionTasks($executionID, $taskID = 0)
     {
         $tasks = $this->task->getExecutionTaskPairs((int)$executionID);
-        die(html::select('task', empty($tasks) ? array('' => '') : $tasks, $taskID, "class='form-control'"));
+        echo html::select('task', empty($tasks) ? array('' => '') : $tasks, $taskID, "class='form-control'");
     }
 
     /**
@@ -1965,6 +1966,6 @@ class task extends control
             $stage = $this->dao->select('*')->from(TABLE_STORY)->where('id')->eq($task->story)->andWhere('version')->eq($task->storyVersion)->fetch('stage');
             $task->storyStage = zget($this->lang->story->stageList, $stage);
         }
-        die(json_encode($task));
+        echo json_encode($task);
     }
 }
diff --git a/module/task/model.php b/module/task/model.php
index 4482e1639f..cb7a802615 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -866,7 +866,7 @@ class taskModel extends model
         {
             $taskConsumed = 0;
             $taskConsumed = $this->dao->select('consumed')->from(TABLE_TASK)->where('id')->eq($this->post->parent)->andWhere('parent')->eq(0)->fetch('consumed');
-            if($taskConsumed > 0) die(js::error($this->lang->task->error->alreadyConsumed));
+            if($taskConsumed > 0) return print(js::error($this->lang->task->error->alreadyConsumed));
         }
 
         $now  = helper::now();
@@ -915,7 +915,7 @@ class taskModel extends model
             ->remove('comment,files,labels,uid,multiple,team,teamEstimate,teamConsumed,teamLeft,contactListMenu')
             ->get();
 
-        if($task->consumed < $oldTask->consumed) die(js::error($this->lang->task->error->consumedSmall));
+        if($task->consumed < $oldTask->consumed) return print(js::error($this->lang->task->error->consumedSmall));
 
         /* Fix bug#1388, Check children task executionID and moduleID. */
         if(isset($task->execution) and $task->execution != $oldTask->execution)
@@ -1166,7 +1166,7 @@ class taskModel extends model
 
                 $task->{$extendField->field} = htmlSpecialString($task->{$extendField->field});
                 $message = $this->checkFlowRule($extendField, $task->{$extendField->field});
-                if($message) die(js::alert($message));
+                if($message) return print(js::alert($message));
             }
 
             if($data->consumeds[$taskID])
@@ -1245,9 +1245,9 @@ class taskModel extends model
         /* Check field not empty. */
         foreach($tasks as $taskID => $task)
         {
-            if($task->status == 'done' and $task->consumed == false) die(js::error('task#' . $taskID . sprintf($this->lang->error->notempty, $this->lang->task->consumedThisTime)));
+            if($task->status == 'done' and $task->consumed == false) return print(js::error('task#' . $taskID . sprintf($this->lang->error->notempty, $this->lang->task->consumedThisTime)));
             if($task->status == 'cancel') continue;
-            if(!empty($task->deadline) and $task->estStarted > $task->deadline) die(js::error('task#' . $taskID . $this->lang->task->error->deadlineSmall));
+            if(!empty($task->deadline) and $task->estStarted > $task->deadline) return print(js::error('task#' . $taskID . $this->lang->task->error->deadlineSmall));
             foreach(explode(',', $this->config->task->edit->requiredFields) as $field)
             {
                 $field = trim($field);
@@ -1315,7 +1315,7 @@ class taskModel extends model
             }
             else
             {
-                die(js::error('task#' . $taskID . dao::getError(true)));
+                return print(js::error('task#' . $taskID . dao::getError(true)));
             }
         }
         if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchEdit');
@@ -1533,8 +1533,8 @@ class taskModel extends model
 
             if(!empty($record->work[$id]) or !empty($record->consumed[$id]))
             {
-                if(!$record->consumed[$id])   die(js::alert($this->lang->task->error->consumedThisTime));
-                if($record->left[$id] === '') die(js::alert($this->lang->task->error->left));
+                if(!$record->consumed[$id])   return print(js::alert($this->lang->task->error->consumedThisTime));
+                if($record->left[$id] === '') return print(js::alert($this->lang->task->error->left));
 
                 $estimates[$id] = new stdclass();
                 $estimates[$id]->date     = $record->dates[$id];
diff --git a/module/testcase/control.php b/module/testcase/control.php
index a8607dfbc3..5ee331738e 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -61,7 +61,7 @@ class testcase extends control
             {
                 $products = $this->product->getPairs();
             }
-            if(empty($products) and !helper::isAjaxRequest()) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName=$tab&activeMenu=testcase&objectID=$objectID")));
+            if(empty($products) and !helper::isAjaxRequest()) return print($this->locate($this->createLink('product', 'showErrorNone', "moduleName=$tab&activeMenu=testcase&objectID=$objectID")));
         }
         else
         {
@@ -537,7 +537,7 @@ class testcase extends control
             $currentModule = $this->app->tab == 'project' ? 'project'  : 'testcase';
             $currentMethod = $this->app->tab == 'project' ? 'testcase' : 'browse';
             $projectParam  = $this->app->tab == 'project' ? "projectID={$this->session->project}&" : '';
-            die(js::locate($this->createLink($currentModule, $currentMethod, $projectParam . "productID=$productID&branch=$branch&browseType=all&param=0&orderBy=id_desc"), 'parent'));
+            return print(js::locate($this->createLink($currentModule, $currentMethod, $projectParam . "productID=$productID&branch=$branch&browseType=all&param=0&orderBy=id_desc"), 'parent'));
         }
         if(empty($this->products)) $this->locate($this->createLink('product', 'create'));
 
@@ -649,7 +649,7 @@ class testcase extends control
             $results = $this->testtask->getResults(0, $caseID);
         }
 
-        if(!$case) die(js::error($this->lang->notFound) . js::locate('back', 'parent'));
+        if(!$case) return print(js::error($this->lang->notFound) . js::locate('back', 'parent'));
 
         $this->view->title   = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->createBug;
         $this->view->runID   = $runID;
@@ -677,7 +677,7 @@ class testcase extends control
         if(!$case)
         {
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'message' => '404 Not found'));
-            die(js::error($this->lang->notFound) . js::locate($this->createLink('qa', 'index')));
+            return print(js::error($this->lang->notFound) . js::locate($this->createLink('qa', 'index')));
         }
         if($case->auto == 'unit')
         {
@@ -783,7 +783,7 @@ class testcase extends control
             if($comment == false)
             {
                 $changes = $this->testcase->update($caseID);
-                if(dao::isError()) die(js::error(dao::getError()));
+                if(dao::isError()) return print(js::error(dao::getError()));
                 $files = $this->loadModel('file')->saveUpload('testcase', $caseID);
             }
             if($this->post->comment != '' or !empty($changes) or !empty($files))
@@ -804,12 +804,12 @@ class testcase extends control
             }
             else
             {
-                die(js::locate($this->createLink('testcase', 'view', "caseID=$caseID"), 'parent'));
+                return print(js::locate($this->createLink('testcase', 'view', "caseID=$caseID"), 'parent'));
             }
         }
 
         $case = $this->testcase->getById($caseID);
-        if(!$case) die(js::error($this->lang->notFound) . js::locate('back'));
+        if(!$case) return print(js::error($this->lang->notFound) . js::locate('back'));
         if($case->auto == 'unit')
         {
             $this->lang->testcase->subMenu->testcase->feature['alias']  = '';
@@ -935,11 +935,11 @@ class testcase extends control
                 }
             }
 
-            die(js::locate($this->session->caseList, 'parent'));
+            return print(js::locate($this->session->caseList, 'parent'));
         }
 
-        $caseIDList = $this->post->caseIDList ? $this->post->caseIDList : die(js::locate($this->session->caseList));
-        $caseIDList = array_unique($caseIDList);
+        if(!$this->post->caseIDList) return print(js::locate($this->session->caseList));
+        $caseIDList    = array_unique($this->post->caseIDList);
         $branchProduct = false;
 
         if($this->app->tab == 'project')   $this->loadModel('project')->setMenu($this->session->project);
@@ -1085,7 +1085,7 @@ class testcase extends control
         if($_POST)
         {
             $changes = $this->testcase->review($caseID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($changes or $this->post->comment != '')
             {
@@ -1096,7 +1096,7 @@ class testcase extends control
 
             $this->executeHooks($caseID);
 
-            die(js::reload('parent.parent'));
+            return print(js::reload('parent.parent'));
         }
 
         $this->view->users   = $this->user->getPairs('noletter|noclosed|nodeleted');
@@ -1114,12 +1114,12 @@ class testcase extends control
      */
     public function batchReview($result)
     {
-        $caseIdList = $this->post->caseIDList ? $this->post->caseIDList : die(js::locate($this->session->caseList, 'parent'));
-        $caseIdList = array_unique($caseIdList);
+        if(!$this->post->caseIDList) return print(js::locate($this->session->caseList, 'parent'));
+        $caseIdList = array_unique($this->post->caseIDList);
         $actions    = $this->testcase->batchReview($caseIdList, $result);
 
-        if(dao::isError()) die(js::error(dao::getError()));
-        die(js::locate($this->session->caseList, 'parent'));
+        if(dao::isError()) return print(js::error(dao::getError()));
+        echo js::locate($this->session->caseList, 'parent');
     }
 
     /**
@@ -1134,7 +1134,7 @@ class testcase extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->testcase->confirmDelete, inlink('delete', "caseID=$caseID&confirm=yes")));
+            return print(js::confirm($this->lang->testcase->confirmDelete, inlink('delete', "caseID=$caseID&confirm=yes")));
         }
         else
         {
@@ -1161,7 +1161,7 @@ class testcase extends control
 
             $locateLink = $this->session->caseList ? $this->session->caseList : inlink('browse', "productID={$case->product}");
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'success'));
-            die(js::locate($locateLink, 'parent'));
+            return print(js::locate($locateLink, 'parent'));
         }
     }
 
@@ -1174,11 +1174,11 @@ class testcase extends control
      */
     public function batchDelete($productID = 0)
     {
-        $caseIDList = $this->post->caseIDList ? $this->post->caseIDList : die(js::locate($this->session->caseList));
-        $caseIDList = array_unique($caseIDList);
+        if(!$this->post->caseIDList) return print(js::locate($this->session->caseList));
+        $caseIDList = array_unique($this->post->caseIDList);
 
         foreach($caseIDList as $caseID) $this->testcase->delete(TABLE_CASE, $caseID);
-        die(js::locate($this->session->caseList));
+        echo js::locate($this->session->caseList);
     }
 
     /**
@@ -1196,7 +1196,7 @@ class testcase extends control
             $caseIDList = array_unique($caseIDList);
             unset($_POST['caseIDList']);
             $allChanges = $this->testcase->batchChangeBranch($caseIDList, $branchID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
             foreach($allChanges as $caseID => $changes)
             {
                 $this->loadModel('action');
@@ -1205,7 +1205,7 @@ class testcase extends control
             }
         }
 
-        die(js::locate($this->session->caseList, 'parent'));
+        echo js::locate($this->session->caseList, 'parent');
     }
 
     /**
@@ -1223,7 +1223,7 @@ class testcase extends control
             $caseIDList = array_unique($caseIDList);
             unset($_POST['caseIDList']);
             $allChanges = $this->testcase->batchChangeModule($caseIDList, $moduleID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
             foreach($allChanges as $caseID => $changes)
             {
                 $this->loadModel('action');
@@ -1232,7 +1232,7 @@ class testcase extends control
             }
         }
 
-        die(js::locate($this->session->caseList, 'parent'));
+        echo js::locate($this->session->caseList, 'parent');
     }
 
     /**
@@ -1244,12 +1244,12 @@ class testcase extends control
      */
     public function batchCaseTypeChange($result)
     {
-        $caseIdList = $this->post->caseIDList ? $this->post->caseIDList : die(js::locate($this->session->caseList, 'parent'));
+        $caseIdList = $this->post->caseIDList ? $this->post->caseIDList : return print(js::locate($this->session->caseList, 'parent'));
         $caseIDList = array_unique($caseIDList);
         $this->testcase->batchCaseTypeChange($caseIdList, $result);
 
-        if(dao::isError()) die(js::error(dao::getError()));
-        die(js::locate($this->session->caseList, 'parent'));
+        if(dao::isError()) return print(js::error(dao::getError()));
+        echo js::locate($this->session->caseList, 'parent');
     }
 
     /**
@@ -1305,8 +1305,8 @@ class testcase extends control
     {
         $case = $this->testcase->getById($caseID);
         $this->dao->update(TABLE_TESTRUN)->set('version')->eq($case->version)->where('`case`')->eq($caseID)->exec();
-        if($from == 'view') die(js::locate(inlink('view', "caseID=$caseID&version=$case->version&from=testtask&taskID=$taskID"), 'parent'));
-        die(js::reload('parent'));
+        if($from == 'view') return print(js::locate(inlink('view', "caseID=$caseID&version=$case->version&from=testtask&taskID=$taskID"), 'parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -1331,7 +1331,7 @@ class testcase extends control
             $step->version = $version;
             $this->dao->insert(TABLE_CASESTEP)->data($step)->exec();
         }
-        die(js::locate($this->createLink('testcase', 'view', "caseID=$caseID&version=$version"), 'parent'));
+        echo js::locate($this->createLink('testcase', 'view', "caseID=$caseID&version=$version"), 'parent');
     }
 
     /**
@@ -1343,9 +1343,9 @@ class testcase extends control
      */
     public function ignoreLibcaseChange($caseID)
     {
-        $case    = $this->testcase->getById($caseID);
+        $case = $this->testcase->getById($caseID);
         $this->dao->update(TABLE_CASE)->set('fromCaseVersion')->eq($case->version)->where('id')->eq($caseID)->exec();
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -1360,7 +1360,7 @@ class testcase extends control
         $case = $this->testcase->getById($caseID);
         $this->dao->update(TABLE_CASE)->set('storyVersion')->eq($case->latestStoryVersion)->where('id')->eq($caseID)->exec();
         $this->loadModel('action')->create('case', $caseID, 'confirmed', '', $case->latestStoryVersion);
-        if($reload) die(js::reload('parent'));
+        if($reload) return print(js::reload('parent'));
     }
 
     /**
@@ -1372,11 +1372,11 @@ class testcase extends control
      */
     public function batchConfirmStoryChange($productID = 0)
     {
-        $caseIDList = $this->post->caseIDList ? $this->post->caseIDList : die(js::locate($this->session->caseList));
-        $caseIDList = array_unique($caseIDList);
+        if(!$this->post->caseIDList) return print(js::locate($this->session->caseList));
+        $caseIDList = array_unique($this->post->caseIDList);
 
         foreach($caseIDList as $caseID) $this->confirmStoryChange($caseID,false);
-        die(js::locate($this->session->caseList));
+        echo js::locate($this->session->caseList);
     }
 
     /**
@@ -1741,13 +1741,14 @@ class testcase extends control
                     if(!isset($fields[$title])) continue;
                     $columnKey[] = $fields[$title];
                 }
-                if(count($columnKey) == 0) die(js::alert($this->lang->testcase->errorEncode));
+                if(count($columnKey) == 0) return print(js::alert($this->lang->testcase->errorEncode));
             }
 
             $this->session->set('fileImport', $fileName);
 
-            die(js::locate(inlink('showImport', "productID=$productID&branch=$branch"), 'parent.parent'));
+            return print(js::locate(inlink('showImport', "productID=$productID&branch=$branch"), 'parent.parent'));
         }
+
         $this->display();
     }
 
@@ -1777,7 +1778,7 @@ class testcase extends control
         if($_POST)
         {
             $this->testcase->importFromLib($productID);
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
 
         $this->app->tab == 'project' ? $this->loadModel('project')->setMenu($this->session->project) : $this->testcase->setMenu($this->products, $productID, $branch);
@@ -1786,7 +1787,7 @@ class testcase extends control
         if(empty($libraries))
         {
             echo js::alert($this->lang->testcase->noLibrary);
-            die(js::locate($this->session->caseList));
+            return print(js::locate($this->session->caseList));
         }
         if(empty($libID) or !isset($libraries[$libID])) $libID = key($libraries);
 
@@ -1854,16 +1855,16 @@ class testcase extends control
 
                 if($this->app->tab == 'project')
                 {
-                    die(js::locate($this->createLink('project', 'testcase', "projectID={$this->session->project}&productID=$productID"), 'parent'));
+                    return print(js::locate($this->createLink('project', 'testcase', "projectID={$this->session->project}&productID=$productID"), 'parent'));
                 }
                 else
                 {
-                    die(js::locate(inlink('browse', "productID=$productID"), 'parent'));
+                    return print(js::locate(inlink('browse', "productID=$productID"), 'parent'));
                 }
             }
             else
             {
-                die(js::locate(inlink('showImport', "productID=$productID&branch=$branch&pagerID=" . ($this->post->pagerID + 1) . "&maxImport=$maxImport&insert=" . zget($_POST, 'insert', '')), 'parent'));
+                return print(js::locate(inlink('showImport', "productID=$productID&branch=$branch&pagerID=" . ($this->post->pagerID + 1) . "&maxImport=$maxImport&insert=" . zget($_POST, 'insert', '')), 'parent'));
             }
         }
 
@@ -2030,7 +2031,7 @@ class testcase extends control
         if(empty($caseData))
         {
             echo js::alert($this->lang->error->noData);
-            die(js::locate($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch")));
+            return print(js::locate($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch")));
         }
 
         $allCount = count($caseData);
@@ -2043,13 +2044,13 @@ class testcase extends control
                 $this->view->maxImport = $maxImport;
                 $this->view->productID = $productID;
                 $this->view->branch    = $branch;
-                die($this->display());
+                return print($this->display());
             }
 
             $allPager = ceil($allCount / $maxImport);
             $caseData = array_slice($caseData, ($pagerID - 1) * $maxImport, $maxImport, true);
         }
-        if(empty($caseData)) die(js::locate(inlink('browse', "productID=$productID&branch=$branch")));
+        if(empty($caseData)) return print(js::locate(inlink('browse', "productID=$productID&branch=$branch")));
 
         /* Judge whether the editedCases is too large and set session. */
         $countInputVars  = count($caseData) * 12 + (isset($stepVars) ? $stepVars : 0);
@@ -2105,7 +2106,7 @@ class testcase extends control
     {
         $story = $this->dao->select('module')->from(TABLE_STORY)->where('id')->eq($storyID)->fetch();
         $moduleID = !empty($story) ? $story->module : 0;
-        die(json_encode(array('moduleID'=> $moduleID)));
+        echo json_encode(array('moduleID'=> $moduleID));
     }
 
     /**
@@ -2121,7 +2122,7 @@ class testcase extends control
         $case   = $this->testcase->getByID($caseID);
         $status = $this->testcase->getStatus($methodName, $case);
         if($methodName == 'update') $status = zget($status, 1, '');
-        die($status);
+        echo $status;
     }
 
     /**
diff --git a/module/testcase/model.php b/module/testcase/model.php
index d5d701742e..365372313a 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -115,7 +115,7 @@ class testcaseModel extends model
 
         foreach($cases->title as $i => $title)
         {
-            if(!empty($cases->title[$i]) and empty($cases->type[$i])) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->testcase->type)));
+            if(!empty($cases->title[$i]) and empty($cases->type[$i])) return print(js::alert(sprintf($this->lang->error->notempty, $this->lang->testcase->type)));
         }
 
         $module = 0;
@@ -176,13 +176,13 @@ class testcaseModel extends model
 
                 $data[$i]->{$extendField->field} = htmlSpecialString($data[$i]->{$extendField->field});
                 $message = $this->checkFlowRule($extendField, $data[$i]->{$extendField->field});
-                if($message) die(js::alert($message));
+                if($message) return print(js::alert($message));
             }
 
             foreach(explode(',', $this->config->testcase->create->requiredFields) as $field)
             {
                 $field = trim($field);
-                if($field and empty($data[$i]->$field)) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->testcase->$field)));
+                if($field and empty($data[$i]->$field)) return print(js::alert(sprintf($this->lang->error->notempty, $this->lang->testcase->$field)));
             }
         }
 
@@ -197,7 +197,7 @@ class testcaseModel extends model
             if(dao::isError())
             {
                 echo js::error(dao::getError());
-                die(js::reload('parent'));
+                return print(js::reload('parent'));
             }
 
             $caseID       = $this->dao->lastInsertID();
@@ -793,7 +793,7 @@ class testcaseModel extends model
      */
     public function review($caseID)
     {
-        if($this->post->result == false) die(js::alert($this->lang->testcase->mustChooseResult));
+        if($this->post->result == false) return print(js::alert($this->lang->testcase->mustChooseResult));
 
         $oldCase = $this->getById($caseID);
 
@@ -932,7 +932,7 @@ class testcaseModel extends model
 
                 $case->{$extendField->field} = htmlSpecialString($case->{$extendField->field});
                 $message = $this->checkFlowRule($extendField, $case->{$extendField->field});
-                if($message) die(js::alert($message));
+                if($message) return print(js::alert($message));
             }
 
             $cases[$caseID] = $case;
@@ -964,7 +964,7 @@ class testcaseModel extends model
             }
             else
             {
-                die(js::error('case#' . $caseID . dao::getError(true)));
+                return print(js::error('case#' . $caseID . dao::getError(true)));
             }
         }
 
@@ -1199,7 +1199,7 @@ class testcaseModel extends model
             $cases[$key] = $caseData;
             $line++;
         }
-        if(dao::isError()) die(js::error(dao::getError()));
+        if(dao::isError()) return print(js::error(dao::getError()));
 
         $forceNotReview = $this->forceNotReview();
         foreach($cases as $key => $caseData)
@@ -1562,7 +1562,7 @@ class testcaseModel extends model
                 else
                 {
                     $showBranch = isset($this->config->testcase->browse->showBranch) ? $this->config->testcase->browse->showBranch : 1;
-                } 
+                }
                 if(isset($branches[$case->branch]) and $showBranch) echo "<span class='label label-outline label-badge'>{$branches[$case->branch]}</span> ";
                 if($modulePairs and $case->module and isset($modulePairs[$case->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$case->module]}</span> ";
                 echo $canView ? ($fromCaseID ? html::a($caseLink, $case->title, null, "style='color: $case->color' data-app='{$this->app->tab}'") . html::a(helper::createLink('testcase', 'view', "caseID=$fromCaseID"), "[<i class='icon icon-share' title='{$this->lang->testcase->fromCase}'></i>#$fromCaseID]", '', "data-app='{$this->app->tab}'") : html::a($caseLink, $case->title, null, "style='color: $case->color' data-app='{$this->app->tab}'")) : "<span style='color: $case->color'>$case->title</span>";
diff --git a/module/testreport/control.php b/module/testreport/control.php
index ca1c40d2e4..57e7b88168 100644
--- a/module/testreport/control.php
+++ b/module/testreport/control.php
@@ -64,7 +64,7 @@ class testreport extends control
             {
                 $products = $this->product->getPairs();
             }
-            if(empty($products) and !helper::isAjaxRequest()) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName=$tab&activeMenu=testreport&objectID=$objectID")));
+            if(empty($products) and !helper::isAjaxRequest()) return print($this->locate($this->createLink('product', 'showErrorNone', "moduleName=$tab&activeMenu=testreport&objectID=$objectID")));
         }
         else
         {
@@ -88,7 +88,7 @@ class testreport extends control
      */
     public function browse($objectID = 0, $objectType = 'product', $extra = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        if(strpos('product|execution|project', $objectType) === false) die('Type Error!');
+        if(strpos('product|execution|project', $objectType) === false) return print('Type Error!');
 
         $objectID = $this->commonAction($objectID, $objectType);
         $object   = $this->$objectType->getById($objectID);
@@ -171,10 +171,10 @@ class testreport extends control
         if($_POST)
         {
             $reportID = $this->testreport->create();
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
             $this->loadModel('action')->create('testreport', $reportID, 'Opened');
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $reportID));
-            die(js::locate(inlink('view', "reportID=$reportID"), 'parent'));
+            return print(js::locate(inlink('view', "reportID=$reportID"), 'parent'));
         }
 
         if($objectType == 'testtask')
@@ -195,7 +195,7 @@ class testreport extends control
                 if($testTask->build == 'trunk') continue;
                 $taskPairs[$testTask->id] = $testTask->name;
             }
-            if(empty($taskPairs)) die(js::alert($this->lang->testreport->noTestTask) . js::locate('back'));
+            if(empty($taskPairs)) return print(js::alert($this->lang->testreport->noTestTask) . js::locate('back'));
 
             if(empty($objectID))
             {
@@ -209,10 +209,10 @@ class testreport extends control
             if($this->app->tab == 'project') $this->project->setMenu($task->project);
         }
 
-        if(empty($objectID)) die(js::alert($this->lang->testreport->noObjectID) . js::locate('back'));
+        if(empty($objectID)) return print(js::alert($this->lang->testreport->noObjectID) . js::locate('back'));
         if($objectType == 'testtask')
         {
-            if($productID != $task->product) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
+            if($productID != $task->product) return print(js::error($this->lang->error->accessDenied) . js::locate('back'));
             $productIdList[$productID] = $productID;
 
             $begin     = !empty($begin) ? date("Y-m-d", strtotime($begin)) : $task->begin;
@@ -222,7 +222,7 @@ class testreport extends control
             if($task->build == 'trunk')
             {
                 echo js::alert($this->lang->testreport->errorTrunk);
-                die(js::locate('back'));
+                return print(js::locate('back'));
             }
             else
             {
@@ -246,7 +246,7 @@ class testreport extends control
         elseif($objectType == 'execution')
         {
             $executionID = $this->commonAction($objectID, $objectType);
-            if($executionID != $objectID) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
+            if($executionID != $objectID) return print(js::error($this->lang->error->accessDenied) . js::locate('back'));
 
             $execution     = $this->execution->getById($executionID);
             $tasks         = $this->testtask->getExecutionTasks($executionID);
@@ -270,7 +270,7 @@ class testreport extends control
             if(count($productIdList) > 1)
             {
                 echo(js::alert($this->lang->testreport->moreProduct));
-                die(js::locate('back'));
+                return print(js::locate('back'));
             }
 
             if($this->app->tab == 'qa')
@@ -355,14 +355,14 @@ class testreport extends control
         if($_POST)
         {
             $changes = $this->testreport->update($reportID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             $files      = $this->loadModel('file')->saveUpload('testreport', $reportID);
             $fileAction = !empty($files) ? $this->lang->addFiles . join(',', $files) . "\n" : '';
             $actionID   = $this->loadModel('action')->create('testreport', $reportID, 'Edited', $fileAction);
             if(!empty($changes)) $this->action->logHistory($actionID, $changes);
 
-            die(js::locate(inlink('view', "reportID=$reportID"), 'parent'));
+            return print(js::locate(inlink('view', "reportID=$reportID"), 'parent'));
         }
 
         $report    = $this->testreport->getById($reportID);
@@ -374,7 +374,7 @@ class testreport extends control
         {
             $product   = $this->product->getById($report->product);
             $productID = $this->commonAction($report->product, 'product');
-            if($productID != $report->product) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
+            if($productID != $report->product) return print(js::error($this->lang->error->accessDenied) . js::locate('back'));
 
             $browseLink = inlink('browse', "objectID=$productID&objectType=product");
             $this->view->position[] = html::a($browseLink, $product->name);
@@ -385,12 +385,12 @@ class testreport extends control
             if($this->app->tab == 'execution')
             {
                 $objectID = $this->commonAction($report->execution, 'execution');
-                if($objectID != $report->execution) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
+                if($objectID != $report->execution) return print(js::error($this->lang->error->accessDenied) . js::locate('back'));
             }
             else
             {
                 $objectID = $this->commonAction($report->project, 'project');
-                if($objectID != $report->project) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
+                if($objectID != $report->project) return print(js::error($this->lang->error->accessDenied) . js::locate('back'));
             }
 
             $browseLink = inlink('browse', "objectID=$objectID&objectType=execution");
@@ -408,7 +408,7 @@ class testreport extends control
             if($task->build == 'trunk')
             {
                 echo js::alert($this->lang->testreport->errorTrunk);
-                die(js::locate('back'));
+                return print(js::locate('back'));
             }
             else
             {
@@ -483,7 +483,7 @@ class testreport extends control
     {
         $reportID = (int)$reportID;
         $report   = $this->testreport->getById($reportID);
-        if(!$report) die(js::error($this->lang->notFound) . js::locate($this->createLink('qa', 'index')));
+        if(!$report) return print(js::error($this->lang->notFound) . js::locate($this->createLink('qa', 'index')));
         $this->session->project = $report->project;
 
         $browseLink = '';
@@ -492,7 +492,7 @@ class testreport extends control
         {
             $product   = $this->product->getById($report->product);
             $productID = $this->commonAction($report->product, 'product');
-            if($productID != $report->product) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
+            if($productID != $report->product) return print(js::error($this->lang->error->accessDenied) . js::locate('back'));
 
             $browseLink = inlink('browse', "objectID=$productID&objectType=product");
             $this->view->position[] = html::a($browseLink, $product->name);
@@ -502,12 +502,12 @@ class testreport extends control
             if($this->app->tab == 'execution')
             {
                 $objectID = $this->commonAction($report->execution, 'execution');
-                if($objectID != $report->execution) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
+                if($objectID != $report->execution) return print(js::error($this->lang->error->accessDenied) . js::locate('back'));
             }
             else
             {
                 $objectID = $this->commonAction($report->project, 'project');
-                if($objectID != $report->project) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
+                if($objectID != $report->project) return print(js::error($this->lang->error->accessDenied) . js::locate('back'));
             }
 
             $browseLink = inlink('browse', "objectID=$objectID&objectType=execution");
@@ -589,7 +589,7 @@ class testreport extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->testreport->confirmDelete, inlink('delete', "reportID=$reportID&confirm=yes")));
+            return print(js::confirm($this->lang->testreport->confirmDelete, inlink('delete', "reportID=$reportID&confirm=yes")));
         }
         else
         {
@@ -597,7 +597,7 @@ class testreport extends control
             $locateLink = $this->session->reportList ? $this->session->reportList : inlink('browse', "productID={$testreport->product}");
 
             $this->testreport->delete(TABLE_TESTREPORT, $reportID);
-            die(js::locate($locateLink, 'parent'));
+            return print(js::locate($locateLink, 'parent'));
         }
     }
 
diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index 3f9b6e4c6f..7d826b7982 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -32,7 +32,7 @@ class testsuite extends control
         parent::__construct($moduleName, $methodName);
 
         $this->view->products = $this->products = $this->loadModel('product')->getPairs();
-        if(empty($this->products) and !helper::isAjaxRequest()) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName=qa&activeMenu=testsuite")));
+        if(empty($this->products) and !helper::isAjaxRequest()) return print($this->locate($this->createLink('product', 'showErrorNone', "moduleName=qa&activeMenu=testsuite")));
     }
 
     /**
@@ -158,8 +158,8 @@ class testsuite extends control
 
         /* Get test suite, and set menu. */
         $suite = $this->testsuite->getById($suiteID, true);
-        if(!$suite) die(js::error($this->lang->notFound) . js::locate('back'));
-        if($suite->type == 'private' and $suite->addedBy != $this->app->user->account and !$this->app->user->admin) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
+        if(!$suite) return print(js::error($this->lang->notFound) . js::locate('back'));
+        if($suite->type == 'private' and $suite->addedBy != $this->app->user->account and !$this->app->user->admin) return print(js::error($this->lang->error->accessDenied) . js::locate('back'));
 
         /* Set product session. */
         $productID = $this->product->saveState($suite->product, $this->products);
@@ -229,7 +229,7 @@ class testsuite extends control
             return $this->send($response);
         }
 
-        if($suite->type == 'private' and $suite->addedBy != $this->app->user->account and !$this->app->user->admin) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
+        if($suite->type == 'private' and $suite->addedBy != $this->app->user->account and !$this->app->user->admin) return print(js::error($this->lang->error->accessDenied) . js::locate('back'));
 
         /* Set product session. */
         $productID = $this->product->saveState($suite->product, $this->products);
@@ -256,12 +256,12 @@ class testsuite extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->testsuite->confirmDelete, inlink('delete', "suiteID=$suiteID&confirm=yes")));
+            return print(js::confirm($this->lang->testsuite->confirmDelete, inlink('delete', "suiteID=$suiteID&confirm=yes")));
         }
         else
         {
             $suite = $this->testsuite->getById($suiteID);
-            if($suite->type == 'private' and $suite->addedBy != $this->app->user->account and !$this->app->user->admin) die(js::error($this->lang->error->accessDenied) . js::locate('back'));
+            if($suite->type == 'private' and $suite->addedBy != $this->app->user->account and !$this->app->user->admin) return print(js::error($this->lang->error->accessDenied) . js::locate('back'));
 
             $this->testsuite->delete($suiteID);
 
@@ -282,7 +282,7 @@ class testsuite extends control
                 }
                 return $this->send($response);
             }
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -358,7 +358,7 @@ class testsuite extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->testsuite->confirmUnlinkCase, $this->createLink('testsuite', 'unlinkCase', "rowID=$rowID&confirm=yes")));
+            return print(js::confirm($this->lang->testsuite->confirmUnlinkCase, $this->createLink('testsuite', 'unlinkCase', "rowID=$rowID&confirm=yes")));
         }
         else
         {
@@ -392,6 +392,6 @@ class testsuite extends control
                 ->exec();
         }
 
-        die(js::locate($this->createLink('testsuite', 'view', "suiteID=$suiteID")));
+        return print(js::locate($this->createLink('testsuite', 'view', "suiteID=$suiteID")));
     }
 }
diff --git a/module/todo/control.php b/module/todo/control.php
index 4cfe437bfd..0e6b5e22bf 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -46,7 +46,7 @@ class todo extends control
         if(!empty($_POST))
         {
             $todoID = $this->todo->create($date, $account);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
             $this->loadModel('action')->create('todo', $todoID, 'opened');
 
             $date = str_replace('-', '', $this->post->date);
@@ -69,9 +69,9 @@ class todo extends control
             }
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $todoID));
-            if($this->viewType == 'xhtml') die(js::locate($this->createLink('todo', 'view', "todoID=$todoID", 'html'), 'parent'));
-            if(isonlybody()) die(js::closeModal('parent.parent'));
-            die(js::locate($this->createLink('my', 'todo', "type=all&userID=&status=all&orderBy=id_desc"), 'parent'));
+            if($this->viewType == 'xhtml') return print(js::locate($this->createLink('todo', 'view', "todoID=$todoID", 'html'), 'parent'));
+            if(isonlybody()) return print(js::closeModal('parent.parent'));
+            return print(js::locate($this->createLink('my', 'todo', "type=all&userID=&status=all&orderBy=id_desc"), 'parent'));
         }
 
         unset($this->lang->todo->typeList['cycle']);
@@ -97,7 +97,7 @@ class todo extends control
         if(!empty($_POST))
         {
             $todoIDList = $this->todo->batchCreate();
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             /* Locate the browser. */
             $date = str_replace('-', '', $this->post->date);
@@ -111,8 +111,8 @@ class todo extends control
             }
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $todoIDList));
-            if(isonlybody())die(js::reload('parent.parent'));
-            die(js::locate($this->createLink('my', 'todo', "type=$date"), 'parent'));
+            if(isonlybody()) return print(js::reload('parent.parent'));
+            return print(js::locate($this->createLink('my', 'todo', "type=$date"), 'parent'));
         }
 
         /* Set Custom*/
@@ -146,7 +146,7 @@ class todo extends control
             if(dao::isError())
             {
                 if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'message' => dao::getError()));
-                die(js::error(dao::getError()));
+                return print(js::error(dao::getError()));
             }
             if($changes)
             {
@@ -155,12 +155,12 @@ class todo extends control
             }
 
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'success'));
-            die(js::locate($this->session->todoList, 'parent.parent'));
+            return print(js::locate($this->session->todoList, 'parent.parent'));
         }
 
         /* Judge a private todo or not, If private, die. */
         $todo = $this->todo->getById($todoID);
-        if($todo->private and $this->app->user->account != $todo->account) die('private');
+        if($todo->private and $this->app->user->account != $todo->account) return print('private');
 
         unset($this->lang->todo->typeList['cycle']);
         $todo->date = date("Y-m-d", strtotime($todo->date));
@@ -271,7 +271,7 @@ class todo extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            die(js::locate($this->session->todoList, 'parent'));
+            return print(js::locate($this->session->todoList, 'parent'));
         }
     }
 
@@ -295,10 +295,11 @@ class todo extends control
             if($todo->type == 'task')  $app = 'execution';
             if($todo->type == 'story') $app = 'product';
             $cancelURL   = $this->server->HTTP_REFERER;
-            die(js::confirm(sprintf($this->lang->todo->$confirmNote, $todo->idvalue), $confirmURL, $cancelURL, $okTarget, 'parent', $app));
+            return print(js::confirm(sprintf($this->lang->todo->$confirmNote, $todo->idvalue), $confirmURL, $cancelURL, $okTarget, 'parent', $app));
         }
-        if(isonlybody())die(js::reload('parent.parent'));
-        die(js::reload('parent'));
+
+        if(isonlybody())return print(js::reload('parent.parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -313,8 +314,8 @@ class todo extends control
         $todo = $this->todo->getById($todoID);
         if($todo->status == 'done' or $todo->status == 'closed') $this->todo->activate($todoID);
         if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'success'));
-        if(isonlybody()) die(js::reload('parent.parent'));
-        die(js::reload('parent'));
+        if(isonlybody()) return print(js::reload('parent.parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -329,8 +330,8 @@ class todo extends control
     {
         $todo = $this->todo->getById($todoID);
         if($todo->status == 'done') $this->todo->close($todoID);
-        if(isonlybody()) die(js::reload('parent.parent'));
-        die(js::reload('parent'));
+        if(isonlybody()) return print(js::reload('parent.parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -345,10 +346,10 @@ class todo extends control
     {
         if(!empty($_POST))
         {
-            if(empty($_POST['assignedTo'])) die(js::error($this->lang->todo->noAssignedTo));
+            if(empty($_POST['assignedTo'])) return print(js::error($this->lang->todo->noAssignedTo));
             $this->todo->assignTo($todoID);
-            if(dao::isError()) die(js::error(dao::getError()));
-            die(js::reload('parent.parent'));
+            if(dao::isError()) return print(js::error(dao::getError()));
+            return print(js::reload('parent.parent'));
         }
 
         $this->view->todo    = $this->todo->getById($todoID);
@@ -373,7 +374,7 @@ class todo extends control
         if(!$todo)
         {
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'message' => '404 Not found'));
-            die(js::error($this->lang->notFound) . js::locate('back'));
+            return print(js::error($this->lang->notFound) . js::locate('back'));
         }
         /* Save the session. */
         if(!isonlybody())
@@ -450,10 +451,10 @@ class todo extends control
             }
 
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'success'));
-            if(isonlybody()) die(js::reload('parent.parent'));
+            if(isonlybody()) return print(js::reload('parent.parent'));
 
             $browseLink = $this->session->todoList ? $this->session->todoList : $this->createLink('my', 'todo');
-            die(js::locate($browseLink, 'parent'));
+            return print(js::locate($browseLink, 'parent'));
         }
     }
 
@@ -478,11 +479,11 @@ class todo extends control
             if($todo->type == 'story') $app = 'product';
             $cancelURL   = $this->server->HTTP_REFERER;
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'success', 'message' => sprintf($this->lang->todo->$confirmNote, $todo->idvalue), 'locate' => $confirmURL));
-            die(js::confirm(sprintf($this->lang->todo->$confirmNote, $todo->idvalue), $confirmURL, $cancelURL, $okTarget, 'parent', $app));
+            return print(js::confirm(sprintf($this->lang->todo->$confirmNote, $todo->idvalue), $confirmURL, $cancelURL, $okTarget, 'parent', $app));
         }
         if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'success'));
-        if(isonlybody())die(js::reload('parent.parent'));
-        die(js::reload('parent'));
+        if(isonlybody()) return print(js::reload('parent.parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -500,7 +501,7 @@ class todo extends control
                 $todo = $this->todo->getById($todoID);
                 if($todo->status != 'done' && $todo->status != 'closed') $this->todo->finish($todoID);
             }
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
     }
 
@@ -521,7 +522,7 @@ class todo extends control
         }
         if(!empty($waitIdList)) echo js::alert(sprintf($this->lang->todo->unfinishedTodo, implode(',', $waitIdList)));
 
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -654,7 +655,7 @@ class todo extends control
     {
         $table = $objectType == 'project' ? TABLE_PROJECT : TABLE_PRODUCT;
         $field = $objectType == 'project' ? 'parent' : 'program';
-        die($this->dao->select($field)->from($table)->where('id')->eq($objectID)->fetch($field));
+        echo $this->dao->select($field)->from($table)->where('id')->eq($objectID)->fetch($field);
     }
 
     /**
@@ -671,7 +672,7 @@ class todo extends control
         $executions = $this->loadModel('execution')->getByProject($projectID, 'undone');
         foreach($executions as $id => $execution) $executions[$id] = $execution->name;
 
-        die(html::select('execution', $executions, '', "class='form-control chosen'"));
+        echo html::select('execution', $executions, '', "class='form-control chosen'");
     }
 
     /**
@@ -686,7 +687,7 @@ class todo extends control
         $this->session->set('project', $projectID);
 
         $products = $this->loadModel('product')->getProductPairsByProject($projectID);
-        die(html::select('bugProduct', $products, '', "class='form-control chosen'"));
+        echo html::select('bugProduct', $products, '', "class='form-control chosen'");
     }
 
     /**
diff --git a/module/todo/model.php b/module/todo/model.php
index d842163c4e..f863864f26 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -187,7 +187,7 @@ class todoModel extends model
                     if(isset($object->title)) $todo->name = $object->title;
                 }
 
-                if($todo->end < $todo->begin) die(js::alert(sprintf($this->lang->error->gt, $this->lang->todo->end, $this->lang->todo->begin)));
+                if($todo->end < $todo->begin) return print(js::alert(sprintf($this->lang->error->gt, $this->lang->todo->end, $this->lang->todo->begin)));
 
                 $validTodos[] = $todo;
             }
@@ -209,7 +209,7 @@ class todoModel extends model
             if(dao::isError())
             {
                 echo js::error(dao::getError());
-                die(js::reload('parent'));
+                return print(js::reload('parent'));
             }
             $todoID       = $this->dao->lastInsertID();
             $todoIDList[] = $todoID;
@@ -335,7 +335,7 @@ class todoModel extends model
                 {
                     $todo->idvalue = isset($data->{$this->config->todo->objectList[$todo->type]}[$todoID]) ? $data->{$this->config->todo->objectList[$todo->type]}[$todoID] : 0;
                 }
-                if($todo->end < $todo->begin) die(js::alert(sprintf($this->lang->error->gt, $this->lang->todo->end, $this->lang->todo->begin)));
+                if($todo->end < $todo->begin) return print(js::alert(sprintf($this->lang->error->gt, $this->lang->todo->end, $this->lang->todo->begin)));
 
                 $todos[$todoID] = $todo;
             }
@@ -368,7 +368,7 @@ class todoModel extends model
                 }
                 else
                 {
-                    die(js::error('todo#' . $todoID . dao::getError(true)));
+                    return print(js::error('todo#' . $todoID . dao::getError(true)));
                 }
             }
         }
diff --git a/module/tree/control.php b/module/tree/control.php
index 8fb10b00d0..878886378a 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -339,7 +339,7 @@ class tree extends control
         $childs = $this->tree->getAllChildId($moduleID);
         foreach($childs as $childModuleID) unset($this->view->optionMenu[$childModuleID]);
 
-        die($this->display());
+        $this->display();
     }
 
     /**
@@ -353,7 +353,7 @@ class tree extends control
     public function fix($root, $type)
     {
         $this->tree->fixModulePath($root, $type);
-        die(js::alert($this->lang->tree->successFixed) . js::reload('parent'));
+        echo js::alert($this->lang->tree->successFixed) . js::reload('parent');
     }
 
     /**
@@ -417,7 +417,7 @@ class tree extends control
         else
         {
             $result = $this->tree->delete($moduleID);
-            if(!$result) die();
+            if(!$result) return;
 
             die(js::reload('parent'));
         }
@@ -543,7 +543,7 @@ class tree extends control
 
         $moduleName = $viewType == 'bug' ? "modules[$number]" : "module[$number]";
         $modules    = empty($modules) ? array('' => '') : $modules;
-        die(html::select($moduleName, $modules, $currentModuleID, 'class=form-control'));
+        echo html::select($moduleName, $modules, $currentModuleID, 'class=form-control');
     }
 
     /**
@@ -563,6 +563,6 @@ class tree extends control
             ->andWhere('type')->eq($type)
             ->andWhere('deleted')->eq(0)
             ->fetchAll('id');
-        die(json_encode($modules));
+        echo json_encode($modules);
     }
 }
diff --git a/module/tree/model.php b/module/tree/model.php
index f904af3b41..b8d9e1b586 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -1565,7 +1565,7 @@ class treeModel extends model
 
         foreach($childs as $moduleID => $moduleName)
         {
-            if(preg_match('/(^\s+$)/', $moduleName)) die(js::alert($this->lang->tree->shouldNotBlank));
+            if(preg_match('/(^\s+$)/', $moduleName)) return print(js::alert($this->lang->tree->shouldNotBlank));
         }
 
         $module         = new stdClass();
@@ -1573,7 +1573,7 @@ class treeModel extends model
         $module->type   = $type;
         $module->parent = $parentModuleID;
         $repeatName     = $this->checkUnique($module, $childs);
-        if($repeatName) die(js::alert(sprintf($this->lang->tree->repeatName, $repeatName)));
+        if($repeatName) return print(js::alert(sprintf($this->lang->tree->repeatName, $repeatName)));
 
         $parentModule = $this->getByID($parentModuleID);
 
@@ -1651,7 +1651,7 @@ class treeModel extends model
         if(!isset($_POST['branch'])) $module->branch = $self->branch;
 
         $repeatName = $this->checkUnique($self, array("id{$self->id}" => $module->name), array("id{$self->id}" => $module->branch));
-        if($repeatName) die(js::alert(sprintf($this->lang->tree->repeatName, $repeatName)));
+        if($repeatName) return print(js::alert(sprintf($this->lang->tree->repeatName, $repeatName)));
 
         $parent = $this->getById($this->post->parent);
         $childs = $this->getAllChildId($moduleID);
diff --git a/module/tutorial/control.php b/module/tutorial/control.php
index 91e1e8dde3..f09b4f00f4 100644
--- a/module/tutorial/control.php
+++ b/module/tutorial/control.php
@@ -73,7 +73,7 @@ class tutorial extends control
         $this->session->set('tutorialMode', false);
         $this->loadModel('setting')->setItem($this->app->user->account . '.common.global.novice', 0);
         if(empty($referer)) $referer = helper::safe64Encode(helper::createLink('my', 'index', '', 'html'));
-        die(js::locate(helper::safe64Decode($referer), 'parent'));
+        echo js::locate(helper::safe64Decode($referer), 'parent');
     }
 
     /**
@@ -86,7 +86,7 @@ class tutorial extends control
     {
         $this->session->set('tutorialMode', false);
         $this->loadModel('setting')->setItem($this->app->user->account . '.common.global.novice', 0);
-        die(json_encode(array('result' => 'success')));
+        echo json_encode(array('result' => 'success'));
     }
 
     /**
@@ -118,7 +118,7 @@ class tutorial extends control
             }
         }
         if(!$hasPriv and $module == 'my' and $method == 'index') $hasPriv = true;
-        if(!$hasPriv) die(js::locate('back'));
+        if(!$hasPriv) return print(js::locate('back'));
 
         $params = helper::safe64Decode($params);
         if($_POST)
@@ -127,9 +127,9 @@ class tutorial extends control
             if(($module == 'story' or $module == 'task' or $module == 'bug') and $method == 'create') $target = 'self';
             if($module == 'execution' and $method == 'linkStory') $target = 'self';
             if($module == 'execution' and $method == 'managemembers') $target = 'self';
-            die(js::locate(helper::createLink('tutorial', 'wizard', "module=$module&method=$method&params=" . helper::safe64Encode($params)), $target));
+            return print(js::locate(helper::createLink('tutorial', 'wizard', "module=$module&method=$method&params=" . helper::safe64Encode($params)), $target));
         }
-        die($this->fetch($module, $method, $params));
+        echo $this->fetch($module, $method, $params);
     }
 
     /**
@@ -144,7 +144,7 @@ class tutorial extends control
     public function ajaxSaveNovice($novice = 'true', $reload = 'false')
     {
         $this->loadModel('setting')->setItem($this->app->user->account . '.common.global.novice', $novice == true ? 1 : 0);
-        if($reload == 'true') die(js::reload('parent'));
+        if($reload == 'true') return print(js::reload('parent'));
     }
 
     /**
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index fc29abaa09..86d89b9705 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -127,7 +127,7 @@ class upgrade extends control
             $this->view->result = 'fail';
             $this->view->errors  = $result;
 
-            die($this->display());
+            return $this->display());
         }
 
         $fromVersion = isset($_POST['fromVersion']) ? $this->post->fromVersion : $fromVersion;
@@ -265,7 +265,7 @@ class upgrade extends control
 
                 /* Create Program. */
                 list($programID, $projectList, $lineID) = $this->upgrade->createProgram($linkedProducts, $linkedSprints);
-                if(dao::isError()) die(js::error(dao::getError()));
+                if(dao::isError()) return print(js::error(dao::getError()));
 
                 /* Process merged products and projects. */
                 if($_POST['projectType'] == 'execution')
@@ -317,7 +317,7 @@ class upgrade extends control
 
                 /* Create Program. */
                 list($programID, $projectList, $lineID) = $this->upgrade->createProgram($linkedProducts, $linkedSprints);
-                if(dao::isError()) die(js::error(dao::getError()));
+                if(dao::isError()) return print(js::error(dao::getError()));
 
                 /* Process productline. */
                 $this->dao->delete()->from(TABLE_MODULE)->where('`root`')->eq(0)->andWhere('`type`')->eq('line')->exec();
@@ -347,7 +347,7 @@ class upgrade extends control
 
                 /* Create Program. */
                 list($programID, $projectList, $lineID) = $this->upgrade->createProgram(array(), $linkedSprints);
-                if(dao::isError()) die(js::error(dao::getError()));
+                if(dao::isError()) return print(js::error(dao::getError()));
 
                 if($_POST['projectType'] == 'execution')
                 {
@@ -369,7 +369,7 @@ class upgrade extends control
 
                 /* Create Program. */
                 list($programID, $projectList, $lineID) = $this->upgrade->createProgram(array(), $linkedSprints);
-                if(dao::isError()) die(js::error(dao::getError()));
+                if(dao::isError()) return print(js::error(dao::getError()));
 
                 if($_POST['projectType'] == 'execution')
                 {
@@ -401,7 +401,7 @@ class upgrade extends control
                 }
             }
 
-            die(js::locate($this->createLink('upgrade', 'mergeProgram', "type=$type&programID=$programID&projectType=$projectType"), 'parent'));
+            return print(js::locate($this->createLink('upgrade', 'mergeProgram', "type=$type&programID=$programID&projectType=$projectType"), 'parent'));
         }
 
         /* Get no merged product and project count. */
@@ -423,7 +423,7 @@ class upgrade extends control
             /* Update sprints history. */
             $sprints = $this->dao->select('id')->from(TABLE_PROJECT)->where('type')->eq('sprint')->fetchAll('id');
             $this->dao->update(TABLE_ACTION)->set('objectType')->eq('execution')->where('objectID')->in(array_keys($sprints))->andWhere('objectType')->eq('project')->exec();
-            die(js::locate($this->createLink('upgrade', 'mergeRepo')));
+            return print(js::locate($this->createLink('upgrade', 'mergeRepo')));
         }
 
         $this->view->noMergedProductCount = $noMergedProductCount;
@@ -622,7 +622,7 @@ class upgrade extends control
                 $this->dao->update(TABLE_PROJECT)->set('name')->eq($projectName)->where('id')->eq($projectID)->exec();
             }
 
-            die(js::closeModal('parent.parent', ''));
+            return print(js::closeModal('parent.parent', ''));
         }
 
         $objectGroup = array();
@@ -649,7 +649,7 @@ class upgrade extends control
         if($_POST)
         {
             $this->upgrade->mergeRepo();
-            die(js::locate($this->createLink('upgrade', 'mergeRepo'), 'parent'));
+            return print(js::locate($this->createLink('upgrade', 'mergeRepo'), 'parent'));
         }
 
         $repoes   = $this->dao->select('id, name')->from(TABLE_REPO)->where('deleted')->eq(0)->andWhere('product')->eq('')->fetchPairs();
@@ -659,7 +659,7 @@ class upgrade extends control
             $this->dao->delete()->from(TABLE_BLOCK)->exec();
             $this->dao->delete()->from(TABLE_CONFIG)->where('`key`')->eq('blockInited')->exec();
             $this->loadModel('setting')->deleteItems('owner=system&module=common&section=global&key=upgradeStep');
-            die(js::locate($this->createLink('upgrade', 'afterExec', "fromVersion=&processed=no")));
+            return print(js::locate($this->createLink('upgrade', 'afterExec', "fromVersion=&processed=no")));
         }
 
         $this->view->title    = $this->lang->upgrade->mergeRepo;
@@ -680,7 +680,7 @@ class upgrade extends control
     public function ajaxGetProjectPairsByProgram($programID = 0)
     {
         $projects = array('' => '') + $this->upgrade->getProjectPairsByProgram($programID);
-        die(html::select('projects', $projects, '', 'class="form-control prj-exist" onchange="getProgramStatus(\'project\', this.value)"'));
+        echo html::select('projects', $projects, '', 'class="form-control prj-exist" onchange="getProgramStatus(\'project\', this.value)"');
     }
 
     /**
@@ -694,7 +694,7 @@ class upgrade extends control
     {
         $lines = array('' => '');
         if((int)$programID) $lines += $this->loadModel('product')->getLinePairs($programID);
-        die(html::select('lines', $lines, '', 'class="form-control line-exist"'));
+        echo html::select('lines', $lines, '', 'class="form-control line-exist"');
     }
 
     /**
@@ -712,7 +712,7 @@ class upgrade extends control
         {
             $this->view->title    = $this->lang->upgrade->consistency;
             $this->view->alterSQL = $alterSQL;
-            die($this->display('upgrade', 'consistency'));
+            return print($this->display('upgrade', 'consistency'));
         }
 
         unset($_SESSION['user']);
@@ -837,7 +837,7 @@ class upgrade extends control
             $response['nextType'] = $result['type'];
             $response['message']  = zget($this->lang->searchObjects, $result['type']) . " <span class='{$result['type']}-num'>0</span>";
         }
-        die(json_encode($response));
+        echo json_encode($response);
     }
 
     /**
@@ -849,7 +849,7 @@ class upgrade extends control
      */
     public function ajaxGetProductName($productID)
     {
-        die($this->dao->findByID($productID)->from(TABLE_PRODUCT)->fetch('name'));
+        echo $this->dao->findByID($productID)->from(TABLE_PRODUCT)->fetch('name');
     }
 
     /**
@@ -861,6 +861,6 @@ class upgrade extends control
      */
     public function ajaxGetProgramStatus($programID)
     {
-        die($this->dao->select('status')->from(TABLE_PROGRAM)->where('id')->eq($programID)->fetch('status'));
+        echo $this->dao->select('status')->from(TABLE_PROGRAM)->where('id')->eq($programID)->fetch('status');
     }
 }
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 458aa13d3b..5613522b16 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -4364,9 +4364,9 @@ class upgradeModel extends model
 
         if(isset($data->newProgram))
         {
-            if(!$this->post->longTime and !$this->post->end and isset($data->begin)) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->upgrade->end)));
+            if(!$this->post->longTime and !$this->post->end and isset($data->begin)) return print(js::alert(sprintf($this->lang->error->notempty, $this->lang->upgrade->end)));
 
-            if(isset($data->projectName) and $data->projectType == 'execution' and empty($data->projectName)) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->upgrade->projectName)));
+            if(isset($data->projectName) and $data->projectType == 'execution' and empty($data->projectName)) return print(js::alert(sprintf($this->lang->error->notempty, $this->lang->upgrade->projectName)));
 
             /* Insert program. */
             $program = new stdclass();
@@ -4445,7 +4445,7 @@ class upgradeModel extends model
 
         if(isset($data->newProject))
         {
-            if(!$this->post->longTime and !$this->post->end) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->upgrade->end)));
+            if(!$this->post->longTime and !$this->post->end) return print(js::alert(sprintf($this->lang->error->notempty, $this->lang->upgrade->end)));
 
             /* Create a project. */
             $this->loadModel('action');
@@ -4618,7 +4618,7 @@ class upgradeModel extends model
         /* No project is created when there are no sprints. */
         if(!$sprintIdList) return;
 
-        if(!$projectID) die(js::alert($this->lang->upgrade->projectEmpty));
+        if(!$projectID) return print(js::alert($this->lang->upgrade->projectEmpty));
 
         $this->dao->update(TABLE_BUG)->set('project')->eq($projectID)->where('product')->in($productIdList)->exec();
         $this->dao->update(TABLE_TESTREPORT)->set('project')->eq($projectID)->where('product')->in($productIdList)->exec();
diff --git a/module/user/control.php b/module/user/control.php
index 21651689b9..17dbd92726 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -60,8 +60,8 @@ class user extends control
     {
         $userID = (int)$userID;
         $user   = $this->user->getById($userID, 'id');
-        if(empty($user)) die(js::error($this->lang->notFound) . js::locate($this->createLink('my', 'team')));
-        if($user->deleted == 1) die(js::error($this->lang->user->noticeHasDeleted) . js::locate('back'));
+        if(empty($user)) return print(js::error($this->lang->notFound) . js::locate($this->createLink('my', 'team')));
+        if($user->deleted == 1) return print(js::error($this->lang->user->noticeHasDeleted) . js::locate('back'));
 
         /* Set thie url to session. */
         $uri = $this->app->getURI(true);
@@ -81,7 +81,7 @@ class user extends control
         $todos   = $this->todo->getList($type, $account, $status, 0, $pager, $sort);
         $date    = (int)$type == 0 ? helper::today() : $type;
         $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id');
-        if(!isset($users[$userID])) die(js::error($this->lang->user->error->noAccess) . js::locate('back'));
+        if(!isset($users[$userID])) return print(js::error($this->lang->user->error->noAccess) . js::locate('back'));
 
         /* set menus. */
         $this->view->userList = $this->user->setUserList($users, $userID);
@@ -573,7 +573,7 @@ class user extends control
             $userIDList = $this->user->batchCreate();
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $userIDList));
-            die(js::locate($this->createLink('company', 'browse'), 'parent'));
+            return print(js::locate($this->createLink('company', 'browse'), 'parent'));
         }
 
         /* Set custom. */
@@ -654,7 +654,7 @@ class user extends control
         elseif($_POST)
         {
             if($this->post->account) $this->user->batchEdit();
-            die(js::locate($this->session->userList ? $this->session->userList : $this->createLink('company', 'browse', "deptID=$deptID"), 'parent'));
+            return print(js::locate($this->session->userList ? $this->session->userList : $this->createLink('company', 'browse', "deptID=$deptID"), 'parent'));
         }
         $this->lang->user->menu      = $this->lang->company->menu;
         $this->lang->user->menuOrder = $this->lang->company->menuOrder;
@@ -693,7 +693,7 @@ class user extends control
         if($this->app->user->admin and $this->app->user->account == $user->account) return;
         if($_POST)
         {
-            if($this->post->verifyPassword != md5($this->app->user->password . $this->session->rand)) die(js::alert($this->lang->user->error->verifyPassword));
+            if($this->post->verifyPassword != md5($this->app->user->password . $this->session->rand)) return print(js::alert($this->lang->user->error->verifyPassword));
             $this->user->delete(TABLE_USER, $userID);
             if(!dao::isError())
             {
@@ -716,7 +716,7 @@ class user extends control
                 }
                 return $this->send($response);
             }
-            die(js::locate($this->session->userList, 'parent.parent'));
+            return print(js::locate($this->session->userList, 'parent.parent'));
         }
 
         $this->view->rand = $this->user->updateSessionRandom();
@@ -734,11 +734,11 @@ class user extends control
      */
     public function unlock($userID, $confirm = 'no')
     {
-        if($confirm == 'no') die(js::confirm($this->lang->user->confirmUnlock, $this->createLink('user', 'unlock', "userID=$userID&confirm=yes")));
+        if($confirm == 'no') return print(js::confirm($this->lang->user->confirmUnlock, $this->createLink('user', 'unlock', "userID=$userID&confirm=yes")));
 
         $user = $this->user->getById($userID, 'id');
         $this->user->cleanLocked($user->account);
-        die(js::locate($this->session->userList ? $this->session->userList : $this->createLink('company', 'browse'), 'parent'));
+        return print(js::locate($this->session->userList ? $this->session->userList : $this->createLink('company', 'browse'), 'parent'));
     }
 
     /**
@@ -751,11 +751,11 @@ class user extends control
      */
     public function unbind($userID, $confirm = 'no')
     {
-        if($confirm == 'no') die(js::confirm($this->lang->user->confirmUnbind, $this->createLink('user', 'unbind', "userID=$userID&confirm=yes")));
+        if($confirm == 'no') return print(js::confirm($this->lang->user->confirmUnbind, $this->createLink('user', 'unbind', "userID=$userID&confirm=yes")));
 
         $user = $this->user->getById($userID, 'id');
         $this->user->unbind($user->account);
-        die(js::locate($this->session->userList ? $this->session->userList : $this->createLink('company', 'browse'), 'parent'));
+        return print(js::locate($this->session->userList ? $this->session->userList : $this->createLink('company', 'browse'), 'parent'));
     }
 
 
@@ -787,11 +787,11 @@ class user extends control
         {
             if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
             {
-                die(sprintf($this->lang->user->mkdirWin, $floderPath, $floderPath));
+                return print(sprintf($this->lang->user->mkdirWin, $floderPath, $floderPath));
             }
             else
             {
-                die(sprintf($this->lang->user->mkdirLinux, $floderPath, $floderPath, $floderPath, $floderPath));
+                return print(sprintf($this->lang->user->mkdirLinux, $floderPath, $floderPath, $floderPath, $floderPath));
             }
         }
 
@@ -813,7 +813,7 @@ class user extends control
             if($this->app->getViewType() == 'json')
             {
                 $data = $this->user->getDataInJSON($this->app->user);
-                die(helper::removeUTF8Bom(json_encode(array('status' => 'success') + $data)));
+                return print(helper::removeUTF8Bom(json_encode(array('status' => 'success') + $data)));
             }
 
             $response['result']  = 'success';
@@ -847,7 +847,7 @@ class user extends control
             {
                 $response['result']  = 'fail';
                 $response['message'] = sprintf($this->lang->user->loginLocked, $this->config->user->lockMinutes);
-                if($this->app->getViewType() == 'json') die(helper::removeUTF8Bom(json_encode(array('status' => 'failed', 'reason' => $failReason))));
+                if($this->app->getViewType() == 'json') return print(helper::removeUTF8Bom(json_encode(array('status' => 'failed', 'reason' => $failReason))));
                 return $this->send($response);
             }
 
@@ -871,7 +871,7 @@ class user extends control
                     if($this->app->getViewType() == 'json')
                     {
                         $data = $this->user->getDataInJSON($user);
-                        die(helper::removeUTF8Bom(json_encode(array('status' => 'success') + $data)));
+                        return print(helper::removeUTF8Bom(json_encode(array('status' => 'success') + $data)));
                     }
 
                     /* Get the module and method of the referer. */
@@ -911,7 +911,7 @@ class user extends control
                     if($this->app->getViewType() == 'json')
                     {
                         $data = $this->user->getDataInJSON($user);
-                        die(helper::removeUTF8Bom(json_encode(array('status' => 'success') + $data)));
+                        return print(helper::removeUTF8Bom(json_encode(array('status' => 'success') + $data)));
                     }
 
                     $response['locate']  = $this->config->webRoot;
@@ -923,7 +923,7 @@ class user extends control
             {
                 $response['result']  = 'fail';
                 $fails = $this->user->failPlus($account);
-                if($this->app->getViewType() == 'json') die(helper::removeUTF8Bom(json_encode(array('status' => 'failed', 'reason' => $this->lang->user->loginFailed))));
+                if($this->app->getViewType() == 'json') return print(helper::removeUTF8Bom(json_encode(array('status' => 'failed', 'reason' => $this->lang->user->loginFailed))));
                 $remainTimes = $this->config->user->failTimes - $fails;
                 if($remainTimes <= 0)
                 {
@@ -993,7 +993,7 @@ class user extends control
 
         $this->view->denyType = $denyType;
 
-        die($this->display());
+        $this->display();
     }
 
     /**
@@ -1009,7 +1009,7 @@ class user extends control
         setcookie('za', false);
         setcookie('zp', false);
 
-        if($this->app->getViewType() == 'json') die(json_encode(array('status' => 'success')));
+        if($this->app->getViewType() == 'json') return print(json_encode(array('status' => 'success')));
         $vars = !empty($referer) ? "referer=$referer" : '';
         $this->locate($this->createLink('user', 'login', $vars));
     }
@@ -1035,15 +1035,15 @@ class user extends control
 
         if($_POST)
         {
-            if($needCreateFile) die(js::reload('parent'));
+            if($needCreateFile) return print(js::reload('parent'));
 
             $result = $this->user->resetPassword();
-            if(dao::isError()) die(js::error(dao::getError()));
-            if(!$result) die(js::alert($this->lang->user->resetFail));
+            if(dao::isError()) return print(js::error(dao::getError()));
+            if(!$result) return print(js::alert($this->lang->user->resetFail));
 
             echo js::alert($this->lang->user->resetSuccess);
             $referer = helper::safe64Encode($this->createLink('index', 'index'));
-            die(js::locate(inlink('logout', 'referer=' . $referer), 'parent'));
+            return print(js::locate(inlink('logout', 'referer=' . $referer), 'parent'));
         }
 
         /* Remove the real path for security reason. */
@@ -1229,7 +1229,7 @@ class user extends control
     {
         $this->user->saveUserTemplate($type);
         if(dao::isError()) echo js::error(dao::getError(), $full = false);
-        die($this->fetch('user', 'ajaxPrintTemplates', "type=$type"));
+        return print($this->fetch('user', 'ajaxPrintTemplates', "type=$type"));
     }
 
     /**
@@ -1244,7 +1244,6 @@ class user extends control
         $this->dao->delete()->from(TABLE_USERTPL)->where('id')->eq($templateID)
             ->beginIF(!$this->app->user->admin)->andWhere('account')->eq($this->app->user->account)->fi()
             ->exec();
-        die();
     }
 
     /**
@@ -1272,7 +1271,7 @@ class user extends control
             $newUsers[$account] = $realname;
         }
 
-        die(json_encode($newUsers));
+        echo json_encode($newUsers);
     }
 
     /**
@@ -1284,6 +1283,6 @@ class user extends control
     public function refreshRandom()
     {
         $rand = (string)$this->user->updateSessionRandom();
-        die($rand);
+        echo $rand;
     }
 }
diff --git a/module/user/model.php b/module/user/model.php
index 0d09c394ec..b609bda207 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -375,7 +375,7 @@ class userModel extends model
      */
     public function batchCreate()
     {
-        if(empty($_POST['verifyPassword']) or $this->post->verifyPassword != md5($this->app->user->password . $this->session->rand)) die(js::alert($this->lang->user->error->verifyPassword));
+        if(empty($_POST['verifyPassword']) or $this->post->verifyPassword != md5($this->app->user->password . $this->session->rand)) return print(js::alert($this->lang->user->error->verifyPassword));
 
         $users    = fixer::input('post')->get();
         $data     = array();
@@ -385,24 +385,24 @@ class userModel extends model
             $users->account[$i] = trim($users->account[$i]);
             if($users->account[$i] != '')
             {
-                if(strtolower($users->account[$i]) == 'guest') die(js::error(sprintf($this->lang->user->error->reserved, $i + 1)));
+                if(strtolower($users->account[$i]) == 'guest') return print(js::error(sprintf($this->lang->user->error->reserved, $i + 1)));
                 $account = $this->dao->select('account')->from(TABLE_USER)->where('account')->eq($users->account[$i])->fetch();
-                if($account) die(js::error(sprintf($this->lang->user->error->accountDupl, $i + 1)));
-                if(in_array($users->account[$i], $accounts)) die(js::error(sprintf($this->lang->user->error->accountDupl, $i + 1)));
-                if(!validater::checkAccount($users->account[$i])) die(js::error(sprintf($this->lang->user->error->account, $i + 1)));
-                if($users->realname[$i] == '') die(js::error(sprintf($this->lang->user->error->realname, $i + 1)));
-                if($users->email[$i] and !validater::checkEmail($users->email[$i])) die(js::error(sprintf($this->lang->user->error->mail, $i + 1)));
+                if($account) return print(js::error(sprintf($this->lang->user->error->accountDupl, $i + 1)));
+                if(in_array($users->account[$i], $accounts)) return print(js::error(sprintf($this->lang->user->error->accountDupl, $i + 1)));
+                if(!validater::checkAccount($users->account[$i])) return print(js::error(sprintf($this->lang->user->error->account, $i + 1)));
+                if($users->realname[$i] == '') return print(js::error(sprintf($this->lang->user->error->realname, $i + 1)));
+                if($users->email[$i] and !validater::checkEmail($users->email[$i])) return print(js::error(sprintf($this->lang->user->error->mail, $i + 1)));
                 $users->password[$i] = (isset($prev['password']) and $users->ditto[$i] == 'on' and !$this->post->password[$i]) ? $prev['password'] : $this->post->password[$i];
-                if(!validater::checkReg($users->password[$i], '|(.){6,}|')) die(js::error(sprintf($this->lang->user->error->password, $i + 1)));
+                if(!validater::checkReg($users->password[$i], '|(.){6,}|')) return print(js::error(sprintf($this->lang->user->error->password, $i + 1)));
                 $role    = $users->role[$i] == 'ditto' ? (isset($prev['role']) ? $prev['role'] : '') : $users->role[$i];
                 $visions = in_array('ditto', $users->visions[$i]) ? (isset($prev['visions']) ? $prev['visions'] : array()) : $users->visions[$i];
 
                 /* Check weak and common weak password. */
-                if(isset($this->config->safe->mode) and $this->computePasswordStrength($users->password[$i]) < $this->config->safe->mode) die(js::error(sprintf($this->lang->user->error->weakPassword, $i + 1)));
+                if(isset($this->config->safe->mode) and $this->computePasswordStrength($users->password[$i]) < $this->config->safe->mode) return print(js::error(sprintf($this->lang->user->error->weakPassword, $i + 1)));
                 if(!empty($this->config->safe->changeWeak))
                 {
                     if(!isset($this->config->safe->weak)) $this->app->loadConfig('admin');
-                    if(strpos(",{$this->config->safe->weak},", ",{$users->password[$i]},") !== false) die(js::error(sprintf($this->lang->user->error->dangerPassword, $i + 1, $this->config->safe->weak)));
+                    if(strpos(",{$this->config->safe->weak},", ",{$users->password[$i]},") !== false) return print(js::error(sprintf($this->lang->user->error->dangerPassword, $i + 1, $this->config->safe->weak)));
                 }
 
                 $data[$i] = new stdclass();
@@ -438,7 +438,7 @@ class userModel extends model
                     if(!isset($data[$i]->$field)) continue;
                     if(!empty($data[$i]->$field)) continue;
 
-                    die(js::error(sprintf($this->lang->error->notempty, $this->lang->user->$field)));
+                    return print(js::error(sprintf($this->lang->error->notempty, $this->lang->user->$field)));
                 }
 
                 /* Change for append field, such as feedback. */
@@ -485,7 +485,7 @@ class userModel extends model
             if(dao::isError())
             {
                 echo js::error(dao::getError());
-                die(js::reload('parent'));
+                return print(js::reload('parent'));
             }
             else
             {
@@ -638,7 +638,7 @@ class userModel extends model
     public function batchEdit()
     {
         $data = fixer::input('post')->get();
-        if(empty($_POST['verifyPassword']) or $this->post->verifyPassword != md5($this->app->user->password . $this->session->rand)) die(js::alert($this->lang->user->error->verifyPassword));
+        if(empty($_POST['verifyPassword']) or $this->post->verifyPassword != md5($this->app->user->password . $this->session->rand)) return print(js::alert($this->lang->user->error->verifyPassword));
 
         $oldUsers     = $this->dao->select('id, account, email')->from(TABLE_USER)->where('id')->in(array_keys($data->account))->fetchAll('id');
         $accountGroup = $this->dao->select('id, account')->from(TABLE_USER)->where('account')->in($data->account)->fetchGroup('account', 'id');
@@ -675,7 +675,7 @@ class userModel extends model
                 if(!isset($users[$id][$field])) continue;
                 if(!empty($users[$id][$field])) continue;
 
-                die(js::error(sprintf($this->lang->error->notempty, $this->lang->user->$field)));
+                return print(js::error(sprintf($this->lang->error->notempty, $this->lang->user->$field)));
             }
 
             if(!empty($this->config->user->batchAppendFields))
@@ -690,11 +690,11 @@ class userModel extends model
                 }
             }
 
-            if(isset($accountGroup[$account]) and count($accountGroup[$account]) > 1) die(js::error(sprintf($this->lang->user->error->accountDupl, $id)));
-            if(in_array($account, $accounts)) die(js::error(sprintf($this->lang->user->error->accountDupl, $id)));
-            if(!validater::checkAccount($users[$id]['account'])) die(js::error(sprintf($this->lang->user->error->account, $id)));
-            if($users[$id]['realname'] == '') die(js::error(sprintf($this->lang->user->error->realname, $id)));
-            if($users[$id]['email'] and !validater::checkEmail($users[$id]['email'])) die(js::error(sprintf($this->lang->user->error->mail, $id)));
+            if(isset($accountGroup[$account]) and count($accountGroup[$account]) > 1) return print(js::error(sprintf($this->lang->user->error->accountDupl, $id)));
+            if(in_array($account, $accounts)) return print(js::error(sprintf($this->lang->user->error->accountDupl, $id)));
+            if(!validater::checkAccount($users[$id]['account'])) return print(js::error(sprintf($this->lang->user->error->account, $id)));
+            if($users[$id]['realname'] == '') return print(js::error(sprintf($this->lang->user->error->realname, $id)));
+            if($users[$id]['email'] and !validater::checkEmail($users[$id]['email'])) return print(js::error(sprintf($this->lang->user->error->mail, $id)));
 
             $accounts[$id] = $account;
             $prev['dept']  = $users[$id]['dept'];
@@ -1406,13 +1406,13 @@ class userModel extends model
         if(empty($data->listName))
         {
             dao::$errors['listName'][] = sprintf($this->lang->error->notempty, $this->lang->user->contacts->listName);
-            die(js::error(dao::getError()));
+            return print(js::error(dao::getError()));
         }
 
         $this->dao->insert(TABLE_USERCONTACT)->data($data)
             ->autoCheck()
             ->exec();
-        if(dao::isError()) die(js::error(dao::getError()));
+        if(dao::isError()) return print(js::error(dao::getError()));
 
         return $this->dao->lastInsertID();
     }
@@ -1435,13 +1435,13 @@ class userModel extends model
         if(empty($data->listName))
         {
             dao::$errors['listName'][] = sprintf($this->lang->error->notempty, $this->lang->user->contacts->listName);
-            die(js::error(dao::getError()));
+            return print(js::error(dao::getError()));
         }
 
         $this->dao->update(TABLE_USERCONTACT)->data($data)
             ->where('id')->eq($listID)
             ->exec();
-        if(dao::isError()) die(js::error(dao::getError()));
+        if(dao::isError()) return print(js::error(dao::getError()));
     }
 
     /**
diff --git a/module/webhook/control.php b/module/webhook/control.php
index d9e9c14268..1cef0ff5c0 100644
--- a/module/webhook/control.php
+++ b/module/webhook/control.php
@@ -181,16 +181,16 @@ class webhook extends control
         if($_POST)
         {
             $this->webhook->bind($id);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
-            die(js::reload('parent'));
+            return print(js::reload('parent'));
         }
 
         $webhook = $this->webhook->getById($id);
         if($webhook->type != 'dinguser' && $webhook->type != 'wechatuser' && $webhook->type != 'feishuuser')
         {
             echo js::alert($this->lang->webhook->note->bind);
-            die(js::locate($this->createLink('webhook', 'browse')));
+            return print(js::locate($this->createLink('webhook', 'browse')));
         }
         $webhook->secret = json_decode($webhook->secret);
 
@@ -226,11 +226,11 @@ class webhook extends control
             if($response['message'] == 'nodept')
             {
                 echo js::error($this->lang->webhook->error->noDept);
-                die(js::locate($this->createLink('webhook', 'chooseDept', "id=$id")));
+                return print(js::locate($this->createLink('webhook', 'chooseDept', "id=$id")));
             }
 
             echo js::error($response['message']);
-            die(js::locate($this->createLink('webhook', 'browse')));
+            return print(js::locate($this->createLink('webhook', 'browse')));
         }
 
         $oauthUsers  = $response['data'];
@@ -278,7 +278,7 @@ class webhook extends control
         if($webhook->type != 'dinguser' && $webhook->type != 'wechatuser' && $webhook->type != 'feishuuser')
         {
             echo js::alert($this->lang->webhook->note->bind);
-            die(js::locate($this->createLink('webhook', 'browse')));
+            return print(js::locate($this->createLink('webhook', 'browse')));
         }
         $webhook->secret = json_decode($webhook->secret);
 
@@ -299,7 +299,7 @@ class webhook extends control
         if($response['result'] == 'fail')
         {
             echo js::error($response['message']);
-            die(js::locate($this->createLink('webhook', 'browse')));
+            return print(js::locate($this->createLink('webhook', 'browse')));
         }
 
         if($response['result'] == 'selected')
@@ -307,7 +307,7 @@ class webhook extends control
             $locateLink  = $this->createLink('webhook', 'bind', "id={$id}");
             $locateLink .= strpos($locateLink, '?') !== false ? '&' : '?';
             $locateLink .= 'selectedDepts=' . join(',', $response['data']);
-            die(js::locate($locateLink));
+            return print(js::locate($locateLink));
         }
 
         $this->view->title      = $this->lang->webhook->chooseDept;
diff --git a/module/webhook/model.php b/module/webhook/model.php
index 2d596eba17..e8638e0df5 100644
--- a/module/webhook/model.php
+++ b/module/webhook/model.php
@@ -640,7 +640,7 @@ class webhookModel extends model
      */
     public function fetchHook($webhook, $sendData, $actionID = 0)
     {
-        if(!extension_loaded('curl')) die(helper::jsonEncode($this->lang->webhook->error->curl));
+        if(!extension_loaded('curl')) return print(helper::jsonEncode($this->lang->webhook->error->curl));
 
         if($webhook->type == 'dinguser' || $webhook->type == 'wechatuser' || $webhook->type == 'feishuuser')
         {

From 49af622fd85095fe3825cef3db680b4b8f728f64 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Tue, 22 Feb 2022 14:25:14 +0800
Subject: [PATCH 20/41] * Move exit to return.

---
 module/common/model.php               | 2 +-
 module/execution/control.php          | 6 ++----
 module/execution/view/create.html.php | 2 +-
 module/git/control.php                | 3 +--
 module/program/view/create.html.php   | 2 +-
 module/story/control.php              | 3 +--
 module/svn/control.php                | 3 +--
 module/todo/control.php               | 3 +--
 8 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index c98df68a1c..60240e3547 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -359,7 +359,7 @@ class commonModel extends model
         {
             echo js::locate($denyLink);
         }
-        exit;
+        helper::end();
     }
 
     /**
diff --git a/module/execution/control.php b/module/execution/control.php
index 65c887caee..bb991f4325 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1304,8 +1304,7 @@ class execution extends control
             $this->view->executionID = $executionID;
             $this->view->projectID   = $projectID;
             $this->view->project     = $project;
-            $this->display();
-            exit;
+            return $this->display();
         }
 
         $name         = '';
@@ -2464,8 +2463,7 @@ class execution extends control
                 include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php';
             }
 
-            echo js::confirm($tips . sprintf($this->lang->execution->confirmDelete, $this->executions[$executionID]), $this->createLink('execution', 'delete', "executionID=$executionID&confirm=yes"));
-            exit;
+            return print(js::confirm($tips . sprintf($this->lang->execution->confirmDelete, $this->executions[$executionID]), $this->createLink('execution', 'delete', "executionID=$executionID&confirm=yes")));
         }
         else
         {
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 19c921774d..f1feb959f2 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -25,7 +25,7 @@
   </div>
 </body>
 </html>
-<?php exit;?>
+<?php helper::end();?>
 <?php endif;?>
 
 <?php include '../../common/view/header.html.php';?>
diff --git a/module/git/control.php b/module/git/control.php
index b0e8ee4733..efb83ec105 100644
--- a/module/git/control.php
+++ b/module/git/control.php
@@ -136,8 +136,7 @@ class git extends control
             $parsedObjects['tasks']   = array_unique($parsedObjects['tasks']);
             $parsedObjects['bugs']    = array_unique($parsedObjects['bugs']);
             $this->view->parsedObjects = $parsedObjects;
-            $this->display();
-            exit;
+            return $this->display();
         }
     }
 
diff --git a/module/program/view/create.html.php b/module/program/view/create.html.php
index 04043a5196..578ad40fba 100644
--- a/module/program/view/create.html.php
+++ b/module/program/view/create.html.php
@@ -25,7 +25,7 @@
   </div>
 </body>
 </html>
-<?php exit;?>
+<?php helper::end();?>
 <?php endif;?>
 
 <?php include '../../common/view/header.html.php';?>
diff --git a/module/story/control.php b/module/story/control.php
index b9f1fd454d..ee195dc703 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1153,8 +1153,7 @@ class story extends control
 
         if($confirm == 'no')
         {
-            echo js::confirm($this->lang->story->confirmDelete, $this->createLink('story', 'delete', "story=$storyID&confirm=yes"), '');
-            exit;
+            return print(js::confirm($this->lang->story->confirmDelete, $this->createLink('story', 'delete', "story=$storyID&confirm=yes"), ''));
         }
         else
         {
diff --git a/module/svn/control.php b/module/svn/control.php
index d33d5a9531..0cd0cc92a3 100644
--- a/module/svn/control.php
+++ b/module/svn/control.php
@@ -124,8 +124,7 @@ class svn extends control
             $parsedObjects['tasks']   = array_unique($parsedObjects['tasks']);
             $parsedObjects['bugs']    = array_unique($parsedObjects['bugs']);
             $this->view->parsedObjects = $parsedObjects;
-            $this->display();
-            exit;
+            return $this->display();
         }
     }
 
diff --git a/module/todo/control.php b/module/todo/control.php
index 0e6b5e22bf..710789c8f4 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -427,8 +427,7 @@ class todo extends control
     {
         if($confirm == 'no')
         {
-            echo js::confirm($this->lang->todo->confirmDelete, $this->createLink('todo', 'delete', "todoID=$todoID&confirm=yes"));
-            exit;
+            return print(js::confirm($this->lang->todo->confirmDelete, $this->createLink('todo', 'delete', "todoID=$todoID&confirm=yes")));
         }
         else
         {

From 7b830975394cf20767bfe4562544a9580e1d0e77 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 22 Feb 2022 14:26:30 +0800
Subject: [PATCH 21/41] * Modify query file logic.

---
 module/upgrade/config.php                 |  2 +-
 module/upgrade/model.php                  | 99 ++++++++++++++++-------
 module/upgrade/view/moveextfiles.html.php | 15 +---
 3 files changed, 71 insertions(+), 45 deletions(-)

diff --git a/module/upgrade/config.php b/module/upgrade/config.php
index a6f2839d5b..33621d5718 100644
--- a/module/upgrade/config.php
+++ b/module/upgrade/config.php
@@ -51,4 +51,4 @@ $config->upgrade->discardedBugTypes['zh-tw']['trackthings']  = '事務跟蹤';
 $config->delete['10.6'][]   = 'module/chat/ext/control/extensions.php';
 $config->delete['12.4.2'][] = 'www/js/ueditor';
 
-$config->upgrade->allModule = array('action','common','execution','job','productplan','search','testtask','admin','company','extension','kanban','program','setting','todo','api','compile','file','license','programplan','sonarqube','tree','automation','convert','git','mail','project','sso','tutorial','backup','cron','gitlab','message','projectbuild','stage','upgrade','block','custom','group','misc','projectrelease','stakeholder','user','branch','datatable','holiday','mr','projectstory','story','webhook','bug','dept','im','my','qa','svn','weekly','build','design','index','owt','release','task','caselib','dev','personnel','repo','testcase','ci','doc','install','pipeline','report','testreport','client','entry','jenkins','product','score','testsuite');
+$config->upgrade->PMSModules = array('action', 'admin', 'api', 'automation', 'backup', 'block', 'branch', 'budget', 'bug', 'build', 'caselib', 'ci', 'client', 'common', 'company', 'compile', 'convert', 'cron', 'custom', 'datatable', 'dept', 'design', 'dev', 'doc', 'durationestimation', 'entry', 'execution', 'extension', 'file', 'git', 'gitlab', 'group', 'holiday', 'im', 'index', 'index.html', 'install', 'issue', 'jenkins', 'job', 'kanban', 'license', 'mail', 'message', 'misc', 'mr', 'my', 'owt', 'personnel', 'pipeline', 'product', 'productplan', 'productset', 'program', 'programplan', 'project', 'projectbuild', 'projectrelease', 'projectstory', 'qa', 'release', 'repo', 'report', 'risk', 'score', 'search', 'setting', 'sonarqube', 'sso', 'stage', 'stakeholder', 'story', 'subject', 'svn', 'task', 'testcase', 'testreport', 'testsuite', 'testtask', 'todo', 'tree', 'tutorial', 'upgrade', 'user', 'webhook', 'weekly', 'workestimation');
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 2afe6592c7..30a9000534 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -5642,29 +5642,26 @@ class upgradeModel extends model
      */
     public function getEXTFiles()
     {
-        $files           = array();
-        $files['custom'] = array();
-        $files['charge'] = array();
+        $files         = array();
+        $allModules    = scandir($this->app->moduleRoot);
+        $skipModules   = $this->getEncryptModules($allModules);
 
-        $dirs = array('control', 'model', 'css', 'js', 'view', 'config', 'lang');
-        foreach($this->config->upgrade->allModule as $module)
+        foreach($allModules as $module)
         {
-            $extRoot = $this->app->moduleRoot . $module . DIRECTORY_SEPARATOR . 'ext';
-            if(!is_dir($extRoot)) continue;
-            
+            if($module === '.' or $module === '..' or in_array($module, $skipModules)) continue;
+
+            $dirPath = in_array($module, $this->config->upgrade->PMSModules) ? $this->app->moduleRoot . $module . DIRECTORY_SEPARATOR . 'ext' : $this->app->moduleRoot . $module;
+            $dirs    = scandir($dirPath);
             foreach($dirs as $dir)
             {
-                $realPath = $extRoot . DIRECTORY_SEPARATOR . $dir;
-                $path     = $module . DIRECTORY_SEPARATOR . 'ext' . DIRECTORY_SEPARATOR . $dir;
+                if($dir === '.' or $dir === '..') continue;
 
+                $realPath = is_file($dirPath . DIRECTORY_SEPARATOR . $dir) ? $dirPath : $dirPath . DIRECTORY_SEPARATOR . $dir;
+                $path     = in_array($module, $this->config->upgrade->PMSModules) ? $module . DIRECTORY_SEPARATOR . 'ext' . DIRECTORY_SEPARATOR . $dir : $module . DIRECTORY_SEPARATOR . $dir;
                 if(is_dir($realPath))
                 {
-                    /* If both the control and model files are encrypted, the current module is not customized. */
-                    if($dir != 'control' and $dir != 'model' and empty($files['custom'])) continue;
-
                     $extFiles = $this->getPluginFiles($module, $dir, $realPath, $path);
-                    $files['custom'] += $extFiles['custom'];
-                    $files['charge'] += $extFiles['charge'];
+                    $files += $extFiles;
                 }
             }
         }
@@ -5672,6 +5669,57 @@ class upgradeModel extends model
         return $files;
     }
 
+    /**
+     * Get encrypt modules.
+     *
+     * @param  array  $allModules
+     * @access public
+     * @return array
+     */
+    public function getEncryptModules($allModules)
+    {
+        $encryptModules = array();
+        foreach($allModules as $module)
+        {
+            if($module === '.' or $module === '..') continue;
+
+            $customFiles = array();
+            if(in_array($module, $this->config->upgrade->PMSModules))
+            {
+                $extRoot = $this->app->moduleRoot . $module . DIRECTORY_SEPARATOR . 'ext';
+                if(!is_dir($extRoot))
+                {
+                    $encryptModules[] = $module;
+                    continue;
+                }
+                else
+                {
+                    foreach(array('control', 'model') as $dir)
+                    {
+                        $realPath = $extRoot . DIRECTORY_SEPARATOR . $dir;
+                        $path     = $module . DIRECTORY_SEPARATOR . 'ext' . DIRECTORY_SEPARATOR . $dir;
+                        if(!is_dir($realPath)) continue;
+                        $customFiles += $this->getPluginFiles($module, $dir, $realPath, $path);
+                    }
+                }
+            }
+            else
+            {
+                foreach(array('control.php', 'model.php') as $file)
+                {
+                    $realPath = $this->app->moduleRoot . $module;
+                    $filePath = $this->app->moduleRoot . $module . DIRECTORY_SEPARATOR . $file;
+                    if(!is_file($filePath)) continue;
+
+                    $customFiles += $this->getPluginFiles($module, $file, $realPath, $module);
+                }
+            }
+
+            if(empty($customFiles)) $encryptModules[] = $module;
+        }
+        return $encryptModules;
+    }
+
     /**
      * Get plugin files.
      *
@@ -5684,25 +5732,20 @@ class upgradeModel extends model
      */
     public function getPluginFiles($module, $dir, $realPath, $path)
     {
-        $files = array();
-        $files['custom'] = array();
-        $files['charge'] = array();
-
-        $extFiles = scandir($realPath);
+        $files    = array();
+        $extFiles = is_file($realPath . DIRECTORY_SEPARATOR . $dir) ? array($dir) : scandir($realPath);
         foreach($extFiles as $extFile)
         {
             if($extFile === '.' or $extFile === '..') continue;
 
             $filePath = $realPath . DIRECTORY_SEPARATOR . $extFile;
-            $fileName = $path . DIRECTORY_SEPARATOR . $extFile;
+            $fileName = is_file($realPath . DIRECTORY_SEPARATOR . $dir) ? $path : $path . DIRECTORY_SEPARATOR . $extFile;
 
             /* If the current point to a directory, traverse the files in the directory. */
             if(is_dir($filePath))
             {
                 $pluginFiles = $this->getPluginFiles($module, $dir, $filePath, $fileName);
-
-                $files['custom'] += $pluginFiles['custom'];
-                $files['charge'] += $pluginFiles['charge'];
+                $files      += $pluginFiles;
             }
             else
             {
@@ -5717,13 +5760,9 @@ class upgradeModel extends model
                 fclose($handle);
 
                 /* Determine whether the current file is encrypted. */
-                if(($dir == 'control' or $dir == 'model') and strpos($line, "extension_loaded('ionCube Loader')") !== false)
+                if(strpos($line, "extension_loaded('ionCube Loader')") === false)
                 {
-                    $files['charge'][$fileName] = $fileName;
-                }
-                else
-                {
-                    $files['custom'][$fileName] = $fileName;
+                    $files[$fileName] = $fileName;
                 }
             }
         }
diff --git a/module/upgrade/view/moveextfiles.html.php b/module/upgrade/view/moveextfiles.html.php
index 6872d39285..51a9b7eb6d 100644
--- a/module/upgrade/view/moveextfiles.html.php
+++ b/module/upgrade/view/moveextfiles.html.php
@@ -21,20 +21,7 @@
           <div class="checkbox-primary" title="<?php echo $lang->selectAll?>">
             <input type='checkbox' id='checkAll' checked><label for='checkAll'><strong><?php echo $lang->upgrade->fileName;?></strong></label>
           </div>
-          <?php echo html::checkbox('files', $files['custom'], '', 'checked');?>
-          <?php if(empty($files['charge'])):?>
-          <div class="panel">
-            <div class="panel-heading" id="headingOne">
-              <h4 class="panel-title">
-                <a data-toggle="collapse" href="#collapseOne"><?php echo $lang->upgrade->viewChargeFile;?></a>
-              </h4>
-            </div>
-            <div id="collapseOne" class="collapse">
-              <?php echo html::checkbox('files', $files['custom'], '', 'checked');?>
-            </div>
-          </div>
-          <?php endif;?>
-          <div></div>
+          <?php echo html::checkbox('files', $files, '', 'checked');?>
         </div>
       </div>
       <div class='modal-footer text-center'><?php echo html::submitButton();?></div>

From 10679fa684406ec2ce405a262d3f6537214fca49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Tue, 22 Feb 2022 14:32:30 +0800
Subject: [PATCH 22/41] * Add upgrade.

---
 config/config.php               |   2 +-
 module/misc/lang/en.php         |   2 +
 module/misc/lang/zh-cn.php      |   2 +
 module/report/model.php         |   1 +
 module/upgrade/config.php       | 167 +++++++
 module/upgrade/lang/version.php | 167 +++++++
 module/upgrade/model.php        | 760 ++++++++++++++++++++++++++------
 7 files changed, 954 insertions(+), 147 deletions(-)

diff --git a/config/config.php b/config/config.php
index 5832892fe4..0af47c222b 100644
--- a/config/config.php
+++ b/config/config.php
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
 if(!function_exists('getWebRoot')){function getWebRoot(){}}
 
 /* 基本设置。Basic settings. */
-$config->version       = '16.4';               // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
+$config->version       = '16.5';               // 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.
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 77ce3e480b..9d3f90dd7a 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -94,6 +94,7 @@ $lang->misc->feature->downloadFile   = 'Download introduction';
 $lang->misc->feature->tutorialDesc   = '<p>ZenTao 15.0 has new functions, and you know how to use it through the "<strong>Tutorial</strong>".</p><p>Click your [<span style="color: #0c60e1">Avatar-Theme-Young Blue</span>] to set it.</p>';
 $lang->misc->feature->themeDesc      = '<p>ZenTao 15.0+ a new "Youth Blue" theme, the pages are more beautiful and the experience is more friendly.</p><p>Click your [<span style="color: #0c60e1">Avatar-Theme-Young Blue</span>] to set it.</p>';
 
+$lang->misc->releaseDate['16.5']        = '2022-02-22';
 $lang->misc->releaseDate['16.4']        = '2022-02-15';
 $lang->misc->releaseDate['16.3']        = '2022-01-26';
 $lang->misc->releaseDate['16.2']        = '2022-01-17';
@@ -168,6 +169,7 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['16.5'][]       = array('title' => 'Fix bug, merge all code to one package', 'desc' => '');
 $lang->misc->feature->all['16.4'][]       = array('title' => 'Implement JIRA import function and improve plug-in extension mechanism.', 'desc' => '');
 $lang->misc->feature->all['16.3'][]       = array('title' => 'Kanban adds related plan/release/version/iteration functions, and the detail experience is optimized, fix bugs.', 'desc' => '');
 $lang->misc->feature->all['16.2'][]       = array('title' => 'Add kanban model project, fix bugs.', 'desc' => '');
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index 3341512918..8180645d27 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -94,6 +94,7 @@ $lang->misc->feature->downloadFile   = '下载新版本功能介绍文档';
 $lang->misc->feature->tutorialDesc   = "<p>禅道15系列新增了多项功能，您可以通过“<strong>新手引导教程</strong>”快速了解禅道的基本使用方法。</p><p>通过鼠标经过 [<span style='color: #0c60e1'>头像-新手引导</span>]，点击新手引导，即可进入新手引导教程。</p>";
 $lang->misc->feature->themeDesc      = "<p>禅道15系列上线了全新的“青春蓝”主题，页面呈现更加美观，体验更加友好。</p><p>通过鼠标经过 [<span style='color: #0c60e1'>头像-主题-青春蓝</span>]，点击青春蓝，即可设置成功。</p>";
 
+$lang->misc->releaseDate['16.5']        = '2022-02-22';
 $lang->misc->releaseDate['16.4']        = '2022-02-15';
 $lang->misc->releaseDate['16.3']        = '2022-01-26';
 $lang->misc->releaseDate['16.2']        = '2022-01-17';
@@ -168,6 +169,7 @@ $lang->misc->releaseDate['7.2.stable']  = '2015-05-22';
 $lang->misc->releaseDate['7.1.stable']  = '2015-03-07';
 $lang->misc->releaseDate['6.3.stable']  = '2014-11-07';
 
+$lang->misc->feature->all['16.5'][]       = array('title' => '实现一码多面，多个禅道版本集成到一个包中。', 'desc' => '');
 $lang->misc->feature->all['16.4'][]       = array('title' => '实现JIRA导入功能，完善插件扩展机制。', 'desc' => '');
 $lang->misc->feature->all['16.3'][]       = array('title' => '看板增加关联计划/发布/版本/迭代功能，细节体验优化。', 'desc' => '');
 $lang->misc->feature->all['16.2'][]       = array('title' => '新增专业研发看板，可以创建看板模型项目，修复Bug。', 'desc' => '');
diff --git a/module/report/model.php b/module/report/model.php
index f5377e35a3..0badfbb7d6 100644
--- a/module/report/model.php
+++ b/module/report/model.php
@@ -390,6 +390,7 @@ class reportModel extends model
                     $workload[$user]['total']['count']   = isset($workload[$user]['total']['count'])   ? $workload[$user]['total']['count']  + 1 : 1;
                     $workload[$user]['total']['manhour'] = isset($workload[$user]['total']['manhour']) ? $workload[$user]['total']['manhour'] + $task->left : $task->left;
                 }
+
                 $workload[$user]['task']['project'] = $project;
             }
         }
diff --git a/module/upgrade/config.php b/module/upgrade/config.php
index 33621d5718..bf1b7baff3 100644
--- a/module/upgrade/config.php
+++ b/module/upgrade/config.php
@@ -1,4 +1,171 @@
 <?php
+$config->maxVersion = array();
+$config->maxVersion['max2_0_rc1']   = '15_0_rc3';
+$config->maxVersion['max2_0']       = '15_0';
+$config->maxVersion['max2_1']       = '15_3';
+$config->maxVersion['max2_2']       = '15_5';
+$config->maxVersion['max2_3']       = '15_7';
+$config->maxVersion['max2_3_1']     = '15_7_1';
+$config->maxVersion['max2_4_beta1'] = '16_0_beta1';
+$config->maxVersion['max2_4']       = '16_0';
+$config->maxVersion['max2_5']       = '16_1';
+$config->maxVersion['max2_6']       = '16_2';
+$config->maxVersion['max2_7']       = '16_3';
+$config->maxVersion['max2_8']       = '16_4';
+
+$config->bizVersion = array();
+$config->bizVersion['biz1_0']       = '9_5_1';
+$config->bizVersion['biz1_1']       = '9_6_3';
+$config->bizVersion['biz1_1_1']     = '9_8';
+$config->bizVersion['biz1_1_2']     = '9_8_1';
+$config->bizVersion['biz1_1_3']     = '9_8_2';
+$config->bizVersion['biz1_1_4']     = '9_8_3';
+$config->bizVersion['biz2_0_beta']  = '10_0';
+$config->bizVersion['biz2_1']       = '10_3';
+$config->bizVersion['biz2_2']       = '10_4';
+$config->bizVersion['biz2_3']       = '10_5';
+$config->bizVersion['biz2_3_1']     = '10_6';
+$config->bizVersion['biz2_4']       = '10_6';
+$config->bizVersion['biz3_0']       = '11_1';
+$config->bizVersion['biz3_1']       = '11_2';
+$config->bizVersion['biz3_2']       = '11_3';
+$config->bizVersion['biz3_2_1']     = '11_4_1';
+$config->bizVersion['biz3_3']       = '11_5';
+$config->bizVersion['biz3_4']       = '11_6';
+$config->bizVersion['biz3_5_alpha'] = '11_6';
+$config->bizVersion['biz3_5_beta']  = '11_6_1';
+$config->bizVersion['biz3_5']       = '11_6_5';
+$config->bizVersion['biz3_5_1']     = '11_7';
+$config->bizVersion['biz3_6']       = '12_0';
+$config->bizVersion['biz3_6_1']     = '12_0_1';
+$config->bizVersion['biz3_7']       = '12_2';
+$config->bizVersion['biz3_7_1']     = '12_3_2';
+$config->bizVersion['biz3_7_2']     = '12_3_3';
+$config->bizVersion['biz4_0']       = '12_4';
+$config->bizVersion['biz4_0_1']     = '12_4_1';
+$config->bizVersion['biz4_0_2']     = '12_4_2';
+$config->bizVersion['biz4_0_3']     = '12_4_3';
+$config->bizVersion['biz4_0_4']     = '12_4_4';
+$config->bizVersion['biz4_1']       = '12_5';
+$config->bizVersion['biz4_1_1']     = '12_5_1';
+$config->bizVersion['biz4_1_2']     = '12_5_2';
+$config->bizVersion['biz4_1_3']     = '12_5_3';
+$config->bizVersion['biz5_0_rc1']   = '15_0_rc3';
+$config->bizVersion['biz5_0']       = '15_0';
+$config->bizVersion['biz5_0_1']     = '15_0_3';
+$config->bizVersion['biz5_1']       = '15_3';
+$config->bizVersion['biz5_2']       = '15_5';
+$config->bizVersion['biz5_3']       = '15_7';
+$config->bizVersion['biz5_3_1']     = '15_7_1';
+$config->bizVersion['biz6_0_beta1'] = '16_0_beta1';
+$config->bizVersion['biz6_0']       = '16_0';
+$config->bizVersion['biz6_1']       = '16_1';
+$config->bizVersion['biz6_2']       = '16_2';
+$config->bizVersion['biz6_3']       = '16_3';
+$config->bizVersion['biz6_4']       = '16_4';
+
+$config->proVersion = array();
+$config->proVersion['pro1_0']        = '3_1';
+$config->proVersion['pro1_1']        = '3_2';
+$config->proVersion['pro1_1_1']      = '3_2_1';
+$config->proVersion['pro1_2']        = '3_3';
+$config->proVersion['pro1_3']        = '3_3';
+$config->proVersion['pro2_0']        = '4_0';
+$config->proVersion['pro2_0_1']      = '4_0_1';
+$config->proVersion['pro2_1']        = '4_1';
+$config->proVersion['pro2_2_beta']   = '4_2_beta';
+$config->proVersion['pro2_3_beta']   = '4_3_beta';
+$config->proVersion['pro3_0_beta1']  = '5_0_beta1';
+$config->proVersion['pro3_0_beta1']  = '5_0_beta2';
+$config->proVersion['pro3_0']        = '5_0';
+$config->proVersion['pro3_1']        = '5_1';
+$config->proVersion['pro3_2']        = '5_2';
+$config->proVersion['pro3_2_1']      = '5_2_1';
+$config->proVersion['pro3_3']        = '5_3';
+$config->proVersion['pro4_0_beta1']  = '6_0';
+$config->proVersion['pro4_0']        = '6_1';
+$config->proVersion['pro4_1_beta']   = '6_2';
+$config->proVersion['pro4_2']        = '6_3';
+$config->proVersion['pro4_3']        = '6_3';
+$config->proVersion['pro4_4']        = '7_0';
+$config->proVersion['pro4_5']        = '7_1';
+$config->proVersion['pro4_6']        = '7_2_4';
+$config->proVersion['pro4_7']        = '7_2_5';
+$config->proVersion['pro4_7_1']      = '7_3';
+$config->proVersion['pro5_0']        = '8_0';
+$config->proVersion['pro5_0_1']      = '8_0_1';
+$config->proVersion['pro5_1']        = '8_1';
+$config->proVersion['pro5_1_3']      = '8_1_3';
+$config->proVersion['pro5_2']        = '8_2';
+$config->proVersion['pro5_2_1']      = '8_2_1';
+$config->proVersion['pro5_3']        = '8_2_3';
+$config->proVersion['pro5_3_1']      = '8_2_4';
+$config->proVersion['pro5_3_2']      = '8_2_5';
+$config->proVersion['pro5_3_3']      = '8_2_6';
+$config->proVersion['pro5_4']        = '8_3';
+$config->proVersion['pro5_4_1']      = '8_3_1';
+$config->proVersion['pro5_5']        = '8_4';
+$config->proVersion['pro5_5_1']      = '8_4_1';
+$config->proVersion['pro6_0_beta']   = '9_0_beta';
+$config->proVersion['pro6_0']        = '9_0';
+$config->proVersion['pro6_0_1']      = '9_0_1';
+$config->proVersion['pro6_1']        = '9_1';
+$config->proVersion['pro6_2']        = '9_1_2';
+$config->proVersion['pro6_3']        = '9_2';
+$config->proVersion['pro6_3_1']      = '9_2_1';
+$config->proVersion['pro6_4']        = '9_4';
+$config->proVersion['pro6_5']        = '9_5';
+$config->proVersion['pro6_5_1']      = '9_5_1';
+$config->proVersion['pro6_6']        = '9_6_3';
+$config->proVersion['pro6_6_1']      = '9_7';
+$config->proVersion['pro6_7']        = '9_8';
+$config->proVersion['pro6_7_1']      = '9_8_1';
+$config->proVersion['pro6_7_2']      = '9_8_2';
+$config->proVersion['pro6_7_3']      = '9_8_3';
+$config->proVersion['pro7_0_beta']   = '10_0';
+$config->proVersion['pro7_1']        = '10_1';
+$config->proVersion['pro7_2']        = '10_3';
+$config->proVersion['pro7_3']        = '10_4';
+$config->proVersion['pro7_4']        = '10_5';
+$config->proVersion['pro7_5']        = '10_5_1';
+$config->proVersion['pro7_5_1']      = '10_6';
+$config->proVersion['pro8_0']        = '11_1';
+$config->proVersion['pro8_1']        = '11_2';
+$config->proVersion['pro8_2']        = '11_3';
+$config->proVersion['pro8_3']        = '11_4_1';
+$config->proVersion['pro8_3_1']      = '11_4_1';
+$config->proVersion['pro8_4']        = '11_5';
+$config->proVersion['pro8_5']        = '11_6';
+$config->proVersion['pro8_5_1']      = '11_6_1';
+$config->proVersion['pro8_5_2']      = '11_6_3';
+$config->proVersion['pro8_5_3']      = '11_6_5';
+$config->proVersion['pro8_6']        = '11_7';
+$config->proVersion['pro8_7']        = '12_0';
+$config->proVersion['pro8_7_1']      = '12_0_1';
+$config->proVersion['pro8_8']        = '12_2';
+$config->proVersion['pro8_8_1']      = '12_3_1';
+$config->proVersion['pro8_8_2']      = '12_3_2';
+$config->proVersion['pro8_8_3']      = '12_3_3';
+$config->proVersion['pro8_9']        = '12_4';
+$config->proVersion['pro8_9_1']      = '12_4_1';
+$config->proVersion['pro8_9_2']      = '12_4_2';
+$config->proVersion['pro8_9_3']      = '12_4_3';
+$config->proVersion['pro8_9_4']      = '12_4_4';
+$config->proVersion['pro9_0']        = '12_5';
+$config->proVersion['pro9_0_1']      = '12_5_1';
+$config->proVersion['pro9_0_2']      = '12_5_2';
+$config->proVersion['pro9_0_3']      = '12_5_3';
+$config->proVersion['pro10_0_rc1']   = '15_0_rc3';
+$config->proVersion['pro10_0']       = '15_0';
+$config->proVersion['pro10_0_1']     = '15_0_2';
+$config->proVersion['pro10_0_2']     = '15_0_3';
+$config->proVersion['pro10_1']       = '15_3';
+$config->proVersion['pro10_2']       = '15_5';
+$config->proVersion['pro10_3']       = '15_7';
+$config->proVersion['pro10_3_1']     = '15_7_1';
+$config->proVersion['pro11_0_beta1'] = '16_0_beta1';
+$config->proVersion['pro11_0']       = '16_0';
+
 $config->upgrade = new stdclass();
 $config->upgrade->lowerTables = array();
 $config->upgrade->lowerTables[$config->db->prefix . 'caseStep']       = $config->db->prefix . 'casestep';
diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php
index 2a6a6a4447..26afc07ee1 100644
--- a/module/upgrade/lang/version.php
+++ b/module/upgrade/lang/version.php
@@ -1,4 +1,5 @@
 <?php
+/* Open. */
 $lang->upgrade->fromVersions['0_3beta']    = '0.3 BETA';
 $lang->upgrade->fromVersions['0_4beta']    = '0.4 BETA';
 $lang->upgrade->fromVersions['0_5beta']    = '0.5 BETA';
@@ -152,3 +153,169 @@ $lang->upgrade->fromVersions['16_0']       = '16.0';
 $lang->upgrade->fromVersions['16_1']       = '16.1';
 $lang->upgrade->fromVersions['16_2']       = '16.2';
 $lang->upgrade->fromVersions['16_3']       = '16.3';
+$lang->upgrade->fromVersions['16_4']       = '16.4';
+
+/* Pro. */
+$lang->upgrade->fromVersions['pro1_0']        = 'Pro1.0';
+$lang->upgrade->fromVersions['pro1_1']        = 'Pro1.1';
+$lang->upgrade->fromVersions['pro1_1_1']      = 'Pro1.1.1';
+$lang->upgrade->fromVersions['pro1_2']        = 'Pro1.2';
+$lang->upgrade->fromVersions['pro1_3']        = 'Pro1.3';
+$lang->upgrade->fromVersions['pro2_0']        = 'Pro2.0';
+$lang->upgrade->fromVersions['pro2_0_1']      = 'Pro2.0.1';
+$lang->upgrade->fromVersions['pro2_1']        = 'Pro2.1';
+$lang->upgrade->fromVersions['pro2_2_beta']   = 'Pro2.2.beta';
+$lang->upgrade->fromVersions['pro2_3_beta']   = 'Pro2.3.beta';
+$lang->upgrade->fromVersions['pro3_0_beta1']  = 'Pro3.0.beta1';
+$lang->upgrade->fromVersions['pro3_0']        = 'Pro3.0';
+$lang->upgrade->fromVersions['pro3_1']        = 'Pro3.1';
+$lang->upgrade->fromVersions['pro3_2']        = 'Pro3.2';
+$lang->upgrade->fromVersions['pro3_2_1']      = 'Pro3.2.1';
+$lang->upgrade->fromVersions['pro3_3']        = 'Pro3.3';
+$lang->upgrade->fromVersions['pro4_0_beta1']  = 'Pro4.0.beta1';
+$lang->upgrade->fromVersions['pro4_0']        = 'Pro4.0';
+$lang->upgrade->fromVersions['pro4_1_beta']   = 'Pro4.1.beta';
+$lang->upgrade->fromVersions['pro4_2']        = 'Pro4.2';
+$lang->upgrade->fromVersions['pro4_3']        = 'Pro4.3';
+$lang->upgrade->fromVersions['pro4_4']        = 'Pro4.4';
+$lang->upgrade->fromVersions['pro4_5']        = 'Pro4.5';
+$lang->upgrade->fromVersions['pro4_6']        = 'Pro4.6';
+$lang->upgrade->fromVersions['pro4_7']        = 'Pro4.7';
+$lang->upgrade->fromVersions['pro4_7_1']      = 'Pro4.7.1';
+$lang->upgrade->fromVersions['pro5_0']        = 'Pro5.0';
+$lang->upgrade->fromVersions['pro5_0_1']      = 'Pro5.0.1';
+$lang->upgrade->fromVersions['pro5_1']        = 'Pro5.1';
+$lang->upgrade->fromVersions['pro5_1_3']      = 'Pro5.1.3';
+$lang->upgrade->fromVersions['pro5_2']        = 'Pro5.2';
+$lang->upgrade->fromVersions['pro5_2_1']      = 'Pro5.2.1';
+$lang->upgrade->fromVersions['pro5_3']        = 'Pro5.3';
+$lang->upgrade->fromVersions['pro5_3_1']      = 'Pro5.3.1';
+$lang->upgrade->fromVersions['pro5_3_2']      = 'Pro5.3.2';
+$lang->upgrade->fromVersions['pro5_3_3']      = 'Pro5.3.3';
+$lang->upgrade->fromVersions['pro5_4']        = 'Pro5.4';
+$lang->upgrade->fromVersions['pro5_4_1']      = 'Pro5.4.1';
+$lang->upgrade->fromVersions['pro5_5']        = 'Pro5.5';
+$lang->upgrade->fromVersions['pro5_5_1']      = 'Pro5.5.1';
+$lang->upgrade->fromVersions['pro6_0_beta']   = 'Pro6.0.beta';
+$lang->upgrade->fromVersions['pro6_0']        = 'Pro6.0';
+$lang->upgrade->fromVersions['pro6_0_1']      = 'Pro6.0.1';
+$lang->upgrade->fromVersions['pro6_1']        = 'Pro6.1';
+$lang->upgrade->fromVersions['pro6_2']        = 'Pro6.2';
+$lang->upgrade->fromVersions['pro6_3']        = 'Pro6.3';
+$lang->upgrade->fromVersions['pro6_3_1']      = 'Pro6.3.1';
+$lang->upgrade->fromVersions['pro6_4']        = 'Pro6.4';
+$lang->upgrade->fromVersions['pro6_5']        = 'Pro6.5';
+$lang->upgrade->fromVersions['pro6_5_1']      = 'Pro6.5.1';
+$lang->upgrade->fromVersions['pro6_6']        = 'Pro6.6';
+$lang->upgrade->fromVersions['pro6_6_1']      = 'Pro6.6.1';
+$lang->upgrade->fromVersions['pro6_7']        = 'Pro6.7';
+$lang->upgrade->fromVersions['pro6_7_1']      = 'Pro6.7.1';
+$lang->upgrade->fromVersions['pro6_7_2']      = 'Pro6.7.2';
+$lang->upgrade->fromVersions['pro6_7_3']      = 'Pro6.7.3';
+$lang->upgrade->fromVersions['pro7_0_beta']   = 'Pro7.0.beta';
+$lang->upgrade->fromVersions['pro7_1']        = 'Pro7.1';
+$lang->upgrade->fromVersions['pro7_2']        = 'Pro7.2';
+$lang->upgrade->fromVersions['pro7_3']        = 'Pro7.3';
+$lang->upgrade->fromVersions['pro7_4']        = 'Pro7.4';
+$lang->upgrade->fromVersions['pro7_5']        = 'Pro7.5';
+$lang->upgrade->fromVersions['pro7_5_1']      = 'Pro7.5.1';
+$lang->upgrade->fromVersions['pro8_0']        = 'Pro8.0';
+$lang->upgrade->fromVersions['pro8_1']        = 'Pro8.1';
+$lang->upgrade->fromVersions['pro8_2']        = 'Pro8.2';
+$lang->upgrade->fromVersions['pro8_3']        = 'Pro8.3';
+$lang->upgrade->fromVersions['pro8_3_1']      = 'Pro8.3.1';
+$lang->upgrade->fromVersions['pro8_4']        = 'Pro8.4';
+$lang->upgrade->fromVersions['pro8_5']        = 'Pro8.5';
+$lang->upgrade->fromVersions['pro8_5_1']      = 'Pro8.5.1';
+$lang->upgrade->fromVersions['pro8_5_2']      = 'Pro8.5.2';
+$lang->upgrade->fromVersions['pro8_5_3']      = 'Pro8.5.3';
+$lang->upgrade->fromVersions['pro8_6']        = 'Pro8.6';
+$lang->upgrade->fromVersions['pro8_7']        = 'Pro8.7';
+$lang->upgrade->fromVersions['pro8_7_1']      = 'Pro8.7.1';
+$lang->upgrade->fromVersions['pro8_8']        = 'Pro8.8';
+$lang->upgrade->fromVersions['pro8_8_1']      = 'Pro8.8.1';
+$lang->upgrade->fromVersions['pro8_8_2']      = 'Pro8.8.2';
+$lang->upgrade->fromVersions['pro8_8_3']      = 'Pro8.8.3';
+$lang->upgrade->fromVersions['pro8_9']        = 'Pro8.9';
+$lang->upgrade->fromVersions['pro8_9_1']      = 'Pro8.9.1';
+$lang->upgrade->fromVersions['pro8_9_2']      = 'Pro8.9.2';
+$lang->upgrade->fromVersions['pro8_9_3']      = 'Pro8.9.3';
+$lang->upgrade->fromVersions['pro8_9_4']      = 'Pro8.9.4';
+$lang->upgrade->fromVersions['pro9_0']        = 'Pro9.0';
+$lang->upgrade->fromVersions['pro9_0_1']      = 'Pro9.0.1';
+$lang->upgrade->fromVersions['pro9_0_2']      = 'Pro9.0.2';
+$lang->upgrade->fromVersions['pro9_0_3']      = 'Pro9.0.3';
+$lang->upgrade->fromVersions['pro10_0_rc1']   = 'Pro10.0.rc1';
+$lang->upgrade->fromVersions['pro10_0']       = 'Pro10.0';
+$lang->upgrade->fromVersions['pro10_0_1']     = 'Pro10.0.1';
+$lang->upgrade->fromVersions['pro10_0_2']     = 'Pro10.0.2';
+$lang->upgrade->fromVersions['pro10_1']       = 'Pro10.1';
+$lang->upgrade->fromVersions['pro10_2']       = 'Pro10.2';
+$lang->upgrade->fromVersions['pro10_3']       = 'Pro10.3';
+$lang->upgrade->fromVersions['pro10_3_1']     = 'Pro10.3.1';
+$lang->upgrade->fromVersions['pro11_0_beta1'] = 'Pro11.0.beta1';
+
+/* Biz. */
+$lang->upgrade->fromVersions['biz1_0']       = 'Biz1.0';
+$lang->upgrade->fromVersions['biz1_1']       = 'Biz1.1';
+$lang->upgrade->fromVersions['biz1_1_1']     = 'Biz1.1.1';
+$lang->upgrade->fromVersions['biz1_1_2']     = 'Biz1.1.2';
+$lang->upgrade->fromVersions['biz1_1_3']     = 'Biz1.1.3';
+$lang->upgrade->fromVersions['biz1_1_4']     = 'Biz1.1.4';
+$lang->upgrade->fromVersions['biz2_0_beta']  = 'Biz2.0.beta';
+$lang->upgrade->fromVersions['biz2_1']       = 'Biz2.1';
+$lang->upgrade->fromVersions['biz2_2']       = 'Biz2.2';
+$lang->upgrade->fromVersions['biz2_3']       = 'Biz2.3';
+$lang->upgrade->fromVersions['biz2_3_1']     = 'Biz2.3.1';
+$lang->upgrade->fromVersions['biz2_4']       = 'Biz2.4';
+$lang->upgrade->fromVersions['biz3_0']       = 'Biz3.0';
+$lang->upgrade->fromVersions['biz3_1']       = 'Biz3.1';
+$lang->upgrade->fromVersions['biz3_2']       = 'Biz3.2';
+$lang->upgrade->fromVersions['biz3_2_1']     = 'Biz3.2.1';
+$lang->upgrade->fromVersions['biz3_3']       = 'Biz3.3';
+$lang->upgrade->fromVersions['biz3_4']       = 'Biz3.4';
+$lang->upgrade->fromVersions['biz3_5_alpha'] = 'Biz3.5.alpha';
+$lang->upgrade->fromVersions['biz3_5_beta']  = 'Biz3.5.beta';
+$lang->upgrade->fromVersions['biz3_5']       = 'Biz3.5';
+$lang->upgrade->fromVersions['biz3_5_1']     = 'Biz3.5.1';
+$lang->upgrade->fromVersions['biz3_6']       = 'Biz3.6';
+$lang->upgrade->fromVersions['biz3_6_1']     = 'Biz3.6.1';
+$lang->upgrade->fromVersions['biz3_7']       = 'Biz3.7';
+$lang->upgrade->fromVersions['biz3_7_1']     = 'Biz3.7.1';
+$lang->upgrade->fromVersions['biz3_7_2']     = 'Biz3.7.2';
+$lang->upgrade->fromVersions['biz4_0']       = 'Biz4.0';
+$lang->upgrade->fromVersions['biz4_0_1']     = 'Biz4.0.1';
+$lang->upgrade->fromVersions['biz4_0_2']     = 'Biz4.0.2';
+$lang->upgrade->fromVersions['biz4_0_3']     = 'Biz4.0.3';
+$lang->upgrade->fromVersions['biz4_0_4']     = 'Biz4.0.4';
+$lang->upgrade->fromVersions['biz4_1']       = 'Biz4.1';
+$lang->upgrade->fromVersions['biz4_1_1']     = 'Biz4.1.1';
+$lang->upgrade->fromVersions['biz4_1_2']     = 'Biz4.1.2';
+$lang->upgrade->fromVersions['biz4_1_3']     = 'Biz4.1.3';
+$lang->upgrade->fromVersions['biz5_0_rc1']   = 'Biz5.0.rc1';
+$lang->upgrade->fromVersions['biz5_0']       = 'Biz5.0';
+$lang->upgrade->fromVersions['biz5_0_1']     = 'Biz5.0.1';
+$lang->upgrade->fromVersions['biz5_1']       = 'Biz5.1';
+$lang->upgrade->fromVersions['biz5_2']       = 'Biz5.2';
+$lang->upgrade->fromVersions['biz5_3']       = 'Biz5.3';
+$lang->upgrade->fromVersions['biz5_3_1']     = 'Biz5.3.1';
+$lang->upgrade->fromVersions['biz6_0_beta1'] = 'Biz6.0.beta1';
+$lang->upgrade->fromVersions['biz6_0']       = 'Biz6.0';
+$lang->upgrade->fromVersions['biz6_1']       = 'Biz6.1';
+$lang->upgrade->fromVersions['biz6_2']       = 'Biz6.2';
+$lang->upgrade->fromVersions['biz6_3']       = 'Biz6.3';
+$lang->upgrade->fromVersions['biz6_4']       = 'Biz6.4';
+
+/* Max. */
+$lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4';
+$lang->upgrade->fromVersions['max2_0_rc1']   = 'Max2.0.rc1';
+$lang->upgrade->fromVersions['max2_0']       = 'Max2.0';
+$lang->upgrade->fromVersions['max2_1']       = 'Max2.1';
+$lang->upgrade->fromVersions['max2_2']       = 'Max2.2';
+$lang->upgrade->fromVersions['max2_3']       = 'Max2.3';
+$lang->upgrade->fromVersions['max2_3_1']     = 'Max2.3.1';
+$lang->upgrade->fromVersions['max2_4_beta1'] = 'Max2.4.beta1';
+$lang->upgrade->fromVersions['max2_4']       = 'Max2.4';
+$lang->upgrade->fromVersions['max2_5']       = 'Max2.5';
+$lang->upgrade->fromVersions['max2_6']       = 'Max2.6';
+$lang->upgrade->fromVersions['max2_7']       = 'Max2.7';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 30a9000534..ec92774102 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -37,8 +37,39 @@ class upgradeModel extends model
     public function execute($fromVersion)
     {
         set_time_limit(0);
+
+        $openVersion = $fromVersion;
+        if(strpos($fromVersion, 'pro') !== false) 
+        {
+            $openVersion = $this->config->proVersion[$fromVersion];
+            $this->executePro($fromVersion);
+        }
+        elseif(strpos($fromVersion, 'biz') !== false) 
+        {
+            $openVersion = $this->config->bizVersion[$fromVersion];
+            $proVersion  = array_search($openVersion, $this->config->proVersion);
+
+            $this->executePro($proVersion);
+            $this->executeBiz($fromVersion);
+        }
+        elseif(strpos($fromVersion, 'max') !== false) 
+        {
+            $openVersion = $this->config->maxVersion[$fromVersion];
+            $proVersion  = array_search($openVersion, $this->config->proVersion);
+            $bizVersion  = array_search($openVersion, $this->config->bizVersion);
+
+            $this->executePro($proVersion);
+            $this->executeBiz($bizVersion);
+            $this->executeMax($fromVersion);
+        }
+
+        $this->executeOpen($openVersion, $fromVersion);
+    }
+
+    public function executeOpen($openVersion, $fromVersion)
+    {
         $executeXuanxuan = false;
-        switch($fromVersion)
+        switch($openVersion)
         {
         case '0_3beta':
             $this->saveLogs('Execute 0_3beta');
@@ -110,337 +141,259 @@ class upgradeModel extends model
         case '3_1':
             $this->saveLogs('Execute 3_1');
             $this->execSQL($this->getUpgradeFile('3.1'));
-            $this->appendExec('3_1');
         case '3_2':
             $this->saveLogs('Execute 3_2');
             $this->execSQL($this->getUpgradeFile('3.2'));
-            $this->appendExec('3_2');
         case '3_2_1':
             $this->saveLogs('Execute 3_2_1');
             $this->execSQL($this->getUpgradeFile('3.2.1'));
-            $this->appendExec('3_2_1');
         case '3_3':
             $this->saveLogs('Execute 3_3');
             $this->execSQL($this->getUpgradeFile('3.3'));
             $this->updateTaskAssignedTo();
-            $this->appendExec('3_3');
         case '4_0_beta1':
             $this->saveLogs('Execute 4_0_beta1');
             $this->execSQL($this->getUpgradeFile('4.0.beta1'));
-            $this->appendExec('4_0_beta1');
         case '4_0_beta2':
             $this->saveLogs('Execute 4_0_beta2');
             $this->execSQL($this->getUpgradeFile('4.0.beta2'));
             $this->updateProjectType();
             $this->updateEstimatePriv();
-            $this->appendExec('4_0_beta2');
         case '4_0':
             $this->saveLogs('Execute 4_0');
             $this->execSQL($this->getUpgradeFile('4.0'));
-            $this->appendExec('4_0');
         case '4_0_1':
             $this->saveLogs('Execute 4_0_1');
             $this->execSQL($this->getUpgradeFile('4.0.1'));
             $this->addPriv4_0_1();
-            $this->appendExec('4_0_1');
         case '4_1':
             $this->saveLogs('Execute 4_1');
             $this->execSQL($this->getUpgradeFile('4.1'));
             $this->addPriv4_1();
             $this->processTaskFinish();
             $this->deleteCompany();
-            $this->appendExec('4_1');
         case '4_2_beta':
             $this->saveLogs('Execute 4_2_beta');
             $this->execSQL($this->getUpgradeFile('4.2'));
-            $this->appendExec('4_2_beta');
         case '4_3_beta':
             $this->saveLogs('Execute 4_3_beta');
             $this->execSQL($this->getUpgradeFile('4.3'));
-            $this->appendExec('4_3_beta');
         case '5_0_beta1':
             $this->saveLogs('Execute 5_0_beta1');
-            $this->appendExec('5_0_beta1');
         case '5_0_beta2':
             $this->saveLogs('Execute 5_0_beta2');
-            $this->appendExec('5_0_beta2');
         case '5_0':
             $this->saveLogs('Execute 5_0');
-            $this->appendExec('5_0');
         case '5_1':
             $this->saveLogs('Execute 5_1');
-            $this->appendExec('5_1');
         case '5_2':
             $this->saveLogs('Execute 5_2');
-            $this->appendExec('5_2');
         case '5_2_1':
             $this->saveLogs('Execute 5_2_1');
             $this->mergeProjectGoalAndDesc();
             $this->execSQL($this->getUpgradeFile('5.2.1'));
-            $this->appendExec('5_2_1');
         case '5_3':
             $this->saveLogs('Execute 5_3');
-            $this->appendExec('5_3');
         case '6_0_beta1':
             $this->saveLogs('Execute 6_0_beta');
             $this->execSQL($this->getUpgradeFile('6.0.beta1'));
             $this->toLowerTable();
             $this->fixBugOSInfo();
             $this->fixTaskFinishedBy();
-            $this->appendExec('6_0_beta1');
         case '6_0':
             $this->saveLogs('Execute 6_0');
             $this->execSQL($this->getUpgradeFile('6.0'));
             $this->fixDataIndex();
-            $this->appendExec('6_0');
         case '6_1':
             $this->saveLogs('Execute 6_1');
             $this->execSQL($this->getUpgradeFile('6.1'));
-            $this->appendExec('6_1');
         case '6_2':
             $this->saveLogs('Execute 6_2');
-            $this->appendExec('6_2');
         case '6_3':
             $this->saveLogs('Execute 6_3');
-            $this->appendExec('6_3');
         case '6_4':
             $this->saveLogs('Execute 6_4');
-            $this->appendExec('6_4');
         case '7_0':
             $this->saveLogs('Execute 7_0');
             $this->execSQL($this->getUpgradeFile('7.0'));
-            $this->appendExec('7_0');
         case '7_1':
             $this->saveLogs('Execute 7_1');
             $this->execSQL($this->getUpgradeFile('7.1'));
             $this->initOrder();
-            $this->appendExec('7_1');
         case '7_2':
             $this->saveLogs('Execute 7_2');
-            $this->appendExec('7_2');
         case '7_2_4':
             $this->saveLogs('Execute 7_2_4');
             $this->execSQL($this->getUpgradeFile('7.2.4'));
-            $this->appendExec('7_2_4');
         case '7_2_5':
             $this->saveLogs('Execute 7_2_5');
             $this->adjustOrder7_3();
-            $this->appendExec('7_2_5');
         case '7_3':
             $this->saveLogs('Execute 7_3');
             $this->execSQL($this->getUpgradeFile('7.3'));
             $this->adjustPriv7_4_beta();
-            $this->appendExec('7_3');
         case '7_4_beta':
             $this->saveLogs('Execute 7_4_beta');
             $this->execSQL($this->getUpgradeFile('7.4.beta'));
-            $this->appendExec('7_4_beta');
         case '8_0':
             $this->saveLogs('Execute 8_0');
-            $this->appendExec('8_0');
         case '8_0_1':
             $this->saveLogs('Execute 8_0_1');
             $this->execSQL($this->getUpgradeFile('8.0.1'));
             $this->addPriv8_1();
-            $this->appendExec('8_0_1');
         case '8_1':
             $this->saveLogs('Execute 8_1');
             $this->execSQL($this->getUpgradeFile('8.1'));
-            $this->appendExec('8_1');
         case '8_1_3':
             $this->saveLogs('Execute 8_1_3');
             $this->execSQL($this->getUpgradeFile('8.1.3'));
             $this->addPriv8_2_beta();
             $this->adjustConfigSectionAndKey();
-            $this->appendExec('8_1_3');
         case '8_2_beta':
             $this->saveLogs('Execute 8_2_beta');
-            $this->appendExec('8_2_beta');
         case '8_2':
             $this->saveLogs('Execute 8_2');
-            $this->appendExec('8_2');
         case '8_2_1':
             $this->saveLogs('Execute 8_2_1');
             $this->execSQL($this->getUpgradeFile('8.2.1'));
-            $this->appendExec('8_2_1');
         case '8_2_2':
             $this->saveLogs('Execute 8_2_2');
-            $this->appendExec('8_2_2');
         case '8_2_3':
             $this->saveLogs('Execute 8_2_3');
-            $this->appendExec('8_2_3');
         case '8_2_4':
             $this->saveLogs('Execute 8_2_4');
-            $this->appendExec('8_2_4');
         case '8_2_5':
             $this->saveLogs('Execute 8_2_5');
-            $this->appendExec('8_2_5');
         case '8_2_6':
             $this->saveLogs('Execute 8_2_6');
             $this->execSQL($this->getUpgradeFile('8.2.6'));
             $this->adjustDocModule();
             $this->moveDocContent();
             $this->adjustPriv8_3();
-            $this->appendExec('8_2_6');
         case '8_3':
             $this->saveLogs('Execute 8_3');
-            $this->appendExec('8_3');
         case '8_3_1':
             $this->saveLogs('Execute 8_3_1');
             $this->execSQL($this->getUpgradeFile('8.3.1'));
             $this->renameMainLib();
             $this->adjustPriv8_4();
-            $this->appendExec('8_3_1');
         case '8_4':
             $this->saveLogs('Execute 8_4');
-            $this->appendExec('8_4');
         case '8_4_1':
             $this->saveLogs('Execute 8_4_1');
             $this->execSQL($this->getUpgradeFile('8.4.1'));
-            $this->appendExec('8_4_1');
         case '9_0_beta':
             $this->saveLogs('Execute 9_0_beta');
             $this->execSQL($this->getUpgradeFile('9.0.beta'));
             $this->adjustPriv9_0();
-            $this->appendExec('9_0_beta');
         case '9_0':
             $this->saveLogs('Execute 9_0');
             $this->fixProjectProductData();
-            $this->appendExec('9_0');
         case '9_0_1':
             $this->saveLogs('Execute 9_0_1');
             $this->execSQL($this->getUpgradeFile('9.0.1'));
             $this->addBugDeadlineToCustomFields();
             $this->adjustPriv9_0_1();
-            $this->appendExec('9_0_1');
         case '9_1':
             $this->saveLogs('Execute 9_1');
             $this->execSQL($this->getUpgradeFile('9.1'));
-            $this->appendExec('9_1');
         case '9_1_1':
             $this->saveLogs('Execute 9_1_1');
             $this->execSQL($this->getUpgradeFile('9.1.1'));
-            $this->appendExec('9_1_1');
         case '9_1_2':
             $this->saveLogs('Execute 9_1_2');
             $this->execSQL($this->getUpgradeFile('9.1.2'));
             $this->processCustomMenus();
             $this->adjustPriv9_2();
-            $this->appendExec('9_1_2');
         case '9_2':
             $this->saveLogs('Execute 9_2');
-            $this->appendExec('9_2');
         case '9_2_1':
             $this->saveLogs('Execute 9_2_1');
-            $this->appendExec('9_2_1');
         case '9_3_beta':
             $this->saveLogs('Execute 9_3_beta');
             $this->execSQL($this->getUpgradeFile('9.3.beta'));
-            $this->appendExec('9_3_beta');
         case '9_4':
             $this->saveLogs('Execute 9_4');
             $this->execSQL($this->getUpgradeFile('9.4'));
             $this->adjustPriv9_4();
-            $this->appendExec('9_4');
         case '9_5':
             $this->saveLogs('Execute 9_5');
             $this->execSQL($this->getUpgradeFile('9.5'));
-            $this->appendExec('9_5');
         case '9_5_1':
             $this->saveLogs('Execute 9_5_1');
             $this->execSQL($this->getUpgradeFile('9.5.1'));
             $this->initProjectStoryOrder();
-            $this->appendExec('9_5_1');
         case '9_6':
             $this->saveLogs('Execute 9_6');
             $this->execSQL($this->getUpgradeFile('9.6'));
             $this->fixDatatableColsConfig();
-            $this->appendExec('9_6');
         case '9_6_1':
             $this->saveLogs('Execute 9_6_1');
             $this->addLimitedGroup();
-            $this->appendExec('9_6_1');
         case '9_6_2':
             $this->saveLogs('Execute 9_6_2');
-            $this->appendExec('9_6_2');
         case '9_6_3':
             $this->saveLogs('Execute 9_6_3');
             $this->execSQL($this->getUpgradeFile('9.6.3'));
             $this->changeLimitedName();
             $this->adjustPriv9_7();
             $this->changeStoryWidth();
-            $this->appendExec('9_6_3');
         case '9_7':
             $this->saveLogs('Execute 9_7');
             $this->execSQL($this->getUpgradeFile('9.7'));
             $this->changeTeamFields();
             $this->moveData2Notify();
-            $this->appendExec('9_7');
         case '9_8':
             $this->saveLogs('Execute 9_8');
             $this->fixTaskFinishedInfo();
-            $this->appendExec('9_8');
         case '9_8_1':
             $this->saveLogs('Execute 9_8_1');
             $this->execSQL($this->getUpgradeFile('9.8.1'));
             $this->fixTaskAssignedTo();
             $this->fixProjectClosedInfo();
             $this->resetProductLine();
-            $this->appendExec('9_8_1');
         case '9_8_2':
             $this->saveLogs('Execute 9_8_2');
             $this->execSQL($this->getUpgradeFile('9.8.2'));
             $this->addUniqueKeyToTeam();
-            $this->appendExec('9_8_2');
         case '9_8_3':
             $this->saveLogs('Execute 9_8_3');
             $this->execSQL($this->getUpgradeFile('9.8.3'));
             $this->adjustPriv10_0_alpha();
-            $this->appendExec('9_8_3');
         case '10_0_alpha':
             $this->saveLogs('Execute 10_0_alpha');
             $this->execSQL($this->getUpgradeFile('10.0.alpha'));
             $this->fixProjectStatisticBlock();
-            $this->appendExec('10_0_alpha');
         case '10_0_beta':
             $this->saveLogs('Execute 10_0_beta');
             $this->execSQL($this->getUpgradeFile('10.0.beta'));
-            $this->appendExec('10_0_beta');
         case '10_0':
             $this->saveLogs('Execute 10_0');
             $this->execSQL($this->getUpgradeFile('10.0'));
             $this->fixStorySpecTitle();
             $this->removeUnlinkPriv();//Remove unlink privilege for story, bug and testcase module.
-            $this->appendExec('10_0');
         case '10_1':
             $this->saveLogs('Execute 10_1');
             $xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'xuanxuan.sql';
             $this->execSQL($xuanxuanSql);
             $executeXuanxuan = true;
-            $this->appendExec('10_1');
         case '10_2':
             $this->saveLogs('Execute 10_2');
-            $this->appendExec('10_2');
         case '10_3':
             $this->saveLogs('Execute 10_3');
-            $this->appendExec('10_3');
         case '10_3_1':
             $this->saveLogs('Execute 10_3_1');
             $this->execSQL($this->getUpgradeFile('10.3.1'));
             $this->removeCustomMenu();
-            $this->appendExec('10_3_1');
         case '10_4':
             $this->saveLogs('Execute 10_4');
             $this->execSQL($this->getUpgradeFile('10.4'));
             $this->changeTaskParentValue();
-            $this->appendExec('10_4');
         case '10_5':
             $this->saveLogs('Execute 10_5');
-            $this->appendExec('10_5');
         case '10_5_1':
             $this->saveLogs('Execute 10_5_1');
             $this->execSQL($this->getUpgradeFile('10.5.1'));
-            $this->appendExec('10_5_1');
         case '10_6':
             $this->saveLogs('Execute 10_6');
             if(!$executeXuanxuan)
@@ -451,10 +404,8 @@ class upgradeModel extends model
                 $this->execSQL($xuanxuanSql);
             }
             $this->initXuanxuan();
-            $this->appendExec('10_6');
         case '11_0':
             $this->saveLogs('Execute 11_0');
-            $this->appendExec('11_0');
         case '11_1':
             $this->saveLogs('Execute 11_1');
             $this->execSQL($this->getUpgradeFile('11.1'));
@@ -468,21 +419,17 @@ class upgradeModel extends model
                 $this->dao->update(TABLE_CONFIG)->set('value')->eq('off')->where('`key`')->eq('isHttps')->andWhere('`section`')->eq('xuanxuan')->andWhere('`value`')->eq('0')->exec();
                 $this->dao->update(TABLE_CONFIG)->set('value')->eq('on')->where('`key`')->eq('isHttps')->andWhere('`section`')->eq('xuanxuan')->andWhere('`value`')->eq('1')->exec();
             }
-            $this->appendExec('11_1');
         case '11_2':
             $this->saveLogs('Execute 11_2');
             $this->execSQL($this->getUpgradeFile('11.2'));
             $this->processDocLibAcl();
-            $this->appendExec('11_2');
         case '11_3':
             $this->saveLogs('Execute 11_3');
             $this->execSQL($this->getUpgradeFile('11.3'));
             $this->addPriv11_4();
-            $this->appendExec('11_3');
         case '11_4':
             $this->saveLogs('Execute 11_4');
             $this->execSQL($this->getUpgradeFile('11.4'));
-            $this->appendExec('11_4');
         case '11_4_1':
             $this->saveLogs('Execute 11_4_1');
             $this->execSQL($this->getUpgradeFile('11.4.1'));
@@ -498,38 +445,29 @@ class upgradeModel extends model
                 }
                 $this->updateXX_11_5();
             }
-            $this->appendExec('11_4_1');
         case '11_5':
             $this->saveLogs('Execute 11_5');
             $this->execSQL($this->getUpgradeFile('11.5'));
-            $this->appendExec('11_5');
         case '11_5_1':
             $this->saveLogs('Execute 11_5_1');
-            $this->appendExec('11_5_1');
         case '11_5_2':
             $this->saveLogs('Execute 11_5_2');
             $this->execSQL($this->getUpgradeFile('11.5.2'));
-            $this->appendExec('11_5_2');
         case '11_6':
             $this->saveLogs('Execute 11_6');
             $this->execSQL($this->getUpgradeFile('11.6'));
-            $this->appendExec('11_6');
         case '11_6_1':
             $this->saveLogs('Execute 11_6_1');
             $this->adjustWebhookType();
             $this->adjustPriv11_6_2();
-            $this->appendExec('11_6_1');
         case '11_6_2':
             $this->saveLogs('Execute 11_6_2');
-            $this->appendExec('11_6_2');
         case '11_6_3':
             $this->saveLogs('Execute 11_6_3');
             $this->adjustPriv11_6_4();
-            $this->appendExec('11_6_3');
         case '11_6_4':
             $this->saveLogs('Execute 11_6_4');
             $this->execSQL($this->getUpgradeFile('11.6.4'));
-            $this->appendExec('11_6_4');
         case '11_6_5':
             $this->saveLogs('Execute 11_6_5');
             $this->execSQL($this->getUpgradeFile('11.6.5'));
@@ -552,21 +490,17 @@ class upgradeModel extends model
                 }
             }
 
-            $this->appendExec('11_6_5');
         case '11_7':
             $this->saveLogs('Execute 11_7');
             $this->execSQL($this->getUpgradeFile('11.7'));
             $this->adjustPriv12_0();
             $this->loadModel('setting')->setItem('system.common.global.showAnnual', '1');
-            $this->appendExec('11_7');
         case '12_0':
             $this->saveLogs('Execute 12_0');
-            $this->appendExec('12_0');
         case '12_0_1':
             $this->saveLogs('Execute 12_0_1');
             $this->execSQL($this->getUpgradeFile('12.0.1'));
             $this->importRepoFromConfig();
-            $this->appendExec('12_0_1');
         case '12_1':
             $this->saveLogs('Execute 12_1');
             $this->execSQL($this->getUpgradeFile('12.1'));
@@ -580,73 +514,56 @@ class upgradeModel extends model
                 }
             }
 
-            $this->appendExec('12_1');
         case '12_2':
             $this->saveLogs('Execute 12_2');
             $this->execSQL($this->getUpgradeFile('12.2'));
-            $this->appendExec('12_2');
         case '12_3':
             $this->saveLogs('Execute 12_3');
-            $this->appendExec('12_3');
         case '12_3_1':
             $this->saveLogs('Execute 12_3_1');
-            $this->appendExec('12_3_1');
         case '12_3_2':
             $this->saveLogs('Execute 12_3_2');
             $this->execSQL($this->getUpgradeFile('12.3.2'));
-            $this->appendExec('12_3_2');
         case '12_3_3':
             $this->saveLogs('Execute 12_3_3');
             $this->execSQL($this->getUpgradeFile('12.3.3'));
             $this->addPriv12_3_3();
             $this->processImport2TaskBugs();  //Code for task #7552
-            $this->appendExec('12_3_3');
         case '12_4':
             $this->saveLogs('Execute 12_4');
             $this->execSQL($this->getUpgradeFile('12.4'));
-            $this->appendExec('12_4');
         case '12_4_1':
             $this->saveLogs('Execute 12_4_1');
             $this->execSQL($this->getUpgradeFile('12.4.1'));
-            $this->appendExec('12_4_1');
         case '12_4_2':
             $this->saveLogs('Execute 12_4_2');
             $this->execSQL($this->getUpgradeFile('12.4.2'));
             $this->fixFromCaseVersion();
             $this->initStoryOfPlan();
-            $this->appendExec('12_4_2');
         case '12_4_3':
             $this->saveLogs('Execute 12_4_3');
-            $this->appendExec('12_4_3');
         case '12_4_4':
             $this->saveLogs('Execute 12_4_4');
             $this->execSQL($this->getUpgradeFile('12.4.4'));
             $this->adjustPriv12_5();
-            $this->appendExec('12_4_4');
         case '12_5':
             $this->saveLogs('Execute 12_5');
-            $this->appendExec('12_5');
         case '12_5_1':
             $this->saveLogs('Execute 12_5_1');
-            $this->appendExec('12_5_1');
         case '12_5_2':
             $this->saveLogs('Execute 12_5_2');
-            $this->appendExec('12_5_2');
         case '12_5_3':
             $this->saveLogs('Execute 12_5_3');
             $this->execSQL($this->getUpgradeFile('12.5.3'));
             $this->adjustWhitelistOfProject();
             $this->adjustWhitelistOfProduct();
             $this->adjustPriv15_0();
-            $this->appendExec('12_5_3');
         case '15_0_rc1':
             $this->saveLogs('Execute 15_0_rc1');
             $this->adjustUserView();
-            $this->appendExec('15_0_rc1');
         case '15_0_rc2':
             $this->saveLogs('Execute 15_0_rc2');
             $this->execSQL($this->getUpgradeFile('15.0.rc2'));
-            $this->appendExec('15_0_rc2');
         case '15_0_rc3':
             $this->saveLogs('Execute 15_0_rc3');
             $this->execSQL($this->getUpgradeFile('15.0.rc3'));
@@ -668,26 +585,21 @@ class upgradeModel extends model
             $this->updateRunCaseStatus();
             $this->fix4TaskLinkProject();
             $this->fixExecutionTeam();
-            $this->appendExec('15_0_rc3');
         case '15_0':
             $this->saveLogs('Execute 15_0');
             $this->execSQL($this->getUpgradeFile('15.0'));
             $this->adjustBugOfProject();
             $this->processBuildTable();
             $this->updateProductVersion();
-            $this->appendExec('15_0');
         case '15_0_1':
             $this->saveLogs('Execute 15_0_1');
-            $this->appendExec('15_0_1');
         case '15_0_2':
             $this->saveLogs('Execute 15_0_2');
             $this->execSQL($this->getUpgradeFile('15.0.2'));
             $this->uniqueProjectAdmin();
-            $this->appendExec('15_0_2');
         case '15_0_3':
             $this->saveLogs('Execute 15_0_3');
             $this->execSQL($this->getUpgradeFile('15.0.3'));
-            $this->appendExec('15_0_3');
         case '15_2':
             $this->saveLogs('Execute 15_2');
             $this->execSQL($this->getUpgradeFile('15.2'));
@@ -695,14 +607,12 @@ class upgradeModel extends model
             $this->processStoryFileType();
             $this->processProductDoc();
             $this->adjustPriv15_3();
-            $this->appendExec('15_2');
         case '15_3':
             $this->saveLogs('Execute 15_3');
             $this->execSQL($this->getUpgradeFile('15.3'));
             $this->adjustBugRequired();
             $this->processTesttaskDate();
             $this->processDocTempContent();
-            $this->appendExec('15_3');
         case '15_4':
             $this->saveLogs('Execute 15_4');
             $this->execSQL($this->getUpgradeFile('15.4'));
@@ -716,61 +626,359 @@ class upgradeModel extends model
                     $this->execSQL($xuanxuanSql);
                 }
             }
-            $this->appendExec('15_4');
         case '15_5':
             $this->saveLogs('Execute 15_5');
             $this->execSQL($this->getUpgradeFile('15.5'));
-            $this->appendExec('15_5');
         case '15_6':
             $this->saveLogs('Execute 15_6');
             $this->execSQL($this->getUpgradeFile('15.6'));
-            $this->appendExec('15_6');
         case '15_7':
             $this->saveLogs('Execute 15_7');
             $this->execSQL($this->getUpgradeFile('15.7'));
-            $this->appendExec('15_7');
         case '15_7_1':
             $this->saveLogs('Execute 15_7_1');
             $this->execSQL($this->getUpgradeFile('15.7.1'));
             $this->updateObjectBranch();
             $this->updateProjectStories();
             $this->updateProjectLinkedBranch();
-            $this->appendExec('15_7_1');
         case '16_0_beta1':
             $this->saveLogs('Execute 16_0_beta1');
             $this->execSQL($this->getUpgradeFile('16.0.beta1'));
             $this->loadModel('api')->createDemoData($this->lang->api->zentaoAPI, 'http://' . $_SERVER['HTTP_HOST'] . $this->app->config->webRoot . 'api.php/v1', '16.0');
-            $this->appendExec('16_0_beta1');
         case '16_0':
             $this->saveLogs('Execute 16_0');
             $this->execSQL($this->getUpgradeFile('16.0'));
-            $this->appendExec('16_0');
         case '16_1':
             $this->saveLogs('Execute 16_1');
             $this->execSQL($this->getUpgradeFile('16.1'));
             $this->moveKanbanData();
-            $this->appendExec('16_1');
         case '16_2':
             $this->saveLogs('Execute 16_2');
             $this->execSQL($this->getUpgradeFile('16.2'));
             $this->updateSpaceTeam();
             $this->updateDocField();
-            $this->appendExec('16_2');
         case '16_3':
             $this->saveLogs('Execute 16_3');
             $this->execSQL($this->getUpgradeFile('16.3'));
-            $this->appendExec('16_3');
         case '16_4':
+            if(strpos($fromVersion, 'pro') === false and strpos($fromVersion, 'biz') === false and strpos($fromVersion, 'max') === false) 
+            {
+                $this->upgradeFreeToPro();
+            }
+
+            if(strpos($fromVersion, 'biz') === false and strpos($fromVersion, 'max') === false) 
+            {
+                $this->upgrade2Biz();
+            }
+
+            if(strpos($fromVersion, 'max') === false) $this->upgrade2Max();
+
             $this->saveLogs('Execute 16_4');
             $this->execSQL($this->getUpgradeFile('16.4'));
             $this->updateActivatedDate();
-            $this->appendExec('16_4');
         }
 
         $this->deletePatch();
         return true;
     }
 
+    /**
+     * Execute pro version sql.
+     * 
+     * @param  string $fromVersion 
+     * @access public
+     * @return void
+     */
+    public function executePro($fromVersion)
+    {
+        switch($fromVersion)
+        {   
+            case 'pro1_0':
+                $this->execSQL($this->getUpgradeFile('pro1.0'));
+            case 'pro1_1':
+            case 'pro1_1_1':
+                $this->execSQL($this->getUpgradeFile('pro1.1'));
+            case 'pro1_2':
+            case 'pro1_3':   
+                $this->execSQL($this->getUpgradeFile('pro1.3'));
+            case 'pro2_0':
+            case 'pro2_0_1':
+            case 'pro2_1':
+                $this->execSQL($this->getUpgradeFile('pro2.1'));
+            case 'pro2_2_beta':
+            case 'pro2_3_beta':
+            case 'pro3_0_beta1':
+            case 'pro3_0':  
+                $this->execSQL($this->getUpgradeFile('pro3.0'));
+            case 'pro3_1':
+            case 'pro3_2':
+            case 'pro3_2_1': 
+                $this->recordFinished();
+            case 'pro3_3': 
+            case 'pro4_0_beta1':
+            case 'pro4_0': 
+                $this->execSQL($this->getUpgradeFile('pro4.0'));
+                $this->fixRepo(); 
+            case 'pro4_1_beta':
+            case 'pro4_2':
+                $this->execSQL($this->getUpgradeFile('pro4.2'));
+            case 'pro4_3': 
+                $this->execSQL($this->getUpgradeFile('pro4.3'));
+            case 'pro4_4': 
+                $this->execSQL($this->getUpgradeFile('pro4.4'));
+            case 'pro4_5':
+                $this->execSQL($this->getUpgradeFile('pro4.5'));
+            case 'pro4_6': 
+                $this->execSQL($this->getUpgradeFile('pro4.6'));
+            case 'pro4_7':
+            case 'pro4_7_1': 
+                $this->execSQL($this->getUpgradeFile('pro4.7.1'));
+            case 'pro5_0':
+            case 'pro5_0_1': 
+                $this->execSQL($this->getUpgradeFile('pro5.0.1'));
+            case 'pro5_1':
+            case 'pro5_1_3':
+                $this->execSQL($this->getUpgradeFile('pro5.1.3'));
+            case 'pro5_2':
+            case 'pro5_2_1':
+            case 'pro5_3':
+            case 'pro5_3_1':
+            case 'pro5_3_2':
+            case 'pro5_3_3':
+            case 'pro5_4':
+            case 'pro5_4_1':
+            case 'pro5_5':
+            case 'pro5_5_1':
+            case 'pro6_0_beta':
+            case 'pro6_0':
+            case 'pro6_0_1':
+            case 'pro6_1':
+            case 'pro6_2':
+            case 'pro6_3':
+            case 'pro6_3_1':
+            case 'pro6_4':
+                $this->execSQL($this->getUpgradeFile('pro6.4'));
+            case 'pro6_5':
+            case 'pro6_5_1': 
+                $this->execSQL($this->getUpgradeFile('pro6.5.1'));
+            case 'pro6_6':
+            case 'pro6_6_1':
+                $this->execSQL($this->getUpgradeFile('pro6.6.1'));
+            case 'pro6_7':
+            case 'pro6_7_1':
+            case 'pro6_7_2':
+            case 'pro6_7_3':
+            case 'pro7_0_beta': 
+                $this->execSQL($this->getUpgradeFile('pro7.0.beta'));
+                $this->fixReport();
+            case 'pro7_1':
+            case 'pro7_2':
+            case 'pro7_3':
+            case 'pro7_4':
+            case 'pro7_5':
+            case 'pro7_5_1':
+                $this->execSQL($this->getUpgradeFile('pro7.5.1'));
+            case 'pro8_0':
+            case 'pro8_1':
+            case 'pro8_2':
+                $this->execSQL($this->getUpgradeFile('pro8.2'));
+            case 'pro8_3': 
+                $this->execSQL($this->getUpgradeFile('pro8.3'));
+                $this->execSQL($this->getUpgradeFile('pro8.2')); //Fix bug #1752.
+            case 'pro8_3_1':
+            case 'pro8_4':
+                $this->execSQL($this->getUpgradeFile('pro8.4'));
+            case 'pro8_5':
+            case 'pro8_5_1': 
+                $this->execSQL($this->getUpgradeFile('pro8.5.1'));
+            case 'pro8_5_2':
+            case 'pro8_5_3':
+            case 'pro8_6': 
+                $this->execSQL($this->getUpgradeFile('pro8.6'));
+            case 'pro8_7':
+            case 'pro8_8': 
+                $this->checkURAndSR();
+            case 'pro8_8_1':
+            case 'pro8_8_2':
+            case 'pro8_8_3':
+            case 'pro8_9':
+            case 'pro8_9_1':
+            case 'pro8_9_2':
+            case 'pro8_9_3': 
+                $this->execSQL($this->getUpgradeFile('pro8.9.3'));
+            case 'pro8_9_4':
+            case 'pro9_0':
+            case 'pro9_0_1':
+            case 'pro9_0_2':
+            case 'pro9_0_3': 
+                $this->execSQL($this->getUpgradeFile('pro9.0.3'));
+            case 'pro10_0_rc1':
+            case 'pro10_0':
+            case 'pro10_0_1':
+            case 'pro10_0_2': 
+                $this->execSQL($this->getUpgradeFile('pro10.0.2'));
+                $this->fixReportLang();
+            case 'pro10_1':
+            case 'pro10_2':
+            case 'pro10_3':
+            case 'pro10_3_1':
+            case 'pro11_0_beta1':
+        }
+    }
+
+    /**
+     * Execute biz upgrade program.
+     * 
+     * @param  int    $fromVersion 
+     * @access public
+     * @return void
+     */
+    public function executeBiz($fromVersion)
+    {
+        $executeXuanxuan = false;
+        switch($fromVersion)
+        {
+            case 'biz1_0': 
+                $this->execSQL($this->getUpgradeFile('biz1.0'));
+            case 'biz1_1':
+            case 'biz1_1_1':
+            case 'biz1_1_2':
+            case 'biz1_1_3':
+            case 'biz1_1_4':
+            case 'biz2_0_beta': 
+                $executeXuanxuan = true;
+            case 'biz2_1':
+            case 'biz2_2': 
+                $this->execSQL($this->getUpgradeFile('biz2.2'));
+            case 'biz2_3':
+            case 'biz2_3_1': 
+                $this->execSQL($this->getUpgradeFile('biz2.3.1'));
+                $this->adjustFeedbackViewData();
+            case 'biz2_4': 
+                $this->execSQL($this->getUpgradeFile('biz2.4'));
+            case 'biz3_0':
+                if(!empty($this->config->isINT) and !$executeXuanxuan)
+                {
+                    $xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan2.3.0.sql';
+                    $this->execSQL($xuanxuanSql);
+                    $this->dao->update(TABLE_CONFIG)->set('value')->eq('off')->where('`key`')->eq('isHttps')->andWhere('`section`')->eq('xuanxuan')->andWhere('`value`')->eq('0')->exec();
+                    $this->dao->update(TABLE_CONFIG)->set('value')->eq('on')->where('`key`')->eq('isHttps')->andWhere('`section`')->eq('xuanxuan')->andWhere('`value`')->eq('1')->exec();
+                }
+            case 'biz3_1':
+            case 'biz3_2': $this->execSQL($this->getUpgradeFile('biz3.2'));
+            case 'biz3_2_1':
+                if(!empty($this->config->isINT))
+                {
+                    if(!$executeXuanxuan)
+                    {
+                        $xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan2.4.0.sql';
+                        $this->execSQL($xuanxuanSql);
+                        $xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan2.5.0.sql';
+                        $this->execSQL($xuanxuanSql);
+                    }
+                    $this->updateXX_11_5();
+                }
+            case 'biz3_3':       $this->execSQL($this->getUpgradeFile('biz3.3'));
+            case 'biz3_4':       
+                $this->execSQL($this->getUpgradeFile('biz3.4'));
+                $this->importBuildinModules();
+            case 'biz3_5_alpha': 
+                $this->execSQL($this->getUpgradeFile('biz3.5.alpha'));
+                $this->addSubStatus();
+            case 'biz3_5_beta':  
+                $this->execSQL($this->getUpgradeFile('biz3.5.beta'));
+                $this->processSubTables();
+            case 'biz3_5':
+            case 'biz3_5_1':
+            case 'biz3_6':
+                $this->addDefaultActions();
+                $this->importCaseLibModule();
+                $this->deleteBuildinFields();
+            case 'biz3_6_1': 
+                $this->execSQL($this->getUpgradeFile('biz3.6.1'));
+                $this->addWorkflowActions();
+                $this->processWorkflowLayout();
+                $this->processWorkflowLabel();
+                $this->processWorkflowCondition();
+                if(!empty($this->config->isINT) and !$executeXuanxuan)
+                {
+                    $xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan3.1.1.sql';
+                    $this->execSQL($xuanxuanSql);
+                }
+            case 'biz3_7':   
+                $this->execSQL($this->getUpgradeFile('biz3.7'));
+                $this->processWorkflowFields();
+            case 'biz3_7_1': 
+                $this->execSQL($this->getUpgradeFile('biz3.7.1'));
+            case 'biz3_7_2': 
+                $this->execSQL($this->getUpgradeFile('biz3.7.2'));
+                $this->processFlowStatus();
+            case 'biz4_0':   
+                $this->execSQL($this->getUpgradeFile('biz4.0'));
+            case 'biz4_0_1': 
+                $this->execSQL($this->getUpgradeFile('biz4.0.1'));
+                $this->addMailtoFields();
+            case 'biz4_0_2': $this->execSQL($this->getUpgradeFile('biz4.0.2'));
+            case 'biz4_0_3': 
+                $this->execSQL($this->getUpgradeFile('biz4.0.3'));
+                $this->updateAttendStatus();
+                $this->initView4WorkflowDatasource();
+            case 'biz4_0_4': 
+                $this->execSQL($this->getUpgradeFile('biz4.0.4'));
+            case 'biz4_1':
+            case 'biz4_1_1':
+            case 'biz4_1_2':
+            case 'biz4_1_3': 
+                $this->execSQL($this->getUpgradeFile('biz4.1.3'));
+            case 'biz5_0_rc1': 
+                $this->execSQL($this->getUpgradeFile('biz5.0.rc1'));
+            case 'biz5_0':
+                $this->adjustPrivBiz5_0_1();
+            case 'biz5_0_1': 
+                $this->execSQL($this->getUpgradeFile('biz5.0.1'));
+                $this->updateWorkflow4Execution();
+            case 'biz5_1': 
+                $this->execSQL($this->getUpgradeFile('biz5.1'));
+            case 'biz5_2':
+            case 'biz5_3':
+            case 'biz5_3_1': 
+                $this->execSQL($this->getUpgradeFile('biz5.3.1'));
+                $this->processFeedbackField();
+                $this->addFileFields();
+                $this->addReportActions();
+            case 'biz6_0_beta1': 
+                $this->execSQL($this->getUpgradeFile('biz6.0.beta1'));
+            case 'biz6_0':
+            case 'biz6_1':
+            case 'biz6_2':
+                $this->importLiteModules();
+        }
+    }
+
+    /**
+     * Execute upgrade program for max version.
+     * 
+     * @param  string $fromVersion 
+     * @access public
+     * @return void
+     */
+    public function executeMax($fromVersion)
+    {
+        switch($fromVersion)
+        {
+            case 'max2_0_beta4':
+                $this->execSQL($this->getUpgradeFile('max2.0.beta4'));
+            case 'max2_0':
+                $this->execSQL($this->getUpgradeFile('max2.0'));
+            case 'max2_2':
+                $this->execSQL($this->getUpgradeFile('max2.2'));
+            case 'max2_3_1':
+                $this->execSQL($this->getUpgradeFile('max2.3.1'));
+            case 'max2_4_beta1':
+                $this->execSQL($this->getUpgradeFile('max2.4.beta1'));
+        }
+    }
+
     /**
      * Create the confirm contents.
      *
@@ -781,7 +989,49 @@ class upgradeModel extends model
     public function getConfirm($fromVersion)
     {
         $confirmContent = '';
-        switch($fromVersion)
+
+        $openVersion = $fromVersion;
+        if(strpos($fromVersion, 'pro') !== false) 
+        {
+            $openVersion     = $this->config->proVersion[$fromVersion];
+            $confirmContent .= $this->getProConfirm($fromVersion);
+        }
+        elseif(strpos($fromVersion, 'biz') !== false) 
+        {
+            $openVersion     = $this->config->bizVersion[$fromVersion];
+            $proVersion      = array_search($openVersion, $this->config->proVersion);
+
+            $confirmContent .= $this->getProConfirm($proVersion);
+            $confirmContent .= $this->getBizConfirm($fromVersion);
+        }
+        elseif(strpos($fromVersion, 'max') !== false) 
+        {
+            $openVersion     = $this->config->maxVersion[$fromVersion];
+            $proVersion      = array_search($openVersion, $this->config->proVersion);
+            $bizVersion      = array_search($openVersion, $this->config->bizVersion);
+
+            $confirmContent .= $this->getProConfirm($proVersion);
+            $confirmContent .= $this->getBizConfirm($bizVersion);
+            $confirmContent .= $this->getMaxConfirm($fromVersion);
+        }
+
+        $confirmContent .= $this->getOpenConfirm($openVersion, $fromVersion);
+
+        return str_replace('zt_', $this->config->db->prefix, $confirmContent);
+    }
+
+    /**
+     * Get open source confirm contents.
+     * 
+     * @param  string  $openVersion
+     * @param  string  $fromVersion 
+     * @access public
+     * @return void
+     */
+    public function getOpenConfirm($openVersion, $fromVersion)
+    {
+        $confirmContent = '';
+        switch($openVersion)
         {
             case '0_3beta':    $confirmContent .= file_get_contents($this->getUpgradeFile('0.3'));
             case '0_4beta':    $confirmContent .= file_get_contents($this->getUpgradeFile('0.4'));
@@ -976,8 +1226,237 @@ class upgradeModel extends model
             case '16_1': $confirmContent .= file_get_contents($this->getUpgradeFile('16.1'));
             case '16_2': $confirmContent .= file_get_contents($this->getUpgradeFile('16.2'));
             case '16_3': $confirmContent .= file_get_contents($this->getUpgradeFile('16.3'));
+            case '16_4': 
+                if(strpos($fromVersion, 'pro') === false and strpos($fromVersion, 'biz') === false and strpos($fromVersion, 'max') === false) 
+                {
+                    $confirmContent .= file_get_contents($this->getUpgradeFile('proinstall'));
+                }
+
+                if(strpos($fromVersion, 'biz') === false and strpos($fromVersion, 'max') === false) 
+                {
+                    $confirmContent .= file_get_contents($this->getUpgradeFile('bizinstall'));
+                }
+
+                if(strpos($fromVersion, 'max') === false) 
+                {
+                    $confirmContent .= file_get_contents($this->getUpgradeFile('maxinstall'));
+                    $confirmContent .= file_get_contents($this->getUpgradeFile('functions'));
+                }
+
+                $confirmContent .= file_get_contents($this->getUpgradeFile('16.4'));
         }
-        return str_replace('zt_', $this->config->db->prefix, $confirmContent);
+
+        return $confirmContent;
+    }
+
+    /**
+     * Get pro version confirm contents.
+     * 
+     * @param  string $fromVersion 
+     * @access public
+     * @return void
+     */
+    public function getProConfirm($fromVersion)
+    {
+        $confirmContent = '';
+        switch($fromVersion)
+        {
+            case 'pro1_0':   $confirmContent .= file_get_contents($this->getUpgradeFile('pro1.0'));
+            case 'pro1_1':
+            case 'pro1_1_1': $confirmContent .= file_get_contents($this->getUpgradeFile('pro1.1'));
+            case 'pro1_2':
+            case 'pro1_3':   $confirmContent .= file_get_contents($this->getUpgradeFile('pro1.3'));
+            case 'pro2_0':
+            case 'pro2_0_1':
+            case 'pro2_1':   $confirmContent .= file_get_contents($this->getUpgradeFile('pro2.1'));
+            case 'pro2_2_beta':
+            case 'pro2_3_beta':
+            case 'pro3_0_beta1':
+            case 'pro3_0':   $confirmContent .= file_get_contents($this->getUpgradeFile('pro3.0'));
+            case 'pro3_1':
+            case 'pro3_2':
+            case 'pro3_2_1':
+            case 'pro3_3':
+            case 'pro4_0_beta1':
+            case 'pro4_0': $confirmContent .= file_get_contents($this->getUpgradeFile('pro4.0'));
+            case 'pro4_1_beta':
+            case 'pro4_2': $confirmContent .= file_get_contents($this->getUpgradeFile('pro4.2'));
+            case 'pro4_3': $confirmContent .= file_get_contents($this->getUpgradeFile('pro4.3'));
+            case 'pro4_4': $confirmContent .= file_get_contents($this->getUpgradeFile('pro4.4'));
+            case 'pro4_5': $confirmContent .= file_get_contents($this->getUpgradeFile('pro4.5'));
+            case 'pro4_6': $confirmContent .= file_get_contents($this->getUpgradeFile('pro4.6'));
+            case 'pro4_7':
+            case 'pro4_7_1': $confirmContent .= file_get_contents($this->getUpgradeFile('pro4.7.1'));
+            case 'pro5_0':
+            case 'pro5_0_1': $confirmContent .= file_get_contents($this->getUpgradeFile('pro5.0.1'));
+            case 'pro5_1':
+            case 'pro5_1_3': $confirmContent .= file_get_contents($this->getUpgradeFile('pro5.1.3'));
+            case 'pro5_2':
+            case 'pro5_2_1':
+            case 'pro5_3':
+            case 'pro5_3_1':
+            case 'pro5_3_2':
+            case 'pro5_3_3':
+            case 'pro5_4':
+            case 'pro5_4_1':
+            case 'pro5_5':
+            case 'pro5_5_1':
+            case 'pro6_0_beta':
+            case 'pro6_0':
+            case 'pro6_0_1':
+            case 'pro6_1':
+            case 'pro6_2':
+            case 'pro6_3':
+            case 'pro6_3_1':
+            case 'pro6_4': $confirmContent .= file_get_contents($this->getUpgradeFile('pro6.4'));
+            case 'pro6_5':
+            case 'pro6_5_1': $confirmContent .= file_get_contents($this->getUpgradeFile('pro6.5.1'));
+            case 'pro6_6':
+            case 'pro6_6_1': $confirmContent .= file_get_contents($this->getUpgradeFile('pro6.6.1'));
+            case 'pro6_7':
+            case 'pro6_7_1':
+            case 'pro6_7_2':
+            case 'pro6_7_3':
+            case 'pro7_0_beta': $confirmContent .= file_get_contents($this->getUpgradeFile('pro7.0.beta'));
+            case 'pro7_1':
+            case 'pro7_2':
+            case 'pro7_3':
+            case 'pro7_4':
+            case 'pro7_5':
+            case 'pro7_5_1': $confirmContent .= file_get_contents($this->getUpgradeFile('pro7.5.1'));
+            case 'pro8_0':
+            case 'pro8_1':
+            case 'pro8_2': $confirmContent .= file_get_contents($this->getUpgradeFile('pro8.2'));
+            case 'pro8_3': $confirmContent .= file_get_contents($this->getUpgradeFile('pro8.3'));
+            case 'pro8_3_1':
+            case 'pro8_4': $confirmContent .= file_get_contents($this->getUpgradeFile('pro8.4'));
+            case 'pro8_5':
+            case 'pro8_5_1': $confirmContent .= file_get_contents($this->getUpgradeFile('pro8.5.1'));
+            case 'pro8_5_2':
+            case 'pro8_5_3':
+            case 'pro8_6': $confirmContent .= file_get_contents($this->getUpgradeFile('pro8.6'));
+            case 'pro8_7':
+            case 'pro8_8':
+            case 'pro8_8_1':
+            case 'pro8_8_2':
+            case 'pro8_8_3':
+            case 'pro8_9':
+            case 'pro8_9_1':
+            case 'pro8_9_2':
+            case 'pro8_9_3': $confirmContent .= file_get_contents($this->getUpgradeFile('pro8.9.3'));
+            case 'pro8_9_4':
+            case 'pro9_0':
+            case 'pro9_0_1':
+            case 'pro9_0_2':
+            case 'pro9_0_3': $confirmContent .= file_get_contents($this->getUpgradeFile('pro9.0.3'));
+            case 'pro10_0_rc1':
+            case 'pro10_0':
+            case 'pro10_0_1':
+            case 'pro10_0_2': $confirmContent .= file_get_contents($this->getUpgradeFile('pro10.0.2'));
+            case 'pro10_1':
+            case 'pro10_2':
+            case 'pro10_3':
+            case 'pro10_3_1':
+            case 'pro11_0_beta1':
+        }
+
+        return $confirmContent;
+    }
+
+    /**
+     * Get biz version confirm contents.
+     * 
+     * @param  string $fromVersion 
+     * @access public
+     * @return void
+     */
+    public function getBizConfirm($fromVersion)
+    {
+        $confirmContent = '';
+        switch($fromVersion)
+        {
+            case 'biz1_0': $confirmContent .= file_get_contents($this->getUpgradeFile('biz1.0'));
+            case 'biz1_1':
+            case 'biz1_1_1':
+            case 'biz1_1_2':
+            case 'biz1_1_3':
+            case 'biz1_1_4':
+            case 'biz2_0_beta':
+            case 'biz2_1':
+            case 'biz2_2': $confirmContent .= file_get_contents($this->getUpgradeFile('biz2.2'));
+            case 'biz2_3':
+            case 'biz2_3_1': $confirmContent .= file_get_contents($this->getUpgradeFile('biz2.3.1'));
+            case 'biz2_4': $confirmContent .= file_get_contents($this->getUpgradeFile('biz2.4'));
+            case 'biz3_0':
+                if(!empty($this->config->isINT))
+                {
+                    $xuanxuanSql     = $this->app->getAppRoot() . 'db' . DS . 'upgradexuanxuan2.3.0.sql';
+                    $confirmContent .= file_get_contents($xuanxuanSql);
+                }
+            case 'biz3_1':
+            case 'biz3_2': $confirmContent .= file_get_contents($this->getUpgradeFile('biz3.2'));
+            case 'biz3_2_1':
+            case 'biz3_3':       $confirmContent .= file_get_contents($this->getUpgradeFile('biz3.3'));
+            case 'biz3_4':       $confirmContent .= file_get_contents($this->getUpgradeFile('biz3.4'));
+            case 'biz3_5_alpha': $confirmContent .= file_get_contents($this->getUpgradeFile('biz3.5.alpha'));
+            case 'biz3_5_beta':  $confirmContent .= file_get_contents($this->getUpgradeFile('biz3.5.beta'));
+            case 'biz3_5':
+            case 'biz3_5_1':
+            case 'biz3_6':
+            case 'biz3_6_1': $confirmContent .= file_get_contents($this->getUpgradeFile('biz3.6.1'));
+            case 'biz3_7':   $confirmContent .= file_get_contents($this->getUpgradeFile('biz3.7'));
+            case 'biz3_7_1': $confirmContent .= file_get_contents($this->getUpgradeFile('biz3.7.1'));
+            case 'biz3_7_2': $confirmContent .= file_get_contents($this->getUpgradeFile('biz3.7.2'));
+            case 'biz4_0':   $confirmContent .= file_get_contents($this->getUpgradeFile('biz4.0'));
+            case 'biz4_0_1': $confirmContent .= file_get_contents($this->getUpgradeFile('biz4.0.1'));
+            case 'biz4_0_2': $confirmContent .= file_get_contents($this->getUpgradeFile('biz4.0.2'));
+            case 'biz4_0_3': $confirmContent .= file_get_contents($this->getUpgradeFile('biz4.0.3'));
+            case 'biz4_0_4': $confirmContent .= file_get_contents($this->getUpgradeFile('biz4.0.4'));
+            case 'biz4_1':
+            case 'biz4_1_1':
+            case 'biz4_1_2':
+            case 'biz4_1_3': $confirmContent .= file_get_contents($this->getUpgradeFile('biz4.1.3'));
+            case 'biz5_0_rc1': $confirmContent .= file_get_contents($this->getUpgradeFile('biz5.0.rc1'));
+            case 'biz5_0':
+            case 'biz5_0_1': $confirmContent .= file_get_contents($this->getUpgradeFile('biz5.0.1'));
+            case 'biz5_1': $confirmContent .= file_get_contents($this->getUpgradeFile('biz5.1'));
+            case 'biz5_2':
+            case 'biz5_3':
+            case 'biz5_3_1': $confirmContent .= file_get_contents($this->getUpgradeFile('biz5.3.1'));
+            case 'biz6_0_beta1': $confirmContent .= file_get_contents($this->getUpgradeFile('biz6.0.beta1'));
+            case 'biz6_0':
+            case 'biz6_1':
+        }
+
+        return $confirmContent;
+    }
+
+    /**
+     * Get max version confirm  contents.
+     * 
+     * @param  string $fromVersion 
+     * @access public
+     * @return void
+     */
+    public function getMaxConfirm($fromVersion)
+    {
+        $confirmContent = '';
+        if($fromVersion == 'max2_0_beta4' && $this->config->version != 'max2.0.rc1') $fromVersion = 'max2_0_rc1';
+        
+        switch($fromVersion)
+        {   
+            case 'max2_0_rc1':
+            case 'max2_0_beta4': $confirmContent .= file_get_contents($this->getUpgradeFile('max2.0.beta4'));
+            case 'max2_0': $confirmContent .= file_get_contents($this->getUpgradeFile('max2.0'));
+            case 'max2_1':
+            case 'max2_2': $confirmContent .= file_get_contents($this->getUpgradeFile('max2.2'));
+            case 'max2_3':
+            case 'max2_3_1': $confirmContent .= file_get_contents($this->getUpgradeFile('max2.3.1'));
+            case 'max2_4_beta1': $confirmContent .= file_get_contents($this->getUpgradeFile('max2.4.beta1'));
+            case 'max2_4':
+        }
+
+        return $confirmContent;
     }
 
     /**
@@ -4961,17 +5440,6 @@ class upgradeModel extends model
         return true;
     }
 
-    /**
-     * Append execute for pro and biz.
-     *
-     * @param  string $fromVersion
-     * @access public
-     * @return void
-     */
-    public function appendExec($zentaoVersion)
-    {
-    }
-
     /**
      * Init story sort of plan.
      *

From 7afe8319fb919ed3139231742f6fda7f4dfe3d6c Mon Sep 17 00:00:00 2001
From: Wenrui LI <liwenrui@easycorp.ltd>
Date: Tue, 22 Feb 2022 14:43:41 +0800
Subject: [PATCH 23/41] * fix workflow icon not present.

---
 extension/lite/common/ext/lang/zh-cn/lite.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php
index 8f1fd98ac4..7d93f851f3 100644
--- a/extension/lite/common/ext/lang/zh-cn/lite.php
+++ b/extension/lite/common/ext/lang/zh-cn/lite.php
@@ -18,6 +18,7 @@ if($config->edition != 'open')
 {
     $lang->navIcons['feedback'] = "<i class='icon icon-feedback'></i>";
     $lang->navIcons['oa']       = "<i class='icon icon-oa'></i>";
+    $lang->navIcons['workflow'] = "<i class='icon icon-flow'></i>";
 
     $lang->mainNav->feedback = $lang->navIcons['feedback'] . '反馈|feedback|browse|';
     $lang->mainNav->oa       = $lang->navIcons['oa'] . '办公|attend|personal|';

From 2fdb1de49074f8b9ebe88bddec7bc77d80d3482b Mon Sep 17 00:00:00 2001
From: Wenrui LI <liwenrui@easycorp.ltd>
Date: Tue, 22 Feb 2022 14:52:36 +0800
Subject: [PATCH 24/41] * show only groups of current vision on user create,
 bug #18849.

---
 module/user/control.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/module/user/control.php b/module/user/control.php
index 17dbd92726..066bd48f55 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -524,7 +524,10 @@ class user extends control
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('company', 'browse')));
         }
 
-        $groups    = $this->dao->select('id, name, role')->from(TABLE_GROUP)->fetchAll();
+        $groups = $this->dao->select('id, name, role')
+            ->from(TABLE_GROUP)
+            ->where('vision')->eq($this->config->vision)
+            ->fetchAll();
         $groupList = array('' => '');
         $roleGroup = array();
         foreach($groups as $group)
@@ -556,7 +559,10 @@ class user extends control
      */
     public function batchCreate($deptID = 0)
     {
-        $groups    = $this->dao->select('id, name, role')->from(TABLE_GROUP)->fetchAll();
+        $groups = $this->dao->select('id, name, role')
+            ->from(TABLE_GROUP)
+            ->where('vision')->eq($this->config->vision)
+            ->fetchAll();
         $groupList = array('' => '');
         $roleGroup = array();
         foreach($groups as $group)

From c9685d4441f6ca9b6490a3275b865e389c3cbffa Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Tue, 22 Feb 2022 15:52:32 +0800
Subject: [PATCH 25/41] *Finish task 49694 49695.

---
 module/execution/control.php          |  1 +
 module/execution/js/kanban.js         | 33 ++++++++++++++------
 module/execution/view/kanban.html.php | 45 ++++++++++++++++-----------
 3 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 65c887caee..04869fbae4 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2069,6 +2069,7 @@ class execution extends control
         $this->view->groupBy          = $groupBy;
         $this->view->productID        = $productID;
         $this->view->branchID         = $branchID;
+        $this->view->projectID        = $this->loadModel('task')->getProjectID($execution);
         $this->view->allPlans         = $allPlans;
         $this->view->kanbanData       = $kanbanData;
         $this->view->executionActions = $executionActions;
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index c746512166..b43e70754a 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -533,7 +533,7 @@ function renderBugItem(item, $item, col)
     if(scaleSize <= 1)
     {
         var $actions = $item.find('.actions');
-        if(!$actions.length && item.menus && item.menus.length)
+        if(!$actions.length && (priv.canEditBug || priv.canResolveBug || priv.canConfirmBug || priv.canCopyBug || priv.canToStoryBug))
         {
             $actions = $([
                 '<div class="actions">',
@@ -597,7 +597,7 @@ function renderTaskItem(item, $item, col)
     if(scaleSize <= 1)
     {
         var $actions = $item.find('.actions');
-        if(!$actions.length && item.menus && item.menus.length)
+        if(!$actions.length && (priv.canEditTask || priv.canRecordEstimateTask || priv.canCreateTask || priv.canCancelTask))
         {
             $actions = $([
                 '<div class="actions">',
@@ -1045,16 +1045,28 @@ function createTaskMenu(options)
 {
     var $card = options.$trigger.closest('.kanban-item');
     var task  = $card.data('item');
-
     var items = [];
-    $.each(task.menus, function()
-    {
-        var item = {label: this.label, icon: this.icon, url: this.url, attrs: {'data-toggle': 'modal', 'data-type': 'iframe'}};
-        if(this.size) item.attrs['data-width'] = this.size;
-
-        items.push(item);
-    });
+    if(priv.canEditTask) items.push({label: taskLang.edit, icon: 'edit', url: createLink('task', 'edit', 'taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
+    if(priv.canRecordEstimateTask) items.push({label: executionLang.effort, icon: 'time', url: createLink('task', 'recordEstimate', 'taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
+    if(priv.canCreateTask) items.push({label: taskLang.copy, icon: 'copy', url: createLink('task', 'create', 'projectID=' + projectID + '&storyID=' + '0' + '&moduleID=' + '0' + '&taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
+    if(priv.canCancelTask) items.push({label: taskLang.cancel, icon: 'cancel', url: createLink('task', 'cancel', 'taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
+    return items;
+}
 
+ /**
+ * Create bug menu
+ * @returns {Object[]}
+ */
+function createBugMenu(options)
+{
+    var $card = options.$trigger.closest('.kanban-item');
+    var bug   = $card.data('item');
+    var items = [];
+    if(priv.canEditBug) items.push({label: bugLang.edit, icon: 'edit', url: createLink('bug', 'edit', 'bugID=' + bug.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
+    if(priv.canResolveBug) items.push({label: bugLang.resolve, icon: 'checked', url: createLink('bug', 'resolve', 'bugID=' + bug.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
+    if(priv.canConfirmBug) items.push({label: bugLang.confirmBug, icon: 'ok', url: createLink('bug', 'confirmbug', 'bugID=' + bug.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
+    if(priv.canCopyBug) items.push({label: bugLang.copy, icon: 'copy', url: createLink('bug', 'create', 'productID=' + productID + '&branch=' + '' + '&extras=bugID=' + bug.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
+    if(priv.canToStoryBug) items.push({label: bugLang.toStory, icon: 'lightbulb', url: createLink('story', 'create', 'product=' + productID + '&branch=' + '0' + '&module=' + '0' + '&story=' + '0' + '&execution=' + '0' + '&bugID=' + bug.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
     return items;
 }
 
@@ -1065,6 +1077,7 @@ window.menuCreators =
     column:       createColumnMenu,
     columnCreate: createColumnCreateMenu,
     task:         createTaskMenu,
+    bug:          createBugMenu,
 };
 
 /**
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 56342f8a00..0061b92a79 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -46,6 +46,7 @@ js::set('displayCards', $execution->displayCards);
 js::set('fluidBoard', $execution->fluidBoard);
 js::set('colorListLang', $lang->kanbancard->colorList);
 js::set('colorList', $this->config->kanban->cardColorList);
+js::set('projectID', $projectID);
 
 $canSortRegion   = commonModel::hasPriv('kanban', 'sortRegion') && count($regions) > 1;
 $canEditRegion   = commonModel::hasPriv('kanban', 'editRegion');
@@ -65,25 +66,31 @@ $hasBugButton        = ($canCreateBug or $canBatchCreateBug);
 
 js::set('priv',
     array(
-        'canCreateTask'       => $canCreateTask,
-        'canBatchCreateTask'  => $canBatchCreateTask,
-        'canCreateBug'        => $canCreateBug,
-        'canBatchCreateBug'   => $canBatchCreateBug,
-        'canCreateStory'      => $canCreateStory,
-        'canBatchCreateStory' => $canBatchCreateStory,
-        'canLinkStory'        => $canLinkStory,
-        'canLinkStoryByPlan'  => $canLinkStoryByPlan,
-        'canAssignTask'       => common::hasPriv('task', 'assignto'),
-        'canAssignStory'      => common::hasPriv('story', 'assignto'),
-        'canFinishTask'       => common::hasPriv('task', 'finish'),
-        'canPauseTask'        => common::hasPriv('task', 'pause'),
-        'canCancelTask'       => common::hasPriv('task', 'cancel'),
-        'canCloseTask'        => common::hasPriv('task', 'close'),
-        'canActivateTask'     => common::hasPriv('task', 'activate'),
-        'canStartTask'        => common::hasPriv('task', 'start'),
-        'canAssignBug'        => common::hasPriv('bug', 'assignto'),
-        'canConfirmBug'       => common::hasPriv('bug', 'confirmBug'),
-        'canActivateBug'      => common::hasPriv('bug', 'activate')
+        'canCreateTask'         => $canCreateTask,
+        'canBatchCreateTask'    => $canBatchCreateTask,
+        'canCreateBug'          => $canCreateBug,
+        'canBatchCreateBug'     => $canBatchCreateBug,
+        'canCreateStory'        => $canCreateStory,
+        'canBatchCreateStory'   => $canBatchCreateStory,
+        'canLinkStory'          => $canLinkStory,
+        'canLinkStoryByPlan'    => $canLinkStoryByPlan,
+        'canAssignBug'          => common::hasPriv('bug', 'assignto'),
+        'canConfirmBug'         => common::hasPriv('bug', 'confirmBug'),
+        'canResolveBug'         => common::hasPriv('bug', 'resolve'),
+        'canCopyBug'            => common::hasPriv('bug', 'create'),
+        'canEditBug'            => common::hasPriv('bug', 'edit'),
+        'canActivateBug'        => common::hasPriv('bug', 'activate'),
+        'canAssignTask'         => common::hasPriv('task', 'assignto'),
+        'canFinishTask'         => common::hasPriv('task', 'finish'),
+        'canPauseTask'          => common::hasPriv('task', 'pause'),
+        'canCancelTask'         => common::hasPriv('task', 'cancel'),
+        'canCloseTask'          => common::hasPriv('task', 'close'),
+        'canActivateTask'       => common::hasPriv('task', 'activate'),
+        'canStartTask'          => common::hasPriv('task', 'start'),
+        'canEditTask'           => common::hasPriv('task', 'edit'),
+        'canRecordEstimateTask' => common::hasPriv('task', 'recordEstimate'),
+        'canToStoryBug'         => common::hasPriv('story', 'create'),
+        'canAssignStory'        => common::hasPriv('story', 'assignto'),
     )
 );
 js::set('hasStoryButton', $hasStoryButton);

From 61dc15d6d1ee8e6beaa1890d2aea5fadc1f1cb04 Mon Sep 17 00:00:00 2001
From: Wenrui LI <liwenrui@easycorp.ltd>
Date: Tue, 22 Feb 2022 16:41:29 +0800
Subject: [PATCH 26/41] * remove unwanted search items from action module, bug
 #19021.

---
 extension/lite/action/ext/lang/zh-cn/lite.php | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/extension/lite/action/ext/lang/zh-cn/lite.php b/extension/lite/action/ext/lang/zh-cn/lite.php
index 8bb9e00e85..68b118a309 100644
--- a/extension/lite/action/ext/lang/zh-cn/lite.php
+++ b/extension/lite/action/ext/lang/zh-cn/lite.php
@@ -36,3 +36,42 @@ $lang->action->dynamicAction->task['unlinkparenttask']    = '从父任务取消
 $lang->action->dynamicAction->task['deletechildrentask']  = '删除子任务';
 $lang->action->dynamicAction->task['linkparenttask']      = '关联到父任务';
 $lang->action->dynamicAction->task['linkchildtask']       = '关联子任务';
+
+$lang->action->search->label = array();
+$lang->action->search->label['']                      = '';
+$lang->action->search->label['created']               = $lang->action->label->created;
+$lang->action->search->label['opened']                = $lang->action->label->opened;
+$lang->action->search->label['changed']               = $lang->action->label->changed;
+$lang->action->search->label['edited']                = $lang->action->label->edited;
+$lang->action->search->label['assigned']              = $lang->action->label->assigned;
+$lang->action->search->label['closed']                = $lang->action->label->closed;
+$lang->action->search->label['deleted']               = $lang->action->label->deleted;
+$lang->action->search->label['deletedfile']           = $lang->action->label->deletedfile;
+$lang->action->search->label['editfile']              = $lang->action->label->editfile;
+$lang->action->search->label['erased']                = $lang->action->label->erased;
+$lang->action->search->label['undeleted']             = $lang->action->label->undeleted;
+$lang->action->search->label['hidden']                = $lang->action->label->hidden;
+$lang->action->search->label['commented']             = $lang->action->label->commented;
+$lang->action->search->label['activated']             = $lang->action->label->activated;
+$lang->action->search->label['reviewed']              = $lang->action->label->reviewed;
+$lang->action->search->label['moved']                 = $lang->action->label->moved;
+$lang->action->search->label['confirmed']             = $lang->action->label->confirmed;
+$lang->action->search->label['totask']                = $lang->action->label->totask;
+$lang->action->search->label['linked2plan']           = $lang->action->label->linked2plan;
+$lang->action->search->label['unlinkedfromplan']      = $lang->action->label->unlinkedfromplan;
+$lang->action->search->label['changestatus']          = $lang->action->label->changestatus;
+$lang->action->search->label['marked']                = $lang->action->label->marked;
+$lang->action->search->label['linked2project']        = $lang->action->label->linked2project;
+$lang->action->search->label['unlinkedfromproject']   = $lang->action->label->unlinkedfromproject;
+$lang->action->search->label['linked2execution']      = $lang->action->label->linked2execution;
+$lang->action->search->label['unlinkedfromexecution'] = $lang->action->label->unlinkedfromexecution;
+$lang->action->search->label['started']               = $lang->action->label->started;
+$lang->action->search->label['restarted']             = $lang->action->label->restarted;
+$lang->action->search->label['recordestimate']        = $lang->action->label->recordestimate;
+$lang->action->search->label['editestimate']          = $lang->action->label->editestimate;
+$lang->action->search->label['canceled']              = $lang->action->label->canceled;
+$lang->action->search->label['finished']              = $lang->action->label->finished;
+$lang->action->search->label['paused']                = $lang->action->label->paused;
+$lang->action->search->label['verified']              = $lang->action->label->verified;
+$lang->action->search->label['login']                 = $lang->action->label->login;
+$lang->action->search->label['logout']                = $lang->action->label->logout;

From 6b2bc498305a23e477cbe7181c1a61bf1a090478 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Tue, 22 Feb 2022 16:59:09 +0800
Subject: [PATCH 27/41] * Finish task #49409.

---
 module/block/control.php     | 3 ++-
 module/extension/control.php | 3 ++-
 module/task/control.php      | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/module/block/control.php b/module/block/control.php
index 5c271ded29..d3f7eafb2d 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -1396,7 +1396,8 @@ class block extends control
     {
         $sprints = $this->dao->select('status, count(*) as sprints')->from(TABLE_EXECUTION)
             ->where('deleted')->eq(0)
-            ->andWhere('type')->eq('sprint')
+            ->beginIF($this->config->vision == 'lite')->andWhere('type')->eq('kanban')->fi()
+            ->beginIF($this->config->vision == 'rnd')->andWhere('type')->eq('sprint')->fi()
             ->andWhere('parent')->eq($this->session->project)
             ->groupBy('status')
             ->fetchPairs();
diff --git a/module/extension/control.php b/module/extension/control.php
index 2b4b8c1aca..9e33d8707d 100644
--- a/module/extension/control.php
+++ b/module/extension/control.php
@@ -30,7 +30,8 @@ class extension extends control
             $this->view->position[] = $this->lang->extension->browse;
 
             $this->view->error = sprintf($this->lang->extension->noticeOkFile, str_replace('\\', '/', $statusFile));
-            return $this->display('extension', 'safe');
+            $this->display('extension', 'safe');
+            helper::end();
         }
     }
 
diff --git a/module/task/control.php b/module/task/control.php
index f1bb5cdfcc..8e92364246 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -571,8 +571,9 @@ class task extends control
             return print(js::locate($this->session->taskList, 'parent'));
         }
 
-        $taskIDList = $this->post->taskIDList ? $this->post->taskIDList : return print(js::locate($this->session->taskList, 'parent'));
-        $taskIDList = array_unique($taskIDList);
+        if(!$this->post->taskIDList) return print(js::locate($this->session->taskList, 'parent'));
+
+        $taskIDList = array_unique($this->post->taskIDList);
 
         /* The tasks of execution. */
         if($executionID)

From a9995c6fe018db8d190162bb13f9624f21a94107 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Tue, 22 Feb 2022 09:00:47 +0000
Subject: [PATCH 28/41] Finish task #49692.

---
 module/kanban/control.php             | 27 +++++++++++++++++++++++----
 module/kanban/js/editspace.js         | 11 +++++++++++
 module/kanban/lang/en.php             |  4 ++++
 module/kanban/lang/zh-cn.php          |  4 ++++
 module/kanban/model.php               | 19 ++++++++++++++++++-
 module/kanban/view/editspace.html.php | 11 ++++++++---
 6 files changed, 68 insertions(+), 8 deletions(-)
 create mode 100644 module/kanban/js/editspace.js

diff --git a/module/kanban/control.php b/module/kanban/control.php
index 2d38f69ff4..b5d71d7d0c 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -74,12 +74,12 @@ class kanban extends control
      * @access public
      * @return void
      */
-    public function editSpace($spaceID)
+    public function editSpace($spaceID, $type = '')
     {
         $this->loadModel('action');
         if(!empty($_POST))
         {
-            $changes = $this->kanban->updateSpace($spaceID);
+            $changes = $this->kanban->updateSpace($spaceID, $type);
 
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
@@ -89,8 +89,27 @@ class kanban extends control
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
         }
 
-        $this->view->space = $this->kanban->getSpaceById($spaceID);
-        $this->view->users = $this->loadModel('user')->getPairs('noclosed');
+        $space = $this->kanban->getSpaceById($spaceID);
+
+        $typeList = $this->lang->kanbanspace->typeList;
+        if($space->type == 'cooperation' or $space->type == 'public') unset($typeList['private']);
+
+        if($space->type == 'private' and ($type == 'cooperation' or $type == 'public'))
+        {
+            $team = $space->whitelist;
+        }
+        else
+        {
+            $team = $space->team;
+        }
+
+        $this->view->spaceID     = $spaceID;
+        $this->view->space       = $space;
+        $this->view->users       = $this->loadModel('user')->getPairs('noclosed');
+        $this->view->typeList    = $typeList;
+        $this->view->type        = $type;
+        $this->view->team        = $team;
+        $this->view->defaultType = $type == '' ? $space->type : $type;
 
         $this->display();
     }
diff --git a/module/kanban/js/editspace.js b/module/kanban/js/editspace.js
new file mode 100644
index 0000000000..f6b1c9bbda
--- /dev/null
+++ b/module/kanban/js/editspace.js
@@ -0,0 +1,11 @@
+/**
+ * When type change.
+ *
+ * @param  string type
+ * @access public
+ * @return void
+ */
+function changeType(spaceID, type)
+{
+    location.href = createLink('kanban', 'editSpace', 'spaceID=' + spaceID + '&type=' + type);
+}
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 3a82c67fe1..3f78e41151 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -271,6 +271,10 @@ $lang->kanbanspace->featureBar['cooperation'] = 'Cooperation Space';
 $lang->kanbanspace->featureBar['public']      = 'Public Space';
 $lang->kanbanspace->featureBar['involved']    = 'Involved';
 
+$lang->kanbanspace->typeList['private']     = 'Private Space';
+$lang->kanbanspace->typeList['cooperation'] = 'Cooperation Space';
+$lang->kanbanspace->typeList['public']      = 'Public Space';
+
 $lang->kanbancolumn = new stdclass();
 $lang->kanbancolumn->name       = $lang->kanban->columnName;
 $lang->kanbancolumn->limit      = $lang->kanban->WIPCount;
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index ca8580188c..7ce89896c9 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -271,6 +271,10 @@ $lang->kanbanspace->featureBar['cooperation'] = '协作空间';
 $lang->kanbanspace->featureBar['public']      = '公共空间';
 $lang->kanbanspace->featureBar['involved']    = '我参与的';
 
+$lang->kanbanspace->typeList['private']     = '私人空间';
+$lang->kanbanspace->typeList['cooperation'] = '协作空间';
+$lang->kanbanspace->typeList['public']      = '公共空间';
+
 $lang->kanbancolumn = new stdclass();
 $lang->kanbancolumn->name       = $lang->kanban->columnName;
 $lang->kanbancolumn->limit      = $lang->kanban->WIPCount;
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 32c0db56eb..6c275a7a15 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1754,7 +1754,7 @@ class kanbanModel extends model
      * @access public
      * @return array
      */
-    public function updateSpace($spaceID)
+    public function updateSpace($spaceID, $type = '')
     {
         $spaceID  = (int)$spaceID;
         $oldSpace = $this->getSpaceById($spaceID);
@@ -1767,6 +1767,8 @@ class kanbanModel extends model
             ->remove('uid,contactListMenu')
             ->get();
 
+        if($type == 'cooperation' or $type == 'public') $space->whitelist = '';
+
         $space = $this->loadModel('file')->processImgURL($space, $this->config->kanban->editor->editspace['id'], $this->post->uid);
 
         $this->dao->update(TABLE_KANBANSPACE)->data($space)
@@ -1775,6 +1777,15 @@ class kanbanModel extends model
             ->where('id')->eq($spaceID)
             ->exec();
 
+        if($oldSpace->type == 'private' and ($type == 'cooperation' or $type == 'public'))
+        {
+            $kanbanList = $this->dao->select('id,team,whitelist')->from(TABLE_KANBAN)->where('space')->eq($spaceID)->andWhere('deleted')->eq('0')->fetchAll('id');
+            foreach($kanbanList as $id => $kanbanData)
+            {
+                $this->dao->update(TABLE_KANBAN)->set('team')->eq($kanbanData->whitelist)->set('whitelist')->eq('')->where('id')->eq($id)->andWhere('deleted')->eq('0')->exec();
+            }
+        }
+
         if(!dao::isError())
         {
             $this->file->saveUpload('kanbanspace', $spaceID);
@@ -1783,6 +1794,12 @@ class kanbanModel extends model
         }
     }
 
+    public function updateKanbanBySpace($spaceID, $type)
+    {
+        $spaceType = $this->dao->select('type')->from(TABLE_KANBANSPACE)->where('id')->eq($spaceID)->fetch();
+
+    }
+
     /**
      * Close a space.
      *
diff --git a/module/kanban/view/editspace.html.php b/module/kanban/view/editspace.html.php
index a354ae3447..59d7f58eec 100644
--- a/module/kanban/view/editspace.html.php
+++ b/module/kanban/view/editspace.html.php
@@ -18,12 +18,17 @@
   </div>
   <form class='form-indicator main-form form-ajax' method='post' enctype='multipart/form-data' id='dataform'>
     <table class='table table-form'>
+      <tr>
+        <th><?php echo $lang->kanbanspace->type;?></th>
+        <td><?php echo html::select('type', $typeList, $defaultType, "onchange='changeType($spaceID, this.value)' class='form-control chosen'");?></td>
+        <td></td>
+      </tr>
       <tr>
         <th><?php echo $lang->kanbanspace->name;?></th>
         <td><?php echo html::input('name', $space->name, "class='form-control'");?></td>
         <td></td>
       </tr>
-      <?php if($space->type != 'private'):?>
+      <?php if($space->type != 'private' or $type == 'cooperation' or $type == 'public'):?>
       <tr>
         <th><?php echo $lang->kanbanspace->owner;?></th>
         <td><?php echo html::select('owner', $users, $space->owner, "class='form-control chosen'");?></td>
@@ -32,7 +37,7 @@
         <th><?php echo $lang->kanbanspace->team;?></th>
         <td colspan='2'>
           <div class="input-group">
-            <?php echo html::select('team[]', $users, $space->team, "class='form-control chosen' multiple data-drop_direction='down'");?>
+            <?php echo html::select('team[]', $users, $team, "class='form-control chosen' multiple data-drop_direction='down'");?>
             <?php echo $this->fetch('my', 'buildContactLists');?>
           </div>
         </td>
@@ -45,7 +50,7 @@
           <?php echo html::textarea('desc', $space->desc, "rows='10' class='form-control'");?>
         </td>
       </tr>
-      <?php if($space->type == 'private'):?>
+      <?php if($space->type == 'private' and $type != 'cooperation' and $type != 'public'):?>
       <tr id="whitelistBox">
         <th><?php echo $lang->whitelist;?></th>
         <td><?php echo html::select('whitelist[]', $users, $space->whitelist, 'class="form-control chosen" multiple');?></td>

From 4e1767b2df7bb437fae0fa6679d387919b33cd34 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 22 Feb 2022 17:08:09 +0800
Subject: [PATCH 29/41] * Fix bug.

---
 module/upgrade/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index a760d9bdd9..8ac8473571 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -127,7 +127,7 @@ class upgrade extends control
             $this->view->result = 'fail';
             $this->view->errors  = $result;
 
-            return $this->display());
+            return $this->display();
         }
 
         $fromVersion = isset($_POST['fromVersion']) ? $this->post->fromVersion : $fromVersion;

From 11d3afd565f3f231e44606418bcb7b00e10eb0ee Mon Sep 17 00:00:00 2001
From: Wenrui LI <liwenrui@easycorp.ltd>
Date: Wed, 23 Feb 2022 08:27:02 +0800
Subject: [PATCH 30/41] * use actual idvalue name for todo create/edit, bug
 #19011.

---
 module/todo/js/common.js         | 12 ++++++++++++
 module/todo/view/create.html.php |  3 ++-
 module/todo/view/edit.html.php   |  3 ++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/module/todo/js/common.js b/module/todo/js/common.js
index e2a16621bf..c1cd87d92c 100644
--- a/module/todo/js/common.js
+++ b/module/todo/js/common.js
@@ -49,6 +49,18 @@ function loadList(type, id)
     {
         $(divClass).html($(divID).html());
     }
+
+    if(nameBoxLabel)
+    {
+        if(type == 'custom')
+        {
+            $('#nameBoxLabel').text(nameBoxLabel.custom);
+        }
+        else
+        {
+            $('#nameBoxLabel').text(nameBoxLabel.idvalue);
+        }
+    }
 }
 
 function selectNext()
diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php
index 67edfa0e2b..c7d6e4d4d4 100644
--- a/module/todo/view/create.html.php
+++ b/module/todo/view/create.html.php
@@ -16,6 +16,7 @@
 <?php js::set('noTodo', $lang->todo->noTodo);?>
 <?php js::set('moduleList', $config->todo->moduleList)?>
 <?php js::set('objectsMethod', $config->todo->getUserObjectsMethod)?>
+<?php js::set('nameBoxLabel', array('custom' => $lang->todo->name, 'idvalue' => $lang->todo->idvalue));?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
@@ -115,7 +116,7 @@
           <td><?php echo html::select('type', $lang->todo->typeList, '', 'onchange="loadList(this.value);" class="form-control"');?></td>
         </tr>
         <tr>
-          <th><?php echo $lang->todo->name;?></th>
+          <th id='nameBoxLabel'><?php echo $lang->todo->name;?></th>
           <td colspan='2'>
             <div id='nameBox' class='hidden'><?php echo html::input('name', '', "class='form-control'");?></div>
             <div class='input-group title-group required'>
diff --git a/module/todo/view/edit.html.php b/module/todo/view/edit.html.php
index 86fd440a79..8d8993222d 100644
--- a/module/todo/view/edit.html.php
+++ b/module/todo/view/edit.html.php
@@ -16,6 +16,7 @@
 <?php js::set('moduleList', $config->todo->moduleList)?>
 <?php js::set('objectsMethod', $config->todo->getUserObjectsMethod)?>
 <?php js::set('idvalue', $todo->idvalue);?>
+<?php js::set('nameBoxLabel', array('custom' => $lang->todo->name, 'idvalue' => $lang->todo->idvalue));?>
 <?php if(common::checkNotCN()):?>
 <style> label.col-sm-1{width:100px;} </style>
 <?php endif;?>
@@ -127,7 +128,7 @@
       </div>
       <?php endif;?>
       <div class="row form-group">
-        <label class="col-sm-1"><?php echo $lang->todo->name;?></label>
+        <label id='nameBoxLabel' class="col-sm-1"><?php echo $todo->type == 'custom' ? $lang->todo->name : $lang->todo->idvalue;?></label>
         <div class="col-sm-10">
           <div id='nameBox' class='hidden'><?php echo html::input('name', $todo->name, "class='form-control'");?></div>
             <div class='input-group title-group required'>

From c34a9bbd675e4c5c71866be5ed5c2313f46e2f00 Mon Sep 17 00:00:00 2001
From: Wenrui LI <liwenrui@easycorp.ltd>
Date: Wed, 23 Feb 2022 08:43:36 +0800
Subject: [PATCH 31/41] * remove plan related stuff from action search of lite
 vision, bug #19021.

---
 extension/lite/action/ext/lang/zh-cn/lite.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/extension/lite/action/ext/lang/zh-cn/lite.php b/extension/lite/action/ext/lang/zh-cn/lite.php
index 67162a4212..a2c6480f75 100644
--- a/extension/lite/action/ext/lang/zh-cn/lite.php
+++ b/extension/lite/action/ext/lang/zh-cn/lite.php
@@ -57,8 +57,6 @@ $lang->action->search->label['reviewed']              = $lang->action->label->re
 $lang->action->search->label['moved']                 = $lang->action->label->moved;
 $lang->action->search->label['confirmed']             = $lang->action->label->confirmed;
 $lang->action->search->label['totask']                = $lang->action->label->totask;
-$lang->action->search->label['linked2plan']           = $lang->action->label->linked2plan;
-$lang->action->search->label['unlinkedfromplan']      = $lang->action->label->unlinkedfromplan;
 $lang->action->search->label['changestatus']          = $lang->action->label->changestatus;
 $lang->action->search->label['marked']                = $lang->action->label->marked;
 $lang->action->search->label['linked2project']        = $lang->action->label->linked2project;
@@ -88,4 +86,4 @@ $lang->action->desc->linkchildstory      = '$date, 由 <strong>$actor</strong> 
 $lang->action->desc->unlinkchildrenstory = '$date, 由 <strong>$actor</strong> 移除子目录 <strong>$extra</strong>。' . "\n";
 $lang->action->desc->linkparentstory     = '$date, 由 <strong>$actor</strong> 关联到父目录 <strong>$extra</strong>。' . "\n";
 $lang->action->desc->unlinkparentstory   = '$date, 由 <strong>$actor</strong> 从父目录<strong>$extra</strong>取消关联。' . "\n";
-$lang->action->desc->deletechildrenstory = '$date, 由 <strong>$actor</strong> 删除子目录<strong>$extra</strong>。' . "\n";
\ No newline at end of file
+$lang->action->desc->deletechildrenstory = '$date, 由 <strong>$actor</strong> 删除子目录<strong>$extra</strong>。' . "\n";

From 8d9439d0e671691c21ffaffac8e80c6459a183e4 Mon Sep 17 00:00:00 2001
From: zhangzilong <zhangzilong@easycorp.ltd>
Date: Wed, 23 Feb 2022 08:57:32 +0800
Subject: [PATCH 32/41] * Fix bug #19780.

---
 module/common/view/kanban.html.php | 6 +++++-
 module/story/lang/en.php           | 1 +
 module/story/lang/zh-tw.php        | 1 +
 module/task/lang/zh-cn.php         | 1 -
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php
index e314ecee49..e5e223fd96 100644
--- a/module/common/view/kanban.html.php
+++ b/module/common/view/kanban.html.php
@@ -163,6 +163,9 @@ function renderPlanItem(item, $item)
 function renderProjectItem(item, $item)
 {
     var $title = $item.find('.title');
+
+    console.log($title);
+
     if(!$title.length)
     {
         if(window.userPrivs.project)
@@ -177,7 +180,8 @@ function renderProjectItem(item, $item)
         }
         $title.appendTo($item);
     }
-    $title.text(item.name).attr('title', item.name);
+
+    $title.text(item.name + "<span class='label label-danger label-badge'>{$lang->execution->delayed}</span>").attr('title', item.name);
 
     if(item.status === 'doing')
     {
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 7a65f2ba99..3bc5da90ab 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -126,6 +126,7 @@ $lang->story->rejectedReason = 'Reject Reason';
 $lang->story->reviewedBy     = 'ReviewedBy';
 $lang->story->reviewers      = 'Reviewers';
 $lang->story->reviewedDate   = 'ReviewedDate';
+$lang->story->activatedDate  = 'Activated Date'
 $lang->story->version        = 'Version';
 $lang->story->feedbackBy     = 'From Name';
 $lang->story->notifyEmail    = 'From Email';
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index e64733eaaf..723d3bbf03 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -126,6 +126,7 @@ $lang->story->rejectedReason = '拒絶原因';
 $lang->story->reviewedBy     = '由誰評審';
 $lang->story->reviewers      = '評審人員';
 $lang->story->reviewedDate   = '評審時間';
+$lang->story->activatedDate  = '激活日期';
 $lang->story->version        = '版本號';
 $lang->story->feedbackBy     = '反饋者';
 $lang->story->notifyEmail    = '通知郵箱';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 12aa712844..3b669129b4 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -111,7 +111,6 @@ $lang->task->assignedDate      = '指派日期';
 $lang->task->openedBy          = '由谁创建';
 $lang->task->openedDate        = '创建日期';
 $lang->task->openedDateAB      = '创建';
-$lang->task->activatedDate     = '激活日期';
 $lang->task->finishedBy        = '由谁完成';
 $lang->task->finishedByAB      = '完成者';
 $lang->task->finishedDate      = '实际完成';

From d38fc515bcced021ddf6274d83b14bd5dde35696 Mon Sep 17 00:00:00 2001
From: Wenrui LI <liwenrui@easycorp.ltd>
Date: Wed, 23 Feb 2022 08:59:52 +0800
Subject: [PATCH 33/41] * change wording for modules in lite vision, bug
 #19489.

---
 extension/lite/datatable/ext/lang/zh-cn/lite.php | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 extension/lite/datatable/ext/lang/zh-cn/lite.php

diff --git a/extension/lite/datatable/ext/lang/zh-cn/lite.php b/extension/lite/datatable/ext/lang/zh-cn/lite.php
new file mode 100644
index 0000000000..013fb74d20
--- /dev/null
+++ b/extension/lite/datatable/ext/lang/zh-cn/lite.php
@@ -0,0 +1,6 @@
+<?php
+$lang->datatable->moduleSetting          = '目录设置';
+$lang->datatable->showModule             = '列表页是否显示目录名';
+$lang->datatable->showAllModule          = '是否显示完整产品目录';
+$lang->datatable->showModuleList['base'] = '只显示一级目录';
+$lang->datatable->showModuleList['end']  = '只显示最后一级目录';

From d04ff0a6d9e52662b338ad54bb919748e0c65e10 Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Wed, 23 Feb 2022 09:00:37 +0800
Subject: [PATCH 34/41] * Finish task 49306.

---
 module/execution/js/taskkanban.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js
index d142e39081..7e7b45b102 100644
--- a/module/execution/js/taskkanban.js
+++ b/module/execution/js/taskkanban.js
@@ -271,6 +271,21 @@ function renderColumnCount($count, count, col)
 {
     var text = count + '/' + (col.limit < 0 ? '<i class="icon icon-infinite"></i>' : col.limit);
     $count.html(text + '<i class="icon icon-arrow-up"></i>');
+
+    if(col.limit != -1 && col.limit < count)
+    {
+        $count.parents('.title').parent('.kanban-header-col').css('background-color', '#F6A1A1');
+        $count.parents('.title').find('.text').css('max-width', $count.parents('.title').width() - 200);
+        $count.css('color', '#E33030');
+        if(!$count.parent().find('.error').length) $count.parent().find('.include-last').after("<span class='error text-grey'><icon class='icon icon-help' title='" + kanbanLang.limitExceeded + "'></icon></span>");
+    }
+    else
+    {
+        $count.parents('.title').parent('.kanban-header-col').css('background-color', 'transparent');
+        $count.parents('.title').find('.text').css('max-width', $count.parents('.title').width() - 120);
+        $count.css('color', '#8B91A2');
+        $count.parent().find('.error').remove();
+    }
 }
 
 /**

From 51db3536d74dad3120a81d107ef4b2704b8c0fd8 Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Wed, 23 Feb 2022 09:04:01 +0800
Subject: [PATCH 35/41] *Code bug.

---
 module/execution/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 6318b0ecab..d212039839 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2068,7 +2068,7 @@ class execution extends control
         $this->view->groupBy          = $groupBy;
         $this->view->productID        = $productID;
         $this->view->branchID         = $branchID;
-        $this->view->projectID        = $this->loadModel('task')->getProjectID($execution);
+        $this->view->projectID        = $this->loadModel('task')->getProjectID($execution->id);
         $this->view->allPlans         = $allPlans;
         $this->view->kanbanData       = $kanbanData;
         $this->view->executionActions = $executionActions;

From 516c7b01337155588c1d2b181224a351dd757833 Mon Sep 17 00:00:00 2001
From: zhangzilong <zhangzilong@easycorp.ltd>
Date: Wed, 23 Feb 2022 09:18:47 +0800
Subject: [PATCH 36/41] * Fix bug #19780.

---
 module/common/view/kanban.html.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php
index e5e223fd96..06e4e5e514 100644
--- a/module/common/view/kanban.html.php
+++ b/module/common/view/kanban.html.php
@@ -164,8 +164,6 @@ function renderProjectItem(item, $item)
 {
     var $title = $item.find('.title');
 
-    console.log($title);
-
     if(!$title.length)
     {
         if(window.userPrivs.project)
@@ -180,8 +178,7 @@ function renderProjectItem(item, $item)
         }
         $title.appendTo($item);
     }
-
-    $title.text(item.name + "<span class='label label-danger label-badge'>{$lang->execution->delayed}</span>").attr('title', item.name);
+    $title.text(item.name).attr('title', item.name);
 
     if(item.status === 'doing')
     {

From 0687aaba5719d3c476223accc0259d85ff5f6200 Mon Sep 17 00:00:00 2001
From: zhangzilong <zhangzilong@easycorp.ltd>
Date: Wed, 23 Feb 2022 09:20:18 +0800
Subject: [PATCH 37/41] * Fix bug #19780.

---
 module/common/view/kanban.html.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php
index 06e4e5e514..e314ecee49 100644
--- a/module/common/view/kanban.html.php
+++ b/module/common/view/kanban.html.php
@@ -163,7 +163,6 @@ function renderPlanItem(item, $item)
 function renderProjectItem(item, $item)
 {
     var $title = $item.find('.title');
-
     if(!$title.length)
     {
         if(window.userPrivs.project)

From d8085ec0cdafc6f0cde09a3071ef6433e37a6f9e Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Wed, 23 Feb 2022 01:23:43 +0000
Subject: [PATCH 38/41] Adjust code.

---
 module/kanban/js/editspace.js | 1 +
 module/kanban/model.php       | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/module/kanban/js/editspace.js b/module/kanban/js/editspace.js
index f6b1c9bbda..4ae84ccaf6 100644
--- a/module/kanban/js/editspace.js
+++ b/module/kanban/js/editspace.js
@@ -1,6 +1,7 @@
 /**
  * When type change.
  *
+ * @param  int    spaceID
  * @param  string type
  * @access public
  * @return void
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 6c275a7a15..07e5bbea9d 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1794,12 +1794,6 @@ class kanbanModel extends model
         }
     }
 
-    public function updateKanbanBySpace($spaceID, $type)
-    {
-        $spaceType = $this->dao->select('type')->from(TABLE_KANBANSPACE)->where('id')->eq($spaceID)->fetch();
-
-    }
-
     /**
      * Close a space.
      *

From c9f2aa8d5cb0064e38cfa0a81b205f880a372335 Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Wed, 23 Feb 2022 09:36:51 +0800
Subject: [PATCH 39/41] *Delete null.

---
 module/story/view/zerocase.html.php     | 2 +-
 module/testtask/view/groupcase.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/story/view/zerocase.html.php b/module/story/view/zerocase.html.php
index cab2b83887..9694f36be8 100644
--- a/module/story/view/zerocase.html.php
+++ b/module/story/view/zerocase.html.php
@@ -33,7 +33,7 @@
           </div>
           <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
         </th>
-        <th class='c-pri' title=<?php echo $lang->story->pri;?>><?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+        <th class='c-pri' title=<?php echo $lang->story->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
         <th class='w-p30'>     <?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
         <th>                   <?php common::printOrderLink('plan',       $orderBy, $vars, $lang->story->planAB);?></th>
         <th class='thWidth'>   <?php common::printOrderLink('source',     $orderBy, $vars, $lang->story->source);?></th>
diff --git a/module/testtask/view/groupcase.html.php b/module/testtask/view/groupcase.html.php
index 2e5857f15f..852b74292a 100644
--- a/module/testtask/view/groupcase.html.php
+++ b/module/testtask/view/groupcase.html.php
@@ -26,7 +26,7 @@
           </div>
         </th>
         <th class='c-id-sm'><?php echo $lang->idAB;?></th>
-        <th class='w-80px' title='<?php echo $lang->pri;?>'>  <?php echo $lang->priAB;?></th>
+        <th class='w-80px' title='<?php echo $lang->pri;?>'><?php echo $lang->priAB;?></th>
         <th><?php echo $lang->testcase->title;?></th>
         <th class='w-80px'> <?php echo $lang->typeAB;?></th>
         <th class='w-user'> <?php echo $lang->testtask->assignedTo;?></th>

From 545ba95f9044cbad4ccb03938cf22f0587b804c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Tue, 22 Feb 2022 16:28:43 +0800
Subject: [PATCH 40/41]  * code for task #49372.

---
 extension/lite/project/ext/view/execution.html.php | 2 +-
 module/report/model.php                            | 4 ++--
 module/task/model.php                              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extension/lite/project/ext/view/execution.html.php b/extension/lite/project/ext/view/execution.html.php
index ba68cfbab0..aeabeeebac 100644
--- a/extension/lite/project/ext/view/execution.html.php
+++ b/extension/lite/project/ext/view/execution.html.php
@@ -31,7 +31,7 @@
     <p>
       <span class="text-muted"><?php echo $lang->execution->noExecution;?></span>
       <?php if(common::hasPriv('execution', 'create')):?>
-      <?php echo html::a($this->createLink('execution', 'create', "projectID=$projectID"), "<i class='icon icon-plus'></i> " . $lang->execution->createKanban, '', "class='btn btn-info' data-app='project'");?>
+      <?php echo html::a($this->createLink('execution', 'create', "projectID=$projectID"), "<i class='icon icon-plus'></i> " . $lang->project->createKanban, '', "class='btn btn-info' data-app='project'");?>
       <?php endif;?>
     </p>
   </div>
diff --git a/module/report/model.php b/module/report/model.php
index 0badfbb7d6..39f38c9610 100644
--- a/module/report/model.php
+++ b/module/report/model.php
@@ -311,8 +311,8 @@ class reportModel extends model
                             $project[$execution->projectname]['execution'][$name]['count']       = 0;
                             $project[$execution->projectname]['execution'][$name]['manhour']     = 0;
 
-                            $workload[$member]['total']['count']                                 = 0;
-                            $workload[$member]['total']['manhour']                               = 0;
+                            $workload[$member]['total']['count']   = 0;
+                            $workload[$member]['total']['manhour'] = 0;
                         }
                     }
                     $workload[$member]['task']['project'] = $project;
diff --git a/module/task/model.php b/module/task/model.php
index cb7a802615..edf8bd0f8d 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2497,7 +2497,7 @@ class taskModel extends model
 
         $this->dao->update(TABLE_TASK)->data($data)->where('id')->eq($task->id)->exec();
         if($task->parent > 0) $this->updateParentStatus($task->id);
-        if($task->story)  $this->loadModel('story')->setStage($oldTask->story);
+        if($task->story)  $this->loadModel('story')->setStage($task->story);
 
         $oldTask = new stdClass();
         $oldTask->consumed = $task->consumed;

From 64c8871c638aabe94819496f331a649ec7aebbcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Wed, 23 Feb 2022 09:56:12 +0800
Subject: [PATCH 41/41] * Merge code.

---
 extension/lite/action/ext/lang/zh-cn/lite.php | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/extension/lite/action/ext/lang/zh-cn/lite.php b/extension/lite/action/ext/lang/zh-cn/lite.php
index a2c6480f75..41ad819491 100644
--- a/extension/lite/action/ext/lang/zh-cn/lite.php
+++ b/extension/lite/action/ext/lang/zh-cn/lite.php
@@ -74,16 +74,16 @@ $lang->action->search->label['verified']              = $lang->action->label->ve
 $lang->action->search->label['login']                 = $lang->action->label->login;
 $lang->action->search->label['logout']                = $lang->action->label->logout;
 
-$lang->action->label->createchildrenstory   = "创建子目录";
-$lang->action->label->linkchildstory        = "关联子目录";
-$lang->action->label->unlinkchildrenstory   = "取消关联子目录";
-$lang->action->label->linkparentstory       = "关联到父目录";
-$lang->action->label->unlinkparentstory     = "从父目录取消关联";
-$lang->action->label->deletechildrenstory   = "删除子目录";
+$lang->action->label->createchildrenstory   = "创建子目标";
+$lang->action->label->linkchildstory        = "关联子目标";
+$lang->action->label->unlinkchildrenstory   = "取消关联子目标";
+$lang->action->label->linkparentstory       = "关联到父目标";
+$lang->action->label->unlinkparentstory     = "从父目标取消关联";
+$lang->action->label->deletechildrenstory   = "删除子目标";
 
-$lang->action->desc->createchildrenstory = '$date, 由 <strong>$actor</strong> 创建子目录 <strong>$extra</strong>。' . "\n";
-$lang->action->desc->linkchildstory      = '$date, 由 <strong>$actor</strong> 关联子目录 <strong>$extra</strong>。' . "\n";
-$lang->action->desc->unlinkchildrenstory = '$date, 由 <strong>$actor</strong> 移除子目录 <strong>$extra</strong>。' . "\n";
-$lang->action->desc->linkparentstory     = '$date, 由 <strong>$actor</strong> 关联到父目录 <strong>$extra</strong>。' . "\n";
-$lang->action->desc->unlinkparentstory   = '$date, 由 <strong>$actor</strong> 从父目录<strong>$extra</strong>取消关联。' . "\n";
-$lang->action->desc->deletechildrenstory = '$date, 由 <strong>$actor</strong> 删除子目录<strong>$extra</strong>。' . "\n";
+$lang->action->desc->createchildrenstory = '$date, 由 <strong>$actor</strong> 创建子目标 <strong>$extra</strong>。' . "\n";
+$lang->action->desc->linkchildstory      = '$date, 由 <strong>$actor</strong> 关联子目标 <strong>$extra</strong>。' . "\n";
+$lang->action->desc->unlinkchildrenstory = '$date, 由 <strong>$actor</strong> 移除子目标 <strong>$extra</strong>。' . "\n";
+$lang->action->desc->linkparentstory     = '$date, 由 <strong>$actor</strong> 关联到父目标 <strong>$extra</strong>。' . "\n";
+$lang->action->desc->unlinkparentstory   = '$date, 由 <strong>$actor</strong> 从父目标<strong>$extra</strong>取消关联。' . "\n";
+$lang->action->desc->deletechildrenstory = '$date, 由 <strong>$actor</strong> 删除子目标<strong>$extra</strong>。' . "\n";