maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

- set correct html-linebreaks when sending e-mails in ticket-class

Browse Source 
- prevent usage of <script>-tag in tickets
- design-correction in archive-search
This commit is contained in:
Michael Kaufmann (d00p)
2010-03-05 07:55:04 +00:00
parent 491e5363a7
commit cbfb89f86a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/ticket/class.ticket.php
View File

@@ -291,7 +291,7 @@ class ticket
$mail->SetFrom($this->settings['ticket']['noreply_email'], $this->settings['ticket']['noreply_name']); $mail->SetFrom($this->settings['ticket']['noreply_email'], $this->settings['ticket']['noreply_name']);
$mail->Subject = $mail_subject; $mail->Subject = $mail_subject;
$mail->AltBody = $mail_body; $mail->AltBody = $mail_body;
$mail->MsgHTML($mail_body); $mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
$mail->AddAddress($usr['email'], $usr['firstname'] . ' ' . $usr['name']); $mail->AddAddress($usr['email'], $usr['firstname'] . ' ' . $usr['name']);
$mail->Send(); $mail->Send();
} catch(phpmailerException $e) { } catch(phpmailerException $e) {
@@ -319,7 +319,7 @@ class ticket
$mail->SetFrom($this->settings['ticket']['noreply_email'], $this->settings['ticket']['noreply_name']); $mail->SetFrom($this->settings['ticket']['noreply_email'], $this->settings['ticket']['noreply_name']);
$mail->Subject = $mail_subject; $mail->Subject = $mail_subject;
$mail->AltBody = $mail_body; $mail->AltBody = $mail_body;
$mail->MsgHTML($mail_body); $mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
$mail->AddAddress($admin['email'], $admin['name']); $mail->AddAddress($admin['email'], $admin['name']);
$mail->Send(); $mail->Send();
} catch(phpmailerException $e) { } catch(phpmailerException $e) {
@@ -691,7 +691,7 @@ class ticket
{ {
if(strtolower($_var) == 'message') if(strtolower($_var) == 'message')
{ {
return htmlspecialchars_decode(nl2br($this->t_data[$_var])); return str_replace('script>', 'pre>', htmlspecialchars_decode(nl2br($this->t_data[$_var])));
} }
else else
{ {

4
templates/admin/ticket/archivesearch.tpl
View File

@@ -15,13 +15,13 @@ $header
<td class="field_display">{$lng['ticket']['subject']}</td> <td class="field_display">{$lng['ticket']['subject']}</td>
<td class="field_display">{$lng['ticket']['lastreplier']}</td> <td class="field_display">{$lng['ticket']['lastreplier']}</td>
<td class="field_display">{$lng['ticket']['priority']}</td> <td class="field_display">{$lng['ticket']['priority']}</td>
<td class="field_display_search">&nbsp;</td> <td class="field_display_search">&nbsp;</td>
</tr> </tr>
$tickets $tickets
</if> </if>
<if $tickets_count < 1 > <if $tickets_count < 1 >
<tr> <tr>
<td class="field_display_border_left" colspan="5">{$lng['ticket']['noresults']}</td> <td class="field_display_border_left" colspan="6">{$lng['ticket']['noresults']}</td>
</tr> </tr>
</if> </if>
</table> </table>