Changeset 132

Timestamp:

01/11/2006 02:25:10 AM (6 years ago)

Author:

Winner

Message:

Bug fix: No escape quotes in email messages.
Bug fix: CRLF characters correctly replacement in hostmaster email messages.

Location:

trunk

Files:

• includes/pages/hostmaster/hostmaster_dnszone.php (modified) (1 diff)
• includes/pages/hostmaster/hostmaster_range.php (modified) (1 diff)
• includes/pages/nodes/nodes_contact.php (modified) (1 diff)
• templates/basic/includes/pages/hostmaster/hostmaster_dnszone_form_zone.tpl (modified) (1 diff)
• templates/basic/includes/pages/hostmaster/hostmaster_range_form_range.tpl (modified) (1 diff)

trunk/includes/pages/hostmaster/hostmaster_dnszone.php

@@ -199 +199 @@
                 if ($_POST['sendmail'] == 'Y') {
                         $_POST['email_to'] = str_replace(";", ", ", $_POST['email_to']);
-                        if ($ret) $ret = $ret && sendmail($_POST['email_to'], $_POST['email_subject'], $_POST['email_body'], '', '', TRUE);
+                        if ($ret) $ret = $ret && sendmail(stripslashes($_POST['email_to']), stripslashes($_POST['email_subject']), stripslashes($_POST['email_body']), '', '', TRUE);
                 }
                 

trunk/includes/pages/hostmaster/hostmaster_range.php

@@ -170 +170 @@
                 if ($_POST['sendmail'] == 'Y') {
                         $_POST['email_to'] = str_replace(";", ", ", $_POST['email_to']);
-                        if ($ret) $ret = $ret && sendmail($_POST['email_to'], $_POST['email_subject'], $_POST['email_body'], '', '', TRUE);
+                        if ($ret) $ret = $ret && sendmail(stripslashes($_POST['email_to']), stripslashes($_POST['email_subject']), stripslashes($_POST['email_body']), '', '', TRUE);
                 }
                 if ($ret) {

trunk/includes/pages/nodes/nodes_contact.php

@@ -66 +66 @@
                 }
                 $to = implode(', ', $to);
-                $subject = $lang['email']['node_contact']['subject_prefix'].$_POST['email_subject'].$lang['email']['node_contact']['subject_suffix'];
-                $body = $lang['email']['node_contact']['body_prefix'].$_POST['email_body'].$lang['email']['node_contact']['body_suffix'];
+                $subject = $lang['email']['node_contact']['subject_prefix'].stripslashes($_POST['email_subject']).$lang['email']['node_contact']['subject_suffix'];
+                $body = $lang['email']['node_contact']['body_prefix'].stripslashes($_POST['email_body']).$lang['email']['node_contact']['body_suffix'];
                 $body = str_replace("##username##", $from[0]['username'], $body);
                 $body = str_replace("##node_name##", $node[0]['name'], $body);

trunk/templates/basic/includes/pages/hostmaster/hostmaster_dnszone_form_zone.tpl

@@ -26 +26 @@
         {section loop=$data[3].Type_Enums name=e}
                 {assign var="lng" value=$data[3].Type_Enums[e].value}
-                arr_s[{$smarty.section.e.index}] = '{$lang.email.zone.$lng.subject|replace:"##zone##":"`$data.0.value`"|replace:"\n":"\\n"}'
+                arr_s[{$smarty.section.e.index}] = '{$lang.email.zone.$lng.subject|replace:"##zone##":"`$data.0.value`"|replace:"\r":"\\r"|replace:"\n":"\\n"|escape:"quotes"}'
         {/section}
         var arr_b = new Array()
         {section loop=$data[3].Type_Enums name=e}
                 {assign var="lng" value=$data[3].Type_Enums[e].value}
-                arr_b[{$smarty.section.e.index}] = '{$lang.email.zone.$lng.body|replace:"##zone##":"`$data.0.value`"|replace:"##node_name##":"`$extra_data.node_name`"|replace:"##node_id##":"`$extra_data.node_id`"|replace:"\n":"\\n"|replace:"##hostmaster_username##":"`$extra_data.hostmaster_username`"|replace:"\n":"\\n"|replace:"##hostmaster_name##":"`$extra_data.hostmaster_name`"|replace:"\n":"\\n"|replace:"##hostmaster_surname##":"`$extra_data.hostmaster_surname`"}'
+                arr_b[{$smarty.section.e.index}] = '{$lang.email.zone.$lng.body|replace:"##zone##":"`$data.0.value`"|replace:"##node_name##":"`$extra_data.node_name`"|replace:"##node_id##":"`$extra_data.node_id`"|replace:"##hostmaster_username##":"`$extra_data.hostmaster_username`"|replace:"##hostmaster_name##":"`$extra_data.hostmaster_name`"|replace:"##hostmaster_surname##":"`$extra_data.hostmaster_surname`"|replace:"\r":"\\r"|replace:"\n":"\\n"|escape:"quotes"}'
         {/section}
         document.{$extra_data.FORM_NAME}.email_subject.value = arr_s[document.{$extra_data.FORM_NAME}.{$data[3].fullField}.selectedIndex]

trunk/templates/basic/includes/pages/hostmaster/hostmaster_range_form_range.tpl

@@ -26 +26 @@
         {section loop=$data[3].Type_Enums name=e}
                 {assign var="lng" value=$data[3].Type_Enums[e].value}
-                arr_s[{$smarty.section.e.index}] = '{$lang.email.range.$lng.subject|replace:"##range##":"`$data.0.value` - `$data.1.value`"|replace:"\n":"\\n"}'
+                arr_s[{$smarty.section.e.index}] = '{$lang.email.range.$lng.subject|replace:"##range##":"`$data.0.value` - `$data.1.value`"|replace:"\r":"\\r"|replace:"\n":"\\n"|escape:"quotes"}'
         {/section}
         var arr_b = new Array()
         {section loop=$data[3].Type_Enums name=e}
                 {assign var="lng" value=$data[3].Type_Enums[e].value}
-                arr_b[{$smarty.section.e.index}] = '{$lang.email.range.$lng.body|replace:"##range##":"`$data.0.value` - `$data.1.value`"|replace:"##node_name##":"`$extra_data.node_name`"|replace:"##node_id##":"`$extra_data.node_id`"|replace:"\n":"\\n"|replace:"\n":"\\n"|replace:"##hostmaster_username##":"`$extra_data.hostmaster_username`"|replace:"\n":"\\n"|replace:"##hostmaster_name##":"`$extra_data.hostmaster_name`"|replace:"\n":"\\n"|replace:"##hostmaster_surname##":"`$extra_data.hostmaster_surname`"}'
+                arr_b[{$smarty.section.e.index}] = '{$lang.email.range.$lng.body|replace:"##range##":"`$data.0.value` - `$data.1.value`"|replace:"##node_name##":"`$extra_data.node_name`"|replace:"##node_id##":"`$extra_data.node_id`"|replace:"##hostmaster_username##":"`$extra_data.hostmaster_username`"|replace:"##hostmaster_name##":"`$extra_data.hostmaster_name`"|replace:"##hostmaster_surname##":"`$extra_data.hostmaster_surname`"|replace:"\r":"\\r"|replace:"\n":"\\n"|escape:"quotes"}'
         {/section}
         document.{$extra_data.FORM_NAME}.email_subject.value = arr_s[document.{$extra_data.FORM_NAME}.{$data[3].fullField}.selectedIndex]