Working on #2972 Template Conversion to Twig Format (sendthread.php) (#…

…2983) * Working on #2972 Template Conversion to Twig Format (sendthread.php) * Removed double escaping
mybb · Jan 11, 2018 · dc9f2ca · dc9f2ca
1 parent 9bca15a
commit dc9f2ca
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 50 deletions.
diff --git a/inc/views/base/sendthread/sendthread.twig b/inc/views/base/sendthread/sendthread.twig
@@ -0,0 +1,44 @@
+{% extends 'layouts/master.twig' %}
+
+{% block head %}
+    <title>{{ thread.subject }} - {{ lang.send_thread }}</title>
+{% endblock head %}
+
+{% block body %}
+    {{ errors|raw }}
+    <form action="sendthread.php" method="post">
+        <input type="hidden" name="my_post_key" value="{{ mybb.post_code }}" />
+        <table border="0" cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" class="tborder">
+            <tr>
+                <td colspan="2" width="100%" class="thead"><strong>{{ lang.send_thread }}</strong></td>
+            </tr>
+            {% if mybb.user.uid == 0 %}
+                <tr>
+                    <td width="40%" class="trow1"><strong>{{ lang.your_name }}</strong><br /><span class="smalltext">{{ lang.name_note }}</span></td>
+                    <td width="60%" class="trow1"><input type="text" class="textbox" size="50" name="fromname" value="{{ form.fromname }}" /></td>
+                </tr>
+                <tr>
+                    <td width="40%" class="trow2"><strong>{{ lang.your_email }}</strong><br /><span class="smalltext">{{ lang.email_note }}</span></td>
+                    <td width="60%" class="trow2"><input type="text" class="textbox" size="50" name="fromemail" value="{{ form.fromemail }}" /></td>
+                </tr>
+            {% endif %}
+            <tr>
+                <td width="40%" class="trow1"><strong>{{ lang.recipient }}</strong><br /><span class="smalltext">{{ lang.recipient_note }}</span></td>
+                <td width="60%" class="trow1"><input type="text" class="textbox" size="50" name="email" value="{{ form.email }}" /></td>
+            </tr>
+            <tr>
+                <td width="40%" class="trow2"><strong>{{ lang.subject }}</strong></td>
+                <td width="60%" class="trow2"><input type="text" class="textbox" size="50" name="subject" value="{{ form.subject }}" /></td>
+            </tr>
+            <tr>
+                <td valign="top" width="40%" class="trow1"><strong>{{ lang.message }}</strong></td>
+                <td width="60%" class="trow1"><textarea cols="50" rows="10" name="message">{{ form.message }}</textarea></td>
+            </tr>
+            {{ captcha|raw }}
+        </table>
+        <br />
+        <input type="hidden" name="action" value="do_sendtofriend" />
+        <input type="hidden" name="tid" value="{{ thread.tid }}" />
+        <div align="center"><input type="submit" class="button" value="{{ lang.send_thread }}" /></div>
+    </form>
+{% endblock body %}
diff --git a/sendthread.php b/sendthread.php
@@ -241,54 +241,44 @@
 	}
 }
 
-if(!$mybb->input['action'])
-{
-	$plugins->run_hooks("sendthread_start");
-
-	// Do we have some errors?
-	if(count($errors) >= 1)
-	{
-		$errors = inline_error($errors);
-		$email = htmlspecialchars_uni($mybb->input['email']);
-		$fromname = htmlspecialchars_uni($mybb->input['fromname']);
-		$fromemail = htmlspecialchars_uni($mybb->input['fromemail']);
-		$subject = htmlspecialchars_uni($mybb->input['subject']);
-		$message = htmlspecialchars_uni($mybb->input['message']);
-	}
-	else
-	{
-		$errors = '';
-		$email = '';
-		$fromname = '';
-		$fromemail = '';
-		$subject = $lang->sprintf($lang->emailsubject_sendtofriend, $mybb->settings['bbname']);
-		$message = '';
-	}
-
-	// Generate CAPTCHA?
-	if($mybb->settings['captchaimage'] && $mybb->user['uid'] == 0)
-	{
-		require_once MYBB_ROOT.'inc/class_captcha.php';
-		$post_captcha = new captcha(true, "post_captcha");
-
-		if($post_captcha->html)
-		{
-			$captcha = $post_captcha->html;
-		}
-	}
-	else
-	{
-		$captcha = '';
-	}
-
-	$from_email = '';
-	if($mybb->user['uid'] == 0)
-	{
-		eval("\$from_email = \"".$templates->get("sendthread_fromemail")."\";");
-	}
-
-	$plugins->run_hooks("sendthread_end");
-
-	eval("\$sendtofriend = \"".$templates->get("sendthread")."\";");
-	output_page($sendtofriend);
+if (!$mybb->input['action']) {
+    $plugins->run_hooks("sendthread_start");
+
+    // Do we have some errors?
+    if (count($errors) >= 1) {
+        $errors = inline_error($errors);
+        $form['email'] = $mybb->input['email'];
+        $form['fromname'] = $mybb->input['fromname'];
+        $form['fromemail'] = $mybb->input['fromemail'];
+        $form['subject'] = $mybb->input['subject'];
+        $form['message'] = $mybb->input['message'];
+    } else {
+        $errors = '';
+        $form['email'] = '';
+        $form['fromname'] = '';
+        $form['fromemail'] = '';
+        $form['subject'] = $lang->sprintf($lang->emailsubject_sendtofriend, $mybb->settings['bbname']);
+        $form['message'] = '';
+    }
+
+    // Generate CAPTCHA?
+    if ($mybb->settings['captchaimage'] && $mybb->user['uid'] == 0) {
+        require_once MYBB_ROOT.'inc/class_captcha.php';
+        $post_captcha = new captcha(true, "post_captcha");
+
+        if ($post_captcha->html) {
+            $captcha = $post_captcha->html;
+        }
+    } else {
+        $captcha = '';
+    }
+
+    $plugins->run_hooks("sendthread_end");
+
+    output_page(\MyBB\template('sendthread/sendthread.twig', [
+        'thread' => $thread,
+        'captcha' => $captcha,
+        'errors' => $errors,
+        'form' => $form,
+    ]));
 }