From 4d6793ae83cbaf0e82c133ac5b6dabaa1f6416c8 Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Wed, 26 Jun 2019 14:58:11 +0900
Subject: [PATCH] =?UTF-8?q?LC=5FPage::plugin=5Factivate=5Fflg=20=E3=82=92?=
 =?UTF-8?q?=E9=9D=9E=E6=8E=A8=E5=A5=A8=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- SC_Helper_Plugin::getSingletonInstance() の引数のデフォルト値を PLUGIN_ACTIVATE_FLAG とするよう修正
- 基本的に常に PLUGIN_ACTIVATE_FLAG の値を参照するよう修正
---
 data/class/SC_FormParam.php                              | 3 +--
 data/class/SC_View.php                                   | 4 ++--
 data/class/helper/SC_Helper_Plugin.php                   | 6 ++++--
 data/class/pages/LC_Page.php                             | 9 ++++++---
 data/class/pages/admin/LC_Page_Admin.php                 | 4 ++--
 data/class/pages/error/LC_Page_Error.php                 | 2 +-
 data/class/pages/error/LC_Page_Error_DispError.php       | 2 +-
 .../pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php    | 2 +-
 data/class/pages/mypage/LC_Page_Mypage_DownLoad.php      | 2 +-
 data/class/pages/products/LC_Page_Products_Detail.php    | 4 ++--
 10 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/data/class/SC_FormParam.php b/data/class/SC_FormParam.php
index 883abd5b1d..ecdd15c261 100644
--- a/data/class/SC_FormParam.php
+++ b/data/class/SC_FormParam.php
@@ -70,8 +70,7 @@ public function __construct()
         $backtraces = debug_backtrace();
         // 呼び出し元のクラスを取得
         $class = $backtraces[1]['class'];
-        $objPage = $backtraces[1]['object'];
-        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($objPage->plugin_activate_flg);
+        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
         if (is_object($objPlugin)) {
             $objPlugin->doAction('SC_FormParam_construct', array($class, $this));
         }
diff --git a/data/class/SC_View.php b/data/class/SC_View.php
index e071f2ab8d..302cb34268 100644
--- a/data/class/SC_View.php
+++ b/data/class/SC_View.php
@@ -145,7 +145,7 @@ public function prefilter_transform($source, Smarty_Internal_Template $template)
     {
         if (!is_null($this->objPage)) {
             // フックポイントを実行.
-            $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->objPage->plugin_activate_flg);
+            $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
             if ($objPlugin) {
                 $objPlugin->doAction('prefilterTransform', array(&$source, $this->objPage, $template->smarty->_current_file));
             }
@@ -164,7 +164,7 @@ public function outputfilter_transform($source, Smarty_Internal_Template $templa
     {
         if (!is_null($this->objPage)) {
             // フックポイントを実行.
-            $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->objPage->plugin_activate_flg);
+            $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
             if ($objPlugin) {
                 $objPlugin->doAction('outputfilterTransform', array(&$source, $this->objPage, $template->smarty->_current_file));
             }
diff --git a/data/class/helper/SC_Helper_Plugin.php b/data/class/helper/SC_Helper_Plugin.php
index 1e90d5d03f..dfceb9a260 100644
--- a/data/class/helper/SC_Helper_Plugin.php
+++ b/data/class/helper/SC_Helper_Plugin.php
@@ -42,6 +42,7 @@ class SC_Helper_Plugin
      * 有効なプラグインのロード. プラグインエンジンが有効になっていない場合は
      * プラグインエンジン自身のインストール処理を起動する
      *
+     * @param bool $plugin_activate_flg プラグインを有効化する場合 true
      * @return void
      */
     public function load($plugin_activate_flg = true)
@@ -86,9 +87,10 @@ public function load($plugin_activate_flg = true)
     /**
      * SC_Helper_Plugin オブジェクトを返す（Singletonパターン）
      *
-     * @return object SC_Helper_Pluginオブジェクト
+     * @param bool $plugin_activate_flg プラグインを有効化する場合 true
+     * @return SC_Helper_Plugin SC_Helper_Pluginオブジェクト
      */
-    public static function getSingletonInstance($plugin_activate_flg = true)
+    public static function getSingletonInstance($plugin_activate_flg = PLUGIN_ACTIVATE_FLAG)
     {
         if (!isset($GLOBALS['_SC_Helper_Plugin_instance'])) {
             // プラグインのローダーがDB接続を必要とするため、
diff --git a/data/class/pages/LC_Page.php b/data/class/pages/LC_Page.php
index 090f01b2ae..9da294e86b 100644
--- a/data/class/pages/LC_Page.php
+++ b/data/class/pages/LC_Page.php
@@ -67,7 +67,10 @@ class LC_Page
     /** 店舗基本情報 */
     public $arrSiteInfo;
 
-    /** プラグインを実行フラグ */
+    /**
+     * プラグインを実行フラグ
+     * @deprecated 定数 PLUGIN_ACTIVATE_FLAG を使用してください
+     */
     public $plugin_activate_flg = PLUGIN_ACTIVATE_FLAG;
 
     /** POST に限定する mode */
@@ -105,7 +108,7 @@ public function init()
         }
 
         // スーパーフックポイントを実行.
-        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
+        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
         $objPlugin->doAction('LC_Page_preProcess', array($this));
 
         // 店舗基本情報取得
@@ -137,7 +140,7 @@ public function process()
      */
     public function sendResponse()
     {
-        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
+        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
         // ローカルフックポイントを実行.
         $this->doLocalHookpointAfter($objPlugin);
 
diff --git a/data/class/pages/admin/LC_Page_Admin.php b/data/class/pages/admin/LC_Page_Admin.php
index 0b504deec8..58e4e3049f 100644
--- a/data/class/pages/admin/LC_Page_Admin.php
+++ b/data/class/pages/admin/LC_Page_Admin.php
@@ -67,7 +67,7 @@ public function init()
         $this->objDisplay = new SC_Display_Ex();
 
         // スーパーフックポイントを実行.
-        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
+        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
         $objPlugin->doAction('LC_Page_preProcess', array($this));
 
         // トランザクショントークンの検証と生成
@@ -99,7 +99,7 @@ public function process()
      */
     public function sendResponse()
     {
-        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
+        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
         // ローカルフックポイントを実行
         $parent_class_name = get_parent_class($this);
         $objPlugin->doAction($parent_class_name . '_action_after', array($this));
diff --git a/data/class/pages/error/LC_Page_Error.php b/data/class/pages/error/LC_Page_Error.php
index 19897abf28..7b7575b0af 100644
--- a/data/class/pages/error/LC_Page_Error.php
+++ b/data/class/pages/error/LC_Page_Error.php
@@ -63,7 +63,7 @@ public function init()
         // ディスプレイクラス生成
         $this->objDisplay = new SC_Display_Ex();
 
-        $objHelperPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
+        $objHelperPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
         if (is_object($objHelperPlugin)) {
             // transformでフックしている場合に, 再度エラーが発生するため, コールバックを無効化.
             $objHelperPlugin->arrRegistedPluginActions = array();
diff --git a/data/class/pages/error/LC_Page_Error_DispError.php b/data/class/pages/error/LC_Page_Error_DispError.php
index 0525e34480..600e9fa002 100644
--- a/data/class/pages/error/LC_Page_Error_DispError.php
+++ b/data/class/pages/error/LC_Page_Error_DispError.php
@@ -50,7 +50,7 @@ public function init()
         $this->objDisplay = new SC_Display_Ex();
 
         // transformでフックしている場合に, 再度エラーが発生するため, コールバックを無効化.
-        $objHelperPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
+        $objHelperPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
         $objHelperPlugin->arrRegistedPluginActions = array();
 
         // キャッシュから店舗情報取得（DBへの接続は行わない）
diff --git a/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php b/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php
index 1fc901bf26..716348f329 100644
--- a/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php
+++ b/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php
@@ -53,7 +53,7 @@ public function init()
         $this->setTokenTo();
 
         // ローカルフックポイントを実行.
-        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
+        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
         $this->doLocalHookpointBefore($objPlugin);
     }
 
diff --git a/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php b/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php
index 53a1b56ff2..f03691f64a 100644
--- a/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php
+++ b/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php
@@ -104,7 +104,7 @@ public function action()
     public function sendResponse()
     {
         // TODO sendResponseをオーバーライドしている為、afterフックポイントが実行されない.直接実行する.(#1790)
-        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
+        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
         $objPlugin->doAction('LC_Page_Mypage_DownLoad_action_after', array($this));
 
         $this->objDisplay->noAction();
diff --git a/data/class/pages/products/LC_Page_Products_Detail.php b/data/class/pages/products/LC_Page_Products_Detail.php
index ca3c533ef8..a9c88ec470 100644
--- a/data/class/pages/products/LC_Page_Products_Detail.php
+++ b/data/class/pages/products/LC_Page_Products_Detail.php
@@ -652,7 +652,7 @@ public function doAddFavorite(SC_Customer &$objCustomer)
                 if (!$this->lfRegistFavoriteProduct($this->objFormParam->getValue('favorite_product_id'), $objCustomer->getValue('customer_id'))) {
                     SC_Response_Ex::actionExit(); 
                 }
-                $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
+                $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
                 $objPlugin->doAction('LC_Page_Products_Detail_action_add_favorite', array($this));
             }
         }
@@ -671,7 +671,7 @@ public function doAddFavoriteSphone(SC_Customer $objCustomer)
             $this->arrErr = $this->lfCheckError($this->mode, $this->objFormParam);
             if (count($this->arrErr) == 0) {
                 if ($this->lfRegistFavoriteProduct($this->objFormParam->getValue('favorite_product_id'), $objCustomer->getValue('customer_id'))) {
-                    $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
+                    $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance();
                     $objPlugin->doAction('LC_Page_Products_Detail_action_add_favorite_sphone', array($this));
                     print 'true';
                     SC_Response_Ex::actionExit();