Small update.

diff --git a/inc/admin/sqldumper/mysql.php b/inc/admin/sqldumper/mysql.php
index 2c778a6..1f88eee 100644 (file)
--- a/inc/admin/sqldumper/mysql.php
+++ b/inc/admin/sqldumper/mysql.php
@@ -152,7 +152,7 @@ if (!$result2) {
 sql_free_result($result2);
 sql_free_result($tabsta);
 ++$l; } $tableout = null;
-$num = count($TableNames); $renee_s = 0;
+$num = count($TableNames); $melanie_p = 0;
 $sqldump = "-- ".$OrgName." ".$SQLDumper."\n";
 $sqldump .= "-- version ".$VerInfo['iDB_Ver_SVN']."\n";
 $sqldump .= "-- ".$iDBHome."support/\n";
@@ -166,13 +166,13 @@ $sqldump .= "--\n";
 $sqldump .= "-- Database: \"".$Settings['sqldb']."\"\n";
 $sqldump .= "--\n\n";
 $sqldump .= "-- --------------------------------------------------------\n\n";
-while ($renee_s < $num) { $tnum = $num - 1;
-$trow = GetAllRows($TableNames[$renee_s]);
+while ($melanie_p < $num) { $tnum = $num - 1;
+$trow = GetAllRows($TableNames[$melanie_p]);
 $numz = count($trow); $kazuki_p = 0;
 $sqldump .= "--\n";
-$sqldump .= "-- Table structure for table \"".$TableNames[$renee_s]."\"\n";
+$sqldump .= "-- Table structure for table \"".$TableNames[$melanie_p]."\"\n";
 $sqldump .= "--\n\n";
-$sqldump .= $FullTable[$renee_s]."\n";
+$sqldump .= $FullTable[$melanie_p]."\n";
 while ($kazuki_p < $numz) { $tnumz = $numz - 1;
 $srow = null; $srowvalue = null;
 $trownew = $trow[$kazuki_p];
@@ -185,7 +185,7 @@ if($_GET['outtype']=="UTF-8"&&$Settings['charset']!="UTF-8") {
 $trowrvalue = utf8_encode($trowrvalue); }
 $trowrvalue = str_replace( array("\n", "\r"), array('\n', '\r'), $trowrvalue);
 /*if($kazuki_p===0) {*/
-if($il===0) { $srow = "INSERT INTO \"".$TableNames[$renee_s]."\" ("; }
+if($il===0) { $srow = "INSERT INTO \"".$TableNames[$melanie_p]."\" ("; }
 if($il<$tnums&&$il!=$tnums) { $srow .= "\"".$trowrname."\", "; }
 if($il==$tnums) { $srow .= "\"".$trowrname."\") VALUES"; } /*}*/
 if($il===0) { $srowvalue = "("; }
@@ -197,20 +197,20 @@ if($il==$tnums) { $srowvalue .= $trowrvalue;
 ++$il; }
 if($kazuki_p===0) {
 $sqldump .= "--\n";
-$sqldump .= "-- Dumping data for table \"".$TableNames[$renee_s]."\"\n";
+$sqldump .= "-- Dumping data for table \"".$TableNames[$melanie_p]."\"\n";
 $sqldump .= "--\n\n"; }
 $sqldump .= $srow."\n"; /*}*/
 $sqldump .= $srowvalue."\n";
-if($kazuki_p==$tnumz&&$renee_s<$tnum) {
+if($kazuki_p==$tnumz&&$melanie_p<$tnum) {
 $sqldump .= "\n-- --------------------------------------------------------\n"; }
 ++$kazuki_p; }
 if($numz===0) {
 $sqldump .= "--\n";
-$sqldump .= "-- Dumping data for table \"".$TableNames[$renee_s]."\"\n";
+$sqldump .= "-- Dumping data for table \"".$TableNames[$melanie_p]."\"\n";
 $sqldump .= "--\n\n";
 $sqldump .= "\n-- --------------------------------------------------------\n"; }
 $sqldump .= "\n";
-++$renee_s; }
+++$melanie_p; }
 if($_GET['compress']=="none") { echo $sqldump; }
 if($_GET['compress']=="gzencode") { echo gzencode($sqldump,$_GET['comlevel']); }
 if($_GET['compress']=="gzcompress") { echo gzcompress($sqldump,$_GET['comlevel']); }

diff --git a/inc/admin/sqldumper/pgsql.php b/inc/admin/sqldumper/pgsql.php
index 25dee80..815dd1a 100644 (file)
--- a/inc/admin/sqldumper/pgsql.php
+++ b/inc/admin/sqldumper/pgsql.php
@@ -137,7 +137,7 @@ if($zli+1 < $zlnum) { $FullTable[$sli] .= ","; }
 $FullTable[$sli] .= $UniKeyRow."\n);\n";
 ++$sli; }
 $TableNames = $TableChCk;
-$num = count($TableNames); $renee_s = 0;
+$num = count($TableNames); $melanie_p = 0;
 $sqldump = "-- ".$OrgName." ".$SQLDumper."\n";
 $sqldump .= "-- version ".$VerInfo['iDB_Ver_SVN']."\n";
 $sqldump .= "-- ".$iDBHome."support/\n";
@@ -150,13 +150,13 @@ $sqldump .= "--\n";
 $sqldump .= "-- Database: \"".$Settings['sqldb']."\"\n";
 $sqldump .= "--\n\n";
 $sqldump .= "-- --------------------------------------------------------\n\n";
-while ($renee_s < $num) { $tnum = $num - 1;
-$trow = GetAllRows($TableNames[$renee_s]);
+while ($melanie_p < $num) { $tnum = $num - 1;
+$trow = GetAllRows($TableNames[$melanie_p]);
 $numz = count($trow); $kazuki_p = 0;
 $sqldump .= "--\n";
-$sqldump .= "-- Table structure for table \"".$TableNames[$renee_s]."\"\n";
+$sqldump .= "-- Table structure for table \"".$TableNames[$melanie_p]."\"\n";
 $sqldump .= "--\n\n";
-$sqldump .= $FullTable[$renee_s]."\n";
+$sqldump .= $FullTable[$melanie_p]."\n";
 while ($kazuki_p < $numz) { $tnumz = $numz - 1;
 $srow = null; $srowvalue = null;
 $trownew = $trow[$kazuki_p];
@@ -169,7 +169,7 @@ if($_GET['outtype']=="UTF-8"&&$Settings['charset']!="UTF-8") {
 $trowrvalue = utf8_encode($trowrvalue); }
 $trowrvalue = str_replace( array("\n", "\r"), array('\n', '\r'), $trowrvalue);
 if($kazuki_p===0) {
-if($il===0) { $srow = "INSERT INTO \"".$TableNames[$renee_s]."\" ("; }
+if($il===0) { $srow = "INSERT INTO \"".$TableNames[$melanie_p]."\" ("; }
 if($il<$tnums&&$il!=$tnums) { $srow .= "\"".$trowrname."\", "; }
 if($il==$tnums) { $srow .= "\"".$trowrname."\") VALUES"; } }
 if($il===0) { $srowvalue = "("; }
@@ -181,20 +181,20 @@ if($kazuki_p==$tnumz) { $srowvalue .= ");"; } }
 ++$il; }
 if($kazuki_p===0) {
 $sqldump .= "--\n";
-$sqldump .= "-- Dumping data for table \"".$TableNames[$renee_s]."\"\n";
+$sqldump .= "-- Dumping data for table \"".$TableNames[$melanie_p]."\"\n";
 $sqldump .= "--\n\n";
 $sqldump .= $srow."\n"; }
 $sqldump .= $srowvalue."\n";
-if($kazuki_p==$tnumz&&$renee_s<$tnum) {
+if($kazuki_p==$tnumz&&$melanie_p<$tnum) {
 $sqldump .= "\n-- --------------------------------------------------------\n"; }
 ++$kazuki_p; }
 if($numz===0) {
 $sqldump .= "--\n";
-$sqldump .= "-- Dumping data for table \"".$TableNames[$renee_s]."\"\n";
+$sqldump .= "-- Dumping data for table \"".$TableNames[$melanie_p]."\"\n";
 $sqldump .= "--\n\n";
 $sqldump .= "\n-- --------------------------------------------------------\n"; }
 $sqldump .= "\n";
-++$renee_s; }
+++$melanie_p; }
 if($_GET['compress']=="none") { echo $sqldump; }
 if($_GET['compress']=="gzencode") { echo gzencode($sqldump,$_GET['comlevel']); }
 if($_GET['compress']=="gzcompress") { echo gzcompress($sqldump,$_GET['comlevel']); }

diff --git a/inc/admin/sqldumper/sqlite.php b/inc/admin/sqldumper/sqlite.php
index c3588b6..23c2630 100644 (file)
--- a/inc/admin/sqldumper/sqlite.php
+++ b/inc/admin/sqldumper/sqlite.php
@@ -22,7 +22,7 @@ if($_SESSION['UserGroup']==$Settings['GuestGroup']||$GroupInfo['HasAdminCP']=="n
 redirect("location",$rbasedir.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']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
-if($Settings['sqltype']!="sqlite") {
+if($Settings['sqltype']!="sqlite"||$Settings['sqltype']!="sqlite3") {
 redirect("location",$rbasedir.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']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
@@ -127,7 +127,7 @@ $FullTable[$sli] .= "\n);\n";
 */
 ++$sli; }
 $TableNames = $TableChCk;
-$num = count($TableNames); $renee_s = 0;
+$num = count($TableNames); $melanie_p = 0;
 $sqldump = "-- ".$OrgName." ".$SQLDumper."\n";
 $sqldump .= "-- version ".$VerInfo['iDB_Ver_SVN']."\n";
 $sqldump .= "-- ".$iDBHome."support/\n";
@@ -139,13 +139,13 @@ $sqldump .= "--\n";
 $sqldump .= "-- Database: \"".$Settings['sqldb']."\"\n";
 $sqldump .= "--\n\n";
 $sqldump .= "-- --------------------------------------------------------\n\n";
-while ($renee_s < $num) { $tnum = $num - 1;
-$trow = GetAllRows($TableNames[$renee_s]);
+while ($melanie_p < $num) { $tnum = $num - 1;
+$trow = GetAllRows($TableNames[$melanie_p]);
 $numz = count($trow); $kazuki_p = 0;
 $sqldump .= "--\n";
-$sqldump .= "-- Table structure for table \"".$TableNames[$renee_s]."\"\n";
+$sqldump .= "-- Table structure for table \"".$TableNames[$melanie_p]."\"\n";
 $sqldump .= "--\n\n";
-$sqldump .= $FullTable[$renee_s]."\n";
+$sqldump .= $FullTable[$melanie_p]."\n";
 while ($kazuki_p < $numz) { $tnumz = $numz - 1;
 $srow = null; $srowvalue = null;
 $trownew = $trow[$kazuki_p];
@@ -157,7 +157,7 @@ $trowrvalue = sql_escape_string($trownew[$trowrname],$SQLStat);
 if($_GET['outtype']=="UTF-8"&&$Settings['charset']!="UTF-8") {
 $trowrvalue = utf8_encode($trowrvalue); }
 $trowrvalue = str_replace( array("\n", "\r"), array('\n', '\r'), $trowrvalue);
-if($il===0) { $srow = "INSERT INTO \"".$TableNames[$renee_s]."\" ("; }
+if($il===0) { $srow = "INSERT INTO \"".$TableNames[$melanie_p]."\" ("; }
 if($il<$tnums&&$il!=$tnums) { $srow .= "\"".$trowrname."\", "; }
 if($il==$tnums) { $srow .= "\"".$trowrname."\") VALUES"; }
 if($il===0) { $srowvalue = "("; }
@@ -169,20 +169,20 @@ if($kazuki_p==$tnumz) { $srowvalue .= ");"; } }
 ++$il; }
 if($kazuki_p===0) {
 $sqldump .= "--\n";
-$sqldump .= "-- Dumping data for table \"".$TableNames[$renee_s]."\"\n";
+$sqldump .= "-- Dumping data for table \"".$TableNames[$melanie_p]."\"\n";
 $sqldump .= "--\n\n"; }
 $sqldump .= $srow."\n";
 $sqldump .= $srowvalue."\n";
-if($kazuki_p==$tnumz&&$renee_s<$tnum) {
+if($kazuki_p==$tnumz&&$melanie_p<$tnum) {
 $sqldump .= "\n-- --------------------------------------------------------\n"; }
 ++$kazuki_p; }
 if($numz===0) {
 $sqldump .= "--\n";
-$sqldump .= "-- Dumping data for table \"".$TableNames[$renee_s]."\"\n";
+$sqldump .= "-- Dumping data for table \"".$TableNames[$melanie_p]."\"\n";
 $sqldump .= "--\n\n";
 $sqldump .= "\n-- --------------------------------------------------------\n"; }
 $sqldump .= "\n";
-++$renee_s; }
+++$melanie_p; }
 if($_GET['compress']=="none") { echo $sqldump; }
 if($_GET['compress']=="gzencode") { echo gzencode($sqldump,$_GET['comlevel']); }
 if($_GET['compress']=="gzcompress") { echo gzcompress($sqldump,$_GET['comlevel']); }

diff --git a/inc/events.php b/inc/events.php
index a75a9e6..b75f888 100644 (file)
--- a/inc/events.php
+++ b/inc/events.php
@@ -288,29 +288,29 @@ $_SESSION['UserFormID'] = $UFID;
 <td class="TableColumn3" style="width: 15%; vertical-align: middle; text-align: center;">
 <div style="width: 100%; height: 160px; overflow: auto;">
 <table style="width: 100%; text-align: center;"><?php
-$renee_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Display\"='yes'", array(null));
-$renee_result=sql_query($renee_query,$SQLStat);
-$renee_num=sql_num_rows($renee_result);
-$renee_s=0; $SmileRow=0; $SmileCRow=0;
-while ($renee_s < $renee_num) { ++$SmileRow;
-$FileName=sql_result($renee_result,$renee_s,"FileName");
-$SmileName=sql_result($renee_result,$renee_s,"SmileName");
-$SmileText=sql_result($renee_result,$renee_s,"SmileText");
-$SmileDirectory=sql_result($renee_result,$renee_s,"Directory");
-$ShowSmile=sql_result($renee_result,$renee_s,"Display");
-$ReplaceType=sql_result($renee_result,$renee_s,"ReplaceCI");
+$melanie_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Display\"='yes'", array(null));
+$melanie_result=sql_query($melanie_query,$SQLStat);
+$melanie_num=sql_num_rows($melanie_result);
+$melanie_p=0; $SmileRow=0; $SmileCRow=0;
+while ($melanie_p < $melanie_num) { ++$SmileRow;
+$FileName=sql_result($melanie_result,$melanie_p,"FileName");
+$SmileName=sql_result($melanie_result,$melanie_p,"SmileName");
+$SmileText=sql_result($melanie_result,$melanie_p,"SmileText");
+$SmileDirectory=sql_result($melanie_result,$melanie_p,"Directory");
+$ShowSmile=sql_result($melanie_result,$melanie_p,"Display");
+$ReplaceType=sql_result($melanie_result,$melanie_p,"ReplaceCI");
 if($SmileRow==1) { ?><tr>
        <?php } if($SmileRow<5) { ++$SmileCRow; ?>
        <td><img src="<?php echo $SmileDirectory."".$FileName; ?>" style="vertical-align: middle; border: 0px; cursor: pointer;" title="<?php echo $SmileName; ?>" alt="<?php echo $SmileName; ?>" onclick="addsmiley('EventText','&nbsp;<?php echo htmlspecialchars($SmileText, ENT_QUOTES, $Settings['charset']); ?>&nbsp;')" /></td>
        <?php } if($SmileRow==5) { ++$SmileCRow; ?>
        <td><img src="<?php echo $SmileDirectory."".$FileName; ?>" style="vertical-align: middle; border: 0px; cursor: pointer;" title="<?php echo $SmileName; ?>" alt="<?php echo $SmileName; ?>" onclick="addsmiley('EventText','&nbsp;<?php echo htmlspecialchars($SmileText, ENT_QUOTES, $Settings['charset']); ?>&nbsp;')" /></td></tr>
        <?php $SmileCRow=0; $SmileRow=0; }
-++$renee_s; }
+++$melanie_p; }
 if($SmileCRow<5&&$SmileCRow!=0) {
 $SmileCRowL = 5 - $SmileCRow;
 echo "<td colspan=\"".$SmileCRowL."\">&nbsp;</td></tr>"; }
 echo "</table>";
-sql_free_result($renee_result);
+sql_free_result($melanie_result);
 ?></div></td>
 <td class="TableColumn3" style="width: 85%;">
 <form style="display: inline;" method="post" id="MkEventForm" action="<?php echo url_maker($exfile['event'],$Settings['file_ext'],"act=makeevent",$Settings['qstr'],$Settings['qsep'],$prexqstr['event'],$exqstr['event']); ?>">
@@ -571,18 +571,18 @@ setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir, $co
 $_SESSION['GuestName']=$_POST['GuestName']; } }
 /*    <_<  iWordFilter  >_>      
    by Kazuki Przyborowski - Cool Dude 2k */
-$katarzynaqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."wordfilter\"", array(null));
-$katarzynart=sql_query($katarzynaqy,$SQLStat);
-$katarzynanm=sql_num_rows($katarzynart);
-$katarzynas=0;
-while ($katarzynas < $katarzynanm) {
-$Filter=sql_result($katarzynart,$katarzynas,"FilterWord");
-$Replace=sql_result($katarzynart,$katarzynas,"Replacement");
-$CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
+$melanieqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."wordfilter\"", array(null));
+$melaniert=sql_query($melanieqy,$SQLStat);
+$melanienm=sql_num_rows($melaniert);
+$melanies=0;
+while ($melanies < $melanienm) {
+$Filter=sql_result($melaniert,$melanies,"FilterWord");
+$Replace=sql_result($melaniert,$melanies,"Replacement");
+$CaseInsensitive=sql_result($melaniert,$melanies,"CaseInsensitive");
 if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
 if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
 if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; }
-$WholeWord=sql_result($katarzynart,$katarzynas,"WholeWord");
+$WholeWord=sql_result($melaniert,$melanies,"WholeWord");
 if($WholeWord=="on") { $WholeWord = "yes"; }
 if($WholeWord=="off") { $WholeWord = "no"; }
 if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; }
@@ -595,7 +595,7 @@ if($CaseInsensitive!="yes"&&$WholeWord!="yes") {
 $_POST['EventText'] = preg_replace("/".$Filter."/", $Replace, $_POST['EventText']); }
 if($CaseInsensitive=="yes"&&$WholeWord!="yes") {
 $_POST['EventText'] = preg_replace("/".$Filter."/i", $Replace, $_POST['EventText']); }
-++$katarzynas; } sql_free_result($katarzynart);
+++$melanies; } sql_free_result($melaniert);
 $lonewolfqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."restrictedwords\" WHERE \"RestrictedEventName\"='yes' or \"RestrictedUserName\"='yes'", array(null));
 $lonewolfrt=sql_query($lonewolfqy,$SQLStat);
 $lonewolfnm=sql_num_rows($lonewolfrt);

diff --git a/inc/function.php b/inc/function.php
index 564143a..1dbedad 100644 (file)
--- a/inc/function.php
+++ b/inc/function.php
@@ -274,14 +274,14 @@ function html_tag_make($name="br",$emptytag=true,$attbvar=null,$attbval=null,$ex
        return $mytag; }
 // Start a xml document
 function xml_tag_make($type,$attbs,$retval=false) {
-       $renee1 = explode("&",$attbs);
-       $reneenum=count($renee1);
-       $reneei=0; $attblist = null;
-       while ($reneei < $reneenum) {
-       $renee2 = explode("=",$renee1[$reneei]);
-       if($renee2[0]!=null||$renee2[1]!=null) {
-       $attblist = $attblist.' '.$renee2[0].'="'.$renee2[1].'"'; }
-       ++$reneei; }
+       $melanie1 = explode("&",$attbs);
+       $melanienum=count($melanie1);
+       $melaniei=0; $attblist = null;
+       while ($melaniei < $melanienum) {
+       $melanie2 = explode("=",$melanie1[$melaniei]);
+       if($melanie2[0]!=null||$melanie2[1]!=null) {
+       $attblist = $attblist.' '.$melanie2[0].'="'.$melanie2[1].'"'; }
+       ++$melaniei; }
        if($retval!==false&&$retval!==true) { $retval=false; }
        if($retval===false) {
        echo '<?'.$type.$attblist.'?>'."\n"; }

diff --git a/inc/messages.php b/inc/messages.php
index 293b8a4..d4965e5 100644 (file)
--- a/inc/messages.php
+++ b/inc/messages.php
@@ -740,29 +740,29 @@ $_SESSION['UserFormID'] = $UFID;
 <td class="TableColumn3" style="width: 15%; vertical-align: middle; text-align: center;">
 <div style="width: 100%; height: 160px; overflow: auto;">
 <table style="width: 100%; text-align: center;"><?php
-$renee_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Display\"='yes'", array(null));
-$renee_result=sql_query($renee_query,$SQLStat);
-$renee_num=sql_num_rows($renee_result);
-$renee_s=0; $SmileRow=0; $SmileCRow=0;
-while ($renee_s < $renee_num) { ++$SmileRow;
-$FileName=sql_result($renee_result,$renee_s,"FileName");
-$SmileName=sql_result($renee_result,$renee_s,"SmileName");
-$SmileText=sql_result($renee_result,$renee_s,"SmileText");
-$SmileDirectory=sql_result($renee_result,$renee_s,"Directory");
-$ShowSmile=sql_result($renee_result,$renee_s,"Display");
-$ReplaceType=sql_result($renee_result,$renee_s,"ReplaceCI");
+$melanie_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Display\"='yes'", array(null));
+$melanie_result=sql_query($melanie_query,$SQLStat);
+$melanie_num=sql_num_rows($melanie_result);
+$melanie_p=0; $SmileRow=0; $SmileCRow=0;
+while ($melanie_p < $melanie_num) { ++$SmileRow;
+$FileName=sql_result($melanie_result,$melanie_p,"FileName");
+$SmileName=sql_result($melanie_result,$melanie_p,"SmileName");
+$SmileText=sql_result($melanie_result,$melanie_p,"SmileText");
+$SmileDirectory=sql_result($melanie_result,$melanie_p,"Directory");
+$ShowSmile=sql_result($melanie_result,$melanie_p,"Display");
+$ReplaceType=sql_result($melanie_result,$melanie_p,"ReplaceCI");
 if($SmileRow==1) { ?><tr>
        <?php } if($SmileRow<5) { ++$SmileCRow; ?>
        <td><img src="<?php echo $SmileDirectory."".$FileName; ?>" style="vertical-align: middle; border: 0px; cursor: pointer;" title="<?php echo $SmileName; ?>" alt="<?php echo $SmileName; ?>" onclick="addsmiley('ReplyPost','&nbsp;<?php echo htmlspecialchars($SmileText, ENT_QUOTES, $Settings['charset']); ?>&nbsp;')" /></td>
        <?php } if($SmileRow==5) { ++$SmileCRow; ?>
        <td><img src="<?php echo $SmileDirectory."".$FileName; ?>" style="vertical-align: middle; border: 0px; cursor: pointer;" title="<?php echo $SmileName; ?>" alt="<?php echo $SmileName; ?>" onclick="addsmiley('ReplyPost','&nbsp;<?php echo htmlspecialchars($SmileText, ENT_QUOTES, $Settings['charset']); ?>&nbsp;')" /></td></tr>
        <?php $SmileCRow=0; $SmileRow=0; }
-++$renee_s; }
+++$melanie_p; }
 if($SmileCRow<5&&$SmileCRow!=0) {
 $SmileCRowL = 5 - $SmileCRow;
 echo "<td colspan=\"".$SmileCRowL."\">&nbsp;</td></tr>"; }
 echo "</table>";
-sql_free_result($renee_result);
+sql_free_result($melanie_result);
 ?></div></td>
 <td class="TableColumn3" style="width: 85%;">
 <form style="display: inline;" method="post" id="MkReplyForm" action="<?php echo url_maker($exfile['messenger'],$Settings['file_ext'],"act=sendmessage",$Settings['qstr'],$Settings['qsep'],$prexqstr['messenger'],$exqstr['messenger']); ?>">
@@ -942,18 +942,18 @@ setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir, $co
 $_SESSION['GuestName']=$_POST['GuestName']; } }
 /*    <_<  iWordFilter  >_>      
    by Kazuki Przyborowski - Cool Dude 2k */
-$katarzynaqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."wordfilter\"", array(null));
-$katarzynart=sql_query($katarzynaqy,$SQLStat);
-$katarzynanm=sql_num_rows($katarzynart);
-$katarzynas=0;
-while ($katarzynas < $katarzynanm) {
-$Filter=sql_result($katarzynart,$katarzynas,"FilterWord");
-$Replace=sql_result($katarzynart,$katarzynas,"Replacement");
-$CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
+$melanieqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."wordfilter\"", array(null));
+$melaniert=sql_query($melanieqy,$SQLStat);
+$melanienm=sql_num_rows($melaniert);
+$melanies=0;
+while ($melanies < $melanienm) {
+$Filter=sql_result($melaniert,$melanies,"FilterWord");
+$Replace=sql_result($melaniert,$melanies,"Replacement");
+$CaseInsensitive=sql_result($melaniert,$melanies,"CaseInsensitive");
 if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
 if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
 if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; }
-$WholeWord=sql_result($katarzynart,$katarzynas,"WholeWord");
+$WholeWord=sql_result($melaniert,$melanies,"WholeWord");
 if($WholeWord=="on") { $WholeWord = "yes"; }
 if($WholeWord=="off") { $WholeWord = "no"; }
 if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; }
@@ -970,7 +970,7 @@ $_POST['MessageDesc'] = preg_replace("/".$Filter."/", $Replace, $_POST['MessageD
 if($CaseInsensitive=="yes"&&$WholeWord!="yes") {
 $_POST['Message'] = preg_replace("/".$Filter."/i", $Replace, $_POST['Message']);
 $_POST['MessageDesc'] = preg_replace("/".$Filter."/i", $Replace, $_POST['MessageDesc']); }
-++$katarzynas; } sql_free_result($katarzynart);
+++$melanies; } sql_free_result($melaniert);
 $lonewolfqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."restrictedwords\" WHERE \"RestrictedMessageName\"='yes' or \"RestrictedUserName\"='yes'", array(null));
 $lonewolfrt=sql_query($lonewolfqy,$SQLStat);
 $lonewolfnm=sql_num_rows($lonewolfrt);

diff --git a/inc/misc/functions.php b/inc/misc/functions.php
index 0616f2e..5bc0d0f 100644 (file)
--- a/inc/misc/functions.php
+++ b/inc/misc/functions.php
@@ -162,17 +162,17 @@ if(!isset($Settings['DefaultTheme'])) {
 function text2icons($Text,$sqlt,$link=null) {
 global $SQLStat;
 if(!isset($link)) { $link = $SQLStat; }
-$reneequery=sql_pre_query("SELECT * FROM \"".$sqlt."smileys\"", array(null));
-$reneeresult=sql_query($reneequery,$link);
-$reneenum=sql_num_rows($reneeresult);
-$renees=0;
-while ($renees < $reneenum) {
-$FileName=sql_result($reneeresult,$renees,"FileName");
-$SmileName=sql_result($reneeresult,$renees,"SmileName");
-$SmileText=sql_result($reneeresult,$renees,"SmileText");
-$SmileDirectory=sql_result($reneeresult,$renees,"Directory");
-$ShowSmile=sql_result($reneeresult,$renees,"Display");
-$ReplaceType=sql_result($reneeresult,$renees,"ReplaceCI");
+$melaniequery=sql_pre_query("SELECT * FROM \"".$sqlt."smileys\"", array(null));
+$melanieresult=sql_query($melaniequery,$link);
+$melanienum=sql_num_rows($melanieresult);
+$melanies=0;
+while ($melanies < $melanienum) {
+$FileName=sql_result($melanieresult,$melanies,"FileName");
+$SmileName=sql_result($melanieresult,$melanies,"SmileName");
+$SmileText=sql_result($melanieresult,$melanies,"SmileText");
+$SmileDirectory=sql_result($melanieresult,$melanies,"Directory");
+$ShowSmile=sql_result($melanieresult,$melanies,"Display");
+$ReplaceType=sql_result($melanieresult,$melanies,"ReplaceCI");
 if($ReplaceType=="on") { $ReplaceType = "yes"; }
 if($ReplaceType=="off") { $ReplaceType = "no"; }
 if($ReplaceType!="yes"||$ReplaceType!="no") { $ReplaceType = "no"; }
@@ -183,7 +183,7 @@ $Text = str_replace($Smile1, $Smile2, $Text); }
 if($ReplaceType=="yes") {
        $Smile1 = preg_quote($SmileText,"/");
 $Text = preg_replace("/".$Smile1."/i",$Smile2,$Text); }
-++$renees; } return $Text; }
+++$melanies; } return $Text; }
 // Removes the bad stuff
 function remove_bad_entities($Text) {
 //HTML Entities Dec Version

diff --git a/inc/profilemain.php b/inc/profilemain.php
index a919717..c2d4d5b 100644 (file)
--- a/inc/profilemain.php
+++ b/inc/profilemain.php
@@ -183,18 +183,18 @@ if($_POST['act']=="view"&&
        //$_POST['Signature'] = remove_bad_entities($_POST['Signature']);
        /*    <_<  iWordFilter  >_>      
     by Kazuki Przyborowski - Cool Dude 2k */
-       $katarzynaqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."wordfilter\"", array(null));
-       $katarzynart=sql_query($katarzynaqy,$SQLStat);
-       $katarzynanm=sql_num_rows($katarzynart);
-       $katarzynas=0;
-       while ($katarzynas < $katarzynanm) {
-       $Filter=sql_result($katarzynart,$katarzynas,"FilterWord");
-       $Replace=sql_result($katarzynart,$katarzynas,"Replacement");
-       $CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
+       $melanieqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."wordfilter\"", array(null));
+       $melaniert=sql_query($melanieqy,$SQLStat);
+       $melanienm=sql_num_rows($melaniert);
+       $melanies=0;
+       while ($melanies < $melanienm) {
+       $Filter=sql_result($melaniert,$melanies,"FilterWord");
+       $Replace=sql_result($melaniert,$melanies,"Replacement");
+       $CaseInsensitive=sql_result($melaniert,$melanies,"CaseInsensitive");
        if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
        if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
        if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; }
-       $WholeWord=sql_result($katarzynart,$katarzynas,"WholeWord");
+       $WholeWord=sql_result($melaniert,$melanies,"WholeWord");
        if($WholeWord=="on") { $WholeWord = "yes"; }
        if($WholeWord=="off") { $WholeWord = "no"; }
        if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; }
@@ -207,7 +207,7 @@ if($_POST['act']=="view"&&
        $_POST['NotePad'] = preg_replace("/".$Filter."/", $Replace, $_POST['NotePad']); }
        if($CaseInsensitive=="yes"&&$WholeWord!="yes") {
        $_POST['NotePad'] = preg_replace("/".$Filter."/i", $Replace, $_POST['NotePad']); }
-       ++$katarzynas; } sql_free_result($katarzynart);
+       ++$melanies; } sql_free_result($melaniert);
        $NewDay=$utccurtime->getTimestamp();
        $NewIP=$_SERVER['REMOTE_ADDR'];
        $querynewskin = sql_pre_query("UPDATE \"".$Settings['sqltable']."members\" SET \"Notes\"='%s',\"LastActive\"=%i,\"IP\"='%s' WHERE \"id\"=%i", array($_POST['NotePad'],$NewDay,$NewIP,$_SESSION['UserID']));
@@ -265,18 +265,18 @@ if($_POST['act']=="signature"&&
        $_POST['Signature'] = remove_bad_entities($_POST['Signature']);
        /*    <_<  iWordFilter  >_>      
     by Kazuki Przyborowski - Cool Dude 2k */
-       $katarzynaqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."wordfilter\"", array(null));
-       $katarzynart=sql_query($katarzynaqy,$SQLStat);
-       $katarzynanm=sql_num_rows($katarzynart);
-       $katarzynas=0;
-       while ($katarzynas < $katarzynanm) {
-       $Filter=sql_result($katarzynart,$katarzynas,"FilterWord");
-       $Replace=sql_result($katarzynart,$katarzynas,"Replacement");
-       $CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
+       $melanieqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."wordfilter\"", array(null));
+       $melaniert=sql_query($melanieqy,$SQLStat);
+       $melanienm=sql_num_rows($melaniert);
+       $melanies=0;
+       while ($melanies < $melanienm) {
+       $Filter=sql_result($melaniert,$melanies,"FilterWord");
+       $Replace=sql_result($melaniert,$melanies,"Replacement");
+       $CaseInsensitive=sql_result($melaniert,$melanies,"CaseInsensitive");
        if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
        if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
        if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; }
-       $WholeWord=sql_result($katarzynart,$katarzynas,"WholeWord");
+       $WholeWord=sql_result($melaniert,$melanies,"WholeWord");
        if($WholeWord=="on") { $WholeWord = "yes"; }
        if($WholeWord=="off") { $WholeWord = "no"; }
        if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; }
@@ -289,7 +289,7 @@ if($_POST['act']=="signature"&&
        $_POST['Signature'] = preg_replace("/".$Filter."/", $Replace, $_POST['Signature']); }
        if($CaseInsensitive=="yes"&&$WholeWord!="yes") {
        $_POST['Signature'] = preg_replace("/".$Filter."/i", $Replace, $_POST['Signature']); }
-       ++$katarzynas; } sql_free_result($katarzynart);
+       ++$melanies; } sql_free_result($melaniert);
        $NewDay=$utccurtime->getTimestamp();
        $NewIP=$_SERVER['REMOTE_ADDR'];
        $querynewskin = sql_pre_query("UPDATE \"".$Settings['sqltable']."members\" SET \"Signature\"='%s',\"LastActive\"=%i,\"IP\"='%s' WHERE \"id\"=%i", array($_POST['Signature'],$NewDay,$NewIP,$_SESSION['UserID']));
@@ -1003,18 +1003,18 @@ if($_POST['act']=="profile"&&
        //$_POST['Signature'] = remove_bad_entities($_POST['Signature']);
        /*    <_<  iWordFilter  >_>      
     by Kazuki Przyborowski - Cool Dude 2k */
-       $katarzynaqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."wordfilter\"", array(null));
-       $katarzynart=sql_query($katarzynaqy,$SQLStat);
-       $katarzynanm=sql_num_rows($katarzynart);
-       $katarzynas=0;
-       while ($katarzynas < $katarzynanm) {
-       $Filter=sql_result($katarzynart,$katarzynas,"FilterWord");
-       $Replace=sql_result($katarzynart,$katarzynas,"Replacement");
-       $CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
+       $melanieqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."wordfilter\"", array(null));
+       $melaniert=sql_query($melanieqy,$SQLStat);
+       $melanienm=sql_num_rows($melaniert);
+       $melanies=0;
+       while ($melanies < $melanienm) {
+       $Filter=sql_result($melaniert,$melanies,"FilterWord");
+       $Replace=sql_result($melaniert,$melanies,"Replacement");
+       $CaseInsensitive=sql_result($melaniert,$melanies,"CaseInsensitive");
        if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
        if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
        if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; }
-       $WholeWord=sql_result($katarzynart,$katarzynas,"WholeWord");
+       $WholeWord=sql_result($melaniert,$melanies,"WholeWord");
        if($WholeWord=="on") { $WholeWord = "yes"; }
        if($WholeWord=="off") { $WholeWord = "no"; }
        if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; }
@@ -1031,7 +1031,7 @@ if($_POST['act']=="profile"&&
        if($CaseInsensitive=="yes"&&$WholeWord!="yes") {
        $_POST['Interests'] = preg_replace("/".$Filter."/i", $Replace, $_POST['Interests']); 
        $_POST['Title'] = preg_replace("/".$Filter."/i", $Replace, $_POST['Title']); }
-       ++$katarzynas; } sql_free_result($katarzynart);
+       ++$melanies; } sql_free_result($melaniert);
        if(!is_numeric($_POST['RepliesPerPage'])) { $_POST['RepliesPerPage'] = "10"; }
        if(!is_numeric($_POST['TopicsPerPage'])) { $_POST['TopicsPerPage'] = "10"; }
        if(!is_numeric($_POST['MessagesPerPage'])) { $_POST['MessagesPerPage'] = "10"; }

diff --git a/inc/replies.php b/inc/replies.php
index ab583da..2c850c7 100644 (file)
--- a/inc/replies.php
+++ b/inc/replies.php
@@ -738,29 +738,29 @@ $_SESSION['UserFormID'] = $UFID;
 <td class="TableColumn3" style="width: 15%; vertical-align: middle; text-align: center;">
 <div style="width: 100%; height: 160px; overflow: auto;">
 <table style="width: 100%; text-align: center;"><?php
-$renee_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Display\"='yes'", array(null));
-$renee_result=sql_query($renee_query,$SQLStat);
-$renee_num=sql_num_rows($renee_result);
-$renee_s=0; $rose_a=0; $SmileRow=0; $SmileCRow=0;
-while ($renee_s < $renee_num) { ++$SmileRow;
-$FileName=sql_result($renee_result,$renee_s,"FileName");
-$SmileName=sql_result($renee_result,$renee_s,"SmileName");
-$SmileText=sql_result($renee_result,$renee_s,"SmileText");
-$SmileDirectory=sql_result($renee_result,$renee_s,"Directory");
-$ShowSmile=sql_result($renee_result,$renee_s,"Display");
-$ReplaceType=sql_result($renee_result,$renee_s,"ReplaceCI");
+$melanie_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Display\"='yes'", array(null));
+$melanie_result=sql_query($melanie_query,$SQLStat);
+$melanie_num=sql_num_rows($melanie_result);
+$melanie_p=0; $rose_a=0; $SmileRow=0; $SmileCRow=0;
+while ($melanie_p < $melanie_num) { ++$SmileRow;
+$FileName=sql_result($melanie_result,$melanie_p,"FileName");
+$SmileName=sql_result($melanie_result,$melanie_p,"SmileName");
+$SmileText=sql_result($melanie_result,$melanie_p,"SmileText");
+$SmileDirectory=sql_result($melanie_result,$melanie_p,"Directory");
+$ShowSmile=sql_result($melanie_result,$melanie_p,"Display");
+$ReplaceType=sql_result($melanie_result,$melanie_p,"ReplaceCI");
 if($SmileRow==1) { ?><tr>
        <?php } if($SmileRow<5) { ++$SmileCRow; ?>
        <td><img src="<?php echo $SmileDirectory."".$FileName; ?>" style="vertical-align: middle; border: 0px; cursor: pointer;" title="<?php echo $SmileName; ?>" alt="<?php echo $SmileName; ?>" onclick="addsmiley('ReplyPost','&nbsp;<?php echo htmlspecialchars($SmileText, ENT_QUOTES, $Settings['charset']); ?>&nbsp;')" /></td>
        <?php ++$rose_a; } if($SmileRow==5) { ++$SmileCRow; $rose_a = 0; ?>
        <td><img src="<?php echo $SmileDirectory."".$FileName; ?>" style="vertical-align: middle; border: 0px; cursor: pointer;" title="<?php echo $SmileName; ?>" alt="<?php echo $SmileName; ?>" onclick="addsmiley('ReplyPost','&nbsp;<?php echo htmlspecialchars($SmileText, ENT_QUOTES, $Settings['charset']); ?>&nbsp;')" /></td></tr>
        <?php $SmileCRow=0; $SmileRow=0; }
-++$renee_s; }
+++$melanie_p; }
 if($SmileCRow<5&&$SmileCRow!=0) {
 $SmileCRowL = 5 - $SmileCRow;
 echo "<td colspan=\"".$SmileCRowL."\">&nbsp;</td></tr>"; }
 echo "</table>";
-sql_free_result($renee_result);
+sql_free_result($melanie_result);
 ?></div></td>
 <td class="TableColumn3" style="width: 85%;">
 <form style="display: inline;" method="post" id="MkReplyForm" action="<?php echo url_maker($exfile['topic'],$Settings['file_ext'],"act=makereply&id=".$TopicID,$Settings['qstr'],$Settings['qsep'],$prexqstr['topic'],$exqstr['topic']); ?>">
@@ -912,18 +912,18 @@ setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir, $co
 $_SESSION['GuestName']=$_POST['GuestName']; } }
 /*    <_<  iWordFilter  >_>      
    by Kazuki Przyborowski - Cool Dude 2k */
-$katarzynaqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."wordfilter\"", array(null));
-$katarzynart=sql_query($katarzynaqy,$SQLStat);
-$katarzynanm=sql_num_rows($katarzynart);
-$katarzynas=0;
-while ($katarzynas < $katarzynanm) {
-$Filter=sql_result($katarzynart,$katarzynas,"FilterWord");
-$Replace=sql_result($katarzynart,$katarzynas,"Replacement");
-$CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
+$melanieqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."wordfilter\"", array(null));
+$melaniert=sql_query($melanieqy,$SQLStat);
+$melanienm=sql_num_rows($melaniert);
+$melanies=0;
+while ($melanies < $melanienm) {
+$Filter=sql_result($melaniert,$melanies,"FilterWord");
+$Replace=sql_result($melaniert,$melanies,"Replacement");
+$CaseInsensitive=sql_result($melaniert,$melanies,"CaseInsensitive");
 if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
 if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
 if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; }
-$WholeWord=sql_result($katarzynart,$katarzynas,"WholeWord");
+$WholeWord=sql_result($melaniert,$melanies,"WholeWord");
 if($WholeWord=="on") { $WholeWord = "yes"; }
 if($WholeWord=="off") { $WholeWord = "no"; }
 if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; }
@@ -940,7 +940,7 @@ $_POST['ReplyPost'] = preg_replace("/".$Filter."/", $Replace, $_POST['ReplyPost'
 if($CaseInsensitive=="yes"&&$WholeWord!="yes") {
 $_POST['ReplyDesc'] = preg_replace("/".$Filter."/i", $Replace, $_POST['ReplyDesc']); 
 $_POST['ReplyPost'] = preg_replace("/".$Filter."/i", $Replace, $_POST['ReplyPost']); }
-++$katarzynas; } sql_free_result($katarzynart);
+++$melanies; } sql_free_result($melaniert);
 if ($_POST['ReplyDesc']==null) { $Error="Yes"; ?>
 <tr>
        <td><span class="TableMessage">
@@ -1490,24 +1490,24 @@ $_SESSION['UserFormID'] = $UFID;
 <tr class="TableRow3" id="EditReplies<?php echo $_GET['post']; ?>">
 <td class="TableColumn3" style="width: 15%; vertical-align: middle; text-align: center;">
 <div style="width: 100%; height: 160px; overflow: auto;"><?php
-$renee_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Display\"='yes'", array(null));
-$renee_result=sql_query($renee_query,$SQLStat);
-$renee_num=sql_num_rows($renee_result);
-$renee_s=0; $SmileRow=1;
-while ($renee_s < $renee_num) {
-$FileName=sql_result($renee_result,$renee_s,"FileName");
-$SmileName=sql_result($renee_result,$renee_s,"SmileName");
-$SmileText=sql_result($renee_result,$renee_s,"SmileText");
-$SmileDirectory=sql_result($renee_result,$renee_s,"Directory");
-$ShowSmile=sql_result($renee_result,$renee_s,"Display");
-$ReplaceType=sql_result($renee_result,$renee_s,"ReplaceCI");
+$melanie_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Display\"='yes'", array(null));
+$melanie_result=sql_query($melanie_query,$SQLStat);
+$melanie_num=sql_num_rows($melanie_result);
+$melanie_p=0; $SmileRow=1;
+while ($melanie_p < $melanie_num) {
+$FileName=sql_result($melanie_result,$melanie_p,"FileName");
+$SmileName=sql_result($melanie_result,$melanie_p,"SmileName");
+$SmileText=sql_result($melanie_result,$melanie_p,"SmileText");
+$SmileDirectory=sql_result($melanie_result,$melanie_p,"Directory");
+$ShowSmile=sql_result($melanie_result,$melanie_p,"Display");
+$ReplaceType=sql_result($melanie_result,$melanie_p,"ReplaceCI");
 if($SmileRow<5) { ?>
        <img src="<?php echo $SmileDirectory."".$FileName; ?>" style="vertical-align: middle; border: 0px; cursor: pointer;" title="<?php echo $SmileName; ?>" alt="<?php echo $SmileName; ?>" onclick="addsmiley('ReplyPost','&nbsp;<?php echo htmlspecialchars($SmileText, ENT_QUOTES, $Settings['charset']); ?>&nbsp;')" />&nbsp;&nbsp;
        <?php } if($SmileRow==5) { ?>
        <img src="<?php echo $SmileDirectory."".$FileName; ?>" style="vertical-align: middle; border: 0px; cursor: pointer;" title="<?php echo $SmileName; ?>" alt="<?php echo $SmileName; ?>" onclick="addsmiley('ReplyPost','&nbsp;<?php echo htmlspecialchars($SmileText, ENT_QUOTES, $Settings['charset']); ?>&nbsp;')" /><br />
        <?php $SmileRow=1; }
-++$renee_s; ++$SmileRow; }
-sql_free_result($renee_result);
+++$melanie_p; ++$SmileRow; }
+sql_free_result($melanie_result);
 ?></div></td>
 <td class="TableColumn3" style="width: 85%;">
 <form style="display: inline;" method="post" id="EditReplyForm" action="<?php echo url_maker($exfile['topic'],$Settings['file_ext'],"act=editreply&id=".$TopicID."&post=".$_GET['post'],$Settings['qstr'],$Settings['qsep'],$prexqstr['topic'],$exqstr['topic']); ?>">
@@ -1695,18 +1695,18 @@ $_POST['TopicName'] = stripcslashes(htmlspecialchars($_POST['TopicName'], ENT_QU
 $_POST['TopicName'] = remove_spaces($_POST['TopicName']); }
 /*    <_<  iWordFilter  >_>      
    by Kazuki Przyborowski - Cool Dude 2k */
-$katarzynaqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."wordfilter\"", array(null));
-$katarzynart=sql_query($katarzynaqy,$SQLStat);
-$katarzynanm=sql_num_rows($katarzynart);
-$katarzynas=0;
-while ($katarzynas < $katarzynanm) {
-$Filter=sql_result($katarzynart,$katarzynas,"FilterWord");
-$Replace=sql_result($katarzynart,$katarzynas,"Replacement");
-$CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
+$melanieqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."wordfilter\"", array(null));
+$melaniert=sql_query($melanieqy,$SQLStat);
+$melanienm=sql_num_rows($melaniert);
+$melanies=0;
+while ($melanies < $melanienm) {
+$Filter=sql_result($melaniert,$melanies,"FilterWord");
+$Replace=sql_result($melaniert,$melanies,"Replacement");
+$CaseInsensitive=sql_result($melaniert,$melanies,"CaseInsensitive");
 if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
 if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
 if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; }
-$WholeWord=sql_result($katarzynart,$katarzynas,"WholeWord");
+$WholeWord=sql_result($melaniert,$melanies,"WholeWord");
 if($WholeWord=="on") { $WholeWord = "yes"; }
 if($WholeWord=="off") { $WholeWord = "no"; }
 if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; }
@@ -1723,7 +1723,7 @@ $_POST['ReplyPost'] = preg_replace("/".$Filter."/", $Replace, $_POST['ReplyPost'
 if($CaseInsensitive=="yes"&&$WholeWord!="yes") {
 $_POST['ReplyDesc'] = preg_replace("/".$Filter."/i", $Replace, $_POST['ReplyDesc']); 
 $_POST['ReplyPost'] = preg_replace("/".$Filter."/i", $Replace, $_POST['ReplyPost']); }
-++$katarzynas; } sql_free_result($katarzynart);
+++$melanies; } sql_free_result($melaniert);
 $lonewolfqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."restrictedwords\" WHERE \"RestrictedTopicName\"='yes' or \"RestrictedUserName\"='yes'", array(null));
 $lonewolfrt=sql_query($lonewolfqy,$SQLStat);
 $lonewolfnm=sql_num_rows($lonewolfrt);
@@ -1935,29 +1935,29 @@ $_SESSION['UserFormID'] = $UFID;
 <td class="TableColumn3" style="width: 15%; vertical-align: middle; text-align: center;">
 <div style="width: 100%; height: 160px; overflow: auto;">
 <table style="width: 100%; text-align: center;"><?php
-$renee_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Display\"='yes'", array(null));
-$renee_result=sql_query($renee_query,$SQLStat);
-$renee_num=sql_num_rows($renee_result);
-$renee_s=0; $SmileRow=0; $SmileCRow=0;
-while ($renee_s < $renee_num) { ++$SmileRow;
-$FileName=sql_result($renee_result,$renee_s,"FileName");
-$SmileName=sql_result($renee_result,$renee_s,"SmileName");
-$SmileText=sql_result($renee_result,$renee_s,"SmileText");
-$SmileDirectory=sql_result($renee_result,$renee_s,"Directory");
-$ShowSmile=sql_result($renee_result,$renee_s,"Display");
-$ReplaceType=sql_result($renee_result,$renee_s,"ReplaceCI");
+$melanie_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Display\"='yes'", array(null));
+$melanie_result=sql_query($melanie_query,$SQLStat);
+$melanie_num=sql_num_rows($melanie_result);
+$melanie_p=0; $SmileRow=0; $SmileCRow=0;
+while ($melanie_p < $melanie_num) { ++$SmileRow;
+$FileName=sql_result($melanie_result,$melanie_p,"FileName");
+$SmileName=sql_result($melanie_result,$melanie_p,"SmileName");
+$SmileText=sql_result($melanie_result,$melanie_p,"SmileText");
+$SmileDirectory=sql_result($melanie_result,$melanie_p,"Directory");
+$ShowSmile=sql_result($melanie_result,$melanie_p,"Display");
+$ReplaceType=sql_result($melanie_result,$melanie_p,"ReplaceCI");
 if($SmileRow==1) { ?><tr>
        <?php } if($SmileRow<5) { ++$SmileCRow; ?>
        <td><img src="<?php echo $SmileDirectory."".$FileName; ?>" style="vertical-align: middle; border: 0px; cursor: pointer;" title="<?php echo $SmileName; ?>" alt="<?php echo $SmileName; ?>" onclick="addsmiley('ReplyPost','&nbsp;<?php echo htmlspecialchars($SmileText, ENT_QUOTES, $Settings['charset']); ?>&nbsp;')" /></td>
        <?php } if($SmileRow==5) { ++$SmileCRow; ?>
        <td><img src="<?php echo $SmileDirectory."".$FileName; ?>" style="vertical-align: middle; border: 0px; cursor: pointer;" title="<?php echo $SmileName; ?>" alt="<?php echo $SmileName; ?>" onclick="addsmiley('ReplyPost','&nbsp;<?php echo htmlspecialchars($SmileText, ENT_QUOTES, $Settings['charset']); ?>&nbsp;')" /></td></tr>
        <?php $SmileCRow=0; $SmileRow=0; }
-++$renee_s; }
+++$melanie_p; }
 if($SmileCRow<5&&$SmileCRow!=0) {
 $SmileCRowL = 5 - $SmileCRow;
 echo "<td colspan=\"".$SmileCRowL."\">&nbsp;</td></tr>"; }
 echo "</table>";
-sql_free_result($renee_result);
+sql_free_result($melanie_result);
 ?></div></td>
 <td class="TableColumn3" style="width: 85%;">
 <form style="display: inline;" method="post" id="MkReplyForm" action="<?php echo url_maker($exfile['topic'],$Settings['file_ext'],"act=makereply&id=".$TopicID,$Settings['qstr'],$Settings['qsep'],$prexqstr['topic'],$exqstr['topic']); ?>">

diff --git a/inc/topics.php b/inc/topics.php
index 671ad78..dadccb6 100644 (file)
--- a/inc/topics.php
+++ b/inc/topics.php
@@ -615,29 +615,29 @@ $_SESSION['UserFormID'] = $UFID;
 <td class="TableColumn3" style="width: 15%; vertical-align: middle; text-align: center;">
 <div style="width: 100%; height: 160px; overflow: auto;">
 <table style="width: 100%; text-align: center;"><?php
-$renee_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Display\"='yes'", array(null));
-$renee_result=sql_query($renee_query,$SQLStat);
-$renee_num=sql_num_rows($renee_result);
-$renee_s=0; $SmileRow=0; $SmileCRow=0;
-while ($renee_s < $renee_num) { ++$SmileRow;
-$FileName=sql_result($renee_result,$renee_s,"FileName");
-$SmileName=sql_result($renee_result,$renee_s,"SmileName");
-$SmileText=sql_result($renee_result,$renee_s,"SmileText");
-$SmileDirectory=sql_result($renee_result,$renee_s,"Directory");
-$ShowSmile=sql_result($renee_result,$renee_s,"Display");
-$ReplaceType=sql_result($renee_result,$renee_s,"ReplaceCI");
+$melanie_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Display\"='yes'", array(null));
+$melanie_result=sql_query($melanie_query,$SQLStat);
+$melanie_num=sql_num_rows($melanie_result);
+$melanie_p=0; $SmileRow=0; $SmileCRow=0;
+while ($melanie_p < $melanie_num) { ++$SmileRow;
+$FileName=sql_result($melanie_result,$melanie_p,"FileName");
+$SmileName=sql_result($melanie_result,$melanie_p,"SmileName");
+$SmileText=sql_result($melanie_result,$melanie_p,"SmileText");
+$SmileDirectory=sql_result($melanie_result,$melanie_p,"Directory");
+$ShowSmile=sql_result($melanie_result,$melanie_p,"Display");
+$ReplaceType=sql_result($melanie_result,$melanie_p,"ReplaceCI");
 if($SmileRow==1) { ?><tr>
        <?php } if($SmileRow<5) { ++$SmileCRow; ?>
        <td><img src="<?php echo $SmileDirectory."".$FileName; ?>" style="vertical-align: middle; border: 0px; cursor: pointer;" title="<?php echo $SmileName; ?>" alt="<?php echo $SmileName; ?>" onclick="addsmiley('TopicPost','&nbsp;<?php echo htmlspecialchars($SmileText, ENT_QUOTES, $Settings['charset']); ?>&nbsp;')" /></td>
        <?php } if($SmileRow==5) { ++$SmileCRow; ?>
        <td><img src="<?php echo $SmileDirectory."".$FileName; ?>" style="vertical-align: middle; border: 0px; cursor: pointer;" title="<?php echo $SmileName; ?>" alt="<?php echo $SmileName; ?>" onclick="addsmiley('TopicPost','&nbsp;<?php echo htmlspecialchars($SmileText, ENT_QUOTES, $Settings['charset']); ?>&nbsp;')" /></td></tr>
        <?php $SmileCRow=0; $SmileRow=0; }
-++$renee_s; }
+++$melanie_p; }
 if($SmileCRow<5&&$SmileCRow!=0) {
 $SmileCRowL = 5 - $SmileCRow;
 echo "<td colspan=\"".$SmileCRowL."\">&nbsp;</td></tr>"; }
 echo "</table>";
-sql_free_result($renee_result);
+sql_free_result($melanie_result);
 ?></div></td>
 <td class="TableColumn3" style="width: 85%;">
 <form style="display: inline;" method="post" id="MkTopicForm" action="<?php echo url_maker($exfile['forum'],$Settings['file_ext'],"act=maketopic&id=".$ForumID,$Settings['qstr'],$Settings['qsep'],$prexqstr['forum'],$exqstr['forum']); ?>">
@@ -794,18 +794,18 @@ setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir, $co
 $_SESSION['GuestName']=$_POST['GuestName']; } }
 /*    <_<  iWordFilter  >_>      
    by Kazuki Przyborowski - Cool Dude 2k */
-$katarzynaqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."wordfilter\"", array(null));
-$katarzynart=sql_query($katarzynaqy,$SQLStat);
-$katarzynanm=sql_num_rows($katarzynart);
-$katarzynas=0;
-while ($katarzynas < $katarzynanm) {
-$Filter=sql_result($katarzynart,$katarzynas,"FilterWord");
-$Replace=sql_result($katarzynart,$katarzynas,"Replacement");
-$CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
+$melanieqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."wordfilter\"", array(null));
+$melaniert=sql_query($melanieqy,$SQLStat);
+$melanienm=sql_num_rows($melaniert);
+$melanies=0;
+while ($melanies < $melanienm) {
+$Filter=sql_result($melaniert,$melanies,"FilterWord");
+$Replace=sql_result($melaniert,$melanies,"Replacement");
+$CaseInsensitive=sql_result($melaniert,$melanies,"CaseInsensitive");
 if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
 if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
 if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; }
-$WholeWord=sql_result($katarzynart,$katarzynas,"WholeWord");
+$WholeWord=sql_result($melaniert,$melanies,"WholeWord");
 if($WholeWord=="on") { $WholeWord = "yes"; }
 if($WholeWord=="off") { $WholeWord = "no"; }
 if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; }
@@ -822,7 +822,7 @@ $_POST['TopicPost'] = preg_replace("/".$Filter."/", $Replace, $_POST['TopicPost'
 if($CaseInsensitive=="yes"&&$WholeWord!="yes") {
 $_POST['TopicDesc'] = preg_replace("/".$Filter."/i", $Replace, $_POST['TopicDesc']); 
 $_POST['TopicPost'] = preg_replace("/".$Filter."/i", $Replace, $_POST['TopicPost']); }
-++$katarzynas; } sql_free_result($katarzynart);
+++$melanies; } sql_free_result($melaniert);
 $lonewolfqy=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."restrictedwords\" WHERE \"RestrictedTopicName\"='yes' or \"RestrictedUserName\"='yes'", array(null));
 $lonewolfrt=sql_query($lonewolfqy,$SQLStat);
 $lonewolfnm=sql_num_rows($lonewolfrt);