add more flexibility for mailing tokens, subject token

CRM/Utmaltor/Logic/Smarty.php

@@ -34,8 +34,9 @@ class CRM_Utmaltor_Logic_Smarty {
   }
 
   private function __construct($params) {
-    $this->variables['mailing_id'] = $params['id'];
-    $this->variables['campaign_id'] = $params['campaign_id'];
+    foreach ($params as $key => $param) {
+      $this->variables[$key] = $param;
+    }
     if (class_exists('CRM_Speakcivi_Logic_Campaign')) {
       $this->variables['campaign_lang'] = $this->getLanguage($params['campaign_id']);
     }

utmaltor.php

@@ -132,7 +132,7 @@ function utmaltor_civicrm_container($container) {
  */
 function _utmaltor_RunEvent_alterUrl(\Civi\FlexMailer\Event\RunEvent $event) {
   $mailing = $event->getMailing();
-  $params = ['id' => $mailing->id, 'campaign_id' => $mailing->campaign_id];
+  $params = ['mailing_id' => $mailing->id, 'campaign_id' => $mailing->campaign_id, 'subject' => $mailing->subject];
   $mailing->body_html = _utmaltor_findUrls($mailing->body_html, $params);
   $mailing->body_text = _utmaltor_findUrls($mailing->body_text, $params);