From 09b352cc6bc6be1ce72170f0ce06c3ed976fa2d0 Mon Sep 17 00:00:00 2001 From: zhouxin Date: Wed, 31 May 2023 14:36:39 +0800 Subject: [PATCH] * Fix error of the sonar. --- module/custom/control.php | 3 +-- module/mail/control.php | 2 +- module/projectstory/control.php | 2 +- module/transfer/model.php | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/module/custom/control.php b/module/custom/control.php index a08875f9bd..f03210e453 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -503,8 +503,7 @@ class custom extends control { if($confirm == 'no') { - echo js::confirm($this->lang->custom->notice->confirmDelete, $this->createLink('custom', 'deleteStoryConcept', "key=$key&confirm=yes"), ''); - die; + return print(js::confirm($this->lang->custom->notice->confirmDelete, $this->createLink('custom', 'deleteStoryConcept', "key=$key&confirm=yes"), '')); } else { diff --git a/module/mail/control.php b/module/mail/control.php index 2d05fd5563..1f1615f861 100755 --- a/module/mail/control.php +++ b/module/mail/control.php @@ -426,7 +426,7 @@ class mail extends control $confirmLink = inlink('batchDelete', "confirm=yes"); $confirmLink .= strpos($confirmLink, '?') === false ? '?' : '&'; $confirmLink .= "idList=$idList"; - die(js::confirm($this->lang->mail->confirmDelete, $confirmLink)); + return print(js::confirm($this->lang->mail->confirmDelete, $confirmLink)); } $idList = array(); if(isset($_GET['idList'])) $idList = explode('|', $_GET['idList']); diff --git a/module/projectstory/control.php b/module/projectstory/control.php index 940b6ab5ca..962dfdd557 100644 --- a/module/projectstory/control.php +++ b/module/projectstory/control.php @@ -48,7 +48,7 @@ class projectStory extends control /* Set product list for export. */ $this->session->set('exportProductList', $this->products); - if(empty($this->products)) return print($this->locate($this->createLink('product', 'showErrorNone', 'moduleName=project&activeMenu=story&projectID=' . $projectID))); + if(empty($this->products)) $this->locate($this->createLink('product', 'showErrorNone', 'moduleName=project&activeMenu=story&projectID=' . $projectID)); echo $this->fetch('product', 'browse', "productID=$productID&branch=$branch&browseType=$browseType¶m=$param&storyType=$storyType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&projectID=$projectID"); } diff --git a/module/transfer/model.php b/module/transfer/model.php index 5768166930..51a4b13d2f 100644 --- a/module/transfer/model.php +++ b/module/transfer/model.php @@ -684,8 +684,8 @@ class transferModel extends model /** * Get files by model. * - * @param int $model - * @param int $datas + * @param string $model + * @param array $datas * @access public * @return void */