twin/jul
1
0
Fork 0
mirror of https://github.com/Xkeeper0/jul.git synced 2025-05-19 08:40:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

[fix #18] poll creation/display now consistent

Browse Source
This commit is contained in:
Xkeeper 2018-11-04 14:08:00 -08:00
parent 36912b353d
commit a23a41f021
No known key found for this signature in database
GPG Key ID: 397C04773ABE4045
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
newthread.php
View File

@ -68,8 +68,11 @@
<br>$radio=iconid value=-1 $checked>&nbsp;None&nbsp; &nbsp; &nbsp; <br>$radio=iconid value=-1 $checked>&nbsp;None&nbsp; &nbsp; &nbsp;
Custom: $inpt=custposticon SIZE=40 MAXLENGTH=100 VALUE=\"". stripslashes($custposticon) ."\"> Custom: $inpt=custposticon SIZE=40 MAXLENGTH=100 VALUE=\"". stripslashes($custposticon) ."\">
"; ";
<<<<<<< Updated upstream
$subject=htmlspecialchars($subject); $subject=htmlspecialchars($subject);
$question=htmlspecialchars($question); $question=htmlspecialchars($question);
=======
>>>>>>> Stashed changes
if ($nosmilies) $nosmilieschk = " checked"; if ($nosmilies) $nosmilieschk = " checked";
if ($nohtml) $nohtmlchk = " checked"; if ($nohtml) $nohtmlchk = " checked";
@ -94,13 +97,13 @@
<!-- </FORM> --> <!-- </FORM> -->
":" ":"
<tr>$tccell1><b>Poll icon:</td> $tccell2l colspan=2>$posticonlist</td></tr> <tr>$tccell1><b>Poll icon:</td> $tccell2l colspan=2>$posticonlist</td></tr>
<tr>$tccell1><b>Poll title:</td> $tccell2l colspan=2>$inpt=subject SIZE=40 MAXLENGTH=100 VALUE=\"". stripslashes($subject) ."\"></td></tr> <tr>$tccell1><b>Poll title:</td> $tccell2l colspan=2>$inpt=subject SIZE=40 MAXLENGTH=100 VALUE=\"". htmlspecialchars(stripslashes($subject)) ."\"></td></tr>
<tr>$tccell1><b>Question:</td> $tccell2l colspan=2>$inpt=question SIZE=60 MAXLENGTH=255 VALUE=\"". stripslashes($question) ."\"></td></tr> <tr>$tccell1><b>Question:</td> $tccell2l colspan=2>$inpt=question SIZE=60 MAXLENGTH=255 VALUE=\"". htmlspecialchars(stripslashes($question)) ."\"></td></tr>
<tr>$tccell1><b>Briefing:</td> $tccell2l colspan=2>$txta=briefing ROWS=2 COLS=$numcols style=\"resize:vertical;\">". stripslashes($briefing) ."</TEXTAREA></td></tr> <tr>$tccell1><b>Briefing:</td> $tccell2l colspan=2>$txta=briefing ROWS=2 COLS=$numcols style=\"resize:vertical;\">". htmlspecialchars(stripslashes($briefing)) ."</TEXTAREA></td></tr>
<tr>$tccell1><b>Multi-voting:</td>$tccell2l colspan=2>$radio=mltvote value=0 $checked0> Disabled &nbsp $radio=mltvote value=1 $checked1> Enabled</td></tr> <tr>$tccell1><b>Multi-voting:</td>$tccell2l colspan=2>$radio=mltvote value=0 $checked0> Disabled &nbsp $radio=mltvote value=1 $checked1> Enabled</td></tr>
<tr>$tccell1><b>Choices:</td> $tccell2l colspan=2>$choices</td></tr> <tr>$tccell1><b>Choices:</td> $tccell2l colspan=2>$choices</td></tr>
<tr>$tccell1><b>Post:</td>$tccell2l width=800px valign=top>".replytoolbar(2)." <tr>$tccell1><b>Post:</td>$tccell2l width=800px valign=top>".replytoolbar(2)."
$txta=message ROWS=21 COLS=$numcols style=\"width: 100%; max-width: 800px; resize:vertical;\">". stripslashes(htmlspecialchars($message)) ."</TEXTAREA></td> $txta=message ROWS=21 COLS=$numcols style=\"width: 100%; max-width: 800px; resize:vertical;\">". htmlspecialchars(stripslashes($message)) ."</TEXTAREA></td>
$tccell2l width=*>".moodlist($moodid)."</td></tr> $tccell2l width=*>".moodlist($moodid)."</td></tr>
<tr> <tr>
@ -275,16 +278,23 @@
"; ";
} }
$mlt=($mltvote?'enabled':'disabled'); $mlt=($mltvote?'enabled':'disabled');
$subject = htmlspecialchars(stripslashes($subject));
$question = htmlspecialchars(stripslashes($question));
$briefing = htmlspecialchars(stripslashes($briefing));
$pollpreview=" $pollpreview="
<td colspan=3 class='tbl tdbgc center font'><b>$question<tr> <td colspan=3 class='tbl tdbgc center font'><b>". $question ."<tr>
$tccell2ls colspan=3>$briefing<tr> $tccell2ls colspan=3>". $briefing ."<tr>
$pchoices $pchoices
$tccell2ls colspan=3>Multi-voting is $mlt. $tccell2ls colspan=3>Multi-voting is $mlt.
$tblend<br>$tblstart $tblend<br>$tblstart
"; ";
<<<<<<< Updated upstream
$subject = htmlspecialchars(stripslashes($subject)); $subject = htmlspecialchars(stripslashes($subject));
$question = htmlspecialchars(stripslashes($question)); $question = htmlspecialchars(stripslashes($question));
$briefing = htmlspecialchars(stripslashes($briefing)); $briefing = htmlspecialchars(stripslashes($briefing));
=======
>>>>>>> Stashed changes
} }
loadtlayout(); loadtlayout();
$ppost=$user; $ppost=$user;

4
thread.php
View File

@ -292,7 +292,7 @@
$link = "<a href='?id={$id}&dat={$confirm}&{$linkact}vote=$pollc[id]'>"; $link = "<a href='?id={$id}&dat={$confirm}&{$linkact}vote=$pollc[id]'>";
$choices .= "<tr> $choices .= "<tr>
$tccell1l width=20%>$dot$link".($pollc['choice'])."</a></td> $tccell1l width=20%>$dot$link".htmlspecialchars($pollc['choice'])."</a></td>
$tccell2l width=60%>$barpart</td> $tccell2l width=60%>$barpart</td>
$tccell1 width=20%>".($poll['doublevote'] ? "$pct% of users, $votes ($pct2%)" : "$pct%, $votes")."</td> $tccell1 width=20%>".($poll['doublevote'] ? "$pct% of users, $votes ($pct2%)" : "$pct%, $votes")."</td>
</tr>"; </tr>";
@ -308,7 +308,7 @@
$polltbl = "$tblstart $polltbl = "$tblstart
<tr>$tccellc colspan=3><b>".htmlspecialchars($poll['question'])."</td></tr> <tr>$tccellc colspan=3><b>".htmlspecialchars($poll['question'])."</td></tr>
<tr>$tccell2ls colspan=3>".nl2br(dofilters($poll['briefing']))."</td></tr> <tr>$tccell2ls colspan=3>".nl2br(htmlspecialchars(dofilters($poll['briefing'])))."</td></tr>
$choices $choices
<tr>$tccell2l colspan=3>$smallfont $polltext $tvotes_u user$s_have voted. $polledit</td></tr> <tr>$tccell2l colspan=3>$smallfont $polltext $tvotes_u user$s_have voted. $polledit</td></tr>
$tblend<br> $tblend<br>