From 0ea063425bc199795eafc3c412ce922955463f0e Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Fri, 3 Nov 2023 11:08:25 +0800
Subject: [PATCH] * The judgment logic of pop-up window is changed to isInModal
 function.

---
 module/account/control.php        |  4 ++--
 module/action/model.php           |  2 +-
 module/api/control.php            |  4 ++--
 module/caselib/control.php        |  4 ++--
 module/common/model.php           | 10 +++++-----
 module/execution/control.php      |  2 +-
 module/file/control.php           |  2 +-
 module/file/model.php             |  2 +-
 module/group/control.php          |  2 +-
 module/kanban/control.php         |  6 +++---
 module/mail/model.php             |  2 +-
 module/message/model.php          |  2 +-
 module/my/control.php             |  2 +-
 module/project/control.php        |  2 +-
 module/projectrelease/control.php |  2 +-
 module/projectrelease/model.php   |  2 +-
 module/story/control.php          | 10 +++++-----
 module/testcase/control.php       |  2 +-
 module/testreport/control.php     |  2 +-
 module/testtask/control.php       |  2 +-
 module/todo/control.php           | 18 +++++++++---------
 module/tree/control.php           |  4 ++--
 module/zahost/control.php         | 10 +++++-----
 module/zanode/control.php         |  2 +-
 24 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/module/account/control.php b/module/account/control.php
index 5a9f60d56c..58380d3261 100644
--- a/module/account/control.php
+++ b/module/account/control.php
@@ -67,7 +67,7 @@ class account extends control
 
             $this->loadModel('action')->create('account', $id, 'created');
 
-            if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => true));
+            if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => true));
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'callback' => 'loadCurrentPage()', 'closeModal' => true));
         }
 
@@ -187,7 +187,7 @@ class account extends control
             $this->account->updateStatus($accountID, $accountStatus);
 
             $this->loadModel('action')->create('account', $id, $accountStatus, $postData->reason);
-            if(isonlybody()) return print(js::reload('parent.parent'));
+            if(isInModal()) return print(js::reload('parent.parent'));
             return print(js::reload('parent'));
         }
 
diff --git a/module/action/model.php b/module/action/model.php
index 5447868409..b30787c278 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -483,7 +483,7 @@ class actionModel extends model
                 $mrAction = str_replace('mr', '', $action->action) . 'Action';
                 list($mrDate, $mrActor, $mrLink) = explode('::', $action->extra);
 
-                if(isonlybody()) $mrLink .= ($this->config->requestType == 'GET' ? '&onlybody=yes' : '?onlybody=yes');
+                if(isInModal()) $mrLink .= ($this->config->requestType == 'GET' ? '&onlybody=yes' : '?onlybody=yes');
 
                 $this->app->loadLang('mr');
                 $desc = sprintf($this->lang->mr->{$mrAction}, $mrDate, $mrActor, $mrLink);
diff --git a/module/api/control.php b/module/api/control.php
index fdcebd940e..5a89c4fdfc 100755
--- a/module/api/control.php
+++ b/module/api/control.php
@@ -553,7 +553,7 @@ class api extends control
         else
         {
             $this->doc->delete(TABLE_DOCLIB, $libID);
-            if(isonlybody())
+            if(isInModal())
             {
                 unset($_GET['onlybody']);
                 return print(js::locate($this->createLink('api', 'index'), 'parent.parent'));
@@ -625,7 +625,7 @@ class api extends control
 
             $this->action->create('api', $api->id, 'Created');
 
-            if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => 'true', 'callback' => "parentLocate({$api->id}, {$api->lib}, {$api->module})"));
+            if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => 'true', 'callback' => "parentLocate({$api->id}, {$api->lib}, {$api->module})"));
             return $this->sendSuccess(array('locate' => helper::createLink('api', 'index', "libID={$api->lib}&moduleID={$api->module}&apiID={$api->id}")));
         }
 
diff --git a/module/caselib/control.php b/module/caselib/control.php
index f2768f0988..a50b2d7886 100644
--- a/module/caselib/control.php
+++ b/module/caselib/control.php
@@ -216,7 +216,7 @@ class caselib extends control
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
             /* If link from no head then reload. */
-            if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
+            if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $this->createLink('caselib', 'browse', "libID={$libID}&browseType=byModule&param={$_POST['module']}")));
         }
         /* Set lib menu. */
@@ -261,7 +261,7 @@ class caselib extends control
             foreach($cases as $case) $this->testcase->create($case);
 
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
-            if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
+            if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $this->createLink('caselib', 'browse', "libID={$libID}&browseType=byModule&param={$moduleID}"), 'closeModal' => true));
         }
 
diff --git a/module/common/model.php b/module/common/model.php
index 1a3dccfda4..d709dd7eef 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -1675,10 +1675,10 @@ EOF;
      */
     public static function buildIconButton($module, $method, $vars = '', $object = '', $type = 'button', $icon = '', $target = '', $extraClass = '', $onlyBody = false, $misc = '', $title = '', $programID = 0, $extraEnabled = '')
     {
-        if(isonlybody() and strpos($extraClass, 'showinonlybody') === false) return false;
+        if(isInModal() and strpos($extraClass, 'showinonlybody') === false) return false;
 
         /* Remove iframe for operation button in modal. Prevent pop up in modal. */
-        if(isonlybody() and strpos($extraClass, 'showinonlybody') !== false) $extraClass = str_replace('iframe', '', $extraClass);
+        if(isInModal() and strpos($extraClass, 'showinonlybody') !== false) $extraClass = str_replace('iframe', '', $extraClass);
 
         global $app, $lang, $config;
 
@@ -1903,7 +1903,7 @@ EOF;
     public static function printRPN($backLink, $preAndNext = '', $linkTemplate = '')
     {
         global $lang, $app;
-        if(isonlybody()) return false;
+        if(isInModal()) return false;
 
         $title = $lang->goback . $lang->backShortcutKey;
         echo html::a($backLink, '<i class="icon-goback icon-back icon-large"></i>', '', "id='back' class='btn' title={$title}");
@@ -1939,7 +1939,7 @@ EOF;
     public static function printBack($backLink, $class = '', $misc = '')
     {
         global $lang, $app;
-        if(isonlybody()) return false;
+        if(isInModal()) return false;
 
         if(empty($class)) $class = 'btn';
         $title = $lang->goback . $lang->backShortcutKey;
@@ -1958,7 +1958,7 @@ EOF;
     public static function printPreAndNext($preAndNext = '', $linkTemplate = '')
     {
         global $lang, $app;
-        if(isonlybody()) return false;
+        if(isInModal()) return false;
 
         $moduleName = ($app->getModuleName() == 'story' and $app->tab == 'project') ? 'projectstory' : $app->getModuleName();
         echo "<nav class='container'>";
diff --git a/module/execution/control.php b/module/execution/control.php
index e004a0b442..0ea711ffc3 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2123,7 +2123,7 @@ class execution extends control
             if($object->type != 'project' and $object->project != 0) $this->execution->linkStory($object->project, $this->post->stories ? $this->post->stories : array());
             $this->execution->linkStory($objectID, $this->post->stories ? $this->post->stories : array(), $extra);
 
-            if(!isonlybody()) return $this->sendSuccess(array('load' => $browseLink));
+            if(!isInModal()) return $this->sendSuccess(array('load' => $browseLink));
             if(!$this->app->tab !== 'execution') return $this->sendSuccess(array('closeModal' => true, 'locate' => $browseLink));
 
             $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
diff --git a/module/file/control.php b/module/file/control.php
index b2a45bbb54..edcee61516 100755
--- a/module/file/control.php
+++ b/module/file/control.php
@@ -138,7 +138,7 @@ class file extends control
         if(!$this->file->checkPriv($file))
         {
             echo js::alert($this->lang->file->accessDenied);
-            if(isonlybody()) return print(js::reload('parent.parent'));
+            if(isInModal()) return print(js::reload('parent.parent'));
             return print(js::locate(helper::createLink('my', 'index'), 'parent.parent'));
         }
 
diff --git a/module/file/model.php b/module/file/model.php
index f36d69de2d..315fffd32a 100755
--- a/module/file/model.php
+++ b/module/file/model.php
@@ -989,7 +989,7 @@ class fileModel extends model
     {
         if(is_string($fields)) $fields = explode(',', str_replace(' ', '', $fields));
 
-        $isonlybody = isonlybody();
+        $isonlybody = isInModal();
         unset($_GET['onlybody']);
 
         foreach($fields as $field)
diff --git a/module/group/control.php b/module/group/control.php
index 5ed7ed78c4..879ce32133 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -195,7 +195,7 @@ class group extends control
             $this->group->updateView($groupID);
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
-            $link = isonlybody() ? 'parent' : $this->createLink('group', 'browse');
+            $link = isInModal() ? 'parent' : $this->createLink('group', 'browse');
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $link));
         }
 
diff --git a/module/kanban/control.php b/module/kanban/control.php
index 839c4774c5..079ddbf020 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1008,7 +1008,7 @@ class kanban extends control
         $actionID = $this->action->create('kanbanCard', $cardID, 'finished');
         $this->action->logHistory($actionID, $changes);
 
-        if(isonlybody()) return print(js::reload('parent.parent'));
+        if(isInModal()) return print(js::reload('parent.parent'));
 
         $kanbanGroup = $this->kanban->getKanbanData($kanbanID);
         return print(json_encode($kanbanGroup));
@@ -1492,7 +1492,7 @@ class kanban extends control
             $actionID = $this->loadModel('action')->create('kanbancard', $cardID, 'archived');
             $this->action->logHistory($actionID, $changes);
 
-            if(isonlybody()) return print(js::reload('parent.parent'));
+            if(isInModal()) return print(js::reload('parent.parent'));
             $card        = $this->kanban->getCardByID($cardID);
             $kanbanGroup = $this->kanban->getKanbanData($card->kanban, $card->region);
             $kanbanGroupParam = json_encode($kanbanGroup);
@@ -1582,7 +1582,7 @@ class kanban extends control
             if($card->fromType == '') $this->kanban->delete(TABLE_KANBANCARD, $cardID);
             if($card->fromType != '') $this->dao->delete()->from(TABLE_KANBANCARD)->where('id')->eq($cardID)->exec();
 
-            if(isonlybody()) return print(js::reload('parent.parent'));
+            if(isInModal()) return print(js::reload('parent.parent'));
 
             $kanbanGroup      = $this->kanban->getKanbanData($card->kanban, $card->region);
             $kanbanGroupParam = json_encode($kanbanGroup);
diff --git a/module/mail/model.php b/module/mail/model.php
index d259bf676c..b191251b22 100644
--- a/module/mail/model.php
+++ b/module/mail/model.php
@@ -318,7 +318,7 @@ class mailModel extends model
         /* Replace full webPath image for mail. */
         $sysURL      = zget($this->config->mail, 'domain', common::getSysURL());
         $readLinkReg = str_replace(array('%fileID%', '/', '.', '?'), array('[0-9]+', '\/', '\.', '\?'), helper::createLink('file', 'read', 'fileID=(%fileID%)', '\w+'));
-        if(isonlybody()) $readLinkReg = str_replace(array('\?onlybody=yes', '&onlybody=yes'), '', $readLinkReg);
+        if(isInModal()) $readLinkReg = str_replace(array('\?onlybody=yes', '&onlybody=yes'), '', $readLinkReg);
 
         $body = preg_replace('/ src="(' . $readLinkReg . ')" /', ' src="' . $sysURL . '$1" ', $body);
         $body = preg_replace('/ src="{([0-9]+)(\.(\w+))?}" /', ' src="' . $sysURL . helper::createLink('file', 'read', "fileID=$1", "$3") . '" ', $body);
diff --git a/module/message/model.php b/module/message/model.php
index 88de478337..add0727ad7 100755
--- a/module/message/model.php
+++ b/module/message/model.php
@@ -151,7 +151,7 @@ class messageModel extends model
         $this->app->loadConfig('mail');
         $sysURL = zget($this->config->mail, 'domain', common::getSysURL());
 
-        $isonlybody = isonlybody();
+        $isonlybody = isInModal();
         if($isonlybody) unset($_GET['onlybody']);
 
         $moduleName = $objectType == 'case' ? 'testcase' : $objectType;
diff --git a/module/my/control.php b/module/my/control.php
index 8bea50144e..6539791e5a 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -1375,7 +1375,7 @@ EOF;
         {
             $this->user->updatePassword($this->app->user->id);
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
-            if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
+            if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $this->createLink('index', 'index')));
         }
 
diff --git a/module/project/control.php b/module/project/control.php
index 11caebba08..829c9b88b8 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -486,7 +486,7 @@ class project extends control
             $message = $this->executeHooks($projectID);
             if($message) $this->lang->saveSuccess = $message;
 
-            if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => 'parent'));
+            if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => 'parent'));
 
             $locateLink = ($this->session->projectList and $from != 'view') ? $this->session->projectList : inLink('view', "projectID=$projectID");
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $locateLink));
diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php
index 69914b0d74..446de635e4 100644
--- a/module/projectrelease/control.php
+++ b/module/projectrelease/control.php
@@ -129,7 +129,7 @@ class projectrelease extends control
             if($message) $this->lang->saveSuccess = $message;
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $releaseID));
-            if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
+            if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "releaseID=$releaseID")));
         }
 
diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php
index e6de358907..f65e101a92 100644
--- a/module/projectrelease/model.php
+++ b/module/projectrelease/model.php
@@ -136,7 +136,7 @@ class projectreleaseModel extends model
     public function buildOperateViewMenu($release)
     {
         $canBeChanged = common::canBeChanged('projectrelease', $release);
-        if($release->deleted || !$canBeChanged || isonlybody()) return '';
+        if($release->deleted || !$canBeChanged || isInModal()) return '';
 
         $menu   = '';
         $params = "releaseID=$release->id";
diff --git a/module/story/control.php b/module/story/control.php
index 9adf66399d..44e5d7240b 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -159,7 +159,7 @@ class story extends control
             }
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $stories));
-            if(isonlybody()) return $this->send($this->storyZen->getResponseInModal($this->lang->saveSuccess, $executionID));
+            if(isInModal()) return $this->send($this->storyZen->getResponseInModal($this->lang->saveSuccess, $executionID));
 
             $locateLink = $this->storyZen->getAfterBatchCreateLocation($productID, $branch, $executionID, $storyID, $storyType);
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
@@ -431,7 +431,7 @@ class story extends control
 
             $this->executeHooks($storyID);
 
-            if(isonlybody())
+            if(isInModal())
             {
                 $execution = $this->execution->getByID($this->session->execution);
                 if($this->app->tab == 'execution' and $execution->type == 'kanban')
@@ -572,7 +572,7 @@ class story extends control
             $message = $this->executeHooks($storyID);
             if(empty($message)) $message = $this->lang->saveSuccess;
 
-            if(isonlybody())
+            if(isInModal())
             {
                 if($this->app->tab == 'execution') $this->loadModel('kanban')->updateLane($this->session->execution, 'story', $storyID);
                 return $this->send($this->storyZen->getResponseInModal($message));
@@ -698,7 +698,7 @@ class story extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => 'loadCurrentPage()'));
+            if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => 'loadCurrentPage()'));
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => $this->createLink('story', 'view', "storyID=$storyID&version=0&param=0&storyType=$storyType")));
         }
 
@@ -767,7 +767,7 @@ class story extends control
 
             $this->executeHooks($storyID);
 
-            if(isonlybody())
+            if(isInModal())
             {
                 $execution    = $this->execution->getByID($this->session->execution);
                 $executionLaneType = $this->session->executionLaneType ? $this->session->executionLaneType : 'all';
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 0706fbbef7..30b7e3dbcd 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -45,7 +45,7 @@ class testcase extends control
         $products = array();
         $objectID = 0;
         $tab      = ($this->app->tab == 'project' or $this->app->tab == 'execution') ? $this->app->tab : 'qa';
-        if(!isonlybody())
+        if(!isInModal())
         {
             if($this->app->tab == 'project')
             {
diff --git a/module/testreport/control.php b/module/testreport/control.php
index e0bcd213fd..fdd6c3f331 100644
--- a/module/testreport/control.php
+++ b/module/testreport/control.php
@@ -48,7 +48,7 @@ class testreport extends control
         $products = array();
         $objectID = 0;
         $tab      = ($this->app->tab == 'project' or $this->app->tab == 'execution') ? $this->app->tab : 'qa';
-        if(!isonlybody())
+        if(!isInModal())
         {
             if($this->app->tab == 'project')
             {
diff --git a/module/testtask/control.php b/module/testtask/control.php
index d834144776..408a2fc0d8 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -48,7 +48,7 @@ class testtask extends control
 
             /* 如果没有获取到产品键值对、并且即不是弹窗页面也不是 ajax 请求，那么跳转到错误提示页面。*/
             /* If the product key-value pair is not obtained and it is not a pop-up page or an ajax request, then jump to the error page. */
-            if(empty($products) && !isonlybody() && !helper::isAjaxRequest())
+            if(empty($products) && !isInModal() && !helper::isAjaxRequest())
             {
                 $tab      = ($this->app->tab == 'project' || $this->app->tab == 'execution') ? $this->app->tab : 'qa';
                 $objectID = ($tab == 'project' || $tab == 'execution') ? $this->session->$tab : 0;
diff --git a/module/todo/control.php b/module/todo/control.php
index 07f80dccde..4132af6fb1 100755
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -66,7 +66,7 @@ class todo extends control
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $todoID));
             if($this->viewType == 'xhtml') return print(js::locate($this->createLink('todo', 'view', "todoID=$todoID", 'html'), 'parent'));
-            if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
+            if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => $this->createLink('my', 'todo', 'type=all&userID=&status=all&orderBy=id_desc')));
         }
 
@@ -204,7 +204,7 @@ class todo extends control
         }
 
         if(in_array($todo->type, array('bug', 'task', 'story'))) return $this->todoZen->printStartConfirm($todo);
-        if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
+        if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
         return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => $this->session->todoList ? $this->session->todoList : $this->createLink('my', 'todo')));
     }
 
@@ -226,7 +226,7 @@ class todo extends control
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
         }
         if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'success'));
-        if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
+        if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
         return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => $this->session->todoList ? $this->session->todoList : $this->createLink('my', 'todo')));
     }
 
@@ -254,7 +254,7 @@ class todo extends control
             $this->send(array('status' => 'success'));
         }
 
-        if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
+        if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
         return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => $this->session->todoList ? $this->session->todoList : $this->createLink('my', 'todo')));
     }
 
@@ -277,7 +277,7 @@ class todo extends control
             $isAssigned = $this->todoZen->doAssignTo($todo);
             if(!$isAssigned) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
-            if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
+            if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => $this->session->todoList ? $this->session->todoList : $this->createLink('my', 'todo')));
         }
 
@@ -305,7 +305,7 @@ class todo extends control
         $account = $this->app->user->account;
         if($todo->private and $todo->account != $account) return print(js::error((string)$this->lang->todo->thisIsPrivate) . (string)js::locate('back'));
 
-        if(!isonlybody()) $this->todoZen->setSessionUri($this->app->getURI(true));
+        if(!isInModal()) $this->todoZen->setSessionUri($this->app->getURI(true));
 
         /* Fix bug #936. */
         if($account != $todo->account and $account != $todo->assignedTo and !common::hasPriv('my', 'team'))
@@ -346,7 +346,7 @@ class todo extends control
         }
 
         if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'success'));
-        if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
+        if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
         return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => $this->session->todoList ? $this->session->todoList : $this->createLink('my', 'todo')));
     }
 
@@ -372,7 +372,7 @@ class todo extends control
         if(in_array($todo->type, $types))
         {
             $confirmNote = 'confirm' . ucfirst($todo->type);
-            $okTarget    = isonlybody() ? 'parent' : 'window.parent.$.apps.open';
+            $okTarget    = isInModal() ? 'parent' : 'window.parent.$.apps.open';
             $confirmURL  = $this->createLink($todo->type, 'view', "id=$todo->objectID");
 
             if($todo->type == 'bug')   $app = 'qa';
@@ -387,7 +387,7 @@ class todo extends control
         {
             return $this->send(array('status' => 'success'));
         }
-        if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
+        if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
         return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => $this->session->todoList ? $this->session->todoList : $this->createLink('my', 'todo')));
     }
 
diff --git a/module/tree/control.php b/module/tree/control.php
index 8e80147411..3d2c2a76d2 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -528,8 +528,8 @@ class tree extends control
             if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $moduleIDList));
-            if(($viewType == 'doc' || $viewType == 'api') and isonlybody()) die(js::reload('parent'));
-            if(isonlybody()) die(js::closeModal('parent.parent', '', "function(){parent.parent.$('a.refresh').click()}"));
+            if(($viewType == 'doc' || $viewType == 'api') and isInModal()) die(js::reload('parent'));
+            if(isInModal()) die(js::closeModal('parent.parent', '', "function(){parent.parent.$('a.refresh').click()}"));
 
             return $this->sendSuccess(array('load' => true));
         }
diff --git a/module/zahost/control.php b/module/zahost/control.php
index 2a1576fcc8..4b6438c111 100644
--- a/module/zahost/control.php
+++ b/module/zahost/control.php
@@ -110,7 +110,7 @@ class zahost extends control
             }
 
             $viewLink = $this->createLink('zahost', 'view', "hostID=$hostID");
-            if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => 'parent.loadHosts()'));
+            if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => 'parent.loadHosts()'));
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $viewLink));
         }
 
@@ -145,7 +145,7 @@ class zahost extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
+            if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
         }
 
@@ -189,7 +189,7 @@ class zahost extends control
             $this->send($response);
         }
 
-        if(isonlybody()) return print(js::reload('parent.parent'));
+        if(isInModal()) return print(js::reload('parent.parent'));
         return print(js::locate($this->createLink('zahost', 'browse'), 'parent'));
     }
 
@@ -262,7 +262,7 @@ class zahost extends control
         $this->zahost->downloadImage($image);
         if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => $this->lang->zahost->image->downloadImageFail));
 
-        if(isonlybody()) return print(js::reload('parent'));
+        if(isInModal()) return print(js::reload('parent'));
         return print(js::locate($this->createLink('zahost', 'browseImage', array("hostID" => $hostID)), 'parent'));
     }
 
@@ -321,7 +321,7 @@ class zahost extends control
         $this->zahost->cancelDownload($image);
         if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => $this->lang->zahost->image->downloadImageFail));
 
-        if(isonlybody()) return print(js::reload('parent'));
+        if(isInModal()) return print(js::reload('parent'));
         return print(js::locate($this->createLink('zahost', 'browseImage', array("hostID" => $image->host)), 'parent'));
     }
 
diff --git a/module/zanode/control.php b/module/zanode/control.php
index 034f989cb2..88bcd3cc68 100644
--- a/module/zanode/control.php
+++ b/module/zanode/control.php
@@ -132,7 +132,7 @@ class zanode extends control
                 if(!empty($changes)) $this->action->logHistory($actionID, $changes);
             }
 
-            if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
+            if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
         }