From c2358ae3357e578ac8ed88931c5e81cd95402744 Mon Sep 17 00:00:00 2001
From: think-mcunanan <mcunanan@think-ahead.jp>
Date: Wed, 15 Sep 2021 11:43:38 +0900
Subject: [PATCH] =?UTF-8?q?Redmine-#5313:[=E3=83=AC=E3=82=B9=E3=83=9D?=
 =?UTF-8?q?=E3=83=B3=E3=82=B9=E6=94=B9=E5=96=84]=20=E3=82=B5=E3=83=BC?=
 =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B5=E3=82=A4=E3=83=89=E3=82=92PHP5?=
 =?UTF-8?q?=E2=86=92PHP7=E3=81=AB=E3=82=A2=E3=83=83=E3=83=97=E3=82=B0?=
 =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=83=89=E3=81=99=E3=82=8B(fix=20note=2018)?=
 =?UTF-8?q?=20-=20remove=20unnecessary=20condition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/servers_controller.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/controllers/servers_controller.php b/app/controllers/servers_controller.php
index 05408d449..62e0512ca 100644
--- a/app/controllers/servers_controller.php
+++ b/app/controllers/servers_controller.php
@@ -10046,18 +10046,13 @@ function wsSendMail($sessionid, $from, $to, $cc, $bcc, $subject, $body)
      */
     function wsSearchJikaiYoyaku($sessionid, $storecode, $ccode = null, $transcode = null)
     {
-        if ($param['ignoreSessionCheck'] <> 1) {
-            //-- セッションを確認してデータベース名を取り込む (Verify Session and Get DB name)
-            $storeinfo = $this->YoyakuSession->Check($this);
-            if ($storeinfo == false) {
-                $this->_soap_server->fault(1, '', INVALID_SESSION);
-                return;
-            }
-        } else {
-            $storeinfo['dbname'] = $param['dbname'];
+        //-- セッションを確認してデータベース名を取り込む (Verify Session and Get DB name)
+        $storeinfo = $this->YoyakuSession->Check($this);
+        if ($storeinfo == false) {
+            $this->_soap_server->fault(1, '', INVALID_SESSION);
+            return;
         }
 
-
         //-- 会社データベースを設定する (Set the Company Database)
         $this->StoreTransaction->set_company_database($storeinfo['dbname'], $this->StoreTransaction);