Skip to content

Commit

Permalink
Working on #2972 Template Conversion to Twig Format (contact.php) (#2991
Browse files Browse the repository at this point in the history
)

* Working on #2972 Template Conversion to Twig Format (contact.php)

* Indented template
  • Loading branch information
Starpaul20 authored and euantorano committed Feb 3, 2018
1 parent ecdc797 commit bfbf895
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 7 deletions.
13 changes: 6 additions & 7 deletions contact.php
Expand Up @@ -278,19 +278,18 @@
}
}

$mybb->input['subject'] = htmlspecialchars_uni($mybb->input['subject']);
$mybb->input['message'] = htmlspecialchars_uni($mybb->input['message']);

if($mybb->user['uid'] && !$mybb->get_input('email'))
{
$mybb->input['email'] = htmlspecialchars_uni($mybb->user['email']);
$mybb->input['email'] = $mybb->user['email'];
}
else
{
$mybb->input['email'] = htmlspecialchars_uni($mybb->get_input('email'));
$mybb->input['email'] = $mybb->get_input('email');
}

$plugins->run_hooks('contact_end');

eval("\$page = \"".$templates->get("contact")."\";");
output_page($page);
output_page(\MyBB\template('contact/contact.twig', [
'errors' => $errors,
'captcha' => $captcha,
]));
34 changes: 34 additions & 0 deletions inc/views/base/contact/contact.twig
@@ -0,0 +1,34 @@
{% extends 'layouts/master.twig' %}

{% block head %}
<title>{{ thread.subject }} - {{ lang.contact }}</title>
{% endblock head %}

{% block body %}
<form action="contact.php" method="post">
<input type="hidden" name="my_post_key" value="{{ mybb.post_code }}" />
{{ errors|raw }}
<table border="0" cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" class="tborder">
<tr>
<td class="thead" colspan="2"><strong>{{ lang.contact }}</strong></td>
</tr>
<tr>
<td class="trow1" valign="top"><strong>{{ lang.contact_subject }}:</strong><br /><span class="smalltext">{{ lang.contact_subject_desc }}</span></td>
<td class="trow1"><input type="text" name="subject" class="textbox" size="49" value="{{ mybb.input.subject }}" /></td>
</tr>
<tr>
<td class="trow2" valign="top"><strong>{{ lang.contact_message }}:</strong><br /><span class="smalltext">{{ lang.contact_message_desc }}</span></td>
<td class="trow2"><textarea cols="50" rows="10" name="message" class="textarea" >{{ mybb.input.message }}</textarea></td>
</tr>
<tr>
<td class="trow1" valign="top"><strong>{{ lang.contact_email }}:</strong><br /><span class="smalltext">{{ lang.contact_email_desc }}</span></td>
<td class="trow1"><input type="text" name="email" class="textbox" size="49" value="{{ mybb.input.email }}" /></td>
</tr>
{{ captcha|raw }}
</table>
<br />
<div align="center">
<input type="submit" class="button" name="submit" value="{{ lang.contact_send }}" />
</div>
</form>
{% endblock body %}

0 comments on commit bfbf895

Please sign in to comment.