Small bug fix read below.

(If user gets deleted it shows them as a guest.)
You can also login by email address.

git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@337 2b68903e-0b30-0410-9a39-a2e4f3c5be39

diff --git a/inc/categories.php b/inc/categories.php
index c5746b8..d954bd7 100644 (file)
--- a/inc/categories.php
+++ b/inc/categories.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: categories.php - Last Update: 9/16/2009 SVN 320 - Author: cooldude2k $
+    $FileInfo: categories.php - Last Update: 11/10/2009 SVN 337 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="categories.php"||$File3Name=="/categories.php") {
@@ -192,6 +192,8 @@ $TimeStamp=mysql_result($glrresult,0,"TimeStamp");
 $TimeStamp=GMTimeChange("F j Y, g:i a",$TimeStamp,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
 @mysql_free_result($glrresult); }
 $UsersName = GetUserName($UsersID,$Settings['sqltable']);
+if($UsersName===null) { $UsersID = -1;
+$UsersName = GetUserName($UsersID,$Settings['sqltable']); }
 $UsersHidden = GetHiddenMember($UsersID,$Settings['sqltable']);
 if($UsersName=="Guest") { $UsersName=$GuestsName;
 if($UsersName==null) { $UsersName="Guest"; } }

diff --git a/inc/events.php b/inc/events.php
index e704592..e93eaf2 100644 (file)
--- a/inc/events.php
+++ b/inc/events.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: events.php - Last Update: 8/20/2009 SVN 314 - Author: cooldude2k $
+    $FileInfo: events.php - Last Update: 11/10/2009 SVN 337 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="events.php"||$File3Name=="/events.php") {
@@ -51,8 +51,11 @@ $_SESSION['ViewingTitle'] = $EventName;
 $requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($EventUser));
 $reresult=mysql_query($requery);
 $renum=mysql_num_rows($reresult);
+if($renum<1) { $EventUser = -1;
+$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($EventUser));
+$reresult=mysql_query($requery);
+$renum=mysql_num_rows($reresult); }
 $rei=0;
-while ($rei < $renum) {
 $User1ID=$EventUser;
 $User1Name=mysql_result($reresult,$rei,"Name");
 $User1IP=mysql_result($reresult,$rei,"IP");
@@ -81,7 +84,7 @@ $AvatarSize1W=$AvatarSize1[0]; $AvatarSize1H=$AvatarSize1[1];
 $User1Website=mysql_result($reresult,$rei,"Website");
 $User1PostCount=mysql_result($reresult,$rei,"PostCount");
 $User1IP=mysql_result($reresult,$rei,"IP");
-++$rei; } @mysql_free_result($reresult);
+@mysql_free_result($reresult);
 ++$is; } @mysql_free_result($result);
 if($User1Name=="Guest") { $User1Name=$EventGuest;
 if($User1Name==null) { $User1Name="Guest"; } }

diff --git a/inc/forums.php b/inc/forums.php
index 407ad0d..fe9f0df 100644 (file)
--- a/inc/forums.php
+++ b/inc/forums.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: forums.php - Last Update: 9/16/2009 SVN 320 - Author: cooldude2k $
+    $FileInfo: forums.php - Last Update: 11/10/2009 SVN 337 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="forums.php"||$File3Name=="/forums.php") {
@@ -164,6 +164,8 @@ $TimeStamp=mysql_result($glrresult,0,"TimeStamp");
 $TimeStamp=GMTimeChange("F j Y, g:i a",$TimeStamp,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
 @mysql_free_result($glrresult); }
 $UsersName = GetUserName($UsersID,$Settings['sqltable']);
+if($UsersName===null) { $UsersID = -1;
+$UsersName = GetUserName($UsersID,$Settings['sqltable']); }
 $UsersHidden = GetHiddenMember($UsersID,$Settings['sqltable']);
 $UsersName1 = pre_substr($UsersName,0,20);
 if($UsersName=="Guest") { $UsersName=$GuestsName;

diff --git a/inc/groupsetup.php b/inc/groupsetup.php
index 0731fbd..ca0de5b 100644 (file)
--- a/inc/groupsetup.php
+++ b/inc/groupsetup.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: groupsetup.php - Last Update: 8/6/2009 SVN 296 - Author: cooldude2k $
+    $FileInfo: groupsetup.php - Last Update: 11/10/2009 SVN 337 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="groupsetup.php"||$File3Name=="/groupsetup.php") {
@@ -25,6 +25,9 @@ if($Settings['file_ext']=="no+ext"||$Settings['file_ext']=="no ext") {
 $_SESSION['ViewingFile'] = $exfile['index']; }
 $_SESSION['PreViewingTitle'] = "Viewing";
 $_SESSION['ViewingTitle'] = "Board index";
+/*$ggidquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `name`='%s' LIMIT 1", array($Settings['GuestGroup']));
+$ggidresult=mysql_query($ggidquery);
+$Settings['GuestGroupID']=mysql_result($ggidresult,0,"id");*/
 // Check to make sure MemberInfo is right
 $MyPostCountChk = null; $MyKarmaCount = null;
 if(!isset($_SESSION['UserID'])) { $_SESSION['UserID'] = 0; }

diff --git a/inc/lowreplies.php b/inc/lowreplies.php
index 9a2a8ac..a01896a 100644 (file)
--- a/inc/lowreplies.php
+++ b/inc/lowreplies.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: replies.php - Last Update: 8/7/2009 SVN 297 - Author: cooldude2k $
+    $FileInfo: replies.php - Last Update: 11/10/2009 SVN 337 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="replies.php"||$File3Name=="/replies.php") {
@@ -223,6 +223,7 @@ $MyGuestName=mysql_result($result,$i,"GuestName");
 $MyTimeStamp=mysql_result($result,$i,"TimeStamp");
 $MyEditTime=mysql_result($result,$i,"LastUpdate");
 $MyEditUserID=mysql_result($result,$i,"EditUser");
+$MyEditUserName=mysql_result($result,$i,"EditUserName");
 $MyTimeStamp=GMTimeChange("M j, Y, g:i a",$MyTimeStamp,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
 $MyPost=mysql_result($result,$i,"Post");
 $MyPost = preg_replace("/\<br\>/", "<br />\n", nl2br($MyPost));
@@ -230,6 +231,10 @@ $MyDescription=mysql_result($result,$i,"Description");
 $requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyUserID));
 $reresult=mysql_query($requery);
 $renum=mysql_num_rows($reresult);
+if($renum<1) { $MyUserID = -1;
+$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyUserID));
+$reresult=mysql_query($requery);
+$renum=mysql_num_rows($reresult); }
 $rei=0; $ipshow = "two";
 $User1ID=$MyUserID; $GuestsName = $MyGuestName;
 $User1Name=mysql_result($reresult,$rei,"Name");
@@ -268,15 +273,62 @@ if(isset($GroupNameSuffix)&&$GroupNameSuffix!=null) {
        $User1Name = $User1Name.$GroupNameSuffix; }
 $MySubPost = null;
 if($MyEditTime!=$MyTimeStamp&&$MyEditUserID!=0) {
+if($MyEditUserID!=$MyUserID) {
 $euquery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyEditUserID));
 $euresult = mysql_query($euquery);
 $eunum = mysql_num_rows($euresult);
-$eui=0; while ($eui < $eunum) {
+if($eunum<1) { $MyEditUserID = -1;
+$euquery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyEditUserID));
+$euresult = mysql_query($euquery);
+$eunum = mysql_num_rows($euresult); }
        $EditUserID = $MyEditUserID;
-       $EditUserName = mysql_result($euresult,$eui,"Name");
-       ++$eui; }
+       $EditUserGroupID = mysql_result($euresult,0,"GroupID");
+       $EditUserHidden=mysql_result($euresult,0,"HiddenMember");
+       $EditUserName = mysql_result($euresult,0,"Name");
+       @mysql_free_result($euresult);
+       $eugquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($EditUserGroupID));
+       $eugresult=mysql_query($eugquery);
+       $EditUserGroup=mysql_result($eugresult,0,"Name");
+       $EditUserNamePrefix=mysql_result($eugresult,0,"NamePrefix");
+       $EditUserNameSuffix=mysql_result($eugresult,0,"NameSuffix");
+       @mysql_free_result($eugresult); }
+       if($MyEditUserID==$MyUserID) {
+       $EditUserID = $User1ID;
+       $EditUserGroupID = $User1GroupID;
+       $EditUserHidden=$User1Hidden;
+       $EditUserName = $User1Name;
+       $EditUserGroup=$User1Group;
+       $EditUserNamePrefix=null;
+       $EditUserNameSuffix=null; }
+       if($EditUserName=="Guest") { $EditUserName=$MyEditUserName;
+       if($EditUserName==null) { $EditUserName="Guest"; } }
+       if(isset($GroupNamePrefix)&&$GroupNamePrefix!=null) {
+               $EditUserName = $EditUserNamePrefix.$EditUserName; }
+       if(isset($GroupNameSuffix)&&$GroupNameSuffix!=null) {
+               $EditUserName = $EditUserName.$EditUserNameSuffix; }
        $MyEditTime = GMTimeChange("M j, Y, g:i a",$MyEditTime,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
        $MySubPost = "<div class=\"EditReply\"><br />This post has been edited by <b>".$EditUserName."</b> on ".$MyEditTime."</div>"; }
+if($MyEditTime!=$MyTimeStamp&&$MyEditUserID!=0&&$MyEditUserID!=$MyUserID) {
+$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyUserID));
+$reresult=mysql_query($requery);
+$renum=mysql_num_rows($reresult);
+$rei=0; $ipshow = "two";
+$User1ID=$MyUserID; $GuestsName = $MyGuestName;
+$User1Name=mysql_result($reresult,$rei,"Name");
+$User1IP=mysql_result($reresult,$rei,"IP");
+if($User1IP==$MyPostIP) { $ipshow = "one"; }
+$User1Email=mysql_result($reresult,$rei,"Email");
+$User1Title=mysql_result($reresult,$rei,"Title");
+$User1Joined=mysql_result($reresult,$rei,"Joined");
+$User1Joined=GMTimeChange("M j Y",$User1Joined,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
+$User1Hidden=mysql_result($reresult,$rei,"HiddenMember");
+$User1GroupID=mysql_result($reresult,$rei,"GroupID");
+$gquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($User1GroupID));
+$gresult=mysql_query($gquery);
+$User1Group=mysql_result($gresult,0,"Name");
+$GroupNamePrefix=mysql_result($gresult,0,"NamePrefix");
+$GroupNameSuffix=mysql_result($gresult,0,"NameSuffix");
+@mysql_free_result($gresult); }
 $MyPost = text2icons($MyPost,$Settings['sqltable']);
 if($MySubPost!=null) { $MyPost = $MyPost."\n".$MySubPost; }
 $User1Signature = preg_replace("/\<br\>/", "<br />\n", nl2br($User1Signature));

diff --git a/inc/lowtopics.php b/inc/lowtopics.php
index 7028906..b900d31 100644 (file)
--- a/inc/lowtopics.php
+++ b/inc/lowtopics.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: lowtopics.php - Last Update: 8/7/2009 SVN 297 - Author: cooldude2k $
+    $FileInfo: lowtopics.php - Last Update: 11/10/2009 SVN 337 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="lowtopics.php"||$File3Name=="/lowtopics.php") {
@@ -248,6 +248,10 @@ $TopicStat=mysql_result($result,$i,"Closed");
 $requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($UsersID));
 $reresult=mysql_query($requery);
 $renum=mysql_num_rows($reresult);
+if($renum<1) { $UsersID = -1;
+$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($UsersID));
+$reresult=mysql_query($requery);
+$renum=mysql_num_rows($reresult); }
 $UserGroupID=mysql_result($reresult,0,"GroupID");
 @mysql_free_result($reresult);
 $gquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($UserGroupID));

diff --git a/inc/members.php b/inc/members.php
index 6be5603..f2e028e 100644 (file)
--- a/inc/members.php
+++ b/inc/members.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: members.php - Last Update: 8/27/2009 SVN 318 - Author: cooldude2k $
+    $FileInfo: members.php - Last Update: 11/10/2009 SVN 337 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="members.php"||$File3Name=="/members.php") {
@@ -744,6 +744,12 @@ $_SESSION['UserFormID'] = $UFID;
 <option value="true">Yes</option>
 <option value="false">No</option>
 </select></td>
+</tr><tr style="text-align: left;">
+       <td style="width: 30%;"><label class="TextBoxLabel" title="Use your Email address for username." for="loginemail">Login by Email?</label></td>
+       <td style="width: 70%;"><select id="loginemail" name="loginemail" class="TextBox">
+<option value="false">No</option>
+<option value="true">Yes</option>
+</select></td>
 </tr></table>
 <table style="text-align: left;">
 <tr style="text-align: left;">
@@ -833,11 +839,16 @@ $YourName = stripcslashes(htmlspecialchars($_POST['username'], ENT_QUOTES, $Sett
 //$YourName = preg_replace("/&amp;#(x[a-f0-9]+|[0-9]+);/i", "&#$1;", $YourName);
 $YourName = @remove_spaces($YourName);
 $passtype="ODFH";
-$querylog = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `Name`='%s' LIMIT 1", array($YourName));
+if(!isset($_POST['loginemail'])) { $_POST['loginemail'] = "false"; }
+if($_POST['loginemail']!="true") {
+$querylog = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `Name`='%s' LIMIT 1", array($YourName)); }
+if($_POST['loginemail']=="true") {
+$querylog = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `Email`='%s' LIMIT 1", array($YourName)); }
 $resultlog=mysql_query($querylog);
 $numlog=mysql_num_rows($resultlog);
 if($numlog>=1) {
 $i=0;
+$YourName=mysql_result($resultlog,$i,"Name");
 $YourPassTry=mysql_result($resultlog,$i,"Password");
 $HashType=mysql_result($resultlog,$i,"HashType");
 $JoinedPass=mysql_result($resultlog,$i,"Joined");

diff --git a/inc/pm.php b/inc/pm.php
index 0a41a30..51b38ff 100644 (file)
--- a/inc/pm.php
+++ b/inc/pm.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: pm.php - Last Update: 11/10/2009 SVN 335 - Author: cooldude2k $
+    $FileInfo: pm.php - Last Update: 11/10/2009 SVN 337 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="pm.php"||$File3Name=="/pm.php") {
@@ -188,10 +188,12 @@ while ($i < $num) {
 $PMID=mysql_result($result,$i,"id");
 $SenderID=mysql_result($result,$i,"SenderID");
 $SenderName = GetUserName($SenderID,$Settings['sqltable']);
+if($SenderName===null) { $SenderID = -1;
+$SenderName = GetUserName($SenderID,$Settings['sqltable']); }
 $SenderHidden = GetHiddenMember($SenderID,$Settings['sqltable']);
-$SentToID=mysql_result($result,$i,"ReciverID");
-$SentToName = GetUserName($SentToID,$Settings['sqltable']);
-$SentToHidden = GetHiddenMember($SentToID,$Settings['sqltable']);
+$ReciverID=mysql_result($result,$i,"ReciverID");
+$ReciverName = GetUserName($ReciverID,$Settings['sqltable']);
+$ReciverHidden = GetHiddenMember($ReciverID,$Settings['sqltable']);
 $PMGuest=mysql_result($result,$i,"GuestName");
 $MessageName=mysql_result($result,$i,"MessageTitle");
 $MessageDesc=mysql_result($result,$i,"Description");
@@ -352,10 +354,14 @@ while ($i < $num) {
 $PMID=mysql_result($result,$i,"id");
 $SenderID=mysql_result($result,$i,"SenderID");
 $SenderName = GetUserName($SenderID,$Settings['sqltable']);
+if($SenderName===null) { $SenderID = -1;
+$SenderName = GetUserName($SenderID,$Settings['sqltable']); }
 $SenderHidden = GetHiddenMember($SenderID,$Settings['sqltable']);
-$SentToID=mysql_result($result,$i,"ReciverID");
-$SentToName = GetUserName($SentToID,$Settings['sqltable']);
-$SentToHidden = GetHiddenMember($SentToID,$Settings['sqltable']);
+$ReciverID=mysql_result($result,$i,"ReciverID");
+$ReciverName = GetUserName($ReciverID,$Settings['sqltable']);
+if($ReciverName===null) { $ReciverID = -1;
+$ReciverName = GetUserName($ReciverID,$Settings['sqltable']); }
+$ReciverHidden = GetHiddenMember($ReciverID,$Settings['sqltable']);
 $PMGuest=mysql_result($result,$i,"GuestName");
 $MessageName=mysql_result($result,$i,"MessageTitle");
 $MessageDesc=mysql_result($result,$i,"Description");
@@ -377,12 +383,12 @@ if ($MessageStat==1) {
 <a href="<?php echo url_maker($exfile['messenger'],$Settings['file_ext'],"act=read&id=".$PMID,$Settings['qstr'],$Settings['qsep'],$prexqstr['messenger'],$exqstr['messenger']); ?>"><?php echo $MessageName; ?></a></div>
 <div class="messagedesc"><?php echo $MessageDesc; ?></div></td>
 <td class="TableMenuColumn3" style="text-align: center;"><?php
-if($SentToID>0&&$SentToHidden=="no") {
+if($ReciverID>0&&$ReciverHidden=="no") {
 echo "<a href=\"";
-echo url_maker($exfile['member'],$Settings['file_ext'],"act=view&id=".$SentToID,$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']);
-echo "\">".$SentToName."</a>"; }
-if($SentToID<=0||$SentToHidden=="yes") {
-echo "<span>".$SentToName."</span>"; }
+echo url_maker($exfile['member'],$Settings['file_ext'],"act=view&id=".$ReciverID,$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']);
+echo "\">".$ReciverName."</a>"; }
+if($ReciverID<=0||$ReciverHidden=="yes") {
+echo "<span>".$ReciverName."</span>"; }
 ?></td>
 <td class="TableMenuColumn3" style="text-align: center;"><?php echo $DateSend; ?></td>
 </tr>
@@ -402,11 +408,15 @@ gzip_page($Settings['use_gzip'],$GZipEncode['Type']); @session_write_close(); di
 while ($is < $num) {
 $PMID=mysql_result($result,$is,"id");
 $SenderID=mysql_result($result,$is,"SenderID");
-//$SenderName = GetUserName($SenderID,$Settings['sqltable']);
-//$SenderHidden = GetHiddenMember($SenderID,$Settings['sqltable']);
-$SentToID=mysql_result($result,$is,"ReciverID");
-$SentToName = GetUserName($SentToID,$Settings['sqltable']);
-$SentToHidden = GetHiddenMember($SentToID,$Settings['sqltable']);
+$SenderName = GetUserName($SenderID,$Settings['sqltable']);
+if($SenderName===null) { $SenderID = -1;
+$SenderName = GetUserName($SenderID,$Settings['sqltable']); }
+$SenderHidden = GetHiddenMember($SenderID,$Settings['sqltable']);
+$ReciverID=mysql_result($result,$is,"ReciverID");
+$ReciverName = GetUserName($ReciverID,$Settings['sqltable']);
+if($ReciverName===null) { $ReciverID = -1;
+$ReciverName = GetUserName($ReciverID,$Settings['sqltable']); }
+$ReciverHidden = GetHiddenMember($ReciverID,$Settings['sqltable']);
 $PMGuest=mysql_result($result,$is,"GuestName");
 $MessageName=mysql_result($result,$is,"MessageTitle");
 $DateSend=mysql_result($result,$is,"DateSend");
@@ -418,7 +428,7 @@ $requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i
 $reresult=mysql_query($requery);
 $renum=mysql_num_rows($reresult);
 $rei=0;
-if($_SESSION['UserID']!=$SentToID&&
+if($_SESSION['UserID']!=$ReciverID&&
        $_SESSION['UserID']!=$SenderID) {
 redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false));
 ob_clean(); @header("Content-Type: text/plain; charset=".$Settings['charset']);
@@ -456,7 +466,7 @@ $User1Karma=mysql_result($reresult,$rei,"Karma");
 $User1IP=mysql_result($reresult,$rei,"IP");
 ++$rei; } @mysql_free_result($reresult);
 ++$is; } @mysql_free_result($result);
-if($_SESSION['UserID']==$SentToID) {
+if($_SESSION['UserID']==$ReciverID) {
 $queryup = query("UPDATE `".$Settings['sqltable']."messenger` SET `Read`=%i WHERE `id`=%i", array(1,$_GET['id']));
 mysql_query($queryup); }
 if($User1Name=="Guest") { $User1Name=$PMGuest;

diff --git a/inc/replies.php b/inc/replies.php
index 94246e1..1222b68 100644 (file)
--- a/inc/replies.php
+++ b/inc/replies.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: replies.php - Last Update: 11/10/2009 SVN 335 - Author: cooldude2k $
+    $FileInfo: replies.php - Last Update: 11/10/2009 SVN 337 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="replies.php"||$File3Name=="/replies.php") {
@@ -268,6 +268,10 @@ $MyDescription=mysql_result($result,$i,"Description");
 $requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyUserID));
 $reresult=mysql_query($requery);
 $renum=mysql_num_rows($reresult);
+if($renum<1) { $MyUserID = -1;
+$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyUserID));
+$reresult=mysql_query($requery);
+$renum=mysql_num_rows($reresult); }
 $rei=0; $ipshow = "two";
 $User1ID=$MyUserID; $GuestsName = $MyGuestName;
 $User1Name=mysql_result($reresult,$rei,"Name");
@@ -306,18 +310,21 @@ if(isset($GroupNamePrefix)&&$GroupNamePrefix!=null) {
 if(isset($GroupNameSuffix)&&$GroupNameSuffix!=null) {
        $User1Name = $User1Name.$GroupNameSuffix; }
 $MySubPost = null;
-
 if($MyEditTime!=$MyTimeStamp&&$MyEditUserID!=0) {
 if($MyEditUserID!=$MyUserID) {
 $euquery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyEditUserID));
 $euresult = mysql_query($euquery);
 $eunum = mysql_num_rows($euresult);
+if($eunum<1) { $MyEditUserID = -1;
+$euquery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyEditUserID));
+$euresult = mysql_query($euquery);
+$eunum = mysql_num_rows($euresult); }
        $EditUserID = $MyEditUserID;
        $EditUserGroupID = mysql_result($euresult,0,"GroupID");
        $EditUserHidden=mysql_result($euresult,0,"HiddenMember");
        $EditUserName = mysql_result($euresult,0,"Name");
        @mysql_free_result($euresult);
-       $eugquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($EditUserID));
+       $eugquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($EditUserGroupID));
        $eugresult=mysql_query($eugquery);
        $EditUserGroup=mysql_result($eugresult,0,"Name");
        $EditUserNamePrefix=mysql_result($eugresult,0,"NamePrefix");
@@ -329,8 +336,8 @@ $eunum = mysql_num_rows($euresult);
        $EditUserHidden=$User1Hidden;
        $EditUserName = $User1Name;
        $EditUserGroup=$User1Group;
-       $EditUserNamePrefix=$GroupNamePrefix;
-       $EditUserNameSuffix=$GroupNameSuffix; }
+       $EditUserNamePrefix=null;
+       $EditUserNameSuffix=null; }
        if($EditUserName=="Guest") { $EditUserName=$MyEditUserName;
        if($EditUserName==null) { $EditUserName="Guest"; } }
        if(isset($GroupNamePrefix)&&$GroupNamePrefix!=null) {
@@ -359,10 +366,7 @@ $gresult=mysql_query($gquery);
 $User1Group=mysql_result($gresult,0,"Name");
 $GroupNamePrefix=mysql_result($gresult,0,"NamePrefix");
 $GroupNameSuffix=mysql_result($gresult,0,"NameSuffix");
-@mysql_free_result($gresult);
-
-}
-
+@mysql_free_result($gresult); }
 $MyPost = text2icons($MyPost,$Settings['sqltable']);
 if($MySubPost!=null) { $MyPost = $MyPost."\n".$MySubPost; }
 $User1Signature = preg_replace("/\<br\>/", "<br />\n", nl2br($User1Signature));
@@ -547,6 +551,10 @@ $QuoteGuestName=mysql_result($result,0,"GuestName");
 $requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($QuoteUserID));
 $reresult=mysql_query($requery);
 $renum=mysql_num_rows($reresult);
+if($renum<1) { $QuoteUserID = -1;
+$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($QuoteUserID));
+$reresult=mysql_query($requery);
+$renum=mysql_num_rows($reresult); }
 $QuoteUserName=mysql_result($reresult,0,"Name");
 if($QuoteUserName=="Guest") { $QuoteUserName=$QuoteGuestName;
 if($QuoteUserName==null) { $QuoteUserName="Guest"; } }

diff --git a/inc/rssfeed.php b/inc/rssfeed.php
index 7370038..4fc3fb9 100644 (file)
--- a/inc/rssfeed.php
+++ b/inc/rssfeed.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: rssfeed.php - Last Update: 11/07/2009 SVN 334 - Author: cooldude2k $
+    $FileInfo: rssfeed.php - Last Update: 11/10/2009 SVN 337 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="rssfeed.php"||$File3Name=="/rssfeed.php") {
@@ -129,6 +129,10 @@ $GuestsName=mysql_result($result,$i,"GuestName");
 $requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($UsersID));
 $reresult=mysql_query($requery);
 $renum=mysql_num_rows($reresult);
+if($renum<1) { $UsersID = -1;
+$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($UsersID));
+$reresult=mysql_query($requery);
+$renum=mysql_num_rows($reresult); }
 $UsersName=mysql_result($reresult,0,"Name");
 $UsersGroupID=mysql_result($reresult,0,"GroupID");
 if($UsersName=="Guest") { $UsersName=$GuestsName;

diff --git a/inc/searchs.php b/inc/searchs.php
index 75dd13b..2fb47df 100644 (file)
--- a/inc/searchs.php
+++ b/inc/searchs.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: searchs.php - Last Update: 9/16/2009 SVN 320 - Author: cooldude2k $
+    $FileInfo: searchs.php - Last Update: 11/10/2009 SVN 337 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="searchs.php"||$File3Name=="/searchs.php") {
@@ -92,7 +92,7 @@ $memsiquery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `Nam
 $memsiresult=mysql_query($memsiquery);
 $memsinum=mysql_num_rows($memsiresult);
 $memsi=0;
-if($memsinum==0) { $_GET['msearch'] = null; }
+if($memsinum==0) { $memsid = -1; }
 if($memsinum!=0) {
 $memsid=mysql_result($memsiresult,$memsi,"id"); 
 @mysql_free_result($memsiresult); } }
@@ -107,9 +107,13 @@ if($_GET['type']=="wildcard") {
 $query = query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."topics` WHERE `TopicName` LIKE '%s' ORDER BY `Pinned` DESC, `LastUpdate` DESC LIMIT %i,%i", array($_GET['search'],$PageLimit,$Settings['max_topics'])); } }
 if($_GET['msearch']!=null) {
 if($_GET['type']!="wildcard") {
-$query = query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."topics` WHERE `TopicName`='%s' AND `UserID`=%i ORDER BY `Pinned` DESC, `LastUpdate` DESC LIMIT %i,%i", array($_GET['search'],$memsid,$PageLimit,$Settings['max_topics'])); }
+$query = query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."topics` WHERE `TopicName`='%s' AND `UserID`=%i ORDER BY `Pinned` DESC, `LastUpdate` DESC LIMIT %i,%i", array($_GET['search'],$memsid,$PageLimit,$Settings['max_topics']));
+if($memsid==-1) {
+$query = query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."topics` WHERE `TopicName`='%s' AND `GuestName`='%s' ORDER BY `Pinned` DESC, `LastUpdate` DESC LIMIT %i,%i", array($_GET['search'],$_GET['msearch'],$PageLimit,$Settings['max_topics'])); } }
 if($_GET['type']=="wildcard") {
-$query = query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."topics` WHERE `TopicName` LIKE '%s' AND `UserID`=%i ORDER BY `Pinned` DESC, `LastUpdate` DESC LIMIT %i,%i", array($_GET['search'],$memsid,$PageLimit,$Settings['max_topics'])); } }
+$query = query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."topics` WHERE `TopicName` LIKE '%s' AND `UserID`=%i ORDER BY `Pinned` DESC, `LastUpdate` DESC LIMIT %i,%i", array($_GET['search'],$memsid,$PageLimit,$Settings['max_topics']));
+if($memsid==-1) {
+$query = query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."topics` WHERE `TopicName` LIKE '%s' AND `GuestName`='%s' ORDER BY `Pinned` DESC, `LastUpdate` DESC LIMIT %i,%i", array($_GET['search'],$_GET['msearch'],$PageLimit,$Settings['max_topics'])); } } }
 $rnquery = query("SELECT FOUND_ROWS();", array(null));
 $result=mysql_query($query);
 $rnresult=mysql_query($rnquery);
@@ -353,6 +357,8 @@ $TopicDescription=mysql_result($result,$i,"Description");
 $PinnedTopic=mysql_result($result,$i,"Pinned");
 $TopicStat=mysql_result($result,$i,"Closed");
 $UsersName = GetUserName($UsersID,$Settings['sqltable']);
+if($UsersName===null) { $UsersID = -1;
+$UsersName = GetUserName($UsersID,$Settings['sqltable']); }
 if($UsersName=="Guest") { $UsersName=$GuestsName;
 if($UsersName==null) { $UsersName="Guest"; } }
 if(isset($PermissionInfo['CanViewForum'][$ForumID])&&
@@ -370,6 +376,8 @@ $GuestsName1=mysql_result($glrresult,0,"GuestName");
 $TimeStamp1=mysql_result($glrresult,0,"TimeStamp");
 $TimeStamp1=GMTimeChange("F j, Y",$TimeStamp1,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
 $UsersName1 = GetUserName($UsersID1,$Settings['sqltable']); 
+if($UsersName1===null) { $UsersID1 = -1;
+$UsersName1 = GetUserName($UsersID1,$Settings['sqltable']); }
 $UsersHidden1 = GetHiddenMember($UsersID1,$Settings['sqltable']); }
 $NumPages = null; $NumRPosts = $NumReply + 1;
 if(!isset($Settings['max_posts'])) { $Settings['max_posts'] = 10; }

diff --git a/inc/topics.php b/inc/topics.php
index 64163b0..5f28871 100644 (file)
--- a/inc/topics.php
+++ b/inc/topics.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: topics.php - Last Update: 11/10/2009 SVN 335 - Author: cooldude2k $
+    $FileInfo: topics.php - Last Update: 11/10/2009 SVN 337 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="topics.php"||$File3Name=="/topics.php") {
@@ -344,6 +344,10 @@ $TopicStat=mysql_result($result,$i,"Closed");
 $requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($UsersID));
 $reresult=mysql_query($requery);
 $renum=mysql_num_rows($reresult);
+if($renum<1) { $UsersID = -1;
+$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($UsersID));
+$reresult=mysql_query($requery);
+$renum=mysql_num_rows($reresult); }
 $UserHidden=mysql_result($reresult,0,"HiddenMember");
 $UserGroupID=mysql_result($reresult,0,"GroupID");
 @mysql_free_result($reresult);
@@ -367,11 +371,13 @@ $glrnum=mysql_num_rows($glrresult);
 if($glrnum>0){
 $ReplyID1=mysql_result($glrresult,0,"id");
 $UsersID1=mysql_result($glrresult,0,"UserID");
+$UsersName1 = GetUserName($UsersID1,$Settings['sqltable']);
+if($UsersName1===null) { $UsersID1 = -1;
+$UsersName1 = GetUserName($UsersID1,$Settings['sqltable']); }
 $UsersHidden1=GetHiddenMember($UsersID1,$Settings['sqltable']);
 $GuestsName1=mysql_result($glrresult,0,"GuestName");
 $TimeStamp1=mysql_result($glrresult,0,"TimeStamp");
-$TimeStamp1=GMTimeChange("F j Y, g:i a",$TimeStamp1,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
-$UsersName1 = GetUserName($UsersID1,$Settings['sqltable']); }
+$TimeStamp1=GMTimeChange("F j Y, g:i a",$TimeStamp1,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']); }
 $NumPages = null; $NumRPosts = $NumReply + 1;
 if(!isset($Settings['max_posts'])) { $Settings['max_posts'] = 10; }
 if($NumRPosts>$Settings['max_posts']) {

diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index aa01443..39307b6 100644 (file)
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: versioninfo.php - Last Update: 11/10/2009 SVN 336 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 11/10/2009 SVN 337 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") {
@@ -27,7 +27,7 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) {
        return $return_var; }
 // Version number and date stuff. :P
 $VER1[0] = 0; $VER1[1] = 3; $VER1[2] = 1; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 336; $RName = "iDB"; $SFName = "IntDB";
+$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 337; $RName = "iDB"; $SFName = "IntDB";
 $SVNDay[0] = 11; $SVNDay[1] = 10; $SVNDay[2] = 2009; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
 $VerInfo['iDB_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,false);
 $VerInfo['iDB_Ver_SVN'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,true);

diff --git a/mysql.php b/mysql.php
index 7412291..80bc589 100644 (file)
--- a/mysql.php
+++ b/mysql.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: mysql.php - Last Update: 8/27/2009 SVN 318 - Author: cooldude2k $
+    $FileInfo: mysql.php - Last Update: 11/10/2009 SVN 337 - Author: cooldude2k $
 */
 /* Some ini setting changes uncomment if you need them. 
    Display PHP Errors */
@@ -357,7 +357,7 @@ $_GET['theme']="iDB"; $_SESSION['Theme']="iDB"; }
 if (file_exists($SettDir['themes'].$_GET['theme']."/settings.php")) {
 if($_SESSION['UserGroup']!=$Settings['GuestGroup']) {
 $NewDay=GMTimeStamp();
-$qnewskin = query("update `".$Settings['sqltable']."members` set `UseTheme`='%s',`LastActive`='%s' WHERE `id`=%i", array($_GET['theme'],$NewDay,$_SESSION['UserID']));
+$qnewskin = query("UPDATE `".$Settings['sqltable']."members` SET `UseTheme`='%s',`LastActive`='%s' WHERE `id`=%i", array($_GET['theme'],$NewDay,$_SESSION['UserID']));
 mysql_query($qnewskin); }
 /* The file Theme Exists */ }
 else { $_GET['theme'] = $Settings['DefaultTheme']; 
@@ -365,6 +365,12 @@ $_SESSION['Theme'] = $Settings['DefaultTheme'];
 /* The file Theme Dose Not Exists */ } }
 if($_GET['theme']==null) { 
 if($_SESSION['Theme']!=null) {
+$OldTheme = $_SESSION['Theme'];
+$_SESSION['Theme'] = chack_themes($_SESSION['Theme']);
+if($OldTheme!=$_SESSION['Theme']) { 
+$NewDay=GMTimeStamp();
+$qnewskin = query("UPDATE `".$Settings['sqltable']."members` SET `UseTheme`='%s',`LastActive`='%s' WHERE `id`=%i", array($_SESSION['Theme'],$NewDay,$_SESSION['UserID']));
+mysql_query($qnewskin); }
 $_GET['theme']=$_SESSION['Theme']; }
 if($_SESSION['Theme']==null) {
 $_SESSION['Theme']=$Settings['DefaultTheme'];