OSDN Git Service

Another small update.
[idb/iDB.git.git] / inc / members.php
index e262a1b..2caa7a7 100644 (file)
     Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/
     Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/
 
-    $FileInfo: members.php - Last Update: 06/03/2008 SVN 165 - Author: cooldude2k $
+    $FileInfo: members.php - Last Update: 12/12/2008 SVN 215 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="members.php"||$File3Name=="/members.php") {
        require('index.php');
        exit(); }
+if(!is_numeric($_GET['id'])) { $_GET['id'] = null; }
+if(!is_numeric($_GET['page'])) { $_GET['page'] = null; }
 if($_GET['act']=="list") {
 $orderlist = null;
 $orderlist = "order by `ID` asc";
@@ -36,7 +38,9 @@ if($_GET['orderby']=="id") { $orderlist = "order by `ID`"; }
 if($_GET['orderby']=="name") { $orderlist = "order by `Name`"; }
 if($_GET['orderby']=="joined") { $orderlist = "order by `Joined`"; }
 if($_GET['orderby']=="active") { $orderlist = "order by `LastActive`"; }
+if($_GET['orderby']=="post") { $orderlist = "order by `PostCount`"; }
 if($_GET['orderby']=="posts") { $orderlist = "order by `PostCount`"; }
+if($_GET['orderby']=="karma") { $orderlist = "order by `Karma`"; }
 if($_GET['orderby']=="offset") { $orderlist = "order by `TimeZone`"; } }
 if($_GET['ordertype']==null) { 
        if($_GET['sorttype']!=null) { 
@@ -50,7 +54,7 @@ if($_GET['ordertype']=="desc") { $orderlist .= " desc"; } }
 if(!is_numeric($_GET['gid'])) { $_GET['gid'] = null; }
 if($_GET['gid']!=null&&$_GET['groupid']==null) { $_GET['groupid'] = $_GET['gid']; }
 if(!is_numeric($_GET['groupid'])) { $_GET['groupid'] = null; }
-$ggquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `Name`='%s' LIMIT 1", array($Settings['GuestGroup']));
+$ggquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `Name`='%s'", array($Settings['GuestGroup']));
 $ggresult=mysql_query($ggquery);
 $GGroup=mysql_result($ggresult,0,"id");
 @mysql_free_result($ggresult);
@@ -99,7 +103,7 @@ $num=mysql_num_rows($result);
 $pagenum=count($Pages);
 if($_GET['page']>$pagenum) {
        $_GET['page'] = $pagenum; }
-$pagei=0; $pstring = "<div class=\"PageList\">Pages: ";
+$pagei=0; $pstring = "<div class=\"PageList\"><span class=\"pagelink\">Pages:</span> ";
 if($_GET['page']<4) { $Pagez[0] = null; }
 if($_GET['page']>=4) { $Pagez[0] = "First"; }
 if($_GET['page']>=3) {
@@ -125,35 +129,59 @@ if($_GET['page']>=$pagenum) { $Pagez[6] = null; }
 $pagenumi=count($Pagez);
 if($NumberMembers==0) {
 $pagenumi = 0;
-$pstring = $pstring."<a href=\"".url_maker($exfile['member'],$Settings['file_ext'],"act=list&orderby=".$_GET['orderby']."&ordertype=".$_GET['ordertype']."&page=1",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member'])."\">1</a> "; }
+$pstring = $pstring."<span class=\"pagelink\"><a href=\"".url_maker($exfile['member'],$Settings['file_ext'],"act=list&orderby=".$_GET['orderby']."&ordertype=".$_GET['ordertype']."&page=1",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member'])."\">1</a></span> "; }
 while ($pagei < $pagenumi) {
 if($Pagez[$pagei]!=null&&
    $Pagez[$pagei]!="First"&&
    $Pagez[$pagei]!="Last") {
-$pstring = $pstring."<a href=\"".url_maker($exfile['member'],$Settings['file_ext'],"act=list&orderby=".$_GET['orderby']."&ordertype=".$_GET['ordertype']."&page=".$Pagez[$pagei],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member'])."\">".$Pagez[$pagei]."</a> "; }
+if($pagei==1&$Pagez[$pagei]!=null&&$Pagez[$pagei]>=2) {
+$Pback = $Pagez[$pagei] - 1;
+$pstring = $pstring."<span class=\"pagelink\"><a href=\"".url_maker($exfile['member'],$Settings['file_ext'],"act=list&orderby=".$_GET['orderby']."&ordertype=".$_GET['ordertype']."&page=".$Pback,$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member'])."\">&lt;</a></span> "; }
+if($pagei!=3) { 
+$pstring = $pstring."<span class=\"pagelink\"><a href=\"".url_maker($exfile['member'],$Settings['file_ext'],"act=list&orderby=".$_GET['orderby']."&ordertype=".$_GET['ordertype']."&page=".$Pagez[$pagei],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member'])."\">".$Pagez[$pagei]."</a></span> "; }
+if($pagei==3) { 
+$pstring = $pstring."<span class=\"pagecurrent\"><a href=\"".url_maker($exfile['member'],$Settings['file_ext'],"act=list&orderby=".$_GET['orderby']."&ordertype=".$_GET['ordertype']."&page=".$Pagez[$pagei],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member'])."\">".$Pagez[$pagei]."</a></span> "; } }
 if($Pagez[$pagei]=="First") {
-$pstring = $pstring."<a href=\"".url_maker($exfile['member'],$Settings['file_ext'],"act=list&orderby=".$_GET['orderby']."&ordertype=".$_GET['ordertype']."&page=1",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member'])."\">&lt; First</a> ... "; }
+$pstring = $pstring."<span class=\"pagelinklast\"><a href=\"".url_maker($exfile['member'],$Settings['file_ext'],"act=list&orderby=".$_GET['orderby']."&ordertype=".$_GET['ordertype']."&page=1",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member'])."\">&laquo;</a></span> "; }
 if($Pagez[$pagei]=="Last") {
-$pstring = $pstring."... <a href=\"".url_maker($exfile['member'],$Settings['file_ext'],"act=list&orderby=".$_GET['orderby']."&ordertype=".$_GET['ordertype']."&page=".$pagenum,$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member'])."\">Last &gt;</a> "; }
+$ptestnext = $pagenext + 1;
+if($ptestnext<$pagenum) {
+$paget = $pagei - 1;
+$Pnext = $Pagez[$paget] + 1;
+$pstring = $pstring."<span class=\"pagelink\"><a href=\"".url_maker($exfile['member'],$Settings['file_ext'],"act=list&orderby=".$_GET['orderby']."&ordertype=".$_GET['ordertype']."&page=".$Pnext,$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member'])."\">&gt;</a></span> "; }
+$pstring = $pstring."<span class=\"pagelinklast\"><a href=\"".url_maker($exfile['member'],$Settings['file_ext'],"act=list&orderby=".$_GET['orderby']."&ordertype=".$_GET['ordertype']."&page=".$pagenum,$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member'])."\">&raquo;</a></span> "; }
        ++$pagei; } $pstring = $pstring."</div>";
+?>
+<div class="NavLinks"><?php echo $ThemeSet['NavLinkIcon']; ?><a href="<?php echo url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']); ?>">Board index</a><?php echo $ThemeSet['NavLinkDivider']; ?><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=list&page=1",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Member list</a></div>
+<div class="DivNavLinks">&nbsp;</div>
+<?php
 echo $pstring;
 //List Page Number Code end
 ?>
+<div class="DivPageLinks">&nbsp;</div>
 <div class="Table1Border">
+<?php if($ThemeSet['TableStyle']=="div") { ?>
+<div class="TableRow1">
+<span style="text-align: left;">
+<?php echo $ThemeSet['TitleIcon']; ?><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=list&orderby=".$_GET['orderby']."&ordertype=".$_GET['ordertype']."&page=".$_GET['page'],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Member List</a>
+</span></div>
+<?php } ?>
 <table class="Table1">
+<?php if($ThemeSet['TableStyle']=="table") { ?>
 <tr class="TableRow1">
-<td class="TableRow1" colspan="7"><span style="float: left;">
-<?php echo $ThemeSet['TitleIcon'] ?><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=list&orderby=".$_GET['orderby']."&ordertype=".$_GET['ordertype']."&page=".$_GET['page'],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Member List</a>
-</span><span style="float: right;">&nbsp;</span></td>
-</tr>
+<td class="TableColumn1" colspan="8"><span style="text-align: left;">
+<?php echo $ThemeSet['TitleIcon']; ?><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=list&orderby=".$_GET['orderby']."&ordertype=".$_GET['ordertype']."&page=".$_GET['page'],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Member List</a>
+</span></td>
+</tr><?php } ?>
 <tr id="Member" class="TableRow2">
-<th class="TableRow2" style="width: 5%;">ID</th>
-<th class="TableRow2" style="width: 28%;">Name</th>
-<th class="TableRow2" style="width: 10%;">Group</th>
-<th class="TableRow2" style="width: 10%;">Posts</th>
-<th class="TableRow2" style="width: 20%;">Joined</th>
-<th class="TableRow2" style="width: 20%;">Last Active</th>
-<th class="TableRow2" style="width: 7%;">Website</th>
+<th class="TableColumn2" style="width: 5%;">ID</th>
+<th class="TableColumn2" style="width: 28%;">Name</th>
+<th class="TableColumn2" style="width: 10%;">Group</th>
+<th class="TableColumn2" style="width: 5%;">Posts</th>
+<th class="TableColumn2" style="width: 5%;">Karma</th>
+<th class="TableColumn2" style="width: 20%;">Joined</th>
+<th class="TableColumn2" style="width: 20%;">Last Active</th>
+<th class="TableColumn2" style="width: 7%;">Website</th>
 </tr>
 <?php
 while ($i < $num) {
@@ -171,30 +199,38 @@ $MemList['LastActive']=GMTimeChange("F j Y, g:i a",$MemList['LastActive'],$_SESS
 $MemList['Website']=mysql_result($result,$i,"Website");
 $MemList['Gender']=mysql_result($result,$i,"Gender");
 $MemList['PostCount']=mysql_result($result,$i,"PostCount");
+$MemList['Karma']=mysql_result($result,$i,"Karma");
 $MemList['TimeZone']=mysql_result($result,$i,"TimeZone");
 $MemList['DST']=mysql_result($result,$i,"DST");
 $MemList['IP']=mysql_result($result,$i,"IP");
 $gquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($MemList['GroupID']));
 $gresult=mysql_query($gquery);
 $MemList['Group']=mysql_result($gresult,0,"Name");
+$GroupNamePrefix=mysql_result($gresult,0,"NamePrefix");
+$GroupNameSuffix=mysql_result($gresult,0,"NameSuffix");
 @mysql_free_result($gresult);
+if(isset($GroupNamePrefix)&&$GroupNamePrefix!=null) {
+       $MemList['Name'] = $GroupNamePrefix.$MemList['Name']; }
+if(isset($GroupNameSuffix)&&$GroupNameSuffix!=null) {
+       $MemList['Name'] = $MemList['Name'].$GroupNameSuffix; }
 $membertitle = " ".$ThemeSet['TitleDivider']." Member List";
 if($MemList['Group']!=$Settings['GuestGroup']) {
 ?>
 <tr class="TableRow3" id="Member<?php echo $MemList['ID']; ?>">
-<td class="TableRow3" style="text-align: center;"><?php echo $MemList['ID']; ?></td>
-<td class="TableRow3">&nbsp;<a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=view&id=".$MemList['ID'],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>"><?php echo $MemList['Name']; ?></a></td>
-<td class="TableRow3" style="text-align: center;"><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=list&gid=".$MemList['GroupID']."&page=".$_GET['page'],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>"><?php echo $MemList['Group']; ?></a></td>
-<td class="TableRow3" style="text-align: center;"><?php echo $MemList['PostCount']; ?></td>
-<td class="TableRow3" style="text-align: center;"><?php echo $MemList['Joined']; ?></td>
-<td class="TableRow3" style="text-align: center;"><?php echo $MemList['LastActive']; ?></td>
-<td class="TableRow3" style="text-align: center;"><a href="<?php echo $MemList['Website']; ?>" onclick="window.open(this.href);return false;">Website</a></td>
+<td class="TableColumn3" style="text-align: center;"><?php echo $MemList['ID']; ?></td>
+<td class="TableColumn3">&nbsp;<a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=view&id=".$MemList['ID'],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>"><?php echo $MemList['Name']; ?></a></td>
+<td class="TableColumn3" style="text-align: center;"><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=list&gid=".$MemList['GroupID']."&page=".$_GET['page'],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>"><?php echo $MemList['Group']; ?></a></td>
+<td class="TableColumn3" style="text-align: center;"><?php echo $MemList['PostCount']; ?></td>
+<td class="TableColumn3" style="text-align: center;"><?php echo $MemList['Karma']; ?></td>
+<td class="TableColumn3" style="text-align: center;"><?php echo $MemList['Joined']; ?></td>
+<td class="TableColumn3" style="text-align: center;"><?php echo $MemList['LastActive']; ?></td>
+<td class="TableColumn3" style="text-align: center;"><a href="<?php echo $MemList['Website']; ?>" onclick="window.open(this.href);return false;">Website</a></td>
 </tr>
 <?php }
 ++$i; } @mysql_free_result($result);
 ?>
 <tr id="MemEnd" class="TableRow4">
-<td class="TableRow4" colspan="7">&nbsp;</td>
+<td class="TableColumn4" colspan="8">&nbsp;</td>
 </tr>
 </table></div>
 <?php }
@@ -223,13 +259,24 @@ $ViewMem['LastActive']=GMTimeChange("M j Y, g:i a",$ViewMem['LastActive'],$_SESS
 $ViewMem['Website']=mysql_result($result,$i,"Website");
 $ViewMem['Gender']=mysql_result($result,$i,"Gender");
 $ViewMem['PostCount']=mysql_result($result,$i,"PostCount");
+$ViewMem['Karma']=mysql_result($result,$i,"Karma");
 $ViewMem['TimeZone']=mysql_result($result,$i,"TimeZone");
 $ViewMem['DST']=mysql_result($result,$i,"DST");
 $ViewMem['IP']=mysql_result($result,$i,"IP");
 $gquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($ViewMem['GroupID']));
 $gresult=mysql_query($gquery);
 $ViewMem['Group']=mysql_result($gresult,0,"Name");
+/*
+$GroupNamePrefix=mysql_result($gresult,0,"NamePrefix");
+$GroupNameSuffix=mysql_result($gresult,0,"NameSuffix");
+*/
 @mysql_free_result($gresult);
+/*
+if(isset($GroupNamePrefix)&&$GroupNamePrefix!=null) {
+       $ViewMem['Name'] = $GroupNamePrefix.$ViewMem['Name']; }
+if(isset($GroupNameSuffix)&&$GroupNameSuffix!=null) {
+       $ViewMem['Name'] = $ViewMem['Name'].$GroupNameSuffix; }
+*/
 $membertitle = " ".$ThemeSet['TitleDivider']." ".$ViewMem['Name'];     
 if ($ViewMem['Avatar']=="http://"||$ViewMem['Avatar']==null||
        strtolower($ViewMem['Avatar'])=="noavatar") {
@@ -253,19 +300,28 @@ if($_GET['view']=="website"||$_GET['view']=="homepage") {
        @session_write_close();
        @header("Location: ".$BoardURL."index.php?act=view"); } }
 ?>
+<div class="NavLinks"><?php echo $ThemeSet['NavLinkIcon']; ?><a href="<?php echo url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']); ?>">Board index</a><?php echo $ThemeSet['NavLinkDivider']; ?><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=view&id=".$_GET['id'],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Viewing profile</a></div>
+<div class="DivNavLinks">&nbsp;</div>
 <div class="Table1Border">
+<?php if($ThemeSet['TableStyle']=="div") { ?>
+<div class="TableRow1">
+<span style="text-align: left;">
+<?php echo $ThemeSet['TitleIcon']; ?><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=view&id=".$_GET['id'],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Viewing profile<?php echo $ThemeSet['NavLinkDivider']; ?><?php echo $ViewMem['Name']; ?></a>
+</span></div>
+<?php } ?>
 <table class="Table1">
+<?php if($ThemeSet['TableStyle']=="table") { ?>
 <tr class="TableRow1">
-<td class="TableRow1" colspan="2"><span style="float: left;">
-<?php echo $ThemeSet['TitleIcon'] ?><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=view&id=".$_GET['id'],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Viewing Profile</a>
-</span><span style="float: right;">&nbsp;</span></td>
-</tr>
+<td class="TableColumn1" colspan="2"><span style="text-align: left;">
+<?php echo $ThemeSet['TitleIcon']; ?><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=view&id=".$_GET['id'],$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Viewing profile<?php echo $ThemeSet['NavLinkDivider']; ?><?php echo $ViewMem['Name']; ?></a>
+</span></td>
+</tr><?php } ?>
 <tr id="Member" class="TableRow2">
-<th class="TableRow2" style="width: 50%;">Avatar</th>
-<th class="TableRow2" style="width: 50%;">User Info</th>
+<th class="TableColumn2" style="width: 50%;">Avatar</th>
+<th class="TableColumn2" style="width: 50%;">User Info</th>
 </tr>
 <tr class="TableRow3" id="MemberProfile">
-<td class="TableRow3">
+<td class="TableColumn3">
 <?php  /* Avatar Table Thanks For SeanJ's Help at http://seanj.jcink.com/ */  ?>
  <table class="AvatarTable" style="width: 100%; height: 100px; text-align: center;">
        <tr class="AvatarRow" style="width: 100px; height: 100px;">
@@ -276,9 +332,12 @@ if($_GET['view']=="website"||$_GET['view']=="homepage") {
  </table>
 <div style="text-align: center;">
 Name: <?php echo $ViewMem['Name']; ?><br />
-Title: <?php echo $ViewMem['Title']; ?></div>
+Title: <?php echo $ViewMem['Title']; ?>
+<?php if($GroupInfo['HasAdminCP']=="yes") { ?>
+<br />User IP: <a onclick="window.open(this.href);return false;" href="http://ip-lookup.net/?<?php echo $ViewMem['IP']; ?>">
+<?php echo $ViewMem['IP']; echo "</a>"; } ?></div>
 </td>
-<td class="TableRow3">
+<td class="TableColumn3">
 &nbsp;User Name: <?php echo $ViewMem['Name']; ?><br />
 &nbsp;User Title: <?php echo $ViewMem['Title']; ?><br />
 &nbsp;User Group: <?php echo $ViewMem['Group']; ?><br />
@@ -287,11 +346,12 @@ Title: <?php echo $ViewMem['Title']; ?></div>
 &nbsp;User Time: <?php echo GMTimeGet("M j Y, g:i a",$ViewMem['TimeZone'],0,$ViewMem['DST']); ?><br />
 &nbsp;User Website: <a href="<?php echo $ViewMem['Website']; ?>" onclick="window.open(this.href);return false;">Website</a><br />
 &nbsp;Post Count: <?php echo $ViewMem['PostCount']; ?><br />
+&nbsp;Karma: <?php echo $ViewMem['Karma']; ?><br />
 &nbsp;Interests: <?php echo $ViewMem['Interests']; ?><br />
 </td>
 </tr>
 <tr class="TableRow4">
-<td class="TableRow4" colspan="2">&nbsp;</td>
+<td class="TableColumn4" colspan="2">&nbsp;</td>
 </tr>
 </table></div>
 <?php } @mysql_free_result($result);
@@ -328,18 +388,27 @@ gzip_page($Settings['use_gzip'],$GZipEncode['Type']); @mysql_close(); die(); }
 if($_SESSION['UserID']==0||$_SESSION['UserID']==null) {
 $membertitle = " ".$ThemeSet['TitleDivider']." Login";
 ?>
+<div class="NavLinks"><?php echo $ThemeSet['NavLinkIcon']; ?><a href="<?php echo url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']); ?>">Board index</a><?php echo $ThemeSet['NavLinkDivider']; ?><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=login",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Login</a></div>
+<div class="DivNavLinks">&nbsp;</div>
 <div class="Table1Border">
+<?php if($ThemeSet['TableStyle']=="div") { ?>
+<div class="TableRow1">
+<span style="text-align: left;">
+<?php echo $ThemeSet['TitleIcon']; ?><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=login",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Log in</a>
+</span></div>
+<?php } ?>
 <table class="Table1">
+<?php if($ThemeSet['TableStyle']=="table") { ?>
 <tr class="TableRow1">
-<td class="TableRow1"><span style="float: left;">
-<?php echo $ThemeSet['TitleIcon'] ?><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=login",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Log in</a>
-</span><span style="float: right;">&nbsp;</span></td>
-</tr>
+<td class="TableColumn1"><span style="text-align: left;">
+<?php echo $ThemeSet['TitleIcon']; ?><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=login",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Log in</a>
+</span></td>
+</tr><?php } ?>
 <tr class="TableRow2">
-<th class="TableRow2" style="width: 100%; text-align: left;">&nbsp;Inert your login info: </th>
+<th class="TableColumn2" style="width: 100%; text-align: left;">&nbsp;Inert your login info: </th>
 </tr>
 <tr class="TableRow3">
-<td class="TableRow3">
+<td class="TableColumn3">
 <form style="display: inline;" method="post" action="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=login_now",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">
 <table style="text-align: left;">
 <tr style="text-align: left;">
@@ -365,7 +434,7 @@ $membertitle = " ".$ThemeSet['TitleDivider']." Login";
 </td>
 </tr>
 <tr class="TableRow4">
-<td class="TableRow4">&nbsp;</td>
+<td class="TableColumn4">&nbsp;</td>
 </tr>
 </table></div>
 <?php } } if($_POST['act']=="loginmember"&&$_GET['act']=="login_now") {
@@ -380,18 +449,26 @@ $URL['REFERER'] = $REFERERurl['host'];
 $URL['HOST'] = $_SERVER["SERVER_NAME"];
 $REFERERurl = null;
 ?>
+<div class="NavLinks"><?php echo $ThemeSet['NavLinkIcon']; ?><a href="<?php echo url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']); ?>">Board index</a><?php echo $ThemeSet['NavLinkDivider']; ?><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=login",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Login</a></div>
+<div class="DivNavLinks">&nbsp;</div>
 <div class="Table1Border">
+<?php if($ThemeSet['TableStyle']=="div") { ?>
+<div class="TableRow1">
+<span style="text-align: left;">&nbsp;<a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=login",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Log in</a></span>
+</div>
+<?php } ?>
 <table class="Table1">
+<?php if($ThemeSet['TableStyle']=="table") { ?>
 <tr class="TableRow1">
-<td class="TableRow1">
-<span style="float: left;">&nbsp;<a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=login",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Log in</a></span>
-<span style="float: right;">&nbsp;</span></td>
-</tr>
+<td class="TableColumn1">
+<span style="text-align: left;">&nbsp;<a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=login",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Log in</a></span>
+</td>
+</tr><?php } ?>
 <tr class="TableRow2">
-<th class="TableRow2" style="width: 100%; text-align: left;">&nbsp;Login Message: </th>
+<th class="TableColumn2" style="width: 100%; text-align: left;">&nbsp;Login Message: </th>
 </tr>
 <tr class="TableRow3">
-<td class="TableRow3">
+<td class="TableColumn3">
 <table style="width: 100%; height: 25%; text-align: center;">
 <?php
 if (pre_strlen($_POST['userpass'])>="30") { $Error="Yes";  ?>
@@ -406,7 +483,7 @@ if (pre_strlen($_POST['userpass'])>="30") { $Error="Yes";  ?>
        <br />Your user name is too big.<br />
        </span>&nbsp;</td>
 </tr>
-<?php } if ($Settings['TestReferer']===true) {
+<?php } if ($Settings['TestReferer']=="on") {
        if ($URL['HOST']!=$URL['REFERER']) { $Error="Yes";  ?>
 <tr>
        <td><span class="TableMessage">
@@ -470,7 +547,7 @@ $_SESSION['UserGroup']=$YourGroupM;
 $_SESSION['UserDST']=$YourDSTM;
 $_SESSION['UserPass']=$NewPassword;
 $_SESSION['DBName']=$Settings['sqldb'];
-if($_POST['storecookie']===true) {
+if($_POST['storecookie']=="true") {
 if($cookieDomain==null) {
 @setcookie("MemberName", $YourNameM, time() + (7 * 86400), $cbasedir);
 @setcookie("UserID", $YourIDM, time() + (7 * 86400), $cbasedir);
@@ -495,7 +572,7 @@ if($cookieSecure===false) {
        Click <a href="<?php echo url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']); ?>">here</a> to continue to board.<br />&nbsp;
        </span><br /></td>
 </tr>
-<?php } if($passright===false||$BanError=="yes") { ?>
+<?php } if($passright===false||$BanError=="yes"||$numlog<=0) { ?>
 <tr>
        <td><span class="TableMessage">
        <br />Password was not right or user not found or user is banned!! &lt;_&lt;<br />
@@ -506,7 +583,7 @@ if($cookieSecure===false) {
 </table>
 </td></tr>
 <tr class="TableRow4">
-<td class="TableRow4">&nbsp;</td>
+<td class="TableColumn4">&nbsp;</td>
 </tr>
 </table></div>
 <?php } } if($_GET['act']=="signup") { 
@@ -517,23 +594,36 @@ ob_clean(); @header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); @mysql_close(); die(); }
 if($_SESSION['UserID']==0||$_SESSION['UserID']==null) {
 ?>
+<div class="NavLinks"><?php echo $ThemeSet['NavLinkIcon']; ?><a href="<?php echo url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']); ?>">Board index</a><?php echo $ThemeSet['NavLinkDivider']; ?><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=signup",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Signup</a></div>
+<div class="DivNavLinks">&nbsp;</div>
 <div class="Table1Border">
+<?php if($ThemeSet['TableStyle']=="div") { ?>
+<div class="TableRow1">
+<span style="text-align: left;">
+<?php echo $ThemeSet['TitleIcon']; ?><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=signup",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Register</a>
+</span></div>
+<?php } ?>
 <table class="Table1">
+<?php if($ThemeSet['TableStyle']=="table") { ?>
 <tr class="TableRow1">
-<td class="TableRow1"><span style="float: left;">
-<?php echo $ThemeSet['TitleIcon'] ?><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=signup",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Register</a>
-</span><span style="float: right;">&nbsp;</span></td>
-</tr>
+<td class="TableColumn1"><span style="text-align: left;">
+<?php echo $ThemeSet['TitleIcon']; ?><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=signup",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Register</a>
+</span></td>
+</tr><?php } ?>
 <tr class="TableRow2">
-<th class="TableRow2" style="width: 100%; text-align: left;">&nbsp;Inert your user info: </th>
+<th class="TableColumn2" style="width: 100%; text-align: left;">&nbsp;Inert your user info: </th>
 </tr>
 <tr class="TableRow3">
-<td class="TableRow3">
+<td class="TableColumn3">
 <form style="display: inline;" method="post" action="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=makemember",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">
 <table style="text-align: left;">
 <tr style="text-align: left;">
        <td style="width: 30%;"><label class="TextBoxLabel" for="Name">Insert a UserName:</label></td>
+       <?php if(!isset($_SESSION['GuestName'])) { ?>
        <td style="width: 70%;"><input maxlength="24" type="text" class="TextBox" name="Name" size="20" id="Name" /></td>
+       <?php } if(isset($_SESSION['GuestName'])) { ?>
+       <td style="width: 70%;"><input maxlength="24" type="text" class="TextBox" name="Name" size="20" id="Name" value="<?php echo $_SESSION['GuestName']; ?>" /></td>
+       <?php } ?>
 </tr><tr>
        <td style="width: 30%;"><label class="TextBoxLabel" for="Password">Insert a Password:</label></td>
        <td style="width: 70%;"><input maxlength="30" type="password" class="TextBox" name="Password" size="20" id="Password" /></td>
@@ -616,15 +706,23 @@ echo "<option value=\"".$showmin."\">0:".$showmin." minutes</option>\n"; }
 <label class="TextBoxLabel" for="TOSBox">TOS - Please read fully and check 'I agree' box ONLY if you agree to terms</label><br />
 <textarea rows="10" cols="58" id="TOSBox" name="TOSBox" class="TextBox" readonly="readonly" accesskey="T"><?php 
        echo file_get_contents("TOS");  ?></textarea><br />
-<input type="checkbox" class="TextBox" name="TOS" value="Agree" id="TOS" /><label class="TextBoxLabel" for="TOS">I Agree</label><br/>
+<input type="checkbox" class="TextBox" name="TOS" value="Agree" id="TOS" /><label class="TextBoxLabel" for="TOS">I Agree</label>
+<?php if($Settings['use_captcha']!="on") { ?><br />
+<?php } if($Settings['use_captcha']=="on") { ?>
+</td></tr>
+<tr style="text-align: left;">
+<td style="width: 100%;">
+<label class="TextBoxLabel" for="signcode"><img src="<?php echo url_maker($exfile['index'],$Settings['file_ext'],"act=MkCaptcha",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']); ?>" alt="CAPTCHA Code" title="CAPTCHA Code" /></label><br />
+<input maxlength="25" type="text" class="TextBox" name="signcode" size="20" id="signcode" value="Enter SignCode" /><br /><?php } ?>
 <input type="hidden" style="display: none;" name="act" value="makemembers" />
 <input type="submit" class="Button" value="Sign UP" />
-</td></tr></table>
+</td></tr>
+</table>
 </form>
 </td>
 </tr>
 <tr class="TableRow4">
-<td class="TableRow4">&nbsp;</td>
+<td class="TableColumn4">&nbsp;</td>
 </tr>
 </table></div>
 <?php } } if($_GET['act']=="makemember") {
@@ -641,18 +739,28 @@ $URL['HOST'] = $_SERVER["SERVER_NAME"];
 $REFERERurl = null;
 if(!isset($_POST['username'])) { $_POST['username'] = null; }
 if(!isset($_POST['TOS'])) { $_POST['TOS'] = null; }
+if($Settings['use_captcha']=="on") {
+require($SettDir['inc']."captcha.php"); }
 ?>
+<div class="NavLinks"><?php echo $ThemeSet['NavLinkIcon']; ?><a href="<?php echo url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']); ?>">Board index</a><?php echo $ThemeSet['NavLinkDivider']; ?><a href="<?php echo url_maker($exfile['member'],$Settings['file_ext'],"act=signup",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']); ?>">Signup</a></div>
+<div class="DivNavLinks">&nbsp;</div>
 <div class="Table1Border">
+<?php if($ThemeSet['TableStyle']=="div") { ?>
+<div class="TableRow1">
+<span style="text-align: left;">
+&nbsp;<a href="<?php echo url_maker($exfile['messenger'],$Settings['file_ext'],"act=signup",$Settings['qstr'],$Settings['qsep'],$prexqstr['messenger'],$exqstr['messenger']); ?>">Register</a></span></div>
+<?php } ?>
 <table class="Table1">
+<?php if($ThemeSet['TableStyle']=="table") { ?>
 <tr class="TableRow1">
-<td class="TableRow1"><span style="float: right;">&nbsp;</span>
-&nbsp;<a href="<?php echo url_maker($exfile['messenger'],$Settings['file_ext'],"act=signup",$Settings['qstr'],$Settings['qsep'],$prexqstr['messenger'],$exqstr['messenger']); ?>">Register</a></td>
-</tr>
+<td class="TableColumn1"><span style="text-align: left;">
+&nbsp;<a href="<?php echo url_maker($exfile['messenger'],$Settings['file_ext'],"act=signup",$Settings['qstr'],$Settings['qsep'],$prexqstr['messenger'],$exqstr['messenger']); ?>">Register</a></span></td>
+</tr><?php } ?>
 <tr class="TableRow2">
-<th class="TableRow2" style="width: 100%; text-align: left;">&nbsp;Signup Message: </th>
+<th class="TableColumn2" style="width: 100%; text-align: left;">&nbsp;Signup Message: </th>
 </tr>
 <tr class="TableRow3">
-<td class="TableRow3">
+<td class="TableColumn3">
 <table style="width: 100%; height: 25%; text-align: center;">
 <?php if (pre_strlen($_POST['Password'])>="30") { $Error="Yes";  ?>
 <tr>
@@ -672,7 +780,16 @@ if(!isset($_POST['TOS'])) { $_POST['TOS'] = null; }
        <br />Your passwords did not match.<br />
        </span>&nbsp;</td>
 </tr>
-<?php } if ($Settings['TestReferer']===true) {
+<?php } if($Settings['use_captcha']=="on") {
+if (PhpCaptcha::Validate($_POST['signcode'])) {
+//echo 'Valid code entered';
+} else { $Error="Yes"; ?>
+<tr>
+       <td><span class="TableMessage">
+       <br />Invalid code entered<br />
+       </span>&nbsp;</td>
+</tr>
+<?php } } if ($Settings['TestReferer']=="on") {
        if ($URL['HOST']!=$URL['REFERER']) { $Error="Yes";  ?>
 <tr>
        <td><span class="TableMessage">
@@ -777,9 +894,9 @@ $_POST['Group'] = $Settings['MemberGroup'];
 $_POST['Joined'] = GMTimeStamp(); $_POST['LastActive'] = GMTimeStamp();
 $_POST['Signature'] = ""; $_POST['Interests'] = "";
 $_POST['Title'] = ""; $_POST['PostCount'] = "0";
-if($Settings['AdminValidate']===true||$Settings['AdminValidate']!==false)
+if($Settings['AdminValidate']=="on"||$Settings['AdminValidate']!="off")
 { $ValidateStats="no"; $yourgroup=$Settings['ValidateGroup']; }
-if($Settings['AdminValidate']===false)
+if($Settings['AdminValidate']=="on")
 { $ValidateStats="yes"; $yourgroup=$Settings['MemberGroup']; }
 $HashSalt = salt_hmac(); 
 $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$HashSalt,"sha1");
@@ -812,7 +929,7 @@ if(!is_numeric($_POST['MinOffSet'])) { $_POST['MinOffSet'] = "00"; }
 if($_POST['MinOffSet']>59) { $_POST['MinOffSet'] = "59"; }
 if($_POST['MinOffSet']<0) { $_POST['MinOffSet'] = "00"; }
 $_POST['YourOffSet'] = $_POST['YourOffSet'].":".$_POST['MinOffSet'];
-$query = query("INSERT INTO `".$Settings['sqltable']."members` VALUES (".$yourid.",'%s','%s','%s','%s','%s','%s',%i,'%s','%s',%i,%i,'0','0','0','0','%s','%s','%s','%s','%s','%s',%i,'%s','%s','%s','%s','%s')", array($Name,$NewPassword,"iDBH",$_POST['Email'],$yourgroup,$ValidateStats,"0",$_POST['Interests'],$_POST['Title'],$_POST['Joined'],$_POST['LastActive'],$NewSignature,'Your Notes',$Avatar,"100x100",$Website,$_POST['YourGender'],$_POST['PostCount'],$_POST['YourOffSet'],$_POST['DST'],$Settings['DefaultTheme'],$_POST['UserIP'],$HashSalt));
+$query = query("INSERT INTO `".$Settings['sqltable']."members` VALUES (".$yourid.",'%s','%s','%s','%s','%s','%s',%i,'%s','%s',%i,%i,'0','0','0','0','%s','%s','%s','%s','%s','%s',%i,0,0,10,10,10,'%s','%s','%s','%s','%s')", array($Name,$NewPassword,"iDBH",$_POST['Email'],$yourgroup,$ValidateStats,"0",$_POST['Interests'],$_POST['Title'],$_POST['Joined'],$_POST['LastActive'],$NewSignature,'Your Notes',$Avatar,"100x100",$Website,$_POST['YourGender'],$_POST['PostCount'],$_POST['YourOffSet'],$_POST['DST'],$Settings['DefaultTheme'],$_POST['UserIP'],$HashSalt));
 mysql_query($query);
 $querylogr = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `Name`='%s' AND `Password`='%s' LIMIT 1", array($Name,$NewPassword));
 $resultlogr=mysql_query($querylogr);
@@ -838,7 +955,7 @@ $_SESSION['UserDST']=$YourDSTMr;
 $_SESSION['UserGroup']=$YourGroupMr;
 $_SESSION['UserPass']=$NewPassword;
 $_SESSION['DBName']=$Settings['sqldb'];
-if($_POST['storecookie']===true) {
+if($_POST['storecookie']=="true") {
 if($cookieDomain==null) {
 @setcookie("MemberName", $YourNameM, time() + (7 * 86400), $cbasedir);
 @setcookie("UserID", $YourIDM, time() + (7 * 86400), $cbasedir);
@@ -867,7 +984,7 @@ $query = query("INSERT INTO `".$Settings['sqltable']."messenger` VALUES (null,%i
        <td><span class="TableMessage">
        <br />Welcome to the Board <?php echo $_SESSION['MemberName']; ?>. ^_^<br />
        Click <a href="<?php echo url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']); ?>">here</a> to continue to board.<?php echo "\n"; 
-       if($Settings['AdminValidate']===true||$Settings['AdminValidate']!==false) {
+       if($Settings['AdminValidate']=="on"||$Settings['AdminValidate']!="off") {
        echo "<br />The admin has to validate your account befoure you can post.\n";
        echo "<br />The admin has been notified of your registration.\n"; } ?>
        <br />&nbsp;
@@ -877,8 +994,8 @@ $query = query("INSERT INTO `".$Settings['sqltable']."messenger` VALUES (null,%i
 </table>
 </td></tr>
 <tr class="TableRow4">
-<td class="TableRow4">&nbsp;</td>
+<td class="TableColumn4">&nbsp;</td>
 </tr>
 </table></div>
 <?php } } } ?>
-<div>&nbsp;</div>
\ No newline at end of file
+<div class="DivMembers">&nbsp;</div>
\ No newline at end of file