nodebb-plugin-simple-contact 2.1.1 → 2.1.3

package/library.js

@@ -6,6 +6,7 @@ const groups = require.main.require('./src/groups');
 const socketIndex = require.main.require('./src/socket.io/index'); 
 const emailer = require.main.require('./src/emailer');
 const user = require.main.require('./src/user');
+const meta = require.main.require('./src/meta');
 
 let chats = null;
 let messaging = null;
@@ -48,7 +49,7 @@ async function getChatRoom(req, res) {
     try {
         let roomId = null;
 
-        const chatModule = chats || messaging; // עדיפות ל-chats ליצירת חדר
+        const chatModule = chats || messaging;
 
         if (chatModule.getRoomId) {
             roomId = await chatModule.getRoomId(myUid, touid);
@@ -228,28 +229,49 @@ async function replyToContact(req, res) {
     }
 
     try {
-        const htmlContent = content.replace(/\n/g, '<br>');
+        const logoUrl = meta.config['brand:emailLogo'] || meta.config['brand:logo'] || '';
+        const siteTitle = meta.config['title'] || 'NetFree';
+
+        let logoHtml = '';
+        if (logoUrl) {
+            const fullLogoUrl = logoUrl.startsWith('http') ? logoUrl : (meta.config['url'] + logoUrl);
+            logoHtml = `<div style="text-align: center; margin-bottom: 20px;">
+                            <img src="${fullLogoUrl}" alt="${siteTitle}" style="max-height: 50px; width: auto; border: 0;">
+                        </div>`;
+        } else {
+            logoHtml = `<div style="text-align: center; margin-bottom: 20px; font-weight: bold; font-size: 18px;">${siteTitle}</div>`;
+        }
+
+        const rawHtml = content.replace(/\n/g, '<br>');
+        
+        const fullBodyHtml = `
+            <div dir="rtl" style="direction: rtl; text-align: right; font-family: Arial, sans-serif; background-color: #ffffff; padding: 10px;">
+                ${logoHtml}
+                <div style="font-size: 14px; color: #333; line-height: 1.6;">
+                    ${rawHtml}
+                </div>
+            </div>
+        `;
+
+        const introHtml = '<div dir="rtl" style="direction: rtl; text-align: right; font-family: Arial, sans-serif;">שלום, קיבלת תשובה חדשה לפנייתך:</div>';
 
         await emailer.sendToEmail('notification', email, 'he', { 
             subject: subject || 'תשובה לפנייתך בצור קשר',
-            username: email,
+            username: ',',
             
             notification: {
                 type: 'contact-reply',
                 bodyShort: subject || 'תשובה לפנייה',
-                bodyLong: htmlContent, 
-                path: '/' 
+                bodyLong: fullBodyHtml,
+                path: ''
             },
 
-            body: htmlContent,
-            message: htmlContent,
-            intro: 'קיבלת תשובה חדשה לפנייתך:'
+            body: fullBodyHtml,
+            intro: introHtml,
+            site_title: siteTitle,
+            url: meta.config['url']
         });
 
-        if (original_id) {
-            await db.setObjectField('contact-request:' + original_id, 'handled', true);
-        }
-
         res.json({ success: true });
     } catch (err) {
         console.error(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-simple-contact",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "תוסף טופס צור קשר עם התראות למנהלים וניהול פניות",
   "main": "library.js",
   "nbbpm": {

package/public/templates/admin/plugins/contact.tpl

@@ -316,12 +316,11 @@
                 email: email,
                 subject: subject,
                 content: content,
-                original_id: id,
                 _csrf: config.csrf_token
             })
             .done(function(data) {
                 $('#emailReplyModal').modal('hide');
-                showMessage('success', 'המייל נשלח בהצלחה והפנייה סומנה כטופלה');
+                showMessage('success', 'המייל נשלח בהצלחה.');
                 setTimeout(function() { ajaxify.refresh(); }, 1000);
             })
             .fail(function(xhr) {