[drydock] r243 committed - more validation fixes (needed to quote the name of one anchor tag, als...
dry...@googlecode.com
Author: all.star25
Date: Sat Jul 23 16:09:20 2011
Log: more validation fixes (needed to quote the name of one anchor
tag, also put <p> elements inside of our post <blockquote> elements)
http://code.google.com/p/drydock/source/detail?r=243
Modified:
/trunk/drydock/tpl/_admin/adminlookup.tpl
/trunk/drydock/tpl/_admin/adminrecentposts.tpl
/trunk/drydock/tpl/_admin/adminreports.tpl
/trunk/drydock/tpl/drydock-anonbbs/board.tpl
/trunk/drydock/tpl/drydock-anonbbs/viewblock.tpl
/trunk/drydock/tpl/drydock-image/viewblock.tpl
/trunk/drydock/tpl/drydock-traditional/viewblock.tpl
=======================================
--- /trunk/drydock/tpl/_admin/adminlookup.tpl Sat Jul 23 13:53:24 2011
+++ /trunk/drydock/tpl/_admin/adminlookup.tpl Sat Jul 23 16:09:20 2011
@@ -128,9 +128,9 @@
{/if}
</td></tr>
<tr><td> {* Split rest of post from post body *}
- <blockquote>
+ <blockquote><p>
{$post.body|nl2br}
- </blockquote>
+ </p></blockquote>
</td></tr>
</table><hr>
{/foreach}
=======================================
--- /trunk/drydock/tpl/_admin/adminrecentposts.tpl Sat Jul 23 13:53:24 2011
+++ /trunk/drydock/tpl/_admin/adminrecentposts.tpl Sat Jul 23 16:09:20 2011
@@ -215,9 +215,9 @@
{* Split rest of post from post body *}
<div>
- <blockquote>
+ <blockquote><p>
{$post.body|nl2br}
- </blockquote>
+ </p></blockquote>
</div>
{/foreach}
=======================================
--- /trunk/drydock/tpl/_admin/adminreports.tpl Sat Jul 23 13:53:24 2011
+++ /trunk/drydock/tpl/_admin/adminreports.tpl Sat Jul 23 16:09:20 2011
@@ -165,9 +165,9 @@
{* Split rest of post from post body *}
<div>
- <blockquote>
+ <blockquote><p>
{$report.post.body|nl2br}
- </blockquote>
+ </p></blockquote>
</div>
{* Show report handling links *}
=======================================
--- /trunk/drydock/tpl/drydock-anonbbs/board.tpl Sat Jul 23 15:46:56 2011
+++ /trunk/drydock/tpl/drydock-anonbbs/board.tpl Sat Jul 23 16:09:20 2011
@@ -38,7 +38,7 @@
{/foreach}{*For each thread*}
</div>
<div class="box">
-<a name=newthread />
+<a name="newthread" />
{include file=postblock.tpl comingfrom=$comingfrom}
</div>
</div>
=======================================
--- /trunk/drydock/tpl/drydock-anonbbs/viewblock.tpl Sat Jul 23 13:58:42
2011
+++ /trunk/drydock/tpl/drydock-anonbbs/viewblock.tpl Sat Jul 23 16:09:20
2011
@@ -71,7 +71,7 @@
</tr>
</table>
{/if}
- <div class="postbody"><blockquote>
+ <div class="postbody"><blockquote><p>
{assign value=$thread.body|THtrunc:2000 var=bodey}
{ if $binfo.id == THnewsboard or $binfo.id == THmodboard or
$binfo.filter!=1}
{ $bodey.text|nl2br|wrapper|quotereply:"$binfo":"$post":"$thread"}
@@ -79,7 +79,7 @@
{ $bodey.text|filters_new|wrapper|quotereply:"$binfo":"$post":"$thread"}
{ /if}
{if $bodey.wastruncated}<em><a href="{$THurl}{if
$THuserewrite}{$binfo.folder}/thread/{else}drydock.php?b={$binfo.folder}&i={/if}{$thread.globalid}#{$post.globalid}"
class="ssmed">[more...]</a></em>{/if}
-</blockquote>
+</p></blockquote>
</div>
{ if $comingfrom=="board"}
{ if $thread.rcount>$binfo.perth}
@@ -124,7 +124,7 @@
</div>
<div class="postbody">
- <blockquote>
+ <blockquote><p>
{assign value=$post.body|THtrunc:2000 var=bodey}
{ if $binfo.id == THnewsboard or $binfo.id == THmodboard or
$binfo.filter!=1}
@@ -133,7 +133,7 @@
{ $bodey.text|filters_new|wrapper|quotereply:"$binfo":"$post":"$thread"}
{ /if}
{if $bodey.wastruncated}<em><a href="{$THurl}{if
$THuserewrite}{$binfo.folder}/thread/{else}drydock.php?b={$binfo.folder}&i={/if}{$thread.globalid}#{$post.globalid}"
class="ssmed">[more...]</a></em>{/if}
-</blockquote>
+</p></blockquote>
</div>
{/foreach}{*For each reply*}
=======================================
--- /trunk/drydock/tpl/drydock-image/viewblock.tpl Sat Jul 23 13:53:24 2011
+++ /trunk/drydock/tpl/drydock-image/viewblock.tpl Sat Jul 23 16:09:20 2011
@@ -64,12 +64,12 @@
</tr>
</table>
{/if}
-<blockquote>
+<blockquote><p>
{if not $thread.body}
{ $THdefaulttext}
{else}
{if $comingfrom=="board"}{assign value=$thread.body|THtrunc:2000
var=bodeycheck}
-<blockquote>
+<blockquote><p>
{assign value=$bodeycheck.text var=bodey}{else}{assign value=$thread.body
var=bodey}{/if}
{ if $binfo.id == THnewsboard or $binfo.id == THmodboard or
$binfo.filter!=1}
{ if $binfo.allowvids == 1}
@@ -87,7 +87,7 @@
{if $comingfrom=="board" and $bodeycheck.wastruncated}<em><a
href="{$THurl}{if
$THuserewrite}{$binfo.folder}/thread/{else}drydock.php?b={$binfo.folder}&i={/if}{$thread.globalid}#{$post.globalid}"
class="ssmed">[more...]</a></em>{/if}
{/if}
-</blockquote>
+</p></blockquote>
{if $comingfrom=="board"}
{ assign value=$thread.rcount-$thread.scount var="count"}
{ if $count>0}<span class="omittedposts">{$count} {if
$count>1}posts{else}post{/if} omitted. Click <a href="{$THurl}{if
$THuserewrite}{$binfo.folder}/thread/{else}drydock.php?b={$binfo.folder}&i={/if}{$thread.globalid}">full
thread</a> to view.</span>{/if}
@@ -149,7 +149,7 @@
</table>
{/if}
{* replies *}
- <blockquote>
+ <blockquote><p>
{if not $post.body} {* no text,admin configable, THdefaulttext *}
{ $THdefaulttext}
{else}
@@ -170,7 +170,7 @@
{ /if}
{if $comingfrom=="board" and $bodeycheck.wastruncated} <em><a
href="{$THurl}{if
$THuserewrite}{$binfo.folder}/thread/{else}drydock.php?b={$binfo.folder}&i={/if}{$thread.globalid}#{$post.globalid}"
title="Read the rest of this post" class="ssmed">[more...]</a></em>{/if}
{/if}
- </blockquote>
+ </p></blockquote>
</td>
</tr>
</tbody>
=======================================
--- /trunk/drydock/tpl/drydock-traditional/viewblock.tpl Sat Jul 23
13:53:24 2011
+++ /trunk/drydock/tpl/drydock-traditional/viewblock.tpl Sat Jul 23
16:09:20 2011
@@ -101,12 +101,12 @@
</tr>
</table>
{/if}
-<blockquote>
+<blockquote><p>
{if not $thread.body}
{ $THdefaulttext}
{else}
{if $comingfrom=="board"}{assign value=$thread.body|THtrunc:2000
var=bodeycheck}
-<blockquote>
+<blockquote><p>
{assign value=$bodeycheck.text var=bodey}{else}{assign value=$thread.body
var=bodey}{/if}
{ if $binfo.id == THnewsboard or $binfo.id == THmodboard or
$binfo.filter!="1"}
{ if $binfo.allowvids == 1}
@@ -123,7 +123,7 @@
{ /if}
{if $comingfrom=="board" and $bodeycheck.wastruncated}<em><a
href="{$THurl}{if
$THuserewrite}{$binfo.folder}/thread/{else}drydock.php?b={$binfo.folder}&i={/if}{$thread.globalid}#{$post.globalid}"
class="ssmed">[more...]</a></em>{/if}
{/if}
-</blockquote>
+</p></blockquote>
{/if}{*board preview*}
{if $comingfrom=="board"}
{ assign value=$thread.rcount-$thread.scount var="count"}
@@ -187,7 +187,7 @@
</table>
{/if}
{* replies *}
- <blockquote>
+ <blockquote><p>
{if not $post.body} {* no text,admin configable, THdefaulttext *}
{ $THdefaulttext}
{else}
@@ -208,7 +208,7 @@
{ /if}
{if $comingfrom=="board" and $bodeycheck.wastruncated} <em><a
href="{$THurl}{if
$THuserewrite}{$binfo.folder}/thread/{else}drydock.php?b={$binfo.folder}&i={/if}{$thread.globalid}#{$post.globalid}"
title="Read the rest of this post" class="ssmed">[more...]</a></em>{/if}
{/if}
- </blockquote>
+ </p></blockquote>
</td>
</tr>
</tbody>