1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-10 16:46:50 +02:00

Forum Post BC-Fixes. Renamed forum-post shortcodes to avoid name conflicts.

This commit is contained in:
Cameron
2016-04-27 14:37:43 -07:00
parent fdfd60419b
commit dc1c46acc1
5 changed files with 291 additions and 266 deletions

View File

@@ -626,6 +626,8 @@ class poll
//XXX New v2.x default for front-end. Currently used by forum-post in bootstrap mode.
// TODO LAN - Needs a more generic LAN rewrite when used on another area than forum
if ($mode == 'front')
{
@@ -722,22 +724,22 @@ class poll
//TODO Hardcoded FORUM code needs to be moved somewhere.
if ($mode == 'forum')
if ($mode == 'forum') // legacy code.
{
$text = "
<tr>
<td colspan='2'><span class='smalltext'>".LAN_FORUM_3029."</span></td>
<td class='forumheader3' colspan='2'><span class='smalltext'>".LAN_FORUM_3029."</span></td>
</tr>
<tr>
<td style='width:20%'><div class='normaltext'>".LAN_FORUM_3030.": </div></td>
<td style='width:80%'class='forumheader3'><input class='tbox' type='text' name='poll_title' size='70' value='".$tp->post_toForm(vartrue($_POST['poll_title']))."' maxlength='200' /></td>
<td class='forumheader3' style='width:20%'><div class='normaltext'>".LAN_FORUM_3030.": </div></td>
<td class='forumheader3' style='width:80%' class='forumheader3'><input class='tbox' type='text' name='poll_title' size='70' value='".$tp->post_toForm(vartrue($_POST['poll_title']))."' maxlength='200' /></td>
</tr>";
$option_count = (count(vartrue($_POST['poll_option'])) ? count($_POST['poll_option']) : 1);
$text .= "
<tr>
<td style='width:20%'>".LAN_FORUM_3031."</td>
<td style='width:80%'>
<td class='forumheader3' style='width:20%'>".LAN_FORUM_3031."</td>
<td class='forumheader3' style='width:80%'>
<div id='pollsection'>";
for($count = 1; $count <= $option_count; $count++)
@@ -758,15 +760,15 @@ class poll
</td>
</tr>
<tr>
<td style='width:20%'>".LAN_FORUM_3033."</td>
<td style='width:80%'>
<td class='forumheader3' style='width:20%'>".LAN_FORUM_3033."</td>
<td class='forumheader3' style='width:80%'>
<input type='radio' name='multipleChoice' value='1'".(vartrue($_POST['multipleChoice']) ? " checked='checked'" : "")." /> ".LAN_YES."&nbsp;&nbsp;
<input type='radio' name='multipleChoice' value='0'".(!$_POST['multipleChoice'] ? " checked='checked'" : "")." /> ".LAN_NO."
</td>
</tr>
<tr>
<td style='width:30%'>".LAN_FORUM_3034."</td>
<td>
<td class='forumheader3'style='width:30%'>".LAN_FORUM_3034."</td>
<td class='forumheader3'>
<input type='radio' name='storageMethod' value='0'".(!vartrue($_POST['storageMethod']) ? " checked='checked'" : "")." /> ".LAN_FORUM_3035."<br />
<input type='radio' name='storageMethod' value='1'".($_POST['storageMethod'] == 1 ? " checked='checked'" : "")." /> ".LAN_FORUM_3036."<br />
<input type='radio' name='storageMethod' value='2'".($_POST['storageMethod'] ==2 ? " checked='checked'" : "")." /> ".LAN_FORUM_3037."