From ff46f960dd31f980fade96ee9386a1ba71596475 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Fri, 30 Jan 2026 16:05:38 +0530 Subject: [PATCH] FIX_NOTIFICATION_TEMPLATE_ISSUE_AND_FILTER_ISSUE --- app/Config/Filters.php | 2 +- app/Controllers/LoginController.php | 2 +- app/Filters/AuthMVC.php | 10 +- app/Views/notification.php | 156 +++++++++------------------- 4 files changed, 58 insertions(+), 112 deletions(-) diff --git a/app/Config/Filters.php b/app/Config/Filters.php index 36899e3a..b115e0ca 100755 --- a/app/Config/Filters.php +++ b/app/Config/Filters.php @@ -63,7 +63,7 @@ class Filters extends BaseConfig 'HttpRequestLog' => ['except' => 'cli/*'], 'Cors', // 'AclFilter' => ['except' => ['login', 'logout', 'auth/*', 'oauth2callback','claim-form-download', 'claims-feedback-form', 'autobookstackLogin','employeeRest/*','processjob','getCommission']], - 'SecurityInputFilter' => ['except' => ['notification/create','/ticket/crud_mail_template/*','test_mail','leads/sendMail'] ], + 'SecurityInputFilter' => ['except' => ['/client/notification/create','/ticket/crud_mail_template/*','test_mail','leads/sendMail'] ], 'GlobalPostFileUploadGuard' // 'csrf', // 'invalidchars', diff --git a/app/Controllers/LoginController.php b/app/Controllers/LoginController.php index 0e118e10..fb073f21 100755 --- a/app/Controllers/LoginController.php +++ b/app/Controllers/LoginController.php @@ -62,7 +62,7 @@ class LoginController extends BaseController set_session_data($session_data); // Bind session to device - // set_session_data(['fingerprint' => generateFingerprint()]); + set_session_data(['fingerprint' => generateFingerprint()]); log_message('error', 'Set The UserId : `'. $user->id .'` in Session'); log_message('error', 'User Login Sucessfully'); diff --git a/app/Filters/AuthMVC.php b/app/Filters/AuthMVC.php index 298a72b9..ef2da046 100755 --- a/app/Filters/AuthMVC.php +++ b/app/Filters/AuthMVC.php @@ -23,11 +23,11 @@ class AuthMVC implements FilterInterface // } // Fingerprint validation - // $fp = generateFingerprint(); - // // log_message('error',$fp); - // if (session()->get('fingerprint') !== $fp) { - // return AuthLogout::logout(); - // } + $fp = generateFingerprint(); + // log_message('error',$fp); + if (session()->get('fingerprint') !== $fp) { + return AuthLogout::logout(); + } } diff --git a/app/Views/notification.php b/app/Views/notification.php index 635ca440..93e8213e 100755 --- a/app/Views/notification.php +++ b/app/Views/notification.php @@ -1614,7 +1614,6 @@ const formData = new FormData(form); formData.append('template_name', template_name); formData.append('client_id', client_id); - console.log(formData.template_name); const fileInput = form.querySelector('input[type="file"]'); // Check if a file is selected @@ -1980,23 +1979,15 @@ // Use the editor instance instead of unlayer directly editor.exportHtml(function(data) { - var formData = $('#account_maneger_summary_mail_form').serializeArray(); - // Append Unlayer editor data - formData.push({ - name: 'mailContent', - value: data.html - }); - formData.push({ - name: 'client_id', - value: $('#general_PrimaryKey').val() - }); - formData.push({ - name: 'mailJson', - value: JSON.stringify(data.design) - }); + var formData = new FormData($('#account_maneger_summary_mail_form')[0]); - console.log(formData); + // Append Unlayer data + formData.append('mailContent', data.html); + formData.append('client_id', $('#general_PrimaryKey').val()); + formData.append('mailJson', JSON.stringify(data.design)); + + console.log([...formData.entries()]); // Show loading indicators $('.loader').fadeIn(); @@ -2042,23 +2033,15 @@ // Use the editor instance instead of unlayer directly editor.exportHtml(function(data) { - var formData = $('#member_welcome_mail_form').serializeArray(); - // Append Unlayer editor data - formData.push({ - name: 'mailContent', - value: data.html - }); - formData.push({ - name: 'client_id', - value: $('#general_PrimaryKey').val() - }); - formData.push({ - name: 'mailJson', - value: JSON.stringify(data.design) - }); + var formData = new FormData($('#member_welcome_mail_form')[0]); - console.log(formData); + // Append Unlayer data + formData.append('mailContent', data.html); + formData.append('client_id', $('#general_PrimaryKey').val()); + formData.append('mailJson', JSON.stringify(data.design)); + + console.log([...formData.entries()]); // Show loading indicators $('.loader').fadeIn(); @@ -2104,23 +2087,15 @@ // Use the editor instance instead of unlayer directly editor.exportHtml(function(data) { - var formData = $('#member_reminder_mail_form').serializeArray(); - // Append Unlayer editor data - formData.push({ - name: 'mailContent', - value: data.html - }); - formData.push({ - name: 'client_id', - value: $('#general_PrimaryKey').val() - }); - formData.push({ - name: 'mailJson', - value: JSON.stringify(data.design) - }); + var formData = new FormData($('#member_reminder_mail_form')[0]); - console.log(formData); + // Append Unlayer data + formData.append('mailContent', data.html); + formData.append('client_id', $('#general_PrimaryKey').val()); + formData.append('mailJson', JSON.stringify(data.design)); + + console.log([...formData.entries()]); // Show loading indicators $('.loader').fadeIn(); @@ -2166,23 +2141,15 @@ // Use the editor instance instead of unlayer directly editor.exportHtml(function(data) { - var formData = $('#member_ecard_mail_form').serializeArray(); - // Append Unlayer editor data - formData.push({ - name: 'mailContent', - value: data.html - }); - formData.push({ - name: 'client_id', - value: $('#general_PrimaryKey').val() - }); - formData.push({ - name: 'mailJson', - value: JSON.stringify(data.design) - }); + var formData = new FormData($('#member_ecard_mail_form')[0]); - console.log(formData); + // Append Unlayer data + formData.append('mailContent', data.html); + formData.append('client_id', $('#general_PrimaryKey').val()); + formData.append('mailJson', JSON.stringify(data.design)); + + console.log([...formData.entries()]); // Show loading indicators $('.loader').fadeIn(); @@ -2229,21 +2196,15 @@ // Use the editor instance instead of unlayer directly editor.exportHtml(function(data) { - var formData = $('#member_common_mail_form').serializeArray(); - // Append Unlayer editor data - formData.push({ - name: 'mailContent', - value: data.html - }); - formData.push({ - name: 'client_id', - value: $('#general_PrimaryKey').val() - }); - formData.push({ - name: 'mailJson', - value: JSON.stringify(data.design) - }); + var formData = new FormData($('#member_common_mail_form')[0]); + + // Append Unlayer data + formData.append('mailContent', data.html); + formData.append('client_id', $('#general_PrimaryKey').val()); + formData.append('mailJson', JSON.stringify(data.design)); + + console.log([...formData.entries()]); // Show loading indicators $('.loader').fadeIn(); @@ -2289,23 +2250,15 @@ // Use the editor instance instead of unlayer directly editor.exportHtml(function(data) { - var formData = $('#member_review_and_summary_mail_form').serializeArray(); - // Append Unlayer editor data - formData.push({ - name: 'mailContent', - value: data.html - }); - formData.push({ - name: 'client_id', - value: $('#general_PrimaryKey').val() - }); - formData.push({ - name: 'mailJson', - value: JSON.stringify(data.design) - }); + var formData = new FormData($('#member_review_and_summary_mail_form')[0]); - console.log(formData); + // Append Unlayer data + formData.append('mailContent', data.html); + formData.append('client_id', $('#general_PrimaryKey').val()); + formData.append('mailJson', JSON.stringify(data.design)); + + console.log([...formData.entries()]); // Show loading indicators $('.loader').fadeIn(); @@ -2351,23 +2304,16 @@ // Use the editor instance instead of unlayer directly editor.exportHtml(function(data) { - var formData = $('#client_hr_summary_mail_form').serializeArray(); - // Append Unlayer editor data - formData.push({ - name: 'mailContent', - value: data.html - }); - formData.push({ - name: 'client_id', - value: $('#general_PrimaryKey').val() - }); - formData.push({ - name: 'mailJson', - value: JSON.stringify(data.design) - }); + var formData = new FormData($('#client_hr_summary_mail_form')[0]); + + // Append Unlayer data + formData.append('mailContent', data.html); + formData.append('client_id', $('#general_PrimaryKey').val()); + formData.append('mailJson', JSON.stringify(data.design)); + + console.log([...formData.entries()]); - console.log(formData); // Show loading indicators $('.loader').fadeIn();