From cea111abeda4ffdb0f2d9c65989028b784ebffd4 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Wed, 24 Mar 2021 13:53:03 +0800
Subject: [PATCH]  * Adjust session.

---
 module/doc/view/objectlibsbylist.html.php |  8 ++++----
 module/tree/control.php                   |  2 +-
 module/user/control.php                   |  2 +-
 module/webhook/control.php                | 23 ++++++++++++-----------
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/module/doc/view/objectlibsbylist.html.php b/module/doc/view/objectlibsbylist.html.php
index 8fd2b79889..b31cf5813e 100644
--- a/module/doc/view/objectlibsbylist.html.php
+++ b/module/doc/view/objectlibsbylist.html.php
@@ -21,13 +21,13 @@
         </thead>
         <tbody>
           <?php foreach($libs as $libID => $lib):?>
-          <?php if($libID == 'execution' and $from != 'doc') continue;?>
+          <?php if($libID == 'execution' and $this->from != 'doc') continue;?>
           <?php if(strpos($config->doc->custom->objectLibs, 'files') === false && $libID == 'files') continue;?>
           <?php if(strpos($config->doc->custom->objectLibs, 'customFiles') === false && isset($lib->main) && !$lib->main) continue;?>
 
-          <?php $libLink = inlink('browse', "libID=$libID&browseType=all&param=0&orderBy=id_desc&from=$from");?>
+          <?php $libLink = inlink('browse', "libID=$libID&browseType=all&param=0&orderBy=id_desc&from=$this->from");?>
           <?php if($libID == 'execution') $libLink = inlink('allLibs', "type=execution&product=$object->id");?>
-          <?php if($libID == 'files')     $libLink = inlink('showFiles', "type=$type&objectID=$object->id&from=$from");?>
+          <?php if($libID == 'files')     $libLink = inlink('showFiles', "type=$type&objectID=$object->id&from=$this->from");?>
           <tr>
             <td class="c-name"><?php echo html::a($libLink, $lib->name);?></td>
             <td class="c-num"><?php echo  $lib->allCount . $lang->doc->item;?></td>
@@ -40,7 +40,7 @@
               <?php endif;?>
               <?php common::printLink('doc', 'editLib', "libID=$libID", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link iframe'")?>
               <?php if(empty($lib->main)) common::printLink('doc', 'deleteLib', "libID=$libID", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
-              <?php common::printLink('tree', 'browse', "rootID=$libID&viewType=doc&currentModuleID=0&branch=0&from=$from", "<i class='icon icon-cog'></i>", '', "title='{$lang->doc->manageType}' class='btn btn-link'")?>
+              <?php common::printLink('tree', 'browse', "rootID=$libID&viewType=doc&currentModuleID=0&branch=0&from=$this->from", "<i class='icon icon-cog'></i>", '', "title='{$lang->doc->manageType}' class='btn btn-link'")?>
               <?php endif;?>
             </td>
           </tr>
diff --git a/module/tree/control.php b/module/tree/control.php
index a4efbb380c..5b17f6c6e1 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -156,7 +156,7 @@ class tree extends control
                 $this->lang->tree->menuOrder = $this->lang->project->menuOrder;
 
                 /* The project parameter needs to be present when the tree module belongs to the project grouping. */
-                if($this->session->docList && $this->session->project && strpos($this->session->docList, 'project') === false) $this->session->set('docList', $this->session->docList . '?project=' . $this->session->project);
+                if($this->session->docList && $this->session->project && strpos($this->session->docList, 'project') === false) $this->session->set('docList', $this->session->docList . '?project=' . $this->session->project, 'project');
             }
 
             if($from == 'doc') $this->lang->navGroup->doc = 'doc';
diff --git a/module/user/control.php b/module/user/control.php
index 0416260a85..43f71390c4 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -62,7 +62,7 @@ class user extends control
 
         /* Set thie url to session. */
         $uri = $this->app->getURI(true);
-        $this->session->set('todoList', $uri);
+        $this->session->set('todoList', $uri, 'my');
         $this->session->set('bugList',  $uri, 'qa');
         $this->session->set('taskList', $uri, 'execution');
 
diff --git a/module/webhook/control.php b/module/webhook/control.php
index ff5d3fafac..468fc41db3 100644
--- a/module/webhook/control.php
+++ b/module/webhook/control.php
@@ -137,17 +137,18 @@ class webhook extends control
     {
         /* Save session. */
         $uri   = $this->app->getURI(true);
-        $this->session->set('productList',     $uri);
-        $this->session->set('productPlanList', $uri);
-        $this->session->set('releaseList',     $uri);
-        $this->session->set('storyList',       $uri);
-        $this->session->set('executionList',   $uri);
-        $this->session->set('taskList',        $uri);
-        $this->session->set('buildList',       $uri);
-        $this->session->set('bugList',         $uri);
-        $this->session->set('caseList',        $uri);
-        $this->session->set('testtaskList',    $uri);
-        $this->session->set('todoList',        $uri);
+        $this->session->set('productList',     $uri, 'product');
+        $this->session->set('productPlanList', $uri, 'product');
+        $this->session->set('releaseList',     $uri, 'product');
+        $this->session->set('storyList',       $uri, 'product');
+        $this->session->set('executionList',   $uri, 'execution');
+        $this->session->set('taskList',        $uri, 'execution');
+        $this->session->set('buildList',       $uri, 'execution');
+        $this->session->set('bugList',         $uri, 'qa');
+        $this->session->set('caseList',        $uri, 'qa');
+        $this->session->set('testtaskList',    $uri, 'qa');
+        $this->session->set('todoList',        $uri, 'my');
+        $this->session->set('docList',         $uri, 'doc');
 
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);