[drydock] r225 committed - replaced <br> with <br /> where we had that
dry...@googlecode.com
Author: all.star25
Date: Sat Jul 23 12:53:01 2011
Log: replaced <br> with <br /> where we had that
http://code.google.com/p/drydock/source/detail?r=225
Modified:
/trunk/drydock/_Smarty/plugins/modifier.filetrunc.php
/trunk/drydock/_Smarty/plugins/modifier.wordwrap_new.php
/trunk/drydock/_Smarty/plugins/modifier.wrapper.php
/trunk/drydock/admin.php
/trunk/drydock/common.php
/trunk/drydock/dbi/MySQL-dbi.php
/trunk/drydock/editpost.php
/trunk/drydock/install.php
/trunk/drydock/logviewer.php
/trunk/drydock/misc.php
/trunk/drydock/news-template.php
/trunk/drydock/orpha.php
/trunk/drydock/post-common.php
/trunk/drydock/profiles.php
/trunk/drydock/rebuilds.php
/trunk/drydock/reply.php
/trunk/drydock/thread.php
/trunk/drydock/tpl/_admin/adminban.tpl
/trunk/drydock/tpl/_admin/adminboard.tpl
/trunk/drydock/tpl/_admin/adminedit.tpl
/trunk/drydock/tpl/_admin/adminhouse.tpl
/trunk/drydock/tpl/_admin/adminlookup.tpl
/trunk/drydock/tpl/_admin/adminrecentpics.tpl
/trunk/drydock/tpl/_admin/adminrecentposts.tpl
/trunk/drydock/tpl/_admin/adminreports.tpl
/trunk/drydock/tpl/_admin/adminstatic.tpl
/trunk/drydock/tpl/drydock-anonbbs/popup.tpl
/trunk/drydock/tpl/drydock-anonbbs/postblock.tpl
/trunk/drydock/tpl/drydock-anonbbs/rules.tpl
/trunk/drydock/tpl/drydock-image/board.tpl
/trunk/drydock/tpl/drydock-image/popup.tpl
/trunk/drydock/tpl/drydock-image/postblock.tpl
/trunk/drydock/tpl/drydock-image/rules.tpl
/trunk/drydock/tpl/drydock-image/thread.tpl
/trunk/drydock/tpl/drydock-traditional/popup.tpl
/trunk/drydock/tpl/drydock-traditional/postblock.tpl
/trunk/drydock/tpl/drydock-traditional/rules.tpl
/trunk/drydock/tpl/drydock-traditional/thread.tpl
/trunk/drydock/upgrade_install.php
=======================================
--- /trunk/drydock/_Smarty/plugins/modifier.filetrunc.php Sat Feb 23
23:15:15 2008
+++ /trunk/drydock/_Smarty/plugins/modifier.filetrunc.php Sat Jul 23
12:53:01 2011
@@ -9,8 +9,8 @@
/**
* Smarty truncate modifier plugin
*
- * Type: modifier<br>
- * Name: truncate<br>
+ * Type: modifier<br />
+ * Name: truncate<br />
* Purpose: Truncate a string to a certain length if necessary,
* optionally splitting in the middle of a word, and
* appending the $etc string or inserting $etc into the middle.
=======================================
--- /trunk/drydock/_Smarty/plugins/modifier.wordwrap_new.php Fri Mar 18
00:43:29 2011
+++ /trunk/drydock/_Smarty/plugins/modifier.wordwrap_new.php Sat Jul 23
12:53:01 2011
@@ -9,8 +9,8 @@
/**
* Smarty wordwrap modifier plugin
*
- * Type: modifier<br>
- * Name: wordwrap_new<br>
+ * Type: modifier<br />
+ * Name: wordwrap_new<br />
* Purpose: wrap a string of text at a given length, hopefully in a way
that doesn't break things! Call this before nl2br.
* @author ordog (lol)
* @param string $string The source string
=======================================
--- /trunk/drydock/_Smarty/plugins/modifier.wrapper.php Sat Feb 23 23:15:15
2008
+++ /trunk/drydock/_Smarty/plugins/modifier.wrapper.php Sat Jul 23 12:53:01
2011
@@ -24,7 +24,7 @@
if ($wrap>$maxwordlength)
{
- $returnvar = $returnvar . "<br>\n";
+ $returnvar = $returnvar . "<br />\n";
$wrap=0;
}
}
=======================================
--- /trunk/drydock/admin.php Fri Mar 18 00:43:29 2011
+++ /trunk/drydock/admin.php Sat Jul 23 12:53:01 2011
@@ -713,7 +713,7 @@
$updated_board['name'] = replacequote($_POST['name'.$oldid]);
$updated_board['folder'] = replacequote($folder); // we already did
the stuff above
$updated_board['about'] =
strip_tags(replacequote($_POST['about'.$oldid]),
- '<i><b><u><strike><p><br><font><a><ul><ol><li><marquee>');
+ '<i><b><u><strike><p><br /><font><a><ul><ol><li><marquee>');
$updated_board['rules'] = replacequote($_POST['rules'.$oldid]);
$updated_board['boardlayout'] =$_POST['boardlayout'.$oldid];
@@ -1010,11 +1010,11 @@
// Check if the account exists
if($profile_dbi->userexists($username) == true)
{
- $errorstring .= "Sorry, an account with this name already
exists.<br>\n";
+ $errorstring .= "Sorry, an account with this name already exists.<br
/>\n";
}
if(!preg_match('/^([\w\.])+$/i', $username))
{
- $errorstring .= "Sorry, your name must be alphanumeric and
contain no spaces.<br>\n";
+ $errorstring .= "Sorry, your name must be alphanumeric and
contain no spaces.<br />\n";
}
// Password validation
@@ -1023,12 +1023,12 @@
$passlength = strlen($password);
if($passlength < 4)
{
- $errorstring .= "Sorry, your password must be at least 4
characters.<br>\n";
+ $errorstring .= "Sorry, your password must be at least 4
characters.<br />\n";
}
}
else
{
- $errorstring .= "You must provide a password!<br>\n";
+ $errorstring .= "You must provide a password!<br />\n";
}
// Email validation
@@ -1037,17 +1037,17 @@
/* Check if valid email address */
if( !validateemail($email) ) // Provided in common.php
{
- $errorstring .= "You must provide a valid email address!<br>\n";
+ $errorstring .= "You must provide a valid email address!<br />\n";
}
// Check if it exists already
if($profile_dbi->emailexists($email) == true)
{
- $errorstring .= "That email has already been used to register an
account!<br>\n";
+ $errorstring .= "That email has already been used to register an
account!<br />\n";
}
}
else
{
- $errorstring .= "You must provide an email address!<br>\n";
+ $errorstring .= "You must provide an email address!<br />\n";
}
// No errors encountered so far, attempt to register
=======================================
--- /trunk/drydock/common.php Sat Jul 23 11:29:07 2011
+++ /trunk/drydock/common.php Sat Jul 23 12:53:01 2011
@@ -79,7 +79,7 @@
foreach( $bans as $singleban )
{
// Display wildcards as appropriate.
- printf("Associated IP: %d.%d.%s.%s<br>\n",
+ printf("Associated IP: %d.%d.%s.%s<br />\n",
$singleban['ip_octet1'],
$singleban['ip_octet2'],
(($singleban['ip_octet3'] == -1) ? "*" : $singleban['ip_octet3']),
=======================================
--- /trunk/drydock/dbi/MySQL-dbi.php Fri Mar 18 00:43:29 2011
+++ /trunk/drydock/dbi/MySQL-dbi.php Sat Jul 23 12:53:01 2011
@@ -436,7 +436,7 @@
}
}
- //var_dump($multi);echo"<br>";
+ //var_dump($multi);echo"<br />";
return $multi;
}
=======================================
--- /trunk/drydock/editpost.php Fri Mar 18 00:43:29 2011
+++ /trunk/drydock/editpost.php Sat Jul 23 12:53:01 2011
@@ -322,11 +322,11 @@
if (THuserewrite)
{
- $diereturn = 'Post(s) deleted.<br><a href="' . THurl .
$boardname . '">Return to board</a>';
+ $diereturn = 'Post(s) deleted.<br /><a href="' . THurl .
$boardname . '">Return to board</a>';
}
else
{
- $diereturn = 'Post(s) deleted.<br><a href="' .
THurl . 'drydock.php?b=' . $boardname . '">Return to board</a>';
+ $diereturn = 'Post(s) deleted.<br /><a href="' .
THurl . 'drydock.php?b=' . $boardname . '">Return to board</a>';
}
}
else
@@ -335,11 +335,11 @@
if (THuserewrite)
{
- $diereturn = 'Post(s) deleted.<br><a href="' . THurl .
$boardname . '/thread/' . $threadop . '">Return to thread</a>';
+ $diereturn = 'Post(s) deleted.<br /><a href="' . THurl .
$boardname . '/thread/' . $threadop . '">Return to thread</a>';
}
else
{
- $diereturn = 'Post(s) deleted.<br><a href="' .
THurl . 'drydock.php?b=' . $boardname . '&i=' . $threadop . '">Return to
thread</a>';
+ $diereturn = 'Post(s) deleted.<br /><a href="' .
THurl . 'drydock.php?b=' . $boardname . '&i=' . $threadop . '">Return to
thread</a>';
}
}
@@ -413,11 +413,11 @@
if (THuserewrite)
{
- THdie('Thread moved.<br><a href="' . THurl .
$destboard_name . '/thread/' . $newthreadspot . '">Return to thread</a>');
+ THdie('Thread moved.<br /><a href="' . THurl .
$destboard_name . '/thread/' . $newthreadspot . '">Return to thread</a>');
}
else
{
- THdie('Thread moved.<br><a href="' . THurl . 'drydock.php?b=' .
$destboard_name . '&i=' . $newthreadspot . '">Return to thread</a>');
+ THdie('Thread moved.<br /><a href="' . THurl . 'drydock.php?b=' .
$destboard_name . '&i=' . $newthreadspot . '">Return to thread</a>');
}
}
else
=======================================
--- /trunk/drydock/install.php Sat Jul 23 12:33:32 2011
+++ /trunk/drydock/install.php Sat Jul 23 12:53:01 2011
@@ -166,7 +166,7 @@
<div class="pgtitle">
Drydock Installation Script
</div>
- <br>
+ <br />
<?php if(!isset($_GET['p'])) {
//Attempt to touch a file in the directories that need to be chmodded.
@@ -382,27 +382,27 @@
?>
<div class="logo">confirm settings</div>
Here you can review your settings before they are written to the server.
-If everything here looks good, go ahead and hit continue.<br><br>
+If everything here looks good, go ahead and hit continue.<br /><br />
<?php
- echo "Database type: ".$check['THdbtype']."<br>";
- echo "Database table prefix: ".$check['THdbprefix']."<br>";
+ echo "Database type: ".$check['THdbtype']."<br />";
+ echo "Database table prefix: ".$check['THdbprefix']."<br />";
if($check['THdbtype']!="SQLite")
{
- echo "Database server: ".$check['THdbserver']."<br>";
- echo "Database username: ".$check['THdbuser']."<br>";
- echo "Database name: ".$check['THdbbase']."<br>";
- }
- echo "Install location: ".$check['THpath']."<br>";
- echo "Install URL: ".$check['THurl']."<br>";
-
- echo "Administrator username: ".$check['adminname']."<br>";
-
- echo "PEAR path: ".$check['THpearpath']."<br>";
- echo "Enable cURL: ".$check['THusecURL']."<br>"; //THusecURL
- echo "Enable SWF metatags: ".$check['THuseSWFmeta']."<br>"; //THuseSWFmeta
- echo "Enable SVG support: ".$check['THuseSVG']."<br>"; //THuseSVG
+ echo "Database server: ".$check['THdbserver']."<br />";
+ echo "Database username: ".$check['THdbuser']."<br />";
+ echo "Database name: ".$check['THdbbase']."<br />";
+ }
+ echo "Install location: ".$check['THpath']."<br />";
+ echo "Install URL: ".$check['THurl']."<br />";
+
+ echo "Administrator username: ".$check['adminname']."<br />";
+
+ echo "PEAR path: ".$check['THpearpath']."<br />";
+ echo "Enable cURL: ".$check['THusecURL']."<br />"; //THusecURL
+ echo "Enable SWF metatags: ".$check['THuseSWFmeta']."<br />";
//THuseSWFmeta
+ echo "Enable SVG support: ".$check['THuseSVG']."<br />"; //THuseSVG
?>
-<br>
+<br />
<form method="post" enctype="multipart/form-data" action="install.php?p=7">
<input type="hidden" name="configarray" value="<?php echo
htmlspecialchars($configarray); ?>">
<input type="submit" value="Continue">
=======================================
--- /trunk/drydock/logviewer.php Sat Jul 23 11:29:07 2011
+++ /trunk/drydock/logviewer.php Sat Jul 23 12:53:01 2011
@@ -54,7 +54,7 @@
}
closedir($handle);
}
- echo "Available logs:<br>\n";
+ echo "Available logs:<br />\n";
echo "<ul>\n";
foreach( $valid_logs as $logchoice )
{
=======================================
--- /trunk/drydock/misc.php Fri Mar 18 00:43:29 2011
+++ /trunk/drydock/misc.php Sat Jul 23 12:53:01 2011
@@ -297,11 +297,11 @@
switch( $status )
{
case 0: // valid report attempt
- $message = 'Reporting post #'.$found_post.' in
/'.$_POST['board'].'/.<br>
- <form action="misc.php" method="post">Report category:<br>
- <input type="radio" name="category" value="1"> Illegal
content<br>
- <input type="radio" name="category" value="2"> Rule violation<br>
- <input type="radio" name="category" value="3" checked="checked">
Low-quality posting<br>
+ $message = 'Reporting post #'.$found_post.' in
/'.$_POST['board'].'/.<br />
+ <form action="misc.php" method="post">Report category:<br />
+ <input type="radio" name="category" value="1"> Illegal
content<br />
+ <input type="radio" name="category" value="2"> Rule violation<br
/>
+ <input type="radio" name="category" value="3" checked="checked">
Low-quality posting<br />
<input type="hidden" name="report" value="report2">
<input type="hidden" name="post" value="'.$found_post.'">
<input type="hidden" name="board" value="'.$_POST['board'].'">
@@ -474,7 +474,7 @@
$db->banipfrompost($postarray['id'], $isthread, 0, $reason, "",
$reason, $duration,
$_SESSION['username'] . " via mod panel");
- $message = $message . "<br>Banning";
+ $message = $message . "<br />Banning";
}
// Delete, if they're an admin
@@ -501,11 +501,11 @@
// Write to the log
writelog("delete\tt:" . $postarray['globalid'] . "\tb:" .
$postarray['board'], "moderator");
- $message = $message . "<br>Post deletion";
+ $message = $message . "<br />Post deletion";
}
elseif ( $_POST['del'] == true ) // hrmph :[
{
- $message = $message . "<br><i><b>Post deletion failed (insufficient
access)</i></b>";
+ $message = $message . "<br /><i><b>Post deletion failed
(insufficient access)</i></b>";
}
}
}
@@ -578,7 +578,7 @@
$db->banipfrompost($postarray['id'], $isthread, 0, $reason, "",
$reason, $duration,
$_SESSION['username'] . " via mod panel");
- $message = $message . "<br>Banning";
+ $message = $message . "<br />Banning";
// Delete, if they're an admin
if($_SESSION['admin'] == 1)
@@ -604,11 +604,11 @@
// Write to the log
writelog("delete\tt:" . $postarray['globalid'] . "\tb:" .
$postarray['board'], "moderator");
- $message = $message . "<br>Post deletion";
+ $message = $message . "<br />Post deletion";
}
else // hrmph :[
{
- $message = $message . "<br><i><b>Post deletion failed (insufficient
access)</i></b>";
+ $message = $message . "<br /><i><b>Post deletion failed
(insufficient access)</i></b>";
}
}
}
=======================================
--- /trunk/drydock/news-template.php Fri Mar 18 00:43:29 2011
+++ /trunk/drydock/news-template.php Sat Jul 23 12:53:01 2011
@@ -7,7 +7,7 @@
<tr bgcolor="#DDDDDD"><td><b
style="font-size:15px;color:#000000">~~~ItemTitle~~~</b></td><td
align="right"><b
style="font-size:15px;color:#000000">~~~ItemAuthor~~~</b></td></tr>
<tr bgcolor="#FFFFFF"><td colspan="2"><dl><dt><span
style='font-family:Verdana'>~~~ItemPubShortDate~~~
~~~ItemPubShortTime~~~</span>
-<br><br><dd>~~~ItemDescription~~~<P></dl></td></tr>
+<br /><br /><dd>~~~ItemDescription~~~<P></dl></td></tr>
<tr bgcolor="#DDDDDD"><td align="right" colspan="2"><a
href="~~~ItemLink~~~">comment on this</a>
</table></td></tr></table>
~~~EndItemsRecord~~~
=======================================
--- /trunk/drydock/orpha.php Sat Jul 23 11:29:07 2011
+++ /trunk/drydock/orpha.php Sat Jul 23 12:53:01 2011
@@ -36,7 +36,7 @@
//Beginning should never be greater than $count, for the reason that
$offset is always >= 0
$imagequery = "SELECT * FROM ".THimages_table." ORDER BY id ASC LIMIT
$beginning , $orpha";
- echo "$imagequery<br>";
+ echo "$imagequery<br />";
$imgs=array();
$queryresult=$db->myquery($imagequery);
@@ -165,7 +165,7 @@
echo "</a>";
//we already know this image is orphaned, so let's output its location
and even a link to a deleter script
- echo '<br>';
+ echo '<br />';
echo $wrapper.":";
echo $wrapper%7;
echo "; (<i>".$thisimage['fsize']."
K, ".$thisimage['width']."x".$thisimage['height']."</i>)";
@@ -185,7 +185,7 @@
}
echo '</table></div>';
echo "rm ".$rmstring;
-echo "<br><br>";
+echo "<br /><br />";
echo "DELETE from ". THimages_table." where ".$deletestring;
//echo "DELETE from images where ";
=======================================
--- /trunk/drydock/post-common.php Fri Mar 18 00:43:29 2011
+++ /trunk/drydock/post-common.php Sat Jul 23 12:53:01 2011
@@ -620,14 +620,14 @@
$prot = $flash->getProtected();
$compr = $flash->getCompression();
- $extrainfo = $type." file, version ".intval($version).".<br>";
- $extrainfo = $extrainfo . "FPS: ".floatval($fps)."<br>";
+ $extrainfo = $type." file, version ".intval($version).".<br
/>";
+ $extrainfo = $extrainfo . "FPS: ".floatval($fps)."<br />";
if($framecount != 1)
{
- $extrainfo = $extrainfo . "Frame
count: ".intval($framecount)." frames<br>";
+ $extrainfo = $extrainfo . "Frame
count: ".intval($framecount)." frames<br />";
} else{
- $extrainfo = $extrainfo . "Frame count: 1 frame<br>";
+ $extrainfo = $extrainfo . "Frame count: 1 frame<br />";
}
$bg = $flash->getBackgroundColor();
@@ -639,11 +639,11 @@
if($prot)
{
- $extrainfo = $extrainfo . "<br>Protected file";
+ $extrainfo = $extrainfo . "<br />Protected file";
}
if($compr)
{
- $extrainfo = $extrainfo . "<br>Zlib compression";
+ $extrainfo = $extrainfo . "<br />Zlib compression";
}
$fyle['extra_info'] = $db->addexifdata($extrainfo);
=======================================
--- /trunk/drydock/profiles.php Sat Jul 23 12:33:32 2011
+++ /trunk/drydock/profiles.php Sat Jul 23 12:53:01 2011
@@ -68,11 +68,11 @@
else
{ // invalid login?
echo "<div class=\"pgtitle\">Login error</div><br />\n";
- echo "<b>There was an error processing your request.</b><br>\n";
- echo "<u>Possible causes:</u><br>\n";
- echo "Invalid username<br>\n";
- echo "Invalid password<br>\n";
- echo "Your account has not been approved<br>\n";
+ echo "<b>There was an error processing your request.</b><br />\n";
+ echo "<u>Possible causes:</u><br />\n";
+ echo "Invalid username<br />\n";
+ echo "Invalid password<br />\n";
+ echo "Your account has not been approved<br />\n";
echo "Your account has been disabled\n";
}
}
@@ -95,7 +95,7 @@
else
{
echo "<div class=\"pgtitle\">Logged in as " .
$_SESSION['username'] . "</div><br />\n";
- echo "You are logged in as <b>" . $_SESSION['username'] . "</b>.
<br><br>\n";
+ echo "You are logged in as <b>" . $_SESSION['username'] . "</b>. <br
/><br />\n";
echo "[<a href=\"profiles.php?action=logout\">Logout if this is not
you</a>]\n";
echo "</td></tr></table>\n";
}
@@ -123,12 +123,12 @@
unset ($_SESSION['moderator']);
unset ($_SESSION['mod_array']);
echo '<div class="pgtitle">Logged out</div><br />';
- echo "You are now logged out!<br><br>\n";
+ echo "You are now logged out!<br /><br />\n";
}
else
{
echo '<div class="pgtitle">Logged out</div><br />';
- echo "You are not logged in!<br><br>\n";
+ echo "You are not logged in!<br /><br />\n";
}
echo "[<a href=\"drydock.php\">Board index</a>]\n";
}
@@ -171,7 +171,7 @@
else
{
echo "<div class=\"pgtitle\">Permissions error</div><br />\n";
- echo "<b>Error:</b> You are not authorized to view this
page!<br><br>\n";
+ echo "<b>Error:</b> You are not authorized to view this page!<br /><br
/>\n";
echo "[<a href=\"drydock.php\">Board index</a>]\n";
}
}
@@ -234,7 +234,7 @@
THurl . "static/disable.png\" alt=\"Disable user\"
border=\"0\">Disable user</a>";
}
- echo "<br>\n";
+ echo "<br />\n";
}
//echo " </div><br />\n<div align=\"right\ style=\"right:
10px;\">";
@@ -317,7 +317,7 @@
else
{
echo "<div class=\"pgtitle\">Permissions error</div><br />\n";
- echo "<b>Error:</b> You are not authorized to view this
page!<br><br>\n";
+ echo "<b>Error:</b> You are not authorized to view this page!<br
/><br />\n";
echo "[<a href=\"drydock.php\">Board index</a>]\n";
echo "</td></tr></table>\n";
}
@@ -423,7 +423,7 @@
if ($passlength < 4)
{
- $passErrString = "Sorry, your password must be at least 4
characters.<br>\n";
+ $passErrString = "Sorry, your password must be at least 4
characters.<br />\n";
}
else
{
@@ -451,12 +451,12 @@
if ($picture_pending)
{
- $imgErrString .= "Picture already pending admin approval.<br>\n";
+ $imgErrString .= "Picture already pending admin approval.<br />\n";
}
if ($_FILES['picture']['size'] > THprofile_maxpicsize)
{
- $imgErrString .= "Picture must be no larger than " .
THprofile_maxpicsize . " bytes.<br>\n";
+ $imgErrString .= "Picture must be no larger than " .
THprofile_maxpicsize . " bytes.<br />\n";
}
//check the MIME type, not the extention - tyam
@@ -479,7 +479,7 @@
"gif"
)))
{
- $imgErrString .= "Picture must be a JPG, PNG, or GIF.<br>\n";
+ $imgErrString .= "Picture must be a JPG, PNG, or GIF.<br />\n";
}
if ($filetype == "jpg")
@@ -497,7 +497,7 @@
if ($theimg == null)
{
- $imgErrString .= "Unknown error.<br>\n";
+ $imgErrString .= "Unknown error.<br />\n";
}
else
{
@@ -556,7 +556,7 @@
if ($_FILES['picture']
&& !move_uploaded_file($_FILES['picture']['tmp_name'], $picpath))
{
// Error moving the file where it was supposed to be, so don't
update the DB
- $imgErrString .= "Unknown error.<br>\n";
+ $imgErrString .= "Unknown error.<br />\n";
}
}
@@ -672,13 +672,13 @@
echo '</td></tr><tr><td>';
echo "<b>Description:</b></td><td><textarea name=\"description\"
rows=\"5\" columns=\"30\">\n";
echo replacequote($user['description']);
- echo "</textarea><br>\n";
+ echo "</textarea><br />\n";
echo '</td></tr><tr><td>';
if ($_SESSION['username'] == $username)
{
echo "<b>Password:</b></td><td><input type=\"password\"
name=\"password\">";
- echo "(Confirm <input type=\"checkbox\" name=\"changepass\"
value=\"1\">)<br>\n";
+ echo "(Confirm <input type=\"checkbox\" name=\"changepass\"
value=\"1\">)<br />\n";
}
echo '</td></tr></table>';
@@ -740,7 +740,7 @@
{
if( stripos($username, $reserved) !== false || $nameexists )
{
- $errorstring .= "Sorry, an account with this name already
exists.<br>\n";
+ $errorstring .= "Sorry, an account with this name already
exists.<br />\n";
break;
}
}
@@ -748,12 +748,12 @@
$namelength = strlen($username);
if ($namelength < 4 || $namelength > 30)
{
- $errorstring .= "Sorry, your name must be between 4 and 30
characters.<br>\n";
+ $errorstring .= "Sorry, your name must be between 4 and 30
characters.<br />\n";
}
if(!preg_match('/^([\w\.])+$/i', $username))
{
- $errorstring .= "Sorry, your name must be alphanumeric and contain
no spaces.<br>\n";
+ $errorstring .= "Sorry, your name must be alphanumeric and contain
no spaces.<br />\n";
}
if ($password)
@@ -761,12 +761,12 @@
$passlength = strlen($password);
if ($passlength < 4)
{
- $errorstring .= "Sorry, your password must be at least 4
characters.<br>\n";
+ $errorstring .= "Sorry, your password must be at least 4
characters.<br />\n";
}
}
else
{
- $errorstring .= "You must provide a password!<br>\n";
+ $errorstring .= "You must provide a password!<br />\n";
}
if (isset ($_POST['email']) && strlen($email))
@@ -775,17 +775,17 @@
/* Check if valid email address */
if( ! validateemail($email) ) // Provided in common.php
{
- $errorstring .= "You must provide a valid email address!<br>\n";
+ $errorstring .= "You must provide a valid email address!<br />\n";
}
if ($db->emailexists($email) == true)
{
- $errorstring .= "That email has already been used to register an
account!<br>\n";
+ $errorstring .= "That email has already been used to register an
account!<br />\n";
}
}
else
{
- $errorstring .= "You must provide an email address!<br>\n";
+ $errorstring .= "You must provide an email address!<br />\n";
}
if ($errorstring == "")
@@ -809,54 +809,54 @@
THprofile_userlevel, $email, $initial_status);
if ($fail == null)
{
- $errorstring .= "Database error.<br>\n";
+ $errorstring .= "Database error.<br />\n";
}
else
{
- //echo "You have registered successfully.<br>\n";
+ //echo "You have registered successfully.<br />\n";
$success = 1;
}
}
}
if ($errorstring != "")
{
- echo "The following errors were encountered:<br>\n";
+ echo "The following errors were encountered:<br />\n";
echo $errorstring;
}
if ($success=="0")
{
echo "<form action=\"profiles.php?action=register\"
method=\"POST\">\n";
- echo "<b>Username:</b><input type=\"text\" name=\"user\"
maxlength=\"30\" ><br>\n";
- echo "<b>Password:</b><input type=\"password\" name=\"password\"
maxlength=\"30\" ><br>\n";
- echo "<b>Email:</b><input type=\"text\" name=\"email\"
maxlength=\"50\" ><br>\n";
- echo "<input type=\"submit\" value=\"Register\"><br>\n";
+ echo "<b>Username:</b><input type=\"text\" name=\"user\"
maxlength=\"30\" ><br />\n";
+ echo "<b>Password:</b><input type=\"password\" name=\"password\"
maxlength=\"30\" ><br />\n";
+ echo "<b>Email:</b><input type=\"text\" name=\"email\"
maxlength=\"50\" ><br />\n";
+ echo "<input type=\"submit\" value=\"Register\"><br />\n";
echo "</form>\n";
}
else
{
- echo "You have successfully registered an account with username
<b>" . $username . "</b>.<br>\n";
+ echo "You have successfully registered an account with username
<b>" . $username . "</b>.<br />\n";
if (THprofile_regpolicy == 1)
{
- echo "However, you must be manually approved by a moderator before
logging in.<br>\n";
+ echo "However, you must be manually approved by a moderator before
logging in.<br />\n";
if (THprofile_emailwelcome)
{
- echo "You will receive notification of your approval through
email.<br>\n";
+ echo "You will receive notification of your approval through
email.<br />\n";
}
}
else
{ // THprofile_regpolicy == 2
- echo "You may log in as soon as desired.<br>\n";
+ echo "You may log in as soon as desired.<br />\n";
if (THprofile_emailwelcome)
{
sendWelcome($username, $email);
- echo "An email containing your account information has been sent
to your specified email address.<br>\n";
+ echo "An email containing your account information has been sent
to your specified email address.<br />\n";
}
}
echo "<table><form action=\"profiles.php?action=login\"
method=\"POST\">\n";
@@ -885,11 +885,11 @@
if (!isset ($_POST['user']))
{
- echo "<b>Note:</b> submitting this form will reset your
password.<br>\n";
+ echo "<b>Note:</b> submitting this form will reset your
password.<br />\n";
echo "<form action=\"profiles.php?action=forgotpass\"
method=\"POST\">\n";
echo "Username:</td><td><input type=\"text\" name=\"user\"
maxlength=\"30\" >\n";
echo "<input type=\"submit\" value=\"Submit\">\n";
- echo "</form><br><br>\n";
+ echo "</form><br /><br />\n";
}
else
{
@@ -918,11 +918,11 @@
if ($db->setuserpass($username, $pass))
{
sendnewpass($_POST['user'], $user['email'], $pass,
$_SERVER['REMOTE_ADDR']);
- echo "Your password has been reset and emailed to your specified
address.<br><br>\n";
+ echo "Your password has been reset and emailed to your specified
address.<br /><br />\n";
}
else
{
- echo "There was an error resetting your password. Please try
again later.<br><br>\n";
+ echo "There was an error resetting your password. Please try
again later.<br /><br />\n";
}
}
echo "[<a href=\"drydock.php\">Board index</a>]\n";
@@ -1057,7 +1057,7 @@
{
echo "<input type=\"checkbox\" name=\"admin\" value=\"1\"> Admin";
}
- echo "<br>\n";
+ echo "<br />\n";
if ($user['mod_global'])
{
@@ -1067,9 +1067,9 @@
{
echo "<input type=\"checkbox\" name=\"moderator\" value=\"1\"> Global
moderator";
}
- echo "<br>\n";
-
- echo "<u>Individual boards:</u><br>\n";
+ echo "<br />\n";
+
+ echo "<u>Individual boards:</u><br />\n";
$add_new_line = 0;
foreach ($boards as $board_to_mod)
{
@@ -1088,7 +1088,7 @@
if ($add_new_line == 4)
{
$add_new_line = 0;
- echo "<br>\n";
+ echo "<br />\n";
}
else
{
@@ -1099,7 +1099,7 @@
// If there are an odd number of boards, start on a new line for userlevel
if ($add_new_line != 0)
{
- echo "<br>\n";
+ echo "<br />\n";
}
echo "<u>Userlevel:</u><br />\n";
=======================================
--- /trunk/drydock/rebuilds.php Sat Jul 23 12:33:32 2011
+++ /trunk/drydock/rebuilds.php Sat Jul 23 12:53:01 2011
@@ -127,16 +127,16 @@
if((int) $configpost['THvc']==1
&& !file_exists($path."recaptchalib.php")) //Did they get the file?
{
fwrite($config, 'define("THvc",' . THvc.');' . "\n"); //NO CHANGE
ALLOWED!
- $recaptchaerror = "You need to get recaptchalib.php from <a
href='http://google.com/recaptcha/'>Google</a>!<br>"
- ."All settings were saved except anti-spam.<br><br>"
+ $recaptchaerror = "You need to get recaptchalib.php from <a
href='http://google.com/recaptcha/'>Google</a>!<br />"
+ ."All settings were saved except anti-spam.<br /><br />"
.'<a href="'.$path.'admin.php?a=g">continue</a>';
} else { //Allow the change... unless the keys aren't set!
if($configpost['reCAPTCHAPublic'] == NULL ||
$configpost['reCAPTCHAPrivate'] == NULL)
{
fwrite($config, 'define("reCAPTCHAPublic","' .
reCAPTCHAPublic . '");' . "\n");
fwrite($config, 'define("reCAPTCHAPrivate","' .
reCAPTCHAPrivate . '");' . "\n");
- $recaptchaerror = "reCAPTCHA keys must be set to use it. You can get
keys from <a href='http://google.com/recaptcha/'>Google</a>!<br>"
- ."All settings were saved except anti-spam.<br><br>"
+ $recaptchaerror = "reCAPTCHA keys must be set to use it. You can get
keys from <a href='http://google.com/recaptcha/'>Google</a>!<br />"
+ ."All settings were saved except anti-spam.<br /><br />"
.'<a href="'.$path.'admin.php?a=g">continue</a>';
} else { //Sounds good, chief.
fwrite($config, 'define("THvc",' . (int)
$configpost['THvc'] . ');' . "\n");
@@ -254,7 +254,7 @@
'<div class="idxmenutitle">' . "\n"); //this is long, is this right?
if ($showcount > 0)
{
- fwrite($sidelinks, "Board Navigation<br>\n");
+ fwrite($sidelinks, "Board Navigation<br />\n");
if (THnewsboard != 0)
{
fwrite($sidelinks, '<a href="' . THurl . 'news.php">' . "News
page</a><br />\n");
@@ -302,7 +302,7 @@
fwrite($sidelinks, '} ?>' . "\n");
fwrite($sidelinks, '<a href="' . THurl . '">Site Index</a><br />' . "\n");
fwrite($sidelinks, '<?php if($_SESSION["username"]) {' . "\n" . 'echo "<a
href=\"".THurl."profiles.php?action=logout\">Log Out</a> / <a
href=\"".THurl."profiles.php\">Profiles</a>";' . "\n" . ' } else {' . "\n");
- fwrite($sidelinks, 'echo "<a
href=\"".THurl."profiles.php?action=login\">Login</a>' . "\n" . '
/ ' . "\n" . '<a
href=".THurl."profiles.php?action=register>Register</a>";' . "\n" . '}?>' . "\n");
+ fwrite($sidelinks, 'echo "<a
href=\"".THurl."profiles.php?action=login\">Login</a>' . "\n" . '
/ ' . "\n" . '<a
href=\"".THurl."profiles.php?action=register\">Register</a>";' . "\n" . '}?>' . "\n");
fwrite($sidelinks, '</div>');
fwrite($sidelinks, '</div>' . "\n");
fclose($sidelinks);
=======================================
--- /trunk/drydock/reply.php Fri Jul 22 22:58:48 2011
+++ /trunk/drydock/reply.php Sat Jul 23 12:53:01 2011
@@ -193,12 +193,12 @@
// There was some sort of error encountered when attempting to upload a
file
// Build a string based on the errors
- $popuptext = "The following errors were encountered when attempting to
upload files:<br><ul>\n";
+ $popuptext = "The following errors were encountered when attempting to
upload files:<br /><ul>\n";
foreach( $filemessages as $filemsg)
{
$popuptext = $popuptext . "<li>" .
htmlspecialchars($filemsg) . "</li>\n";
}
- $popuptext = $popuptext . '</ul><br>Click <a href="'.$location.'">here
to proceed.';
+ $popuptext = $popuptext . '</ul><br />Click <a href="'.$location.'">here
to proceed.';
$sm->assign("text",$popuptext); // Stick into the template
=======================================
--- /trunk/drydock/thread.php Fri Jul 22 22:27:30 2011
+++ /trunk/drydock/thread.php Sat Jul 23 12:53:01 2011
@@ -208,12 +208,12 @@
// There was some sort of error encountered when attempting to upload a
file
// Build a string based on the errors
- $popuptext = "The following errors were encountered when attempting to
upload files:<br><ul>\n";
+ $popuptext = "The following errors were encountered when attempting to
upload files:<br /><ul>\n";
foreach( $filemessages as $filemsg)
{
$popuptext = $popuptext . "<li>" .
htmlspecialchars($filemsg) . "</li>\n";
}
- $popuptext = $popuptext . '</ul><br>Click <a href="'.$location.'">here
to proceed.';
+ $popuptext = $popuptext . '</ul><br />Click <a href="'.$location.'">here
to proceed.';
$sm->assign("text",$popuptext); // Stick into the template
=======================================
--- /trunk/drydock/tpl/_admin/adminban.tpl Fri Mar 18 00:43:29 2011
+++ /trunk/drydock/tpl/_admin/adminban.tpl Sat Jul 23 12:53:01 2011
@@ -23,7 +23,7 @@
Banned IP
</td>
<td>
- Private<br>Reason
+ Private<br />Reason
</td>
<td>
Duration
@@ -61,7 +61,7 @@
{/foreach}
</table>
- <br />Unban rationale: <input type="text" name="reason"><br>
+ <br />Unban rationale: <input type="text" name="reason"><br />
<input type="submit" value="Unban checked IPs" />
</div>
</form>
@@ -116,10 +116,10 @@
Banned IP
</td>
<td>
- Private<br>Reason
+ Private<br />Reason
</td>
<td>
- Admin<br>Reason
+ Admin<br />Reason
</td>
<td>
Duration
@@ -164,7 +164,7 @@
</table>
</div>
{/if}
- <br />Unban rationale: <input type="text" name="reason"><br>
+ <br />Unban rationale: <input type="text" name="reason"><br />
<input type="submit" value="Unban checked IPs" />
</div>
</form>
@@ -190,7 +190,7 @@
<br />
<form method="post" enctype="multipart/form-data" action="admin.php?t=lx">
<div>
-IP address: <input type="text" name="ip" /><br>
+IP address: <input type="text" name="ip" /><br />
<input type="submit" value="Lookup" />
</div>
</form>
=======================================
--- /trunk/drydock/tpl/_admin/adminboard.tpl Fri Mar 18 00:43:29 2011
+++ /trunk/drydock/tpl/_admin/adminboard.tpl Sat Jul 23 12:53:01 2011
@@ -72,7 +72,7 @@
<tr><td>Hide from index/linkbar</td><td><input type="checkbox"
name="hidden{$board.id}"{if $board.hidden==1} checked="checked"{/if}
/></td></tr>
<tr><td>forced_anon</td><td><input type="checkbox"
name="forced_anon{$board.id}"{if $board.forced_anon==1}
checked="checked"{/if} /></td></tr>
<tr><td>Apply wordfilters</td><td><input type="checkbox"
name="filter{$board.id}"{if $board.filter==1} checked="checked"{/if}
/></td></tr>
-<tr><td>Allow embedded videos<br>(MySpace, YouTube, Google)</td><td><input
type="checkbox" name="allowvids{$board.id}"{if $board.allowvids==1}
checked="checked"{/if} /></td></tr>
+<tr><td>Allow embedded videos<br />(MySpace, YouTube,
Google)</td><td><input type="checkbox" name="allowvids{$board.id}"{if
$board.allowvids==1} checked="checked"{/if} /></td></tr>
<tr><td>Require registration</td><td><input type="checkbox"
name="requireregistration{$board.id}"{if $board.requireregistration==1}
checked="checked"{/if} /></td></tr>
<tr><td>Board layout</td><td>
<select name="boardlayout{$board.id}">
@@ -81,7 +81,7 @@
{/foreach}
</select>
</tr></td>
-<tr><td>Use custom css<br>(Place css file named "{$board.folder}.css" in
template directory)</td><td><input type="checkbox"
name="customcss{$board.id}"{if $board.customcss==1} checked="checked"{/if}
/></td></tr>
+<tr><td>Use custom css<br />(Place css file named "{$board.folder}.css" in
template directory)</td><td><input type="checkbox"
name="customcss{$board.id}"{if $board.customcss==1} checked="checked"{/if}
/></td></tr>
<tr><td>Thread lock</td><td><input type="checkbox"
name="tlock{$board.id}"{if $board.tlock==1} checked="checked"{/if}
/></td></tr>
<tr><td>Reply lock</td><td><input type="checkbox"
name="rlock{$board.id}"{if $board.rlock==1} checked="checked"{/if}
/></td></tr>
=======================================
--- /trunk/drydock/tpl/_admin/adminedit.tpl Fri Mar 18 00:43:29 2011
+++ /trunk/drydock/tpl/_admin/adminedit.tpl Sat Jul 23 12:53:01 2011
@@ -27,22 +27,22 @@
</tr>
<tr>
- <td><b>Poster name:</b><br>
+ <td><b>Poster name:</b><br />
<input name="name"
{if $adminpowers == 0} disabled {/if}
type="text" value="{$postarray.name}"></td>
- <td><b>Poster trip:</b><br> <input name="trip"
+ <td><b>Poster trip:</b><br /> <input name="trip"
{if $adminpowers == 0} disabled {/if}
type="text" value="{$postarray.trip}"></td>
</tr>
<tr>
- <td><b>Poster link:</b><br> <input name="link"
+ <td><b>Poster link:</b><br /> <input name="link"
{if $adminpowers == 0} disabled {/if}
type="text" value="{$postarray.link}"></td>
- <td><b>Post subject (if OP):</b><br> <input name="title"
+ <td><b>Post subject (if OP):</b><br /> <input name="title"
{if $adminpowers == 0} disabled {/if}
type="text" value="{$postarray.title}"></td>
</tr>
@@ -63,8 +63,8 @@
<td>
<table><tbody>
<tr>
- <td><b>Modify thread:</b><br></td>
- <td><b>Visibility:</b><br></td>
+ <td><b>Modify thread:</b><br /></td>
+ <td><b>Visibility:</b><br /></td>
</tr>
<tr>
@@ -123,7 +123,7 @@
</td>
<td>
- <b>Delete images:</b><br>
+ <b>Delete images:</b><br />
{counter name="imgcount" assign="imgcount" start="0"} {* start a new
table row after every 5th picture *}
{foreach from=$postarray.images item=thisimage}
@@ -143,11 +143,11 @@
{counter name="imgcount"}
{if $imgcount mod 2 == 0}
- <br>
+ <br />
{/if}
{/foreach}
{if $imgcount == 0}
- No images<br>
+ No images<br />
{/if}
</td>
</tr>
@@ -155,19 +155,19 @@
<tr>
<td>
{if $adminpowers > 0}
- <b>Delete:</b><br>
+ <b>Delete:</b><br />
<select name="moddo">
<option value="nil" selected="selected">—</option>
<option value="killpost">Delete this post</option>
<option value="killip">Delete all posts from this poster's
IP</option>
<option value="killsub">Delete all posts from this poster's
subnet</option>
- </select><br>
+ </select><br />
{else}
Deletion functions are not available at your access level.
- Please use the hide functions instead.<br>
+ Please use the hide functions instead.<br />
{/if}
- <b>Ban:</b><br>
+ <b>Ban:</b><br />
<select name="modban">
<option value="nil" selected="selected">—</option>
<option value="banip">Ban this poster's IP</option>
@@ -180,7 +180,7 @@
{* Is this a thread and are we admin? *}
{if $postarray.thread == 0 && $adminpowers > 0}
- <br><b>Move thread:</b><br>
+ <br /><b>Move thread:</b><br />
<select name="movethread">
<option value="nil" selected="selected">—</option>
{foreach from=$boards item=board}
@@ -191,12 +191,12 @@
{/if}
{/foreach}
</select>
- <br><b>Warning:</b> hiding/deleting this post will hide/delete all
replies.
+ <br /><b>Warning:</b> hiding/deleting this post will hide/delete all
replies.
{/if}
</td>
<td>
- <b>Ban options:</b><br>
+ <b>Ban options:</b><br />
<table><tbody><tr>
<td>Public ban reason:</td>
<td><input type="text" name="publicbanreason" size="20" /></td></tr>
=======================================
--- /trunk/drydock/tpl/_admin/adminhouse.tpl Fri Mar 18 00:43:29 2011
+++ /trunk/drydock/tpl/_admin/adminhouse.tpl Sat Jul 23 12:53:01 2011
@@ -6,7 +6,7 @@
<div class="pgtitle">
Housekeeping Functions
</div>
- <br>
+ <br />
<div class="sslarge">
The following buttons can be used to force updates to certain script
built pages. They can be called manually if there is some error in the
build process or if changes are made outisde of the scope of the update
scripts (such as editing a post in your news board).
<div class="pgtitle">
=======================================
--- /trunk/drydock/tpl/_admin/adminlookup.tpl Fri Mar 18 00:43:29 2011
+++ /trunk/drydock/tpl/_admin/adminlookup.tpl Sat Jul 23 12:53:01 2011
@@ -12,7 +12,7 @@
<div class="sslarge">
<div class="pgtitle">Find post from image:</div>
<form action="lookups.php" method="get">
-Image URL: <input type="text" name="url"><br>
+Image URL: <input type="text" name="url"><br />
<input type="submit" name="submit">
<input type="hidden" name="action" value="imglookup">
</form>
@@ -27,7 +27,7 @@
<input type="text" name="ip" value="{$single_ip}">
{else}
<input type="text" name="ip">
-{/if}<br>
+{/if}<br />
<input type="submit" name="submit">
<input type="hidden" name="action" value="iplookup">
</form>
@@ -78,7 +78,7 @@
<i><b>Previously moderated</b></i>
{/if}
- <br>
+ <br />
{* Show stuff like name, link field, etc *}
@@ -101,7 +101,7 @@
<img src="{$THurl}static/invisible.png" alt="INVISIBLE" border="0">
{/if}
- {if $post.title != ''}<br><span
class="filetitle">{$post.title}</span>{/if}
+ {if $post.title != ''}<br /><span
class="filetitle">{$post.title}</span>{/if}
{* Show images *}
{if $post.images}
@@ -246,10 +246,10 @@
Banned IP
</td>
<td>
- Private<br>Reason
+ Private<br />Reason
</td>
<td>
- Admin<br>Reason
+ Admin<br />Reason
</td>
<td>
Duration
=======================================
--- /trunk/drydock/tpl/_admin/adminrecentpics.tpl Sat Jul 23 11:41:06 2011
+++ /trunk/drydock/tpl/_admin/adminrecentpics.tpl Sat Jul 23 12:53:01 2011
@@ -80,10 +80,10 @@
<span id="quickmod{$thisimage.reply_id}" style="display: none;"
class="modblock">
<input type="hidden" name="board" value="{$boardz}" />
<input type="hidden" name="post"
value="{$thisimage.reply_globalid}" />
- <input type="checkbox" name="doban" value="1"> Ban poster<br>
- Reason: <input type="text" name="banreason"> <br>
- Duration: <input type="text" name="duration" value="0"><br>
- <input type="checkbox" name="del" value="1"> Delete this post
(requires admin)<br>
+ <input type="checkbox" name="doban" value="1"> Ban poster<br />
+ Reason: <input type="text" name="banreason"> <br />
+ Duration: <input type="text" name="duration" value="0"><br />
+ <input type="checkbox" name="del" value="1"> Delete this post
(requires admin)<br />
<input type="submit" name="quickmod" value="quickmod">
</span>
</form>
@@ -118,10 +118,10 @@
<span id="quickmod{$thisimage.thread_id}" style="display: none;"
class="modblock">
<input type="hidden" name="board" value="{$boardz}" />
<input type="hidden" name="post"
value="{$thisimage.thread_globalid}" />
- <input type="checkbox" name="doban" value="1"> Ban poster<br>
- Reason: <input type="text" name="banreason"> <br>
- Duration: <input type="text" name="duration" value="0"><br>
- <input type="checkbox" name="del" value="1"> Delete this post
(requires admin)<br>
+ <input type="checkbox" name="doban" value="1"> Ban poster<br />
+ Reason: <input type="text" name="banreason"> <br />
+ Duration: <input type="text" name="duration" value="0"><br />
+ <input type="checkbox" name="del" value="1"> Delete this post
(requires admin)<br />
<input type="submit" name="quickmod" value="quickmod">
</span>
</form>
=======================================
--- /trunk/drydock/tpl/_admin/adminrecentposts.tpl Sat Jul 23 11:41:06 2011
+++ /trunk/drydock/tpl/_admin/adminrecentposts.tpl Sat Jul 23 12:53:01 2011
@@ -137,10 +137,10 @@
<span id="quickmod{$post.id}" style="display: none;" class="modblock">
<input type="hidden" name="board" value="{$boardz}" />
<input type="hidden" name="post" value="{$post.globalid}" />
- <input type="checkbox" name="doban" value="1"> Ban poster<br>
- Reason: <input type="text" name="banreason"> <br>
- Duration: <input type="text" name="duration" value="0"><br>
- <input type="checkbox" name="del" value="1"> Delete this post
(requires admin)<br>
+ <input type="checkbox" name="doban" value="1"> Ban poster<br />
+ Reason: <input type="text" name="banreason"> <br />
+ Duration: <input type="text" name="duration" value="0"><br />
+ <input type="checkbox" name="del" value="1"> Delete this post
(requires admin)<br />
<input type="submit" name="quickmod" value="quickmod">
</span>
</form>
@@ -180,7 +180,7 @@
<img src="{$THurl}static/invisible.png" alt="INVISIBLE" border="0">
{/if}
- {if $post.title != ''}<br><span
class="filetitle">{$post.title}</span>{/if}
+ {if $post.title != ''}<br /><span
class="filetitle">{$post.title}</span>{/if}
</div> {* end of name, link field, etc *}
=======================================
--- /trunk/drydock/tpl/_admin/adminreports.tpl Sat Jul 23 11:41:06 2011
+++ /trunk/drydock/tpl/_admin/adminreports.tpl Sat Jul 23 12:53:01 2011
@@ -76,10 +76,10 @@
<span id="quickmod{$report.post.id}" class="modblock">
<input type="hidden" name="board" value="{$boardz}" />
<input type="hidden" name="post" value="{$report.post.globalid}" />
- <input type="checkbox" name="doban" value="1"> Ban poster<br>
- Reason: <input type="text" name="banreason"> <br>
- Duration: <input type="text" name="duration" value="0"><br>
- <input type="checkbox" name="del" value="1"> Delete this post
(requires admin)<br>
+ <input type="checkbox" name="doban" value="1"> Ban poster<br />
+ Reason: <input type="text" name="banreason"> <br />
+ Duration: <input type="text" name="duration" value="0"><br />
+ <input type="checkbox" name="del" value="1"> Delete this post
(requires admin)<br />
<input type="submit" name="quickmod" value="quickmod">
</span>
</form>
@@ -130,7 +130,7 @@
<img src="{$THurl}static/invisible.png" alt="INVISIBLE" border="0">
{/if}
- {if $report.post.title != ''}<br><span
class="filetitle">{$report.post.title}</span>{/if}
+ {if $report.post.title != ''}<br /><span
class="filetitle">{$report.post.title}</span>{/if}
</div> {* end of name, link field, etc *}
=======================================
--- /trunk/drydock/tpl/_admin/adminstatic.tpl Fri Mar 18 00:43:29 2011
+++ /trunk/drydock/tpl/_admin/adminstatic.tpl Sat Jul 23 12:53:01 2011
@@ -133,7 +133,7 @@
</td>
</tr>
</table>
- Content:<br>
+ Content:<br />
<textarea name="content" cols="48" rows="6"
>{$single_page.content|escape:"html":"UTF-8"}</textarea>
<input type="hidden" value="{$single_page.id}" name="id">
<input type="submit" value="Edit" />
=======================================
--- /trunk/drydock/tpl/drydock-anonbbs/popup.tpl Sat Jul 23 11:29:07 2011
+++ /trunk/drydock/tpl/drydock-anonbbs/popup.tpl Sat Jul 23 12:53:01 2011
@@ -40,9 +40,9 @@
{if $timeout > 0}
{if $redirectURL != ""} {* Possibly redirect *}
- <br>This window will redirect in {$timeout} seconds. Click <a
href="{$redirectURL}">here</a> to immediately go to your destination.
+ <br />This window will redirect in {$timeout} seconds. Click <a
href="{$redirectURL}">here</a> to immediately go to your destination.
{else}
- <br>This window will close in {$timeout} seconds.
+ <br />This window will close in {$timeout} seconds.
{/if}
{/if}
=======================================
--- /trunk/drydock/tpl/drydock-anonbbs/postblock.tpl Sat Jul 23 12:38:38
2011
+++ /trunk/drydock/tpl/drydock-anonbbs/postblock.tpl Sat Jul 23 12:53:01
2011
@@ -47,7 +47,7 @@
Password: <input type="password" name="password" size="8" /> {* New
password field for deletion *}
- <input type="submit" value="Post" /><br>
+ <input type="submit" value="Post" /><br />
<input type="hidden" name="board" value="{$binfo.folder}" />
{if $comingfrom == "thread"}<input type="hidden" name="thread"
value="{$thread.id}" />{/if}
</div>
=======================================
--- /trunk/drydock/tpl/drydock-anonbbs/rules.tpl Sat Mar 1 02:37:28 2008
+++ /trunk/drydock/tpl/drydock-anonbbs/rules.tpl Sat Jul 23 12:53:01 2011
@@ -16,5 +16,5 @@
{if $binfo.allowedformats & 16}SWF {/if}
{if $binfo.allowedformats & 32}PDF {/if}
{else}Image posting is currently disabled.{/if} {* can you even post
images? *}
-{if $binfo.allowvids}<br>Video tags are enabled for this board. {/if}
-
+{if $binfo.allowvids}<br />Video tags are enabled for this board. {/if}
+
=======================================
--- /trunk/drydock/tpl/drydock-image/board.tpl Sat Jul 23 12:02:24 2011
+++ /trunk/drydock/tpl/drydock-image/board.tpl Sat Jul 23 12:53:01 2011
@@ -38,7 +38,7 @@
{* End of form for post deletion/reporting/whatever else *}
<div style="text-align:right">
-Password: <input type="password" name="password" value=""><br>
+Password: <input type="password" name="password" value=""><br />
<input type="submit" name="report" value="Report"><input type="submit"
name="delete" value="Delete">
</div>
</form>
=======================================
--- /trunk/drydock/tpl/drydock-image/popup.tpl Sat Jul 23 11:29:07 2011
+++ /trunk/drydock/tpl/drydock-image/popup.tpl Sat Jul 23 12:53:01 2011
@@ -40,9 +40,9 @@
{if $timeout > 0}
{if $redirectURL != ""} {* Possibly redirect *}
- <br>This window will redirect in {$timeout} seconds. Click <a
href="{$redirectURL}">here</a> to immediately go to your destination.
+ <br />This window will redirect in {$timeout} seconds. Click <a
href="{$redirectURL}">here</a> to immediately go to your destination.
{else}
- <br>This window will close in {$timeout} seconds.
+ <br />This window will close in {$timeout} seconds.
{/if}
{/if}
=======================================
--- /trunk/drydock/tpl/drydock-image/postblock.tpl Sat Jul 23 12:38:38 2011
+++ /trunk/drydock/tpl/drydock-image/postblock.tpl Sat Jul 23 12:53:01 2011
@@ -87,7 +87,7 @@
<td class="postblock">Blotter</td>
<td><div class="rules">
{foreach from=$blotter item=blot}
-<span class="timedate">{$blot.time|date_format:$THdatetimestring}</span> -
{$blot.entry}<br>
+<span class="timedate">{$blot.time|date_format:$THdatetimestring}</span> -
{$blot.entry}<br />
{/foreach}
</div></td>
</tr>
=======================================
--- /trunk/drydock/tpl/drydock-image/rules.tpl Sat Mar 1 02:37:28 2008
+++ /trunk/drydock/tpl/drydock-image/rules.tpl Sat Jul 23 12:53:01 2011
@@ -16,5 +16,5 @@
{if $binfo.allowedformats & 16}SWF {/if}
{if $binfo.allowedformats & 32}PDF {/if}
{else}Image posting is currently disabled.{/if} {* can you even post
images? *}
-{if $binfo.allowvids}<br>Video tags are enabled for this board. {/if}
-
+{if $binfo.allowvids}<br />Video tags are enabled for this board. {/if}
+
=======================================
--- /trunk/drydock/tpl/drydock-image/thread.tpl Sat Jul 23 12:02:24 2011
+++ /trunk/drydock/tpl/drydock-image/thread.tpl Sat Jul 23 12:53:01 2011
@@ -37,7 +37,7 @@
{* End of form for post deletion/reporting/whatever else *}
<div style="text-align:right">
-Password: <input type="password" name="password" value=""><br>
+Password: <input type="password" name="password" value=""><br />
<input type="submit" name="report" value="Report"><input type="submit"
name="delete" value="Delete">
</div>
</form>
=======================================
--- /trunk/drydock/tpl/drydock-traditional/popup.tpl Sat Jul 23 11:29:07
2011
+++ /trunk/drydock/tpl/drydock-traditional/popup.tpl Sat Jul 23 12:53:01
2011
@@ -40,9 +40,9 @@
{if $timeout > 0}
{if $redirectURL != ""} {* Possibly redirect *}
- <br>This window will redirect in {$timeout} seconds. Click <a
href="{$redirectURL}">here</a> to immediately go to your destination.
+ <br />This window will redirect in {$timeout} seconds. Click <a
href="{$redirectURL}">here</a> to immediately go to your destination.
{else}
- <br>This window will close in {$timeout} seconds.
+ <br />This window will close in {$timeout} seconds.
{/if}
{/if}
=======================================
--- /trunk/drydock/tpl/drydock-traditional/postblock.tpl Sat Jul 23
12:38:38 2011
+++ /trunk/drydock/tpl/drydock-traditional/postblock.tpl Sat Jul 23
12:53:01 2011
@@ -89,7 +89,7 @@
<td class="postblock">Blotter</td>
<td><div class="rules">
{foreach from=$blotter item=blot}
-<span class="timedate">{$blot.time|date_format:$THdatetimestring}</span> -
{$blot.entry}<br>
+<span class="timedate">{$blot.time|date_format:$THdatetimestring}</span> -
{$blot.entry}<br />
{/foreach}
</div></td>
</tr>
=======================================
--- /trunk/drydock/tpl/drydock-traditional/rules.tpl Sat Mar 1 02:37:28
2008
+++ /trunk/drydock/tpl/drydock-traditional/rules.tpl Sat Jul 23 12:53:01
2011
@@ -16,5 +16,5 @@
{if $binfo.allowedformats & 16}SWF {/if}
{if $binfo.allowedformats & 32}PDF {/if}
{else}Image posting is currently disabled.{/if} {* can you even post
images? *}
-{if $binfo.allowvids}<br>Video tags are enabled for this board. {/if}
-
+{if $binfo.allowvids}<br />Video tags are enabled for this board. {/if}
+
=======================================
--- /trunk/drydock/tpl/drydock-traditional/thread.tpl Fri Mar 18 00:43:29
2011
+++ /trunk/drydock/tpl/drydock-traditional/thread.tpl Sat Jul 23 12:53:01
2011
@@ -38,7 +38,7 @@
{* End of form for post deletion/reporting/whatever else *}
<div style="text-align:right">
-Password: <input type="password" name="password" value=""><br>
+Password: <input type="password" name="password" value=""><br />
<input type="submit" name="report" value="Report"><input type="submit"
name="delete" value="Delete">
</div>
</form>
=======================================
--- /trunk/drydock/upgrade_install.php Sat Jul 23 11:29:07 2011
+++ /trunk/drydock/upgrade_install.php Sat Jul 23 12:53:01 2011
@@ -300,7 +300,7 @@
if($result === null)
{
- printf("Insert Error for %d.%d.%d.%s: #%d: %s<br>\n",
+ printf("Insert Error for %d.%d.%d.%s: #%d: %s<br />\n",
$insert['ip_octet1'],
$insert['ip_octet2'],
$insert['ip_octet3'],
@@ -357,7 +357,7 @@
{
// Change the pane corresponding with this message.
document.getElementById("action_"+type).style.display = "block"; //
unhide
- document.getElementById("action_"+type).innerHTML = "Server
response:<br>"+this.responseText;
+ document.getElementById("action_"+type).innerHTML = "Server
response:<br />"+this.responseText;
// Change the link for this request either to be hidden or back to a
valid link
if( this.responseText == "Success!"
@@ -387,7 +387,7 @@
<div class="pgtitle">
drydock Upgrade Script
</div>
- <br>
+ <br />
This script will attempt to perform the necessary database changes. Make
sure that THdbprefix is defined
in your current config.php script before executing this script. Probably
this will work:
<pre>define("THdbprefix","drydock_");</pre>