[drydock] r249 committed - reworked which template sections close/open which divs, started workin...
dry...@googlecode.com
Author: all.star25
Date: Sat Jul 23 20:54:24 2011
Log: reworked which template sections close/open which divs, started
working on making profiles templated (so far login and viewprofile are done)
http://code.google.com/p/drydock/source/detail?r=249
Added:
/trunk/drydock/tpl/profiles
/trunk/drydock/tpl/profiles/bottombar.tpl
/trunk/drydock/tpl/profiles/default.css
/trunk/drydock/tpl/profiles/head.tpl
/trunk/drydock/tpl/profiles/login.tpl
/trunk/drydock/tpl/profiles/viewprofile.tpl
Modified:
/trunk/drydock/news.php
/trunk/drydock/profiles.php
/trunk/drydock/rebuilds.php
/trunk/drydock/tpl/drydock-anonbbs/viewblock.tpl
/trunk/drydock/tpl/drydock-image/bottombar.tpl
/trunk/drydock/tpl/drydock-image/postblock.tpl
/trunk/drydock/tpl/drydock-image/recaptcha.tpl
/trunk/drydock/tpl/drydock-traditional/bottombar.tpl
/trunk/drydock/tpl/drydock-traditional/recaptcha.tpl
=======================================
--- /dev/null
+++ /trunk/drydock/tpl/profiles/bottombar.tpl Sat Jul 23 20:54:24 2011
@@ -0,0 +1,8 @@
+</div> {* end of "box" div *}
+{include_php file="menu.php"}
+</div> {* end of "main" div *}
+<div style="text-align: center;">- <a
href="http://wakaba.c3.cx/soc/kareha.pl/1121005876/"
target="blank">Thorn</a> +
+<a href="http://wakaba.c3.cx/s/web/wakaba_kareha.html"
target="_blank">Wakaba</a> +
+<a href="http://code.google.com/p/drydock/" target="_blank">drydock</a>
-</div>
+</body>
+</html>
=======================================
--- /dev/null
+++ /trunk/drydock/tpl/profiles/default.css Sat Jul 23 20:54:24 2011
@@ -0,0 +1,86 @@
+html, body { background-color:#FFFFFF; color: #333333; FONT-SIZE: 14px;
FONT-FAMILY: MS Sans Serif; }
+a { color: #0088A0; }
+a:hover { color: #0066FF; text-decoration: none; }
+a:link {text-decoration: none}
+a:visited {text-decoration: none}
+a:active {text-decoration: none}
+
+a.info{ position:relative; /*this is the key*/ z-index:24; color:#FF6600;
text-decoration:none }
+a.info:hover{ z-index:25; background-color:#EEEEEE }
+a.info span{ display: none }
+/*the span will display just on :hover state*/
+a.info:hover span{ display:block; position:absolute; top:2em; left:2em;
width:15em; border:1px solid #FF6600; background-color:#EEEEEE;
color:#333333; text-align: center }
+
+blockquote { margin: .5em .5em .5em 1em; float:none; clear:both; }
+blockquote p { margin: 0; padding: 0; }
+
+table.border{ border-style: groove; border-width: 1px; }
+table { border-style: none; FONT-SIZE: 14px; FONT-FAMILY: MS Sans Serif; }
+table td { border-style: none; }
+ .logo { clear:both; text-align:left; font-size:2em; font-weight: bold;
color:#FF6600; }
+ .theader { background:#DDDDDD; text-align:center; padding:2px;
color:#2266AA; clear: both; font-weight: bold; margin-bottom: .5em; border:
solid 1px #CCCCCC; -moz-border-radius: 5px; }
+ .postarea { text-align: center; }
+ .rules { font-size:0.7em; }
+ .postblock { background:transparent; color:#002244; font-weight:bold; }
+ .reflink { font-size: .8em; font-weight: bold; }
+ .filesize { text-decoration:none; color: #666666; font-size: .8em; }
+.filetitle { background:inherit; font-size:1.2em; color:#002244;
font-weight:bold; }
+ .postername { color:#004A99; font-weight:bold; }
+ .postertrip { color:#FF3300; }
+ .omittedposts { color:#666666; }
+.reply { background:#DDDDDD; border: solid 1px #CCCCCC; padding: 0;
margin: 0; -moz-border-radius: 5px; }
+.reply blockquote { margin: .5em; }
+.doubledash { display: none; vertical-align:top; clear:both; float:left; }
+.replytitle { font-size: 1.2em; color:#002244; font-weight:bold; }
+hr { border-style: solid none none none; border-width: 1px; border-color:
#0088A0; }
+.cells { font-size: 13px; color: #FFFFFF; background-color: #000000;
border-color: #FFFFFF; }
+.b { FONT-WEIGHT: bold; }
+.c { TEXT-ALIGN: center; }
+.r { TEXT-ALIGN: right; }
+/*Thorn's addition*/
+#modblock { display:none; }
+.imgbox { white-space:nowrap; overflow:hidden; text-align:left;
float:left; margin-left:1px; margin-top:1px; padding:3px; width:150px; }
+/*from heady.tpl - why was it there?*/
+body { margin: 0; padding: 8px; margin-bottom: auto; }
+blockquote blockquote { margin-left: 0em }
+form { margin-bottom: 0px }
+.postarea { text-align: center }
+.postarea table { margin: 0px auto; text-align: left }
+.thumb { border: none; float: center; margin: 2px 2px }
+.nothumb { float: left; background: #eee; border: 2px dashed #aaa;
text-align: center; margin: 2px 20px; padding: 1em 0.5em;}
+.reply blockquote, blockquote :last-child { margin-bottom: 0em }
+.reflink a { color: inherit; text-decoration: none }
+.reply .filesize { margin-left: 20px }
+.userdelete { float: right; text-align: center; white-space: nowrap }
+.replypage .replylink { display: none }
+#idxmenu { overflow:hidden; white-space:nowrap; color:#333333;
font-family: MS Sans Serif; font-size:large; position:fixed; float:right;
text-align:center; background-color:#EFEFEF; border-style:solid;
border-color:#0066FF; border-width:1px; right:8px; top:8px; width:150px; }
+#idxmenu A { color:#0066FF; text-decoration:none; margin:1px; }
+#idxmenuitem { font-family:"Gill Sans",Helvetica,sans-serif;
font-size:small; text-align:left; overflow:hidden; }
+#idxmenuitem A:hover { text-decoration:underline; }
+#idxmenuitem .idxmenutitle { color:#2266AA; text-align:center; }
+#idxmenuitem .idxmenupg { text-align:center; font-size:x-small; }
+#idxmenuitem .idxmenutitle A { color:#0066FF; }
+ .pgtitle { text-decoration:none; color:#2266AA; font-family:sans-serif;
font-size:x-large; border-width:0px 0px 2px 0px; border-color:#FF6600;
border-style:solid; margin-right:10px; margin-top:5px; }
+.medtitle { font-size:large; margin-left:14px; margin-top:5px; }
+#main { margin-right:154px; }
+.box { padding-left:10px; margin-bottom:10px; border-style:none;
border-color:black; border-width:1px; }
+.bline { font-family:sans-serif; font-size:xx-small; text-align:center; }
+.bottomAdTitle { font-family: arial,helvetica, sans-serif; background:
#EEEEEE; color: #333333; }
+.plus { color: #0066FF; cursor: hand; cursor: pointer }
+.ban { color:red; font-weight: bold; }
+.centered
+{
+ width: 100%;
+ text-align: center;
+}
+.lefthalf
+{
+ width: 50%;
+ text-align: left;
+}
+
+.righthalf
+{
+ width: 50%;
+ text-align: right;
+}
=======================================
--- /dev/null
+++ /trunk/drydock/tpl/profiles/head.tpl Sat Jul 23 20:54:24 2011
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<script type="text/javascript"
src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
+<link rel="stylesheet" type="text/css" href="{$THtplurl}default.css"
title="Stylesheet" />
=======================================
--- /dev/null
+++ /trunk/drydock/tpl/profiles/login.tpl Sat Jul 23 20:54:24 2011
@@ -0,0 +1,37 @@
+{*{include file=head.tpl} Commented out until everything in profiles gets
switched over *}
+<title>{$THname} — Login</title>
+</head>
+<body>
+ <div id="main">
+ <div class="box">
+ {if $loginerror}
+ <div class="pgtitle">Login error</div>
+ <strong>There was an error processing your
request.</strong><br />
+ <u>Possible causes:</u>
+ <ul>
+ <li>Invalid username</li>
+ <li>Invalid password</li>
+ <li>Your account has not been approved</li>
+ <li>Your account has been disabled</li>
+ </ul>
+ {/if}
+
+ {if $loggedin}
+ <div class="pgtitle">Logged in as {$username}</div>
+ <div>You are logged in as <strong>{$username}</strong>.<br
/><br />
+ [<a href="profiles.php?action=logout">Logout if this
is not you</a>]</div>
+ {else}
+ <div class="pgtitle">Login</div><br />
+ <table><form action="profiles.php?action=login"
method="post">
+ <tr><td>Username:</td><td><input type="text"
name="name" maxlength="30" ></td></tr>
+ <tr><td>Password:</td><td><input type="password"
name="password" maxlength="30" ></td></tr>
+ <tr><td><input type="checkbox" name="remember"
><font size="2">Remember me</td><td style="text-align: right;">
+ {if $showreset}
+ <a
href="{$THurl}profiles.php?action=forgotpass"><font size="2">Forgot
password?</a>
+ {else}
+
+ {/if}</td></tr>
+ <tr><td><input type="submit"
value="Login"></td></tr>
+ </form></table>
+ {/if}
+ {include file=bottombar.tpl}
=======================================
--- /dev/null
+++ /trunk/drydock/tpl/profiles/viewprofile.tpl Sat Jul 23 20:54:24 2011
@@ -0,0 +1,83 @@
+{*{include file=head.tpl} Commented out until everything in profiles gets
switched over *}
+<title>{$THname} — Viewing profile of {$user.username}</title>
+</head>
+<body>
+ <div id="main">
+ <div class="box">
+
+ <div class="pgtitle">User profile: {$user.username}</div><div>
+
+ {if $caneditprofile}
+ <a
href="profiles.php?action=edit&user={$user.username}">
+ <img src="{$THurl}static/edit.png" alt="Edit
profile" border="0" />Edit profile</a>
+ {/if}
+
+ {if $isadmin}
+ <a
href="profiles.php?action=permissions&user={$user.username}">
+ <img src="{$THurl}static/shield.png" alt="Edit
permissions" border="0" />Edit permissions</a>
+ <a
href="profiles.php?action=remove&user={$user.username}">
+ <img src="{$THurl}static/disable.png" alt="Disable
user" border="0" />Disable user</a>
+ {/if}
+ <br />
+
+ {if $user.has_picture}
+ <img
src="{$THurl}images/profiles/{$user.username}.{$user.has_picture}"
+ align="left" alt="User profile picture" />
+ {else}
+ <img src="{$THurl}static/nopicture.png" align="left"
alt="No picture provided" />
+ {/if}
+ <br />
+
+ {if $capcode}
+ <strong>Posts as:</strong> {$capcode}<br />
+ {/if}
+
+ <strong>Gender:</strong>
+ {if $user.gender == "M" || $user.gender == "F"}
+ {$user.gender}
+ {else}
+ Unspecified
+ {/if}
+ <br />
+
+ <strong>Age:</strong>
+ {if $user.age}
+ {$user.age}
+ {else}
+ Unspecified
+ {/if}
+ <br />
+
+ <strong>Location:</strong>
+ {if $user.location}
+ {$user.location}
+ {else}
+ Unspecified
+ {/if}
+ <br />
+
+ {if $user.mod_admin}
+ <strong>Position:</strong> Administrator<br />
+ {elseif $user.mod_global || $user.mod_array}
+ <strong>Position:</strong> Moderator<br />
+ {/if}
+
+ <strong>Contact information:</strong>
+ {if $user.contact}
+ {$user.contact}
+ {else}
+ Unspecified
+ {/if}
+ <br />
+
+ <strong>Description:</strong>
+ {if $user.description}
+ {$user.description}
+ {else}
+ None
+ {/if}
+ <br />
+
+ <a href="{$THurl}profiles.php?action=memberlist">Return to
member list</a>
+ </div>
+{include file=bottombar.tpl}
=======================================
--- /trunk/drydock/news.php Sat Jul 23 13:17:13 2011
+++ /trunk/drydock/news.php Sat Jul 23 20:54:24 2011
@@ -63,7 +63,7 @@
</div>
</div>
<?php include("menu.php"); ?>
-</div></div>
+
<?php if($archivelink) {
echo '<div style="text-align: center;"
style="font-family:verdana,century;font-size:10px;padding-bottom:
10px;">- '.$archivelink." -</div>\n";
}
=======================================
--- /trunk/drydock/profiles.php Sat Jul 23 13:17:13 2011
+++ /trunk/drydock/profiles.php Sat Jul 23 20:54:24 2011
@@ -1,1211 +1,879 @@
<?php
-
-
/*
- drydock imageboard script (http://code.573chan.org/)
- File: profiles.php
- Description: Profile management script. IT DOES IT ALL
-
- Unless otherwise stated, this code is copyright 2008
- by the drydock developers and is released under the
- Artistic License 2.0:
- http://www.opensource.org/licenses/artistic-license-2.0.php
-*/
+ drydock imageboard script (http://code.573chan.org/)
+ File: profiles.php
+ Description: Profile management script. IT DOES IT ALL
+
+ Unless otherwise stated, this code is copyright 2008
+ by the drydock developers and is released under the
+ Artistic License 2.0:
+ http://www.opensource.org/licenses/artistic-license-2.0.php
+ */
require_once ("config.php");
require_once ("common.php");
session_start();
-if (isset($_POST['remember']))
-{
- setcookie(THcookieid . "-uname", $_SESSION['username'], time() +
THprofile_cookietime, THprofile_cookiepath);
- setcookie(THcookieid . "-id", $_SESSION['userid'], time() +
THprofile_cookietime, THprofile_cookiepath);
-
-}
-
+if (isset($_POST['remember'])) {
+ setcookie(THcookieid . "-uname", $_SESSION['username'], time() +
THprofile_cookietime, THprofile_cookiepath);
+ setcookie(THcookieid . "-id", $_SESSION['userid'], time() +
THprofile_cookietime, THprofile_cookiepath);
+}
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<script type="text/javascript"
src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
-<link rel="stylesheet" type="text/css" href="<?php echo
THurl.'tpl/'.THtplset;?>/futaba.css" title="Stylesheet" />
-
-<?php
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"
/>
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <script type="text/javascript"
src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
+ <link rel="stylesheet" type="text/css" href="<?php echo
THurl . 'tpl/' . THtplset; ?>/futaba.css" title="Stylesheet" />
+
+ <?php
+ $db = new ThornProfileDBI();
-$db = new ThornProfileDBI();
-if(isset($_GET['action']))
-{
-if ($_GET['action'] == "login")
-{
- // Three POST parameters:
- // $_POST['name'], $_POST['password'], $_POST['remember']
- echo "<title>" . THname . "— Login</title>\n";
- echo "</head><body>\n";
- echo '<div id="main"><div class="box">';
-
- if (isset ($_POST['name']) && isset ($_POST['password']))
- {
- $userdata = $db->getuserdata_login($_POST['name'], $_POST['password']);
-
- if ($userdata != NULL)
- {
- $_SESSION['username'] = $userdata['username'];
- $_SESSION['userid'] = generateRandID();
- $_SESSION['userlevel'] = $userdata['userlevel'];
- $_SESSION['admin'] = $userdata['mod_admin'];
- $_SESSION['mod_array'] = $userdata['mod_array'];
- $_SESSION['mod_global'] = $userdata['mod_global'];
- if ($userdata['mod_global'] || $userdata['mod_array'])
- {
- $_SESSION['moderator'] = true;
- }
-
- // Update userid field
- $db->updateuser($_POST['name'], $_SESSION['userid']);
- }
- 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 "Your account has been disabled\n";
- }
- }
-
- if (!isset ($_SESSION['username']))
- {
- echo "<div class=\"pgtitle\">Login</div><br />\n";
- echo "<table><form action=\"profiles.php?action=login\"
method=\"POST\">\n";
- echo "<tr><td>Username:</td><td><input type=\"text\" name=\"name\"
maxlength=\"30\" ></td></tr>\n";
- echo "<tr><td>Password:</td><td><input type=\"password\"
name=\"password\" maxlength=\"30\" ></td></tr>\n";
- echo "<tr><td><input type=\"checkbox\" name=\"remember\" ><font
size=\"2\">Remember me</td>\n";
- //This checks to see if end user has even bothered to change the default
email. No use giving a link to something that won't work. ~tyamzzz
- if (THprofile_emailaddr != "THIS IS NOT AN EMAIL")
- {
- echo "<td style=\"text-alignt: right;\"><a href=\"" .
THurl . "profiles.php?action=forgotpass\"><font size=\"2\">Forgot
password?</a></td></tr>\n";
- }
- echo "<tr><td><input type=\"submit\" value=\"Login\"></td></tr>\n";
- echo "</form></table>\n";
- }
- 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 "[<a href=\"profiles.php?action=logout\">Logout if this is not
you</a>]\n";
- echo "</td></tr></table>\n";
- }
-}
-else
- if ($_GET['action'] == "logout")
- {
- echo "<title>" . THname . "— Logout</title>\n";
- echo "</head><body>\n";
- echo '<div id="main"><div class="box">';
-
- if (isset ($_SESSION['username']))
- {
- if (isset ($_COOKIE[THcookieid . '-uname']) && isset
($_COOKIE[THcookieid . '-id']))
- {
- setcookie(THcookieid . "-uname", "", time() - THprofile_cookietime,
THprofile_cookiepath);
- setcookie(THcookieid . "-id", "", time() - THprofile_cookietime,
THprofile_cookiepath);
- }
-
- /* Unset PHP session variables */
- unset ($_SESSION['username']);
- unset ($_SESSION['userid']);
- unset ($_SESSION['userlevel']);
- unset ($_SESSION['admin']);
- unset ($_SESSION['moderator']);
- unset ($_SESSION['mod_array']);
- echo '<div class="pgtitle">Logged out</div><br />';
- 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 "[<a href=\"drydock.php\">Board index</a>]\n";
- }
- else
- if ($_GET['action'] == "memberlist")
- {
- echo "<title>" . THname . "— Members</title>\n";
- echo "</head><body>\n";
- echo '<div id="main"><div class="box">';
- $can_access = 0;
-
- if (THprofile_viewuserpolicy == 2)
- {
- $can_access = 1;
- }
- elseif (THprofile_viewuserpolicy == 1 && isset ($_SESSION['username']))
- {
- $can_access = 1;
- }
- elseif (THprofile_viewuserpolicy == 0 && ($_SESSION['admin'] ||
$_SESSION['moderator']))
- {
- $can_access = 1;
- }
-
- if ($can_access)
- {
- echo "<div class=\"pgtitle\">Members</div><br />\n";
-
- $users = $db->getuserlist();
-
- foreach ($users as $user_entry)
- {
- if ($user_entry['username'] != "initialadmin")
- {
- echo "<a href=\"profiles.php?action=viewprofile&user=" .
$user_entry['username'] . "\">" .
- $user_entry['username'] . "</a><br />\n";
- }
- }
- }
- 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 "[<a href=\"drydock.php\">Board index</a>]\n";
- }
- }
- else
- if ($_GET['action'] == "viewprofile")
- {
- if (!isset ($_GET['user']))
- {
- die("You must specify a user!");
- }
-
- if (THprofile_lcnames)
- {
- $username = strtolower($_GET['user']);
- }
- else
- {
- $username = $_GET['user'];
- }
-
- $user = $db->getuserdata($username);
-
- if (!$user)
- {
- die("Invalid user specified!");
- }
-
- echo "<title>" . THname . "— Viewing profile of " .
$user['username'] . "</title>\n";
- echo "</head><body>\n";
- echo '<div id="main"><div class="box">';
- $can_access = 0;
-
- if (THprofile_viewuserpolicy == 2)
- {
- $can_access = 1;
- }
- elseif (THprofile_viewuserpolicy == 1 && isset ($_SESSION['username']))
- {
- $can_access = 1;
- }
- elseif (THprofile_viewuserpolicy == 0 && ($_SESSION['admin'] ||
$_SESSION['moderator']))
- {
- $can_access = 1;
- }
-
- if ($can_access)
- {
- echo "<div class=\"pgtitle\">User profile:" .
$user['username'] . "</div><br />\n";
-
- if ($db->caneditprofile($user['username']) == true)
- {
- echo "<a href=\"profiles.php?action=edit&user=" .
$user['username'] . "\"><img src=\"" .
- THurl . "static/edit.png\" alt=\"Edit profile\" border=\"0\">Edit
profile</a>";
-
- if ($_SESSION['admin'])
- {
- echo " <a href=\"profiles.php?action=permissions&user=" .
$user['username'] . "\"><img src=\"" .
- THurl . "static/shield.png\" alt=\"Edit permissions\"
border=\"0\">Edit permissions</a>";
- echo " <a href=\"profiles.php?action=remove&user=" .
$user['username'] . "\"><img src=\"" .
- THurl . "static/disable.png\" alt=\"Disable user\"
border=\"0\">Disable user</a>";
- }
-
- echo "<br />\n";
- }
-
- if ($user['has_picture'])
- {
- echo "<img src=\"" . THurl . "images/profiles/" .
$user['username'] . "." .
- $user['has_picture'] . "\" align=\"left\" /><br />\n";
- }
- else
- {
- echo "<img src=\"" . THurl . "static/nopicture.png\" align=\"left\"
/>\n";
- }
-
- if ($user['capcode'])
- {
- $capcode = $db->getusercapcode($user['capcode']);
- if ($capcode)
- {
- echo "<b>Posts as:</b> " . $capcode . "<br />\n";
- }
- }
-
- if ($user['gender'] == "M" || $user['gender'] == "F")
- {
- echo "<b>Gender:</b> " . $user['gender'] . "<br />\n";
- }
- else
- {
- echo "<b>Gender:</b> Unspecified<br />\n";
- }
-
- if ($user['age'])
- {
- echo "<b>Age:</b> " . $user['age'] . "<br />\n";
- }
- else
- {
- echo "<b>Age:</b> Unspecified<br />\n";
- }
-
- if ($user['location'])
- {
- echo "<b>Location:</b> " . $user['location'] . "<br />\n";
- }
- else
- {
- echo "<b>Location:</b> Unspecified<br />\n";
- }
-
- if ($user['mod_admin'])
- {
- echo "<b>Position:</b> Administrator<br />\n";
- }
- elseif ($user['mod_global'] || $user['mod_array'])
- {
- echo "<b>Position:</b> Moderator<br />\n";
- }
-
- if ($user['contact'])
- {
- echo "<b>Contact information:</b> " . $user['contact'] . "<br />\n";
- }
- else
- {
- echo "<b>Contact information:</b> Unspecified<br />\n";
- }
-
- if ($user['description'])
- {
- echo "<b>Description:</b> " . $user['description'] . "<br />\n";
- }
- else
- {
- echo "<b>Description:</b> None<br />\n";
- }
-
- echo "<a href=\"" . THurl . "profiles.php?action=memberlist\">Return
to member list</a>";
- //echo "</div></div>\n";
- }
- 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 "[<a href=\"drydock.php\">Board index</a>]\n";
- echo "</td></tr></table>\n";
- }
- }
- else
- if ($_GET['action'] == "edit")
- {
-
- $imgErrString = ""; // This only gets set if there is a problem
- $passErrString = ""; // This only gets set if there is a problem with
the password
-
- if (!isset ($_GET['user']))
- {
- die("You must specify a user!");
- }
-
- if (THprofile_lcnames)
- {
- $username = strtolower($_GET['user']);
- }
- else
- {
- $username = $_GET['user'];
- }
-
- if (!$db->userexists($username))
- {
- die("Invalid user specified!");
- }
-
- if (!$db->caneditprofile($username))
- {
- die("You cannot edit this user's profile!");
- }
-
- if (isset ($_POST['edit_update']))
- {
- $user = $db->getuserdata($username);
-
- if (isset ($_POST['capcode']) && $user['capcode'] != "")
- {
- $capcode = $db->getusercapcode($user['capcode']);
-
- // Don't bother with the approval process if it's identical to the
capcode
- // that's already been approved
- if ($capcode != $_POST['capcode'])
- {
- $db->proposeusercapcode($username, $capcode);
- }
- }
-
- if (isset ($_POST['age']))
- {
- $age = htmlentities(substr(trim($_POST['age']), 0, 3));
- }
- else
- {
- $age = $user['age'];
- }
-
- if (isset ($_POST['gender']))
- {
- $gender = htmlentities(substr(trim($_POST['gender']), 0, 1));
- }
- else
- {
- $gender = $user['gender'];
- }
-
- if (isset ($_POST['location']))
- {
- $location = htmlentities(substr(trim($_POST['location']), 0, 256));
- }
- else
- {
- $location = $user['location'];
- }
-
- if (isset ($_POST['contact']))
- {
- $contact = htmlentities(substr(trim($_POST['contact']), 0, 256));
- }
- else
- {
- $contact = $user['contact'];
- }
-
- if (isset ($_POST['description']))
- {
- $description = htmlentities(substr(trim($_POST['description']), 0,
512));
- }
- else
- {
- $description = $user['description'];
- }
-
- // Only users can edit their own passwords-while admins can edit
just about anything else
- if (isset ($_POST['password']) && $_SESSION['username'] == $username
&& isset ($_POST['changepass']))
- {
- $password = $_POST['password'];
-
- $passlength = strlen($password);
-
- if ($passlength < 4)
- {
- $passErrString = "Sorry, your password must be at least 4
characters.<br />\n";
- }
- else
- {
- // Everything checked out, so update.
- $db->setuserpass($username, $password);
- }
- }
-
- $picture_ext = $user['has_picture'];
-
- if (isset ($_POST['remove_picture']))
- {
- if ($picture_ext != null)
- {
- unlink(THpath . "images/profiles/" . $username . $ext);
- }
-
- $picture_ext = "";
- }
-
- $picture_pending = $user['pic_pending'];
-
- if ($_FILES['picture']['error'] == 0 && $_FILES['picture'])
- {
-
- if ($picture_pending)
- {
- $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";
- }
-
- //check the MIME type, not the extention - tyam
- if ($_FILES['picture']['type'] == "image/jpeg")
- {
- $filetype = "jpg";
- }
- elseif ($_FILES['picture']['type'] == "image/gif")
- {
- $filetype = "gif";
- }
- elseif ($_FILES['picture']['type'] == "image/png")
- {
- $filetype = "png";
- }
-
- if ($_FILES['picture'] && !in_array($filetype, array (
- "jpg",
- "png",
- "gif"
- )))
- {
- $imgErrString .= "Picture must be a JPG, PNG, or GIF.<br />\n";
- }
-
- if ($filetype == "jpg")
- {
- $theimg = imagecreatefromjpeg($_FILES['picture']['tmp_name']);
- }
- elseif ($filetype == "png" && is_callable("imagecreatefrompng"))
- {
- $theimg = imagecreatefrompng($_FILES['picture']['tmp_name']);
- }
- elseif ($filetype == "gif" && is_callable("imagecreatefromgif"))
- {
- $theimg = imagecreatefromgif($_FILES['picture']['tmp_name']);
- }
-
- if ($theimg == null)
- {
- $imgErrString .= "Unknown error.<br />\n";
- }
- else
- {
- $orig_width = imagesx($theimg);
- $orig_height = imagesy($theimg);
-
- // Resize if necessary
- if ($_FILES['picture'] && ($orig_height > 500 || $orig_height >
500))
- {
- //Thumbnail code.
- //Man, this code is a female canine. (Good thing I took this from
post-common :])
- if ($orig_height > $orig_height)
- {
- $targh = 500;
- $targw = (500 / $orig_height) * $orig_width;
- if ($targw > 500)
- {
- $ratio = 500 / $targw;
- $targw = 500;
- $targh = $targh * $ratio;
- }
- }
- else
- {
- $targw = 500;
- $targh = (500 / $orig_width) * $orig_height;
- if ($targh > 500)
- {
- $ratio = 500 / $targh;
- $targh = 500;
- $targw = $targw * $ratio;
- }
- } //if width>height
-
- $targw = round($targw);
- $targh = round($targh);
-
- $resized_image = imagecreatetruecolor($targw, $targh);
- imagecopyresampled($resized_image, $theimg, 0, 0, 0, 0, $targw,
$targh, $orig_width, $orig_height);
- if ($filetype == "png" || $filetype == "gif")
- {
- imagepng($resized_image, $_FILES['picture']['tmp_name']);
- }
- else
- {
- imagejpeg($resized_image, $_FILES['picture']['tmp_name'],
THjpegqual);
- }
- }
- }
-
- // Has everything gone okay so far?
- if ($imgErrString == "")
- {
- $picpath = THpath . 'unlinked/' . $username . "." . $filetype;
-
- 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";
- }
- }
-
- // The reason this check is here is because if move_uploaded_file
fails
- // $imgErrString gets set to a non-null value
- if ($imgErrString == "")
- {
- $picture_pending = $filetype; // guess it worked
- }
- }
-
- $db->updateuserinfo($username, $age, $gender, $location, $contact,
- $description, $picture_ext, $picture_pending);
-
- $actionstring = "Profile edit\tprofile:" . $username;
- writelog($actionstring, "profiles");
-
- } // end of if isset($_POST['edit_update'])
-
- // Reload the user data
- $user = $db->getuserdata($username);
-
- echo "<title>" . THname . "— Editing profile of " .
$user['username'] . "</title>\n";
- echo "</head><body>\n";
- echo '<div id="main"><div class="box">';
- echo "<div class=\"pgtitle\">User profile:" .
$user['username'] . "</div><br />\n";
-
- // For errors involving changing of password or uploading of image
- if ($imgErrString != "")
- {
- echo "<font color=\"#ff0000\">" . $imgErrString . "</font>";
- }
- if ($passErrString != "")
- {
- echo "<font color=\"#ff0000\">" . $passErrString . "</font>";
- }
-
- echo "<form id=\"profileedit\" action=\"" .
THurl . "profiles.php?action=edit&user=" .
- $username . "\" method=\"post\" enctype=\"multipart/form-data\">";
- echo '<input type="hidden" name="edit_update" value="1">';
- echo "<p style=\"text-align: left;\">\n"; // This is for picture
manipulation stuff
- echo '<table class="centered"><tr><td style="width: 50%;">';
- if ($user['has_picture'])
- {
- echo "<img src=\"" . THurl . "images/profiles/" .
$user['username'] . "." .
- $user['has_picture'] . "\" align=\"left\" /><br />\n";
- echo "<input type=\"checkbox\" name=\"remove_picture\" value=\"1\">
Remove picture<br />\n";
- }
- else
- {
- echo "<img src=\"" . THurl . "static/nopicture.png\" align=\"left\"
/>\n";
- }
- echo '</td></tr><tr><td style="width: 50%;">';
- if ($user['pic_pending'])
- {
- echo "<img src=\"" . THurl . "static/time.png\" alt=\"Picture
pending\">" . $username . " has a picture awating admin approval.<br />\n";
- }
- else
- {
- echo "<b>Upload a new picture: </b></td><td><input type=\"file\"
name=\"picture\" /></td></tr>\n";
- echo "<tr><td colspan=2>To be displayed on the main site, it first
must be manually approved by an admin.\n";
- echo "File must be a JPEG, GIF, or PNG no larger than 500x500 or " .
THprofile_maxpicsize . " bytes.";
- echo "If the image is too large, it will be resized.</td></tr>\n";
- }
-
- echo '<tr><td>';
- // If user has been granted a capcode by the admins, they can specify
how to display their name
- if ($user['capcode'])
- {
- $capcode = $db->getusercapcode($user['capcode']);
-
- if ($capcode)
- {
- echo "<b>Current capcode displays as:</b></td><td>" . $capcode;
- echo "\n</td></tr><tr><td>";
- }
- if ($user['proposed_capcode'])
- {
- echo "<b>Capcode awaiting approval:</b></td><td>" .
$user['proposed_capcode'] . "<br />\n";
- }
- else
- { //HAJIME NO KAPPUKOUDO
- echo "<b>Propose a capcode:</b></td><td><input type=\"text\"
name=\"capcode\"" .
- "length=\"128\" maxlength=\"128\" />";
- echo "<i><small>(admin approval required)</small></i><br />\n";
- }
- echo '</td></tr><tr><td>';
- }
-
- echo "<b>Gender:</b></td><td>";
-?>
- <SELECT name="gender">
- <OPTION <?php if($user['gender'] == "U" || !$user['gender']) {
echo "SELECTED"; } ?> value="U">--
- <OPTION <?php if($user['gender'] == "M" ) { echo "SELECTED"; } ?>
value="M">Male
- <OPTION <?php if($user['gender'] == "F" ) { echo "SELECTED"; } ?>
value="F">Female
- </SELECT>
- <?php
-
-
- echo '</td></tr><tr><td>';
- echo "<b>Age:</b></td><td><input type=\"text\" name=\"age\"
value=\"" .
- replacequote($user['age']) . "\" length=\"3\" maxlength=\"3\" /><br
/>\n";
-
- echo '</td></tr><tr><td>';
- echo "<b>Location:</b></td><td><input type=\"text\" name=\"location\"
value=\"" .
- replacequote($user['location']) . "\"/><br />\n";
-
- echo '</td></tr><tr><td>';
- echo "<b>Contact information:</b></td><td><input type=\"text\"
name=\"contact\" value=\"" .
- replacequote($user['contact']) . "\"/><br />\n";
-
- 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 '</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 '</td></tr></table>';
- echo "<input type=\"submit\" value=\"Submit\" id=\"subbtn\" /><br
/>\n";
- echo "<a href=\"" . THurl . "profiles.php?action=viewprofile&user=" .
$username . "\">Return to member profile</a>";
- //echo "</div></div>\n";
-
- }
- else
- if ($_GET['action'] == "register")
- {
- echo "<div class=\"pgtitle\">Register a new account</div><br />\n";
- if (isset ($_SESSION['username']))
- {
- die("But you are logged in!");
- }
-
- if (THprofile_regpolicy == 0)
- {
- die("Registration disabled.");
- }
-
- $success = 0;
-
- echo "<title>" . THname . "— Register</title>\n";
- echo "</head><body>\n";
- echo '<div id="main"><div class="box">';
- $errorstring = "";
- if (isset ($_POST['user']))
- {
- if (THprofile_lcnames)
- {
- $username = strtolower(trim($_POST['user']));
- }
- else
- {
- $username = trim($_POST['user']);
- }
-
- $password = trim($_POST['password']);
- $email = trim($_POST['email']);
-
- // you can change this however you wish.
- $reserved_words = array (
- "admin",
- "guest",
- "root",
- "banned",
- "moderator",
- "mod",
- "administrator",
- "trendster",
- "trendy"
- );
-
- $nameexists = $db->userexists($username);
-
- foreach( $reserved_words as $reserved )
- {
- if( stripos($username, $reserved) !== false || $nameexists )
- {
- $errorstring .= "Sorry, an account with this name already
exists.<br />\n";
- break;
- }
- }
-
- $namelength = strlen($username);
- if ($namelength < 4 || $namelength > 30)
- {
- $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";
- }
-
- if ($password)
- {
- $passlength = strlen($password);
- if ($passlength < 4)
- {
- $errorstring .= "Sorry, your password must be at least 4
characters.<br />\n";
- }
- }
- else
- {
- $errorstring .= "You must provide a password!<br />\n";
- }
-
- if (isset ($_POST['email']) && strlen($email))
- {
-
- /* Check if valid email address */
- if( ! validateemail($email) ) // Provided in common.php
- {
- $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";
- }
- }
- else
- {
- $errorstring .= "You must provide an email address!<br />\n";
- }
-
- if ($errorstring == "")
- {
- // No errors encountered so far, attempt to register
-
- if (THprofile_regpolicy == 1)
- {
- $initial_status = 0; // pending admin approval
- }
- else
- {
- $initial_status = 1; // automatically approved
- }
-
- $actionstring = "Register\tname:" . $username;
- writelog($actionstring, "profiles");
-
- // I believe this returns non-null on a successful query, so...
- $fail = $db->registeruser($username, $password,
- THprofile_userlevel, $email, $initial_status);
- if ($fail == null)
- {
- $errorstring .= "Database error.<br />\n";
- }
- else
- {
- //echo "You have registered successfully.<br />\n";
- $success = 1;
- }
- }
- }
- if ($errorstring != "")
- {
- 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 "</form>\n";
- }
- else
- {
-
- 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";
-
- if (THprofile_emailwelcome)
- {
- 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";
-
- if (THprofile_emailwelcome)
- {
- sendWelcome($username, $email);
- 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";
- echo "<tr><td>Username:</td><td><input type=\"text\" name=\"name\"
maxlength=\"30\" ></td></tr>\n";
- echo "<tr><td>Password:</td><td><input type=\"password\"
name=\"password\" maxlength=\"30\" ></td></tr>\n";
- echo "<tr><td><input type=\"checkbox\" name=\"remember\" ><font
size=\"2\">Remember me</td>\n";
- echo "<tr><td><input type=\"submit\" value=\"Login\"></td></tr>\n";
- echo "</form></table>\n";
- }
+ if (isset($_GET['action'])) {
+ if ($_GET['action'] == "login") {
+
+ $sm = sminit("login.tpl", null, "profiles", false, false);
+
+ // Three POST parameters:
+ // $_POST['name'], $_POST['password'], $_POST['remember']
+
+ if (isset($_POST['name']) && isset($_POST['password'])) {
+ $userdata = $db->getuserdata_login($_POST['name'],
$_POST['password']);
+
+ if ($userdata != NULL) {
+ $_SESSION['username'] = $userdata['username'];
+ $_SESSION['userid'] = generateRandID();
+ $_SESSION['userlevel'] = $userdata['userlevel'];
+ $_SESSION['admin'] = $userdata['mod_admin'];
+ $_SESSION['mod_array'] = $userdata['mod_array'];
+ $_SESSION['mod_global'] = $userdata['mod_global'];
+ if ($userdata['mod_global'] ||
$userdata['mod_array']) {
+ $_SESSION['moderator'] = true;
+ }
+
+ // Update userid field
+ $db->updateuser($_POST['name'],
$_SESSION['userid']);
+ } else {
+ // Login error - show that in the template
+ $sm->assign("loginerror", 1);
+ }
+ }
+
+ //This checks to see if end user has even bothered to
change the default email. No use giving a link to something that won't
work. ~tyamzzz
+ if (THprofile_emailaddr != "THIS IS NOT AN EMAIL") {
+ $sm->assign("showreset", 1);
+ }
+
+ if (isset($_SESSION['username'])) {
+ // Set logged-in vars
+ $sm->assign("loggedin", 1);
+ $sm->assign("username", $_SESSION['username']);
+ }
+
+ $sm->display("login.tpl", null);
+ } else
+ if ($_GET['action'] == "logout") {
+ echo "<title>" . THname . "— Logout</title>\n";
+ echo "</head><body>\n";
+ echo '<div id="main"><div class="box">';
+
+ if (isset($_SESSION['username'])) {
+ if (isset($_COOKIE[THcookieid . '-uname']) &&
isset($_COOKIE[THcookieid . '-id'])) {
+ setcookie(THcookieid . "-uname", "", time() -
THprofile_cookietime, THprofile_cookiepath);
+ setcookie(THcookieid . "-id", "", time() -
THprofile_cookietime, THprofile_cookiepath);
+ }
+
+ /* Unset PHP session variables */
+ unset($_SESSION['username']);
+ unset($_SESSION['userid']);
+ unset($_SESSION['userlevel']);
+ unset($_SESSION['admin']);
+ unset($_SESSION['moderator']);
+ unset($_SESSION['mod_array']);
+ echo '<div class="pgtitle">Logged out</div><br />';
+ 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 "[<a href=\"drydock.php\">Board index</a>]\n";
+ } else
+ if ($_GET['action'] == "memberlist") {
+ echo "<title>" . THname . "— Members</title>\n";
+ echo "</head><body>\n";
+ echo '<div id="main"><div class="box">';
+ $can_access = 0;
+
+ if (THprofile_viewuserpolicy == 2) {
+ $can_access = 1;
+ } elseif (THprofile_viewuserpolicy == 1 &&
isset($_SESSION['username'])) {
+ $can_access = 1;
+ } elseif (THprofile_viewuserpolicy == 0 &&
($_SESSION['admin'] || $_SESSION['moderator'])) {
+ $can_access = 1;
+ }
+
+ if ($can_access) {
+ echo "<div class=\"pgtitle\">Members</div><br />\n";
+
+ $users = $db->getuserlist();
+
+ foreach ($users as $user_entry) {
+ if ($user_entry['username'] != "initialadmin") {
+ echo "<a
href=\"profiles.php?action=viewprofile&user=" .
$user_entry['username'] . "\">" .
+ $user_entry['username'] . "</a><br />\n";
+ }
+ }
+ } 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 "[<a href=\"drydock.php\">Board index</a>]\n";
+ }
+ } else
+ if ($_GET['action'] == "viewprofile") {
+ if (!isset($_GET['user'])) {
+ die("You must specify a user!");
+ }
+
+ if (THprofile_lcnames) {
+ $username = strtolower($_GET['user']);
+ } else {
+ $username = $_GET['user'];
+ }
+
***The diff for this file has been truncated for email.***
=======================================
--- /trunk/drydock/rebuilds.php Sat Jul 23 13:17:13 2011
+++ /trunk/drydock/rebuilds.php Sat Jul 23 20:54:24 2011
@@ -303,8 +303,7 @@
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, '</div>');
- fwrite($sidelinks, '</div>' . "\n");
+ fwrite($sidelinks, '</div></div></div>' . "\n");
fclose($sidelinks);
}
=======================================
--- /trunk/drydock/tpl/drydock-anonbbs/viewblock.tpl Sat Jul 23 16:27:00
2011
+++ /trunk/drydock/tpl/drydock-anonbbs/viewblock.tpl Sat Jul 23 20:54:24
2011
@@ -83,7 +83,7 @@
</div>
{if $comingfrom=="board"}
{if $thread.rcount>$binfo.perth}
- <div class="ssmed"><span class="name">Showing only last
{$binfo.perth} {if
$binfo.perth==1}reply{else}replies{/if}→</span></div><br />
+ <div class="ssmed"><span class="name">Showing only last
{$binfo.perth} {if
$binfo.perth==1}reply{else}replies{/if}→</span></div>
{/if}
{/if}
=======================================
--- /trunk/drydock/tpl/drydock-image/bottombar.tpl Sat Jul 23 14:06:39 2011
+++ /trunk/drydock/tpl/drydock-image/bottombar.tpl Sat Jul 23 20:54:24 2011
@@ -1,10 +1,8 @@
-
</div>
- </div>
-</div>
-{* end the box class *}
+ </div> {* end of unnamed div at bottom of heady.tpl *}
+</div> {* end of "box" div *}
{include_php file="menu.php"}
-</div>
+</div> {* end of "main" div *}
<div style="text-align: center;">- <a
href="http://wakaba.c3.cx/soc/kareha.pl/1121005876/"
target="blank">Thorn</a> +
<a href="http://wakaba.c3.cx/s/web/wakaba_kareha.html"
target="_blank">Wakaba</a> +
<a href="http://code.google.com/p/drydock/" target="_blank">drydock</a>
-</div>
=======================================
--- /trunk/drydock/tpl/drydock-image/postblock.tpl Sat Jul 23 15:59:31 2011
+++ /trunk/drydock/tpl/drydock-image/postblock.tpl Sat Jul 23 20:54:24 2011
@@ -1,4 +1,3 @@
-<!-- postblock -->
<div class="theader">
{if $comingfrom=="board"}
{if $binfo.tlock}
=======================================
--- /trunk/drydock/tpl/drydock-image/recaptcha.tpl Sat Jul 23 12:38:38 2011
+++ /trunk/drydock/tpl/drydock-image/recaptcha.tpl Sat Jul 23 20:54:24 2011
@@ -5,7 +5,7 @@
{literal}<script type="text/javascript">var RecaptchaOptions = {
theme: 'custom', lang: 'en',
custom_theme_widget: 'recaptcha_widget'};</script>{/literal}
<div id="recaptcha_widget" style="display: none;">
<div id="recaptcha_image"></div>
- <input id="recaptcha_response_field" name="recaptcha_response_field"
type="text">
+ <input id="recaptcha_response_field" name="recaptcha_response_field"
type="text" />
<script type="text/javascript"
src="http://api.recaptcha.net/challenge?k={$reCAPTCHAPublic}&lang=en"></script>
</div>
</td>
=======================================
--- /trunk/drydock/tpl/drydock-traditional/bottombar.tpl Sat Jul 23
14:06:39 2011
+++ /trunk/drydock/tpl/drydock-traditional/bottombar.tpl Sat Jul 23
20:54:24 2011
@@ -1,10 +1,8 @@
-
</div>
- </div>
-</div>
-{* end the box class *}
+ </div> {* end of unnamed div at bottom of heady.tpl *}
+</div> {* end of "box" div *}
{include_php file="menu.php"}
-</div>
+</div> {* end of "main" div *}
<div style="text-align: center;">- <a
href="http://wakaba.c3.cx/soc/kareha.pl/1121005876/"
target="blank">Thorn</a> +
<a href="http://wakaba.c3.cx/s/web/wakaba_kareha.html"
target="_blank">Wakaba</a> +
<a href="http://code.google.com/p/drydock/" target="_blank">drydock</a>
-</div>
=======================================
--- /trunk/drydock/tpl/drydock-traditional/recaptcha.tpl Sat Jul 23
12:38:38 2011
+++ /trunk/drydock/tpl/drydock-traditional/recaptcha.tpl Sat Jul 23
20:54:24 2011
@@ -5,7 +5,7 @@
{literal}<script type="text/javascript">var RecaptchaOptions = {
theme: 'custom', lang: 'en',
custom_theme_widget: 'recaptcha_widget'};</script>{/literal}
<div id="recaptcha_widget" style="display: none;">
<div id="recaptcha_image"></div>
- <input id="recaptcha_response_field" name="recaptcha_response_field"
type="text">
+ <input id="recaptcha_response_field" name="recaptcha_response_field"
type="text" />
<script type="text/javascript"
src="http://api.recaptcha.net/challenge?k={$reCAPTCHAPublic}&lang=en"></script>
</div>
</td>