From 4e3f46d87a9cd907f9302b0749c2f60d6e67cf88 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, 1 Mar 2022 08:34:06 +0800
Subject: [PATCH 1/6] * Fix code detail.

---
 module/upgrade/view/to15guide.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/upgrade/view/to15guide.html.php b/module/upgrade/view/to15guide.html.php
index 528dd3b675..f1d56423fd 100644
--- a/module/upgrade/view/to15guide.html.php
+++ b/module/upgrade/view/to15guide.html.php
@@ -16,11 +16,11 @@
     <form method='post'>
       <div class='panel-title text-center'>
         <?php
-        if($this->config->edition == 'max')
+        if($config->edition == 'max')
         {
             echo $lang->upgrade->toMAXGuide;
         }
-        elseif($this->config->edition == 'biz')
+        elseif($config->edition == 'biz')
         {
             echo $lang->upgrade->toBIZ5Guide;
         }

From b1afcd3a6e0fb20fec0753c2d90f11a1aa7dfb9c Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 1 Mar 2022 10:15:29 +0800
Subject: [PATCH 2/6] * Fix bug #20154.

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

diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 99873cc289..0cdc984525 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -171,7 +171,7 @@ js::set('hasTaskButton', $hasTaskButton);
         <?php if($canBatchCreateBug) echo '<li>' . html::a(helper::createLink('bug', 'batchCreate', "productID=$productID&branch=$branchID&executionID=$execution->id", '', true), $lang->bug->batchCreate, '', "class='iframe'") . '</li>';?>
         <?php if(($hasStoryButton or $hasBugButton) and $hasTaskButton) echo '<li class="divider"></li>';?>
         <?php if($canCreateTask) echo '<li>' . html::a(helper::createLink('task', 'create', "execution=$execution->id", '', true), $lang->task->create, '', "class='iframe'") . '</li>';?>
-        <?php if($canImportBug) echo '<li>' . html::a(helper::createLink('execution', 'importBug', "executionID=$execution->id", '', true), $lang->execution->importBug, '', "class='ifram'") . '</li>';?>
+        <?php if($canImportBug) echo '<li>' . html::a(helper::createLink('execution', 'importBug', "executionID=$execution->id", '', true), $lang->execution->importBug, '', "class='iframe' data-width=80%") . '</li>';?>
         <?php if($canBatchCreateTask) echo '<li>' . html::a(helper::createLink('task', 'batchCreate', "execution=$execution->id", '', true), $lang->execution->batchCreateTask, '', "class='iframe'") . '</li>';?>
       </ul>
     </div>

From 59c9f0dbeb3ee0f0c1681ad288d9e5fbf95f7fb7 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 1 Mar 2022 10:33:46 +0800
Subject: [PATCH 3/6] * Fix bug #20164.

---
 module/file/view/export.html.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php
index db6fd17222..927fb10abc 100644
--- a/module/file/view/export.html.php
+++ b/module/file/view/export.html.php
@@ -10,8 +10,8 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php include '../../common/view/header.lite.html.php';?>
-<?php include '../../common/view/chosen.html.php';?>
+<?php include $app->getModuleRoot() . 'common/view/header.lite.html.php';?>
+<?php include $app->getModuleRoot() . 'common/view/chosen.html.php';?>
 <?php $this->app->loadLang('file');?>
 <style>
 #customFields .panel {border: 1px solid #ddd; background: #fafafa; margin: 0;}
@@ -331,4 +331,4 @@ if($isCustomExport)
     </div>
   </div>
 </main>
-<?php include '../../common/view/footer.lite.html.php';?>
+<?php include $app->getModuleRoot() . 'common/view/footer.lite.html.php';?>

From bd01479b5a75162fe449d22c2e4f109843cbaf23 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, 1 Mar 2022 10:40:52 +0800
Subject: [PATCH 4/6] * Merge code.

---
 module/upgrade/model.php                      | 38 ++++++++++++++-----
 .../upgrade/{maxfiles.txt => systemfiles.txt} |  0
 2 files changed, 29 insertions(+), 9 deletions(-)
 rename module/upgrade/{maxfiles.txt => systemfiles.txt} (100%)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 35ea130dc0..ec2d7c315d 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -40,12 +40,12 @@ class upgradeModel extends model
 
         $openVersion  = $fromVersion;
         $proInstalled = $bizInstalled = $maxInstalled = false;
-        if($fromVersion[0] == 'p') 
+        if($fromVersion[0] == 'p')
         {
             $openVersion  = $this->config->upgrade->proVersion[$fromVersion];
             $proInstalled = true;
         }
-        elseif($fromVersion[0] == 'b') 
+        elseif($fromVersion[0] == 'b')
         {
             $openVersion  = $this->config->upgrade->bizVersion[$fromVersion];
             $bizInstalled = true;
@@ -5834,9 +5834,9 @@ class upgradeModel extends model
                 /* Check whether the current file is encrypted. */
                 if(strpos($line, "extension_loaded('ionCube Loader')") === false)
                 {
-                    $maxFiles = file_get_contents('maxfiles.txt');
-                    $maxFiles = str_replace('/', DS, $maxFiles);
-                    if(strpos($maxFiles, $fileName) !== false) continue;
+                    $systemFiles = file_get_contents('systemfiles.txt');
+                    $systemFiles = str_replace('/', DS, $systemFiles);
+                    if(strpos($systemFiles, $fileName) !== false) continue;
 
                     $pluginFiles[$fileName] = $fileName;
                 }
@@ -5876,7 +5876,7 @@ class upgradeModel extends model
                 }
             }
             copy($fromPath, $toPath);
-            $this->replaceEXTFile($toPath);
+            $this->replaceIncludePath($toPath);
         }
 
         return $response;
@@ -5914,18 +5914,38 @@ class upgradeModel extends model
     }
 
     /**
-     * Replace extent file.
+     * Replace the load path of the file.
      *
      * @param  string $filePath
      * @access public
      * @return void
      */
-    public function replaceEXTFile($filePath)
+    public function replaceIncludePath($filePath)
     {
         $content = file_get_contents($filePath);
         if(strpos(basename($filePath), 'html'))
         {
-            $content = preg_replace("#(include )'((../){2,})([a-z]+/)#", '$1' . '$app->getModuleRoot() . ' . "'$4", $content);
+            $content = preg_replace('#(include )(\'|")((../){2,})([a-z]+/)(?!ext/)([a-z]+/)#', '$1' . '$app->getModuleRoot() . ' . '"$5$6', $content);
+
+            $systemFiles = file_get_contents('systemfiles.txt');
+            $systemFiles = str_replace('/', DS, $systemFiles);
+
+            preg_match_all('#(include )(\'|")(../){2,}[a-z]+/ext/[a-z]+/(([a-z]+[.]?)+)#', $content, $matches);
+            foreach($matches[0] as $fileName)
+            {
+                $fileName = preg_replace("#(include )('|\")((../){2,})#", "", $fileName);
+                if(strpos($systemFiles, $fileName) !== false)
+                {
+                    $fileName = basename($fileName);
+                    $content = preg_replace('#(include )(\'|")((../){2,})([a-z]+/ext/view/' . $fileName . ')#', '$1' . '$app->appRoot . ' . '$2extension/max/$5', $content);;
+
+                }
+                else
+                {
+                    $fileName = basename($fileName);
+                    $content = preg_replace('#(include )(\'|")((../){2,})([a-z]+/ext/view/' . $fileName . ')#', '$1' . '$app->appRoot . ' . '$2extension/custom/$5', $content);;
+                }
+            }
         }
         else
         {
diff --git a/module/upgrade/maxfiles.txt b/module/upgrade/systemfiles.txt
similarity index 100%
rename from module/upgrade/maxfiles.txt
rename to module/upgrade/systemfiles.txt

From fe98c033c700e4ec64108c1e822506fcb39fcad2 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 1 Mar 2022 10:38:34 +0800
Subject: [PATCH 5/6] * Remove empty line.

---
 module/upgrade/model.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index ec2d7c315d..fa22bdd210 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -5937,13 +5937,12 @@ class upgradeModel extends model
                 if(strpos($systemFiles, $fileName) !== false)
                 {
                     $fileName = basename($fileName);
-                    $content = preg_replace('#(include )(\'|")((../){2,})([a-z]+/ext/view/' . $fileName . ')#', '$1' . '$app->appRoot . ' . '$2extension/max/$5', $content);;
-
+                    $content = preg_replace('#(include )(\'|")((../){2,})([a-z]+/ext/view/' . $fileName . ')#', '$1' . '$app->appRoot . ' . '$2extension/max/$5', $content);
                 }
                 else
                 {
                     $fileName = basename($fileName);
-                    $content = preg_replace('#(include )(\'|")((../){2,})([a-z]+/ext/view/' . $fileName . ')#', '$1' . '$app->appRoot . ' . '$2extension/custom/$5', $content);;
+                    $content = preg_replace('#(include )(\'|")((../){2,})([a-z]+/ext/view/' . $fileName . ')#', '$1' . '$app->appRoot . ' . '$2extension/custom/$5', $content);
                 }
             }
         }

From 44be255e67e99c9a5f3e8d557fd2e6db0e1b62eb 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, 1 Mar 2022 11:23:44 +0800
Subject: [PATCH 6/6]  * adjust task #49362 and check priv.

---
 .../lite/doc/ext/view/objectlibs.lite.html.hook.php |  2 +-
 .../user/ext/view/featurebar.lite.html.hook.php     |  4 ++--
 module/doc/model.php                                | 13 ++++++++-----
 module/project/view/team.html.php                   |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/extension/lite/doc/ext/view/objectlibs.lite.html.hook.php b/extension/lite/doc/ext/view/objectlibs.lite.html.hook.php
index 1ac68e29da..6ebc48b5f7 100644
--- a/extension/lite/doc/ext/view/objectlibs.lite.html.hook.php
+++ b/extension/lite/doc/ext/view/objectlibs.lite.html.hook.php
@@ -10,7 +10,7 @@ $('#pageNav .btn-group #dropMenu .table-col .list-group a[href*="showFiles"]').r
 </script>
 <?php endif;?>
 
-<?php if(!empty($doc) and !$doc->deleted and $doc->version > 1 and common::hasPriv('doc', 'diff')):?>
+<?php if(!empty($doc) and !$doc->deleted and $doc->version > 1 and common::hasPriv('doc', 'diff') and $config->edition != 'open'):?>
 <?php
 $versions = array();
 $i = 1;
diff --git a/extension/lite/user/ext/view/featurebar.lite.html.hook.php b/extension/lite/user/ext/view/featurebar.lite.html.hook.php
index bf6b7bc5e2..43d0e35d07 100644
--- a/extension/lite/user/ext/view/featurebar.lite.html.hook.php
+++ b/extension/lite/user/ext/view/featurebar.lite.html.hook.php
@@ -1,6 +1,6 @@
 <script>
 $('#mainMenu .btn-toolbar > a[href*="bug"], a[href*="testtask"], a[href*="testcase"], a[href*="issue"], a[href*="risk"], a[href*="requirement"]').remove();
-<?php if($this->config->edition != 'open'):?>
-$('#mainMenu .btn-toolbar > a:first').attr('href', createLink('user', 'todocalendar', 'userID=<?php echo $user->id?>'));
+<?php if($this->config->edition != 'open' and common::hasPriv('user', 'todocalendar')):?>
+$('#mainMenu .btn-toolbar > a:first[href*="todo"]').attr('href', createLink('user', 'todocalendar', 'userID=<?php echo $user->id?>'));
 <?php endif;?>
 </script>
diff --git a/module/doc/model.php b/module/doc/model.php
index f9031c7f1b..ca179ac701 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -516,12 +516,15 @@ class docModel extends model
         /* When file change then version add one. */
         $files    = $this->loadModel('file')->getByObject('doc', $docID);
         $docFiles = array();
-        foreach($files as $file)
+        if($docContent)
         {
-            $pathName       = $this->file->getRealPathName($file->pathname);
-            $file->webPath  = $this->file->webPath . $pathName;
-            $file->realPath = $this->file->savePath . $pathName;
-            if(strpos(",{$docContent->files},", ",{$file->id},") !== false) $docFiles[$file->id] = $file;
+            foreach($files as $file)
+            {
+                $pathName       = $this->file->getRealPathName($file->pathname);
+                $file->webPath  = $this->file->webPath . $pathName;
+                $file->realPath = $this->file->savePath . $pathName;
+                if(strpos(",{$docContent->files},", ",{$file->id},") !== false) $docFiles[$file->id] = $file;
+            }
         }
 
         /* Check file change. */
diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php
index 4e12136abe..6576b85d93 100644
--- a/module/project/view/team.html.php
+++ b/module/project/view/team.html.php
@@ -67,7 +67,7 @@
         <tr>
           <td>
           <?php
-          if(common::hasPriv('user', 'view'))
+          if(common::hasPriv('user', 'view') and common::hasPriv('my', 'team'))
           {
               $link = isset($deptUsers[$member->userID]) ? $this->createLink('user', 'view', "userID={$member->userID}") : "javascript: alert(noAccess);";
               echo html::a($link, $member->realname, '', 'data-app="system"');