mailFormLinkメソッド修正 (#3985)

baserproject · Nov 6, 2024 · 323b788 · 323b788
1 parent 1a533f3
commit 323b788
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/plugins/bc-blog/src/View/Helper/BlogHelper.php b/plugins/bc-blog/src/View/Helper/BlogHelper.php
@@ -49,6 +49,7 @@
 use BaserCore\Annotation\NoTodo;
 use BaserCore\Annotation\Checked;
 use BaserCore\Annotation\UnitTest;
+use BcMail\View\Helper\MailHelper;
 
 /**
  * ブログヘルパー
@@ -1296,7 +1297,6 @@ public function getEyeCatch($post, $options = [])
      */
     public function mailFormLink($title, $contentsName, $datas = [], $options = [])
     {
-        App::uses('MailHelper', 'BcMail.View/Helper');
         $MailHelper = new MailHelper($this->_View);
         $MailHelper->link($title, $contentsName, $datas, $options);
     }

diff --git a/plugins/bc-mail/src/View/Helper/MailHelper.php b/plugins/bc-mail/src/View/Helper/MailHelper.php
@@ -198,6 +198,7 @@ public function descriptionExists()
 
     /**
      * メールフォームへのリンクを生成する
+     * $contentsNameはコンテンツ管理上の１階層のみ対応
      *
      * @param string $title リンクのタイトル
      * @param string $contentsName メールフォームのコンテンツ名
@@ -212,10 +213,26 @@ public function link($title, $contentsName, $datas = [], $options = [])
     {
         if ($datas && is_array($datas)) {
             foreach ($datas as $key => $data) {
-                $datas[$key] = base64UrlsafeEncode($data);
+                $datas[$key] = BcUtil::base64UrlsafeEncode($data);
             }
         }
-        $link = array_merge(['plugin' => '', 'controller' => $contentsName, 'action' => 'index'], $datas);
+
+        $contentsTable = TableRegistry::getTableLocator()->get('BaserCore.Contents');
+        $content = $contentsTable->find('all')
+            ->where([
+                'Contents.name' => $contentsName,
+                'Contents.plugin' => 'BcMail',
+                'Contents.type' => 'MailContent',
+                ])
+            ->first();
+
+        $link = [
+            'plugin' => 'BcMail',
+            'controller' => 'Mail',
+            'action' => 'index',
+            'entityId' => $content->entity_id,
+            '?' => $datas,
+        ];
         $this->BcBaser->link($title, $link, $options);
     }