Changed mysql functions to sql wrapper functions.

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

diff --git a/inc/admin/categories.php b/inc/admin/categories.php
index d6ea2ff..9e924bc 100644 (file)
--- a/inc/admin/categories.php
+++ b/inc/admin/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: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: categories.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="categories.php"||$File3Name=="/categories.php") {
@@ -88,20 +88,20 @@ $admincptitle = " ".$ThemeSet['TitleDivider']." Adding new Category";
        <td style="width: 50%;"><select size="1" class="TextBox" name="InSubCategory" id="InSubCategory">
        <option selected="selected" value="0">none</option>
 <?php 
-$fq = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `InSubCategory`=0 ORDER BY `OrderID` ASC, `id` ASC", array(null));
-$fr=exec_query($fq);
-$ai=mysql_num_rows($fr);
+$fq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `InSubCategory`=0 ORDER BY `OrderID` ASC, `id` ASC", array(null));
+$fr=sql_query($fq);
+$ai=sql_num_rows($fr);
 $fi=0;
 while ($fi < $ai) {
-$InCategoryID=mysql_result($fr,$fi,"id");
-$InCategoryName=mysql_result($fr,$fi,"Name");
-$InCategoryType=mysql_result($fr,$fi,"CategoryType");
-$AiFiInSubCategory=mysql_result($fr,$fi,"InSubCategory");
+$InCategoryID=sql_result($fr,$fi,"id");
+$InCategoryName=sql_result($fr,$fi,"Name");
+$InCategoryType=sql_result($fr,$fi,"CategoryType");
+$AiFiInSubCategory=sql_result($fr,$fi,"InSubCategory");
 if ($AiFiInSubCategory=="0") {
 ?>
        <option value="<?php echo $InCategoryID; ?>"><?php echo $InCategoryName; ?></option>
 <?php } ++$fi; }
-mysql_free_result($fr); ?>
+sql_free_result($fr); ?>
        </select></td>
 </tr><tr style="text-align: left;">
        <td style="width: 50%;"><label class="TextBoxLabel" for="NumPostView">Number of posts to view category:</label></td>
@@ -133,10 +133,10 @@ $_POST['CategoryName'] = remove_spaces($_POST['CategoryName']);
 $_POST['CategoryDesc'] = stripcslashes(htmlspecialchars($_POST['CategoryDesc'], ENT_QUOTES, $Settings['charset']));
 //$_POST['CategoryDesc'] = preg_replace("/&amp;#(x[a-f0-9]+|[0-9]+);/i", "&#$1;", $_POST['CategoryDesc']);
 $_POST['CategoryDesc'] = remove_spaces($_POST['CategoryDesc']);
-$sql_id_check = exec_query(query("SELECT `id` FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($_POST['CategoryID'])));
-$sql_order_check = exec_query(query("SELECT `OrderID` FROM `".$Settings['sqltable']."categories` WHERE `OrderID`=%i LIMIT 1", array($_POST['OrderID'])));
-$id_check = mysql_num_rows($sql_id_check); $order_check = mysql_num_rows($sql_order_check);
-mysql_free_result($sql_id_check); mysql_free_result($sql_order_check);
+$sql_id_check = sql_query(sql_pre_query("SELECT `id` FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($_POST['CategoryID'])));
+$sql_order_check = sql_query(sql_pre_query("SELECT `OrderID` FROM `".$Settings['sqltable']."categories` WHERE `OrderID`=%i LIMIT 1", array($_POST['OrderID'])));
+$id_check = sql_num_rows($sql_id_check); $order_check = sql_num_rows($sql_order_check);
+sql_free_result($sql_id_check); sql_free_result($sql_order_check);
 $errorstr = "";
 if ($_POST['NumPostView']==null||
        !is_numeric($_POST['NumPostView'])) {
@@ -169,25 +169,25 @@ $errorstr = $errorstr."Your category description is too big.<br />\n"; }
 if ($Error!="Yes") {
 redirect("refresh",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view&menu=categories",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],FALSE),"4");
 $admincptitle = " ".$ThemeSet['TitleDivider']." Updating Settings";
-$query = query("INSERT INTO `".$Settings['sqltable']."categories` (`id`, `OrderID`, `Name`, `ShowCategory`, `CategoryType`, `SubShowForums`, `InSubCategory`, `PostCountView`, `KarmaCountView`, `Description`) VALUES\n".
+$query = sql_pre_query("INSERT INTO `".$Settings['sqltable']."categories` (`id`, `OrderID`, `Name`, `ShowCategory`, `CategoryType`, `SubShowForums`, `InSubCategory`, `PostCountView`, `KarmaCountView`, `Description`) VALUES\n".
 "(%i, %i, '%s', '%s', '%s', 'yes', %i, %i, %i, '%s')", array($_POST['CategoryID'],$_POST['OrderID'],$_POST['CategoryName'],$_POST['ShowCategory'],$_POST['CategoryType'],$_POST['InSubCategory'],$_POST['CategoryDesc'],$_POST['NumPostView'],$_POST['NumKarmaView'],$_POST['CategoryDesc']));
-exec_query($query);
-$getperidq = query("SELECT DISTINCT `PermissionID` FROM `".$Settings['sqltable']."catpermissions` ORDER BY `PermissionID` ASC", array(null));
-$getperidr=exec_query($getperidq);
-$getperidnum=mysql_num_rows($getperidr);
+sql_query($query);
+$getperidq = sql_pre_query("SELECT DISTINCT `PermissionID` FROM `".$Settings['sqltable']."catpermissions` ORDER BY `PermissionID` ASC", array(null));
+$getperidr=sql_query($getperidq);
+$getperidnum=sql_num_rows($getperidr);
 $getperidi = 0; 
-$nextperid = getnextid($Settings['sqltable'],"catpermissions");
+$nextperid = sql_get_next_id($Settings['sqltable'],"catpermissions");
 while ($getperidi < $getperidnum) {
-$getperidID=mysql_result($getperidr,$getperidi,"PermissionID");
-$getperidq2 = query("SELECT * FROM `".$Settings['sqltable']."catpermissions` WHERE `PermissionID`=%i", array($getperidID));
-$getperidr2=exec_query($getperidq2);
-$getperidnum2=mysql_num_rows($getperidr2);
-$getperidName=mysql_result($getperidr2,0,"Name");
-mysql_free_result($getperidr2);
-$query = query("INSERT IGNORE INTO `".$Settings['sqltable']."catpermissions` VALUES (%i, %i, '%s', %i, 'yes')", array($nextperid,$getperidID,$getperidName,$_POST['CategoryID'])); 
-exec_query($query);
+$getperidID=sql_result($getperidr,$getperidi,"PermissionID");
+$getperidq2 = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."catpermissions` WHERE `PermissionID`=%i", array($getperidID));
+$getperidr2=sql_query($getperidq2);
+$getperidnum2=sql_num_rows($getperidr2);
+$getperidName=sql_result($getperidr2,0,"Name");
+sql_free_result($getperidr2);
+$query = sql_pre_query("INSERT IGNORE INTO `".$Settings['sqltable']."catpermissions` VALUES (%i, %i, '%s', %i, 'yes')", array($nextperid,$getperidID,$getperidName,$_POST['CategoryID'])); 
+sql_query($query);
 ++$getperidi; ++$nextperid; }
-mysql_free_result($getperidr);
+sql_free_result($getperidr);
 ?>
 <?php } } if($_GET['act']=="deletecategory"&&$_POST['update']!="now") { 
 $admincptitle = " ".$ThemeSet['TitleDivider']." Deleting a Category";
@@ -242,19 +242,19 @@ $admincptitle = " ".$ThemeSet['TitleDivider']." Deleting a Category";
        <td style="width: 50%;"><label class="TextBoxLabel" for="DelID">Delete Category:</label></td>
        <td style="width: 50%;"><select size="1" class="TextBox" name="DelID" id="DelID">
 <?php 
-$fq = query("SELECT * FROM `".$Settings['sqltable']."categories` ORDER BY `OrderID` ASC, `id` ASC", array(null));
-$fr=exec_query($fq);
-$ai=mysql_num_rows($fr);
+$fq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` ORDER BY `OrderID` ASC, `id` ASC", array(null));
+$fr=sql_query($fq);
+$ai=sql_num_rows($fr);
 $fi=0;
 while ($fi < $ai) {
-$InCategoryID=mysql_result($fr,$fi,"id");
-$InCategoryName=mysql_result($fr,$fi,"Name");
-$InCategoryType=mysql_result($fr,$fi,"CategoryType");
-$AiFiInSubCategory=mysql_result($fr,$fi,"InSubCategory");
+$InCategoryID=sql_result($fr,$fi,"id");
+$InCategoryName=sql_result($fr,$fi,"Name");
+$InCategoryType=sql_result($fr,$fi,"CategoryType");
+$AiFiInSubCategory=sql_result($fr,$fi,"InSubCategory");
 ?>
        <option value="<?php echo $InCategoryID; ?>"><?php echo $InCategoryName; ?></option>
 <?php ++$fi; }
-mysql_free_result($fr); ?>
+sql_free_result($fr); ?>
        </select></td>
 </tr></table>
 <table style="text-align: left;">
@@ -275,53 +275,53 @@ mysql_free_result($fr); ?>
 </div>
 <?php } if($_GET['act']=="deletecategory"&&$_POST['update']=="now"&&$_GET['act']=="deletecategory") { 
 $admincptitle = " ".$ThemeSet['TitleDivider']." Updating Settings";
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_POST['DelID']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_POST['DelID']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
 $errorstr = ""; $Error = null;
 if (!is_numeric($_POST['DelID'])) { $Error="Yes";
 $errorstr = $errorstr."You need to enter a forum ID.<br />\n"; } 
 if($prenum>0&&$Error!="Yes") {
-$dtquery = query("DELETE FROM `".$Settings['sqltable']."categories` WHERE `id`=%i", array($_POST['DelID']));
-exec_query($dtquery);
+$dtquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."categories` WHERE `id`=%i", array($_POST['DelID']));
+sql_query($dtquery);
 if($_POST['DelCategories']=="yes") {
-$dscquery = query("DELETE FROM `".$Settings['sqltable']."categories` WHERE `InSubCategory`=%i", array($_POST['DelID']));
-exec_query($dscquery); }
+$dscquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."categories` WHERE `InSubCategory`=%i", array($_POST['DelID']));
+sql_query($dscquery); }
 if($_POST['DelForums']=="yes") {
-$dsfquery = query("DELETE FROM `".$Settings['sqltable']."forums` WHERE `CategoryID`=%i", array($_POST['DelID']));
-exec_query($dsfquery); }
+$dsfquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."forums` WHERE `CategoryID`=%i", array($_POST['DelID']));
+sql_query($dsfquery); }
 if($_POST['DelForums']=="yes") {
-$dstquery = query("DELETE FROM `".$Settings['sqltable']."topics` WHERE `CategoryID`=%i", array($_POST['DelID']));
-exec_query($dstquery); }
+$dstquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."topics` WHERE `CategoryID`=%i", array($_POST['DelID']));
+sql_query($dstquery); }
 if($_POST['DelForums']=="yes") {
-$dstquery = query("DELETE FROM `".$Settings['sqltable']."topics` WHERE `CategoryID`=%i", array($_POST['DelID']));
-exec_query($dstquery);
-$dstquery = query("DELETE FROM `".$Settings['sqltable']."posts` WHERE `CategoryID`=%i", array($_POST['DelID']));
-exec_query($dstquery); }
+$dstquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."topics` WHERE `CategoryID`=%i", array($_POST['DelID']));
+sql_query($dstquery);
+$dstquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."posts` WHERE `CategoryID`=%i", array($_POST['DelID']));
+sql_query($dstquery); }
 if($_POST['DelPermission']=="yes") {
-$apcquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `CategoryID`=%i ORDER BY `OrderID` ASC, `id` ASC", array($_POST['DelID']));
-$apcresult=exec_query($apcquery);
-$apcnum=mysql_num_rows($apcresult);
+$apcquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `CategoryID`=%i ORDER BY `OrderID` ASC, `id` ASC", array($_POST['DelID']));
+$apcresult=sql_query($apcquery);
+$apcnum=sql_num_rows($apcresult);
 $apci=0; $apcl=1; if($apcnum>=1) {
 while ($apci < $apcnum) {
-$DelForumID=mysql_result($apcresult,$apci,"id");
+$DelForumID=sql_result($apcresult,$apci,"id");
 if($_POST['DelPermission']=="yes") {
-$dtquery = query("DELETE FROM `".$Settings['sqltable']."permissions` WHERE `ForumID`=%i", array($DelForumID));
-exec_query($dtquery); }
+$dtquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."permissions` WHERE `ForumID`=%i", array($DelForumID));
+sql_query($dtquery); }
 ++$apci; }
-mysql_free_result($apcresult); } }
+sql_free_result($apcresult); } }
 if($_POST['DelPermission']=="yes") {
-$apcquery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `InSubCategory`=%i ORDER BY `OrderID` ASC, `id` ASC", array($_POST['DelID']));
-$apcresult=exec_query($apcquery);
-$apcnum=mysql_num_rows($apcresult);
+$apcquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `InSubCategory`=%i ORDER BY `OrderID` ASC, `id` ASC", array($_POST['DelID']));
+$apcresult=sql_query($apcquery);
+$apcnum=sql_num_rows($apcresult);
 $apci=0; $apcl=1; if($apcnum>=1) {
 while ($apci < $apcnum) {
-$DelSubsCategoryID=mysql_result($apcresult,$apci,"id");
+$DelSubsCategoryID=sql_result($apcresult,$apci,"id");
 if($_POST['DelPermission']=="yes") {
-$dtquery = query("DELETE FROM `".$Settings['sqltable']."catpermissions` WHERE `CategoryID`=%i", array($DelSubsCategoryID));
-exec_query($dtquery); }
+$dtquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."catpermissions` WHERE `CategoryID`=%i", array($DelSubsCategoryID));
+sql_query($dtquery); }
 ++$apci; }
-mysql_free_result($apcresult); } }
+sql_free_result($apcresult); } }
 ?>
 <?php } } if($_GET['act']=="editcategory"&&$_POST['update']!="now") {
 $admincptitle = " ".$ThemeSet['TitleDivider']." Editing a Category";
@@ -353,19 +353,19 @@ if(!isset($_POST['id'])) {
        <td style="width: 50%;"><label class="TextBoxLabel" for="id">Category to Edit:</label></td>
        <td style="width: 50%;"><select size="1" class="TextBox" name="id" id="id">
 <?php 
-$fq = query("SELECT * FROM `".$Settings['sqltable']."categories` ORDER BY `OrderID` ASC, `id` ASC", array(null));
-$fr=exec_query($fq);
-$ai=mysql_num_rows($fr);
+$fq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` ORDER BY `OrderID` ASC, `id` ASC", array(null));
+$fr=sql_query($fq);
+$ai=sql_num_rows($fr);
 $fi=0;
 while ($fi < $ai) {
-$InCategoryID=mysql_result($fr,$fi,"id");
-$InCategoryName=mysql_result($fr,$fi,"Name");
-$InCategoryType=mysql_result($fr,$fi,"CategoryType");
-$AiFiInSubCategory=mysql_result($fr,$fi,"InSubCategory");
+$InCategoryID=sql_result($fr,$fi,"id");
+$InCategoryName=sql_result($fr,$fi,"Name");
+$InCategoryType=sql_result($fr,$fi,"CategoryType");
+$AiFiInSubCategory=sql_result($fr,$fi,"InSubCategory");
 ?>
        <option value="<?php echo $InCategoryID; ?>"><?php echo $InCategoryName; ?></option>
 <?php ++$fi; }
-mysql_free_result($fr); ?>
+sql_free_result($fr); ?>
        </select></td>
 </tr></table>
 <table style="text-align: left;">
@@ -384,26 +384,26 @@ mysql_free_result($fr); ?>
 </table>
 </div>
 <?php } if(isset($_POST['id'])) { 
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($_POST['id']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
-if($prenum==0) { redirect("location",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],false)); mysql_free_result($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($_POST['id']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
+if($prenum==0) { redirect("location",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],false)); sql_free_result($preresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($prenum>=1) {
-$CategoryID=mysql_result($preresult,0,"id");
-$CategoryOrder=mysql_result($preresult,0,"OrderID");
-$CategoryName=mysql_result($preresult,0,"Name");
+$CategoryID=sql_result($preresult,0,"id");
+$CategoryOrder=sql_result($preresult,0,"OrderID");
+$CategoryName=sql_result($preresult,0,"Name");
 $CategoryName = htmlspecialchars($CategoryName, ENT_QUOTES, $Settings['charset']);
-$ShowCategory=mysql_result($preresult,0,"ShowCategory");
-$CategoryType=mysql_result($preresult,0,"CategoryType");
-$SubShowForums=mysql_result($preresult,0,"SubShowForums");
-$InSubCategory=mysql_result($preresult,0,"InSubCategory");
-$CategoryDescription=mysql_result($preresult,0,"Description");
+$ShowCategory=sql_result($preresult,0,"ShowCategory");
+$CategoryType=sql_result($preresult,0,"CategoryType");
+$SubShowForums=sql_result($preresult,0,"SubShowForums");
+$InSubCategory=sql_result($preresult,0,"InSubCategory");
+$CategoryDescription=sql_result($preresult,0,"Description");
 $CategoryDescription = htmlspecialchars($CategoryDescription, ENT_QUOTES, $Settings['charset']);
-$KarmaCountView=mysql_result($preresult,0,"KarmaCountView");
-$PostCountView=mysql_result($preresult,0,"PostCountView");
-mysql_free_result($preresult);
+$KarmaCountView=sql_result($preresult,0,"KarmaCountView");
+$PostCountView=sql_result($preresult,0,"PostCountView");
+sql_free_result($preresult);
 $CategoryType = strtolower($CategoryType);
 ?>
 <div class="TableMenuBorder">
@@ -457,15 +457,15 @@ $CategoryType = strtolower($CategoryType);
        <td style="width: 50%;"><select size="1" class="TextBox" name="InSubCategory" id="InSubCategory">
        <option selected="selected" value="0">none</option>
 <?php 
-$fq = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `InSubCategory`=0 AND `id`<>%i ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID));
-$fr=exec_query($fq);
-$ai=mysql_num_rows($fr);
+$fq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `InSubCategory`=0 AND `id`<>%i ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID));
+$fr=sql_query($fq);
+$ai=sql_num_rows($fr);
 $fi=0;
 while ($fi < $ai) {
-$InCategoryID=mysql_result($fr,$fi,"id");
-$InCategoryName=mysql_result($fr,$fi,"Name");
-$InCategoryType=mysql_result($fr,$fi,"CategoryType");
-$AiFiInSubCategory=mysql_result($fr,$fi,"InSubCategory");
+$InCategoryID=sql_result($fr,$fi,"id");
+$InCategoryName=sql_result($fr,$fi,"Name");
+$InCategoryType=sql_result($fr,$fi,"CategoryType");
+$AiFiInSubCategory=sql_result($fr,$fi,"InSubCategory");
 if ($AiFiInSubCategory=="0") {
 if($InSubCategory==$InCategoryID) {
 ?>
@@ -473,7 +473,7 @@ if($InSubCategory==$InCategoryID) {
 <?php } if($InSubCategory!=$InCategoryID) { ?>
        <option value="<?php echo $InCategoryID; ?>"><?php echo $InCategoryName; ?></option>
 <?php } } ++$fi; }
-mysql_free_result($fr); ?>
+sql_free_result($fr); ?>
        </select></td>
 </tr><tr style="text-align: left;">
        <td style="width: 50%;"><label class="TextBoxLabel" for="NumPostView">Number of posts to view categories:</label></td>
@@ -507,20 +507,20 @@ $_POST['CategoryName'] = remove_spaces($_POST['CategoryName']);
 $_POST['CategoryDesc'] = stripcslashes(htmlspecialchars($_POST['CategoryDesc'], ENT_QUOTES, $Settings['charset']));
 //$_POST['CategoryDesc'] = preg_replace("/&amp;#(x[a-f0-9]+|[0-9]+);/i", "&#$1;", $_POST['CategoryDesc']);
 $_POST['CategoryDesc'] = remove_spaces($_POST['CategoryDesc']);
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($_POST['id']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
-if($prenum==0) { redirect("location",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],false)); mysql_free_result($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($_POST['id']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
+if($prenum==0) { redirect("location",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],false)); sql_free_result($preresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($prenum>=1) {
-$OldID=mysql_result($preresult,0,"id");
-$OldOrder=mysql_result($preresult,0,"OrderID");
-mysql_free_result($preresult);
-$sql_id_check = exec_query(query("SELECT `id` FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($_POST['ForumID'])));
-$sql_order_check = exec_query(query("SELECT `OrderID` FROM `".$Settings['sqltable']."categories` WHERE `OrderID`=%i LIMIT 1", array($_POST['OrderID'])));
-$id_check = mysql_num_rows($sql_id_check); $order_check = mysql_num_rows($sql_order_check);
-mysql_free_result($sql_id_check); mysql_free_result($sql_order_check);
+$OldID=sql_result($preresult,0,"id");
+$OldOrder=sql_result($preresult,0,"OrderID");
+sql_free_result($preresult);
+$sql_id_check = sql_query(sql_pre_query("SELECT `id` FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($_POST['ForumID'])));
+$sql_order_check = sql_query(sql_pre_query("SELECT `OrderID` FROM `".$Settings['sqltable']."categories` WHERE `OrderID`=%i LIMIT 1", array($_POST['OrderID'])));
+$id_check = sql_num_rows($sql_id_check); $order_check = sql_num_rows($sql_order_check);
+sql_free_result($sql_id_check); sql_free_result($sql_order_check);
 if ($_POST['NumPostView']==null||
        !is_numeric($_POST['NumPostView'])) {
        $_POST['NumPostView'] = 0; }
@@ -546,8 +546,8 @@ $errorstr = $errorstr."Your category description is too big.<br />\n"; }
 if ($Error!="Yes") {
 redirect("refresh",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view&menu=categories",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],FALSE),"4");
 $admincptitle = " ".$ThemeSet['TitleDivider']." Updating Settings";
-$query = query("UPDATE `".$Settings['sqltable']."categories` SET `id`=%i,`OrderID`=%i,`Name`='%s',`ShowCategory`='%s',`CategoryType`='%s',`InSubCategory`=%i,`Description`='%s',`PostCountView`=%i,`KarmaCountView`=%i WHERE `id`=%i", array($_POST['CategoryID'],$_POST['OrderID'],$_POST['CategoryName'],$_POST['ShowCategory'],$_POST['CategoryType'],$_POST['InSubCategory'],$_POST['CategoryDesc'],$_POST['NumPostView'],$_POST['NumKarmaView'],$_POST['id']));
-exec_query($query);
+$query = sql_pre_query("UPDATE `".$Settings['sqltable']."categories` SET `id`=%i,`OrderID`=%i,`Name`='%s',`ShowCategory`='%s',`CategoryType`='%s',`InSubCategory`=%i,`Description`='%s',`PostCountView`=%i,`KarmaCountView`=%i WHERE `id`=%i", array($_POST['CategoryID'],$_POST['OrderID'],$_POST['CategoryName'],$_POST['ShowCategory'],$_POST['CategoryType'],$_POST['InSubCategory'],$_POST['CategoryDesc'],$_POST['NumPostView'],$_POST['NumKarmaView'],$_POST['id']));
+sql_query($query);
 ?>
 <?php } } } if($_GET['act']=="cpermissions"&&$_POST['update']!="now") {
 $admincptitle = " ".$ThemeSet['TitleDivider']." Category Permissions Manager";
@@ -579,21 +579,21 @@ if(!isset($_POST['id'])) {
        <td style="width: 50%;"><label class="TextBoxLabel" for="id">Permission to view:</label></td>
        <td style="width: 50%;"><select size="1" class="TextBox" name="id" id="id">
 <?php 
-$getperidq = query("SELECT DISTINCT `PermissionID` FROM `".$Settings['sqltable']."catpermissions`", array(null));
-$getperidr=exec_query($getperidq);
-$getperidnum=mysql_num_rows($getperidr);
+$getperidq = sql_pre_query("SELECT DISTINCT `PermissionID` FROM `".$Settings['sqltable']."catpermissions`", array(null));
+$getperidr=sql_query($getperidq);
+$getperidnum=sql_num_rows($getperidr);
 $getperidi = 0;
 while ($getperidi < $getperidnum) {
-$getperidID=mysql_result($getperidr,$getperidi,"PermissionID");
-$getperidq2 = query("SELECT * FROM `".$Settings['sqltable']."catpermissions` WHERE `PermissionID`=%i ORDER BY `CategoryID` ASC", array($getperidID));
-$getperidr2=exec_query($getperidq2);
-$getperidnum2=mysql_num_rows($getperidr2);
-$getperidName=mysql_result($getperidr2,0,"Name");
-mysql_free_result($getperidr2);
+$getperidID=sql_result($getperidr,$getperidi,"PermissionID");
+$getperidq2 = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."catpermissions` WHERE `PermissionID`=%i ORDER BY `CategoryID` ASC", array($getperidID));
+$getperidr2=sql_query($getperidq2);
+$getperidnum2=sql_num_rows($getperidr2);
+$getperidName=sql_result($getperidr2,0,"Name");
+sql_free_result($getperidr2);
 ?>
        <option value="<?php echo $getperidID; ?>"><?php echo $getperidName; ?></option>
 <?php ++$getperidi; }
-mysql_free_result($getperidr); ?>
+sql_free_result($getperidr); ?>
        </select></td>
 </tr></table>
 <table style="text-align: left;">
@@ -633,21 +633,21 @@ mysql_free_result($getperidr); ?>
 <tr class="TableMenuRow3">
 <td class="TableMenuColumn3">
 <?php 
-$fq = query("SELECT * FROM `".$Settings['sqltable']."categories` ORDER BY `OrderID` ASC, `id` ASC", array(null));
-$fr=exec_query($fq);
-$ai=mysql_num_rows($fr);
+$fq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` ORDER BY `OrderID` ASC, `id` ASC", array(null));
+$fr=sql_query($fq);
+$ai=sql_num_rows($fr);
 $fi=0;
 while ($fi < $ai) {
-$InCategoryID=mysql_result($fr,$fi,"id");
-$InCategoryName=mysql_result($fr,$fi,"Name");
-$getperidq = query("SELECT * FROM `".$Settings['sqltable']."catpermissions` WHERE PermissionID=%i AND `CategoryID`=%i LIMIT 1", array($_POST['id'],$InCategoryID));
-$getperidr=exec_query($getperidq);
-$getperidnum=mysql_num_rows($getperidr);
+$InCategoryID=sql_result($fr,$fi,"id");
+$InCategoryName=sql_result($fr,$fi,"Name");
+$getperidq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."catpermissions` WHERE PermissionID=%i AND `CategoryID`=%i LIMIT 1", array($_POST['id'],$InCategoryID));
+$getperidr=sql_query($getperidq);
+$getperidnum=sql_num_rows($getperidr);
 $getperidNumz = null;
 $getperidID = null;
 if($getperidnum>0) {
-$getperidNumz=mysql_result($getperidr,0,"id");
-$getperidID=mysql_result($getperidr,0,"PermissionID"); }
+$getperidNumz=sql_result($getperidr,0,"id");
+$getperidID=sql_result($getperidr,0,"PermissionID"); }
 ?>
 <form style="display: inline;" method="post" action="<?php echo url_maker($exfile['admin'],$Settings['file_ext'],"act=cpermissions",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin']); ?>">
 <table style="text-align: left;">
@@ -670,9 +670,9 @@ Permissions for <?php echo $InCategoryName; ?> are not set: <br />
 </td></tr></table>
 </form>
 <?php 
-mysql_free_result($getperidr);
+sql_free_result($getperidr);
 ++$fi; }
-mysql_free_result($fr); ?>
+sql_free_result($fr); ?>
 </td>
 </tr>
 <tr class="TableMenuRow4">
@@ -681,19 +681,19 @@ mysql_free_result($fr); ?>
 </table>
 </div>
 <?php } if(isset($_POST['id'])&&$_POST['subact']=="edit") {
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."catpermissions` WHERE `id`=%i LIMIT 1", array($_POST['id']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
-if($prenum==0) { redirect("location",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],false)); mysql_free_result($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."catpermissions` WHERE `id`=%i LIMIT 1", array($_POST['id']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
+if($prenum==0) { redirect("location",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],false)); sql_free_result($preresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($prenum>=1) {
-$PermissionNum=mysql_result($preresult,0,"id"); 
-$PermissionID=mysql_result($preresult,0,"PermissionID"); 
-$PermissionName=mysql_result($preresult,0,"Name"); 
-$PermissionCategoryID=mysql_result($preresult,0,"CategoryID"); 
-$CanViewCategory=mysql_result($preresult,0,"CanViewCategory");
-mysql_free_result($preresult); }
+$PermissionNum=sql_result($preresult,0,"id"); 
+$PermissionID=sql_result($preresult,0,"PermissionID"); 
+$PermissionName=sql_result($preresult,0,"Name"); 
+$PermissionCategoryID=sql_result($preresult,0,"CategoryID"); 
+$CanViewCategory=sql_result($preresult,0,"CanViewCategory");
+sql_free_result($preresult); }
 $PermissionName = stripcslashes(htmlspecialchars($PermissionName, ENT_QUOTES, $Settings['charset']));
 //$_POST['CategoryName'] = preg_replace("/&amp;#(x[a-f0-9]+|[0-9]+);/i", "&#$1;", $_POST['CategoryName']);
 ?>
@@ -747,8 +747,8 @@ $PermissionName = stripcslashes(htmlspecialchars($PermissionName, ENT_QUOTES, $S
 <?php } if(isset($_POST['id'])&&$_POST['subact']=="editnow") {
 $admincptitle = " ".$ThemeSet['TitleDivider']." Updating Settings";
 redirect("refresh",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view&menu=categories",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],FALSE),"4");
-$query = query("UPDATE `".$Settings['sqltable']."catpermissions` SET `CanViewCategory`='%s' WHERE `id`=%i", array($_POST['CanViewCategory'], $_POST['id']));
-exec_query($query); } if(isset($_POST['id'])&&$_POST['subact']=="create") { 
+$query = sql_pre_query("UPDATE `".$Settings['sqltable']."catpermissions` SET `CanViewCategory`='%s' WHERE `id`=%i", array($_POST['CanViewCategory'], $_POST['id']));
+sql_query($query); } if(isset($_POST['id'])&&$_POST['subact']=="create") { 
 ?>
 <div class="TableMenuBorder">
 <?php if($ThemeSet['TableStyle']=="div") { ?>
@@ -800,19 +800,19 @@ exec_query($query); } if(isset($_POST['id'])&&$_POST['subact']=="create") {
 <?php } if(isset($_POST['id'])&&isset($_POST['permid'])&&$_POST['subact']=="makenow") {
 $admincptitle = " ".$ThemeSet['TitleDivider']." Updating Settings";
 redirect("refresh",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view&menu=categories",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],FALSE),"4");
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."catpermissions` WHERE `id`=%i LIMIT 1", array($_POST['permid']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
-if($prenum==0) { redirect("location",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],false)); mysql_free_result($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."catpermissions` WHERE `id`=%i LIMIT 1", array($_POST['permid']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
+if($prenum==0) { redirect("location",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],false)); sql_free_result($preresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($prenum>=1) {
-$PermissionName=mysql_result($preresult,0,"Name"); 
-mysql_free_result($preresult); }
-$nextidnum = getnextid($Settings['sqltable'],"catpermissions");
-$query = query("INSERT INTO `".$Settings['sqltable']."catpermissions` (`PermissionID`, `Name`, `CategoryID`, `CanViewCategory`) VALUES\n".
+$PermissionName=sql_result($preresult,0,"Name"); 
+sql_free_result($preresult); }
+$nextidnum = sql_get_next_id($Settings['sqltable'],"catpermissions");
+$query = sql_pre_query("INSERT INTO `".$Settings['sqltable']."catpermissions` (`PermissionID`, `Name`, `CategoryID`, `CanViewCategory`) VALUES\n".
 "(%i, '%s', %i, '%s')", array($_POST['permid'], $PermissionName, $_POST['id'], $_POST['CanViewCategory'])); 
-exec_query($query); }
+sql_query($query); }
 ?>
 <?php } $doupdate = false;
 if(isset($_POST['id'])&&$_POST['subact']=="editnow") { 

diff --git a/inc/admin/forums.php b/inc/admin/forums.php
index d86f35c..18913f4 100644 (file)
--- a/inc/admin/forums.php
+++ b/inc/admin/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: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: forums.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="forums.php"||$File3Name=="/forums.php") {
@@ -36,24 +36,24 @@ require($SettDir['admin'].'table.php');
        <td style="width: 85%; vertical-align: top;">
 <?php if($_GET['act']=="retopics") { 
 $admincptitle = " ".$ThemeSet['TitleDivider']." Recounting Topics";
-$query = query("SELECT * FROM `".$Settings['sqltable']."forums` ORDER BY `OrderID` ASC, `id` ASC", array(null));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` ORDER BY `OrderID` ASC, `id` ASC", array(null));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
 while ($i < $num) {
-$ForumID=mysql_result($result,$i,"id");
-$tquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `Pinned` DESC, `LastUpdate` DESC", array($ForumID));
-$tresult=exec_query($tquery);
-$tnum=mysql_num_rows($tresult);
-$rquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `ForumID`=%i ORDER BY `TimeStamp` ASC", array($ForumID));
-$rresult=exec_query($rquery);
-$rnum=mysql_num_rows($rresult);
-$query = query("UPDATE `".$Settings['sqltable']."forums` SET `NumPosts`=%i,`NumTopics`=%i WHERE `id`=%i", array($rnum,$tnum,$ForumID));
-exec_query($query);
-mysql_free_result($tresult);
-mysql_free_result($rresult);
+$ForumID=sql_result($result,$i,"id");
+$tquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `Pinned` DESC, `LastUpdate` DESC", array($ForumID));
+$tresult=sql_query($tquery);
+$tnum=sql_num_rows($tresult);
+$rquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `ForumID`=%i ORDER BY `TimeStamp` ASC", array($ForumID));
+$rresult=sql_query($rquery);
+$rnum=sql_num_rows($rresult);
+$query = sql_pre_query("UPDATE `".$Settings['sqltable']."forums` SET `NumPosts`=%i,`NumTopics`=%i WHERE `id`=%i", array($rnum,$tnum,$ForumID));
+sql_query($query);
+sql_free_result($tresult);
+sql_free_result($rresult);
 ++$i; }
-mysql_free_result($result);
+sql_free_result($result);
 ?>
 <div class="TableMenuBorder">
 <?php if($ThemeSet['TableStyle']=="div") { ?>
@@ -88,21 +88,21 @@ mysql_free_result($result);
 </div>
 <?php } if($_GET['act']=="rereplies") { 
 $admincptitle = " ".$ThemeSet['TitleDivider']." Recounting Replies";
-$query = query("SELECT * FROM `".$Settings['sqltable']."topics` ORDER BY `Pinned` DESC, `LastUpdate` DESC", array(null));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` ORDER BY `Pinned` DESC, `LastUpdate` DESC", array(null));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
 while ($i < $num) {
-$TopicID=mysql_result($result,$i,"id");
-$rquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` ASC", array($TopicID));
-$rresult=exec_query($rquery);
-$rnum=mysql_num_rows($rresult);
+$TopicID=sql_result($result,$i,"id");
+$rquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` ASC", array($TopicID));
+$rresult=sql_query($rquery);
+$rnum=sql_num_rows($rresult);
 $Nrnum = $rnum - 1;
-$query = query("UPDATE `".$Settings['sqltable']."topics` SET `NumReply`=%i WHERE `id`=%i", array($Nrnum,$TopicID));
-exec_query($query);
-mysql_free_result($rresult);
+$query = sql_pre_query("UPDATE `".$Settings['sqltable']."topics` SET `NumReply`=%i WHERE `id`=%i", array($Nrnum,$TopicID));
+sql_query($query);
+sql_free_result($rresult);
 ++$i; }
-mysql_free_result($result);
+sql_free_result($result);
 ?>
 <div class="TableMenuBorder">
 <?php if($ThemeSet['TableStyle']=="div") { ?>
@@ -137,14 +137,14 @@ mysql_free_result($result);
 </div>
 <?php } if($_GET['act']=="fixtnames") { 
 $admincptitle = " ".$ThemeSet['TitleDivider']." Fixing Topic User Names";
-$query = query("SELECT * FROM `".$Settings['sqltable']."topics` ORDER BY `TimeStamp` ASC", array(null));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` ORDER BY `TimeStamp` ASC", array(null));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
 while ($i < $num) {
-$TopicID=mysql_result($result,$i,"id");
-$UsersID=mysql_result($result,$i,"UserID");
-$GuestsName=mysql_result($result,$i,"GuestName");
+$TopicID=sql_result($result,$i,"id");
+$UsersID=sql_result($result,$i,"UserID");
+$GuestsName=sql_result($result,$i,"GuestName");
 $NewUserID = $UsersID;
 $NewGuestsName = $GuestsName;
 $NewGuestsName = GetUserName($NewUserID,$Settings['sqltable']);
@@ -160,10 +160,10 @@ if($UsersID===0&&$GuestsName==null) {
 $NewUserID = -1; $NewGuestsName = "Guest"; }
 if($UsersID==$NewUserID&&$GuestsName==$NewGuestsName) {
 $NewUserID = $UsersID; $NewGuestsName = $GuestsName; }
-$query = query("UPDATE `".$Settings['sqltable']."topics` SET `UserID`=%i,`GuestName`='%s' WHERE `id`=%i", array($NewUserID,$NewGuestsName,$TopicID));
-exec_query($query);
+$query = sql_pre_query("UPDATE `".$Settings['sqltable']."topics` SET `UserID`=%i,`GuestName`='%s' WHERE `id`=%i", array($NewUserID,$NewGuestsName,$TopicID));
+sql_query($query);
 ++$i; }
-mysql_free_result($result);
+sql_free_result($result);
 ?>
 <div class="TableMenuBorder">
 <?php if($ThemeSet['TableStyle']=="div") { ?>
@@ -198,14 +198,14 @@ mysql_free_result($result);
 </div>
 <?php } if($_GET['act']=="fixrnames") { 
 $admincptitle = " ".$ThemeSet['TitleDivider']." Fixing Reply User Names";
-$query = query("SELECT * FROM `".$Settings['sqltable']."posts` ORDER BY `TimeStamp` ASC", array(null));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` ORDER BY `TimeStamp` ASC", array(null));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
 while ($i < $num) {
-$PostID=mysql_result($result,$i,"id");
-$UsersID=mysql_result($result,$i,"UserID");
-$GuestsName=mysql_result($result,$i,"GuestName");
+$PostID=sql_result($result,$i,"id");
+$UsersID=sql_result($result,$i,"UserID");
+$GuestsName=sql_result($result,$i,"GuestName");
 $NewUserID = $UsersID;
 $NewGuestsName = $GuestsName;
 $NewGuestsName = GetUserName($NewUserID,$Settings['sqltable']);
@@ -221,8 +221,8 @@ if($UsersID===0&&$GuestsName==null) {
 $NewUserID = -1; $NewGuestsName = "Guest"; }
 if($UsersID==$NewUserID&&$GuestsName==$NewGuestsName) {
 $NewUserID = $UsersID; $NewGuestsName = $GuestsName; }
-$EditUserID=mysql_result($result,$i,"EditUser");
-$EditUserName=mysql_result($result,$i,"EditUserName");
+$EditUserID=sql_result($result,$i,"EditUser");
+$EditUserName=sql_result($result,$i,"EditUserName");
 $NewEditUserID = $EditUserID;
 $NewEditUserName = $EditUserName;
 $NewEditUserName = GetUserName($NewEditUserID,$Settings['sqltable']);
@@ -238,10 +238,10 @@ if($EditUserID===0&&$EditUserName==null) {
 $NewEditUserID = "0"; $NewEditUserName = null; }
 if($EditUserID==$NewEditUserID&&$EditUserName==$NewEditUserName) {
 $NewEditUserID = $EditUserID; $NewEditUserName = $EditUserName; }
-$query = query("UPDATE `".$Settings['sqltable']."posts` SET `UserID`=%i,`GuestName`='%s',`EditUser`=%i,`EditUserName`='%s' WHERE `id`=%i", array($NewUserID,$NewGuestsName,$NewEditUserID,$NewEditUserName,$PostID));
-exec_query($query);
+$query = sql_pre_query("UPDATE `".$Settings['sqltable']."posts` SET `UserID`=%i,`GuestName`='%s',`EditUser`=%i,`EditUserName`='%s' WHERE `id`=%i", array($NewUserID,$NewGuestsName,$NewEditUserID,$NewEditUserName,$PostID));
+sql_query($query);
 ++$i; }
-mysql_free_result($result);
+sql_free_result($result);
 ?>
 <div class="TableMenuBorder">
 <?php if($ThemeSet['TableStyle']=="div") { ?>
@@ -309,18 +309,18 @@ $admincptitle = " ".$ThemeSet['TitleDivider']." Adding new Forum";
        <td style="width: 50%;"><label class="TextBoxLabel" for="ForumCatID">Select category for forum:</label></td>
        <td style="width: 50%;"><select size="1" class="TextBox" name="ForumCatID" id="ForumCatID">
 <?php 
-$cq = query("SELECT * FROM `".$Settings['sqltable']."categories` ORDER BY `OrderID` ASC, `id` ASC", array(null));
-$cr=exec_query($cq);
-$eu=mysql_num_rows($cr);
+$cq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` ORDER BY `OrderID` ASC, `id` ASC", array(null));
+$cr=sql_query($cq);
+$eu=sql_num_rows($cr);
 $nu=0;
 while ($nu < $eu) {
-$InCatID=mysql_result($cr,$nu,"id");
-$InCatName=mysql_result($cr,$nu,"Name");
+$InCatID=sql_result($cr,$nu,"id");
+$InCatName=sql_result($cr,$nu,"Name");
 $EuNuMai = "Eu nu mai vreau";
 ?>
        <option value="<?php echo $InCatID; ?>"><?php echo $InCatName; ?></option>
 <?php ++$nu; }
-mysql_free_result($cr); ?>
+sql_free_result($cr); ?>
        </select></td>
 </tr><tr style="text-align: left;">
        <td style="width: 50%;"><label class="TextBoxLabel" for="ForumName">Insert name for forum:</label></td>
@@ -349,20 +349,20 @@ mysql_free_result($cr); ?>
        <td style="width: 50%;"><select size="1" class="TextBox" name="InSubForum" id="InSubForum">
        <option selected="selected" value="0">none</option>
 <?php 
-$fq = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `InSubForum`=0 ORDER BY `OrderID` ASC, `id` ASC", array(null));
-$fr=exec_query($fq);
-$ai=mysql_num_rows($fr);
+$fq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `InSubForum`=0 ORDER BY `OrderID` ASC, `id` ASC", array(null));
+$fr=sql_query($fq);
+$ai=sql_num_rows($fr);
 $fi=0;
 while ($fi < $ai) {
-$InForumID=mysql_result($fr,$fi,"id");
-$InForumName=mysql_result($fr,$fi,"Name");
-$InForumType=mysql_result($fr,$fi,"ForumType");
-$AiFiInSubForum=mysql_result($fr,$fi,"InSubForum");
+$InForumID=sql_result($fr,$fi,"id");
+$InForumName=sql_result($fr,$fi,"Name");
+$InForumType=sql_result($fr,$fi,"ForumType");
+$AiFiInSubForum=sql_result($fr,$fi,"InSubForum");
 if ($InForumType!="redirect"&&$AiFiInSubForum=="0") {
 ?>
        <option value="<?php echo $InForumID; ?>"><?php echo $InForumName; ?></option>
 <?php } ++$fi; }
-mysql_free_result($fr); ?>
+sql_free_result($fr); ?>
        </select></td>
 </tr><tr style="text-align: left;">
        <td style="width: 50%;"><label class="TextBoxLabel" for="PostCountAdd">Add to post count:</label></td>
@@ -390,19 +390,19 @@ mysql_free_result($fr); ?>
        <td style="width: 50%;"><select size="1" class="TextBox" name="CPermissions" id="CPermissions">
        <option selected="selected" value="0">none</option>
 <?php 
-$fq = query("SELECT * FROM `".$Settings['sqltable']."forums` ORDER BY `OrderID` ASC, `id` ASC", array(null));
-$fr=exec_query($fq);
-$ai=mysql_num_rows($fr);
+$fq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` ORDER BY `OrderID` ASC, `id` ASC", array(null));
+$fr=sql_query($fq);
+$ai=sql_num_rows($fr);
 $fi=0;
 while ($fi < $ai) {
-$InForumID=mysql_result($fr,$fi,"id");
-$InForumName=mysql_result($fr,$fi,"Name");
-$InForumType=mysql_result($fr,$fi,"ForumType");
-$AiFiInSubForum=mysql_result($fr,$fi,"InSubForum");
+$InForumID=sql_result($fr,$fi,"id");
+$InForumName=sql_result($fr,$fi,"Name");
+$InForumType=sql_result($fr,$fi,"ForumType");
+$AiFiInSubForum=sql_result($fr,$fi,"InSubForum");
 ?>
        <option value="<?php echo $InForumID; ?>"><?php echo $InForumName; ?></option>
 <?php ++$fi; }
-mysql_free_result($fr); ?>
+sql_free_result($fr); ?>
        </select></td>
 </tr></table>
 <table style="text-align: left;">
@@ -428,10 +428,10 @@ $_POST['ForumName'] = remove_spaces($_POST['ForumName']);
 $_POST['ForumDesc'] = stripcslashes(htmlspecialchars($_POST['ForumDesc'], ENT_QUOTES, $Settings['charset']));
 //$_POST['ForumDesc'] = preg_replace("/&amp;#(x[a-f0-9]+|[0-9]+);/i", "&#$1;", $_POST['ForumDesc']);
 $_POST['ForumDesc'] = remove_spaces($_POST['ForumDesc']);
-$sql_id_check = exec_query(query("SELECT `id` FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_POST['ForumID'])));
-$sql_order_check = exec_query(query("SELECT `OrderID` FROM `".$Settings['sqltable']."forums` WHERE `OrderID`=%i LIMIT 1", array($_POST['OrderID'])));
-$id_check = mysql_num_rows($sql_id_check); $order_check = mysql_num_rows($sql_order_check);
-mysql_free_result($sql_id_check); mysql_free_result($sql_order_check);
+$sql_id_check = sql_query(sql_pre_query("SELECT `id` FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_POST['ForumID'])));
+$sql_order_check = sql_query(sql_pre_query("SELECT `OrderID` FROM `".$Settings['sqltable']."forums` WHERE `OrderID`=%i LIMIT 1", array($_POST['OrderID'])));
+$id_check = sql_num_rows($sql_id_check); $order_check = sql_num_rows($sql_order_check);
+sql_free_result($sql_id_check); sql_free_result($sql_order_check);
 $errorstr = "";
 if ($_POST['NumPostView']==null||
        !is_numeric($_POST['NumPostView'])) {
@@ -464,55 +464,55 @@ $errorstr = $errorstr."Your Forum Description is too big.<br />\n"; }
 if ($Error!="Yes") {
 redirect("refresh",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view&menu=forums",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],FALSE),"4");
 $admincptitle = " ".$ThemeSet['TitleDivider']." Updating Settings";
-$query = query("INSERT INTO `".$Settings['sqltable']."forums` (`id`, `CategoryID`, `OrderID`, `Name`, `ShowForum`, `ForumType`, `InSubForum`, `RedirectURL`, `Redirects`, `NumViews`, `Description`, `PostCountAdd`, `PostCountView`, `KarmaCountView`, `CanHaveTopics`, `HotTopicPosts`, `NumPosts`, `NumTopics`) VALUES\n".
+$query = sql_pre_query("INSERT INTO `".$Settings['sqltable']."forums` (`id`, `CategoryID`, `OrderID`, `Name`, `ShowForum`, `ForumType`, `InSubForum`, `RedirectURL`, `Redirects`, `NumViews`, `Description`, `PostCountAdd`, `PostCountView`, `KarmaCountView`, `CanHaveTopics`, `HotTopicPosts`, `NumPosts`, `NumTopics`) VALUES\n".
 "(%i, %i, %i, '%s', '%s', '%s', %i, '%s', 0, 0, '%s', '%s', %i, %i, '%s', %i, 0, 0)", array($_POST['ForumID'],$_POST['ForumCatID'],$_POST['OrderID'],$_POST['ForumName'],$_POST['ShowForum'],$_POST['ForumType'],$_POST['InSubForum'],$_POST['RedirectURL'],$_POST['ForumDesc'],$_POST['PostCountAdd'],$_POST['NumPostView'],$_POST['NumKarmaView'],$_POST['CanHaveTopics'],$_POST['NumPostHotTopic']));
-exec_query($query);
+sql_query($query);
 if(!is_numeric($_POST['CPermissions'])) { $_POST['CPermissions'] = "0"; }
-$getperidq = query("SELECT DISTINCT `PermissionID` FROM `".$Settings['sqltable']."permissions` ORDER BY `PermissionID` ASC", array(null));
-$getperidr=exec_query($getperidq);
-$getperidnum=mysql_num_rows($getperidr);
+$getperidq = sql_pre_query("SELECT DISTINCT `PermissionID` FROM `".$Settings['sqltable']."permissions` ORDER BY `PermissionID` ASC", array(null));
+$getperidr=sql_query($getperidq);
+$getperidnum=sql_num_rows($getperidr);
 $getperidi = 0; 
-$nextperid = getnextid($Settings['sqltable'],"permissions");
+$nextperid = sql_get_next_id($Settings['sqltable'],"permissions");
 while ($getperidi < $getperidnum) {
-$getperidID=mysql_result($getperidr,$getperidi,"PermissionID");
+$getperidID=sql_result($getperidr,$getperidi,"PermissionID");
 if($_POST['CPermissions']=="0") {
-$getperidq2 = query("SELECT * FROM `".$Settings['sqltable']."permissions` WHERE `PermissionID`=%i", array($getperidID)); }
+$getperidq2 = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."permissions` WHERE `PermissionID`=%i", array($getperidID)); }
 if($_POST['CPermissions']!="0") {
-$getperidq2 = query("SELECT * FROM `".$Settings['sqltable']."permissions` WHERE `PermissionID`=%i AND ForumID=%i", array($getperidID,$_POST['CPermissions'])); }
-$getperidr2=exec_query($getperidq2);
-$getperidnum2=mysql_num_rows($getperidr2);
-$PermissionNum=mysql_result($getperidr2,0,"id"); 
-$PermissionID=mysql_result($getperidr2,0,"PermissionID"); 
-$PermissionName=mysql_result($getperidr2,0,"Name"); 
-$PermissionForumID=mysql_result($getperidr2,0,"ForumID"); 
-$CanViewForum=mysql_result($getperidr2,0,"CanViewForum"); 
-$CanMakeTopics=mysql_result($getperidr2,0,"CanMakeTopics"); 
-$CanMakeReplys=mysql_result($getperidr2,0,"CanMakeReplys"); 
-$CanMakeReplysCT=mysql_result($getperidr2,0,"CanMakeReplysCT"); 
-$CanEditTopics=mysql_result($getperidr2,0,"CanEditTopics"); 
-$CanEditTopicsCT=mysql_result($getperidr2,0,"CanEditTopicsCT"); 
-$CanEditReplys=mysql_result($getperidr2,0,"CanEditReplys"); 
-$CanEditReplysCT=mysql_result($getperidr2,0,"CanEditReplysCT"); 
-$CanDeleteTopics=mysql_result($getperidr2,0,"CanDeleteTopics"); 
-$CanDeleteTopicsCT=mysql_result($getperidr2,0,"CanDeleteTopicsCT"); 
-$CanDeleteReplys=mysql_result($getperidr2,0,"CanDeleteReplys"); 
-$CanDeleteReplysCT=mysql_result($getperidr2,0,"CanDeleteReplysCT"); 
-$CanCloseTopics=mysql_result($getperidr2,0,"CanCloseTopics"); 
-$CanPinTopics=mysql_result($getperidr2,0,"CanPinTopics"); 
-$CanDohtml=mysql_result($getperidr2,0,"CanDohtml"); 
-$CanUseBBags=mysql_result($getperidr2,0,"CanUseBBags"); 
-$CanModForum=mysql_result($getperidr2,0,"CanModForum"); 
-mysql_free_result($getperidr2);
+$getperidq2 = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."permissions` WHERE `PermissionID`=%i AND ForumID=%i", array($getperidID,$_POST['CPermissions'])); }
+$getperidr2=sql_query($getperidq2);
+$getperidnum2=sql_num_rows($getperidr2);
+$PermissionNum=sql_result($getperidr2,0,"id"); 
+$PermissionID=sql_result($getperidr2,0,"PermissionID"); 
+$PermissionName=sql_result($getperidr2,0,"Name"); 
+$PermissionForumID=sql_result($getperidr2,0,"ForumID"); 
+$CanViewForum=sql_result($getperidr2,0,"CanViewForum"); 
+$CanMakeTopics=sql_result($getperidr2,0,"CanMakeTopics"); 
+$CanMakeReplys=sql_result($getperidr2,0,"CanMakeReplys"); 
+$CanMakeReplysCT=sql_result($getperidr2,0,"CanMakeReplysCT"); 
+$CanEditTopics=sql_result($getperidr2,0,"CanEditTopics"); 
+$CanEditTopicsCT=sql_result($getperidr2,0,"CanEditTopicsCT"); 
+$CanEditReplys=sql_result($getperidr2,0,"CanEditReplys"); 
+$CanEditReplysCT=sql_result($getperidr2,0,"CanEditReplysCT"); 
+$CanDeleteTopics=sql_result($getperidr2,0,"CanDeleteTopics"); 
+$CanDeleteTopicsCT=sql_result($getperidr2,0,"CanDeleteTopicsCT"); 
+$CanDeleteReplys=sql_result($getperidr2,0,"CanDeleteReplys"); 
+$CanDeleteReplysCT=sql_result($getperidr2,0,"CanDeleteReplysCT"); 
+$CanCloseTopics=sql_result($getperidr2,0,"CanCloseTopics"); 
+$CanPinTopics=sql_result($getperidr2,0,"CanPinTopics"); 
+$CanDohtml=sql_result($getperidr2,0,"CanDohtml"); 
+$CanUseBBags=sql_result($getperidr2,0,"CanUseBBags"); 
+$CanModForum=sql_result($getperidr2,0,"CanModForum"); 
+sql_free_result($getperidr2);
 if($_POST['CPermissions']=="0") {
-$query = query("INSERT IGNORE INTO `".$Settings['sqltable']."permissions` VALUES (%i, %i, '%s', %i, 'yes', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no')", array($nextperid,$PermissionID,$PermissionName,$_POST['ForumID'])); }
+$query = sql_pre_query("INSERT IGNORE INTO `".$Settings['sqltable']."permissions` VALUES (%i, %i, '%s', %i, 'yes', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no')", array($nextperid,$PermissionID,$PermissionName,$_POST['ForumID'])); }
 if($_POST['CPermissions']!="0") {
 if($getperidnum2>0) {
-$query = query("INSERT IGNORE INTO `".$Settings['sqltable']."permissions` VALUES (%i, %i, '%s', %i, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')", array($nextperid,$PermissionID,$PermissionName,$_POST['ForumID'],$CanViewForum,$CanMakeTopics,$CanMakeReplys,$CanMakeReplysCT,$CanEditTopics,$CanEditTopicsCT,$CanEditReplys,$CanEditReplysCT,$CanDeleteTopics,$CanDeleteTopicsCT,$CanDeleteReplys,$CanDeleteReplysCT,$CanCloseTopics,$CanPinTopics,$CanDohtml,$CanUseBBags,$CanModForum)); }
+$query = sql_pre_query("INSERT IGNORE INTO `".$Settings['sqltable']."permissions` VALUES (%i, %i, '%s', %i, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')", array($nextperid,$PermissionID,$PermissionName,$_POST['ForumID'],$CanViewForum,$CanMakeTopics,$CanMakeReplys,$CanMakeReplysCT,$CanEditTopics,$CanEditTopicsCT,$CanEditReplys,$CanEditReplysCT,$CanDeleteTopics,$CanDeleteTopicsCT,$CanDeleteReplys,$CanDeleteReplysCT,$CanCloseTopics,$CanPinTopics,$CanDohtml,$CanUseBBags,$CanModForum)); }
 if($getperidnum2<=0) {
-$query = query("INSERT IGNORE INTO `".$Settings['sqltable']."permissions` VALUES (%i, %i, '%s', %i, 'yes', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no')", array($nextperid,$PermissionID,$PermissionName,$_POST['ForumID'])); } }
-exec_query($query);
+$query = sql_pre_query("INSERT IGNORE INTO `".$Settings['sqltable']."permissions` VALUES (%i, %i, '%s', %i, 'yes', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no')", array($nextperid,$PermissionID,$PermissionName,$_POST['ForumID'])); } }
+sql_query($query);
 ++$getperidi; ++$nextperid; }
-mysql_free_result($getperidr);
+sql_free_result($getperidr);
 ?>
 <?php } } if($_GET['act']=="deleteforum"&&$_POST['update']!="now") { 
 $admincptitle = " ".$ThemeSet['TitleDivider']." Deleting a Forum";
@@ -561,19 +561,19 @@ $admincptitle = " ".$ThemeSet['TitleDivider']." Deleting a Forum";
        <td style="width: 50%;"><label class="TextBoxLabel" for="DelID">Delete Forum:</label></td>
        <td style="width: 50%;"><select size="1" class="TextBox" name="DelID" id="DelID">
 <?php 
-$fq = query("SELECT * FROM `".$Settings['sqltable']."forums` ORDER BY `OrderID` ASC, `id` ASC", array(null));
-$fr=exec_query($fq);
-$ai=mysql_num_rows($fr);
+$fq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` ORDER BY `OrderID` ASC, `id` ASC", array(null));
+$fr=sql_query($fq);
+$ai=sql_num_rows($fr);
 $fi=0;
 while ($fi < $ai) {
-$InForumID=mysql_result($fr,$fi,"id");
-$InForumName=mysql_result($fr,$fi,"Name");
-$InForumType=mysql_result($fr,$fi,"ForumType");
-$AiFiInSubForum=mysql_result($fr,$fi,"InSubForum");
+$InForumID=sql_result($fr,$fi,"id");
+$InForumName=sql_result($fr,$fi,"Name");
+$InForumType=sql_result($fr,$fi,"ForumType");
+$AiFiInSubForum=sql_result($fr,$fi,"InSubForum");
 ?>
        <option value="<?php echo $InForumID; ?>"><?php echo $InForumName; ?></option>
 <?php ++$fi; }
-mysql_free_result($fr); ?>
+sql_free_result($fr); ?>
        </select></td>
 </tr></table>
 <table style="text-align: left;">
@@ -594,42 +594,42 @@ mysql_free_result($fr); ?>
 </div>
 <?php } if($_GET['act']=="deleteforum"&&$_POST['update']=="now"&&$_GET['act']=="deleteforum") { 
 $admincptitle = " ".$ThemeSet['TitleDivider']." Updating Settings";
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_POST['DelID']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_POST['DelID']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
 $errorstr = ""; $Error = null;
 if (!is_numeric($_POST['DelID'])) { $Error="Yes";
 $errorstr = $errorstr."You need to enter a forum ID.<br />\n"; } 
 if($prenum>0&&$Error!="Yes") {
-$dtquery = query("DELETE FROM `".$Settings['sqltable']."forums` WHERE `id`=%i", array($_POST['DelID']));
-exec_query($dtquery);
+$dtquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."forums` WHERE `id`=%i", array($_POST['DelID']));
+sql_query($dtquery);
 if($_POST['DelForums']=="yes") {
-$dtquery = query("DELETE FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i", array($_POST['DelID']));
-exec_query($dtquery);
-$dtquery = query("DELETE FROM `".$Settings['sqltable']."posts` WHERE `ForumID`=%i", array($_POST['DelID']));
-exec_query($dtquery); }
+$dtquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i", array($_POST['DelID']));
+sql_query($dtquery);
+$dtquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."posts` WHERE `ForumID`=%i", array($_POST['DelID']));
+sql_query($dtquery); }
 if($_POST['DelPermission']=="yes") {
-$dtquery = query("DELETE FROM `".$Settings['sqltable']."permissions` WHERE `ForumID`=%i", array($_POST['DelID']));
-exec_query($dtquery); }
+$dtquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."permissions` WHERE `ForumID`=%i", array($_POST['DelID']));
+sql_query($dtquery); }
 if($_POST['DelForums']=="yes") {
-$apcquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($_POST['DelID']));
-$apcresult=exec_query($apcquery);
-$apcnum=mysql_num_rows($apcresult);
+$apcquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($_POST['DelID']));
+$apcresult=sql_query($apcquery);
+$apcnum=sql_num_rows($apcresult);
 $apci=0; $apcl=1; if($apcnum>=1) {
 while ($apci < $apcnum) {
-$DelSubsForumID=mysql_result($apcresult,$apci,"id");
+$DelSubsForumID=sql_result($apcresult,$apci,"id");
 if($_POST['DelForums']=="yes") {
-$dtquery = query("DELETE FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i", array($DelSubsForumID));
-exec_query($dtquery);
-$dtquery = query("DELETE FROM `".$Settings['sqltable']."posts` WHERE `ForumID`=%i", array($DelSubsForumID));
-exec_query($dtquery); }
+$dtquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i", array($DelSubsForumID));
+sql_query($dtquery);
+$dtquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."posts` WHERE `ForumID`=%i", array($DelSubsForumID));
+sql_query($dtquery); }
 if($_POST['DelPermission']=="yes") {
-$dtquery = query("DELETE FROM `".$Settings['sqltable']."permissions` WHERE `ForumID`=%i", array($DelSubsForumID));
-exec_query($dtquery); }
-$dtquery = query("DELETE FROM `".$Settings['sqltable']."forums` WHERE `id`=%i", array($DelSubsForumID));
-exec_query($dtquery);
+$dtquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."permissions` WHERE `ForumID`=%i", array($DelSubsForumID));
+sql_query($dtquery); }
+$dtquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."forums` WHERE `id`=%i", array($DelSubsForumID));
+sql_query($dtquery);
 ++$apci; }
-mysql_free_result($apcresult); } }
+sql_free_result($apcresult); } }
 ?>
 <?php } } if($_GET['act']=="editforum"&&$_POST['update']!="now") {
 $admincptitle = " ".$ThemeSet['TitleDivider']." Editing a Forum";
@@ -661,19 +661,19 @@ if(!isset($_POST['id'])) {
        <td style="width: 50%;"><label class="TextBoxLabel" for="id">Forum to Edit:</label></td>
        <td style="width: 50%;"><select size="1" class="TextBox" name="id" id="id">
 <?php 
-$fq = query("SELECT * FROM `".$Settings['sqltable']."forums` ORDER BY `OrderID` ASC, `id` ASC", array(null));
-$fr=exec_query($fq);
-$ai=mysql_num_rows($fr);
+$fq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` ORDER BY `OrderID` ASC, `id` ASC", array(null));
+$fr=sql_query($fq);
+$ai=sql_num_rows($fr);
 $fi=0;
 while ($fi < $ai) {
-$InForumID=mysql_result($fr,$fi,"id");
-$InForumName=mysql_result($fr,$fi,"Name");
-$InForumType=mysql_result($fr,$fi,"ForumType");
-$AiFiInSubForum=mysql_result($fr,$fi,"InSubForum");
+$InForumID=sql_result($fr,$fi,"id");
+$InForumName=sql_result($fr,$fi,"Name");
+$InForumType=sql_result($fr,$fi,"ForumType");
+$AiFiInSubForum=sql_result($fr,$fi,"InSubForum");
 ?>
        <option value="<?php echo $InForumID; ?>"><?php echo $InForumName; ?></option>
 <?php ++$fi; }
-mysql_free_result($fr); ?>
+sql_free_result($fr); ?>
        </select></td>
 </tr></table>
 <table style="text-align: left;">
@@ -692,34 +692,34 @@ mysql_free_result($fr); ?>
 </table>
 </div>
 <?php } if(isset($_POST['id'])) { 
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_POST['id']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
-if($prenum==0) { redirect("location",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],false)); mysql_free_result($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_POST['id']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
+if($prenum==0) { redirect("location",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],false)); sql_free_result($preresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($prenum>=1) {
-$ForumID=mysql_result($preresult,0,"id");
-$ForumCatID=mysql_result($preresult,0,"CategoryID");
-$ForumOrder=mysql_result($preresult,0,"OrderID");
-$ForumName=mysql_result($preresult,0,"Name");
+$ForumID=sql_result($preresult,0,"id");
+$ForumCatID=sql_result($preresult,0,"CategoryID");
+$ForumOrder=sql_result($preresult,0,"OrderID");
+$ForumName=sql_result($preresult,0,"Name");
 $ForumName = htmlspecialchars($ForumName, ENT_QUOTES, $Settings['charset']);
-$ShowForum=mysql_result($preresult,0,"ShowForum");
-$ForumType=mysql_result($preresult,0,"ForumType");
-$InSubForum=mysql_result($preresult,0,"InSubForum");
-$RedirectURL=mysql_result($preresult,0,"RedirectURL");
-$RedirectTimes=mysql_result($preresult,0,"Redirects");
-$NumberViews=mysql_result($preresult,0,"NumViews");
-$ForumDescription=mysql_result($preresult,0,"Description");
+$ShowForum=sql_result($preresult,0,"ShowForum");
+$ForumType=sql_result($preresult,0,"ForumType");
+$InSubForum=sql_result($preresult,0,"InSubForum");
+$RedirectURL=sql_result($preresult,0,"RedirectURL");
+$RedirectTimes=sql_result($preresult,0,"Redirects");
+$NumberViews=sql_result($preresult,0,"NumViews");
+$ForumDescription=sql_result($preresult,0,"Description");
 $ForumDescription = htmlspecialchars($ForumDescription, ENT_QUOTES, $Settings['charset']);
-$PostCountAdd=mysql_result($preresult,0,"PostCountAdd");
-$PostCountView=mysql_result($preresult,0,"PostCountView");
-$KarmaCountView=mysql_result($preresult,0,"KarmaCountView");
-$CanHaveTopics=mysql_result($preresult,0,"CanHaveTopics");
-$HotTopicPosts=mysql_result($preresult,0,"HotTopicPosts");
-$NumberPosts=mysql_result($preresult,0,"NumPosts");
-$NumberTopics=mysql_result($preresult,0,"NumTopics");
-mysql_free_result($preresult);
+$PostCountAdd=sql_result($preresult,0,"PostCountAdd");
+$PostCountView=sql_result($preresult,0,"PostCountView");
+$KarmaCountView=sql_result($preresult,0,"KarmaCountView");
+$CanHaveTopics=sql_result($preresult,0,"CanHaveTopics");
+$HotTopicPosts=sql_result($preresult,0,"HotTopicPosts");
+$NumberPosts=sql_result($preresult,0,"NumPosts");
+$NumberTopics=sql_result($preresult,0,"NumTopics");
+sql_free_result($preresult);
 $ForumType = strtolower($ForumType); $CanHaveTopics = strtolower($CanHaveTopics);
 ?>
 <div class="TableMenuBorder">
@@ -754,13 +754,13 @@ $ForumType = strtolower($ForumType); $CanHaveTopics = strtolower($CanHaveTopics)
        <td style="width: 50%;"><label class="TextBoxLabel" for="ForumCatID">Select category for forum:</label></td>
        <td style="width: 50%;"><select size="1" class="TextBox" name="ForumCatID" id="ForumCatID">
 <?php 
-$cq = query("SELECT * FROM `".$Settings['sqltable']."categories` ORDER BY `OrderID` ASC, `id` ASC", array(null));
-$cr=exec_query($cq);
-$eu=mysql_num_rows($cr);
+$cq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` ORDER BY `OrderID` ASC, `id` ASC", array(null));
+$cr=sql_query($cq);
+$eu=sql_num_rows($cr);
 $nu=0;
 while ($nu < $eu) {
-$InCatID=mysql_result($cr,$nu,"id");
-$InCatName=mysql_result($cr,$nu,"Name");
+$InCatID=sql_result($cr,$nu,"id");
+$InCatName=sql_result($cr,$nu,"Name");
 $EuNuMai = "Eu nu mai vreau";
 if($ForumCatID==$InCatID) {
 ?>
@@ -768,7 +768,7 @@ if($ForumCatID==$InCatID) {
 <?php } if($ForumCatID!=$InCatID) { ?>
        <option value="<?php echo $InCatID; ?>"><?php echo $InCatName; ?></option>
 <?php } ++$nu; }
-mysql_free_result($cr); ?>
+sql_free_result($cr); ?>
        </select></td>
 </tr><tr style="text-align: left;">
        <td style="width: 50%;"><label class="TextBoxLabel" for="ForumName">Insert name for forum:</label></td>
@@ -797,15 +797,15 @@ mysql_free_result($cr); ?>
        <td style="width: 50%;"><select size="1" class="TextBox" name="InSubForum" id="InSubForum">
        <option selected="selected" value="0">none</option>
 <?php 
-$fq = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `InSubForum`=0 AND `id`<>%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
-$fr=exec_query($fq);
-$ai=mysql_num_rows($fr);
+$fq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `InSubForum`=0 AND `id`<>%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
+$fr=sql_query($fq);
+$ai=sql_num_rows($fr);
 $fi=0;
 while ($fi < $ai) {
-$InForumID=mysql_result($fr,$fi,"id");
-$InForumName=mysql_result($fr,$fi,"Name");
-$InForumType=mysql_result($fr,$fi,"ForumType");
-$AiFiInSubForum=mysql_result($fr,$fi,"InSubForum");
+$InForumID=sql_result($fr,$fi,"id");
+$InForumName=sql_result($fr,$fi,"Name");
+$InForumType=sql_result($fr,$fi,"ForumType");
+$AiFiInSubForum=sql_result($fr,$fi,"InSubForum");
 if ($InForumType!="redirect"&&$AiFiInSubForum=="0") {
 if($InSubForum==$InForumID) {
 ?>
@@ -813,7 +813,7 @@ if($InSubForum==$InForumID) {
 <?php } if($InSubForum!=$InForumID) { ?>
        <option value="<?php echo $InForumID; ?>"><?php echo $InForumName; ?></option>
 <?php } } ++$fi; }
-mysql_free_result($fr); ?>
+sql_free_result($fr); ?>
        </select></td>
 </tr><tr style="text-align: left;">
        <td style="width: 50%;"><label class="TextBoxLabel" for="PostCountAdd">Add to post count:</label></td>
@@ -862,20 +862,20 @@ $_POST['ForumName'] = remove_spaces($_POST['ForumName']);
 $_POST['ForumDesc'] = stripcslashes(htmlspecialchars($_POST['ForumDesc'], ENT_QUOTES, $Settings['charset']));
 //$_POST['ForumDesc'] = preg_replace("/&amp;#(x[a-f0-9]+|[0-9]+);/i", "&#$1;", $_POST['ForumDesc']);
 $_POST['ForumDesc'] = remove_spaces($_POST['ForumDesc']);
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_POST['id']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
-if($prenum==0) { redirect("location",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],false)); mysql_free_result($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_POST['id']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
+if($prenum==0) { redirect("location",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],false)); sql_free_result($preresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($prenum>=1) {
-$OldID=mysql_result($preresult,0,"id");
-$OldOrder=mysql_result($preresult,0,"OrderID");
-mysql_free_result($preresult);
-$sql_id_check = exec_query(query("SELECT `id` FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_POST['ForumID'])));
-$sql_order_check = exec_query(query("SELECT `OrderID` FROM `".$Settings['sqltable']."forums` WHERE `OrderID`=%i LIMIT 1", array($_POST['OrderID'])));
-$id_check = mysql_num_rows($sql_id_check); $order_check = mysql_num_rows($sql_order_check);
-mysql_free_result($sql_id_check); mysql_free_result($sql_order_check);
+$OldID=sql_result($preresult,0,"id");
+$OldOrder=sql_result($preresult,0,"OrderID");
+sql_free_result($preresult);
+$sql_id_check = sql_query(sql_pre_query("SELECT `id` FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_POST['ForumID'])));
+$sql_order_check = sql_query(sql_pre_query("SELECT `OrderID` FROM `".$Settings['sqltable']."forums` WHERE `OrderID`=%i LIMIT 1", array($_POST['OrderID'])));
+$id_check = sql_num_rows($sql_id_check); $order_check = sql_num_rows($sql_order_check);
+sql_free_result($sql_id_check); sql_free_result($sql_order_check);
 if ($_POST['NumPostView']==null||
        !is_numeric($_POST['NumPostView'])) {
        $_POST['NumPostView'] = 0; }
@@ -907,8 +907,8 @@ $errorstr = $errorstr."Your Forum Description is too big.<br />\n"; }
 if ($Error!="Yes") {
 redirect("refresh",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view&menu=forums",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],FALSE),"4");
 $admincptitle = " ".$ThemeSet['TitleDivider']." Updating Settings";
-$query = query("UPDATE `".$Settings['sqltable']."forums` SET `id`=%i,`CategoryID`=%i,`OrderID`=%i,`Name`='%s',`ShowForum`='%s',`ForumType`='%s',`InSubForum`=%i,`RedirectURL`='%s',`Description`='%s',`PostCountAdd`='%s',`PostCountView`=%i,`KarmaCountView`=%i,`CanHaveTopics`='%s',`HotTopicPosts`=%i WHERE `id`=%i", array($_POST['ForumID'],$_POST['ForumCatID'],$_POST['OrderID'],$_POST['ForumName'],$_POST['ShowForum'],$_POST['ForumType'],$_POST['InSubForum'],$_POST['RedirectURL'],$_POST['ForumDesc'],$_POST['PostCountAdd'],$_POST['NumPostView'],$_POST['NumKarmaView'],$_POST['CanHaveTopics'],$_POST['NumPostHotTopic'],$_POST['id']));
-exec_query($query);
+$query = sql_pre_query("UPDATE `".$Settings['sqltable']."forums` SET `id`=%i,`CategoryID`=%i,`OrderID`=%i,`Name`='%s',`ShowForum`='%s',`ForumType`='%s',`InSubForum`=%i,`RedirectURL`='%s',`Description`='%s',`PostCountAdd`='%s',`PostCountView`=%i,`KarmaCountView`=%i,`CanHaveTopics`='%s',`HotTopicPosts`=%i WHERE `id`=%i", array($_POST['ForumID'],$_POST['ForumCatID'],$_POST['OrderID'],$_POST['ForumName'],$_POST['ShowForum'],$_POST['ForumType'],$_POST['InSubForum'],$_POST['RedirectURL'],$_POST['ForumDesc'],$_POST['PostCountAdd'],$_POST['NumPostView'],$_POST['NumKarmaView'],$_POST['CanHaveTopics'],$_POST['NumPostHotTopic'],$_POST['id']));
+sql_query($query);
 ?>
 <?php } } } if($_GET['act']=="fpermissions"&&$_POST['update']!="now") {
 $admincptitle = " ".$ThemeSet['TitleDivider']." Forum Permissions Manager";
@@ -940,21 +940,21 @@ if(!isset($_POST['id'])) {
        <td style="width: 50%;"><label class="TextBoxLabel" for="id">Permission to view:</label></td>
        <td style="width: 50%;"><select size="1" class="TextBox" name="id" id="id">
 <?php 
-$getperidq = query("SELECT DISTINCT `PermissionID` FROM `".$Settings['sqltable']."permissions`", array(null));
-$getperidr=exec_query($getperidq);
-$getperidnum=mysql_num_rows($getperidr);
+$getperidq = sql_pre_query("SELECT DISTINCT `PermissionID` FROM `".$Settings['sqltable']."permissions`", array(null));
+$getperidr=sql_query($getperidq);
+$getperidnum=sql_num_rows($getperidr);
 $getperidi = 0;
 while ($getperidi < $getperidnum) {
-$getperidID=mysql_result($getperidr,$getperidi,"PermissionID");
-$getperidq2 = query("SELECT * FROM `".$Settings['sqltable']."permissions` WHERE `PermissionID`=%i ORDER BY `ForumID` ASC", array($getperidID));
-$getperidr2=exec_query($getperidq2);
-$getperidnum2=mysql_num_rows($getperidr2);
-$getperidName=mysql_result($getperidr2,0,"Name");
-mysql_free_result($getperidr2);
+$getperidID=sql_result($getperidr,$getperidi,"PermissionID");
+$getperidq2 = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."permissions` WHERE `PermissionID`=%i ORDER BY `ForumID` ASC", array($getperidID));
+$getperidr2=sql_query($getperidq2);
+$getperidnum2=sql_num_rows($getperidr2);
+$getperidName=sql_result($getperidr2,0,"Name");
+sql_free_result($getperidr2);
 ?>
        <option value="<?php echo $getperidID; ?>"><?php echo $getperidName; ?></option>
 <?php ++$getperidi; }
-mysql_free_result($getperidr); ?>
+sql_free_result($getperidr); ?>
        </select></td>
 </tr></table>
 <table style="text-align: left;">
@@ -994,21 +994,21 @@ mysql_free_result($getperidr); ?>
 <tr class="TableMenuRow3">
 <td class="TableMenuColumn3">
 <?php 
-$fq = query("SELECT * FROM `".$Settings['sqltable']."forums` ORDER BY `OrderID` ASC, `id` ASC", array(null));
-$fr=exec_query($fq);
-$ai=mysql_num_rows($fr);
+$fq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` ORDER BY `OrderID` ASC, `id` ASC", array(null));
+$fr=sql_query($fq);
+$ai=sql_num_rows($fr);
 $fi=0;
 while ($fi < $ai) {
-$InForumID=mysql_result($fr,$fi,"id");
-$InForumName=mysql_result($fr,$fi,"Name");
-$getperidq = query("SELECT * FROM `".$Settings['sqltable']."permissions` WHERE PermissionID=%i AND `ForumID`=%i LIMIT 1", array($_POST['id'],$InForumID));
-$getperidr=exec_query($getperidq);
-$getperidnum=mysql_num_rows($getperidr);
+$InForumID=sql_result($fr,$fi,"id");
+$InForumName=sql_result($fr,$fi,"Name");
+$getperidq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."permissions` WHERE PermissionID=%i AND `ForumID`=%i LIMIT 1", array($_POST['id'],$InForumID));
+$getperidr=sql_query($getperidq);
+$getperidnum=sql_num_rows($getperidr);
 $getperidNumz = null;
 $getperidID = null;
 if($getperidnum>0) {
-$getperidNumz=mysql_result($getperidr,0,"id");
-$getperidID=mysql_result($getperidr,0,"PermissionID"); }
+$getperidNumz=sql_result($getperidr,0,"id");
+$getperidID=sql_result($getperidr,0,"PermissionID"); }
 ?>
 <form style="display: inline;" method="post" action="<?php echo url_maker($exfile['admin'],$Settings['file_ext'],"act=fpermissions",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin']); ?>">
 <table style="text-align: left;">
@@ -1031,9 +1031,9 @@ Permissions for <?php echo $InForumName; ?> are not set: <br />
 </td></tr></table>
 </form>
 <?php 
-mysql_free_result($getperidr);
+sql_free_result($getperidr);
 ++$fi; }
-mysql_free_result($fr); ?>
+sql_free_result($fr); ?>
 </td>
 </tr>
 <tr class="TableMenuRow4">
@@ -1042,35 +1042,35 @@ mysql_free_result($fr); ?>
 </table>
 </div>
 <?php } if(isset($_POST['id'])&&$_POST['subact']=="edit") {
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."permissions` WHERE `id`=%i LIMIT 1", array($_POST['id']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
-if($prenum==0) { redirect("location",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],false)); mysql_free_result($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."permissions` WHERE `id`=%i LIMIT 1", array($_POST['id']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
+if($prenum==0) { redirect("location",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],false)); sql_free_result($preresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($prenum>=1) {
-$PermissionNum=mysql_result($preresult,0,"id"); 
-$PermissionID=mysql_result($preresult,0,"PermissionID"); 
-$PermissionName=mysql_result($preresult,0,"Name"); 
-$PermissionForumID=mysql_result($preresult,0,"ForumID"); 
-$CanViewForum=mysql_result($preresult,0,"CanViewForum"); 
-$CanMakeTopics=mysql_result($preresult,0,"CanMakeTopics"); 
-$CanMakeReplys=mysql_result($preresult,0,"CanMakeReplys"); 
-$CanMakeReplysCT=mysql_result($preresult,0,"CanMakeReplysCT"); 
-$CanEditTopics=mysql_result($preresult,0,"CanEditTopics"); 
-$CanEditTopicsCT=mysql_result($preresult,0,"CanEditTopicsCT"); 
-$CanEditReplys=mysql_result($preresult,0,"CanEditReplys"); 
-$CanEditReplysCT=mysql_result($preresult,0,"CanEditReplysCT"); 
-$CanDeleteTopics=mysql_result($preresult,0,"CanDeleteTopics"); 
-$CanDeleteTopicsCT=mysql_result($preresult,0,"CanDeleteTopicsCT"); 
-$CanDeleteReplys=mysql_result($preresult,0,"CanDeleteReplys"); 
-$CanDeleteReplysCT=mysql_result($preresult,0,"CanDeleteReplysCT"); 
-$CanCloseTopics=mysql_result($preresult,0,"CanCloseTopics"); 
-$CanPinTopics=mysql_result($preresult,0,"CanPinTopics"); 
-$CanDohtml=mysql_result($preresult,0,"CanDohtml"); 
-$CanUseBBags=mysql_result($preresult,0,"CanUseBBags"); 
-$CanModForum=mysql_result($preresult,0,"CanModForum"); 
-mysql_free_result($preresult); }
+$PermissionNum=sql_result($preresult,0,"id"); 
+$PermissionID=sql_result($preresult,0,"PermissionID"); 
+$PermissionName=sql_result($preresult,0,"Name"); 
+$PermissionForumID=sql_result($preresult,0,"ForumID"); 
+$CanViewForum=sql_result($preresult,0,"CanViewForum"); 
+$CanMakeTopics=sql_result($preresult,0,"CanMakeTopics"); 
+$CanMakeReplys=sql_result($preresult,0,"CanMakeReplys"); 
+$CanMakeReplysCT=sql_result($preresult,0,"CanMakeReplysCT"); 
+$CanEditTopics=sql_result($preresult,0,"CanEditTopics"); 
+$CanEditTopicsCT=sql_result($preresult,0,"CanEditTopicsCT"); 
+$CanEditReplys=sql_result($preresult,0,"CanEditReplys"); 
+$CanEditReplysCT=sql_result($preresult,0,"CanEditReplysCT"); 
+$CanDeleteTopics=sql_result($preresult,0,"CanDeleteTopics"); 
+$CanDeleteTopicsCT=sql_result($preresult,0,"CanDeleteTopicsCT"); 
+$CanDeleteReplys=sql_result($preresult,0,"CanDeleteReplys"); 
+$CanDeleteReplysCT=sql_result($preresult,0,"CanDeleteReplysCT"); 
+$CanCloseTopics=sql_result($preresult,0,"CanCloseTopics"); 
+$CanPinTopics=sql_result($preresult,0,"CanPinTopics"); 
+$CanDohtml=sql_result($preresult,0,"CanDohtml"); 
+$CanUseBBags=sql_result($preresult,0,"CanUseBBags"); 
+$CanModForum=sql_result($preresult,0,"CanModForum"); 
+sql_free_result($preresult); }
 $PermissionName = stripcslashes(htmlspecialchars($PermissionName, ENT_QUOTES, $Settings['charset']));
 //$_POST['ForumName'] = preg_replace("/&amp;#(x[a-f0-9]+|[0-9]+);/i", "&#$1;", $_POST['ForumName']);
 ?>
@@ -1235,8 +1235,8 @@ $PermissionName = stripcslashes(htmlspecialchars($PermissionName, ENT_QUOTES, $S
 <?php } if(isset($_POST['id'])&&$_POST['subact']=="editnow") {
 $admincptitle = " ".$ThemeSet['TitleDivider']." Updating Settings";
 redirect("refresh",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view&menu=forums",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],FALSE),"4");
-$query = query("UPDATE `".$Settings['sqltable']."permissions` SET `CanViewForum`='%s', `CanMakeTopics`='%s', `CanMakeReplys`='%s', `CanMakeReplysCT`='%s', `CanEditTopics`='%s', `CanEditTopicsCT`='%s', `CanEditReplys`='%s', `CanEditReplysCT`='%s', `CanDeleteTopics`='%s', `CanDeleteTopicsCT`='%s', `CanDeleteReplys`='%s', `CanDeleteReplysCT`='%s', `CanCloseTopics`='%s', `CanPinTopics`='%s', `CanDohtml`='%s', `CanUseBBags`='%s', `CanModForum`='%s' WHERE `id`=%i", array($_POST['CanViewForum'], $_POST['CanMakeTopics'], $_POST['CanMakeReplys'], $_POST['CanMakeReplysCT'], $_POST['CanEditTopics'], $_POST['CanEditTopicsCT'], $_POST['CanEditReplys'], $_POST['CanEditReplysCT'], $_POST['CanDeleteTopics'], $_POST['CanDeleteTopicsCT'], $_POST['CanDeleteReplys'], $_POST['CanDeleteReplysCT'], $_POST['CanCloseTopics'], $_POST['CanPinTopics'], $_POST['CanDohtml'], $_POST['CanUseBBags'], $_POST['CanModForum'], $_POST['id']));
-exec_query($query); } if(isset($_POST['id'])&&$_POST['subact']=="create") { 
+$query = sql_pre_query("UPDATE `".$Settings['sqltable']."permissions` SET `CanViewForum`='%s', `CanMakeTopics`='%s', `CanMakeReplys`='%s', `CanMakeReplysCT`='%s', `CanEditTopics`='%s', `CanEditTopicsCT`='%s', `CanEditReplys`='%s', `CanEditReplysCT`='%s', `CanDeleteTopics`='%s', `CanDeleteTopicsCT`='%s', `CanDeleteReplys`='%s', `CanDeleteReplysCT`='%s', `CanCloseTopics`='%s', `CanPinTopics`='%s', `CanDohtml`='%s', `CanUseBBags`='%s', `CanModForum`='%s' WHERE `id`=%i", array($_POST['CanViewForum'], $_POST['CanMakeTopics'], $_POST['CanMakeReplys'], $_POST['CanMakeReplysCT'], $_POST['CanEditTopics'], $_POST['CanEditTopicsCT'], $_POST['CanEditReplys'], $_POST['CanEditReplysCT'], $_POST['CanDeleteTopics'], $_POST['CanDeleteTopicsCT'], $_POST['CanDeleteReplys'], $_POST['CanDeleteReplysCT'], $_POST['CanCloseTopics'], $_POST['CanPinTopics'], $_POST['CanDohtml'], $_POST['CanUseBBags'], $_POST['CanModForum'], $_POST['id']));
+sql_query($query); } if(isset($_POST['id'])&&$_POST['subact']=="create") { 
 ?>
 <div class="TableMenuBorder">
 <?php if($ThemeSet['TableStyle']=="div") { ?>
@@ -1400,19 +1400,19 @@ exec_query($query); } if(isset($_POST['id'])&&$_POST['subact']=="create") {
 <?php } if(isset($_POST['id'])&&isset($_POST['permid'])&&$_POST['subact']=="makenow") {
 $admincptitle = " ".$ThemeSet['TitleDivider']." Updating Settings";
 redirect("refresh",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view&menu=forums",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],FALSE),"4");
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."permissions` WHERE `id`=%i LIMIT 1", array($_POST['permid']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
-if($prenum==0) { redirect("location",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],false)); mysql_free_result($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."permissions` WHERE `id`=%i LIMIT 1", array($_POST['permid']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
+if($prenum==0) { redirect("location",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],false)); sql_free_result($preresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($prenum>=1) {
-$PermissionName=mysql_result($preresult,0,"Name"); 
-mysql_free_result($preresult); }
-$nextidnum = getnextid($Settings['sqltable'],"permissions");
-$query = query("INSERT INTO `".$Settings['sqltable']."permissions` (`PermissionID`, `Name`, `ForumID`, `CanViewForum`, `CanMakeTopics`, `CanMakeReplys`, `CanMakeReplysCT`, `CanEditTopics`, `CanEditTopicsCT`, `CanEditReplys`, `CanEditReplysCT`, `CanDeleteTopics`, `CanDeleteTopicsCT`, `CanDeleteReplys`, `CanDeleteReplysCT`, `CanCloseTopics`, `CanPinTopics`, `CanDohtml`, `CanUseBBags`, `CanModForum`) VALUES\n".
+$PermissionName=sql_result($preresult,0,"Name"); 
+sql_free_result($preresult); }
+$nextidnum = sql_get_next_id($Settings['sqltable'],"permissions");
+$query = sql_pre_query("INSERT INTO `".$Settings['sqltable']."permissions` (`PermissionID`, `Name`, `ForumID`, `CanViewForum`, `CanMakeTopics`, `CanMakeReplys`, `CanMakeReplysCT`, `CanEditTopics`, `CanEditTopicsCT`, `CanEditReplys`, `CanEditReplysCT`, `CanDeleteTopics`, `CanDeleteTopicsCT`, `CanDeleteReplys`, `CanDeleteReplysCT`, `CanCloseTopics`, `CanPinTopics`, `CanDohtml`, `CanUseBBags`, `CanModForum`) VALUES\n".
 "(%i, '%s', %i, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')", array($_POST['permid'], $PermissionName, $_POST['id'], $_POST['CanViewForum'], $_POST['CanMakeTopics'], $_POST['CanMakeReplys'], $_POST['CanMakeReplysCT'], $_POST['CanEditTopics'], $_POST['CanEditTopicsCT'], $_POST['CanEditReplys'], $_POST['CanEditReplysCT'], $_POST['CanDeleteTopics'], $_POST['CanDeleteTopicsCT'], $_POST['CanDeleteReplys'], $_POST['CanDeleteReplysCT'], $_POST['CanCloseTopics'], $_POST['CanPinTopics'], $_POST['CanDohtml'], $_POST['CanUseBBags'], $_POST['CanModForum'])); 
-exec_query($query); }
+sql_query($query); }
 ?>
 <?php } $doupdate = false;
 if(isset($_POST['id'])&&$_POST['subact']=="editnow") { 

diff --git a/inc/admin/main.php b/inc/admin/main.php
index 33a87d3..1306958 100644 (file)
--- a/inc/admin/main.php
+++ b/inc/admin/main.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: main.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: main.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="main.php"||$File3Name=="/main.php") {
@@ -74,9 +74,9 @@ $Settings['KBoostPercent'] = "6|10"; }
 require($SettDir['admin'].'table.php'); 
 if($_GET['act']=="delsessions"&&$GroupInfo['ViewDBInfo']=="yes") {
 $time = GMTimeStamp() - ini_get("session.gc_maxlifetime");
-//$sqlg = query('DELETE FROM `'.$Settings['sqltable'].'sessions` WHERE `expires` < UNIX_TIMESTAMP();', array(null));
-$sqlgc = query('DELETE FROM `'.$Settings['sqltable'].'sessions` WHERE `expires` < %i', array($time));
-exec_query($sqlgc);
+//$sqlg = sql_pre_query('DELETE FROM `'.$Settings['sqltable'].'sessions` WHERE `expires` < UNIX_TIMESTAMP();', array(null));
+$sqlgc = sql_pre_query('DELETE FROM `'.$Settings['sqltable'].'sessions` WHERE `expires` < %i', array($time));
+sql_query($sqlgc);
 $_POST['update'] = "now"; $_GET['act'] = "view"; }
 if($_GET['act']=="optimize"&&$GroupInfo['ViewDBInfo']=="yes") {
 $TablePreFix = $Settings['sqltable'];
@@ -90,8 +90,8 @@ $TblOptimized = 0;
 while ($ti < $tcount) {
 if(isset($OptimizeAr["Msg_text"])) { unset($OptimizeAr["Msg_text"]); }
 if(isset($OptimizeAr[3])) { unset($OptimizeAr[3]); }
-$OptimizeTea = exec_query(query("OPTIMIZE TABLE `".$TableChCk[$ti]."`", array(null))); 
-$OptimizeAr = mysql_fetch_array($OptimizeTea);
+$OptimizeTea = sql_query(sql_pre_query("OPTIMIZE TABLE `".$TableChCk[$ti]."`", array(null))); 
+$OptimizeAr = sql_fetch_array($OptimizeTea);
 if(!isset($OptimizeAr["Msg_text"])&&
        isset($OptimizeAr[3])) { $OptimizeAr["Msg_text"] = $OptimizeAr[3]; }
 if($OptimizeAr["Msg_text"]=="OK") { 
@@ -127,12 +127,12 @@ redirect("refresh",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"ac
 <?php if(isset($OutPutLog)) { echo "<br />".$OutPutLog; } ?>
 <br />Settings have been updated <a href="<?php echo url_maker($exfile['admin'],$Settings['file_ext'],"act=".$_GET['act']."&menu=main",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin']); ?>">click here</a> to go back. ^_^<br />&nbsp;</div>
 <?php } if($_GET['act']=="view"&&$_POST['update']!="now") {
-$query = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_SESSION['UserID']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_SESSION['UserID']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
-$YourID=mysql_result($result,$i,"id");
-$Notes=mysql_result($result,$i,"Notes");
+$YourID=sql_result($result,$i,"id");
+$Notes=sql_result($result,$i,"Notes");
 $noteact = url_maker($exfile['profile'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['profile'],$exqstr['profile']);
 $notepadact = $noteact; $profiletitle = " ".$ThemeSet['TitleDivider']." NotePad";
 $admincptitle = " ".$ThemeSet['TitleDivider']." Admin CP";
@@ -181,14 +181,14 @@ if(!is_numeric($ts_array[1])) { $ts_array[1] = "00"; }
 if($ts_array[1]>59) { $ts_array[1] = "59"; $Settings['DefaultTimeZone'] = $ts_array[0].":".$ts_array[1]; }
 if($ts_array[1]<0) { $ts_array[1] = "00"; $Settings['DefaultTimeZone'] = $ts_array[0].":".$ts_array[1]; }
 $tsa = array("offset" => $Settings['DefaultTimeZone'], "hour" => $ts_array[0], "minute" => $ts_array[1]);
-$mguerys = query("SELECT * FROM `".$Settings['sqltable']."groups`", array(null));
-$mgresults=exec_query($mguerys);
-$mnum=mysql_num_rows($mgresults);
+$mguerys = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups`", array(null));
+$mgresults=sql_query($mguerys);
+$mnum=sql_num_rows($mgresults);
 $mi = 0;
 while ($mi < $mnum) {
-$MGroups[$mi]=mysql_result($mgresults,$mi,"Name");
+$MGroups[$mi]=sql_result($mgresults,$mi,"Name");
 ++$mi; }
-mysql_free_result($mgresults);
+sql_free_result($mgresults);
 ?>
 <div class="TableMenuBorder">
 <?php if($ThemeSet['TableStyle']=="div") { ?>

diff --git a/inc/admin/members.php b/inc/admin/members.php
index 7249373..58e7fb6 100644 (file)
--- a/inc/admin/members.php
+++ b/inc/admin/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: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: members.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="members.php"||$File3Name=="/members.php") {
@@ -67,24 +67,24 @@ $admincptitle = " ".$ThemeSet['TitleDivider']." Validating Members";
        <td style="width: 50%;"><label class="TextBoxLabel" for="id">Member to validate:</label></td>
        <td style="width: 50%;"><select size="1" class="TextBox" name="id" id="id">
 <?php 
-$gquerys = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `Name`='%s' LIMIT 1", array($Settings['ValidateGroup']));
-$gresults=exec_query($gquerys);
-$VGroupID=mysql_result($gresults,0,"id");
-mysql_free_result($gresults);
-$getmemidq = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE (`GroupID`=%i AND `id`<>-1) OR (`Validated`='no' AND `id`<>-1)", array($VGroupID));
-$getmemidr=exec_query($getmemidq);
-$getmemidnum=mysql_num_rows($getmemidr);
+$gquerys = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `Name`='%s' LIMIT 1", array($Settings['ValidateGroup']));
+$gresults=sql_query($gquerys);
+$VGroupID=sql_result($gresults,0,"id");
+sql_free_result($gresults);
+$getmemidq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE (`GroupID`=%i AND `id`<>-1) OR (`Validated`='no' AND `id`<>-1)", array($VGroupID));
+$getmemidr=sql_query($getmemidq);
+$getmemidnum=sql_num_rows($getmemidr);
 $getmemidi = 0;
 if($getmemidnum<1) { ?>
        <option value="0">None</option>
 <?php }
 while ($getmemidi < $getmemidnum) {
-$getmemidID=mysql_result($getmemidr,$getmemidi,"id");
-$getmemidName=mysql_result($getmemidr,$getmemidi,"Name");
+$getmemidID=sql_result($getmemidr,$getmemidi,"id");
+$getmemidName=sql_result($getmemidr,$getmemidi,"Name");
 ?>
 <option value="<?php echo $getmemidID; ?>"><?php echo $getmemidName; ?></option>
 <?php ++$getmemidi; }
-mysql_free_result($getmemidr); ?>
+sql_free_result($getmemidr); ?>
        </select></td>
 </tr></table>
 <table style="text-align: left;">
@@ -104,29 +104,29 @@ mysql_free_result($getmemidr); ?>
 </table>
 </div>
 <?php } if($_POST['act']=="validate"&&$_POST['update']=="now"&&$_GET['act']=="validate"&&$_POST['id']!="0") { 
-$mguerys = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `Name`='%s' LIMIT 1", array($Settings['MemberGroup']));
-$mgresults=exec_query($mguerys);
-$MGroupID=mysql_result($mgresults,0,"id");
-mysql_free_result($mgresults);
-$gquerys = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `Name`='%s' LIMIT 1", array($Settings['ValidateGroup']));
-$gresults=exec_query($gquerys);
-$VGroupID=mysql_result($gresults,0,"id");
-mysql_free_result($gresults);
-$query = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_POST['id']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$mguerys = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `Name`='%s' LIMIT 1", array($Settings['MemberGroup']));
+$mgresults=sql_query($mguerys);
+$MGroupID=sql_result($mgresults,0,"id");
+sql_free_result($mgresults);
+$gquerys = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `Name`='%s' LIMIT 1", array($Settings['ValidateGroup']));
+$gresults=sql_query($gquerys);
+$VGroupID=sql_result($gresults,0,"id");
+sql_free_result($gresults);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_POST['id']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
-$VMemName=mysql_result($result,$i,"Name");
-$VMemGroup=mysql_result($result,$i,"GroupID");
-$VMemValidated=mysql_result($result,$i,"Validated");
+$VMemName=sql_result($result,$i,"Name");
+$VMemGroup=sql_result($result,$i,"GroupID");
+$VMemValidated=sql_result($result,$i,"Validated");
 $admincptitle = " ".$ThemeSet['TitleDivider']." Validating Members";
 redirect("refresh",$basedir.url_maker($exfile['admin'],$Settings['file_ext'],"act=".$_GET['act']."&menu=members",$Settings['qstr'],$Settings['qsep'],$prexqstr['admin'],$exqstr['admin'],FALSE),"4");
 if($VMemGroup==$VGroupID) {
-$query = query("UPDATE `".$Settings['sqltable']."members` SET `GroupID`='%s', `Validated`='%s' WHERE `id`=%i", array($MGroupID, "yes", $_POST['id']));
-exec_query($query); }
+$query = sql_pre_query("UPDATE `".$Settings['sqltable']."members` SET `GroupID`='%s', `Validated`='%s' WHERE `id`=%i", array($MGroupID, "yes", $_POST['id']));
+sql_query($query); }
 if($VMemGroup!=$VGroupID&&$VMemValidated=="no") {
-$query = query("UPDATE `".$Settings['sqltable']."members` SET `Validated`='%s' WHERE `id`=%i", array("yes", $_POST['id']));
-exec_query($query); }
+$query = sql_pre_query("UPDATE `".$Settings['sqltable']."members` SET `Validated`='%s' WHERE `id`=%i", array("yes", $_POST['id']));
+sql_query($query); }
 ?>
 <div class="TableMenuBorder">
 <?php if($ThemeSet['TableStyle']=="div") { ?>
@@ -184,20 +184,20 @@ $admincptitle = " ".$ThemeSet['TitleDivider']." Deleting Members";
        <td style="width: 50%;"><label class="TextBoxLabel" for="id">Member to delete:</label></td>
        <td style="width: 50%;"><select size="1" class="TextBox" name="id" id="id">
 <?php 
-$getmemidq = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE (`id`<>-1 AND `id`<>1)", array(null));
-$getmemidr=exec_query($getmemidq);
-$getmemidnum=mysql_num_rows($getmemidr);
+$getmemidq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE (`id`<>-1 AND `id`<>1)", array(null));
+$getmemidr=sql_query($getmemidq);
+$getmemidnum=sql_num_rows($getmemidr);
 $getmemidi = 0;
 if($getmemidnum<1) { ?>
        <option value="0">None</option>
 <?php }
 while ($getmemidi < $getmemidnum) {
-$getmemidID=mysql_result($getmemidr,$getmemidi,"id");
-$getmemidName=mysql_result($getmemidr,$getmemidi,"Name");
+$getmemidID=sql_result($getmemidr,$getmemidi,"id");
+$getmemidName=sql_result($getmemidr,$getmemidi,"Name");
 ?>
 <option value="<?php echo $getmemidID; ?>"><?php echo $getmemidName; ?></option>
 <?php ++$getmemidi; }
-mysql_free_result($getmemidr); ?>
+sql_free_result($getmemidr); ?>
        </select></td>
 </tr></table>
 <table style="text-align: left;">
@@ -221,8 +221,8 @@ mysql_free_result($getmemidr); ?>
 $DMemName = GetUserName($_POST['id'],$Settings['sqltable']);
 $DMemName = $DMemName['Name'];
 if($DMemName!==null&&($_POST['id']!="0"||$_POST['id']!="1"||$_POST['id']!="-1")) { 
-$dmquery = query("DELETE FROM `".$Settings['sqltable']."members` WHERE `id`=%i", array($_POST['id']));
-exec_query($dmquery); }
+$dmquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."members` WHERE `id`=%i", array($_POST['id']));
+sql_query($dmquery); }
 ?>
 <div class="TableMenuBorder">
 <?php if($ThemeSet['TableStyle']=="div") { ?>
@@ -282,39 +282,39 @@ $admincptitle = " ".$ThemeSet['TitleDivider']." Editing Members";
        <td style="width: 50%;"><label class="TextBoxLabel" for="id">Member to edit:</label></td>
        <td style="width: 50%;"><select size="1" class="TextBox" name="id" id="id">
 <?php 
-$getmemidq = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE (`id`<>-1 AND `id`<>1)", array(null));
-$getmemidr=exec_query($getmemidq);
-$getmemidnum=mysql_num_rows($getmemidr);
+$getmemidq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE (`id`<>-1 AND `id`<>1)", array(null));
+$getmemidr=sql_query($getmemidq);
+$getmemidnum=sql_num_rows($getmemidr);
 $getmemidi = 0;
 if($getmemidnum<1) { ?>
        <option value="0">None</option>
 <?php }
 while ($getmemidi < $getmemidnum) {
-$getmemidID=mysql_result($getmemidr,$getmemidi,"id");
-$getmemidName=mysql_result($getmemidr,$getmemidi,"Name");
+$getmemidID=sql_result($getmemidr,$getmemidi,"id");
+$getmemidName=sql_result($getmemidr,$getmemidi,"Name");
 ?>
 <option value="<?php echo $getmemidID; ?>"><?php echo $getmemidName; ?></option>
 <?php ++$getmemidi; }
-mysql_free_result($getmemidr); ?>
+sql_free_result($getmemidr); ?>
        </select></td>
 </tr><tr style="text-align: left;">
        <td style="width: 50%;"><label class="TextBoxLabel" for="gid">New Group for Member:</label></td>
        <td style="width: 50%;"><select size="1" class="TextBox" name="gid" id="gid">
 <?php 
-$getgrpidq = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE (`Name`<>'%s' AND `Name`<>'%s')", array($Settings['GuestGroup'],$Settings['ValidateGroup']));
-$getgrpidr=exec_query($getgrpidq);
-$getgrpidnum=mysql_num_rows($getgrpidr);
+$getgrpidq = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE (`Name`<>'%s' AND `Name`<>'%s')", array($Settings['GuestGroup'],$Settings['ValidateGroup']));
+$getgrpidr=sql_query($getgrpidq);
+$getgrpidnum=sql_num_rows($getgrpidr);
 $getgrpidi = 0;
 if($getgrpidnum<1) { ?>
        <option value="0">None</option>
 <?php }
 while ($getgrpidi < $getgrpidnum) {
-$getgrpidID=mysql_result($getgrpidr,$getgrpidi,"id");
-$getgrpidName=mysql_result($getgrpidr,$getgrpidi,"Name");
+$getgrpidID=sql_result($getgrpidr,$getgrpidi,"id");
+$getgrpidName=sql_result($getgrpidr,$getgrpidi,"Name");
 ?>
 <option value="<?php echo $getgrpidID; ?>"><?php echo $getgrpidName; ?></option>
 <?php ++$getgrpidi; }
-mysql_free_result($getgrpidr); ?>
+sql_free_result($getgrpidr); ?>
        </select></td>
 </tr></table>
 <table style="text-align: left;">
@@ -335,20 +335,20 @@ mysql_free_result($getgrpidr); ?>
 </div>
 <?php } if($_POST['act']=="editmember"&&$_POST['update']=="now"&&$_GET['act']=="editmember"&&
        ($_POST['id']!="0"||$_POST['id']!="1"||$_POST['id']!="-1")) { 
-$ggidquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `name`='%s' LIMIT 1", array($Settings['GuestGroup']));
-$ggidresult=exec_query($ggidquery);
-$GuestGroupID=mysql_result($ggidresult,0,"id");
-mysql_free_result($ggidresult);
-$vgidquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `name`='%s' LIMIT 1", array($Settings['ValidateGroup']));
-$vgidresult=exec_query($vgidquery);
-$ValidateGroupID=mysql_result($vgidresult,0,"id");
-mysql_free_result($vgidresult);
+$ggidquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `name`='%s' LIMIT 1", array($Settings['GuestGroup']));
+$ggidresult=sql_query($ggidquery);
+$GuestGroupID=sql_result($ggidresult,0,"id");
+sql_free_result($ggidresult);
+$vgidquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `name`='%s' LIMIT 1", array($Settings['ValidateGroup']));
+$vgidresult=sql_query($vgidquery);
+$ValidateGroupID=sql_result($vgidresult,0,"id");
+sql_free_result($vgidresult);
 $DMemName = GetUserName($_POST['id'],$Settings['sqltable']);
 $DMemName = $DMemName['Name'];
 if($DMemName!==null&&($_POST['id']!="0"||$_POST['id']!="1"||$_POST['id']!="-1")&&
        ($_POST['gid']!=$GuestGroupID||$_POST['gid']!=$ValidateGroupID)) { 
-$dmquery = query("UPDATE `".$Settings['sqltable']."members` SET GroupID=%i WHERE `id`=%i", array($_POST['gid'],$_POST['id']));
-exec_query($dmquery); }
+$dmquery = sql_pre_query("UPDATE `".$Settings['sqltable']."members` SET GroupID=%i WHERE `id`=%i", array($_POST['gid'],$_POST['id']));
+sql_query($dmquery); }
 ?>
 <div class="TableMenuBorder">
 <?php if($ThemeSet['TableStyle']=="div") { ?>

diff --git a/inc/admin/sqldumper.php b/inc/admin/sqldumper.php
index a8caae2..edb951b 100644 (file)
--- a/inc/admin/sqldumper.php
+++ b/inc/admin/sqldumper.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: sqldumper.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: sqldumper.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="sqldumper.php"||$File3Name=="/sqldumper.php") {
@@ -32,11 +32,11 @@ header("Content-Type: application/octet-stream");
 header("Content-Transfer-Encoding: binary");
 $SQLDumper = "SQL Dumper";
 function GetAllRows($table) { $rene_j = 0; $trowout = null;
-$tresult = exec_query("SELECT * FROM `".$table."`");
-while ($trow = mysql_fetch_array($tresult, MYSQL_ASSOC)) {
+$tresult = sql_query("SELECT * FROM `".$table."`");
+while ($trow = sql_fetch_array($tresult, MYSQL_ASSOC)) {
 $trowout[$rene_j] = $trow;
 ++$rene_j; }
-mysql_free_result($tresult);
+sql_free_result($tresult);
 return $trowout; }
 $TablePreFix = $Settings['sqltable'];
 function add_prefix($tarray) {
@@ -51,30 +51,30 @@ header("Content-Type: text/plain; charset=ISO-8859-15"); }
 if($_GET['outtype']=="latin15") {
 header("Content-Type: text/plain; charset=ISO-8859-15"); }
 $sql = "SHOW TABLES LIKE '".$Settings['sqltable']."%'";
-$result = exec_query($sql);
+$result = sql_query($sql);
 if (!$result) {
 echo "DB Error, could not list tables\n";
-echo 'MySQL Error: ' . mysql_error();
+echo 'MySQL Error: ' . sql_error();
 exit; }
 $DropTable = null; $CreateTable = null; $TableNames = null; $l = 0;
-while ($row = mysql_fetch_row($result)) { 
+while ($row = sql_fetch_row($result)) { 
 if(in_array($row[0],$TableChCk)) {
 $TableNames[$l] = $row[0];
 $DropTable[$l] = "DROP TABLE IF EXISTS `".$row[0]."`;\n";
 $CreateTable[$l] = "CREATE TABLE IF NOT EXISTS `".$row[0]."` (\n";
 $CreateTable[$l] = null;
-$result2 = exec_query("SHOW COLUMNS FROM ".$row[0]);
-$tabsta = exec_query("SHOW TABLE STATUS LIKE '".$row[0]."'");
-$tabstats = mysql_fetch_array($tabsta); $AutoIncrement = " ";
-$tabstaz = exec_query("SHOW CREATE TABLE `".$row[0]."`");
-$tabstatz = mysql_fetch_array($tabstaz);
+$result2 = sql_query("SHOW COLUMNS FROM ".$row[0]);
+$tabsta = sql_query("SHOW TABLE STATUS LIKE '".$row[0]."'");
+$tabstats = sql_fetch_array($tabsta); $AutoIncrement = " ";
+$tabstaz = sql_query("SHOW CREATE TABLE `".$row[0]."`");
+$tabstatz = sql_fetch_array($tabstaz);
 $FullTable[$l] = $DropTable[$l].$tabstatz[1].";\n";
-$tabstats = mysql_fetch_array($tabsta); $AutoIncrement = " ";
+$tabstats = sql_fetch_array($tabsta); $AutoIncrement = " ";
 /*
 if($tabstats["Auto_increment"]!="") {
 $AutoIncrement = " AUTO_INCREMENT=".$tabstats["Auto_increment"]." "; }
        $TableInfo[$l] = null; $TableStats = null; $i = 0;
-       while ($row2 = mysql_fetch_assoc($result2)) {
+       while ($row2 = sql_fetch_assoc($result2)) {
                $row2["Default"] = "'".$row2["Default"]."'"; 
                if($i==0) { $row2["Default"] = null; } $DefaVaule = null;
                if($row2["Default"]!=null) { $DefaVaule = " default ".$row2["Default"]; }
@@ -97,10 +97,10 @@ $AutoIncrement = " AUTO_INCREMENT=".$tabstats["Auto_increment"]." "; }
        $TableInfo[$l] .= $PrimaryKey[$l]."\n".$TableStats[$l];
        $FullTable[$l] = $DropTable[$l].$CreateTable[$l].$TableInfo[$l]; */ }
 if (!$result2) {
-    echo 'Could not run query: ' . mysql_error();
+    echo 'Could not run query: ' . sql_error();
     exit; }
-mysql_free_result($result2);
-mysql_free_result($tabsta);
+sql_free_result($result2);
+sql_free_result($tabsta);
 ++$l; } $tableout = null;
 $num = count($TableNames); $renee_s = 0;
 echo "-- ".$OrgName." ".$SQLDumper."\n";
@@ -109,7 +109,7 @@ echo "-- ".$iDBHome."support/\n";
 echo "--\n";
 echo "-- Host: ".$Settings['sqlhost']."\n";
 echo "-- Generation Time: ".GMTimeGet('F d, Y \a\t h:i A',$_SESSION['UserTimeZone'],0,$_SESSION['UserDST'])."\n";
-echo "-- Server version: ".mysql_get_server_info()."\n";
+echo "-- Server version: ".sql_server_info()."\n";
 echo "-- PHP Version: ".phpversion()."\n\n";
 echo "SET SQL_MODE=\"NO_AUTO_VALUE_ON_ZERO\";\n\n";
 echo "--\n";
@@ -129,8 +129,8 @@ $trownew = $trow[$kazuki_p];
 $trowname = array_keys($trownew);
 $nums = count($trownew); $il = 0;
 while ($il < $nums) { $tnums = $nums - 1;
-$trowrname = mysql_real_escape_string($trowname[$il]);
-$trowrvalue = mysql_real_escape_string($trownew[$trowrname]);
+$trowrname = sql_escape_string($trowname[$il]);
+$trowrvalue = sql_escape_string($trownew[$trowrname]);
 if($_GET['outtype']=="UTF-8"&&$Settings['charset']!="UTF-8") {
 $trowrvalue = utf8_encode($trowrvalue); }
 $trowrvalue = str_replace( array("\n", "\r"), array('\n', '\r'), $trowrvalue);

diff --git a/inc/calendars.php b/inc/calendars.php
index e25b8d2..336cb20 100644 (file)
--- a/inc/calendars.php
+++ b/inc/calendars.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: calendars.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: calendars.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="calendars.php"||$File3Name=="/calendars.php") {
@@ -40,24 +40,24 @@ $MyTimeStamp2 = mktime(23,59,59,$MyMonth,$CountDays,$MyYear);
 $MyMonthName = GMTimeGet("F",$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
 $FirstDayThisMonth = date("w", mktime(0, 0, 0, $MyMonth, 1, $MyYear));
 $EventsName = array();
-$query = query("SELECT * FROM `".$Settings['sqltable']."events` WHERE (`EventMonth`>=%i AND `EventYear`<%i AND `EventYearEnd`>=%i) OR (`EventMonth`<=%i AND `EventMonthEnd`>=%i AND `EventYearEnd`>=%i)", array($MyMonth,$MyYear,$MyYear,$MyMonth,$MyMonth,$MyYear));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."events` WHERE (`EventMonth`>=%i AND `EventYear`<%i AND `EventYearEnd`>=%i) OR (`EventMonth`<=%i AND `EventMonthEnd`>=%i AND `EventYearEnd`>=%i)", array($MyMonth,$MyYear,$MyYear,$MyMonth,$MyMonth,$MyYear));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $is=0;
 while ($is < $num) {
-$EventID=mysql_result($result,$is,"id");
-$EventUser=mysql_result($result,$is,"UserID");
-$EventGuest=mysql_result($result,$is,"GuestName");
-$EventName=mysql_result($result,$is,"EventName");
-$EventText=mysql_result($result,$is,"EventText");
-$EventStart=mysql_result($result,$is,"TimeStamp");
-$EventEnd=mysql_result($result,$is,"TimeStampEnd");
-$EventMonth=mysql_result($result,$is,"EventMonth");
-$EventMonthEnd=mysql_result($result,$is,"EventMonthEnd");
-$EventDay=mysql_result($result,$is,"EventDay");
-$EventDayEnd=mysql_result($result,$is,"EventDayEnd");
-$EventYear=mysql_result($result,$is,"EventYear");
-$EventYearEnd=mysql_result($result,$is,"EventYearEnd");
+$EventID=sql_result($result,$is,"id");
+$EventUser=sql_result($result,$is,"UserID");
+$EventGuest=sql_result($result,$is,"GuestName");
+$EventName=sql_result($result,$is,"EventName");
+$EventText=sql_result($result,$is,"EventText");
+$EventStart=sql_result($result,$is,"TimeStamp");
+$EventEnd=sql_result($result,$is,"TimeStampEnd");
+$EventMonth=sql_result($result,$is,"EventMonth");
+$EventMonthEnd=sql_result($result,$is,"EventMonthEnd");
+$EventDay=sql_result($result,$is,"EventDay");
+$EventDayEnd=sql_result($result,$is,"EventDayEnd");
+$EventYear=sql_result($result,$is,"EventYear");
+$EventYearEnd=sql_result($result,$is,"EventYearEnd");
 if($EventMonthEnd!=$MyMonth) { $EventDayEnd = $CountDays; }
 if($EventMonth<$MyMonth) { $EventDay = 1; }
 $oldeventname=$EventName;
@@ -81,16 +81,16 @@ if ($EventsName[$NextDay] == null) {
 $NextDay++; } }
 $EventsID[$EventDay] = $EventID;
 ++$is; } 
-mysql_free_result($result);
-$bdquery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `BirthMonth`=%i", array($MyMonth));
-$bdresult=exec_query($bdquery);
-$bdnum=mysql_num_rows($bdresult);
+sql_free_result($result);
+$bdquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `BirthMonth`=%i", array($MyMonth));
+$bdresult=sql_query($bdquery);
+$bdnum=sql_num_rows($bdresult);
 $bdi=0;
 while ($bdi < $bdnum) {
-$UserNamebd=mysql_result($bdresult,$bdi,"Name");
-$BirthDay=mysql_result($bdresult,$bdi,"BirthDay");
-$BirthMonth=mysql_result($bdresult,$bdi,"BirthMonth");
-$BirthYear=mysql_result($bdresult,$bdi,"BirthYear");
+$UserNamebd=sql_result($bdresult,$bdi,"Name");
+$BirthDay=sql_result($bdresult,$bdi,"BirthDay");
+$BirthMonth=sql_result($bdresult,$bdi,"BirthMonth");
+$BirthYear=sql_result($bdresult,$bdi,"BirthYear");
 $oldusername=$UserNamebd;
 $UserNamebd1 = pre_substr($UserNamebd,0,20);
 if (pre_strlen($UserNamebd)>20) { $UserNamebd1 = $UserNamebd1."..."; }
@@ -101,7 +101,7 @@ if ($EventsName[$BirthDay] != null) {
 if ($EventsName[$BirthDay] == null) {
        $EventsName[$BirthDay] = "<span title=\"".$oldusername."'s birthday.\">".$UserNamebd1."</span>"; }
 ++$bdi; } 
-mysql_free_result($bdresult);
+sql_free_result($bdresult);
 $MyDays = array();
 $MyDays[] = "Sunday";
 $MyDays[] = "Monday";

diff --git a/inc/categories.php b/inc/categories.php
index 03ed6e0..6e7840a 100644 (file)
--- a/inc/categories.php
+++ b/inc/categories.php
@@ -11,30 +11,30 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: categories.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: categories.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="categories.php"||$File3Name=="/categories.php") {
        require('index.php');
        exit(); }
 if(!is_numeric($_GET['id'])) { $_GET['id'] = null; }
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($_GET['id']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
-if($prenum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); mysql_free_result($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($_GET['id']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
+if($prenum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); sql_free_result($preresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($prenum>=1) {
-$CategoryID=mysql_result($preresult,0,"id");
-$CategoryName=mysql_result($preresult,0,"Name");
-$CategoryShow=mysql_result($preresult,0,"ShowCategory");
-$CategoryType=mysql_result($preresult,0,"CategoryType");
-$InSubCategory=mysql_result($preresult,0,"InSubCategory");
-$SubShowForums=mysql_result($preresult,0,"SubShowForums");
-$CategoryDescription=mysql_result($preresult,0,"Description");
+$CategoryID=sql_result($preresult,0,"id");
+$CategoryName=sql_result($preresult,0,"Name");
+$CategoryShow=sql_result($preresult,0,"ShowCategory");
+$CategoryType=sql_result($preresult,0,"CategoryType");
+$InSubCategory=sql_result($preresult,0,"InSubCategory");
+$SubShowForums=sql_result($preresult,0,"SubShowForums");
+$CategoryDescription=sql_result($preresult,0,"Description");
 $CategoryType = strtolower($CategoryType); $SubShowForums = strtolower($SubShowForums);
-$CategoryPostCountView=mysql_result($preresult,0,"PostCountView");
-$CategoryKarmaCountView=mysql_result($preresult,0,"KarmaCountView");
+$CategoryPostCountView=sql_result($preresult,0,"PostCountView");
+$CategoryKarmaCountView=sql_result($preresult,0,"KarmaCountView");
 if($MyPostCountChk==null) { $MyPostCountChk = 0; }
 if($MyKarmaCount==null) { $MyKarmaCount = 0; }
 if($GroupInfo['HasAdminCP']!="yes"||$GroupInfo['HasModCP']!="yes") {
@@ -60,17 +60,17 @@ $_SESSION['ViewingFile'] = $exfile[$CategoryType]; }
 $_SESSION['PreViewingTitle'] = "Viewing Category:";
 $_SESSION['ViewingTitle'] = $CategoryName;
 if($InSubCategory!="0") {
-$iscquery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($InSubCategory));
-$iscresult=exec_query($iscquery);
-$iscnum=mysql_num_rows($iscresult);
+$iscquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($InSubCategory));
+$iscresult=sql_query($iscquery);
+$iscnum=sql_num_rows($iscresult);
 if($iscnum>=1) {
-$iscCategoryID=mysql_result($iscresult,0,"id");
-$iscCategoryName=mysql_result($iscresult,0,"Name");
-$iscCategoryShow=mysql_result($iscresult,0,"ShowCategory");
-$iscCategoryType=mysql_result($iscresult,0,"CategoryType");
+$iscCategoryID=sql_result($iscresult,0,"id");
+$iscCategoryName=sql_result($iscresult,0,"Name");
+$iscCategoryShow=sql_result($iscresult,0,"ShowCategory");
+$iscCategoryType=sql_result($iscresult,0,"CategoryType");
 $iscCategoryType = strtolower($iscCategoryType); }
 if($iscnum<1) { $InSubCategory = "0"; } 
-mysql_free_result($iscresult); }
+sql_free_result($iscresult); }
 ?>
 <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 if($InSubCategory!="0") { echo $ThemeSet['NavLinkDivider']; ?><a href="<?php echo url_maker($exfile[$iscCategoryType],$Settings['file_ext'],"act=view&id=".$iscCategoryID."&page=1",$Settings['qstr'],$Settings['qsep'],$prexqstr[$iscCategoryType],$exqstr[$iscCategoryType]); ?>"><?php echo $iscCategoryName; ?></a><?php } echo $ThemeSet['NavLinkDivider']; ?><a href="<?php echo url_maker($exfile[$CategoryType],$Settings['file_ext'],"act=view&id=".$CategoryID,$Settings['qstr'],$Settings['qsep'],$prexqstr[$CategoryType],$exqstr[$CategoryType]); ?>"><?php echo $CategoryName; ?></a></div>
 <div class="DivNavLinks">&nbsp;</div>
@@ -79,9 +79,9 @@ if($CategoryType=="subcategory") {
 redirect("location",$basedir.url_maker($exfile['subcategory'],$Settings['file_ext'],"act=".$_GET['act']."&id=".$_GET['id'],$Settings['qstr'],$Settings['qsep'],$prexqstr['subcategory'],$exqstr['subcategory'],FALSE));
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); } }
-$query = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `CategoryID`=%i AND `InSubForum`=0 ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `CategoryID`=%i AND `InSubForum`=0 ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
 if($num>=1) {
 ?>
@@ -107,31 +107,31 @@ if($num>=1) {
 </tr>
 <?php }
 while ($i < $num) {
-$ForumID=mysql_result($result,$i,"id");
-$ForumName=mysql_result($result,$i,"Name");
-$ForumShow=mysql_result($result,$i,"ShowForum");
-$ForumType=mysql_result($result,$i,"ForumType");
-$ForumShowTopics=mysql_result($result,$i,"CanHaveTopics");
+$ForumID=sql_result($result,$i,"id");
+$ForumName=sql_result($result,$i,"Name");
+$ForumShow=sql_result($result,$i,"ShowForum");
+$ForumType=sql_result($result,$i,"ForumType");
+$ForumShowTopics=sql_result($result,$i,"CanHaveTopics");
 $ForumShowTopics = strtolower($ForumShowTopics);
-$NumTopics=mysql_result($result,$i,"NumTopics");
-$NumPosts=mysql_result($result,$i,"NumPosts");
-$NumRedirects=mysql_result($result,$i,"Redirects");
-$ForumDescription=mysql_result($result,$i,"Description");
+$NumTopics=sql_result($result,$i,"NumTopics");
+$NumPosts=sql_result($result,$i,"NumPosts");
+$NumRedirects=sql_result($result,$i,"Redirects");
+$ForumDescription=sql_result($result,$i,"Description");
 $ForumType = strtolower($ForumType); $sflist = null;
 $gltf = array(null); $gltf[0] = $ForumID;
 if ($ForumType=="subforum") { 
-$apcquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
-$apcresult=exec_query($apcquery);
-$apcnum=mysql_num_rows($apcresult);
+$apcquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
+$apcresult=sql_query($apcquery);
+$apcnum=sql_num_rows($apcresult);
 $apci=0; $apcl=1; if($apcnum>=1) {
 while ($apci < $apcnum) {
-$NumsTopics=mysql_result($apcresult,$apci,"NumTopics");
+$NumsTopics=sql_result($apcresult,$apci,"NumTopics");
 $NumTopics = $NumsTopics + $NumTopics;
-$NumsPosts=mysql_result($apcresult,$apci,"NumPosts");
+$NumsPosts=sql_result($apcresult,$apci,"NumPosts");
 $NumPosts = $NumsPosts + $NumPosts;
-$SubsForumID=mysql_result($apcresult,$apci,"id");
-$SubsForumName=mysql_result($apcresult,$apci,"Name");
-$SubsForumType=mysql_result($apcresult,$apci,"ForumType");
+$SubsForumID=sql_result($apcresult,$apci,"id");
+$SubsForumName=sql_result($apcresult,$apci,"Name");
+$SubsForumType=sql_result($apcresult,$apci,"ForumType");
 if(isset($PermissionInfo['CanViewForum'][$SubsForumID])&&
        $PermissionInfo['CanViewForum'][$SubsForumID]=="yes") {
 $sfurl = "<a href=\"";
@@ -144,7 +144,7 @@ if($apcl>1) {
 $sflist = $sflist.", ".$sfurl; }
 $gltf[$apcl] = $SubsForumID; ++$apcl; }
 ++$apci; }
-mysql_free_result($apcresult); } }
+sql_free_result($apcresult); } }
 if(isset($PermissionInfo['CanViewForum'][$ForumID])&&
        $PermissionInfo['CanViewForum'][$ForumID]=="yes") {
 $LastTopic = "&nbsp;<br />&nbsp;<br />&nbsp;";
@@ -153,25 +153,25 @@ $gltnum = count($gltf); $glti = 0;
 $OldUpdateTime = 0; $UseThisFonum = null;
 if ($ForumType=="subforum") { 
 while ($glti < $gltnum) {
-$gltfoquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($gltf[$glti]));
-$gltforesult=exec_query($gltfoquery);
-$gltfonum=mysql_num_rows($gltforesult);
+$gltfoquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($gltf[$glti]));
+$gltforesult=sql_query($gltfoquery);
+$gltfonum=sql_num_rows($gltforesult);
 if($gltfonum>0) {
-$NewUpdateTime=mysql_result($gltforesult,0,"LastUpdate");
+$NewUpdateTime=sql_result($gltforesult,0,"LastUpdate");
 if($NewUpdateTime>$OldUpdateTime) { 
        $UseThisFonum = $gltf[$glti]; 
 $OldUpdateTime = $NewUpdateTime; } }
-mysql_free_result($gltforesult);
+sql_free_result($gltforesult);
 ++$glti; } }
 if ($ForumType!="subforum"&&$ForumType!="redirect") { $UseThisFonum = $gltf[0]; }
 if ($ForumType!="redirect") {
-$gltquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($UseThisFonum));
-$gltresult=exec_query($gltquery);
-$gltnum=mysql_num_rows($gltresult);
+$gltquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($UseThisFonum));
+$gltresult=sql_query($gltquery);
+$gltnum=sql_num_rows($gltresult);
 if($gltnum>0){
-$TopicID=mysql_result($gltresult,0,"id");
-$TopicName=mysql_result($gltresult,0,"TopicName");
-$NumReplys=mysql_result($gltresult,0,"NumReply");
+$TopicID=sql_result($gltresult,0,"id");
+$TopicName=sql_result($gltresult,0,"TopicName");
+$NumReplys=sql_result($gltresult,0,"NumReply");
 $NumPages = null; $NumRPosts = $NumReplys + 1;
 if(!isset($Settings['max_posts'])) { $Settings['max_posts'] = 10; }
 if($NumRPosts>$Settings['max_posts']) {
@@ -181,16 +181,16 @@ $TopicName1 = pre_substr($TopicName,0,20);
 $oldtopicname=$TopicName;
 if (pre_strlen($TopicName)>20) {
 $TopicName1 = $TopicName1."..."; $TopicName=$TopicName1; }
-$glrquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` DESC LIMIT 1", array($TopicID));
-$glrresult=exec_query($glrquery);
-$glrnum=mysql_num_rows($glrresult);
+$glrquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` DESC LIMIT 1", array($TopicID));
+$glrresult=sql_query($glrquery);
+$glrnum=sql_num_rows($glrresult);
 if($glrnum>0){
-$ReplyID=mysql_result($glrresult,0,"id");
-$UsersID=mysql_result($glrresult,0,"UserID");
-$GuestsName=mysql_result($glrresult,0,"GuestName");
-$TimeStamp=mysql_result($glrresult,0,"TimeStamp");
+$ReplyID=sql_result($glrresult,0,"id");
+$UsersID=sql_result($glrresult,0,"UserID");
+$GuestsName=sql_result($glrresult,0,"GuestName");
+$TimeStamp=sql_result($glrresult,0,"TimeStamp");
 $TimeStamp=GMTimeChange("F j Y, g:i a",$TimeStamp,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
-mysql_free_result($glrresult); }
+sql_free_result($glrresult); }
 $PreUsersName = GetUserName($UsersID,$Settings['sqltable']);
 if($PreUsersName['Name']===null) { $UsersID = -1;
 $PreUsersName = GetUserName($UsersID,$Settings['sqltable']); }
@@ -212,7 +212,7 @@ if(($UsersID<-1&&$UsersHidden=="yes")||$UsersID==0||($UsersID>0&&$UsersHidden=="
        $UserPre = "Hidden:"; }
 $LastTopic = $TimeStamp."<br />\nTopic: <a href=\"".url_maker($exfile['topic'],$Settings['file_ext'],"act=view&id=".$TopicID."&page=".$NumPages,$Settings['qstr'],$Settings['qsep'],$prexqstr['topic'],$exqstr['topic']).$qstrhtml."&#35;reply".$NumRPosts."\" title=\"".$oldtopicname."\">".$TopicName."</a><br />\n".$UserPre." <span title=\"".$oldusername."\">".$UsersName."</span>"; } }
 if($LastTopic==null) { $LastTopic = "&nbsp;<br />&nbsp;<br />&nbsp;"; } }
-mysql_free_result($gltresult);
+sql_free_result($gltresult);
 if ($ForumType=="redirect") { $LastTopic="&nbsp;<br />Redirects: ".$NumRedirects."<br />&nbsp;"; }
 $PreForum = $ThemeSet['ForumIcon'];
 if ($ForumType=="forum") { $PreForum=$ThemeSet['ForumIcon']; }
@@ -232,7 +232,7 @@ $ExStr = ""; if ($ForumType!="redirect"&&
 <td class="TableColumn3" style="text-align: center;"><?php echo $NumPosts; ?></td>
 <td class="TableColumn3"><?php echo $LastTopic; ?></td>
 </tr>
-<?php } ++$i; } mysql_free_result($result);
+<?php } ++$i; } sql_free_result($result);
 if($num>=1) { ?>
 <tr id="CatEnd<?php echo $CategoryID; ?>" class="TableRow4">
 <td class="TableColumn4" colspan="5">&nbsp;</td>
@@ -240,4 +240,4 @@ if($num>=1) { ?>
 </table></div>
 <div class="DivCategories">&nbsp;</div>
 <?php } } }
-mysql_free_result($preresult); ?>
+sql_free_result($preresult); ?>

diff --git a/inc/events.php b/inc/events.php
index 498268f..bff2154 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: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: events.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="events.php"||$File3Name=="/events.php") {
@@ -19,11 +19,11 @@ if ($File3Name=="events.php"||$File3Name=="/events.php") {
        exit(); }
 if(!is_numeric($_GET['id'])) { $_GET['id'] = null; }
 if($_GET['act']=="view"||$_GET['act']==null) {
-$query = query("SELECT * FROM `".$Settings['sqltable']."events` WHERE `id`=%i LIMIT 1", array($_GET['id']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."events` WHERE `id`=%i LIMIT 1", array($_GET['id']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $is=0;
-if($num==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); mysql_free_result($result);
+if($num==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); sql_free_result($result);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 ?>
@@ -31,14 +31,14 @@ gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die
 <div class="DivNavLinks">&nbsp;</div>
 <?php
 while ($is < $num) {
-$EventID=mysql_result($result,$is,"id");
-$EventUser=mysql_result($result,$is,"UserID");
-$EventGuest=mysql_result($result,$is,"GuestName");
-$EventName=mysql_result($result,$is,"EventName");
-$EventText=mysql_result($result,$is,"EventText");
+$EventID=sql_result($result,$is,"id");
+$EventUser=sql_result($result,$is,"UserID");
+$EventGuest=sql_result($result,$is,"GuestName");
+$EventName=sql_result($result,$is,"EventName");
+$EventText=sql_result($result,$is,"EventText");
 $EventText = preg_replace("/\<br\>/", "<br />", nl2br($EventText));
-$EventStart=mysql_result($result,$is,"TimeStamp");
-$EventEnd=mysql_result($result,$is,"TimeStampEnd");
+$EventStart=sql_result($result,$is,"TimeStamp");
+$EventEnd=sql_result($result,$is,"TimeStampEnd");
 $EventStart = GMTimeChange("M. j Y",$EventStart,null);
 $EventEnd = GMTimeChange("M. j Y",$EventEnd,null);
 $_SESSION['ViewingPage'] = url_maker(null,"no+ext","act=view&id=".$_GET['id'],"&","=",$prexqstr['event'],$exqstr['event']);
@@ -48,44 +48,44 @@ if($Settings['file_ext']=="no+ext"||$Settings['file_ext']=="no ext") {
 $_SESSION['ViewingFile'] = $exfile['event']; }
 $_SESSION['PreViewingTitle'] = "Viewing Event:";
 $_SESSION['ViewingTitle'] = $EventName;
-$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($EventUser));
-$reresult=exec_query($requery);
-$renum=mysql_num_rows($reresult);
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($EventUser));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult);
 if($renum<1) { $EventUser = -1;
-$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($EventUser));
-$reresult=exec_query($requery);
-$renum=mysql_num_rows($reresult); }
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($EventUser));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult); }
 $rei=0;
 $User1ID=$EventUser;
-$User1Name=mysql_result($reresult,$rei,"Name");
-$User1IP=mysql_result($reresult,$rei,"IP");
-$User1Email=mysql_result($reresult,$rei,"Email");
-$User1Title=mysql_result($reresult,$rei,"Title");
-$User1Joined=mysql_result($reresult,$rei,"Joined");
+$User1Name=sql_result($reresult,$rei,"Name");
+$User1IP=sql_result($reresult,$rei,"IP");
+$User1Email=sql_result($reresult,$rei,"Email");
+$User1Title=sql_result($reresult,$rei,"Title");
+$User1Joined=sql_result($reresult,$rei,"Joined");
 $User1Joined=GMTimeChange("M j Y",$User1Joined,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
-$User1GroupID=mysql_result($reresult,$rei,"GroupID");
-$gquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($User1GroupID));
-$gresult=exec_query($gquery);
-$User1Hidden=mysql_result($reresult,$rei,"HiddenMember");
-$User1Group=mysql_result($gresult,0,"Name");
-$GroupNamePrefix=mysql_result($gresult,0,"NamePrefix");
-$GroupNameSuffix=mysql_result($gresult,0,"NameSuffix");
-mysql_free_result($gresult);
-$User1Signature=mysql_result($reresult,$rei,"Signature");
+$User1GroupID=sql_result($reresult,$rei,"GroupID");
+$gquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($User1GroupID));
+$gresult=sql_query($gquery);
+$User1Hidden=sql_result($reresult,$rei,"HiddenMember");
+$User1Group=sql_result($gresult,0,"Name");
+$GroupNamePrefix=sql_result($gresult,0,"NamePrefix");
+$GroupNameSuffix=sql_result($gresult,0,"NameSuffix");
+sql_free_result($gresult);
+$User1Signature=sql_result($reresult,$rei,"Signature");
 $User1Signature = preg_replace("/\<br\>/", "<br />", nl2br($User1Signature));
-$User1Avatar=mysql_result($reresult,$rei,"Avatar");
-$User1AvatarSize=mysql_result($reresult,$rei,"AvatarSize");
+$User1Avatar=sql_result($reresult,$rei,"Avatar");
+$User1AvatarSize=sql_result($reresult,$rei,"AvatarSize");
 if ($User1Avatar=="http://"||$User1Avatar==null||
        strtolower($User1Avatar)=="noavatar") {
 $User1Avatar=$ThemeSet['NoAvatar'];
 $User1AvatarSize=$ThemeSet['NoAvatarSize']; }
 $AvatarSize1=explode("x", $User1AvatarSize);
 $AvatarSize1W=$AvatarSize1[0]; $AvatarSize1H=$AvatarSize1[1];
-$User1Website=mysql_result($reresult,$rei,"Website");
-$User1PostCount=mysql_result($reresult,$rei,"PostCount");
-$User1IP=mysql_result($reresult,$rei,"IP");
-mysql_free_result($reresult);
-++$is; } mysql_free_result($result);
+$User1Website=sql_result($reresult,$rei,"Website");
+$User1PostCount=sql_result($reresult,$rei,"PostCount");
+$User1IP=sql_result($reresult,$rei,"IP");
+sql_free_result($reresult);
+++$is; } sql_free_result($result);
 if($User1Name=="Guest") { $User1Name=$EventGuest;
 if($User1Name==null) { $User1Name="Guest"; } }
 if(isset($GroupNamePrefix)&&$GroupNamePrefix!=null) {
@@ -199,17 +199,17 @@ $_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=query("SELECT * FROM `".$Settings['sqltable']."smileys` WHERE `Show`='yes'", array(null));
-$renee_result=exec_query($renee_query);
-$renee_num=mysql_num_rows($renee_result);
+$renee_query=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."smileys` WHERE `Show`='yes'", array(null));
+$renee_result=sql_query($renee_query);
+$renee_num=sql_num_rows($renee_result);
 $renee_s=0; $SmileRow=0; $SmileCRow=0;
 while ($renee_s < $renee_num) { ++$SmileRow;
-$FileName=mysql_result($renee_result,$renee_s,"FileName");
-$SmileName=mysql_result($renee_result,$renee_s,"SmileName");
-$SmileText=mysql_result($renee_result,$renee_s,"SmileText");
-$SmileDirectory=mysql_result($renee_result,$renee_s,"Directory");
-$ShowSmile=mysql_result($renee_result,$renee_s,"Show");
-$ReplaceType=mysql_result($renee_result,$renee_s,"ReplaceCI");
+$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,"Show");
+$ReplaceType=sql_result($renee_result,$renee_s,"ReplaceCI");
 if($SmileRow==1) { ?><tr>
        <?php } if($SmileRow<5) { ++$SmileCRow; ?>
        <td>&nbsp;<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;')" />&nbsp;</td>
@@ -221,7 +221,7 @@ if($SmileCRow<5&&$SmileCRow!=0) {
 $SmileCRowL = 5 - $SmileCRow;
 echo "<td colspan=\"".$SmileCRowL."\">&nbsp;</td></tr>"; }
 echo "</table>";
-mysql_free_result($renee_result);
+sql_free_result($renee_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']); ?>">
@@ -448,18 +448,18 @@ setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir);
 $_SESSION['GuestName']=$_POST['GuestName']; } }
 /*    <_<  iWordFilter  >_>      
    by Kazuki Przyborowski - Cool Dude 2k */
-$katarzynaqy=query("SELECT * FROM `".$Settings['sqltable']."wordfilter`", array(null));
-$katarzynart=exec_query($katarzynaqy);
-$katarzynanm=mysql_num_rows($katarzynart);
+$katarzynaqy=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."wordfilter`", array(null));
+$katarzynart=sql_query($katarzynaqy);
+$katarzynanm=sql_num_rows($katarzynart);
 $katarzynas=0;
 while ($katarzynas < $katarzynanm) {
-$Filter=mysql_result($katarzynart,$katarzynas,"Filter");
-$Replace=mysql_result($katarzynart,$katarzynas,"Replace");
-$CaseInsensitive=mysql_result($katarzynart,$katarzynas,"CaseInsensitive");
+$Filter=sql_result($katarzynart,$katarzynas,"Filter");
+$Replace=sql_result($katarzynart,$katarzynas,"Replace");
+$CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
 if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
 if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
 if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; }
-$WholeWord=mysql_result($katarzynart,$katarzynas,"WholeWord");
+$WholeWord=sql_result($katarzynart,$katarzynas,"WholeWord");
 if($WholeWord=="on") { $WholeWord = "yes"; }
 if($WholeWord=="off") { $WholeWord = "no"; }
 if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; }
@@ -472,26 +472,26 @@ 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; } mysql_free_result($katarzynart);
-$lonewolfqy=query("SELECT * FROM `".$Settings['sqltable']."restrictedwords` WHERE `RestrictedEventName`='yes' or `RestrictedUserName`='yes'", array(null));
-$lonewolfrt=exec_query($lonewolfqy);
-$lonewolfnm=mysql_num_rows($lonewolfrt);
+++$katarzynas; } sql_free_result($katarzynart);
+$lonewolfqy=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."restrictedwords` WHERE `RestrictedEventName`='yes' or `RestrictedUserName`='yes'", array(null));
+$lonewolfrt=sql_query($lonewolfqy);
+$lonewolfnm=sql_num_rows($lonewolfrt);
 $lonewolfs=0; $RMatches = null; $RGMatches = null;
 while ($lonewolfs < $lonewolfnm) {
-$RWord=mysql_result($lonewolfrt,$lonewolfs,"Word");
-$RCaseInsensitive=mysql_result($lonewolfrt,$lonewolfs,"CaseInsensitive");
+$RWord=sql_result($lonewolfrt,$lonewolfs,"Word");
+$RCaseInsensitive=sql_result($lonewolfrt,$lonewolfs,"CaseInsensitive");
 if($RCaseInsensitive=="on") { $RCaseInsensitive = "yes"; }
 if($RCaseInsensitive=="off") { $RCaseInsensitive = "no"; }
 if($RCaseInsensitive!="yes"||$RCaseInsensitive!="no") { $RCaseInsensitive = "no"; }
-$RWholeWord=mysql_result($lonewolfrt,$lonewolfs,"WholeWord");
+$RWholeWord=sql_result($lonewolfrt,$lonewolfs,"WholeWord");
 if($RWholeWord=="on") { $RWholeWord = "yes"; }
 if($RWholeWord=="off") { $RWholeWord = "no"; }
 if($RWholeWord!="yes"||$RWholeWord!="no") { $RWholeWord = "no"; }
-$RestrictedEventName=mysql_result($lonewolfrt,$lonewolfs,"RestrictedEventName");
+$RestrictedEventName=sql_result($lonewolfrt,$lonewolfs,"RestrictedEventName");
 if($RestrictedEventName=="on") { $RestrictedEventName = "yes"; }
 if($RestrictedEventName=="off") { $RestrictedEventName = "no"; }
 if($RestrictedEventName!="yes"||$RestrictedEventName!="no") { $RestrictedEventName = "no"; }
-$RestrictedUserName=mysql_result($lonewolfrt,$lonewolfs,"RestrictedUserName");
+$RestrictedUserName=sql_result($lonewolfrt,$lonewolfs,"RestrictedUserName");
 if($RestrictedUserName=="on") { $RestrictedUserName = "yes"; }
 if($RestrictedUserName=="off") { $RestrictedUserName = "no"; }
 if($RestrictedUserName!="yes"||$RestrictedUserName!="no") { $RestrictedUserName = "no"; }
@@ -524,7 +524,7 @@ $RMatches = preg_match("/".$RWord."/i", $_POST['EventName']);
 if($RestrictedUserName=="yes") {
 $RGMatches = preg_match("/".$RWord."/i", $_POST['GuestName']);
        if($RGMatches==true) { break 1; } } }
-++$lonewolfs; } mysql_free_result($lonewolfrt);
+++$lonewolfs; } sql_free_result($lonewolfrt);
 if ($_POST['EventName']==null) { $Error="Yes"; ?>
 <tr>
        <td><span class="TableMessage">
@@ -627,13 +627,13 @@ $EventDay=GMTimeChange("d",$TimeSIn,0,0,"off");
 $EventDayEnd=GMTimeChange("d",$TimeSOut,0,0,"off");
 $EventYear=GMTimeChange("Y",$TimeSIn,0,0,"off");
 $EventYearEnd=GMTimeChange("Y",$TimeSOut,0,0,"off");
-$eventid = getnextid($Settings['sqltable'],"events");
+$eventid = sql_get_next_id($Settings['sqltable'],"events");
 $User1ID=$MyUserID;
 if($_SESSION['UserGroup']==$Settings['GuestGroup']) { $User1Name = $_POST['GuestName']; }
 if($_SESSION['UserGroup']!=$Settings['GuestGroup']) { $User1Name = $_SESSION['MemberName']; }
-$query = query("INSERT INTO ".$Settings['sqltable']."events (`UserID`, `GuestName`, `EventName`, `EventText`, `TimeStamp`, `TimeStampEnd`, `EventMonth`, `EventMonthEnd`, `EventDay`, `EventDayEnd`, `EventYear`, `EventYearEnd`) VALUES\n".
+$query = sql_pre_query("INSERT INTO ".$Settings['sqltable']."events (`UserID`, `GuestName`, `EventName`, `EventText`, `TimeStamp`, `TimeStampEnd`, `EventMonth`, `EventMonthEnd`, `EventDay`, `EventDayEnd`, `EventYear`, `EventYearEnd`) VALUES\n".
 "(%i, '%s', '%s', '%s', %i, %i, %i, %i, %i, %i, %i, %i)", array($User1ID,$User1Name,$_POST['EventName'],$_POST['EventText'],$TimeSIn,$TimeSOut,$EventMonth,$EventMonthEnd,$EventDay,$EventDayEnd,$EventYear,$EventYearEnd));
-exec_query($query);
+sql_query($query);
 redirect("refresh",$basedir.url_maker($exfile['event'],$Settings['file_ext'],"act=event&id=".$eventid,$Settings['qstr'],$Settings['qsep'],$prexqstr['event'],$exqstr['event'],FALSE),"3");
 ?><tr>
        <td><span class="TableMessage"><br />

diff --git a/inc/forums.php b/inc/forums.php
index a3a15a9..e252dce 100644 (file)
--- a/inc/forums.php
+++ b/inc/forums.php
@@ -11,15 +11,15 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: forums.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: forums.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="forums.php"||$File3Name=="/forums.php") {
        require('index.php');
        exit(); }
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `ShowCategory`='yes' AND `InSubCategory`=0 ORDER BY `OrderID` ASC, `id` ASC", array());
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `ShowCategory`='yes' AND `InSubCategory`=0 ORDER BY `OrderID` ASC, `id` ASC", array());
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
 $prei=0;
 $_SESSION['ViewingPage'] = url_maker(null,"no+ext","act=view","&","=",$prexqstr['index'],$exqstr['index']);
 if($Settings['file_ext']!="no+ext"&&$Settings['file_ext']!="no ext") {
@@ -33,15 +33,15 @@ $_SESSION['ViewingTitle'] = "Board index";
 <div class="DivNavLinks">&nbsp;</div>
 <?php
 while ($prei < $prenum) {
-$CategoryID=mysql_result($preresult,$prei,"id");
-$CategoryName=mysql_result($preresult,$prei,"Name");
-$CategoryShow=mysql_result($preresult,$prei,"ShowCategory");
-$CategoryType=mysql_result($preresult,$prei,"CategoryType");
-$SubShowForums=mysql_result($preresult,$prei,"SubShowForums");
-$CategoryDescription=mysql_result($preresult,$prei,"Description");
+$CategoryID=sql_result($preresult,$prei,"id");
+$CategoryName=sql_result($preresult,$prei,"Name");
+$CategoryShow=sql_result($preresult,$prei,"ShowCategory");
+$CategoryType=sql_result($preresult,$prei,"CategoryType");
+$SubShowForums=sql_result($preresult,$prei,"SubShowForums");
+$CategoryDescription=sql_result($preresult,$prei,"Description");
 $CategoryType = strtolower($CategoryType); $SubShowForums = strtolower($SubShowForums);
-$CategoryPostCountView=mysql_result($preresult,0,"PostCountView");
-$CategoryKarmaCountView=mysql_result($preresult,0,"KarmaCountView");
+$CategoryPostCountView=sql_result($preresult,0,"PostCountView");
+$CategoryKarmaCountView=sql_result($preresult,0,"KarmaCountView");
 if($MyPostCountChk==null) { $MyPostCountChk = 0; }
 if($MyKarmaCount==null) { $MyKarmaCount = 0; }
 if($GroupInfo['HasAdminCP']!="yes"||$GroupInfo['HasModCP']!="yes") {
@@ -51,9 +51,9 @@ if($CategoryKarmaCountView!=0&&$MyKarmaCount<$CategoryKarmaCountView) {
 redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); } }
 if(isset($CatPermissionInfo['CanViewCategory'][$CategoryID])&&
        $CatPermissionInfo['CanViewCategory'][$CategoryID]=="yes") {
-$query = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `CategoryID`=%i AND `InSubForum`=0 ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `CategoryID`=%i AND `InSubForum`=0 ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
 if($num>=1) {
 ?>
@@ -79,31 +79,31 @@ if($num>=1) {
 </tr>
 <?php }
 while ($i < $num) {
-$ForumID=mysql_result($result,$i,"id");
-$ForumName=mysql_result($result,$i,"Name");
-$ForumShow=mysql_result($result,$i,"ShowForum");
-$ForumType=mysql_result($result,$i,"ForumType");
-$ForumShowTopics=mysql_result($result,$i,"CanHaveTopics");
+$ForumID=sql_result($result,$i,"id");
+$ForumName=sql_result($result,$i,"Name");
+$ForumShow=sql_result($result,$i,"ShowForum");
+$ForumType=sql_result($result,$i,"ForumType");
+$ForumShowTopics=sql_result($result,$i,"CanHaveTopics");
 $ForumShowTopics = strtolower($ForumShowTopics);
-$NumTopics=mysql_result($result,$i,"NumTopics");
-$NumPosts=mysql_result($result,$i,"NumPosts");
-$NumRedirects=mysql_result($result,$i,"Redirects");
-$ForumDescription=mysql_result($result,$i,"Description");
+$NumTopics=sql_result($result,$i,"NumTopics");
+$NumPosts=sql_result($result,$i,"NumPosts");
+$NumRedirects=sql_result($result,$i,"Redirects");
+$ForumDescription=sql_result($result,$i,"Description");
 $ForumType = strtolower($ForumType); $sflist = null;
 $gltf = array(null); $gltf[0] = $ForumID;
 if ($ForumType=="subforum") { 
-$apcquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
-$apcresult=exec_query($apcquery);
-$apcnum=mysql_num_rows($apcresult);
+$apcquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
+$apcresult=sql_query($apcquery);
+$apcnum=sql_num_rows($apcresult);
 $apci=0; $apcl=1; if($apcnum>=1) {
 while ($apci < $apcnum) {
-$NumsTopics=mysql_result($apcresult,$apci,"NumTopics");
+$NumsTopics=sql_result($apcresult,$apci,"NumTopics");
 $NumTopics = $NumsTopics + $NumTopics;
-$NumsPosts=mysql_result($apcresult,$apci,"NumPosts");
+$NumsPosts=sql_result($apcresult,$apci,"NumPosts");
 $NumPosts = $NumsPosts + $NumPosts;
-$SubsForumID=mysql_result($apcresult,$apci,"id");
-$SubsForumName=mysql_result($apcresult,$apci,"Name");
-$SubsForumType=mysql_result($apcresult,$apci,"ForumType");
+$SubsForumID=sql_result($apcresult,$apci,"id");
+$SubsForumName=sql_result($apcresult,$apci,"Name");
+$SubsForumType=sql_result($apcresult,$apci,"ForumType");
 if(isset($PermissionInfo['CanViewForum'][$SubsForumID])&&
        $PermissionInfo['CanViewForum'][$SubsForumID]=="yes") {
 $sfurl = "<a href=\"";
@@ -116,7 +116,7 @@ if($apcl>1) {
 $sflist = $sflist.", ".$sfurl; }
 $gltf[$apcl] = $SubsForumID; ++$apcl; }
 ++$apci; }
-mysql_free_result($apcresult); } }
+sql_free_result($apcresult); } }
 if(isset($PermissionInfo['CanViewForum'][$ForumID])&&
        $PermissionInfo['CanViewForum'][$ForumID]=="yes") {
 $LastTopic = "&nbsp;<br />&nbsp;<br />&nbsp;";
@@ -125,25 +125,25 @@ $gltnum = count($gltf); $glti = 0;
 $OldUpdateTime = 0; $UseThisFonum = null;
 if ($ForumType=="subforum") { 
 while ($glti < $gltnum) {
-$gltfoquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($gltf[$glti]));
-$gltforesult=exec_query($gltfoquery);
-$gltfonum=mysql_num_rows($gltforesult);
+$gltfoquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($gltf[$glti]));
+$gltforesult=sql_query($gltfoquery);
+$gltfonum=sql_num_rows($gltforesult);
 if($gltfonum>0) {
-$NewUpdateTime=mysql_result($gltforesult,0,"LastUpdate");
+$NewUpdateTime=sql_result($gltforesult,0,"LastUpdate");
 if($NewUpdateTime>$OldUpdateTime) { 
        $UseThisFonum = $gltf[$glti]; 
 $OldUpdateTime = $NewUpdateTime; } }
-mysql_free_result($gltforesult);
+sql_free_result($gltforesult);
 ++$glti; } }
 if ($ForumType!="subforum"&&$ForumType!="redirect") { $UseThisFonum = $gltf[0]; }
 if ($ForumType!="redirect") {
-$gltquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($UseThisFonum));
-$gltresult=exec_query($gltquery);
-$gltnum=mysql_num_rows($gltresult);
+$gltquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($UseThisFonum));
+$gltresult=sql_query($gltquery);
+$gltnum=sql_num_rows($gltresult);
 if($gltnum>0){
-$TopicID=mysql_result($gltresult,0,"id");
-$TopicName=mysql_result($gltresult,0,"TopicName");
-$NumReplys=mysql_result($gltresult,0,"NumReply");
+$TopicID=sql_result($gltresult,0,"id");
+$TopicName=sql_result($gltresult,0,"TopicName");
+$NumReplys=sql_result($gltresult,0,"NumReply");
 $NumPages = null; $NumRPosts = $NumReplys + 1;
 if(!isset($Settings['max_posts'])) { $Settings['max_posts'] = 10; }
 if($NumRPosts>$Settings['max_posts']) {
@@ -153,16 +153,16 @@ $TopicName1 = pre_substr($TopicName,0,20);
 $oldtopicname=$TopicName;
 if (pre_strlen($TopicName)>20) { 
 $TopicName1 = $TopicName1."..."; $TopicName=$TopicName1; }
-$glrquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` DESC LIMIT 1", array($TopicID));
-$glrresult=exec_query($glrquery);
-$glrnum=mysql_num_rows($glrresult);
+$glrquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` DESC LIMIT 1", array($TopicID));
+$glrresult=sql_query($glrquery);
+$glrnum=sql_num_rows($glrresult);
 if($glrnum>0){
-$ReplyID=mysql_result($glrresult,0,"id");
-$UsersID=mysql_result($glrresult,0,"UserID");
-$GuestsName=mysql_result($glrresult,0,"GuestName");
-$TimeStamp=mysql_result($glrresult,0,"TimeStamp");
+$ReplyID=sql_result($glrresult,0,"id");
+$UsersID=sql_result($glrresult,0,"UserID");
+$GuestsName=sql_result($glrresult,0,"GuestName");
+$TimeStamp=sql_result($glrresult,0,"TimeStamp");
 $TimeStamp=GMTimeChange("F j Y, g:i a",$TimeStamp,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
-mysql_free_result($glrresult); }
+sql_free_result($glrresult); }
 $PreUsersName = GetUserName($UsersID,$Settings['sqltable']);
 if($PreUsersName['Name']===null) { $UsersID = -1;
 $PreUsersName = GetUserName($UsersID,$Settings['sqltable']); }
@@ -184,7 +184,7 @@ if(($UsersID<-1&&$UsersHidden=="yes")||$UsersID==0||($UsersID>0&&$UsersHidden=="
        $UserPre = "Hidden:"; }
 $LastTopic = $TimeStamp."<br />\nTopic: <a href=\"".url_maker($exfile['topic'],$Settings['file_ext'],"act=view&id=".$TopicID."&page=".$NumPages,$Settings['qstr'],$Settings['qsep'],$prexqstr['topic'],$exqstr['topic']).$qstrhtml."&#35;reply".$NumRPosts."\" title=\"".$oldtopicname."\">".$TopicName."</a><br />\n".$UserPre." <span title=\"".$oldusername."\">".$UsersName."</span>"; } }
 if($LastTopic==null) { $LastTopic="&nbsp;<br />&nbsp;"; } }
-mysql_free_result($gltresult);
+sql_free_result($gltresult);
 if ($ForumType=="redirect") { $LastTopic="&nbsp;<br />Redirects: ".$NumRedirects."<br />&nbsp;"; }
 $PreForum = $ThemeSet['ForumIcon'];
 if ($ForumType=="forum") { $PreForum=$ThemeSet['ForumIcon']; }
@@ -204,7 +204,7 @@ $ExStr = ""; if ($ForumType!="redirect"&&
 <td class="TableColumn3" style="text-align: center;"><?php echo $NumPosts; ?></td>
 <td class="TableColumn3"><?php echo $LastTopic; ?></td>
 </tr>
-<?php } ++$i; } mysql_free_result($result);
+<?php } ++$i; } sql_free_result($result);
 if($num>=1) {
 ?>
 <tr id="CatEnd<?php echo $CategoryID; ?>" class="TableRow4">
@@ -216,4 +216,4 @@ if($num>=1) {
 <?php } if($prei == $prenum - 1) { ?>
 <div class="DivStsts">&nbsp;</div>
 <?php } } } ++$prei; }
-mysql_free_result($preresult); ?>
+sql_free_result($preresult); ?>

diff --git a/inc/groupsetup.php b/inc/groupsetup.php
index e3d71c7..cfd600e 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: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: groupsetup.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="groupsetup.php"||$File3Name=="/groupsetup.php") {
@@ -25,40 +25,40 @@ 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=exec_query($ggidquery);
-$Settings['GuestGroupID']=mysql_result($ggidresult,0,"id");*/
+/*$ggidquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `name`='%s' LIMIT 1", array($Settings['GuestGroup']));
+$ggidresult=sql_query($ggidquery);
+$Settings['GuestGroupID']=sql_result($ggidresult,0,"id");*/
 // Check to make sure MemberInfo is right
 $MyPostCountChk = null; $MyKarmaCount = null;
 if(!isset($_SESSION['UserID'])) { $_SESSION['UserID'] = 0; }
 if($_SESSION['UserID']!=0&&$_SESSION['UserID']!=null) { $BanError = null;
-$kgbquerychkusr = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `Name`='%s' AND `Password`='%s' AND `id`=%i LIMIT 1", array($_SESSION['MemberName'],$_SESSION['UserPass'],$_SESSION['UserID'])); 
-$resultchkusr=exec_query($kgbquerychkusr);
-$numchkusr=mysql_num_rows($resultchkusr);
+$kgbquerychkusr = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `Name`='%s' AND `Password`='%s' AND `id`=%i LIMIT 1", array($_SESSION['MemberName'],$_SESSION['UserPass'],$_SESSION['UserID'])); 
+$resultchkusr=sql_query($kgbquerychkusr);
+$numchkusr=sql_num_rows($resultchkusr);
 if($numchkusr==1) {
-$ChkUsrID=mysql_result($resultchkusr,0,"id");
-$ChkUsrName=mysql_result($resultchkusr,0,"Name");
-$ChkUsrGroup=mysql_result($resultchkusr,0,"GroupID");
+$ChkUsrID=sql_result($resultchkusr,0,"id");
+$ChkUsrName=sql_result($resultchkusr,0,"Name");
+$ChkUsrGroup=sql_result($resultchkusr,0,"GroupID");
 $ChkUsrGroupID=$ChkUsrGroup;
-$ChkUsrPass=mysql_result($resultchkusr,0,"Password");
-$ChkUsrTimeZone=mysql_result($resultchkusr,0,"TimeZone");
-$ChkUsrTheme=mysql_result($resultchkusr,0,"UseTheme");
-$ChkUsrLastPostTime=mysql_result($resultchkusr,0,"LastPostTime");
-$MyPostCountChk=mysql_result($resultchkusr,0,"PostCount");
-$MyKarmaCount=mysql_result($resultchkusr,0,"Karma");
-$MyKarmaUpdate=mysql_result($resultchkusr,0,"KarmaUpdate");
-$MyRepliesPerPage=mysql_result($resultchkusr,0,"RepliesPerPage");
+$ChkUsrPass=sql_result($resultchkusr,0,"Password");
+$ChkUsrTimeZone=sql_result($resultchkusr,0,"TimeZone");
+$ChkUsrTheme=sql_result($resultchkusr,0,"UseTheme");
+$ChkUsrLastPostTime=sql_result($resultchkusr,0,"LastPostTime");
+$MyPostCountChk=sql_result($resultchkusr,0,"PostCount");
+$MyKarmaCount=sql_result($resultchkusr,0,"Karma");
+$MyKarmaUpdate=sql_result($resultchkusr,0,"KarmaUpdate");
+$MyRepliesPerPage=sql_result($resultchkusr,0,"RepliesPerPage");
 $Settings['max_posts'] = $MyRepliesPerPage;
-$MyTopicsPerPage=mysql_result($resultchkusr,0,"TopicsPerPage");
+$MyTopicsPerPage=sql_result($resultchkusr,0,"TopicsPerPage");
 $Settings['max_topics'] = $MyTopicsPerPage;
-$MyMessagesPerPage=mysql_result($resultchkusr,0,"MessagesPerPage");
+$MyMessagesPerPage=sql_result($resultchkusr,0,"MessagesPerPage");
 $Settings['max_memlist'] = $MyMessagesPerPage;
 $Settings['max_pmlist'] = $MyMessagesPerPage;
-$ChkUsrDST=mysql_result($resultchkusr,0,"DST");
-$svrquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($ChkUsrGroup));
-$svrgresultkgb=exec_query($svrquery);
-$ChkUsrGroup=mysql_result($svrgresultkgb,0,"Name"); 
-$ChkUsrBanTime=mysql_result($resultchkusr,0,"BanTime");
+$ChkUsrDST=sql_result($resultchkusr,0,"DST");
+$svrquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($ChkUsrGroup));
+$svrgresultkgb=sql_query($svrquery);
+$ChkUsrGroup=sql_result($svrgresultkgb,0,"Name"); 
+$ChkUsrBanTime=sql_result($resultchkusr,0,"BanTime");
 $ChkUsrGMTime = GMTimeStamp();
 if($ChkUsrBanTime!=0&&$ChkUsrBanTime!=null) {
 if($ChkUsrBanTime>=$ChkUsrGMTime) { $BanError = "yes"; } }
@@ -92,71 +92,71 @@ setcookie("SessPass", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain);
 setcookie(session_name(), "", GMTimeStamp() - 3600, $cbasedir, $cookieDomain); } }
 unset($_COOKIE[session_name()]);
 $_SESSION = array(); session_unset(); session_destroy();
-redirect("location",$basedir.url_maker($exfile['member'],$Settings['file_ext'],"act=login",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member'],false)); mysql_free_result($resultchkusr); mysql_free_result($svrgresultkgb);
+redirect("location",$basedir.url_maker($exfile['member'],$Settings['file_ext'],"act=login",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member'],false)); sql_free_result($resultchkusr); sql_free_result($svrgresultkgb);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
-mysql_free_result($resultchkusr); mysql_free_result($svrgresultkgb); }
+sql_free_result($resultchkusr); sql_free_result($svrgresultkgb); }
 if($_SESSION['UserID']==0||$_SESSION['UserID']==null) {
 $_SESSION['UserIP']=$_SERVER['REMOTE_ADDR'];
 $_SESSION['MemberName'] = null;
 $_SESSION['UserGroup'] = $Settings['GuestGroup']; 
-$gidquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `name`='%s' LIMIT 1", array($Settings['GuestGroup']));
-$gidresult=exec_query($gidquery);
-$_SESSION['UserGroupID']=mysql_result($gidresult,0,"id"); 
-mysql_free_result($gidresult); }
+$gidquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `name`='%s' LIMIT 1", array($Settings['GuestGroup']));
+$gidresult=sql_query($gidquery);
+$_SESSION['UserGroupID']=sql_result($gidresult,0,"id"); 
+sql_free_result($gidresult); }
 if($_SESSION['MemberName']==null) { $_SESSION['UserID'] = "0";
 $_SESSION['UserIP']=$_SERVER['REMOTE_ADDR'];
 $_SESSION['UserGroup'] = $Settings['GuestGroup']; 
-$gidquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `name`='%s' LIMIT 1", array($Settings['GuestGroup']));
-$gidresult=exec_query($gidquery);
-$_SESSION['UserGroupID']=mysql_result($gidresult,0,"id"); 
-mysql_free_result($gidresult); }
+$gidquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `name`='%s' LIMIT 1", array($Settings['GuestGroup']));
+$gidresult=sql_query($gidquery);
+$_SESSION['UserGroupID']=sql_result($gidresult,0,"id"); 
+sql_free_result($gidresult); }
 // Member Group Setup
 if(!isset($_SESSION['UserGroup'])) { $_SESSION['UserGroup'] = null; }
 if($_SESSION['UserGroup']==null) { 
 $_SESSION['UserGroup']=$Settings['GuestGroup']; } $GruError = null;
-$gruquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `Name`='%s' LIMIT 1", array($_SESSION['UserGroup']));
-$gruresult=exec_query($gruquery);
-$grunum=mysql_num_rows($gruresult);
-if($grunum<=0) { $GruError = true; mysql_free_result($gruresult);
+$gruquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `Name`='%s' LIMIT 1", array($_SESSION['UserGroup']));
+$gruresult=sql_query($gruquery);
+$grunum=sql_num_rows($gruresult);
+if($grunum<=0) { $GruError = true; sql_free_result($gruresult);
 header("Content-Type: text/plain; charset=".$Settings['charset']); 
 ob_clean(); echo "Sorry could not find group data in database.\nContact the board admin about error."; 
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($grunum>=1) {
-$GroupInfo['ID']=mysql_result($gruresult,0,"id");
+$GroupInfo['ID']=sql_result($gruresult,0,"id");
 if(!is_numeric($GroupInfo['ID'])) { $GruError = true; }
-$GroupInfo['Name']=mysql_result($gruresult,0,"Name");
-$GroupInfo['PermissionID']=mysql_result($gruresult,0,"PermissionID");
+$GroupInfo['Name']=sql_result($gruresult,0,"Name");
+$GroupInfo['PermissionID']=sql_result($gruresult,0,"PermissionID");
 if(!is_numeric($GroupInfo['PermissionID'])) { $GruError = true; }
-$GroupInfo['NamePrefix']=mysql_result($gruresult,0,"NamePrefix");
-$GroupInfo['NameSuffix']=mysql_result($gruresult,0,"NameSuffix");
-$GroupInfo['CanViewBoard']=mysql_result($gruresult,0,"CanViewBoard");
+$GroupInfo['NamePrefix']=sql_result($gruresult,0,"NamePrefix");
+$GroupInfo['NameSuffix']=sql_result($gruresult,0,"NameSuffix");
+$GroupInfo['CanViewBoard']=sql_result($gruresult,0,"CanViewBoard");
 if($GroupInfo['CanViewBoard']!="yes"&&$GroupInfo['CanViewBoard']!="no") {
                $GruError = true; }
-$GroupInfo['CanViewOffLine']=mysql_result($gruresult,0,"CanViewOffLine");
+$GroupInfo['CanViewOffLine']=sql_result($gruresult,0,"CanViewOffLine");
 if($GroupInfo['CanViewOffLine']!="yes"&&$GroupInfo['CanViewOffLine']!="no") {
                $GruError = true; }
-$GroupInfo['FloodControl']=mysql_result($gruresult,0,"FloodControl");
+$GroupInfo['FloodControl']=sql_result($gruresult,0,"FloodControl");
 if(!is_numeric($GroupInfo['FloodControl'])) { $GroupInfo['FloodControl'] = 30; }
-$GroupInfo['SearchFlood']=mysql_result($gruresult,0,"SearchFlood");
+$GroupInfo['SearchFlood']=sql_result($gruresult,0,"SearchFlood");
 if(!is_numeric($GroupInfo['SearchFlood'])) { $GroupInfo['SearchFlood'] = 30; }
-$GroupInfo['CanEditProfile']=mysql_result($gruresult,0,"CanEditProfile");
+$GroupInfo['CanEditProfile']=sql_result($gruresult,0,"CanEditProfile");
 if($GroupInfo['CanEditProfile']!="yes"&&$GroupInfo['CanEditProfile']!="no") {
                $GruError = true; }
-$GroupInfo['CanAddEvents']=mysql_result($gruresult,0,"CanAddEvents");
+$GroupInfo['CanAddEvents']=sql_result($gruresult,0,"CanAddEvents");
 if($GroupInfo['CanAddEvents']!="yes"&&$GroupInfo['CanAddEvents']!="no") {
                $GruError = true; }
-$GroupInfo['CanPM']=mysql_result($gruresult,0,"CanPM");
+$GroupInfo['CanPM']=sql_result($gruresult,0,"CanPM");
 if($GroupInfo['CanPM']!="yes"&&$GroupInfo['CanPM']!="no") {
                $GruError = true; }
-$GroupInfo['CanSearch']=mysql_result($gruresult,0,"CanSearch");
+$GroupInfo['CanSearch']=sql_result($gruresult,0,"CanSearch");
 if($GroupInfo['CanSearch']!="yes"&&$GroupInfo['CanSearch']!="no") {
                $GruError = true; }
-$GroupInfo['PromoteTo']=mysql_result($gruresult,0,"PromoteTo");
-$GroupInfo['PromotePosts']=mysql_result($gruresult,0,"PromotePosts");
+$GroupInfo['PromoteTo']=sql_result($gruresult,0,"PromoteTo");
+$GroupInfo['PromotePosts']=sql_result($gruresult,0,"PromotePosts");
 if(!is_numeric($GroupInfo['PromotePosts'])) { 
        $GroupInfo['PromotePosts'] = 0; $GroupInfo['PromoteTo'] = 0; }
-$GroupInfo['PromoteKarma']=mysql_result($gruresult,0,"PromoteKarma");
+$GroupInfo['PromoteKarma']=sql_result($gruresult,0,"PromoteKarma");
 if(!is_numeric($GroupInfo['PromoteKarma'])) { 
        $GroupInfo['PromoteKarma'] = 0; $GroupInfo['PromoteTo'] = 0; }
 if(!isset($Settings['KarmaBoostDays'])) {
@@ -188,140 +188,140 @@ if($MyKarmaUpdate<$NewKarmaUpdate&&$MyPostCountChk>0) {
        $MyKarmaCount = $MyKarmaCount + $BoostTotal; }
        if($BoostTotal==null) {
        $MyKarmaCount = $MyKarmaCount + 1; }
-       $querykarmaup = query("UPDATE `".$Settings['sqltable']."members` SET `Karma`=%i,`KarmaUpdate`=%i WHERE `id`=%i", array($MyKarmaCount,$NewKarmaUpdate,$_SESSION['UserID']));
-       exec_query($querykarmaup); }
+       $querykarmaup = sql_pre_query("UPDATE `".$Settings['sqltable']."members` SET `Karma`=%i,`KarmaUpdate`=%i WHERE `id`=%i", array($MyKarmaCount,$NewKarmaUpdate,$_SESSION['UserID']));
+       sql_query($querykarmaup); }
 if($GroupInfo['PromoteTo']!=0&&$MyPostCountChk>=$GroupInfo['PromotePosts']) {
-       $sql_group_check = exec_query(query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($GroupInfo['PromoteTo'])));
-       $group_check = mysql_num_rows($sql_group_check);
-       mysql_free_result($sql_group_check);
+       $sql_group_check = sql_query(sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($GroupInfo['PromoteTo'])));
+       $group_check = sql_num_rows($sql_group_check);
+       sql_free_result($sql_group_check);
        if($group_check > 0) {
-       $queryupgrade = query("UPDATE `".$Settings['sqltable']."members` SET `GroupID`=%i WHERE `id`=%i", array($GroupInfo['PromoteTo'],$_SESSION['UserID']));
-       exec_query($queryupgrade); } }
+       $queryupgrade = sql_pre_query("UPDATE `".$Settings['sqltable']."members` SET `GroupID`=%i WHERE `id`=%i", array($GroupInfo['PromoteTo'],$_SESSION['UserID']));
+       sql_query($queryupgrade); } }
 if($GroupInfo['PromotePosts']==0&&$GroupInfo['PromoteTo']!=0&&$MyKarmaCount>=$GroupInfo['PromoteKarma']) {
-       $sql_group_check = exec_query(query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($GroupInfo['PromoteTo'])));
-       $group_check = mysql_num_rows($sql_group_check);
-       mysql_free_result($sql_group_check);
+       $sql_group_check = sql_query(sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($GroupInfo['PromoteTo'])));
+       $group_check = sql_num_rows($sql_group_check);
+       sql_free_result($sql_group_check);
        if($group_check > 0) {
-       $queryupgrade = query("UPDATE `".$Settings['sqltable']."members` SET `GroupID`=%i WHERE `id`=%i", array($GroupInfo['PromoteTo'],$_SESSION['UserID']));
-       exec_query($queryupgrade); } } }
-$GroupInfo['HasModCP']=mysql_result($gruresult,0,"HasModCP");
+       $queryupgrade = sql_pre_query("UPDATE `".$Settings['sqltable']."members` SET `GroupID`=%i WHERE `id`=%i", array($GroupInfo['PromoteTo'],$_SESSION['UserID']));
+       sql_query($queryupgrade); } } }
+$GroupInfo['HasModCP']=sql_result($gruresult,0,"HasModCP");
 if($GroupInfo['HasModCP']!="yes"&&$GroupInfo['HasModCP']!="no") {
        $GroupInfo['HasModCP'] = "no"; }
-$GroupInfo['HasAdminCP']=mysql_result($gruresult,0,"HasAdminCP");
+$GroupInfo['HasAdminCP']=sql_result($gruresult,0,"HasAdminCP");
 if($GroupInfo['HasAdminCP']!="yes"&&$GroupInfo['HasAdminCP']!="no") {
        $GroupInfo['HasAdminCP'] = "no"; }
-$GroupInfo['ViewDBInfo']=mysql_result($gruresult,0,"ViewDBInfo"); 
+$GroupInfo['ViewDBInfo']=sql_result($gruresult,0,"ViewDBInfo"); 
 if($GroupInfo['ViewDBInfo']!="yes"&&$GroupInfo['ViewDBInfo']!="no") {
        $GroupInfo['ViewDBInfo'] = "no"; }
 if($GruError==true) {
-header("Content-Type: text/plain; charset=".$Settings['charset']); mysql_free_result($gruresult);
+header("Content-Type: text/plain; charset=".$Settings['charset']); sql_free_result($gruresult);
 ob_clean(); echo "Sorry could not load all group data in database.\nContact the board admin about error."; 
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); } }
-mysql_free_result($gruresult);
+sql_free_result($gruresult);
 if($GroupInfo['CanViewBoard']=="no") { 
 header("Content-Type: text/plain; charset=".$Settings['charset']); 
 ob_clean(); echo "Sorry you can not view the board."; 
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 // Member Group Permissions Setup
-$perquery = query("SELECT * FROM `".$Settings['sqltable']."permissions` WHERE `PermissionID`=%i ORDER BY `ForumID` ASC", array($GroupInfo['PermissionID']));
-$peresult=exec_query($perquery);
-$pernum=mysql_num_rows($peresult);
+$perquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."permissions` WHERE `PermissionID`=%i ORDER BY `ForumID` ASC", array($GroupInfo['PermissionID']));
+$peresult=sql_query($perquery);
+$pernum=sql_num_rows($peresult);
 $peri=0; $PerError = null;
-if($pernum<=0) { $PerError = true; mysql_free_result($peresult);
+if($pernum<=0) { $PerError = true; sql_free_result($peresult);
 header("Content-Type: text/plain; charset=".$Settings['charset']); 
 ob_clean(); echo "Sorry could not find permission data in database.\nContact the board admin about error."; 
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($pernum>=1) { while ($peri < $pernum) {
-$PerForumID=mysql_result($peresult,$peri,"ForumID");
+$PerForumID=sql_result($peresult,$peri,"ForumID");
 if(!is_numeric($PerForumID)) { $PerError = true; }
-$PermissionInfo['ID'][$PerForumID]=mysql_result($peresult,$peri,"ID");
+$PermissionInfo['ID'][$PerForumID]=sql_result($peresult,$peri,"ID");
 if(!is_numeric($PermissionInfo['ID'][$PerForumID])) { $PerError = true; }
-$PermissionInfo['PermissionID'][$PerForumID]=mysql_result($peresult,$peri,"PermissionID");
+$PermissionInfo['PermissionID'][$PerForumID]=sql_result($peresult,$peri,"PermissionID");
 if(!is_numeric($PermissionInfo['PermissionID'][$PerForumID])) { $PerError = true; }
-$PermissionInfo['Name'][$PerForumID]=mysql_result($peresult,$peri,"Name");
-$PermissionInfo['ForumID'][$PerForumID]=mysql_result($peresult,$peri,"ForumID");
+$PermissionInfo['Name'][$PerForumID]=sql_result($peresult,$peri,"Name");
+$PermissionInfo['ForumID'][$PerForumID]=sql_result($peresult,$peri,"ForumID");
 if(!is_numeric($PermissionInfo['ForumID'][$PerForumID])) { $PerError = true; }
-$PermissionInfo['CanViewForum'][$PerForumID]=mysql_result($peresult,$peri,"CanViewForum");
+$PermissionInfo['CanViewForum'][$PerForumID]=sql_result($peresult,$peri,"CanViewForum");
 if($PermissionInfo['CanViewForum'][$PerForumID]!="yes"&&$PermissionInfo['CanViewForum'][$PerForumID]!="no") {
                $PerError = true; }
-$PermissionInfo['CanMakeTopics'][$PerForumID]=mysql_result($peresult,$peri,"CanMakeTopics");
+$PermissionInfo['CanMakeTopics'][$PerForumID]=sql_result($peresult,$peri,"CanMakeTopics");
 if($PermissionInfo['CanMakeTopics'][$PerForumID]!="yes"&&$PermissionInfo['CanMakeTopics'][$PerForumID]!="no") {
                $PerError = true; }
-$PermissionInfo['CanMakeReplys'][$PerForumID]=mysql_result($peresult,$peri,"CanMakeReplys");
+$PermissionInfo['CanMakeReplys'][$PerForumID]=sql_result($peresult,$peri,"CanMakeReplys");
 if($PermissionInfo['CanMakeReplys'][$PerForumID]!="yes"&&$PermissionInfo['CanMakeReplys'][$PerForumID]!="no") {
                $PerError = true; }
-$PermissionInfo['CanMakeReplysClose'][$PerForumID]=mysql_result($peresult,$peri,"CanMakeReplysCT");
+$PermissionInfo['CanMakeReplysClose'][$PerForumID]=sql_result($peresult,$peri,"CanMakeReplysCT");
 if($PermissionInfo['CanMakeReplysClose'][$PerForumID]!="yes"&&$PermissionInfo['CanMakeReplysClose'][$PerForumID]!="no") {
                $PerError = true; }
-$PermissionInfo['CanEditTopics'][$PerForumID]=mysql_result($peresult,$peri,"CanEditTopics");
+$PermissionInfo['CanEditTopics'][$PerForumID]=sql_result($peresult,$peri,"CanEditTopics");
 if($PermissionInfo['CanEditTopics'][$PerForumID]!="yes"&&$PermissionInfo['CanEditTopics'][$PerForumID]!="no") {
        $PermissionInfo['CanEditTopics'][$PerForumID] = "no"; }
-$PermissionInfo['CanEditTopicsClose'][$PerForumID]=mysql_result($peresult,$peri,"CanEditTopicsCT");
+$PermissionInfo['CanEditTopicsClose'][$PerForumID]=sql_result($peresult,$peri,"CanEditTopicsCT");
 if($PermissionInfo['CanEditTopicsClose'][$PerForumID]!="yes"&&$PermissionInfo['CanEditTopicsClose'][$PerForumID]!="no") {
        $PermissionInfo['CanEditTopicsClose'][$PerForumID] = "no"; }
-$PermissionInfo['CanEditReplys'][$PerForumID]=mysql_result($peresult,$peri,"CanEditReplys");
+$PermissionInfo['CanEditReplys'][$PerForumID]=sql_result($peresult,$peri,"CanEditReplys");
 if($PermissionInfo['CanEditReplys'][$PerForumID]!="yes"&&$PermissionInfo['CanEditReplys'][$PerForumID]!="no") {
        $PermissionInfo['CanEditReplys'][$PerForumID] = "no"; }
-$PermissionInfo['CanEditReplysClose'][$PerForumID]=mysql_result($peresult,$peri,"CanEditReplysCT");
+$PermissionInfo['CanEditReplysClose'][$PerForumID]=sql_result($peresult,$peri,"CanEditReplysCT");
 if($PermissionInfo['CanEditReplysClose'][$PerForumID]!="yes"&&$PermissionInfo['CanEditReplysClose'][$PerForumID]!="no") {
        $PermissionInfo['CanEditReplysClose'][$PerForumID] = "no"; }
-$PermissionInfo['CanDeleteTopics'][$PerForumID]=mysql_result($peresult,$peri,"CanDeleteTopics");
+$PermissionInfo['CanDeleteTopics'][$PerForumID]=sql_result($peresult,$peri,"CanDeleteTopics");
 if($PermissionInfo['CanDeleteTopics'][$PerForumID]!="yes"&&$PermissionInfo['CanDeleteTopics'][$PerForumID]!="no") {
        $PermissionInfo['CanDeleteTopics'][$PerForumID] = "no"; }
-$PermissionInfo['CanDeleteTopicsClose'][$PerForumID]=mysql_result($peresult,$peri,"CanDeleteTopicsCT");
+$PermissionInfo['CanDeleteTopicsClose'][$PerForumID]=sql_result($peresult,$peri,"CanDeleteTopicsCT");
 if($PermissionInfo['CanDeleteTopicsClose'][$PerForumID]!="yes"&&$PermissionInfo['CanDeleteTopicsClose'][$PerForumID]!="no") {
        $PermissionInfo['CanDeleteTopicsClose'][$PerForumID] = "no"; }
-$PermissionInfo['CanDeleteReplys'][$PerForumID]=mysql_result($peresult,$peri,"CanDeleteReplys");
+$PermissionInfo['CanDeleteReplys'][$PerForumID]=sql_result($peresult,$peri,"CanDeleteReplys");
 if($PermissionInfo['CanDeleteReplys'][$PerForumID]!="yes"&&$PermissionInfo['CanDeleteReplys'][$PerForumID]!="no") {
        $PermissionInfo['CanDeleteReplys'][$PerForumID] = "no"; }
-$PermissionInfo['CanDeleteReplysClose'][$PerForumID]=mysql_result($peresult,$peri,"CanDeleteReplysCT");
+$PermissionInfo['CanDeleteReplysClose'][$PerForumID]=sql_result($peresult,$peri,"CanDeleteReplysCT");
 if($PermissionInfo['CanDeleteReplysClose'][$PerForumID]!="yes"&&$PermissionInfo['CanDeleteReplysClose'][$PerForumID]!="no") {
        $PermissionInfo['CanDeleteReplysClose'][$PerForumID] = "no"; }
-$PermissionInfo['CanCloseTopics'][$PerForumID]=mysql_result($peresult,$peri,"CanCloseTopics");
+$PermissionInfo['CanCloseTopics'][$PerForumID]=sql_result($peresult,$peri,"CanCloseTopics");
 if($PermissionInfo['CanCloseTopics'][$PerForumID]!="yes"&&$PermissionInfo['CanCloseTopics'][$PerForumID]!="no") {
        $PermissionInfo['CanCloseTopics'][$PerForumID] = "no"; }
-$PermissionInfo['CanPinTopics'][$PerForumID]=mysql_result($peresult,$peri,"CanPinTopics");
+$PermissionInfo['CanPinTopics'][$PerForumID]=sql_result($peresult,$peri,"CanPinTopics");
 if($PermissionInfo['CanPinTopics'][$PerForumID]!="yes"&&$PermissionInfo['CanPinTopics'][$PerForumID]!="no") {
        $PermissionInfo['CanPinTopics'][$PerForumID] = "no"; }
-$PermissionInfo['CanDohtml'][$PerForumID]=mysql_result($peresult,$peri,"CanDohtml");
+$PermissionInfo['CanDohtml'][$PerForumID]=sql_result($peresult,$peri,"CanDohtml");
 if($PermissionInfo['CanDohtml'][$PerForumID]!="yes"&&$PermissionInfo['CanDohtml'][$PerForumID]!="no") {
        $PermissionInfo['CanDohtml'][$PerForumID] = "no"; }
-$PermissionInfo['CanUseBBags'][$PerForumID]=mysql_result($peresult,$peri,"CanUseBBags");
+$PermissionInfo['CanUseBBags'][$PerForumID]=sql_result($peresult,$peri,"CanUseBBags");
 if($PermissionInfo['CanUseBBags'][$PerForumID]!="yes"&&$PermissionInfo['CanUseBBags'][$PerForumID]!="no") {
        $PermissionInfo['CanUseBBags'][$PerForumID] = "no"; }
-$PermissionInfo['CanModForum'][$PerForumID]=mysql_result($peresult,$peri,"CanModForum");
+$PermissionInfo['CanModForum'][$PerForumID]=sql_result($peresult,$peri,"CanModForum");
 if($PermissionInfo['CanModForum'][$PerForumID]!="yes"&&$PermissionInfo['CanModForum'][$PerForumID]!="no") {
        $PermissionInfo['CanModForum'][$PerForumID] = "no"; }
 if($PerError===true) { $peri = $pernum; }
 ++$peri; } if($PerError===true) {
-header("Content-Type: text/plain; charset=".$Settings['charset']); mysql_free_result($peresult);
+header("Content-Type: text/plain; charset=".$Settings['charset']); sql_free_result($peresult);
 ob_clean(); echo "Sorry could not load all permission data in database.\nContact the board admin about error."; 
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); } }
-mysql_free_result($peresult);
-$per2query = query("SELECT * FROM `".$Settings['sqltable']."catpermissions` WHERE `PermissionID`=%i ORDER BY `CategoryID` ASC", array($GroupInfo['PermissionID']));
-$per2esult=exec_query($per2query);
-$per2num=mysql_num_rows($per2esult);
+sql_free_result($peresult);
+$per2query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."catpermissions` WHERE `PermissionID`=%i ORDER BY `CategoryID` ASC", array($GroupInfo['PermissionID']));
+$per2esult=sql_query($per2query);
+$per2num=sql_num_rows($per2esult);
 $per2i=0; $Per2Error = null;
-if($per2num<=0) { $Per2Error = true; mysql_free_result($per2esult);
+if($per2num<=0) { $Per2Error = true; sql_free_result($per2esult);
 header("Content-Type: text/plain; charset=".$Settings['charset']); 
 ob_clean(); echo "Sorry could not find permission data in database.\nContact the board admin about error."; 
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($per2num>=1) { while ($per2i < $per2num) {
-$PerCatID=mysql_result($per2esult,$per2i,"CategoryID");
+$PerCatID=sql_result($per2esult,$per2i,"CategoryID");
 if(!is_numeric($PerCatID)) { $Per2Error = true; }
-$CatPermissionInfo['ID'][$PerCatID]=mysql_result($per2esult,$per2i,"id");
+$CatPermissionInfo['ID'][$PerCatID]=sql_result($per2esult,$per2i,"id");
 if(!is_numeric($CatPermissionInfo['ID'][$PerCatID])) { $Per2Error = true; }
-$CatPermissionInfo['PermissionID'][$PerCatID]=mysql_result($per2esult,$per2i,"PermissionID");
+$CatPermissionInfo['PermissionID'][$PerCatID]=sql_result($per2esult,$per2i,"PermissionID");
 if(!is_numeric($CatPermissionInfo['PermissionID'][$PerCatID])) { $Per2Error = true; }
-$CatPermissionInfo['Name'][$PerCatID]=mysql_result($per2esult,$per2i,"Name");
-$CatPermissionInfo['CategoryID'][$PerCatID]=mysql_result($per2esult,$per2i,"CategoryID");
+$CatPermissionInfo['Name'][$PerCatID]=sql_result($per2esult,$per2i,"Name");
+$CatPermissionInfo['CategoryID'][$PerCatID]=sql_result($per2esult,$per2i,"CategoryID");
 if(!is_numeric($CatPermissionInfo['CategoryID'][$PerCatID])) { $Per2Error = true; }
-$CatPermissionInfo['CanViewCategory'][$PerCatID]=mysql_result($per2esult,$per2i,"CanViewCategory");
+$CatPermissionInfo['CanViewCategory'][$PerCatID]=sql_result($per2esult,$per2i,"CanViewCategory");
 if($CatPermissionInfo['CanViewCategory'][$PerCatID]!="yes"&&$CatPermissionInfo['CanViewCategory'][$PerCatID]!="no") { $Per2Error = true; }
 if($Per2Error===true) { $per2i = $per2num; }
 ++$per2i; } if($Per2Error===true) {
-header("Content-Type: text/plain; charset=".$Settings['charset']); mysql_free_result($per2esult);
+header("Content-Type: text/plain; charset=".$Settings['charset']); sql_free_result($per2esult);
 ob_clean(); echo "Sorry could not load all permission data in database.\nContact the board admin about error."; 
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); } }
-mysql_free_result($per2esult);
+sql_free_result($per2esult);
 ?>
\ No newline at end of file

diff --git a/inc/lowcategories.php b/inc/lowcategories.php
index e89be1a..ade3db3 100644 (file)
--- a/inc/lowcategories.php
+++ b/inc/lowcategories.php
@@ -11,30 +11,30 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: lowcategories.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: lowcategories.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="lowcategories.php"||$File3Name=="/lowcategories.php") {
        require('index.php');
        exit(); }
 if(!is_numeric($_GET['id'])) { $_GET['id'] = null; }
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($_GET['id']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
-if($prenum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); mysql_free_result($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($_GET['id']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
+if($prenum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); sql_free_result($preresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($prenum>=1) {
-$CategoryID=mysql_result($preresult,0,"id");
-$CategoryName=mysql_result($preresult,0,"Name");
-$CategoryShow=mysql_result($preresult,0,"ShowCategory");
-$CategoryType=mysql_result($preresult,0,"CategoryType");
-$InSubCategory=mysql_result($preresult,0,"InSubCategory");
-$SubShowForums=mysql_result($preresult,0,"SubShowForums");
-$CategoryDescription=mysql_result($preresult,0,"Description");
+$CategoryID=sql_result($preresult,0,"id");
+$CategoryName=sql_result($preresult,0,"Name");
+$CategoryShow=sql_result($preresult,0,"ShowCategory");
+$CategoryType=sql_result($preresult,0,"CategoryType");
+$InSubCategory=sql_result($preresult,0,"InSubCategory");
+$SubShowForums=sql_result($preresult,0,"SubShowForums");
+$CategoryDescription=sql_result($preresult,0,"Description");
 $CategoryType = strtolower($CategoryType); $SubShowForums = strtolower($SubShowForums);
-$CategoryPostCountView=mysql_result($preresult,0,"PostCountView");
-$CategoryKarmaCountView=mysql_result($preresult,0,"KarmaCountView");
+$CategoryPostCountView=sql_result($preresult,0,"PostCountView");
+$CategoryKarmaCountView=sql_result($preresult,0,"KarmaCountView");
 if($MyPostCountChk==null) { $MyPostCountChk = 0; }
 if($MyKarmaCount==null) { $MyKarmaCount = 0; }
 if($GroupInfo['HasAdminCP']!="yes"||$GroupInfo['HasModCP']!="yes") {
@@ -60,17 +60,17 @@ $_SESSION['ViewingFile'] = $exfile[$CategoryType]; }
 $_SESSION['PreViewingTitle'] = "Viewing Category:";
 $_SESSION['ViewingTitle'] = $CategoryName;
 if($InSubCategory!="0") {
-$iscquery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($InSubCategory));
-$iscresult=exec_query($iscquery);
-$iscnum=mysql_num_rows($iscresult);
+$iscquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($InSubCategory));
+$iscresult=sql_query($iscquery);
+$iscnum=sql_num_rows($iscresult);
 if($iscnum>=1) {
-$iscCategoryID=mysql_result($iscresult,0,"id");
-$iscCategoryName=mysql_result($iscresult,0,"Name");
-$iscCategoryShow=mysql_result($iscresult,0,"ShowCategory");
-$iscCategoryType=mysql_result($iscresult,0,"CategoryType");
+$iscCategoryID=sql_result($iscresult,0,"id");
+$iscCategoryName=sql_result($iscresult,0,"Name");
+$iscCategoryShow=sql_result($iscresult,0,"ShowCategory");
+$iscCategoryType=sql_result($iscresult,0,"CategoryType");
 $iscCategoryType = strtolower($iscCategoryType); }
 if($iscnum<1) { $InSubCategory = "0"; } 
-mysql_free_result($iscresult); }
+sql_free_result($iscresult); }
 ?>
 <div style="font-size: 1.0em; font-weight: bold; margin-bottom: 10px; padding-top: 3px; width: auto;">Full Version: <a href="<?php echo url_maker($exfile[$CategoryType],$Settings['file_ext'],"act=view&id=".$CategoryID,$Settings['qstr'],$Settings['qsep'],$prexqstr[$CategoryType],$exqstr[$CategoryType]); ?>"><?php echo $CategoryName; ?></a></div>
 <div style="font-size: 11px; font-weight: bold; padding: 10px; border: 1px solid gray;"><a href="<?php echo url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']); ?>">Board index</a><?php if($InSubCategory!="0") { echo $ThemeSet['NavLinkDivider']; ?><a href="<?php echo url_maker($exfile[$iscCategoryType],$Settings['file_ext'],"act=view&id=".$iscCategoryID."&page=1",$Settings['qstr'],$Settings['qsep'],$prexqstr[$iscCategoryType],$exqstr[$iscCategoryType]); ?>"><?php echo $iscCategoryName; ?></a><?php } echo $ThemeSet['NavLinkDivider']; ?><a href="<?php echo url_maker($exfile[$CategoryType],$Settings['file_ext'],"act=lowview&id=".$CategoryID,$Settings['qstr'],$Settings['qsep'],$prexqstr[$CategoryType],$exqstr[$CategoryType]); ?>"><?php echo $CategoryName; ?></a></div>
@@ -82,40 +82,40 @@ if($CategoryType=="subcategory") {
 redirect("location",$basedir.url_maker($exfile['subcategory'],$Settings['file_ext'],"act=".$_GET['act']."&id=".$_GET['id'],$Settings['qstr'],$Settings['qsep'],$prexqstr['subcategory'],$exqstr['subcategory'],FALSE));
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); } }
-$query = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `CategoryID`=%i AND `InSubForum`=0 ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `CategoryID`=%i AND `InSubForum`=0 ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
 if($num>=1) {
 ?>
 <li style="font-weight: bold;"><a href="<?php echo url_maker($exfile[$CategoryType],$Settings['file_ext'],"act=lowview&id=".$CategoryID,$Settings['qstr'],$Settings['qsep'],$prexqstr[$CategoryType],$exqstr[$CategoryType]); ?>"><?php echo $CategoryName; ?></a></li><li>
 <?php }
 while ($i < $num) {
-$ForumID=mysql_result($result,$i,"id");
-$ForumName=mysql_result($result,$i,"Name");
-$ForumShow=mysql_result($result,$i,"ShowForum");
-$ForumType=mysql_result($result,$i,"ForumType");
-$ForumShowTopics=mysql_result($result,$i,"CanHaveTopics");
+$ForumID=sql_result($result,$i,"id");
+$ForumName=sql_result($result,$i,"Name");
+$ForumShow=sql_result($result,$i,"ShowForum");
+$ForumType=sql_result($result,$i,"ForumType");
+$ForumShowTopics=sql_result($result,$i,"CanHaveTopics");
 $ForumShowTopics = strtolower($ForumShowTopics);
-$NumTopics=mysql_result($result,$i,"NumTopics");
-$NumPosts=mysql_result($result,$i,"NumPosts");
-$NumRedirects=mysql_result($result,$i,"Redirects");
-$ForumDescription=mysql_result($result,$i,"Description");
+$NumTopics=sql_result($result,$i,"NumTopics");
+$NumPosts=sql_result($result,$i,"NumPosts");
+$NumRedirects=sql_result($result,$i,"Redirects");
+$ForumDescription=sql_result($result,$i,"Description");
 $ForumType = strtolower($ForumType); $sflist = null;
 $gltf = array(null); $gltf[0] = $ForumID;
 if ($ForumType=="subforum") { 
-$apcquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
-$apcresult=exec_query($apcquery);
-$apcnum=mysql_num_rows($apcresult);
+$apcquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
+$apcresult=sql_query($apcquery);
+$apcnum=sql_num_rows($apcresult);
 $apci=0; $apcl=1; if($apcnum>=1) {
 while ($apci < $apcnum) {
-$NumsTopics=mysql_result($apcresult,$apci,"NumTopics");
+$NumsTopics=sql_result($apcresult,$apci,"NumTopics");
 $NumTopics = $NumsTopics + $NumTopics;
-$NumsPosts=mysql_result($apcresult,$apci,"NumPosts");
+$NumsPosts=sql_result($apcresult,$apci,"NumPosts");
 $NumPosts = $NumsPosts + $NumPosts;
-$SubsForumID=mysql_result($apcresult,$apci,"id");
-$SubsForumName=mysql_result($apcresult,$apci,"Name");
-$SubsForumType=mysql_result($apcresult,$apci,"ForumType");
+$SubsForumID=sql_result($apcresult,$apci,"id");
+$SubsForumName=sql_result($apcresult,$apci,"Name");
+$SubsForumType=sql_result($apcresult,$apci,"ForumType");
 if(isset($PermissionInfo['CanViewForum'][$SubsForumID])&&
        $PermissionInfo['CanViewForum'][$SubsForumID]=="yes") {
 $shownum = null;
@@ -130,7 +130,7 @@ if($apcl>1) {
 $sflist = $sflist." ".$sfurl; }
 $gltf[$apcl] = $SubsForumID; ++$apcl; }
 ++$apci; }
-mysql_free_result($apcresult); } }
+sql_free_result($apcresult); } }
 if(isset($PermissionInfo['CanViewForum'][$ForumID])&&
        $PermissionInfo['CanViewForum'][$ForumID]=="yes") {
 $LastTopic = "&nbsp;<br />&nbsp;<br />&nbsp;";
@@ -148,9 +148,9 @@ $ExStr = ""; if ($ForumType!="redirect"&&
 <ul style="list-style-type: none;"><li>
 <a href="<?php echo url_maker($exfile[$ForumType],$Settings['file_ext'],"act=lowview&id=".$ForumID.$ExStr,$Settings['qstr'],$Settings['qsep'],$prexqstr[$ForumType],$exqstr[$ForumType]); ?>"<?php if($ForumType=="redirect") { echo " onclick=\"window.open(this.href);return false;\""; } ?>><?php echo $ForumName; ?></a> <span style="color: gray; font-size: 10px;"><?php echo $shownum; ?></span></li>
 <?php echo $sflist; ?></ul>
-<?php } ++$i; } mysql_free_result($result);
+<?php } ++$i; } sql_free_result($result);
 if($num>=1) { ?>
 </li></ul></div>
 <div>&nbsp;</div>
 <?php } } }
-mysql_free_result($preresult); ?>
+sql_free_result($preresult); ?>

diff --git a/inc/lowforums.php b/inc/lowforums.php
index 8bc7cdc..31ffda6 100644 (file)
--- a/inc/lowforums.php
+++ b/inc/lowforums.php
@@ -11,15 +11,15 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: lowforums.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: lowforums.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="lowforums.php"||$File3Name=="/lowforums.php") {
        require('index.php');
        exit(); }
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `ShowCategory`='yes' AND `InSubCategory`=0 ORDER BY `OrderID` ASC, `id` ASC", array());
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `ShowCategory`='yes' AND `InSubCategory`=0 ORDER BY `OrderID` ASC, `id` ASC", array());
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
 $prei=0;
 $_SESSION['ViewingPage'] = url_maker(null,"no+ext","act=lowview","&","=",$prexqstr['index'],$exqstr['index']);
 if($Settings['file_ext']!="no+ext"&&$Settings['file_ext']!="no ext") {
@@ -36,15 +36,15 @@ $_SESSION['ViewingTitle'] = "Board index";
 <ul style="list-style-type: none;">
 <?php
 while ($prei < $prenum) {
-$CategoryID=mysql_result($preresult,$prei,"id");
-$CategoryName=mysql_result($preresult,$prei,"Name");
-$CategoryShow=mysql_result($preresult,$prei,"ShowCategory");
-$CategoryType=mysql_result($preresult,$prei,"CategoryType");
-$SubShowForums=mysql_result($preresult,$prei,"SubShowForums");
-$CategoryDescription=mysql_result($preresult,$prei,"Description");
+$CategoryID=sql_result($preresult,$prei,"id");
+$CategoryName=sql_result($preresult,$prei,"Name");
+$CategoryShow=sql_result($preresult,$prei,"ShowCategory");
+$CategoryType=sql_result($preresult,$prei,"CategoryType");
+$SubShowForums=sql_result($preresult,$prei,"SubShowForums");
+$CategoryDescription=sql_result($preresult,$prei,"Description");
 $CategoryType = strtolower($CategoryType); $SubShowForums = strtolower($SubShowForums);
-$CategoryPostCountView=mysql_result($preresult,0,"PostCountView");
-$CategoryKarmaCountView=mysql_result($preresult,0,"KarmaCountView");
+$CategoryPostCountView=sql_result($preresult,0,"PostCountView");
+$CategoryKarmaCountView=sql_result($preresult,0,"KarmaCountView");
 if($MyPostCountChk==null) { $MyPostCountChk = 0; }
 if($MyKarmaCount==null) { $MyKarmaCount = 0; }
 if($GroupInfo['HasAdminCP']!="yes"||$GroupInfo['HasModCP']!="yes") {
@@ -54,40 +54,40 @@ if($CategoryKarmaCountView!=0&&$MyKarmaCount<$CategoryKarmaCountView) {
 redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); } }
 if(isset($CatPermissionInfo['CanViewCategory'][$CategoryID])&&
        $CatPermissionInfo['CanViewCategory'][$CategoryID]=="yes") {
-$query = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `CategoryID`=%i AND `InSubForum`=0 ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `CategoryID`=%i AND `InSubForum`=0 ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
 if($num>=1) {
 ?>
 <li style="font-weight: bold;"><a href="<?php echo url_maker($exfile[$CategoryType],$Settings['file_ext'],"act=lowview&id=".$CategoryID,$Settings['qstr'],$Settings['qsep'],$prexqstr[$CategoryType],$exqstr[$CategoryType]); ?>"><?php echo $CategoryName; ?></a></li><li>
 <?php }
 while ($i < $num) {
-$ForumID=mysql_result($result,$i,"id");
-$ForumName=mysql_result($result,$i,"Name");
-$ForumShow=mysql_result($result,$i,"ShowForum");
-$ForumType=mysql_result($result,$i,"ForumType");
-$ForumShowTopics=mysql_result($result,$i,"CanHaveTopics");
+$ForumID=sql_result($result,$i,"id");
+$ForumName=sql_result($result,$i,"Name");
+$ForumShow=sql_result($result,$i,"ShowForum");
+$ForumType=sql_result($result,$i,"ForumType");
+$ForumShowTopics=sql_result($result,$i,"CanHaveTopics");
 $ForumShowTopics = strtolower($ForumShowTopics);
-$NumTopics=mysql_result($result,$i,"NumTopics");
-$NumPosts=mysql_result($result,$i,"NumPosts");
-$NumRedirects=mysql_result($result,$i,"Redirects");
-$ForumDescription=mysql_result($result,$i,"Description");
+$NumTopics=sql_result($result,$i,"NumTopics");
+$NumPosts=sql_result($result,$i,"NumPosts");
+$NumRedirects=sql_result($result,$i,"Redirects");
+$ForumDescription=sql_result($result,$i,"Description");
 $ForumType = strtolower($ForumType); $sflist = null;
 $gltf = array(null); $gltf[0] = $ForumID;
 if ($ForumType=="subforum") { 
-$apcquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
-$apcresult=exec_query($apcquery);
-$apcnum=mysql_num_rows($apcresult);
+$apcquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
+$apcresult=sql_query($apcquery);
+$apcnum=sql_num_rows($apcresult);
 $apci=0; $apcl=1; if($apcnum>=1) {
 while ($apci < $apcnum) {
-$NumsTopics=mysql_result($apcresult,$apci,"NumTopics");
+$NumsTopics=sql_result($apcresult,$apci,"NumTopics");
 $NumTopics = $NumsTopics + $NumTopics;
-$NumsPosts=mysql_result($apcresult,$apci,"NumPosts");
+$NumsPosts=sql_result($apcresult,$apci,"NumPosts");
 $NumPosts = $NumsPosts + $NumPosts;
-$SubsForumID=mysql_result($apcresult,$apci,"id");
-$SubsForumName=mysql_result($apcresult,$apci,"Name");
-$SubsForumType=mysql_result($apcresult,$apci,"ForumType");
+$SubsForumID=sql_result($apcresult,$apci,"id");
+$SubsForumName=sql_result($apcresult,$apci,"Name");
+$SubsForumType=sql_result($apcresult,$apci,"ForumType");
 if(isset($PermissionInfo['CanViewForum'][$SubsForumID])&&
        $PermissionInfo['CanViewForum'][$SubsForumID]=="yes") {
 $shownum = null;
@@ -103,7 +103,7 @@ if($apcl>1) {
 $sflist = $sflist." ".$sfurl; }
 $gltf[$apcl] = $SubsForumID; ++$apcl; }
 ++$apci; }
-mysql_free_result($apcresult); } }
+sql_free_result($apcresult); } }
 if(isset($PermissionInfo['CanViewForum'][$ForumID])&&
        $PermissionInfo['CanViewForum'][$ForumID]=="yes") {
 $LastTopic = "&nbsp;<br />&nbsp;<br />&nbsp;";
@@ -112,15 +112,15 @@ $gltnum = count($gltf); $glti = 0;
 $OldUpdateTime = 0; $UseThisFonum = null;
 if ($ForumType=="subforum") { 
 while ($glti < $gltnum) {
-$gltfoquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($gltf[$glti]));
-$gltforesult=exec_query($gltfoquery);
-$gltfonum=mysql_num_rows($gltforesult);
+$gltfoquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($gltf[$glti]));
+$gltforesult=sql_query($gltfoquery);
+$gltfonum=sql_num_rows($gltforesult);
 if($gltfonum>0) {
-$NewUpdateTime=mysql_result($gltforesult,0,"LastUpdate");
+$NewUpdateTime=sql_result($gltforesult,0,"LastUpdate");
 if($NewUpdateTime>$OldUpdateTime) { 
        $UseThisFonum = $gltf[$glti]; 
 $OldUpdateTime = $NewUpdateTime; } }
-mysql_free_result($gltforesult);
+sql_free_result($gltforesult);
 ++$glti; } }
 $shownum = null;
 if ($ForumType=="redirect") { $shownum = "(".$NumRedirects." redirects)"; }
@@ -135,12 +135,12 @@ $ExStr = ""; if ($ForumType!="redirect"&&
 <ul style="list-style-type: none;"><li>
 <a href="<?php echo url_maker($exfile[$ForumType],$Settings['file_ext'],"act=lowview&id=".$ForumID.$ExStr,$Settings['qstr'],$Settings['qsep'],$prexqstr[$ForumType],$exqstr[$ForumType]); ?>"<?php if($ForumType=="redirect") { echo " onclick=\"window.open(this.href);return false;\""; } ?>><?php echo $ForumName; ?></a> <span style="color: gray; font-size: 10px;"><?php echo $shownum; ?></span></li>
 <?php echo $sflist; ?></ul>
-<?php } ++$i; } mysql_free_result($result);
+<?php } ++$i; } sql_free_result($result);
 if($num>=1) {
 ?>
 <?php } } 
 ?></li><?php
 ++$prei; }
-mysql_free_result($preresult); ?>
+sql_free_result($preresult); ?>
 </ul></div>
 <div>&nbsp;</div>

diff --git a/inc/lowreplies.php b/inc/lowreplies.php
index 3dd3827..aee2a76 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: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: replies.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="replies.php"||$File3Name=="/replies.php") {
@@ -25,36 +25,36 @@ if(!isset($_GET['modact'])) { $_GET['modact'] = null; }
 if($_GET['modact']=="pin"||$_GET['modact']=="unpin"||$_GET['modact']=="open"||
        $_GET['modact']=="close"||$_GET['modact']=="edit"||$_GET['modact']=="delete")
                { $_GET['act'] = $_GET['modact']; }
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `id`=%i LIMIT 1", array($_GET['id']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
-if($prenum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); mysql_free_result($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `id`=%i LIMIT 1", array($_GET['id']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
+if($prenum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); sql_free_result($preresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($prenum>=1) {
-$TopicName=mysql_result($preresult,0,"TopicName");
-$TopicID=mysql_result($preresult,0,"id");
-$TopicForumID=mysql_result($preresult,0,"ForumID");
-$TopicCatID=mysql_result($preresult,0,"CategoryID");
-$TopicClosed=mysql_result($preresult,0,"Closed");
-$NumberReplies=mysql_result($preresult,0,"NumReply");
-$ViewTimes=mysql_result($preresult,0,"NumViews");
-mysql_free_result($preresult);
-$forumcheckx = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i  LIMIT 1", array($TopicForumID));
-$fmckresult=exec_query($forumcheckx);
-$ForumName=mysql_result($fmckresult,0,"Name");
-$ForumType=mysql_result($fmckresult,0,"ForumType");
-$CanHaveTopics=mysql_result($fmckresult,0,"CanHaveTopics");
-$ForumPostCountView=mysql_result($fmckresult,0,"PostCountView");
-$ForumKarmaCountView=mysql_result($fmckresult,0,"KarmaCountView");
-mysql_free_result($fmckresult);
-$catcheck = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i  LIMIT 1", array($TopicCatID));
-$catresult=exec_query($catcheck);
-$CategoryName=mysql_result($catresult,0,"Name");
-$CategoryType=mysql_result($catresult,0,"CategoryType");
-$CategoryPostCountView=mysql_result($catresult,0,"PostCountView");
-$CategoryKarmaCountView=mysql_result($catresult,0,"KarmaCountView");
-mysql_free_result($catresult);
+$TopicName=sql_result($preresult,0,"TopicName");
+$TopicID=sql_result($preresult,0,"id");
+$TopicForumID=sql_result($preresult,0,"ForumID");
+$TopicCatID=sql_result($preresult,0,"CategoryID");
+$TopicClosed=sql_result($preresult,0,"Closed");
+$NumberReplies=sql_result($preresult,0,"NumReply");
+$ViewTimes=sql_result($preresult,0,"NumViews");
+sql_free_result($preresult);
+$forumcheckx = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i  LIMIT 1", array($TopicForumID));
+$fmckresult=sql_query($forumcheckx);
+$ForumName=sql_result($fmckresult,0,"Name");
+$ForumType=sql_result($fmckresult,0,"ForumType");
+$CanHaveTopics=sql_result($fmckresult,0,"CanHaveTopics");
+$ForumPostCountView=sql_result($fmckresult,0,"PostCountView");
+$ForumKarmaCountView=sql_result($fmckresult,0,"KarmaCountView");
+sql_free_result($fmckresult);
+$catcheck = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i  LIMIT 1", array($TopicCatID));
+$catresult=sql_query($catcheck);
+$CategoryName=sql_result($catresult,0,"Name");
+$CategoryType=sql_result($catresult,0,"CategoryType");
+$CategoryPostCountView=sql_result($catresult,0,"PostCountView");
+$CategoryKarmaCountView=sql_result($catresult,0,"KarmaCountView");
+sql_free_result($catresult);
 if($GroupInfo['HasAdminCP']!="yes"||$GroupInfo['HasModCP']!="yes") {
 if($MyPostCountChk==null) { $MyPostCountChk = 0; }
 if($MyKarmaCount==null) { $MyKarmaCount = 0; }
@@ -132,17 +132,17 @@ $PageLimit = $Settings['max_posts'] * $snumber;
 if($PageLimit<0) { $PageLimit = 0; }
 //End Reply Page Code
 $i=0;
-$query = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` ASC LIMIT %i,%i", array($_GET['id'],$PageLimit,$Settings['max_posts']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` ASC LIMIT %i,%i", array($_GET['id'],$PageLimit,$Settings['max_posts']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 if($num==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$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($num!=0) { 
 if($ViewTimes==0||$ViewTimes==null) { $NewViewTimes = 1; }
 if($ViewTimes!=0&&$ViewTimes!=null) { $NewViewTimes = $ViewTimes + 1; }
-$viewsup = query("UPDATE `".$Settings['sqltable']."topics` SET `NumViews`='%s' WHERE `id`=%i", array($NewViewTimes,$_GET['id']));
-exec_query($viewsup); }
+$viewsup = sql_pre_query("UPDATE `".$Settings['sqltable']."topics` SET `NumViews`='%s' WHERE `id`=%i", array($NewViewTimes,$_GET['id']));
+sql_query($viewsup); }
 //List Page Number Code Start
 $pagenum=count($Pages);
 if($_GET['page']>$pagenum) {
@@ -213,58 +213,58 @@ if($TopicClosed==1&&$PermissionInfo['CanMakeReplysClose'][$TopicForumID]=="yes"
 <div>&nbsp;</div>
 <div style="padding: 10px; border: 1px solid gray;">
 <?php while ($i < $num) {
-$MyPostID=mysql_result($result,$i,"id");
-$MyTopicID=mysql_result($result,$i,"TopicID");
-$MyPostIP=mysql_result($result,$i,"IP");
-$MyForumID=mysql_result($result,$i,"ForumID");
-$MyCategoryID=mysql_result($result,$i,"CategoryID");
-$MyUserID=mysql_result($result,$i,"UserID");
-$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");
+$MyPostID=sql_result($result,$i,"id");
+$MyTopicID=sql_result($result,$i,"TopicID");
+$MyPostIP=sql_result($result,$i,"IP");
+$MyForumID=sql_result($result,$i,"ForumID");
+$MyCategoryID=sql_result($result,$i,"CategoryID");
+$MyUserID=sql_result($result,$i,"UserID");
+$MyGuestName=sql_result($result,$i,"GuestName");
+$MyTimeStamp=sql_result($result,$i,"TimeStamp");
+$MyEditTime=sql_result($result,$i,"LastUpdate");
+$MyEditUserID=sql_result($result,$i,"EditUser");
+$MyEditUserName=sql_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=sql_result($result,$i,"Post");
 $MyPost = preg_replace("/\<br\>/", "<br />", nl2br($MyPost));
-$MyDescription=mysql_result($result,$i,"Description");
-$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyUserID));
-$reresult=exec_query($requery);
-$renum=mysql_num_rows($reresult);
+$MyDescription=sql_result($result,$i,"Description");
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyUserID));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult);
 if($renum<1) { $MyUserID = -1;
-$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyUserID));
-$reresult=exec_query($requery);
-$renum=mysql_num_rows($reresult); }
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyUserID));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult); }
 $rei=0; $ipshow = "two";
 $User1ID=$MyUserID; $GuestsName = $MyGuestName;
-$User1Name=mysql_result($reresult,$rei,"Name");
-$User1IP=mysql_result($reresult,$rei,"IP");
+$User1Name=sql_result($reresult,$rei,"Name");
+$User1IP=sql_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");
+$User1Email=sql_result($reresult,$rei,"Email");
+$User1Title=sql_result($reresult,$rei,"Title");
+$User1Joined=sql_result($reresult,$rei,"Joined");
 $User1Joined=GMTimeChange("M j Y",$User1Joined,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
-$User1GroupID=mysql_result($reresult,$rei,"GroupID");
-$gquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($User1GroupID));
-$gresult=exec_query($gquery);
-$User1Group=mysql_result($gresult,0,"Name");
-$GroupNamePrefix=mysql_result($gresult,0,"NamePrefix");
-$GroupNameSuffix=mysql_result($gresult,0,"NameSuffix");
-mysql_free_result($gresult);
-$User1Signature=mysql_result($reresult,$rei,"Signature");
-$User1Avatar=mysql_result($reresult,$rei,"Avatar");
-$User1AvatarSize=mysql_result($reresult,$rei,"AvatarSize");
+$User1GroupID=sql_result($reresult,$rei,"GroupID");
+$gquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($User1GroupID));
+$gresult=sql_query($gquery);
+$User1Group=sql_result($gresult,0,"Name");
+$GroupNamePrefix=sql_result($gresult,0,"NamePrefix");
+$GroupNameSuffix=sql_result($gresult,0,"NameSuffix");
+sql_free_result($gresult);
+$User1Signature=sql_result($reresult,$rei,"Signature");
+$User1Avatar=sql_result($reresult,$rei,"Avatar");
+$User1AvatarSize=sql_result($reresult,$rei,"AvatarSize");
 if ($User1Avatar=="http://"||$User1Avatar==null||
        strtolower($User1Avatar)=="noavatar") {
 $User1Avatar=$ThemeSet['NoAvatar'];
 $User1AvatarSize=$ThemeSet['NoAvatarSize']; }
 $AvatarSize1=explode("x", $User1AvatarSize);
 $AvatarSize1W=$AvatarSize1[0]; $AvatarSize1H=$AvatarSize1[1];
-$User1Website=mysql_result($reresult,$rei,"Website");
-$User1PostCount=mysql_result($reresult,$rei,"PostCount");
-$User1Karma=mysql_result($reresult,$rei,"Karma");
-$User1IP=mysql_result($reresult,$rei,"IP");
-mysql_free_result($reresult);
+$User1Website=sql_result($reresult,$rei,"Website");
+$User1PostCount=sql_result($reresult,$rei,"PostCount");
+$User1Karma=sql_result($reresult,$rei,"Karma");
+$User1IP=sql_result($reresult,$rei,"IP");
+sql_free_result($reresult);
 if($User1Name=="Guest") { $User1Name=$GuestsName;
 if($User1Name==null) { $User1Name="Guest"; } }
 if(isset($GroupNamePrefix)&&$GroupNamePrefix!=null) {
@@ -274,24 +274,24 @@ if(isset($GroupNameSuffix)&&$GroupNameSuffix!=null) {
 $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 = exec_query($euquery);
-$eunum = mysql_num_rows($euresult);
+$euquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyEditUserID));
+$euresult = sql_query($euquery);
+$eunum = sql_num_rows($euresult);
 if($eunum<1) { $MyEditUserID = -1;
-$euquery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyEditUserID));
-$euresult = exec_query($euquery);
-$eunum = mysql_num_rows($euresult); }
+$euquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyEditUserID));
+$euresult = sql_query($euquery);
+$eunum = sql_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($EditUserGroupID));
-       $eugresult=exec_query($eugquery);
-       $EditUserGroup=mysql_result($eugresult,0,"Name");
-       $EditUserNamePrefix=mysql_result($eugresult,0,"NamePrefix");
-       $EditUserNameSuffix=mysql_result($eugresult,0,"NameSuffix");
-       mysql_free_result($eugresult);  }
+       $EditUserGroupID = sql_result($euresult,0,"GroupID");
+       $EditUserHidden=sql_result($euresult,0,"HiddenMember");
+       $EditUserName = sql_result($euresult,0,"Name");
+       sql_free_result($euresult);
+       $eugquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($EditUserGroupID));
+       $eugresult=sql_query($eugquery);
+       $EditUserGroup=sql_result($eugresult,0,"Name");
+       $EditUserNamePrefix=sql_result($eugresult,0,"NamePrefix");
+       $EditUserNameSuffix=sql_result($eugresult,0,"NameSuffix");
+       sql_free_result($eugresult);    }
        if($MyEditUserID==$MyUserID) {
        $EditUserID = $User1ID;
        $EditUserGroupID = $User1GroupID;
@@ -309,26 +309,26 @@ $eunum = mysql_num_rows($euresult); }
        $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=exec_query($requery);
-$renum=mysql_num_rows($reresult);
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyUserID));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult);
 $rei=0; $ipshow = "two";
 $User1ID=$MyUserID; $GuestsName = $MyGuestName;
-$User1Name=mysql_result($reresult,$rei,"Name");
-$User1IP=mysql_result($reresult,$rei,"IP");
+$User1Name=sql_result($reresult,$rei,"Name");
+$User1IP=sql_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");
+$User1Email=sql_result($reresult,$rei,"Email");
+$User1Title=sql_result($reresult,$rei,"Title");
+$User1Joined=sql_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=exec_query($gquery);
-$User1Group=mysql_result($gresult,0,"Name");
-$GroupNamePrefix=mysql_result($gresult,0,"NamePrefix");
-$GroupNameSuffix=mysql_result($gresult,0,"NameSuffix");
-mysql_free_result($gresult); }
+$User1Hidden=sql_result($reresult,$rei,"HiddenMember");
+$User1GroupID=sql_result($reresult,$rei,"GroupID");
+$gquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($User1GroupID));
+$gresult=sql_query($gquery);
+$User1Group=sql_result($gresult,0,"Name");
+$GroupNamePrefix=sql_result($gresult,0,"NamePrefix");
+$GroupNameSuffix=sql_result($gresult,0,"NameSuffix");
+sql_free_result($gresult); }
 $MyPost = text2icons($MyPost,$Settings['sqltable']);
 if($MySubPost!=null) { $MyPost = $MyPost."\n".$MySubPost; }
 $User1Signature = preg_replace("/\<br\>/", "<br />", nl2br($User1Signature));
@@ -351,5 +351,5 @@ $ReplyNum = $i + $PageLimit + 1;
 <div style="width:auto; font-size: 0.8em; color: gray; text-align:right;"><?php echo $MyTimeStamp; ?></div>
 </div>
 <div style="padding: 6px; font-size: 0.8em;"><?php echo $MyPost; ?></div></div>
-<?php ++$i; } mysql_free_result($result); 
+<?php ++$i; } sql_free_result($result); 
 ?></div><div>&nbsp;</div><?php } } ?>

diff --git a/inc/lowsubcategories.php b/inc/lowsubcategories.php
index 7f0152b..425dd06 100644 (file)
--- a/inc/lowsubcategories.php
+++ b/inc/lowsubcategories.php
@@ -11,26 +11,26 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: lowsubcategories.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: lowsubcategories.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="lowsubcategories.php"||$File3Name=="/lowsubcategories.php") {
        require('index.php');
        exit(); }
 if(!is_numeric($_GET['id'])) { $_GET['id'] = null; }
-$checkquery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($_GET['id']));
-$checkresult=exec_query($checkquery);
-$checknum=mysql_num_rows($checkresult);
-if($checknum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); mysql_free_result($checkresult);
+$checkquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($_GET['id']));
+$checkresult=sql_query($checkquery);
+$checknum=sql_num_rows($checkresult);
+if($checknum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); sql_free_result($checkresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($checknum>=1) {
-$CategoryID=mysql_result($checkresult,0,"id");
-$CategoryName=mysql_result($checkresult,0,"Name");
-$CategoryShow=mysql_result($checkresult,0,"ShowCategory");
-$CategoryType=mysql_result($checkresult,0,"CategoryType");
-$InSubCategory=mysql_result($checkresult,0,"InSubCategory");
-$SubShowForums=mysql_result($checkresult,0,"SubShowForums");
+$CategoryID=sql_result($checkresult,0,"id");
+$CategoryName=sql_result($checkresult,0,"Name");
+$CategoryShow=sql_result($checkresult,0,"ShowCategory");
+$CategoryType=sql_result($checkresult,0,"CategoryType");
+$InSubCategory=sql_result($checkresult,0,"InSubCategory");
+$SubShowForums=sql_result($checkresult,0,"SubShowForums");
 $CategoryType = strtolower($CategoryType); $SubShowForums = strtolower($SubShowForums);
 $SCategoryName = $CategoryName;
 if(!isset($CatPermissionInfo['CanViewCategory'][$CategoryID])) {
@@ -49,17 +49,17 @@ $_SESSION['ViewingFile'] = $exfile[$CategoryType]; }
 $_SESSION['PreViewingTitle'] = "Viewing SubCategory:";
 $_SESSION['ViewingTitle'] = $CategoryName;
 if($InSubCategory!="0") {
-$iscquery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($InSubCategory));
-$iscresult=exec_query($iscquery);
-$iscnum=mysql_num_rows($iscresult);
+$iscquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($InSubCategory));
+$iscresult=sql_query($iscquery);
+$iscnum=sql_num_rows($iscresult);
 if($iscnum>=1) {
-$iscCategoryID=mysql_result($iscresult,0,"id");
-$iscCategoryName=mysql_result($iscresult,0,"Name");
-$iscCategoryShow=mysql_result($iscresult,0,"ShowCategory");
-$iscCategoryType=mysql_result($iscresult,0,"CategoryType");
+$iscCategoryID=sql_result($iscresult,0,"id");
+$iscCategoryName=sql_result($iscresult,0,"Name");
+$iscCategoryShow=sql_result($iscresult,0,"ShowCategory");
+$iscCategoryType=sql_result($iscresult,0,"CategoryType");
 $iscCategoryType = strtolower($iscCategoryType); }
 if($iscnum<1) { $InSubCategory = "0"; } 
-mysql_free_result($iscresult); }
+sql_free_result($iscresult); }
 ?>
 <div style="font-size: 1.0em; font-weight: bold; margin-bottom: 10px; padding-top: 3px; width: auto;">Full Version: <a href="<?php echo url_maker($exfile[$CategoryType],$Settings['file_ext'],"act=view&id=".$CategoryID,$Settings['qstr'],$Settings['qsep'],$prexqstr[$CategoryType],$exqstr[$CategoryType]); ?>"><?php echo $CategoryName; ?></a></div>
 <div style="font-size: 11px; font-weight: bold; padding: 10px; border: 1px solid gray;"><?php echo $ThemeSet['NavLinkIcon']; ?><a href="<?php echo url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']); ?>">Board index</a><?php if($InSubCategory!="0") { echo $ThemeSet['NavLinkDivider']; ?><a href="<?php echo url_maker($exfile[$iscCategoryType],$Settings['file_ext'],"act=view&id=".$iscCategoryID."&page=1",$Settings['qstr'],$Settings['qsep'],$prexqstr[$iscCategoryType],$exqstr[$iscCategoryType]); ?>"><?php echo $iscCategoryName; ?></a><?php } echo $ThemeSet['NavLinkDivider']; ?><a href="<?php echo url_maker($exfile[$CategoryType],$Settings['file_ext'],"act=lowview&id=".$CategoryID,$Settings['qstr'],$Settings['qsep'],$prexqstr[$CategoryType],$exqstr[$CategoryType]); ?>"><?php echo $CategoryName; ?></a></div>
@@ -71,55 +71,55 @@ if($CategoryType=="category") {
 redirect("location",$basedir.url_maker($exfile['category'],$Settings['file_ext'],"act=".$_GET['act']."&id=".$_GET['id'],$Settings['qstr'],$Settings['qsep'],$prexqstr['category'],$exqstr['category'],FALSE));
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
-mysql_free_result($checkresult);
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `ShowCategory`='yes' AND `InSubCategory`=%i ORDER BY `OrderID` ASC, `id` ASC", array($_GET['id']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
+sql_free_result($checkresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `ShowCategory`='yes' AND `InSubCategory`=%i ORDER BY `OrderID` ASC, `id` ASC", array($_GET['id']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
 $prei=0;
 while ($prei < $prenum) {
-$CategoryID=mysql_result($preresult,$prei,"id");
-$CategoryName=mysql_result($preresult,$prei,"Name");
-$CategoryShow=mysql_result($preresult,$prei,"ShowCategory");
-$CategoryType=mysql_result($preresult,$prei,"CategoryType");
-$SSubShowForums=mysql_result($preresult,$prei,"SubShowForums");
-$CategoryDescription=mysql_result($preresult,$prei,"Description");
+$CategoryID=sql_result($preresult,$prei,"id");
+$CategoryName=sql_result($preresult,$prei,"Name");
+$CategoryShow=sql_result($preresult,$prei,"ShowCategory");
+$CategoryType=sql_result($preresult,$prei,"CategoryType");
+$SSubShowForums=sql_result($preresult,$prei,"SubShowForums");
+$CategoryDescription=sql_result($preresult,$prei,"Description");
 $CategoryType = strtolower($CategoryType); $SubShowForums = strtolower($SubShowForums);
 if(isset($CatPermissionInfo['CanViewCategory'][$CategoryID])&&
        $CatPermissionInfo['CanViewCategory'][$CategoryID]=="yes") {
-$query = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `CategoryID`=%i AND `InSubForum`=0 ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `CategoryID`=%i AND `InSubForum`=0 ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
 if($num>=1) {
 ?>
 <li style="font-weight: bold;"><a href="<?php echo url_maker($exfile[$CategoryType],$Settings['file_ext'],"act=lowview&id=".$CategoryID,$Settings['qstr'],$Settings['qsep'],$prexqstr[$CategoryType],$exqstr[$CategoryType]); ?>"><?php echo $CategoryName; ?></a></li><li>
 <?php }
 while ($i < $num) {
-$ForumID=mysql_result($result,$i,"id");
-$ForumName=mysql_result($result,$i,"Name");
-$ForumShow=mysql_result($result,$i,"ShowForum");
-$ForumType=mysql_result($result,$i,"ForumType");
-$ForumShowTopics=mysql_result($result,$i,"CanHaveTopics");
+$ForumID=sql_result($result,$i,"id");
+$ForumName=sql_result($result,$i,"Name");
+$ForumShow=sql_result($result,$i,"ShowForum");
+$ForumType=sql_result($result,$i,"ForumType");
+$ForumShowTopics=sql_result($result,$i,"CanHaveTopics");
 $ForumShowTopics = strtolower($ForumShowTopics);
-$NumTopics=mysql_result($result,$i,"NumTopics");
-$NumPosts=mysql_result($result,$i,"NumPosts");
-$NumRedirects=mysql_result($result,$i,"Redirects");
-$ForumDescription=mysql_result($result,$i,"Description");
+$NumTopics=sql_result($result,$i,"NumTopics");
+$NumPosts=sql_result($result,$i,"NumPosts");
+$NumRedirects=sql_result($result,$i,"Redirects");
+$ForumDescription=sql_result($result,$i,"Description");
 $ForumType = strtolower($ForumType); $sflist = null;
 $gltf = array(null); $gltf[0] = $ForumID;
 if ($ForumType=="subforum") { 
-$apcquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
-$apcresult=exec_query($apcquery);
-$apcnum=mysql_num_rows($apcresult);
+$apcquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
+$apcresult=sql_query($apcquery);
+$apcnum=sql_num_rows($apcresult);
 $apci=0; $apcl=1; if($apcnum>=1) {
 while ($apci < $apcnum) {
-$NumsTopics=mysql_result($apcresult,$apci,"NumTopics");
+$NumsTopics=sql_result($apcresult,$apci,"NumTopics");
 $NumTopics = $NumsTopics + $NumTopics;
-$NumsPosts=mysql_result($apcresult,$apci,"NumPosts");
+$NumsPosts=sql_result($apcresult,$apci,"NumPosts");
 $NumPosts = $NumsPosts + $NumPosts;
-$SubsForumID=mysql_result($apcresult,$apci,"id");
-$SubsForumName=mysql_result($apcresult,$apci,"Name");
-$SubsForumType=mysql_result($apcresult,$apci,"ForumType");
+$SubsForumID=sql_result($apcresult,$apci,"id");
+$SubsForumName=sql_result($apcresult,$apci,"Name");
+$SubsForumType=sql_result($apcresult,$apci,"ForumType");
 if(isset($PermissionInfo['CanViewForum'][$SubsForumID])&&
        $PermissionInfo['CanViewForum'][$SubsForumID]=="yes") {
 $shownum = null;
@@ -134,23 +134,23 @@ if($apcl>1) {
 $sflist = $sflist." ".$sfurl; }
 $gltf[$apcl] = $SubsForumID; ++$apcl; }
 ++$apci; }
-mysql_free_result($apcresult); } }
+sql_free_result($apcresult); } }
 if ($ForumType=="subforum") { 
-$apcquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
-$apcresult=exec_query($apcquery);
-$apcnum=mysql_num_rows($apcresult);
+$apcquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
+$apcresult=sql_query($apcquery);
+$apcnum=sql_num_rows($apcresult);
 $apci=0; $apcl=1; if($apcnum>=1) {
 while ($apci < $apcnum) {
-$NumsTopics=mysql_result($apcresult,$apci,"NumTopics");
+$NumsTopics=sql_result($apcresult,$apci,"NumTopics");
 $NumTopics = $NumsTopics + $NumTopics;
-$NumsPosts=mysql_result($apcresult,$apci,"NumPosts");
+$NumsPosts=sql_result($apcresult,$apci,"NumPosts");
 $NumPosts = $NumsPosts + $NumPosts;
-$SubsForumID=mysql_result($apcresult,$apci,"id");
+$SubsForumID=sql_result($apcresult,$apci,"id");
 if(isset($PermissionInfo['CanViewForum'][$SubsForumID])&&
        $PermissionInfo['CanViewForum'][$SubsForumID]=="yes") {
 $gltf[$apcl] = $SubsForumID; ++$apcl; }
 ++$apci; }
-mysql_free_result($apcresult); } }
+sql_free_result($apcresult); } }
 if(isset($PermissionInfo['CanViewForum'][$ForumID])&&
        $PermissionInfo['CanViewForum'][$ForumID]=="yes") {
 $LastTopic = "&nbsp;<br />&nbsp;<br />&nbsp;";
@@ -159,15 +159,15 @@ $gltnum = count($gltf); $glti = 0;
 $OldUpdateTime = 0; $UseThisFonum = null;
 if ($ForumType=="subforum") { 
 while ($glti < $gltnum) {
-$gltfoquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `CategoryID`=%i AND `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($CategoryID,$gltf[$glti]));
-$gltforesult=exec_query($gltfoquery);
-$gltfonum=mysql_num_rows($gltforesult);
+$gltfoquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `CategoryID`=%i AND `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($CategoryID,$gltf[$glti]));
+$gltforesult=sql_query($gltfoquery);
+$gltfonum=sql_num_rows($gltforesult);
 if($gltfonum>0) {
-$NewUpdateTime=mysql_result($gltforesult,0,"LastUpdate");
+$NewUpdateTime=sql_result($gltforesult,0,"LastUpdate");
 if($NewUpdateTime>$OldUpdateTime) { 
        $UseThisFonum = $gltf[$glti]; 
 $OldUpdateTime = $NewUpdateTime; } }
-mysql_free_result($gltforesult);
+sql_free_result($gltforesult);
 ++$glti; } }
 $shownum = null;
 if ($ForumType=="redirect") { $shownum = "(".$NumRedirects." redirects)"; }
@@ -182,12 +182,12 @@ $ExStr = ""; if ($ForumType!="redirect"&&
 <ul style="list-style-type: none;"><li>
 <a href="<?php echo url_maker($exfile[$ForumType],$Settings['file_ext'],"act=lowview&id=".$ForumID.$ExStr,$Settings['qstr'],$Settings['qsep'],$prexqstr[$ForumType],$exqstr[$ForumType]); ?>"<?php if($ForumType=="redirect") { echo " onclick=\"window.open(this.href);return false;\""; } ?>><?php echo $ForumName; ?></a> <span style="color: gray; font-size: 10px;"><?php echo $shownum; ?></span></li>
 <?php echo $sflist; ?></ul>
-<?php } ++$i; } mysql_free_result($result); } ?>
+<?php } ++$i; } sql_free_result($result); } ?>
 </li></ul>
 <ul style="list-style-type: none;">
 <?php ++$prei; } } ?>
 <?php
-mysql_free_result($preresult);
+sql_free_result($preresult);
 $CatCheck = "skip";
 if($SubShowForums!="yes") { 
        $CategoryName = $SCategoryName; }

diff --git a/inc/lowsubforums.php b/inc/lowsubforums.php
index 5942ff2..30bb5ec 100644 (file)
--- a/inc/lowsubforums.php
+++ b/inc/lowsubforums.php
@@ -11,41 +11,41 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: lowsubforums.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: lowsubforums.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="lowsubforums.php"||$File3Name=="/lowsubforums.php") {
        require('index.php');
        exit(); }
 if(!is_numeric($_GET['id'])) { $_GET['id'] = null; }
-$checkquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_GET['id']));
-$checkresult=exec_query($checkquery);
-$checknum=mysql_num_rows($checkresult);
-if($checknum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); mysql_free_result($checkresult);
+$checkquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_GET['id']));
+$checkresult=sql_query($checkquery);
+$checknum=sql_num_rows($checkresult);
+if($checknum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); sql_free_result($checkresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($checknum>=1) {
-$ForumID=mysql_result($checkresult,0,"id");
-$ForumName=mysql_result($checkresult,0,"Name");
-$ForumType=mysql_result($checkresult,0,"ForumType");
-$InSubForum=mysql_result($checkresult,0,"InSubForum");
-$CategoryID=mysql_result($checkresult,0,"CategoryID");
-$RedirectURL=mysql_result($checkresult,0,"RedirectURL");
-$RedirectTimes=mysql_result($checkresult,0,"Redirects");
-$CanHaveTopics=mysql_result($checkresult,0,"CanHaveTopics");
-$NumberViews=mysql_result($checkresult,0,"NumViews");
+$ForumID=sql_result($checkresult,0,"id");
+$ForumName=sql_result($checkresult,0,"Name");
+$ForumType=sql_result($checkresult,0,"ForumType");
+$InSubForum=sql_result($checkresult,0,"InSubForum");
+$CategoryID=sql_result($checkresult,0,"CategoryID");
+$RedirectURL=sql_result($checkresult,0,"RedirectURL");
+$RedirectTimes=sql_result($checkresult,0,"Redirects");
+$CanHaveTopics=sql_result($checkresult,0,"CanHaveTopics");
+$NumberViews=sql_result($checkresult,0,"NumViews");
 $SForumName = $ForumName;
 $ForumType = strtolower($ForumType); $CanHaveTopics = strtolower($CanHaveTopics);
 if($CanHaveTopics!="yes"&&$ForumType!="redirect") {
 if($NumberViews==0||$NumberViews==null) { $NewNumberViews = 1; }
 if($NumberViews!=0&&$NumberViews!=null) { $NewNumberViews = $NumberViews + 1; }
-$viewup = query("UPDATE `".$Settings['sqltable']."forums` SET `NumViews`='%s' WHERE `id`=%i", array($NewNumberViews,$_GET['id']));
-exec_query($viewup); }
+$viewup = sql_pre_query("UPDATE `".$Settings['sqltable']."forums` SET `NumViews`='%s' WHERE `id`=%i", array($NewNumberViews,$_GET['id']));
+sql_query($viewup); }
 if($ForumType=="redirect") {
 if($RedirectTimes==0||$RedirectTimes==null) { $NewRedirTime = 1; }
 if($RedirectTimes!=0&&$RedirectTimes!=null) { $NewRedirTime = $RedirectTimes + 1; }
-$redirup = query("UPDATE `".$Settings['sqltable']."forums` SET `Redirects`='%s' WHERE `id`=%i", array($NewRedirTime,$_GET['id']));
-exec_query($redirup);
+$redirup = sql_pre_query("UPDATE `".$Settings['sqltable']."forums` SET `Redirects`='%s' WHERE `id`=%i", array($NewRedirTime,$_GET['id']));
+sql_query($redirup);
 if($RedirectURL!="http://"&&$RedirectURL!="") {
 redirect("location",$RedirectURL,0,null,false); ob_clean();
 header("Content-Type: text/plain; charset=".$Settings['charset']);
@@ -58,29 +58,29 @@ if($ForumType=="forum") {
 redirect("location",$basedir.url_maker($exfile['forum'],$Settings['file_ext'],"act=".$_GET['act']."&id=".$_GET['id'],$Settings['qstr'],$Settings['qsep'],$prexqstr['forum'],$exqstr['forum'],FALSE));
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
-mysql_free_result($checkresult);
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `ShowCategory`='yes' AND `id`=%i ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
+sql_free_result($checkresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `ShowCategory`='yes' AND `id`=%i ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
 $prei=0;
-$CategoryID=mysql_result($preresult,0,"id");
-$CategoryType=mysql_result($preresult,0,"CategoryType");
-$CategoryName=mysql_result($preresult,0,"Name");
-$CategoryShow=mysql_result($preresult,0,"ShowCategory");
-$CategoryDescription=mysql_result($preresult,0,"Description");
+$CategoryID=sql_result($preresult,0,"id");
+$CategoryType=sql_result($preresult,0,"CategoryType");
+$CategoryName=sql_result($preresult,0,"Name");
+$CategoryShow=sql_result($preresult,0,"ShowCategory");
+$CategoryDescription=sql_result($preresult,0,"Description");
 if($InSubForum!="0") {
-$isfquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($InSubForum));
-$isfresult=exec_query($isfquery);
-$isfnum=mysql_num_rows($isfresult);
+$isfquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($InSubForum));
+$isfresult=sql_query($isfquery);
+$isfnum=sql_num_rows($isfresult);
 if($isfnum>=1) {
-$isfForumID=mysql_result($isfresult,0,"id");
-$isfForumCatID=mysql_result($isfresult,0,"CategoryID");
-$isfForumName=mysql_result($isfresult,0,"Name");
-$isfForumType=mysql_result($isfresult,0,"ForumType");
+$isfForumID=sql_result($isfresult,0,"id");
+$isfForumCatID=sql_result($isfresult,0,"CategoryID");
+$isfForumName=sql_result($isfresult,0,"Name");
+$isfForumType=sql_result($isfresult,0,"ForumType");
 $isfForumType = strtolower($isfForumType);
-$isfRedirectURL=mysql_result($isfresult,0,"RedirectURL"); }
+$isfRedirectURL=sql_result($isfresult,0,"RedirectURL"); }
 if($isfnum<1) { $InSubForum = "0"; } 
-mysql_free_result($isfresult); }
+sql_free_result($isfresult); }
 $_SESSION['ViewingPage'] = url_maker(null,"no+ext","act=lowview&id=".$ForumID."&page=".$_GET['page'],"&","=",$prexqstr[$ForumType],$exqstr[$ForumType]);
 if($Settings['file_ext']!="no+ext"&&$Settings['file_ext']!="no ext") {
 $_SESSION['ViewingFile'] = $exfile[$ForumType].$Settings['file_ext']; }
@@ -111,39 +111,39 @@ ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($CatPermissionInfo['CanViewCategory'][$CategoryID]=="yes"&&
        $PermissionInfo['CanViewForum'][$_GET['id']]=="yes") {
-$query = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `CategoryID`=%i AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID,$_GET['id']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `CategoryID`=%i AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID,$_GET['id']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
 ?>
 <li style="font-weight: bold;"><a href="<?php echo url_maker($exfile[$ForumType],$Settings['file_ext'],"act=lowview&id=".$ForumID."&page=1",$Settings['qstr'],$Settings['qsep'],$prexqstr[$ForumType],$exqstr[$ForumType]); ?>"><?php echo $ForumName; ?></a></li><li>
 <?php
 while ($i < $num) {
-$ForumID=mysql_result($result,$i,"id");
-$ForumName=mysql_result($result,$i,"Name");
-$ForumShow=mysql_result($result,$i,"ShowForum");
-$ForumType=mysql_result($result,$i,"ForumType");
-$ForumShowTopics=mysql_result($result,$i,"CanHaveTopics");
+$ForumID=sql_result($result,$i,"id");
+$ForumName=sql_result($result,$i,"Name");
+$ForumShow=sql_result($result,$i,"ShowForum");
+$ForumType=sql_result($result,$i,"ForumType");
+$ForumShowTopics=sql_result($result,$i,"CanHaveTopics");
 $ForumShowTopics = strtolower($ForumShowTopics);
-$NumTopics=mysql_result($result,$i,"NumTopics");
-$NumPosts=mysql_result($result,$i,"NumPosts");
-$NumRedirects=mysql_result($result,$i,"Redirects");
-$ForumDescription=mysql_result($result,$i,"Description");
+$NumTopics=sql_result($result,$i,"NumTopics");
+$NumPosts=sql_result($result,$i,"NumPosts");
+$NumRedirects=sql_result($result,$i,"Redirects");
+$ForumDescription=sql_result($result,$i,"Description");
 $ForumType = strtolower($ForumType); $sflist = null;
 $gltf = array(null); $gltf[0] = $ForumID;
 if ($ForumType=="subforum") { 
-$apcquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
-$apcresult=exec_query($apcquery);
-$apcnum=mysql_num_rows($apcresult);
+$apcquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
+$apcresult=sql_query($apcquery);
+$apcnum=sql_num_rows($apcresult);
 $apci=0; $apcl=1; if($apcnum>=1) {
 while ($apci < $apcnum) {
-$NumsTopics=mysql_result($apcresult,$apci,"NumTopics");
+$NumsTopics=sql_result($apcresult,$apci,"NumTopics");
 $NumTopics = $NumsTopics + $NumTopics;
-$NumsPosts=mysql_result($apcresult,$apci,"NumPosts");
+$NumsPosts=sql_result($apcresult,$apci,"NumPosts");
 $NumPosts = $NumsPosts + $NumPosts;
-$SubsForumID=mysql_result($apcresult,$apci,"id");
-$SubsForumName=mysql_result($apcresult,$apci,"Name");
-$SubsForumType=mysql_result($apcresult,$apci,"ForumType");
+$SubsForumID=sql_result($apcresult,$apci,"id");
+$SubsForumName=sql_result($apcresult,$apci,"Name");
+$SubsForumType=sql_result($apcresult,$apci,"ForumType");
 if(isset($PermissionInfo['CanViewForum'][$SubsForumID])&&
        $PermissionInfo['CanViewForum'][$SubsForumID]=="yes") {
 $shownum = null;
@@ -159,7 +159,7 @@ if($apcl>1) {
 $sflist = $sflist." ".$sfurl; }
 $gltf[$apcl] = $SubsForumID; ++$apcl; }
 ++$apci; }
-mysql_free_result($apcresult); } }
+sql_free_result($apcresult); } }
 $shownum = null;
 if ($ForumType=="redirect") { $shownum = "(".$NumRedirects." redirects)"; }
 if ($ForumType!="redirect") { $shownum = "(".$NumPosts." posts)"; }
@@ -173,11 +173,11 @@ $ExStr = ""; if ($ForumType!="redirect"&&
 <ul style="list-style-type: none;"><li>
 <a href="<?php echo url_maker($exfile[$ForumType],$Settings['file_ext'],"act=lowview&id=".$ForumID.$ExStr,$Settings['qstr'],$Settings['qsep'],$prexqstr[$ForumType],$exqstr[$ForumType]); ?>"<?php if($ForumType=="redirect") { echo " onclick=\"window.open(this.href);return false;\""; } ?>><?php echo $ForumName; ?> <span style="color: gray; font-size: 10px;"><?php echo $shownum; ?></span></a></li>
 <?php echo $sflist; ?></ul>
-<?php ++$i; } mysql_free_result($result);
+<?php ++$i; } sql_free_result($result);
 ?>
 </li></ul></div>
 <div>&nbsp;</div>
-<?php } mysql_free_result($preresult);
+<?php } sql_free_result($preresult);
 $ForumCheck = "skip";
 if($CanHaveTopics!="yes") { 
        $ForumName = $SForumName; }

diff --git a/inc/lowtopics.php b/inc/lowtopics.php
index b6f1b33..a807b6a 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: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: lowtopics.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="lowtopics.php"||$File3Name=="/lowtopics.php") {
@@ -20,41 +20,41 @@ if ($File3Name=="lowtopics.php"||$File3Name=="/lowtopics.php") {
 $pstring = null; $pagenum = null;
 if(!is_numeric($_GET['id'])) { $_GET['id'] = null; }
 if(!is_numeric($_GET['page'])) { $_GET['page'] = 1; }
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_GET['id']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
-if($prenum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); mysql_free_result($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_GET['id']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
+if($prenum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); sql_free_result($preresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($prenum>=1) {
-$ForumID=mysql_result($preresult,0,"id");
-$ForumCatID=mysql_result($preresult,0,"CategoryID");
-$ForumName=mysql_result($preresult,0,"Name");
-$ForumType=mysql_result($preresult,0,"ForumType");
-$InSubForum=mysql_result($preresult,0,"InSubForum");
-$RedirectURL=mysql_result($preresult,0,"RedirectURL");
-$RedirectTimes=mysql_result($preresult,0,"Redirects");
-$NumberViews=mysql_result($preresult,0,"NumViews");
-$NumberPosts=mysql_result($preresult,0,"NumPosts");
-$NumberTopics=mysql_result($preresult,0,"NumTopics");
-$PostCountAdd=mysql_result($preresult,0,"PostCountAdd");
-$CanHaveTopics=mysql_result($preresult,0,"CanHaveTopics");
-$HotTopicPosts=mysql_result($preresult,0,"HotTopicPosts");
+$ForumID=sql_result($preresult,0,"id");
+$ForumCatID=sql_result($preresult,0,"CategoryID");
+$ForumName=sql_result($preresult,0,"Name");
+$ForumType=sql_result($preresult,0,"ForumType");
+$InSubForum=sql_result($preresult,0,"InSubForum");
+$RedirectURL=sql_result($preresult,0,"RedirectURL");
+$RedirectTimes=sql_result($preresult,0,"Redirects");
+$NumberViews=sql_result($preresult,0,"NumViews");
+$NumberPosts=sql_result($preresult,0,"NumPosts");
+$NumberTopics=sql_result($preresult,0,"NumTopics");
+$PostCountAdd=sql_result($preresult,0,"PostCountAdd");
+$CanHaveTopics=sql_result($preresult,0,"CanHaveTopics");
+$HotTopicPosts=sql_result($preresult,0,"HotTopicPosts");
 if($HotTopicPosts!=0&&is_numeric($HotTopicPosts)) {
        $Settings['hot_topic_num'] = $HotTopicPosts; }
 if(!is_numeric($Settings['hot_topic_num'])) {
        $Settings['hot_topic_num'] = 15; }
-$ForumPostCountView=mysql_result($preresult,0,"PostCountView");
-$ForumKarmaCountView=mysql_result($preresult,0,"KarmaCountView");
-mysql_free_result($preresult);
+$ForumPostCountView=sql_result($preresult,0,"PostCountView");
+$ForumKarmaCountView=sql_result($preresult,0,"KarmaCountView");
+sql_free_result($preresult);
 $ForumType = strtolower($ForumType); $CanHaveTopics = strtolower($CanHaveTopics);
-$catcheck = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i  LIMIT 1", array($ForumCatID));
-$catresult=exec_query($catcheck);
-$CategoryName=mysql_result($catresult,0,"Name");
-$CategoryType=mysql_result($catresult,0,"CategoryType");
-$CategoryPostCountView=mysql_result($catresult,0,"PostCountView");
-$CategoryKarmaCountView=mysql_result($catresult,0,"KarmaCountView");
-mysql_free_result($catresult);
+$catcheck = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i  LIMIT 1", array($ForumCatID));
+$catresult=sql_query($catcheck);
+$CategoryName=sql_result($catresult,0,"Name");
+$CategoryType=sql_result($catresult,0,"CategoryType");
+$CategoryPostCountView=sql_result($catresult,0,"PostCountView");
+$CategoryKarmaCountView=sql_result($catresult,0,"KarmaCountView");
+sql_free_result($catresult);
 if($GroupInfo['HasAdminCP']!="yes"||$GroupInfo['HasModCP']!="yes") {
 if($MyPostCountChk==null) { $MyPostCountChk = 0; }
 if($MyKarmaCount==null) { $MyKarmaCount = 0; }
@@ -67,18 +67,18 @@ redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"a
 if($CategoryKarmaCountView!=0&&$MyKarmaCount<$CategoryKarmaCountView) {
 redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=lowview",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); } }
 if($InSubForum!="0") {
-$isfquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($InSubForum));
-$isfresult=exec_query($isfquery);
-$isfnum=mysql_num_rows($isfresult);
+$isfquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($InSubForum));
+$isfresult=sql_query($isfquery);
+$isfnum=sql_num_rows($isfresult);
 if($isfnum>=1) {
-$isfForumID=mysql_result($isfresult,0,"id");
-$isfForumCatID=mysql_result($isfresult,0,"CategoryID");
-$isfForumName=mysql_result($isfresult,0,"Name");
-$isfForumType=mysql_result($isfresult,0,"ForumType");
+$isfForumID=sql_result($isfresult,0,"id");
+$isfForumCatID=sql_result($isfresult,0,"CategoryID");
+$isfForumName=sql_result($isfresult,0,"Name");
+$isfForumType=sql_result($isfresult,0,"ForumType");
 $isfForumType = strtolower($isfForumType);
-$isfRedirectURL=mysql_result($isfresult,0,"RedirectURL"); }
+$isfRedirectURL=sql_result($isfresult,0,"RedirectURL"); }
 if($isfnum<1) { $InSubForum = "0"; }
-mysql_free_result($isfresult); }
+sql_free_result($isfresult); }
 $_SESSION['ViewingPage'] = url_maker(null,"no+ext","act=lowview&id=".$ForumID."&page=".$_GET['page'],"&","=",$prexqstr[$ForumType],$exqstr[$ForumType]);
 if($Settings['file_ext']!="no+ext"&&$Settings['file_ext']!="no ext") {
 $_SESSION['ViewingFile'] = $exfile[$ForumType].$Settings['file_ext']; }
@@ -111,13 +111,13 @@ if($CatPermissionInfo['CanViewCategory'][$ForumCatID]=="yes"&&
 if($ForumType!="redirect") {
 if($NumberViews==0||$NumberViews==null) { $NewNumberViews = 1; }
 if($NumberViews!=0&&$NumberViews!=null) { $NewNumberViews = $NumberViews + 1; }
-$viewup = query("UPDATE `".$Settings['sqltable']."forums` SET `NumViews`=%i WHERE `id`=%i", array($NewNumberViews,$_GET['id']));
-exec_query($viewup); }
+$viewup = sql_pre_query("UPDATE `".$Settings['sqltable']."forums` SET `NumViews`=%i WHERE `id`=%i", array($NewNumberViews,$_GET['id']));
+sql_query($viewup); }
 if($ForumType=="redirect") {
 if($RedirectTimes==0||$RedirectTimes==null) { $NewRedirTime = 1; }
 if($RedirectTimes!=0&&$RedirectTimes!=null) { $NewRedirTime = $RedirectTimes + 1; }
-$redirup = query("UPDATE `".$Settings['sqltable']."forums` SET `Redirects`=%i WHERE `id`=%i", array($NewRedirTime,$_GET['id']));
-exec_query($redirup);
+$redirup = sql_pre_query("UPDATE `".$Settings['sqltable']."forums` SET `Redirects`=%i WHERE `id`=%i", array($NewRedirTime,$_GET['id']));
+sql_query($redirup);
 if($RedirectURL!="http://"&&$RedirectURL!="") {
 redirect("location",$RedirectURL,0,null,false); ob_clean();
 header("Content-Type: text/plain; charset=".$Settings['charset']);
@@ -161,9 +161,9 @@ $PageLimit = $Settings['max_topics'] * $snumber;
 if($PageLimit<0) { $PageLimit = 0; }
 //End Topic Page Code
 $i=0;
-$query = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `Pinned` DESC, `LastUpdate` DESC LIMIT %i,%i", array($_GET['id'],$PageLimit,$Settings['max_topics']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `Pinned` DESC, `LastUpdate` DESC LIMIT %i,%i", array($_GET['id'],$PageLimit,$Settings['max_topics']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 //List Page Number Code Start
 $pagenum=count($Pages);
 if($_GET['page']>$pagenum) {
@@ -231,20 +231,20 @@ $pstring = $pstring."<span class=\"pagelinklast\"><a href=\"".url_maker($exfile[
 <ul style="list-style-type: decimal;">
 <?php }
 while ($i < $num) {
-$TopicID=mysql_result($result,$i,"id");
-$UsersID=mysql_result($result,$i,"UserID");
-$GuestsName=mysql_result($result,$i,"GuestName");
-$TheTime=mysql_result($result,$i,"TimeStamp");
+$TopicID=sql_result($result,$i,"id");
+$UsersID=sql_result($result,$i,"UserID");
+$GuestsName=sql_result($result,$i,"GuestName");
+$TheTime=sql_result($result,$i,"TimeStamp");
 $TheTime=GMTimeChange("F j Y, g:i a",$TheTime,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
-$NumReply=mysql_result($result,$i,"NumReply");
+$NumReply=sql_result($result,$i,"NumReply");
 $NumberPosts=$NumReply + 1;
 $prepagelist = null;
 if(!isset($Settings['max_posts'])) { 
        $Settings['max_posts'] = 10; }
-$TopicName=mysql_result($result,$i,"TopicName");
-$TopicDescription=mysql_result($result,$i,"Description");
-$PinnedTopic=mysql_result($result,$i,"Pinned");
-$TopicStat=mysql_result($result,$i,"Closed");
+$TopicName=sql_result($result,$i,"TopicName");
+$TopicDescription=sql_result($result,$i,"Description");
+$PinnedTopic=sql_result($result,$i,"Pinned");
+$TopicStat=sql_result($result,$i,"Closed");
 $PreTopic = null;
 if ($PinnedTopic>1) { $PinnedTopic = 1; } 
 if ($PinnedTopic<0) { $PinnedTopic = 0; }
@@ -258,4 +258,4 @@ if ($PinnedTopic==0) { $PreTopic=null; }
 <li><a href="<?php echo url_maker($exfile['topic'],$Settings['file_ext'],"act=lowview&id=".$TopicID."&page=1",$Settings['qstr'],$Settings['qsep'],$prexqstr['topic'],$exqstr['topic']); ?>"><?php echo $PreTopic.$TopicName; ?></a> <span style="color: gray; font-size: 10px;">(<?php echo $NumReply; ?> replies)</span></li>
 <?php ++$i; } ?>
 </ul></div><div>&nbsp;</div>
-<?php mysql_free_result($result); } } } ?>
+<?php sql_free_result($result); } } } ?>

diff --git a/inc/members.php b/inc/members.php
index 4a8ab0e..917eaba 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: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: members.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="members.php"||$File3Name=="/members.php") {
@@ -56,24 +56,24 @@ 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'", array($Settings['GuestGroup']));
-$ggresult=exec_query($ggquery);
-$GGroup=mysql_result($ggresult,0,"id");
-mysql_free_result($ggresult);
+$ggquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `Name`='%s'", array($Settings['GuestGroup']));
+$ggresult=sql_query($ggquery);
+$GGroup=sql_result($ggresult,0,"id");
+sql_free_result($ggresult);
 //Get SQL LIMIT Number
 $nums = $_GET['page'] * $Settings['max_memlist'];
 $PageLimit = $nums - $Settings['max_memlist'];
 if($PageLimit<0) { $PageLimit = 0; }
 $i=0;
 if($_GET['groupid']==null) {
-$query = query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."members` WHERE `GroupID`<>%i AND `id`>=0 AND `HiddenMember`='no' ".$orderlist." LIMIT %i,%i", array($GGroup,$PageLimit,$Settings['max_memlist'])); }
+$query = sql_pre_query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."members` WHERE `GroupID`<>%i AND `id`>=0 AND `HiddenMember`='no' ".$orderlist." LIMIT %i,%i", array($GGroup,$PageLimit,$Settings['max_memlist'])); }
 if($_GET['groupid']!=null) {
-$query = query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."members` WHERE `GroupID`=%i AND `GroupID`<>%i AND `id`>=0 ".$orderlist." LIMIT %i,%i", array($_GET['groupid'],$GGroup,$PageLimit,$Settings['max_memlist'])); }
-$rnquery = query("SELECT FOUND_ROWS();", array(null));
-$result=exec_query($query);
-$rnresult=exec_query($rnquery);
-$NumberMembers = mysql_result($rnresult,0);
-mysql_free_result($rnresult);
+$query = sql_pre_query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."members` WHERE `GroupID`=%i AND `GroupID`<>%i AND `id`>=0 ".$orderlist." LIMIT %i,%i", array($_GET['groupid'],$GGroup,$PageLimit,$Settings['max_memlist'])); }
+$rnquery = sql_pre_query("SELECT FOUND_ROWS();", array(null));
+$result=sql_query($query);
+$rnresult=sql_query($rnquery);
+$NumberMembers = sql_result($rnresult,0);
+sql_free_result($rnresult);
 $_SESSION['ViewingPage'] = url_maker(null,"no+ext","act=list&orderby=".$_GET['orderby']."&ordertype=".$_GET['ordertype']."&page=".$_GET['page'],"&","=",$prexqstr['member'],$exqstr['member']);
 if($Settings['file_ext']!="no+ext"&&$Settings['file_ext']!="no ext") {
 $_SESSION['ViewingFile'] = $exfile['member'].$Settings['file_ext']; }
@@ -107,7 +107,7 @@ if($pnum<$Settings['max_memlist']&&$pnum>0) {
        $Pages[$l] = $l; ++$l; } }
 $nums = $_GET['page'] * $Settings['max_memlist'];
 //End MemberList Page Code
-$num=mysql_num_rows($result);
+$num=sql_num_rows($result);
 //List Page Number Code Start
 $pagenum=count($Pages);
 if($_GET['page']>$pagenum) {
@@ -199,30 +199,30 @@ if($pagenum>1) {
 </tr>
 <?php
 while ($i < $num) {
-$MemList['ID']=mysql_result($result,$i,"id");
-$MemList['Name']=mysql_result($result,$i,"Name");
-$MemList['Email']=mysql_result($result,$i,"Email");
-$MemList['GroupID']=mysql_result($result,$i,"GroupID");
-$MemList['WarnLevel']=mysql_result($result,$i,"WarnLevel");
-$MemList['Interests']=mysql_result($result,$i,"Interests");
-$MemList['Title']=mysql_result($result,$i,"Title");
-$MemList['Joined']=mysql_result($result,$i,"Joined");
+$MemList['ID']=sql_result($result,$i,"id");
+$MemList['Name']=sql_result($result,$i,"Name");
+$MemList['Email']=sql_result($result,$i,"Email");
+$MemList['GroupID']=sql_result($result,$i,"GroupID");
+$MemList['WarnLevel']=sql_result($result,$i,"WarnLevel");
+$MemList['Interests']=sql_result($result,$i,"Interests");
+$MemList['Title']=sql_result($result,$i,"Title");
+$MemList['Joined']=sql_result($result,$i,"Joined");
 $MemList['Joined']=GMTimeChange("F j Y, g:i a",$MemList['Joined'],$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
-$MemList['LastActive']=mysql_result($result,$i,"LastActive");
+$MemList['LastActive']=sql_result($result,$i,"LastActive");
 $MemList['LastActive']=GMTimeChange("F j Y, g:i a",$MemList['LastActive'],$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
-$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=exec_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);
+$MemList['Website']=sql_result($result,$i,"Website");
+$MemList['Gender']=sql_result($result,$i,"Gender");
+$MemList['PostCount']=sql_result($result,$i,"PostCount");
+$MemList['Karma']=sql_result($result,$i,"Karma");
+$MemList['TimeZone']=sql_result($result,$i,"TimeZone");
+$MemList['DST']=sql_result($result,$i,"DST");
+$MemList['IP']=sql_result($result,$i,"IP");
+$gquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($MemList['GroupID']));
+$gresult=sql_query($gquery);
+$MemList['Group']=sql_result($gresult,0,"Name");
+$GroupNamePrefix=sql_result($gresult,0,"NamePrefix");
+$GroupNameSuffix=sql_result($gresult,0,"NameSuffix");
+sql_free_result($gresult);
 if(isset($GroupNamePrefix)&&$GroupNamePrefix!=null) {
        $MemList['Name'] = $GroupNamePrefix.$MemList['Name']; }
 if(isset($GroupNameSuffix)&&$GroupNameSuffix!=null) {
@@ -241,7 +241,7 @@ if($MemList['Group']!=$Settings['GuestGroup']) {
 <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);
+++$i; } sql_free_result($result);
 ?>
 <tr id="MemEnd" class="TableRow4">
 <td class="TableColumn4" colspan="8">&nbsp;</td>
@@ -268,12 +268,12 @@ if($PageLimit<0) { $PageLimit = 0; }
 $i=0;
 $uolcuttime = GMTimeStamp();
 $uoltime = $uolcuttime - ini_get("session.gc_maxlifetime");
-$query = query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."sessions` WHERE `expires` >= %i ORDER BY `expires` DESC LIMIT %i,%i", array($uoltime,$PageLimit,$Settings['max_memlist']));
-$rnquery = query("SELECT FOUND_ROWS();", array(null));
-$result=exec_query($query);
-$rnresult=exec_query($rnquery);
-$NumberMembers = mysql_result($rnresult,0);
-mysql_free_result($rnresult);
+$query = sql_pre_query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."sessions` WHERE `expires` >= %i ORDER BY `expires` DESC LIMIT %i,%i", array($uoltime,$PageLimit,$Settings['max_memlist']));
+$rnquery = sql_pre_query("SELECT FOUND_ROWS();", array(null));
+$result=sql_query($query);
+$rnresult=sql_query($rnquery);
+$NumberMembers = sql_result($rnresult,0);
+sql_free_result($rnresult);
 $_SESSION['ViewingPage'] = url_maker(null,"no+ext","act=online&list=".$_GET['list']."&page=".$_GET['page'],"&","=",$prexqstr['member'],$exqstr['member']);
 if($Settings['file_ext']!="no+ext"&&$Settings['file_ext']!="no ext") {
 $_SESSION['ViewingFile'] = $exfile['member'].$Settings['file_ext']; }
@@ -307,7 +307,7 @@ if($pnum<$Settings['max_memlist']&&$pnum>0) {
        $Pages[$l] = $l; ++$l; } }
 $nums = $_GET['page'] * $Settings['max_memlist'];
 //End MemberList Page Code
-$num=mysql_num_rows($result);
+$num=sql_num_rows($result);
 //List Page Number Code Start
 $pagenum=count($Pages);
 if($_GET['page']>$pagenum) {
@@ -396,8 +396,8 @@ if($pagenum>1) {
 </tr>
 <?php
 while ($i < $num) {
-$session_data=mysql_result($result,$i,"session_data"); 
-$session_expires=mysql_result($result,$i,"expires"); 
+$session_data=sql_result($result,$i,"session_data"); 
+$session_expires=sql_result($result,$i,"expires"); 
 $session_expires = GMTimeChange("F j Y, g:i a",$session_expires,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
 $UserSessInfo = unserialize_session($session_data);
 if(!isset($UserSessInfo['UserGroup'])) { 
@@ -428,12 +428,12 @@ $PreExpPage = str_replace($qsep, "=", $PreExpPage);
 parse_str($PreExpPage,$ChkID);
 if($PreFileName==$exfile['topic'].$Settings['file_ext']) {
 if(isset($ChkID["id"])) { $ChkID = $ChkID["id"]; 
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `id`=%i LIMIT 1", array($ChkID));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `id`=%i LIMIT 1", array($ChkID));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
 if($prenum>=1) {
-$TopicForumID=mysql_result($preresult,0,"ForumID");
-$TopicCatID=mysql_result($preresult,0,"CategoryID"); }
+$TopicForumID=sql_result($preresult,0,"ForumID");
+$TopicCatID=sql_result($preresult,0,"CategoryID"); }
 if($prenum<1) {
 $TopicForumID=0;
 $TopicCatID=0; }
@@ -449,11 +449,11 @@ if($PermissionInfo['CanViewForum'][$TopicForumID]=="no"||
        $UserSessInfo['ViewingTitle'] = "Board index"; } } }
 if($PreFileName==$exfile['forum'].$Settings['file_ext']) {
 if(isset($ChkID["id"])) { $ChkID = $ChkID["id"]; 
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($ChkID));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
-$ForumCatID=mysql_result($preresult,0,"CategoryID");
-mysql_free_result($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($ChkID));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
+$ForumCatID=sql_result($preresult,0,"CategoryID");
+sql_free_result($preresult);
 if($CatPermissionInfo['CanViewCategory'][$ForumCatID]=="no"||
        $CatPermissionInfo['CanViewCategory'][$ForumCatID]!="yes") {
        $UserSessInfo['ViewingPage'] = url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']);
@@ -466,11 +466,11 @@ if($PermissionInfo['CanViewForum'][$ChkID]=="no"||
        $UserSessInfo['ViewingTitle'] = "Board index"; } } }
 if($PreFileName==$exfile['subforum'].$Settings['file_ext']) {
 if(isset($ChkID["id"])) { $ChkID = $ChkID["id"]; 
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($ChkID));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
-$ForumCatID=mysql_result($preresult,0,"CategoryID");
-mysql_free_result($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($ChkID));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
+$ForumCatID=sql_result($preresult,0,"CategoryID");
+sql_free_result($preresult);
 if($CatPermissionInfo['CanViewCategory'][$ForumCatID]=="no"||
        $CatPermissionInfo['CanViewCategory'][$ForumCatID]!="yes") {
        $UserSessInfo['ViewingPage'] = url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']);
@@ -541,43 +541,43 @@ if($pagenum>1) {
 <div class="DivPageLinks">&nbsp;</div>
 <?php } }
 if($_GET['act']=="view") { 
-$query = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_GET['id']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_GET['id']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
 if($num==0||$_GET['id']<=0) { 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']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
-$ViewMem['ID']=mysql_result($result,$i,"id");
-$ViewMem['Name']=mysql_result($result,$i,"Name");
-$ViewMem['Signature']=mysql_result($result,$i,"Signature");
-$ViewMem['Avatar']=mysql_result($result,$i,"Avatar");
-$ViewMem['AvatarSize']=mysql_result($result,$i,"AvatarSize");
-$ViewMem['Email']=mysql_result($result,$i,"Email");
-$ViewMem['GroupID']=mysql_result($result,$i,"GroupID");
-$ViewMem['HiddenMember']=mysql_result($result,$i,"HiddenMember");
-$ViewMem['WarnLevel']=mysql_result($result,$i,"WarnLevel");
-$ViewMem['Interests']=mysql_result($result,$i,"Interests");
-$ViewMem['Title']=mysql_result($result,$i,"Title");
-$ViewMem['Joined']=mysql_result($result,$i,"Joined");
+$ViewMem['ID']=sql_result($result,$i,"id");
+$ViewMem['Name']=sql_result($result,$i,"Name");
+$ViewMem['Signature']=sql_result($result,$i,"Signature");
+$ViewMem['Avatar']=sql_result($result,$i,"Avatar");
+$ViewMem['AvatarSize']=sql_result($result,$i,"AvatarSize");
+$ViewMem['Email']=sql_result($result,$i,"Email");
+$ViewMem['GroupID']=sql_result($result,$i,"GroupID");
+$ViewMem['HiddenMember']=sql_result($result,$i,"HiddenMember");
+$ViewMem['WarnLevel']=sql_result($result,$i,"WarnLevel");
+$ViewMem['Interests']=sql_result($result,$i,"Interests");
+$ViewMem['Title']=sql_result($result,$i,"Title");
+$ViewMem['Joined']=sql_result($result,$i,"Joined");
 $ViewMem['Joined']=GMTimeChange("M j Y, g:i a",$ViewMem['Joined'],$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
-$ViewMem['LastActive']=mysql_result($result,$i,"LastActive");
+$ViewMem['LastActive']=sql_result($result,$i,"LastActive");
 $ViewMem['LastActive']=GMTimeChange("M j Y, g:i a",$ViewMem['LastActive'],$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
-$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=exec_query($gquery);
-$ViewMem['Group']=mysql_result($gresult,0,"Name");
+$ViewMem['Website']=sql_result($result,$i,"Website");
+$ViewMem['Gender']=sql_result($result,$i,"Gender");
+$ViewMem['PostCount']=sql_result($result,$i,"PostCount");
+$ViewMem['Karma']=sql_result($result,$i,"Karma");
+$ViewMem['TimeZone']=sql_result($result,$i,"TimeZone");
+$ViewMem['DST']=sql_result($result,$i,"DST");
+$ViewMem['IP']=sql_result($result,$i,"IP");
+$gquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($ViewMem['GroupID']));
+$gresult=sql_query($gquery);
+$ViewMem['Group']=sql_result($gresult,0,"Name");
 /*
-$GroupNamePrefix=mysql_result($gresult,0,"NamePrefix");
-$GroupNameSuffix=mysql_result($gresult,0,"NameSuffix");
+$GroupNamePrefix=sql_result($gresult,0,"NamePrefix");
+$GroupNameSuffix=sql_result($gresult,0,"NameSuffix");
 */
-mysql_free_result($gresult);
+sql_free_result($gresult);
 /*
 if(isset($GroupNamePrefix)&&$GroupNamePrefix!=null) {
        $ViewMem['Name'] = $GroupNamePrefix.$ViewMem['Name']; }
@@ -671,7 +671,7 @@ Title: <?php echo $ViewMem['Title']; ?>
 <td class="TableColumn4" colspan="2">&nbsp;</td>
 </tr>
 </table></div>
-<?php } mysql_free_result($result);
+<?php } sql_free_result($result);
 if($_GET['act']=="logout") {
 session_unset();
 if($cookieDomain==null) {
@@ -846,18 +846,18 @@ $YourName = remove_spaces($YourName);
 $passtype="ODFH";
 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)); }
+$querylog = sql_pre_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=exec_query($querylog);
-$numlog=mysql_num_rows($resultlog);
+$querylog = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `Email`='%s' LIMIT 1", array($YourName)); }
+$resultlog=sql_query($querylog);
+$numlog=sql_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");
-$HashSalt=mysql_result($resultlog,$i,"Salt");
+$YourName=sql_result($resultlog,$i,"Name");
+$YourPassTry=sql_result($resultlog,$i,"Password");
+$HashType=sql_result($resultlog,$i,"HashType");
+$JoinedPass=sql_result($resultlog,$i,"Joined");
+$HashSalt=sql_result($resultlog,$i,"Salt");
 $UpdateHash = false;
 if($HashType=="ODFH") { $YourPassword = PassHash2x($_POST['userpass']); }
 if($HashType=="IPB2") { $YourPassword = hash2xkey($_POST['userpass'],$HashSalt); }
@@ -871,25 +871,25 @@ if($HashType=="iDBH386") { $YourPassword = b64e_hmac($_POST['userpass'],$JoinedP
 if($HashType=="iDBH512") { $YourPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$HashSalt,"sha512"); }
 if($YourPassword!=$YourPassTry) { $passright = false; } 
 if($YourPassword==$YourPassTry) { $passright = true;
-$YourIDM=mysql_result($resultlog,$i,"id");
-$YourNameM=mysql_result($resultlog,$i,"Name");
-$YourPassM=mysql_result($resultlog,$i,"Password");
-$PostCount=mysql_result($resultlog,$i,"PostCount");
-$YourGroupM=mysql_result($resultlog,$i,"GroupID");
+$YourIDM=sql_result($resultlog,$i,"id");
+$YourNameM=sql_result($resultlog,$i,"Name");
+$YourPassM=sql_result($resultlog,$i,"Password");
+$PostCount=sql_result($resultlog,$i,"PostCount");
+$YourGroupM=sql_result($resultlog,$i,"GroupID");
 $YourGroupIDM=$YourGroupM;
-$YourLastPostTime=mysql_result($resultlog,$i,"LastPostTime");
-$YourBanTime=mysql_result($resultlog,$i,"BanTime");
+$YourLastPostTime=sql_result($resultlog,$i,"LastPostTime");
+$YourBanTime=sql_result($resultlog,$i,"BanTime");
 $CGMTime = GMTimeStamp();
 if($YourBanTime!=0&&$YourBanTime!=null) {
 if($YourBanTime>=$CGMTime) { $BanError = "yes"; } }
-$gquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($YourGroupM));
-$gresult=exec_query($gquery);
-$YourGroupM=mysql_result($gresult,0,"Name");
-mysql_free_result($gresult);
-$YourTimeZoneM=mysql_result($resultlog,$i,"TimeZone");
-$YourDSTM=mysql_result($resultlog,$i,"DST");
-$JoinedDate=mysql_result($resultlog,$i,"Joined");
-$UseTheme=mysql_result($resultlog,$i,"UseTheme");
+$gquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($YourGroupM));
+$gresult=sql_query($gquery);
+$YourGroupM=sql_result($gresult,0,"Name");
+sql_free_result($gresult);
+$YourTimeZoneM=sql_result($resultlog,$i,"TimeZone");
+$YourDSTM=sql_result($resultlog,$i,"DST");
+$JoinedDate=sql_result($resultlog,$i,"Joined");
+$UseTheme=sql_result($resultlog,$i,"UseTheme");
 $NewHashSalt = salt_hmac();
 if($Settings['use_hashtype']=="md2") { $iDBHash = "iDBH2";
 $NewPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$NewHashSalt,"md2"); }
@@ -908,9 +908,9 @@ $NewPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$NewHashSalt,"sha512");
 $NewDay=GMTimeStamp();
 $NewIP=$_SERVER['REMOTE_ADDR'];
 if($BanError!="yes") {
-$queryup = query("UPDATE `".$Settings['sqltable']."members` SET `Password`='%s',`HashType`='%s',`LastActive`=%i,`IP`='%s',`Salt`='%s' WHERE `id`=%i", array($NewPassword,$iDBHash,$NewDay,$NewIP,$NewHashSalt,$YourIDM));
-exec_query($queryup);
-mysql_free_result($resultlog); mysql_free_result($queryup);
+$queryup = sql_pre_query("UPDATE `".$Settings['sqltable']."members` SET `Password`='%s',`HashType`='%s',`LastActive`=%i,`IP`='%s',`Salt`='%s' WHERE `id`=%i", array($NewPassword,$iDBHash,$NewDay,$NewIP,$NewHashSalt,$YourIDM));
+sql_query($queryup);
+sql_free_result($resultlog); sql_free_result($queryup);
 //session_regenerate_id();
 $_SESSION['Theme']=$UseTheme;
 $_SESSION['MemberName']=$YourNameM;
@@ -1199,17 +1199,17 @@ if (PhpCaptcha::Validate($_POST['signcode'])) {
 $Name = stripcslashes(htmlspecialchars($_POST['Name'], ENT_QUOTES, $Settings['charset']));
 //$Name = preg_replace("/&amp;#(x[a-f0-9]+|[0-9]+);/i", "&#$1;", $Name);
 $Name = remove_spaces($Name);
-$lonewolfqy=query("SELECT * FROM `".$Settings['sqltable']."restrictedwords` WHERE `RestrictedUserName`='yes'", array(null));
-$lonewolfrt=exec_query($lonewolfqy);
-$lonewolfnm=mysql_num_rows($lonewolfrt);
+$lonewolfqy=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."restrictedwords` WHERE `RestrictedUserName`='yes'", array(null));
+$lonewolfrt=sql_query($lonewolfqy);
+$lonewolfnm=sql_num_rows($lonewolfrt);
 $lonewolfs=0; $RMatches = null;
 while ($lonewolfs < $lonewolfnm) {
-$RWord=mysql_result($lonewolfrt,$lonewolfs,"Word");
-$RCaseInsensitive=mysql_result($lonewolfrt,$lonewolfs,"CaseInsensitive");
+$RWord=sql_result($lonewolfrt,$lonewolfs,"Word");
+$RCaseInsensitive=sql_result($lonewolfrt,$lonewolfs,"CaseInsensitive");
 if($RCaseInsensitive=="on") { $RCaseInsensitive = "yes"; }
 if($RCaseInsensitive=="off") { $RCaseInsensitive = "no"; }
 if($RCaseInsensitive!="yes"||$RCaseInsensitive!="no") { $RCaseInsensitive = "no"; }
-$RWholeWord=mysql_result($lonewolfrt,$lonewolfs,"WholeWord");
+$RWholeWord=sql_result($lonewolfrt,$lonewolfs,"WholeWord");
 if($RWholeWord=="on") { $RWholeWord = "yes"; }
 if($RWholeWord=="off") { $RWholeWord = "no"; }
 if($RWholeWord!="yes"||$RWholeWord!="no") { $RWholeWord = "no"; }
@@ -1226,12 +1226,12 @@ $RMatches = preg_match("/".$RWord."/", $Name);
 if($RCaseInsensitive=="yes"&&$RWholeWord!="yes") {
 $RMatches = preg_match("/".$RWord."/i", $Name);
        if($RMatches==true) { break 1; } }
-++$lonewolfs; } mysql_free_result($lonewolfrt);
-$sql_email_check = exec_query(query("SELECT `Email` FROM `".$Settings['sqltable']."members` WHERE `Email`='%s'", array($_POST['Email'])));
-$sql_username_check = exec_query(query("SELECT `Name` FROM `".$Settings['sqltable']."members` WHERE `Name`='%s'", array($Name)));
-$email_check = mysql_num_rows($sql_email_check); 
-$username_check = mysql_num_rows($sql_username_check);
-mysql_free_result($sql_email_check); mysql_free_result($sql_username_check);
+++$lonewolfs; } sql_free_result($lonewolfrt);
+$sql_email_check = sql_query(sql_pre_query("SELECT `Email` FROM `".$Settings['sqltable']."members` WHERE `Email`='%s'", array($_POST['Email'])));
+$sql_username_check = sql_query(sql_pre_query("SELECT `Name` FROM `".$Settings['sqltable']."members` WHERE `Name`='%s'", array($Name)));
+$email_check = sql_num_rows($sql_email_check); 
+$username_check = sql_num_rows($sql_username_check);
+sql_free_result($sql_email_check); sql_free_result($sql_username_check);
 if ($_POST['TOS']!="Agree") { $Error="Yes";  ?>
 <tr>
        <td><span class="TableMessage">
@@ -1327,11 +1327,11 @@ $Avatar = remove_spaces($Avatar);
 $Website = stripcslashes(htmlspecialchars($_POST['Website'], ENT_QUOTES, $Settings['charset']));
 //$Website = preg_replace("/&amp;#(x[a-f0-9]+|[0-9]+);/i", "&#$1;", $Website);
 $Website = remove_spaces($Website);
-$gquerys = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `Name`='%s' LIMIT 1", array($yourgroup));
-$gresults=exec_query($gquerys);
-$yourgroup=mysql_result($gresults,0,"id");
-mysql_free_result($gresults);
-$yourid = getnextid($Settings['sqltable'],"members");
+$gquerys = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `Name`='%s' LIMIT 1", array($yourgroup));
+$gresults=sql_query($gquerys);
+$yourgroup=sql_result($gresults,0,"id");
+sql_free_result($gresults);
+$yourid = sql_get_next_id($Settings['sqltable'],"members");
 $_POST['Interests'] = remove_spaces($_POST['Interests']);
 $_POST['Title'] = remove_spaces($_POST['Title']);
 $_POST['Email'] = remove_spaces($_POST['Email']);
@@ -1342,25 +1342,25 @@ 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` (`Name`, `Password`, `HashType`, `Email`, `GroupID`, `Validated`, `HiddenMember`, `WarnLevel`, `Interests`, `Title`, `Joined`, `LastActive`, `LastPostTime`, `BanTime`, `BirthDay`, `BirthMonth`, `BirthYear`, `Signature`, `Notes`, `Avatar`, `AvatarSize`, `Website`, `Gender`, `PostCount`, `Karma`, `KarmaUpdate`, `RepliesPerPage`, `TopicsPerPage`, `MessagesPerPage`, `TimeZone`, `DST`, `UseTheme`, `IP`, `Salt`) VALUES\n". 
+$query = sql_pre_query("INSERT INTO `".$Settings['sqltable']."members` (`Name`, `Password`, `HashType`, `Email`, `GroupID`, `Validated`, `HiddenMember`, `WarnLevel`, `Interests`, `Title`, `Joined`, `LastActive`, `LastPostTime`, `BanTime`, `BirthDay`, `BirthMonth`, `BirthYear`, `Signature`, `Notes`, `Avatar`, `AvatarSize`, `Website`, `Gender`, `PostCount`, `Karma`, `KarmaUpdate`, `RepliesPerPage`, `TopicsPerPage`, `MessagesPerPage`, `TimeZone`, `DST`, `UseTheme`, `IP`, `Salt`) VALUES\n". 
 "('%s', '%s', '%s', '%s', '%s', '%s', '%s', %i, '%s', '%s', %i, %i, '0', '0', '0', '0', '0', '%s', '%s', '%s', '%s', '%s', '%s', %i, 0, 0, 10, 10, 10, '%s', '%s', '%s', '%s', '%s')", array($Name,$NewPassword,$iDBHash,$_POST['Email'],$yourgroup,$ValidateStats,$HideMe,"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));
-exec_query($query);
-$querylogr = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `Name`='%s' AND `Password`='%s' LIMIT 1", array($Name,$NewPassword));
-$resultlogr=exec_query($querylogr);
-$numlogr=mysql_num_rows($resultlogr);
+sql_query($query);
+$querylogr = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `Name`='%s' AND `Password`='%s' LIMIT 1", array($Name,$NewPassword));
+$resultlogr=sql_query($querylogr);
+$numlogr=sql_num_rows($resultlogr);
 if($numlogr>=1) {
 $ir=0;
-$YourIDMr=mysql_result($resultlogr,$ir,"id");
-$YourNameMr=mysql_result($resultlogr,$ir,"Name");
-$YourGroupMr=mysql_result($resultlogr,$ir,"GroupID");
+$YourIDMr=sql_result($resultlogr,$ir,"id");
+$YourNameMr=sql_result($resultlogr,$ir,"Name");
+$YourGroupMr=sql_result($resultlogr,$ir,"GroupID");
 $YourGroupIDMr=$YourGroupMr;
-$gquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($YourGroupMr));
-$gresult=exec_query($gquery);
-$YourGroupMr=mysql_result($gresult,0,"Name");
-mysql_free_result($gresult);
-$YourTimeZoneMr=mysql_result($resultlogr,$ir,"TimeZone");
-$YourDSTMr=mysql_result($resultlogr,$ir,"DST"); }
-mysql_free_result($resultlogr);
+$gquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($YourGroupMr));
+$gresult=sql_query($gquery);
+$YourGroupMr=sql_result($gresult,0,"Name");
+sql_free_result($gresult);
+$YourTimeZoneMr=sql_result($resultlogr,$ir,"TimeZone");
+$YourDSTMr=sql_result($resultlogr,$ir,"DST"); }
+sql_free_result($resultlogr);
 session_regenerate_id(true);
 $_SESSION['Loggedin']=true;
 $_SESSION['MemberName']=$YourNameMr;

diff --git a/inc/misc/functions.php b/inc/misc/functions.php
index d3df85c..6b9f16f 100644 (file)
--- a/inc/misc/functions.php
+++ b/inc/misc/functions.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: functions.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: functions.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="functions.php"||$File3Name=="/functions.php") {
@@ -30,6 +30,7 @@ if ($File3Name==$FileName||$File3Name=="/".$FileName) {
        return true; } }
 CheckFile("functions.php");
 require($SettDir['misc']."compression.php");
+require($SettDir['misc']."mysql.php");
 /* 
 if ($_GET['act']=="DeleteSession") { session_destroy(); }
 if ($_GET['act']=="ResetSession") { session_unset(); }
@@ -38,15 +39,7 @@ if ($_GET['act']=="PHPInfo") { phpinfo(); exit(); }
 if ($_GET['act']=="phpinfo") { phpinfo(); exit(); }
 if ($_GET['act']=="PHPCredits") { phpcredits(); exit(); }
 if ($_GET['act']=="phpcredits") { phpcredits(); exit(); } 
-*/// Connect to mysql database
-function ConnectMysql($sqlhost,$sqluser,$sqlpass,$sqldb,$retlink=false) {
-if($retlink!==true) { $retlink = false; }
-$StatSQL = mysql_connect($sqlhost,$sqluser,$sqlpass);
-$StatBase = mysql_select_db($sqldb);
-if (!$StatSQL) { return false; }
-if (!$StatBase) { return false; }
-if($retlink===true) { return $StatSQL; }
-if($retlink===false) { return true; } }
+*/
        $Names['RS'] = "Renee Sabonis";
 define("_renee_", $Names['RS']);
 // Change the title and gzip page
@@ -102,133 +95,6 @@ if($use_gzip=="on") {
        $goutput = gzcompress($output); }
        echo $goutput; } }
 $foo="bar"; $$foo="foo";
-//SQL Functions might make it easy to port to other SQL systems.
-function sql_error($link) {
-if(isset($link)) {
-       $result = mysql_error($link); }
-if(!isset($link)) {
-       $result = mysql_error(); }
-if (!$result) {
-    trigger_error("Invalid query: ".mysql_error(),E_USER_ERROR);
-       return false; }
-       return $result; }
-// Execute a query :P
-$NumQueries = 0;
-/*
-Comment out untill I can change all calls to exec_query to sql_query.
-function sql_query($query,$link=null) {
-*/
-function exec_query($query,$link=null) {
-global $NumQueries;
-if(isset($link)) {
-       $result = mysql_query($query,$link); }
-if(!isset($link)) {
-       $result = mysql_query($query); }
-if (!$result) {
-    trigger_error("Invalid query: ".sql_error(),E_USER_ERROR);
-       return false; }
-if ($result) {
-       ++$NumQueries;
-       return $result; } }
-// Query Results :P
-function sql_result($result,$row,$field=0) {
-$value = mysql_result($result, $row, $field);
-if (!$value) {
-    trigger_error("Invalid query: ".sql_error(),E_USER_ERROR);
-       return false; }
-       return $value; }
-// Free Results :P
-function sql_free_result($result) {
-$fresult = mysql_free_result($result);
-if (!$fresult) {
-    trigger_error("Invalid query: ".sql_error(),E_USER_ERROR);
-       return false; }
-if ($fresult) {
-       return true; } }
-//Fetch Results to Array
-function sql_fetch_array($result,$result_type=MYSQL_BOTH) {
-$row = mysql_fetch_array($result,$result_type);
-if (!$row) {
-    trigger_error("Invalid query: ".sql_error(),E_USER_ERROR);
-       return false; }
-       return $row; }
-//Fetch Row Results
-function sql_fetch_row($result,$result_type=MYSQL_BOTH) {
-$row = mysql_fetch_array($result,$result_type);
-if (!$row) {
-    trigger_error("Invalid query: ".sql_error(),E_USER_ERROR);
-       return false; }
-       return $row; }
-//Fetch Row Results
-function sql_server_info($link) {
-if(isset($link)) {
-       $result = mysql_get_server_info($link); }
-if(!isset($link)) {
-       $result = mysql_get_server_info(); }
-if (!$result) {
-    trigger_error("Invalid query: ".sql_error(),E_USER_ERROR);
-       return false; }
-       return $result; }
-function sql_escape_string($string,$link) {
-if(isset($link)) {
-       $string = mysql_real_escape_string($string,$link); }
-if(!isset($link)) {
-       $string = mysql_real_escape_string($string); }
-if (!$result) {
-    trigger_error("Invalid query: ".sql_error(),E_USER_ERROR);
-       return false; }
-       return $string; }
-// SafeSQL Lite Source Code by Cool Dude 2k
-// Make SQL Query's safe
-/*
-Comment out untill I can change all calls to query to sql_pre_query.
-function sql_pre_query($query_string,$query_vars) {
-*/
-function query($query_string,$query_vars) {
-   $query_array = array(array("%i","%I","%F","%S"),array("%d","%d","%f","%s"));
-   $query_string = str_replace($query_array[0], $query_array[1], $query_string);
-   if (get_magic_quotes_gpc()) {
-       $query_vars  = array_map("stripslashes", $query_vars); }
-   $query_vars = array_map("mysql_real_escape_string", $query_vars);
-   $query_val = $query_vars;
-$query_num = count($query_val);
-$query_i = 0;
-while ($query_i < $query_num) {
-$query_is = $query_i+1;
-$query_val[$query_is] = $query_vars[$query_i];
-++$query_i; }
-   $query_val[0] = $query_string;
-   return call_user_func_array("sprintf",$query_val); }
-function sql_set_charset($charset,$link) {
-if(function_exists('mysql_set_charset')===false) {
-       $result = exec_query("SET CHARACTER SET '".$charset."'");
-if (!$result) {
-    trigger_error("Invalid query: ".sql_error(),E_USER_ERROR);
-       return false; }
-       $result = exec_query("SET NAMES '".$charset."'"); 
-if (!$result) {
-    trigger_error("Invalid query: ".sql_error(),E_USER_ERROR);
-       return false; }
-       return true; }
-if(function_exists('mysql_set_charset')===true) {
-if(isset($link)) {
-       $result = mysql_set_charset($charset,$link); }
-if(!isset($link)) {
-       $result = mysql_set_charset($charset); }
-if (!$result) {
-    trigger_error("Invalid query: ".sql_error(),E_USER_ERROR);
-       return false; }
-       return true; } }
-if(function_exists('mysql_set_charset')===false) {
-function mysql_set_charset($charset,$link) {
-if(isset($link)) {
-       $result = mysql_set_charset($charset,$link); }
-if(!isset($link)) {
-       $result = mysql_set_charset($charset); }
-if (!$result) {
-    trigger_error("Invalid query: ".sql_error(),E_USER_ERROR);
-       return false; }
-       return true; } }
        $Names['KP'] = "Kazuki Przyborowski";
 define("_kazuki_", $Names['KP']);
 // Kill bad vars for some functions
@@ -267,17 +133,17 @@ if(!in_array($theme,$cktheme)||strlen($theme)>26) {
 // Change the text to icons(smileys)
 function text2icons($Text,$sqlt) {
 global $Settings;
-$reneequery=query("SELECT * FROM `".$sqlt."smileys`", array(null));
-$reneeresult=exec_query($reneequery);
-$reneenum=mysql_num_rows($reneeresult);
+$reneequery=sql_pre_query("SELECT * FROM `".$sqlt."smileys`", array(null));
+$reneeresult=sql_query($reneequery);
+$reneenum=sql_num_rows($reneeresult);
 $renees=0;
 while ($renees < $reneenum) {
-$FileName=mysql_result($reneeresult,$renees,"FileName");
-$SmileName=mysql_result($reneeresult,$renees,"SmileName");
-$SmileText=mysql_result($reneeresult,$renees,"SmileText");
-$SmileDirectory=mysql_result($reneeresult,$renees,"Directory");
-$ShowSmile=mysql_result($reneeresult,$renees,"Show");
-$ReplaceType=mysql_result($reneeresult,$renees,"ReplaceCI");
+$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,"Show");
+$ReplaceType=sql_result($reneeresult,$renees,"ReplaceCI");
 if($ReplaceType=="on") { $ReplaceType = "yes"; }
 if($ReplaceType=="off") { $ReplaceType = "no"; }
 if($ReplaceType!="yes"||$ReplaceType!="no") { $ReplaceType = "no"; }
@@ -338,20 +204,6 @@ $text = preg_replace("/".$fixamps1[$ampi]."/i", $fixamps2[$ampi], $text);
 ++$ampi; }
 $text = preg_replace("/&amp;#(x[a-f0-9]+|[0-9]+);/i", "&#$1;", $text);
 return $text; }
-// Get next id for stuff
-function getnextid($tablepre,$table) {
-   $getnextidq = query("SHOW TABLE STATUS LIKE '".$tablepre.$table."'", array());
-   $getnextidr = exec_query($getnextidq);
-   $getnextid = mysql_fetch_assoc($getnextidr);
-   return $getnextid['Auto_increment'];
-   mysql_free_result($getnextidr); }
-// Get number of rows for table
-function getnumrows($tablepre,$table) {
-   $getnextidq = query("SHOW TABLE STATUS LIKE '".$tablepre.$table."'", array());
-   $getnextidr = exec_query($getnextidq);
-   $getnextid = mysql_fetch_assoc($getnextidr);
-   return $getnextid['Rows'];
-   mysql_free_result($getnextidr); }
        $Names['K'] = "Katarzyna";
 define("_katarzyna_", $Names['K']);
 // Change Time Stamp to a readable time
@@ -457,16 +309,16 @@ $phpsrcs = preg_replace("/\<\/font>/i", "</span>", $phpsrcs);
 return $phpsrcs; }
 // Check to see if the user is hidden/shy. >_> | ^_^ | <_<
 function GetUserName($idu,$sqlt) { $UsersName = null;
-$gunquery = query("SELECT * FROM `".$sqlt."members` WHERE `id`=%i LIMIT 1", array($idu));
-$gunresult=exec_query($gunquery);
-$gunnum=mysql_num_rows($gunresult);
+$gunquery = sql_pre_query("SELECT * FROM `".$sqlt."members` WHERE `id`=%i LIMIT 1", array($idu));
+$gunresult=sql_query($gunquery);
+$gunnum=sql_num_rows($gunresult);
 // I'm now hidden from you. ^_^ | <_< I cant find you.
 $UsersHidden = "yes";
 if($gunnum>0){
-$UsersName=mysql_result($gunresult,0,"Name");
+$UsersName=sql_result($gunresult,0,"Name");
 // Am i still hidden. o_O <_< I see you.
-$UsersHidden=mysql_result($gunresult,0,"HiddenMember"); }
-mysql_free_result($gunresult);
+$UsersHidden=sql_result($gunresult,0,"HiddenMember"); }
+sql_free_result($gunresult);
 $UsersInfo['Name'] = $UsersName;
 $UsersInfo['Hidden'] = $UsersHidden;
 return $UsersInfo; }
@@ -554,11 +406,6 @@ if(!is_array($search)&&!is_array($replace)) {
 $search = preg_quote($search, "/");
 $subject = preg_replace("/".$search."/i", $replace, $subject); }
 return $subject; } }
-/*   Adds mysql_set_charset to PHP below Ver. 5.2.3 - by: Janez R.      // 
-//   http://us.php.net/manual/en/function.mysql-set-charset.php#77565   */
-if (!function_exists('mysql_set_charset')) {
-  function mysql_set_charset($charset) {
-    return exec_query("set names $charset"); } }
 /*   Adds httponly to PHP below Ver. 5.2.0   // 
 //       by Kazuki Przyborowski - Cool Dude 2k      */
 function http_set_cookie($name,$value=null,$expire=null,$path=null,$domain=null,$secure=false,$httponly=false) {
@@ -589,4 +436,4 @@ function dump_included_files() {    return var_dump(get_included_files()); }
 function count_included_files() {      return count(get_included_files()); }
 function dump_extensions() {   return var_dump(get_loaded_extensions()); }
 function count_extensions() {  return count(get_loaded_extensions()); }
-?>
+?>
\ No newline at end of file

diff --git a/inc/misc/mysql.php b/inc/misc/mysql.php
index 330abbe..6fb4a9a 100644 (file)
--- a/inc/misc/mysql.php
+++ b/inc/misc/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: 11/22/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: mysql.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="mysql.php"||$File3Name=="/mysql.php") {
@@ -106,8 +106,8 @@ function sql_fetch_assoc($result) {
 $row = mysql_fetch_assoc($result);
        return $row; }
 //Fetch Row Results
-function sql_fetch_row($result,$result_type=MYSQL_BOTH) {
-$row = mysql_fetch_row($result,$result_type);
+function sql_fetch_row($result) {
+$row = mysql_fetch_row($result);
        return $row; }
 //Fetch Row Results
 function sql_server_info($link) {
@@ -116,7 +116,7 @@ if(isset($link)) {
 if(!isset($link)) {
        $result = mysql_get_server_info(); }
        return $result; }
-function sql_escape_string($string,$link) {
+function sql_escape_string($string,$link=null) {
 if(isset($link)) {
        $string = mysql_real_escape_string($string,$link); }
 if(!isset($link)) {
@@ -142,7 +142,7 @@ $query_val[$query_is] = $query_vars[$query_i];
 ++$query_i; }
    $query_val[0] = $query_string;
    return call_user_func_array("sprintf",$query_val); }
-function sql_set_charset($charset,$link) {
+function sql_set_charset($charset,$link=null) {
 if(function_exists('mysql_set_charset')===false) {
        $result = sql_query("SET CHARACTER SET '".$charset."'");
 if ($result===false) {

diff --git a/inc/navbar.php b/inc/navbar.php
index dc3fb3b..a8883d1 100644 (file)
--- a/inc/navbar.php
+++ b/inc/navbar.php
@@ -11,21 +11,21 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: navbar.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: navbar.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="navbar.php"||$File3Name=="/navbar.php") {
        require('index.php');
        exit(); }
 if($_SESSION['UserGroup']!=$Settings['GuestGroup']||$GroupInfo['CanPM']=="yes") {
-$pmquery1 = query("SELECT * FROM `".$Settings['sqltable']."messenger` WHERE `ReciverID`=%i AND `Read`=0", array($_SESSION['UserID']));
-$pmresult1=exec_query($pmquery1);
-$PMNumber=mysql_num_rows($pmresult1);
-mysql_free_result($pmresult1); /*
-$pmquery2 = query("SELECT * FROM `".$Settings['sqltable']."messenger` WHERE `SenderID`=%i AND `Read`=0", array($_SESSION['UserID']));
-$pmresult2=exec_query($pmquery2);
-$SentPMNumber=mysql_num_rows($pmresult2);
-mysql_free_result($pmresult2); */ }
+$pmquery1 = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."messenger` WHERE `ReciverID`=%i AND `Read`=0", array($_SESSION['UserID']));
+$pmresult1=sql_query($pmquery1);
+$PMNumber=sql_num_rows($pmresult1);
+sql_free_result($pmresult1); /*
+$pmquery2 = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."messenger` WHERE `SenderID`=%i AND `Read`=0", array($_SESSION['UserID']));
+$pmresult2=sql_query($pmquery2);
+$SentPMNumber=sql_num_rows($pmresult2);
+sql_free_result($pmresult2); */ }
 if($ThemeSet['LogoStyle']==null) { $logostyle = ""; }
 if($ThemeSet['LogoStyle']!=null) { $logostyle = "style=\"".$ThemeSet['LogoStyle']."\" "; }
 // Am I hidden from everyone

diff --git a/inc/pm.php b/inc/pm.php
index 5157197..0f86848 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/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: pm.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="pm.php"||$File3Name=="/pm.php") {
@@ -67,16 +67,16 @@ if($_GET['act']=="view") {
 //Get SQL LIMIT Number
 $nums = $_GET['page'] * $Settings['max_pmlist'];
 $PageLimit = $nums - $Settings['max_pmlist'];
-$query = query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."messenger` WHERE `ReciverID`=%i ORDER BY `DateSend` DESC LIMIT %i,%i", array($_SESSION['UserID'],$PageLimit,$Settings['max_pmlist']));
-$rnquery = query("SELECT FOUND_ROWS();", array(null));
-$result=exec_query($query);
-$rnresult=exec_query($rnquery);
-$NumberMessage = mysql_result($rnresult,0);
-mysql_free_result($rnresult);
+$query = sql_pre_query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."messenger` WHERE `ReciverID`=%i ORDER BY `DateSend` DESC LIMIT %i,%i", array($_SESSION['UserID'],$PageLimit,$Settings['max_pmlist']));
+$rnquery = sql_pre_query("SELECT FOUND_ROWS();", array(null));
+$result=sql_query($query);
+$rnresult=sql_query($rnquery);
+$NumberMessage = sql_result($rnresult,0);
+sql_free_result($rnresult);
 if($NumberMessage==null) { 
        $NumberMessage = 0; }
 $num = $NumberMessage;
-$num=mysql_num_rows($result);
+$num=sql_num_rows($result);
 //Start MessengerList Page Code
 if(!isset($Settings['max_pmlist'])) { $Settings['max_pmlist'] = 10; }
 if($_GET['page']==null) { $_GET['page'] = 1; } 
@@ -99,7 +99,7 @@ if($pnum<$Settings['max_pmlist']&&$pnum>0) {
        $pnum = $pnum - $pnum; 
        $Pages[$l] = $l; ++$l; } }
 //End MessengerList Page Code
-$num=mysql_num_rows($result);
+$num=sql_num_rows($result);
 $i=0;
 //List Page Number Code Start
 $pagenum=count($Pages);
@@ -185,25 +185,25 @@ if($pagenum>1) {
 </tr>
 <?php
 while ($i < $num) {
-$PMID=mysql_result($result,$i,"id");
-$SenderID=mysql_result($result,$i,"SenderID");
+$PMID=sql_result($result,$i,"id");
+$SenderID=sql_result($result,$i,"SenderID");
 $PreSenderName = GetUserName($SenderID,$Settings['sqltable']);
 if($PreSenderName['Name']===null) { $SenderID = -1;
 $PreSenderName = GetUserName($SenderID,$Settings['sqltable']); }
 $SenderName = $PreSenderName['Name'];
 $SenderHidden = $PreSenderName['Hidden'];
-$ReciverID=mysql_result($result,$i,"ReciverID");
+$ReciverID=sql_result($result,$i,"ReciverID");
 $PreReciverName = GetUserName($ReciverID,$Settings['sqltable']);
 if($PreReciverName['Name']===null) { $ReciverID = -1;
 $PreReciverName = GetUserName($ReciverID,$Settings['sqltable']); }
 $ReciverName = $PreReciverName['Name'];
 $ReciverHidden = $PreReciverName['Hidden'];
-$PMGuest=mysql_result($result,$i,"GuestName");
-$MessageName=mysql_result($result,$i,"MessageTitle");
-$MessageDesc=mysql_result($result,$i,"Description");
-$DateSend=mysql_result($result,$i,"DateSend");
+$PMGuest=sql_result($result,$i,"GuestName");
+$MessageName=sql_result($result,$i,"MessageTitle");
+$MessageDesc=sql_result($result,$i,"Description");
+$DateSend=sql_result($result,$i,"DateSend");
 $DateSend=GMTimeChange("F j, Y, g:i a",$DateSend,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
-$MessageStat=mysql_result($result,$i,"Read");
+$MessageStat=sql_result($result,$i,"Read");
 if($SenderName=="Guest") { $SenderName=$PMGuest;
 if($SenderName==null) { $SenderName="Guest"; } }
 $PreMessage = $ThemeSet['MessageUnread'];
@@ -228,7 +228,7 @@ echo "<span>".$SenderName."</span>"; }
 ?></td>
 <td class="TableMenuColumn3" style="text-align: center;"><?php echo $DateSend; ?></td>
 </tr>
-<?php ++$i; } mysql_free_result($result); ?>
+<?php ++$i; } sql_free_result($result); ?>
 <tr id="MessengerEnd" class="TableMenuRow4">
 <td class="TableMenuColumn4" colspan="4">&nbsp;</td>
 </tr>
@@ -237,16 +237,16 @@ if($_GET['act']=="viewsent") {
 //Get SQL LIMIT Number
 $nums = $_GET['page'] * $Settings['max_pmlist'];
 $PageLimit = $nums - $Settings['max_pmlist'];
-$query = query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."messenger` WHERE `SenderID`=%i ORDER BY `DateSend` DESC LIMIT %i,%i", array($_SESSION['UserID'],$PageLimit,$Settings['max_pmlist']));
-$rnquery = query("SELECT FOUND_ROWS();", array(null));
-$result=exec_query($query);
-$rnresult=exec_query($rnquery);
-$NumberMessage = mysql_result($rnresult,0);
-mysql_free_result($rnresult);
+$query = sql_pre_query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."messenger` WHERE `SenderID`=%i ORDER BY `DateSend` DESC LIMIT %i,%i", array($_SESSION['UserID'],$PageLimit,$Settings['max_pmlist']));
+$rnquery = sql_pre_query("SELECT FOUND_ROWS();", array(null));
+$result=sql_query($query);
+$rnresult=sql_query($rnquery);
+$NumberMessage = sql_result($rnresult,0);
+sql_free_result($rnresult);
 if($NumberMessage==null) { 
        $NumberMessage = 0; }
 $num = $NumberMessage;
-$num=mysql_num_rows($result);
+$num=sql_num_rows($result);
 //Start MessengerList Page Code
 if(!isset($Settings['max_pmlist'])) { $Settings['max_pmlist'] = 10; }
 if($_GET['page']==null) { $_GET['page'] = 1; } 
@@ -269,7 +269,7 @@ if($pnum<$Settings['max_pmlist']&&$pnum>0) {
        $pnum = $pnum - $pnum; 
        $Pages[$l] = $l; ++$l; } }
 //End MessengerList Page Code
-$num=mysql_num_rows($result);
+$num=sql_num_rows($result);
 $i=0;
 //List Page Number Code Start
 $pagenum=count($Pages);
@@ -355,25 +355,25 @@ if($pagenum>1) {
 </tr>
 <?php
 while ($i < $num) {
-$PMID=mysql_result($result,$i,"id");
-$SenderID=mysql_result($result,$i,"SenderID");
+$PMID=sql_result($result,$i,"id");
+$SenderID=sql_result($result,$i,"SenderID");
 $PreSenderName = GetUserName($SenderID,$Settings['sqltable']);
 if($PreSenderName['Name']===null) { $SenderID = -1;
 $PreSenderName = GetUserName($SenderID,$Settings['sqltable']); }
 $SenderName = $PreSenderName['Name'];
 $SenderHidden = $PreSenderName['Hidden'];
-$ReciverID=mysql_result($result,$i,"ReciverID");
+$ReciverID=sql_result($result,$i,"ReciverID");
 $PreReciverName = GetUserName($ReciverID,$Settings['sqltable']);
 if($PreReciverName['Name']===null) { $ReciverID = -1;
 $PreReciverName = GetUserName($ReciverID,$Settings['sqltable']); }
 $ReciverName = $PreReciverName['Name'];
 $ReciverHidden = $PreReciverName['Hidden'];
-$PMGuest=mysql_result($result,$i,"GuestName");
-$MessageName=mysql_result($result,$i,"MessageTitle");
-$MessageDesc=mysql_result($result,$i,"Description");
-$DateSend=mysql_result($result,$i,"DateSend");
+$PMGuest=sql_result($result,$i,"GuestName");
+$MessageName=sql_result($result,$i,"MessageTitle");
+$MessageDesc=sql_result($result,$i,"Description");
+$DateSend=sql_result($result,$i,"DateSend");
 $DateSend=GMTimeChange("F j, Y, g:i a",$DateSend,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
-$MessageStat=mysql_result($result,$i,"Read");
+$MessageStat=sql_result($result,$i,"Read");
 if($SenderName=="Guest") { $SenderName=$PMGuest;
 if($SenderName==null) { $SenderName="Guest"; } }
 $PreMessage = $ThemeSet['MessageUnread'];
@@ -402,39 +402,39 @@ echo "<span>".$ReciverName."</span>"; }
 <tr id="MessengerEnd" class="TableMenuRow4">
 <td class="TableMenuColumn4" colspan="4">&nbsp;</td>
 </tr>
-<?php } mysql_free_result($result);
+<?php } sql_free_result($result);
 if($_GET['act']=="read") {
-$query = query("SELECT * FROM `".$Settings['sqltable']."messenger` WHERE `id`=%i", array($_GET['id']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."messenger` WHERE `id`=%i", array($_GET['id']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $is=0;
 if($num==0) { 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']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 while ($is < $num) {
-$PMID=mysql_result($result,$is,"id");
-$SenderID=mysql_result($result,$is,"SenderID");
+$PMID=sql_result($result,$is,"id");
+$SenderID=sql_result($result,$is,"SenderID");
 $PreSenderName = GetUserName($SenderID,$Settings['sqltable']);
 if($PreSenderName['Name']===null) { $SenderID = -1;
 $PreSenderName = GetUserName($SenderID,$Settings['sqltable']); }
 $SenderName = $PreSenderName['Name'];
 $SenderHidden = $PreSenderName['Hidden'];
-$ReciverID=mysql_result($result,$is,"ReciverID");
+$ReciverID=sql_result($result,$is,"ReciverID");
 $PreReciverName = GetUserName($ReciverID,$Settings['sqltable']);
 if($PreReciverName['Name']===null) { $ReciverID = -1;
 $PreReciverName = GetUserName($ReciverID,$Settings['sqltable']); }
 $ReciverName = $PreReciverName['Name'];
 $ReciverHidden = $PreReciverName['Hidden'];
-$PMGuest=mysql_result($result,$is,"GuestName");
-$MessageName=mysql_result($result,$is,"MessageTitle");
-$DateSend=mysql_result($result,$is,"DateSend");
+$PMGuest=sql_result($result,$is,"GuestName");
+$MessageName=sql_result($result,$is,"MessageTitle");
+$DateSend=sql_result($result,$is,"DateSend");
 $DateSend=GMTimeChange("F j, Y, g:i a",$DateSend,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
-$MessageText=mysql_result($result,$is,"MessageText");
+$MessageText=sql_result($result,$is,"MessageText");
 $MessageText = preg_replace("/\<br\>/", "<br />", nl2br($MessageText));
-$MessageDesc=mysql_result($result,$is,"Description");
-$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i", array($SenderID));
-$reresult=exec_query($requery);
-$renum=mysql_num_rows($reresult);
+$MessageDesc=sql_result($result,$is,"Description");
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i", array($SenderID));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult);
 $rei=0;
 if($_SESSION['UserID']!=$ReciverID&&
        $_SESSION['UserID']!=$SenderID) {
@@ -443,40 +443,40 @@ ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 while ($rei < $renum) {
 $User1ID=$SenderID;
-$User1Name=mysql_result($reresult,$rei,"Name");
+$User1Name=sql_result($reresult,$rei,"Name");
 $SenderName = $User1Name;
-$User1IP=mysql_result($reresult,$rei,"IP");
-$User1Email=mysql_result($reresult,$rei,"Email");
-$User1Title=mysql_result($reresult,$rei,"Title");
-$User1Joined=mysql_result($reresult,$rei,"Joined");
+$User1IP=sql_result($reresult,$rei,"IP");
+$User1Email=sql_result($reresult,$rei,"Email");
+$User1Title=sql_result($reresult,$rei,"Title");
+$User1Joined=sql_result($reresult,$rei,"Joined");
 $User1Joined=GMTimeChange("M j Y",$User1Joined,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
-$User1GroupID=mysql_result($reresult,$rei,"GroupID");
-$User1Hidden=mysql_result($reresult,$rei,"HiddenMember");
+$User1GroupID=sql_result($reresult,$rei,"GroupID");
+$User1Hidden=sql_result($reresult,$rei,"HiddenMember");
 $SenderHidden = $User1Hidden;
-$gquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i", array($User1GroupID));
-$gresult=exec_query($gquery);
-$User1Group=mysql_result($gresult,0,"Name");
-$GroupNamePrefix=mysql_result($gresult,0,"NamePrefix");
-$GroupNameSuffix=mysql_result($gresult,0,"NameSuffix");
-mysql_free_result($gresult);
-$User1Signature=mysql_result($reresult,$rei,"Signature");
-$User1Avatar=mysql_result($reresult,$rei,"Avatar");
-$User1AvatarSize=mysql_result($reresult,$rei,"AvatarSize");
+$gquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i", array($User1GroupID));
+$gresult=sql_query($gquery);
+$User1Group=sql_result($gresult,0,"Name");
+$GroupNamePrefix=sql_result($gresult,0,"NamePrefix");
+$GroupNameSuffix=sql_result($gresult,0,"NameSuffix");
+sql_free_result($gresult);
+$User1Signature=sql_result($reresult,$rei,"Signature");
+$User1Avatar=sql_result($reresult,$rei,"Avatar");
+$User1AvatarSize=sql_result($reresult,$rei,"AvatarSize");
 if ($User1Avatar=="http://"||$User1Avatar==null||
        strtolower($User1Avatar)=="noavatar") {
 $User1Avatar=$ThemeSet['NoAvatar'];
 $User1AvatarSize=$ThemeSet['NoAvatarSize']; }
 $AvatarSize1=explode("x", $User1AvatarSize);
 $AvatarSize1W=$AvatarSize1[0]; $AvatarSize1H=$AvatarSize1[1];
-$User1Website=mysql_result($reresult,$rei,"Website");
-$User1PostCount=mysql_result($reresult,$rei,"PostCount");
-$User1Karma=mysql_result($reresult,$rei,"Karma");
-$User1IP=mysql_result($reresult,$rei,"IP");
-++$rei; } mysql_free_result($reresult);
-++$is; } mysql_free_result($result);
+$User1Website=sql_result($reresult,$rei,"Website");
+$User1PostCount=sql_result($reresult,$rei,"PostCount");
+$User1Karma=sql_result($reresult,$rei,"Karma");
+$User1IP=sql_result($reresult,$rei,"IP");
+++$rei; } sql_free_result($reresult);
+++$is; } sql_free_result($result);
 if($_SESSION['UserID']==$ReciverID) {
-$queryup = query("UPDATE `".$Settings['sqltable']."messenger` SET `Read`=%i WHERE `id`=%i", array(1,$_GET['id']));
-exec_query($queryup); }
+$queryup = sql_pre_query("UPDATE `".$Settings['sqltable']."messenger` SET `Read`=%i WHERE `id`=%i", array(1,$_GET['id']));
+sql_query($queryup); }
 if($User1Name=="Guest") { $User1Name=$PMGuest;
 if($User1Name==null) { $User1Name="Guest"; } }
 if(isset($GroupNamePrefix)&&$GroupNamePrefix!=null) {
@@ -574,15 +574,15 @@ echo url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr
 <?php } if($_GET['act']=="create") { 
 $SendMessageTo = null;
 if($_GET['id']!=null&&$_GET['id']!=-1) {
-$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i", array($_GET['id']));
-$reresult=exec_query($requery);
-$renum=mysql_num_rows($reresult);
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i", array($_GET['id']));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult);
 $rei=0;
 while ($rei < $renum) {
-$SendMessageTo = mysql_result($reresult,$rei,"Name");
+$SendMessageTo = sql_result($reresult,$rei,"Name");
 $SendMessageTo = htmlspecialchars($SendMessageTo, ENT_QUOTES, $Settings['charset']);
-$SendToGroupID = mysql_result($reresult,$rei,"GroupID");
-++$rei; } } mysql_free_result($reresult);
+$SendToGroupID = sql_result($reresult,$rei,"GroupID");
+++$rei; } } sql_free_result($reresult);
 if(!isset($renum)) { $renum = 0; }
 if($renum==0) { $SendMessageTo = null; }
 $QuoteReply = null; $QuoteDescription = null; $QuoteTitle = null;
@@ -591,15 +591,15 @@ if(isset($SendMessageTo)) {
 $QuoteUserName = $SendMessageTo; }
 if(!isset($SendMessageTo)) {
 $QuoteUserName = "Unknown"; }
-$query = query("SELECT * FROM `".$Settings['sqltable']."messenger` WHERE `id`=%i", array($_GET['post']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
-$QuoteTitle=mysql_result($result,0,"MessageTitle");
-$MessageText=mysql_result($result,0,"MessageText");
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."messenger` WHERE `id`=%i", array($_GET['post']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
+$QuoteTitle=sql_result($result,0,"MessageTitle");
+$MessageText=sql_result($result,0,"MessageText");
 $QuoteReply = preg_replace("/\<br\>/", "<br />", nl2br($MessageText));
-$QuoteDescription=mysql_result($result,0,"Description");
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$QuoteDescription=sql_result($result,0,"Description");
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $QuoteReply = remove_bad_entities($QuoteReply);
 $QuoteDescription = str_replace("Re: ","",$QuoteDescription);
 $QuoteDescription = "Re: ".$QuoteDescription;
@@ -629,17 +629,17 @@ $_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=query("SELECT * FROM `".$Settings['sqltable']."smileys` WHERE `Show`='yes'", array(null));
-$renee_result=exec_query($renee_query);
-$renee_num=mysql_num_rows($renee_result);
+$renee_query=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."smileys` WHERE `Show`='yes'", array(null));
+$renee_result=sql_query($renee_query);
+$renee_num=sql_num_rows($renee_result);
 $renee_s=0; $SmileRow=0; $SmileCRow=0;
 while ($renee_s < $renee_num) { ++$SmileRow;
-$FileName=mysql_result($renee_result,$renee_s,"FileName");
-$SmileName=mysql_result($renee_result,$renee_s,"SmileName");
-$SmileText=mysql_result($renee_result,$renee_s,"SmileText");
-$SmileDirectory=mysql_result($renee_result,$renee_s,"Directory");
-$ShowSmile=mysql_result($renee_result,$renee_s,"Show");
-$ReplaceType=mysql_result($renee_result,$renee_s,"ReplaceCI");
+$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,"Show");
+$ReplaceType=sql_result($renee_result,$renee_s,"ReplaceCI");
 if($SmileRow==1) { ?><tr>
        <?php } if($SmileRow<5) { ++$SmileCRow; ?>
        <td>&nbsp;<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;</td>
@@ -651,7 +651,7 @@ if($SmileCRow<5&&$SmileCRow!=0) {
 $SmileCRowL = 5 - $SmileCRow;
 echo "<td colspan=\"".$SmileCRowL."\">&nbsp;</td></tr>"; }
 echo "</table>";
-mysql_free_result($renee_result);
+sql_free_result($renee_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']); ?>">
@@ -805,18 +805,18 @@ setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir);
 $_SESSION['GuestName']=$_POST['GuestName']; } }
 /*    <_<  iWordFilter  >_>      
    by Kazuki Przyborowski - Cool Dude 2k */
-$katarzynaqy=query("SELECT * FROM `".$Settings['sqltable']."wordfilter`", array(null));
-$katarzynart=exec_query($katarzynaqy);
-$katarzynanm=mysql_num_rows($katarzynart);
+$katarzynaqy=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."wordfilter`", array(null));
+$katarzynart=sql_query($katarzynaqy);
+$katarzynanm=sql_num_rows($katarzynart);
 $katarzynas=0;
 while ($katarzynas < $katarzynanm) {
-$Filter=mysql_result($katarzynart,$katarzynas,"Filter");
-$Replace=mysql_result($katarzynart,$katarzynas,"Replace");
-$CaseInsensitive=mysql_result($katarzynart,$katarzynas,"CaseInsensitive");
+$Filter=sql_result($katarzynart,$katarzynas,"Filter");
+$Replace=sql_result($katarzynart,$katarzynas,"Replace");
+$CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
 if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
 if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
 if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; }
-$WholeWord=mysql_result($katarzynart,$katarzynas,"WholeWord");
+$WholeWord=sql_result($katarzynart,$katarzynas,"WholeWord");
 if($WholeWord=="on") { $WholeWord = "yes"; }
 if($WholeWord=="off") { $WholeWord = "no"; }
 if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; }
@@ -833,26 +833,26 @@ $_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; } mysql_free_result($katarzynart);
-$lonewolfqy=query("SELECT * FROM `".$Settings['sqltable']."restrictedwords` WHERE `RestrictedMessageName`='yes' or `RestrictedUserName`='yes'", array(null));
-$lonewolfrt=exec_query($lonewolfqy);
-$lonewolfnm=mysql_num_rows($lonewolfrt);
+++$katarzynas; } sql_free_result($katarzynart);
+$lonewolfqy=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."restrictedwords` WHERE `RestrictedMessageName`='yes' or `RestrictedUserName`='yes'", array(null));
+$lonewolfrt=sql_query($lonewolfqy);
+$lonewolfnm=sql_num_rows($lonewolfrt);
 $lonewolfs=0; $RMatches = null; $RGMatches = null;
 while ($lonewolfs < $lonewolfnm) {
-$RWord=mysql_result($lonewolfrt,$lonewolfs,"Word");
-$RCaseInsensitive=mysql_result($lonewolfrt,$lonewolfs,"CaseInsensitive");
+$RWord=sql_result($lonewolfrt,$lonewolfs,"Word");
+$RCaseInsensitive=sql_result($lonewolfrt,$lonewolfs,"CaseInsensitive");
 if($RCaseInsensitive=="on") { $RCaseInsensitive = "yes"; }
 if($RCaseInsensitive=="off") { $RCaseInsensitive = "no"; }
 if($RCaseInsensitive!="yes"||$RCaseInsensitive!="no") { $RCaseInsensitive = "no"; }
-$RWholeWord=mysql_result($lonewolfrt,$lonewolfs,"WholeWord");
+$RWholeWord=sql_result($lonewolfrt,$lonewolfs,"WholeWord");
 if($RWholeWord=="on") { $RWholeWord = "yes"; }
 if($RWholeWord=="off") { $RWholeWord = "no"; }
 if($RWholeWord!="yes"||$RWholeWord!="no") { $RWholeWord = "no"; }
-$RestrictedMessageName=mysql_result($lonewolfrt,$lonewolfs,"RestrictedMessageName");
+$RestrictedMessageName=sql_result($lonewolfrt,$lonewolfs,"RestrictedMessageName");
 if($RestrictedMessageName=="on") { $RestrictedMessageName = "yes"; }
 if($RestrictedMessageName=="off") { $RestrictedMessageName = "no"; }
 if($RestrictedMessageName!="yes"||$RestrictedMessageName!="no") { $RestrictedMessageName = "no"; }
-$RestrictedUserName=mysql_result($lonewolfrt,$lonewolfs,"RestrictedUserName");
+$RestrictedUserName=sql_result($lonewolfrt,$lonewolfs,"RestrictedUserName");
 if($RestrictedUserName=="on") { $RestrictedUserName = "yes"; }
 if($RestrictedUserName=="off") { $RestrictedUserName = "no"; }
 if($RestrictedUserName!="yes"||$RestrictedUserName!="no") { $RestrictedUserName = "no"; }
@@ -885,22 +885,22 @@ $RMatches = preg_match("/".$RWord."/i", $_POST['MessageName']);
 if($RestrictedUserName=="yes") {
 $RGMatches = preg_match("/".$RWord."/i", $_POST['GuestName']);
        if($RGMatches==true) { break 1; } } }
-++$lonewolfs; } mysql_free_result($lonewolfrt);
-$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `Name`='%s'", array($_POST['SendMessageTo']));
-$reresult=exec_query($requery);
-$renum=mysql_num_rows($reresult);
+++$lonewolfs; } sql_free_result($lonewolfrt);
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `Name`='%s'", array($_POST['SendMessageTo']));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult);
 $rei=0;
 while ($rei < $renum) {
-$SendMessageToID = mysql_result($reresult,$rei,"id");
-$SendToGroupID = mysql_result($reresult,$rei,"GroupID");
-$gquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i", array($SendToGroupID));
-$gresult=exec_query($gquery);
-$SendUserCanPM=mysql_result($gresult,0,"CanPM");
+$SendMessageToID = sql_result($reresult,$rei,"id");
+$SendToGroupID = sql_result($reresult,$rei,"GroupID");
+$gquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i", array($SendToGroupID));
+$gresult=sql_query($gquery);
+$SendUserCanPM=sql_result($gresult,0,"CanPM");
 $SendUserCanPM = strtolower($SendUserCanPM);
 if($SendUserCanPM!="yes"&&$SendUserCanPM!="no") {
        $SendUserCanPM = "no"; }
-mysql_free_result($gresult);
-++$rei; } mysql_free_result($reresult);
+sql_free_result($gresult);
+++$rei; } sql_free_result($reresult);
 if($renum==0) { $Error="Yes"; ?>
 <tr>
        <td><span class="TableMessage">
@@ -959,12 +959,12 @@ redirect("refresh",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"ac
        </span><br /></td>
 </tr>
 <?php } if ($Error!="Yes") { $LastActive = GMTimeStamp();
-$messageid = getnextid($Settings['sqltable'],"messenger");
+$messageid = sql_get_next_id($Settings['sqltable'],"messenger");
 if($_SESSION['UserGroup']==$Settings['GuestGroup']) { $User1Name = $_POST['GuestName']; }
 if($_SESSION['UserGroup']!=$Settings['GuestGroup']) { $User1Name = $_SESSION['MemberName']; }
-$query = query("INSERT INTO `".$Settings['sqltable']."messenger` (`SenderID`, `ReciverID`, `GuestName`, `MessageTitle`, `MessageText`, `Description`, `DateSend`, `Read`) VALUES 
+$query = sql_pre_query("INSERT INTO `".$Settings['sqltable']."messenger` (`SenderID`, `ReciverID`, `GuestName`, `MessageTitle`, `MessageText`, `Description`, `DateSend`, `Read`) VALUES 
 (%i, %i, '%s', '%s', '%s', '%s', %i, %i)", array($_SESSION['UserID'],$SendMessageToID,$_SESSION['MemberName'],$_POST['MessageName'],$_POST['Message'],$_POST['MessageDesc'],$LastActive,0));
-exec_query($query);
+sql_query($query);
 ?><tr>
        <td><span class="TableMessage"><br />
        Message sent to user <?php echo $_POST['SendMessageTo']; ?>.<br />

diff --git a/inc/prelogin.php b/inc/prelogin.php
index 03ff6fb..91681ce 100644 (file)
--- a/inc/prelogin.php
+++ b/inc/prelogin.php
@@ -11,38 +11,38 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: prelogin.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: prelogin.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="prelogin.php"||$File3Name=="/prelogin.php") {
        require('index.php');
        exit(); }
 $_SESSION['CheckCookie']="done";
-$querylog2 = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `Name`='%s' AND `Password`='%s' AND `id`=%i LIMIT 1", array($_COOKIE['MemberName'],$_COOKIE['SessPass'],$_COOKIE['UserID']));
-$resultlog2=exec_query($querylog2);
-$numlog2=mysql_num_rows($resultlog2);
+$querylog2 = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `Name`='%s' AND `Password`='%s' AND `id`=%i LIMIT 1", array($_COOKIE['MemberName'],$_COOKIE['SessPass'],$_COOKIE['UserID']));
+$resultlog2=sql_query($querylog2);
+$numlog2=sql_num_rows($resultlog2);
 if($numlog2==1) {
-$YourIDAM=mysql_result($resultlog2,0,"id");
-$YourNameAM=mysql_result($resultlog2,0,"Name");
-$YourGroupAM=mysql_result($resultlog2,0,"GroupID");
+$YourIDAM=sql_result($resultlog2,0,"id");
+$YourNameAM=sql_result($resultlog2,0,"Name");
+$YourGroupAM=sql_result($resultlog2,0,"GroupID");
 $YourGroupIDAM=$YourGroupAM;
-$YourPassAM=mysql_result($resultlog2,0,"Password");
-$gquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($YourGroupAM));
-$gresult=exec_query($gquery);
-$YourGroupAM=mysql_result($gresult,0,"Name");
-mysql_free_result($gresult); $BanError = null;
-$YourTimeZoneAM=mysql_result($resultlog2,0,"TimeZone");
-$UseThemeAM=mysql_result($resultlog2,0,"UseTheme");
-$YourDSTAM=mysql_result($resultlog2,0,"DST");
-$YourLastPostTime=mysql_result($resultlog2,0,"LastPostTime");
-$YourBanTime=mysql_result($resultlog2,0,"BanTime");
+$YourPassAM=sql_result($resultlog2,0,"Password");
+$gquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($YourGroupAM));
+$gresult=sql_query($gquery);
+$YourGroupAM=sql_result($gresult,0,"Name");
+sql_free_result($gresult); $BanError = null;
+$YourTimeZoneAM=sql_result($resultlog2,0,"TimeZone");
+$UseThemeAM=sql_result($resultlog2,0,"UseTheme");
+$YourDSTAM=sql_result($resultlog2,0,"DST");
+$YourLastPostTime=sql_result($resultlog2,0,"LastPostTime");
+$YourBanTime=sql_result($resultlog2,0,"BanTime");
 $CGMTime = GMTimeStamp();
 if($YourBanTime!=0&&$YourBanTime!=null) {
 if($YourBanTime>=$CGMTime) { $BanError = "yes"; } }
 $NewDay=GMTimeStamp();
 $NewIP=$_SERVER['REMOTE_ADDR'];
 if($BanError!="yes") {
-$queryup = query("UPDATE `".$Settings['sqltable']."members` SET `LastActive`=%i,`IP`='%s' WHERE `id`=%i", array($NewDay,$NewIP,$YourIDAM));
+$queryup = sql_pre_query("UPDATE `".$Settings['sqltable']."members` SET `LastActive`=%i,`IP`='%s' WHERE `id`=%i", array($NewDay,$NewIP,$YourIDAM));
 $_SESSION['Theme']=$UseThemeAM;
 $_SESSION['MemberName']=$_COOKIE['MemberName'];
 $_SESSION['UserID']=$YourIDAM;
@@ -86,8 +86,8 @@ setcookie("SessPass", null, GMTimeStamp() - 3600, $cbasedir, $cookieDomain);
 setcookie(session_name(), "", GMTimeStamp() - 3600, $cbasedir, $cookieDomain); } }
 unset($_COOKIE[session_name()]);
 $_SESSION = array(); session_unset(); session_destroy();
-redirect("location",$basedir.url_maker($exfile['member'],$Settings['file_ext'],"act=login",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member'],false)); mysql_free_result($resultlog2); mysql_free_result($gresult);
+redirect("location",$basedir.url_maker($exfile['member'],$Settings['file_ext'],"act=login",$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member'],false)); sql_free_result($resultlog2); sql_free_result($gresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
-mysql_free_result($resultlog2); mysql_free_result($gresult);
+sql_free_result($resultlog2); sql_free_result($gresult);
 ?>

diff --git a/inc/profilemain.php b/inc/profilemain.php
index 6da68b1..14d94aa 100644 (file)
--- a/inc/profilemain.php
+++ b/inc/profilemain.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: profilemain.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: profilemain.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="profilemain.php"||$File3Name=="/profilemain.php") {
@@ -112,12 +112,12 @@ $profiletitle = " ".$ThemeSet['TitleDivider']." NotePad";
 <br />Profile updated <a href="<?php echo $updateact; ?>">click here</a> to go back. ^_^<br />&nbsp;</div>
 <?php } if($_GET['act']=="view") {
 if($_POST['update']!="now") {
-$query = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_SESSION['UserID']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_SESSION['UserID']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
-$YourID=mysql_result($result,$i,"id");
-$Notes=mysql_result($result,$i,"Notes");
+$YourID=sql_result($result,$i,"id");
+$Notes=sql_result($result,$i,"Notes");
 $noteact = url_maker($exfile['profile'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['profile'],$exqstr['profile']);
 $notepadact = $noteact; $profiletitle = " ".$ThemeSet['TitleDivider']." NotePad";
 ?>
@@ -153,7 +153,7 @@ $notepadact = $noteact; $profiletitle = " ".$ThemeSet['TitleDivider']." NotePad"
 </tr>
 </table>
 </div>
-<?php mysql_free_result($result); }
+<?php sql_free_result($result); }
 if($_POST['update']=="now") {
 if($_POST['act']=="view"&&
        $_SESSION['UserGroup']!=$Settings['GuestGroup']) {
@@ -164,18 +164,18 @@ if($_POST['act']=="view"&&
        //$_POST['Signature'] = remove_bad_entities($_POST['Signature']);
        /*    <_<  iWordFilter  >_>      
     by Kazuki Przyborowski - Cool Dude 2k */
-       $katarzynaqy=query("SELECT * FROM `".$Settings['sqltable']."wordfilter`", array(null));
-       $katarzynart=exec_query($katarzynaqy);
-       $katarzynanm=mysql_num_rows($katarzynart);
+       $katarzynaqy=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."wordfilter`", array(null));
+       $katarzynart=sql_query($katarzynaqy);
+       $katarzynanm=sql_num_rows($katarzynart);
        $katarzynas=0;
        while ($katarzynas < $katarzynanm) {
-       $Filter=mysql_result($katarzynart,$katarzynas,"Filter");
-       $Replace=mysql_result($katarzynart,$katarzynas,"Replace");
-       $CaseInsensitive=mysql_result($katarzynart,$katarzynas,"CaseInsensitive");
+       $Filter=sql_result($katarzynart,$katarzynas,"Filter");
+       $Replace=sql_result($katarzynart,$katarzynas,"Replace");
+       $CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
        if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
        if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
        if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; }
-       $WholeWord=mysql_result($katarzynart,$katarzynas,"WholeWord");
+       $WholeWord=sql_result($katarzynart,$katarzynas,"WholeWord");
        if($WholeWord=="on") { $WholeWord = "yes"; }
        if($WholeWord=="off") { $WholeWord = "no"; }
        if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; }
@@ -188,19 +188,19 @@ 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; } mysql_free_result($katarzynart);
+       ++$katarzynas; } sql_free_result($katarzynart);
        $NewDay=GMTimeStamp();
        $NewIP=$_SERVER['REMOTE_ADDR'];
-       $querynewskin = query("UPDATE `".$Settings['sqltable']."members` SET `Notes`='%s',`LastActive`=%i,`IP`='%s' WHERE `id`=%i", array($_POST['NotePad'],$NewDay,$NewIP,$_SESSION['UserID']));
-               exec_query($querynewskin); } } }
+       $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']));
+               sql_query($querynewskin); } } }
 if($_GET['act']=="signature") {
 if($_POST['update']!="now") {
-$query = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_SESSION['UserID']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_SESSION['UserID']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
-$YourID=mysql_result($result,$i,"id");
-$Signature=mysql_result($result,$i,"Signature"); 
+$YourID=sql_result($result,$i,"id");
+$Signature=sql_result($result,$i,"Signature"); 
 $signatureact = url_maker($exfile['profile'],$Settings['file_ext'],"act=signature",$Settings['qstr'],$Settings['qsep'],$prexqstr['profile'],$exqstr['profile']);
 $profiletitle = " ".$ThemeSet['TitleDivider']." Signature Editor";
 ?>
@@ -236,7 +236,7 @@ $profiletitle = " ".$ThemeSet['TitleDivider']." Signature Editor";
 </tr>
 </table>
 </div>
-<?php mysql_free_result($result); }
+<?php sql_free_result($result); }
 if($_POST['update']=="now") {
 if($_POST['act']=="signature"&&
        $_SESSION['UserGroup']!=$Settings['GuestGroup']) {
@@ -246,18 +246,18 @@ if($_POST['act']=="signature"&&
        $_POST['Signature'] = remove_bad_entities($_POST['Signature']);
        /*    <_<  iWordFilter  >_>      
     by Kazuki Przyborowski - Cool Dude 2k */
-       $katarzynaqy=query("SELECT * FROM `".$Settings['sqltable']."wordfilter`", array(null));
-       $katarzynart=exec_query($katarzynaqy);
-       $katarzynanm=mysql_num_rows($katarzynart);
+       $katarzynaqy=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."wordfilter`", array(null));
+       $katarzynart=sql_query($katarzynaqy);
+       $katarzynanm=sql_num_rows($katarzynart);
        $katarzynas=0;
        while ($katarzynas < $katarzynanm) {
-       $Filter=mysql_result($katarzynart,$katarzynas,"Filter");
-       $Replace=mysql_result($katarzynart,$katarzynas,"Replace");
-       $CaseInsensitive=mysql_result($katarzynart,$katarzynas,"CaseInsensitive");
+       $Filter=sql_result($katarzynart,$katarzynas,"Filter");
+       $Replace=sql_result($katarzynart,$katarzynas,"Replace");
+       $CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
        if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
        if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
        if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; }
-       $WholeWord=mysql_result($katarzynart,$katarzynas,"WholeWord");
+       $WholeWord=sql_result($katarzynart,$katarzynas,"WholeWord");
        if($WholeWord=="on") { $WholeWord = "yes"; }
        if($WholeWord=="off") { $WholeWord = "no"; }
        if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; }
@@ -270,20 +270,20 @@ 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; } mysql_free_result($katarzynart);
+       ++$katarzynas; } sql_free_result($katarzynart);
        $NewDay=GMTimeStamp();
        $NewIP=$_SERVER['REMOTE_ADDR'];
-       $querynewskin = query("UPDATE `".$Settings['sqltable']."members` SET `Signature`='%s',`LastActive`=%i,`IP`='%s' WHERE `id`=%i", array($_POST['Signature'],$NewDay,$NewIP,$_SESSION['UserID']));
-       exec_query($querynewskin); } } }
+       $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']));
+       sql_query($querynewskin); } } }
 if($_GET['act']=="avatar") {
 if($_POST['update']!="now") {
-$query = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_SESSION['UserID']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_SESSION['UserID']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
-$YourID=mysql_result($result,$i,"id");
-$User1Avatar=mysql_result($result,$i,"Avatar"); 
-$User1AvatarSize=mysql_result($result,$i,"AvatarSize");
+$YourID=sql_result($result,$i,"id");
+$User1Avatar=sql_result($result,$i,"Avatar"); 
+$User1AvatarSize=sql_result($result,$i,"AvatarSize");
 $avataract = url_maker($exfile['profile'],$Settings['file_ext'],"act=avatar",$Settings['qstr'],$Settings['qsep'],$prexqstr['profile'],$exqstr['profile']);
 $profiletitle = " ".$ThemeSet['TitleDivider']." Avatar Editor";
 $Pre1Avatar = $User1Avatar;
@@ -353,7 +353,7 @@ $AvatarSize1W=$AvatarSize1[0]; $AvatarSize1H=$AvatarSize1[1];
 </tr>
 </table>
 </div>
-<?php mysql_free_result($result); }
+<?php sql_free_result($result); }
 if($_POST['update']=="now") {
 if($_POST['Avatar']!=null&&$_POST['AvatarSizeW']!=null&&$_POST['AvatarSizeH']!=null&&
        $_SESSION['UserGroup']!=$Settings['GuestGroup']) {
@@ -366,19 +366,19 @@ if($_POST['Avatar']!=null&&$_POST['AvatarSizeW']!=null&&$_POST['AvatarSizeH']!=n
        $NewDay=GMTimeStamp();
        $NewIP=$_SERVER['REMOTE_ADDR'];
        $_POST['Avatar'] = remove_spaces($_POST['Avatar']);
-       $querynewskin = query("UPDATE `".$Settings['sqltable']."members` SET `Avatar`='%s',`AvatarSize`='%s',`LastActive`=%i,`IP`='%s' WHERE `id`=%i", array($_POST['Avatar'],$fullavatarsize,$NewDay,$NewIP,$_SESSION['UserID']));
-       exec_query($querynewskin); } } }
+       $querynewskin = sql_pre_query("UPDATE `".$Settings['sqltable']."members` SET `Avatar`='%s',`AvatarSize`='%s',`LastActive`=%i,`IP`='%s' WHERE `id`=%i", array($_POST['Avatar'],$fullavatarsize,$NewDay,$NewIP,$_SESSION['UserID']));
+       sql_query($querynewskin); } } }
 if($_GET['act']=="settings") {
 if($_POST['update']!="now") {
-$query = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_SESSION['UserID']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_SESSION['UserID']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
-$YourID=mysql_result($result,$i,"id");
-$User1TimeZone=mysql_result($result,$i,"TimeZone"); 
+$YourID=sql_result($result,$i,"id");
+$User1TimeZone=sql_result($result,$i,"TimeZone"); 
 $tsa_mem = explode(":",$User1TimeZone);
 $TimeZoneArray = array("offset" => $User1TimeZone, "hour" => $tsa_mem[0], "minute" => $tsa_mem[1]);
-$User1DST=mysql_result($result,$i,"DST");
+$User1DST=sql_result($result,$i,"DST");
 $settingsact = url_maker($exfile['profile'],$Settings['file_ext'],"act=settings",$Settings['qstr'],$Settings['qsep'],$prexqstr['profile'],$exqstr['profile']);
 $profiletitle = " ".$ThemeSet['TitleDivider']." Board Settings"; ?>
 <div class="TableMenuBorder">
@@ -513,7 +513,7 @@ if ($handle = opendir($skindir)) { $dirnum = null;
 </tr>
 </table>
 </div>
-<?php mysql_free_result($result); }
+<?php sql_free_result($result); }
 if($_POST['update']=="now") {
 if($_POST['act']=="settings"&&
        $_SESSION['UserGroup']!=$Settings['GuestGroup']) {
@@ -531,23 +531,23 @@ if($_POST['act']=="settings"&&
        if(!is_numeric($_POST['RepliesPerPage'])) { $_POST['RepliesPerPage'] = "10"; }
        if(!is_numeric($_POST['TopicsPerPage'])) { $_POST['TopicsPerPage'] = "10"; }
        if(!is_numeric($_POST['MessagesPerPage'])) { $_POST['MessagesPerPage'] = "10"; }
-       $querynewskin = query("UPDATE `".$Settings['sqltable']."members` SET `UseTheme`='%s',`TimeZone`='%s',`DST`='%s',`LastActive`=%i,RepliesPerPage=%i,TopicsPerPage=%i,MessagesPerPage=%i,`IP`='%s' WHERE `id`=%i", array(chack_themes($_POST['skin']),$_POST['YourOffSet'],$_POST['DST'],$NewDay,$_POST['RepliesPerPage'],$_POST['TopicsPerPage'],$_POST['MessagesPerPage'],$NewIP,$_SESSION['UserID']));
-       exec_query($querynewskin); } } }
+       $querynewskin = sql_pre_query("UPDATE `".$Settings['sqltable']."members` SET `UseTheme`='%s',`TimeZone`='%s',`DST`='%s',`LastActive`=%i,RepliesPerPage=%i,TopicsPerPage=%i,MessagesPerPage=%i,`IP`='%s' WHERE `id`=%i", array(chack_themes($_POST['skin']),$_POST['YourOffSet'],$_POST['DST'],$NewDay,$_POST['RepliesPerPage'],$_POST['TopicsPerPage'],$_POST['MessagesPerPage'],$NewIP,$_SESSION['UserID']));
+       sql_query($querynewskin); } } }
 if($_GET['act']=="profile") {
 if($_POST['update']!="now") {
-$query = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_SESSION['UserID']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_SESSION['UserID']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
-$YourID=mysql_result($result,$i,"id");
-$User1Interests=mysql_result($result,$i,"Interests"); 
-$User1Title=mysql_result($result,$i,"Title");
-$User1Website=mysql_result($result,$i,"Website"); 
-$User1Gender=mysql_result($result,$i,"Gender");
-$User1TimeZone=mysql_result($result,$i,"TimeZone");
-$BirthDay=mysql_result($result,$i,"BirthDay");
-$BirthMonth=mysql_result($result,$i,"BirthMonth");
-$BirthYear=mysql_result($result,$i,"BirthYear");
+$YourID=sql_result($result,$i,"id");
+$User1Interests=sql_result($result,$i,"Interests"); 
+$User1Title=sql_result($result,$i,"Title");
+$User1Website=sql_result($result,$i,"Website"); 
+$User1Gender=sql_result($result,$i,"Gender");
+$User1TimeZone=sql_result($result,$i,"TimeZone");
+$BirthDay=sql_result($result,$i,"BirthDay");
+$BirthMonth=sql_result($result,$i,"BirthMonth");
+$BirthYear=sql_result($result,$i,"BirthYear");
 $User1Birthday = "MM/DD/YYYY";
 if($BirthMonth!=null&&$BirthDay!=null&&$BirthYear!=null) { 
        if($BirthYear=="0") { $BirthYear = "YYYY"; }
@@ -561,7 +561,7 @@ if($BirthMonth!=null&&$BirthDay!=null&&$BirthYear!=null) {
        $User1Birthday = $BirthMonth."/".$BirthDay."/".$BirthYear; }
 $tsa_mem = explode(":",$User1TimeZone);
 $TimeZoneArray = array("offset" => $User1TimeZone, "hour" => $tsa_mem[0], "minute" => $tsa_mem[1]);
-$User1DST=mysql_result($result,$i,"DST");
+$User1DST=sql_result($result,$i,"DST");
 $profileact = url_maker($exfile['profile'],$Settings['file_ext'],"act=profile",$Settings['qstr'],$Settings['qsep'],$prexqstr['profile'],$exqstr['profile']);
 $profiletitle = " ".$ThemeSet['TitleDivider']." Profile Editor";
 ?>
@@ -696,7 +696,7 @@ echo "<option value=\"".$showmin."\">0:".$showmin." minutes</option>\n";
 </tr>
 </table>
 </div>
-<?php mysql_free_result($result); }
+<?php sql_free_result($result); }
 if($_POST['update']=="now") {
 if($_POST['act']=="profile"&&
        $_SESSION['UserGroup']!=$Settings['GuestGroup']) {
@@ -711,18 +711,18 @@ if($_POST['act']=="profile"&&
        //$_POST['Signature'] = remove_bad_entities($_POST['Signature']);
        /*    <_<  iWordFilter  >_>      
     by Kazuki Przyborowski - Cool Dude 2k */
-       $katarzynaqy=query("SELECT * FROM `".$Settings['sqltable']."wordfilter`", array(null));
-       $katarzynart=exec_query($katarzynaqy);
-       $katarzynanm=mysql_num_rows($katarzynart);
+       $katarzynaqy=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."wordfilter`", array(null));
+       $katarzynart=sql_query($katarzynaqy);
+       $katarzynanm=sql_num_rows($katarzynart);
        $katarzynas=0;
        while ($katarzynas < $katarzynanm) {
-       $Filter=mysql_result($katarzynart,$katarzynas,"Filter");
-       $Replace=mysql_result($katarzynart,$katarzynas,"Replace");
-       $CaseInsensitive=mysql_result($katarzynart,$katarzynas,"CaseInsensitive");
+       $Filter=sql_result($katarzynart,$katarzynas,"Filter");
+       $Replace=sql_result($katarzynart,$katarzynas,"Replace");
+       $CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
        if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
        if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
        if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; }
-       $WholeWord=mysql_result($katarzynart,$katarzynas,"WholeWord");
+       $WholeWord=sql_result($katarzynart,$katarzynas,"WholeWord");
        if($WholeWord=="on") { $WholeWord = "yes"; }
        if($WholeWord=="off") { $WholeWord = "no"; }
        if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; }
@@ -739,7 +739,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; } mysql_free_result($katarzynart);
+       ++$katarzynas; } sql_free_result($katarzynart);
        if(!is_numeric($_POST['RepliesPerPage'])) { $_POST['RepliesPerPage'] = "10"; }
        if(!is_numeric($_POST['TopicsPerPage'])) { $_POST['TopicsPerPage'] = "10"; }
        if(!is_numeric($_POST['MessagesPerPage'])) { $_POST['MessagesPerPage'] = "10"; }
@@ -780,16 +780,16 @@ if($_POST['act']=="profile"&&
        $_SESSION['UserDST'] = $_POST['DST'];
        $NewDay=GMTimeStamp();
        $NewIP=$_SERVER['REMOTE_ADDR'];
-       $querynewprofile = query("UPDATE `".$Settings['sqltable']."members` SET `Interests`='%s',`Title`='%s',`Website`='%s',`TimeZone`='%s',`Gender`='%s',`DST`='%s',`LastActive`=%i,`BirthMonth`=%i,`BirthDay`=%i,`BirthYear`=%i,RepliesPerPage=%i,TopicsPerPage=%i,MessagesPerPage=%i,`IP`='%s' WHERE `id`=%i", array($_POST['Interests'],$_POST['Title'],$_POST['Website'],$_POST['YourOffSet'],$_POST['YourGender'],$_POST['DST'],$NewDay,$BirthMonth,$BirthDay,$BirthYear,$_POST['RepliesPerPage'],$_POST['TopicsPerPage'],$_POST['MessagesPerPage'],$NewIP,$_SESSION['UserID']));
-       exec_query($querynewprofile); } } }
+       $querynewprofile = sql_pre_query("UPDATE `".$Settings['sqltable']."members` SET `Interests`='%s',`Title`='%s',`Website`='%s',`TimeZone`='%s',`Gender`='%s',`DST`='%s',`LastActive`=%i,`BirthMonth`=%i,`BirthDay`=%i,`BirthYear`=%i,RepliesPerPage=%i,TopicsPerPage=%i,MessagesPerPage=%i,`IP`='%s' WHERE `id`=%i", array($_POST['Interests'],$_POST['Title'],$_POST['Website'],$_POST['YourOffSet'],$_POST['YourGender'],$_POST['DST'],$NewDay,$BirthMonth,$BirthDay,$BirthYear,$_POST['RepliesPerPage'],$_POST['TopicsPerPage'],$_POST['MessagesPerPage'],$NewIP,$_SESSION['UserID']));
+       sql_query($querynewprofile); } } }
 if($_GET['act']=="userinfo") {
 if($_POST['update']!="now") {
-$query = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_SESSION['UserID']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_SESSION['UserID']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
-$YourID=mysql_result($result,$i,"id");
-$User1Email=mysql_result($result,$i,"Email"); 
+$YourID=sql_result($result,$i,"id");
+$User1Email=sql_result($result,$i,"Email"); 
 $userinfoact = url_maker($exfile['profile'],$Settings['file_ext'],"act=userinfo",$Settings['qstr'],$Settings['qsep'],$prexqstr['profile'],$exqstr['profile']);
 $profiletitle = " ".$ThemeSet['TitleDivider']." User Info Editer";
 ?>
@@ -842,18 +842,18 @@ $profiletitle = " ".$ThemeSet['TitleDivider']." User Info Editer";
 </tr>
 </table>
 </div>
-<?php mysql_free_result($result); }
+<?php sql_free_result($result); }
 if($_POST['update']=="now") {
 if($_POST['act']=="userinfo"&&
        $_SESSION['UserGroup']!=$Settings['GuestGroup']) {
-       $query = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_SESSION['UserID']));
-       $result=exec_query($query);
-       $num=mysql_num_rows($result);
+       $query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_SESSION['UserID']));
+       $result=sql_query($query);
+       $num=sql_num_rows($result);
        $i=0;
-       $OldPassword=mysql_result($result,$i,"Password");
-       $OldHashType=mysql_result($result,$i,"HashType");
-       $OldJoined=mysql_result($result,$i,"Joined");
-       $OldSalt=mysql_result($result,$i,"Salt");
+       $OldPassword=sql_result($result,$i,"Password");
+       $OldHashType=sql_result($result,$i,"HashType");
+       $OldJoined=sql_result($result,$i,"Joined");
+       $OldSalt=sql_result($result,$i,"Salt");
        $UpdateHash = false; $NewSalt = salt_hmac(); 
 if($OldHashType=="ODFH") { 
        $YourPassword = sha1(md5($_POST['OldPass']));
@@ -884,8 +884,8 @@ if($YourPassword!=$OldPassword) { $Error="Yes"; ?>
        if($cookieSecure===false) {
        setcookie("SessPass", $NewPassword, time() + (7 * 86400), $cbasedir, $cookieDomain); } }
        $_POST['Email'] = remove_spaces($_POST['Email']);
-       $querynewuserinfo = query("UPDATE `".$Settings['sqltable']."members` SET `Password`='%s',`HashType`='iDBH',`Email`='%s',`LastActive`=%i,`IP`='%s',`Salt`='%s' WHERE `id`=%i", array($NewPassword,$_POST['Email'],$NewDay,$NewIP,$NewSalt,$_SESSION['UserID']));
-       exec_query($querynewuserinfo); } } } }
+       $querynewuserinfo = sql_pre_query("UPDATE `".$Settings['sqltable']."members` SET `Password`='%s',`HashType`='iDBH',`Email`='%s',`LastActive`=%i,`IP`='%s',`Salt`='%s' WHERE `id`=%i", array($NewPassword,$_POST['Email'],$NewDay,$NewIP,$NewSalt,$_SESSION['UserID']));
+       sql_query($querynewuserinfo); } } } }
 ?>
 <?php if($_POST['update']=="now"&&$_GET['act']!=null) {
        $profiletitle = " ".$ThemeSet['TitleDivider']." Updating Settings"; ?>

diff --git a/inc/replies.php b/inc/replies.php
index e1c3b00..fc93a41 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/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: replies.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="replies.php"||$File3Name=="/replies.php") {
@@ -25,39 +25,39 @@ if(!isset($_GET['modact'])) { $_GET['modact'] = null; }
 if($_GET['modact']=="pin"||$_GET['modact']=="unpin"||$_GET['modact']=="open"||
        $_GET['modact']=="close"||$_GET['modact']=="edit"||$_GET['modact']=="delete")
                { $_GET['act'] = $_GET['modact']; }
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `id`=%i LIMIT 1", array($_GET['id']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
-if($prenum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); mysql_free_result($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `id`=%i LIMIT 1", array($_GET['id']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
+if($prenum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); sql_free_result($preresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($prenum>=1) {
-$TopicName=mysql_result($preresult,0,"TopicName");
-$TopicID=mysql_result($preresult,0,"id");
-$TopicForumID=mysql_result($preresult,0,"ForumID");
-$TopicCatID=mysql_result($preresult,0,"CategoryID");
-$TopicClosed=mysql_result($preresult,0,"Closed");
+$TopicName=sql_result($preresult,0,"TopicName");
+$TopicID=sql_result($preresult,0,"id");
+$TopicForumID=sql_result($preresult,0,"ForumID");
+$TopicCatID=sql_result($preresult,0,"CategoryID");
+$TopicClosed=sql_result($preresult,0,"Closed");
 if(!isset($_GET['post'])||$_GET['post']!==null) {
-$NumberReplies=mysql_result($preresult,0,"NumReply"); }
+$NumberReplies=sql_result($preresult,0,"NumReply"); }
 if(isset($_GET['post'])&&$_GET['post']!==null) {
 $NumberReplies=1; }
-$ViewTimes=mysql_result($preresult,0,"NumViews");
-mysql_free_result($preresult);
-$forumcheckx = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i  LIMIT 1", array($TopicForumID));
-$fmckresult=exec_query($forumcheckx);
-$ForumName=mysql_result($fmckresult,0,"Name");
-$ForumType=mysql_result($fmckresult,0,"ForumType");
-$CanHaveTopics=mysql_result($fmckresult,0,"CanHaveTopics");
-$ForumPostCountView=mysql_result($fmckresult,0,"PostCountView");
-$ForumKarmaCountView=mysql_result($fmckresult,0,"KarmaCountView");
-mysql_free_result($fmckresult);
-$catcheck = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i  LIMIT 1", array($TopicCatID));
-$catresult=exec_query($catcheck);
-$CategoryName=mysql_result($catresult,0,"Name");
-$CategoryType=mysql_result($catresult,0,"CategoryType");
-$CategoryPostCountView=mysql_result($catresult,0,"PostCountView");
-$CategoryKarmaCountView=mysql_result($catresult,0,"KarmaCountView");
-mysql_free_result($catresult);
+$ViewTimes=sql_result($preresult,0,"NumViews");
+sql_free_result($preresult);
+$forumcheckx = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i  LIMIT 1", array($TopicForumID));
+$fmckresult=sql_query($forumcheckx);
+$ForumName=sql_result($fmckresult,0,"Name");
+$ForumType=sql_result($fmckresult,0,"ForumType");
+$CanHaveTopics=sql_result($fmckresult,0,"CanHaveTopics");
+$ForumPostCountView=sql_result($fmckresult,0,"PostCountView");
+$ForumKarmaCountView=sql_result($fmckresult,0,"KarmaCountView");
+sql_free_result($fmckresult);
+$catcheck = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i  LIMIT 1", array($TopicCatID));
+$catresult=sql_query($catcheck);
+$CategoryName=sql_result($catresult,0,"Name");
+$CategoryType=sql_result($catresult,0,"CategoryType");
+$CategoryPostCountView=sql_result($catresult,0,"PostCountView");
+$CategoryKarmaCountView=sql_result($catresult,0,"KarmaCountView");
+sql_free_result($catresult);
 if($GroupInfo['HasAdminCP']!="yes"||$GroupInfo['HasModCP']!="yes") {
 if($MyPostCountChk==null) { $MyPostCountChk = 0; }
 if($MyKarmaCount==null) { $MyKarmaCount = 0; }
@@ -151,19 +151,19 @@ if($PageLimit<0) { $PageLimit = 0; }
 //End Reply Page Code
 $i=0;
 if(!isset($_GET['post'])||$_GET['post']!==null) {
-$query = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` ASC LIMIT %i,%i", array($_GET['id'],$PageLimit,$Settings['max_posts'])); }
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` ASC LIMIT %i,%i", array($_GET['id'],$PageLimit,$Settings['max_posts'])); }
 if(isset($_GET['post'])&&$_GET['post']!==null) {
-$query = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i AND `id`=%i ORDER BY `TimeStamp` ASC LIMIT %i,%i", array($_GET['id'],$_GET['post'],$PageLimit,$Settings['max_posts'])); }
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i AND `id`=%i ORDER BY `TimeStamp` ASC LIMIT %i,%i", array($_GET['id'],$_GET['post'],$PageLimit,$Settings['max_posts'])); }
+$result=sql_query($query);
+$num=sql_num_rows($result);
 if($num==0) { 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']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($num!=0) { 
 if($ViewTimes==0||$ViewTimes==null) { $NewViewTimes = 1; }
 if($ViewTimes!=0&&$ViewTimes!=null) { $NewViewTimes = $ViewTimes + 1; }
-$viewsup = query("UPDATE `".$Settings['sqltable']."topics` SET `NumViews`='%s' WHERE `id`=%i", array($NewViewTimes,$_GET['id']));
-exec_query($viewsup); }
+$viewsup = sql_pre_query("UPDATE `".$Settings['sqltable']."topics` SET `NumViews`='%s' WHERE `id`=%i", array($NewViewTimes,$_GET['id']));
+sql_query($viewsup); }
 //List Page Number Code Start
 $pagenum=count($Pages);
 if($_GET['page']>$pagenum) {
@@ -250,59 +250,59 @@ if($pstring!=null||$CanMakeReply=="yes"||$CanMakeTopic=="yes") {
 <div class="DivTable2">&nbsp;</div>
 <?php }
 while ($i < $num) {
-$MyPostID=mysql_result($result,$i,"id");
-$MyTopicID=mysql_result($result,$i,"TopicID");
-$MyPostIP=mysql_result($result,$i,"IP");
-$MyForumID=mysql_result($result,$i,"ForumID");
-$MyCategoryID=mysql_result($result,$i,"CategoryID");
-$MyUserID=mysql_result($result,$i,"UserID");
-$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");
+$MyPostID=sql_result($result,$i,"id");
+$MyTopicID=sql_result($result,$i,"TopicID");
+$MyPostIP=sql_result($result,$i,"IP");
+$MyForumID=sql_result($result,$i,"ForumID");
+$MyCategoryID=sql_result($result,$i,"CategoryID");
+$MyUserID=sql_result($result,$i,"UserID");
+$MyGuestName=sql_result($result,$i,"GuestName");
+$MyTimeStamp=sql_result($result,$i,"TimeStamp");
+$MyEditTime=sql_result($result,$i,"LastUpdate");
+$MyEditUserID=sql_result($result,$i,"EditUser");
+$MyEditUserName=sql_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=sql_result($result,$i,"Post");
 $MyPost = preg_replace("/\<br\>/", "<br />", nl2br($MyPost));
-$MyDescription=mysql_result($result,$i,"Description");
-$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyUserID));
-$reresult=exec_query($requery);
-$renum=mysql_num_rows($reresult);
+$MyDescription=sql_result($result,$i,"Description");
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyUserID));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult);
 if($renum<1) { $MyUserID = -1;
-$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyUserID));
-$reresult=exec_query($requery);
-$renum=mysql_num_rows($reresult); }
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyUserID));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult); }
 $rei=0; $ipshow = "two";
 $User1ID=$MyUserID; $GuestsName = $MyGuestName;
-$User1Name=mysql_result($reresult,$rei,"Name");
-$User1IP=mysql_result($reresult,$rei,"IP");
+$User1Name=sql_result($reresult,$rei,"Name");
+$User1IP=sql_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");
+$User1Email=sql_result($reresult,$rei,"Email");
+$User1Title=sql_result($reresult,$rei,"Title");
+$User1Joined=sql_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=exec_query($gquery);
-$User1Group=mysql_result($gresult,0,"Name");
-$GroupNamePrefix=mysql_result($gresult,0,"NamePrefix");
-$GroupNameSuffix=mysql_result($gresult,0,"NameSuffix");
-mysql_free_result($gresult);
-$User1Signature=mysql_result($reresult,$rei,"Signature");
-$User1Avatar=mysql_result($reresult,$rei,"Avatar");
-$User1AvatarSize=mysql_result($reresult,$rei,"AvatarSize");
+$User1Hidden=sql_result($reresult,$rei,"HiddenMember");
+$User1GroupID=sql_result($reresult,$rei,"GroupID");
+$gquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($User1GroupID));
+$gresult=sql_query($gquery);
+$User1Group=sql_result($gresult,0,"Name");
+$GroupNamePrefix=sql_result($gresult,0,"NamePrefix");
+$GroupNameSuffix=sql_result($gresult,0,"NameSuffix");
+sql_free_result($gresult);
+$User1Signature=sql_result($reresult,$rei,"Signature");
+$User1Avatar=sql_result($reresult,$rei,"Avatar");
+$User1AvatarSize=sql_result($reresult,$rei,"AvatarSize");
 if ($User1Avatar=="http://"||$User1Avatar==null||
        strtolower($User1Avatar)=="noavatar") {
 $User1Avatar=$ThemeSet['NoAvatar'];
 $User1AvatarSize=$ThemeSet['NoAvatarSize']; }
 $AvatarSize1=explode("x", $User1AvatarSize);
 $AvatarSize1W=$AvatarSize1[0]; $AvatarSize1H=$AvatarSize1[1];
-$User1Website=mysql_result($reresult,$rei,"Website");
-$User1PostCount=mysql_result($reresult,$rei,"PostCount");
-$User1Karma=mysql_result($reresult,$rei,"Karma");
-$User1IP=mysql_result($reresult,$rei,"IP");
-mysql_free_result($reresult);
+$User1Website=sql_result($reresult,$rei,"Website");
+$User1PostCount=sql_result($reresult,$rei,"PostCount");
+$User1Karma=sql_result($reresult,$rei,"Karma");
+$User1IP=sql_result($reresult,$rei,"IP");
+sql_free_result($reresult);
 if($User1Name=="Guest") { $User1Name=$GuestsName;
 if($User1Name==null) { $User1Name="Guest"; } }
 if(isset($GroupNamePrefix)&&$GroupNamePrefix!=null) {
@@ -312,24 +312,24 @@ if(isset($GroupNameSuffix)&&$GroupNameSuffix!=null) {
 $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 = exec_query($euquery);
-$eunum = mysql_num_rows($euresult);
+$euquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyEditUserID));
+$euresult = sql_query($euquery);
+$eunum = sql_num_rows($euresult);
 if($eunum<1) { $MyEditUserID = -1;
-$euquery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyEditUserID));
-$euresult = exec_query($euquery);
-$eunum = mysql_num_rows($euresult); }
+$euquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyEditUserID));
+$euresult = sql_query($euquery);
+$eunum = sql_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($EditUserGroupID));
-       $eugresult=exec_query($eugquery);
-       $EditUserGroup=mysql_result($eugresult,0,"Name");
-       $EditUserNamePrefix=mysql_result($eugresult,0,"NamePrefix");
-       $EditUserNameSuffix=mysql_result($eugresult,0,"NameSuffix");
-       mysql_free_result($eugresult);  }
+       $EditUserGroupID = sql_result($euresult,0,"GroupID");
+       $EditUserHidden=sql_result($euresult,0,"HiddenMember");
+       $EditUserName = sql_result($euresult,0,"Name");
+       sql_free_result($euresult);
+       $eugquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($EditUserGroupID));
+       $eugresult=sql_query($eugquery);
+       $EditUserGroup=sql_result($eugresult,0,"Name");
+       $EditUserNamePrefix=sql_result($eugresult,0,"NamePrefix");
+       $EditUserNameSuffix=sql_result($eugresult,0,"NameSuffix");
+       sql_free_result($eugresult);    }
        if($MyEditUserID==$MyUserID) {
        $EditUserID = $User1ID;
        $EditUserGroupID = $User1GroupID;
@@ -453,7 +453,7 @@ echo url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr
 </tr>
 </table></div>
 <div class="DivReplies">&nbsp;</div>
-<?php ++$i; } mysql_free_result($result); } 
+<?php ++$i; } sql_free_result($result); } 
 if((GMTimeStamp()<$_SESSION['LastPostTime']&&$_SESSION['LastPostTime']!=0)&&
 ($_GET['act']=="create"||$_GET['act']=="edit"||$_GET['act']=="makereply"||$_GET['act']=="editreply")) { 
 $_GET['act'] = "view"; $_POST['act'] = null; 
@@ -508,33 +508,33 @@ ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 $QuoteReply = null; $QuoteDescription = null;
 if($_GET['post']==null) {
-$query = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` ASC  LIMIT 1", array($_GET['id']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
-$QuoteDescription=mysql_result($result,0,"Description"); 
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` ASC  LIMIT 1", array($_GET['id']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
+$QuoteDescription=sql_result($result,0,"Description"); 
 $QuoteDescription = str_replace("Re: ","",$QuoteDescription);
 $QuoteDescription = "Re: ".$QuoteDescription;
-mysql_free_result($result); }
+sql_free_result($result); }
 if($_GET['post']!=null) {
-$query = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `id`=%i LIMIT 1", array($_GET['post']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `id`=%i LIMIT 1", array($_GET['post']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 if($num>=1) {
-$QuoteReplyID=mysql_result($result,0,"id");
-$QuoteReplyFID=mysql_result($result,0,"ForumID");
-$QuoteReplyCID=mysql_result($result,0,"CategoryID");
-$QuoteUserID=mysql_result($result,0,"UserID");
-$QuoteReply=mysql_result($result,0,"Post");
-$QuoteDescription=mysql_result($result,0,"Description");
-$QuoteGuestName=mysql_result($result,0,"GuestName");
-$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($QuoteUserID));
-$reresult=exec_query($requery);
-$renum=mysql_num_rows($reresult);
+$QuoteReplyID=sql_result($result,0,"id");
+$QuoteReplyFID=sql_result($result,0,"ForumID");
+$QuoteReplyCID=sql_result($result,0,"CategoryID");
+$QuoteUserID=sql_result($result,0,"UserID");
+$QuoteReply=sql_result($result,0,"Post");
+$QuoteDescription=sql_result($result,0,"Description");
+$QuoteGuestName=sql_result($result,0,"GuestName");
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($QuoteUserID));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult);
 if($renum<1) { $QuoteUserID = -1;
-$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($QuoteUserID));
-$reresult=exec_query($requery);
-$renum=mysql_num_rows($reresult); }
-$QuoteUserName=mysql_result($reresult,0,"Name");
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($QuoteUserID));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult); }
+$QuoteUserName=sql_result($reresult,0,"Name");
 if($QuoteUserName=="Guest") { $QuoteUserName=$QuoteGuestName;
 if($QuoteUserName==null) { $QuoteUserName="Guest"; } }
 $QuoteUserName = stripcslashes(htmlspecialchars($QuoteUserName, ENT_QUOTES, $Settings['charset']));
@@ -557,16 +557,16 @@ if($CatPermissionInfo['CanViewCategory'][$QuoteReplyCID]=="no") {
        $QuoteReply = null; $QuoteDescription = null; } } }
 if($GroupInfo['HasAdminCP']!="yes"||$GroupInfo['HasModCP']!="yes") {
 if($_GET['post']!=null&&$num>=1) {
-$rforumcheck = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i  LIMIT 1", array($QuoteReplyFID));
-$rfmckresult=exec_query($rforumcheck);
-$rForumPostCountView=mysql_result($rfmckresult,0,"PostCountView");
-$rForumKarmaCountView=mysql_result($rfmckresult,0,"KarmaCountView");
-mysql_free_result($rfmckresult);
-$rcatcheck = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i  LIMIT 1", array($QuoteReplyCID));
-$rcatresult=exec_query($rcatcheck);
-$rCategoryPostCountView=mysql_result($rcatresult,0,"PostCountView");
-$rCategoryKarmaCountView=mysql_result($rcatresult,0,"KarmaCountView");
-mysql_free_result($rcatresult);
+$rforumcheck = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i  LIMIT 1", array($QuoteReplyFID));
+$rfmckresult=sql_query($rforumcheck);
+$rForumPostCountView=sql_result($rfmckresult,0,"PostCountView");
+$rForumKarmaCountView=sql_result($rfmckresult,0,"KarmaCountView");
+sql_free_result($rfmckresult);
+$rcatcheck = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i  LIMIT 1", array($QuoteReplyCID));
+$rcatresult=sql_query($rcatcheck);
+$rCategoryPostCountView=sql_result($rcatresult,0,"PostCountView");
+$rCategoryKarmaCountView=sql_result($rcatresult,0,"KarmaCountView");
+sql_free_result($rcatresult);
 if($MyPostCountChk==null) { $MyPostCountChk = 0; }
 if($rForumPostCountView!=0&&$MyPostCountChk<$rForumPostCountView) {
 $QuoteReply = null; $QuoteDescription = null; }
@@ -600,17 +600,17 @@ $_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=query("SELECT * FROM `".$Settings['sqltable']."smileys` WHERE `Show`='yes'", array(null));
-$renee_result=exec_query($renee_query);
-$renee_num=mysql_num_rows($renee_result);
+$renee_query=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."smileys` WHERE `Show`='yes'", array(null));
+$renee_result=sql_query($renee_query);
+$renee_num=sql_num_rows($renee_result);
 $renee_s=0; $rose_a=0; $SmileRow=0; $SmileCRow=0;
 while ($renee_s < $renee_num) { ++$SmileRow;
-$FileName=mysql_result($renee_result,$renee_s,"FileName");
-$SmileName=mysql_result($renee_result,$renee_s,"SmileName");
-$SmileText=mysql_result($renee_result,$renee_s,"SmileText");
-$SmileDirectory=mysql_result($renee_result,$renee_s,"Directory");
-$ShowSmile=mysql_result($renee_result,$renee_s,"Show");
-$ReplaceType=mysql_result($renee_result,$renee_s,"ReplaceCI");
+$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,"Show");
+$ReplaceType=sql_result($renee_result,$renee_s,"ReplaceCI");
 if($SmileRow==1) { ?><tr>
        <?php } if($SmileRow<5) { ++$SmileCRow; ?>
        <td>&nbsp;<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;</td>
@@ -622,7 +622,7 @@ if($SmileCRow<5&&$SmileCRow!=0) {
 $SmileCRowL = 5 - $SmileCRow;
 echo "<td colspan=\"".$SmileCRowL."\">&nbsp;</td></tr>"; }
 echo "</table>";
-mysql_free_result($renee_result);
+sql_free_result($renee_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']); ?>">
@@ -761,18 +761,18 @@ setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir);
 $_SESSION['GuestName']=$_POST['GuestName']; } }
 /*    <_<  iWordFilter  >_>      
    by Kazuki Przyborowski - Cool Dude 2k */
-$katarzynaqy=query("SELECT * FROM `".$Settings['sqltable']."wordfilter`", array(null));
-$katarzynart=exec_query($katarzynaqy);
-$katarzynanm=mysql_num_rows($katarzynart);
+$katarzynaqy=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."wordfilter`", array(null));
+$katarzynart=sql_query($katarzynaqy);
+$katarzynanm=sql_num_rows($katarzynart);
 $katarzynas=0;
 while ($katarzynas < $katarzynanm) {
-$Filter=mysql_result($katarzynart,$katarzynas,"Filter");
-$Replace=mysql_result($katarzynart,$katarzynas,"Replace");
-$CaseInsensitive=mysql_result($katarzynart,$katarzynas,"CaseInsensitive");
+$Filter=sql_result($katarzynart,$katarzynas,"Filter");
+$Replace=sql_result($katarzynart,$katarzynas,"Replace");
+$CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
 if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
 if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
 if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; }
-$WholeWord=mysql_result($katarzynart,$katarzynas,"WholeWord");
+$WholeWord=sql_result($katarzynart,$katarzynas,"WholeWord");
 if($WholeWord=="on") { $WholeWord = "yes"; }
 if($WholeWord=="off") { $WholeWord = "no"; }
 if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; }
@@ -789,7 +789,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; } mysql_free_result($katarzynart);
+++$katarzynas; } sql_free_result($katarzynart);
 if ($_POST['ReplyDesc']==null) { $Error="Yes"; ?>
 <tr>
        <td><span class="TableMessage">
@@ -830,45 +830,45 @@ redirect("refresh",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"ac
        </span><br /></td>
 </tr>
 <?php } if ($Error!="Yes") { $LastActive = GMTimeStamp();
-$gnrquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($TopicForumID));
-$gnrresult=exec_query($gnrquery); $gnrnum=mysql_num_rows($gnrresult);
-$NumberPosts=mysql_result($gnrresult,0,"NumPosts"); 
-$PostCountAdd=mysql_result($gnrresult,0,"PostCountAdd"); 
-mysql_free_result($gnrresult);
-$postid = getnextid($Settings['sqltable'],"posts");
-$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyUsersID));
-$reresult=exec_query($requery);
-$renum=mysql_num_rows($reresult);
+$gnrquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($TopicForumID));
+$gnrresult=sql_query($gnrquery); $gnrnum=sql_num_rows($gnrresult);
+$NumberPosts=sql_result($gnrresult,0,"NumPosts"); 
+$PostCountAdd=sql_result($gnrresult,0,"PostCountAdd"); 
+sql_free_result($gnrresult);
+$postid = sql_get_next_id($Settings['sqltable'],"posts");
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyUsersID));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult);
 $rei=0;
 while ($rei < $renum) {
 $User1ID=$MyUsersID;
-$User1Name=mysql_result($reresult,$rei,"Name");
+$User1Name=sql_result($reresult,$rei,"Name");
 if($_SESSION['UserGroup']==$Settings['GuestGroup']) { $User1Name = $_POST['GuestName']; }
-$User1Email=mysql_result($reresult,$rei,"Email");
-$User1Title=mysql_result($reresult,$rei,"Title");
-$User1GroupID=mysql_result($reresult,$rei,"GroupID");
-$PostCount=mysql_result($reresult,$rei,"PostCount");
+$User1Email=sql_result($reresult,$rei,"Email");
+$User1Title=sql_result($reresult,$rei,"Title");
+$User1GroupID=sql_result($reresult,$rei,"GroupID");
+$PostCount=sql_result($reresult,$rei,"PostCount");
 $NewPostCount = null;
 if($PostCountAdd=="on") { $NewPostCount = $PostCount + 1; }
 if(!isset($NewPostCount)) { $NewPostCount = $PostCount; }
-$gquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($User1GroupID));
-$gresult=exec_query($gquery);
-$User1Group=mysql_result($gresult,0,"Name");
-mysql_free_result($gresult);
+$gquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($User1GroupID));
+$gresult=sql_query($gquery);
+$User1Group=sql_result($gresult,0,"Name");
+sql_free_result($gresult);
 $User1IP=$_SERVER['REMOTE_ADDR'];
-++$rei; } mysql_free_result($reresult);
-$query = query("INSERT INTO `".$Settings['sqltable']."posts` (`TopicID`, `ForumID`, `CategoryID`, `UserID`, `GuestName`, `TimeStamp`, `LastUpdate`, `EditUser`, `EditUserName`, `Post`, `Description`, `IP`, `EditIP`) VALUES\n".
+++$rei; } sql_free_result($reresult);
+$query = sql_pre_query("INSERT INTO `".$Settings['sqltable']."posts` (`TopicID`, `ForumID`, `CategoryID`, `UserID`, `GuestName`, `TimeStamp`, `LastUpdate`, `EditUser`, `EditUserName`, `Post`, `Description`, `IP`, `EditIP`) VALUES\n".
 "(%i, %i, %i, %i, '%s', %i, %i, 0, '', '%s', '%s', '%s', '0')", array($TopicID,$TopicForumID,$TopicCatID,$User1ID,$User1Name,$LastActive,$LastActive,$_POST['ReplyPost'],$_POST['ReplyDesc'],$User1IP));
-exec_query($query);
+sql_query($query);
 $_SESSION['LastPostTime'] = GMTimeStamp() + $GroupInfo['FloodControl'];
 if($User1ID!=0&&$User1ID!=-1) {
-$queryupd = query("UPDATE `".$Settings['sqltable']."members` SET `LastActive`=%i,`IP`='%s',`PostCount`=%i,`LastPostTime`=%i WHERE `id`=%i", array($LastActive,$User1IP,$NewPostCount,$_SESSION['LastPostTime'],$User1ID));
-exec_query($queryupd); }
+$queryupd = sql_pre_query("UPDATE `".$Settings['sqltable']."members` SET `LastActive`=%i,`IP`='%s',`PostCount`=%i,`LastPostTime`=%i WHERE `id`=%i", array($LastActive,$User1IP,$NewPostCount,$_SESSION['LastPostTime'],$User1ID));
+sql_query($queryupd); }
 $NewNumPosts = $NumberPosts + 1; $NewNumReplies = $NumberReplies + 1;
-$queryupd = query("UPDATE `".$Settings['sqltable']."forums` SET `NumPosts`=%i WHERE `id`=%i", array($NewNumPosts,$TopicForumID));
-exec_query($queryupd);
-$queryupd = query("UPDATE `".$Settings['sqltable']."topics` SET `NumReply`=%i,LastUpdate=%i WHERE `id`=%i", array($NewNumReplies,$LastActive,$TopicID));
-exec_query($queryupd);
+$queryupd = sql_pre_query("UPDATE `".$Settings['sqltable']."forums` SET `NumPosts`=%i WHERE `id`=%i", array($NewNumPosts,$TopicForumID));
+sql_query($queryupd);
+$queryupd = sql_pre_query("UPDATE `".$Settings['sqltable']."topics` SET `NumReply`=%i,LastUpdate=%i WHERE `id`=%i", array($NewNumReplies,$LastActive,$TopicID));
+sql_query($queryupd);
 $MyPostNum = $NewNumReplies + 1; $NumPages = null;
 if(!isset($Settings['max_posts'])) { $Settings['max_posts'] = 10; }
 if($MyPostNum>$Settings['max_posts']) {
@@ -891,13 +891,13 @@ redirect("refresh",$basedir.url_maker($exfile['topic'],$Settings['file_ext'],"ac
 </table></div>
 <div class="DivMkReply">&nbsp;</div>
 <?php } if($_GET['act']=="pin"||$_GET['act']=="unpin") {
-$gtsquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `id`=%i LIMIT 1", array($_GET['id']));
-$gtsresult=exec_query($gtsquery);
-$gtsnum=mysql_num_rows($gtsresult);
-$TTopicID=mysql_result($gtsresult,0,"id");
-$TForumID=mysql_result($gtsresult,0,"ForumID");
-$TUsersID=mysql_result($gtsresult,0,"UserID");
-$TPinned=mysql_result($gtsresult,0,"Pinned");
+$gtsquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `id`=%i LIMIT 1", array($_GET['id']));
+$gtsresult=sql_query($gtsquery);
+$gtsnum=sql_num_rows($gtsresult);
+$TTopicID=sql_result($gtsresult,0,"id");
+$TForumID=sql_result($gtsresult,0,"ForumID");
+$TUsersID=sql_result($gtsresult,0,"UserID");
+$TPinned=sql_result($gtsresult,0,"Pinned");
 if ($TPinned>1) { $TPinned = 1; } 
 if ($TPinned<0) { $TPinned = 0; }
 $CanPinTopics = false;
@@ -911,16 +911,16 @@ if($PermissionInfo['CanPinTopics'][$TForumID]=="yes"&&
                $TopicClosed==1) { $CanPinTopics = false; } }
 if($_SESSION['UserID']==0) { $CanPinTopics = false; }
 if($CanPinTopics===false) {
-redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); mysql_free_result($gtsresult);
+redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); sql_free_result($gtsresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
-mysql_free_result($gtsresult);
+sql_free_result($gtsresult);
 if($CanPinTopics===true) {
        if($_GET['act']=="pin") {
-$queryupd = query("UPDATE `".$Settings['sqltable']."topics` SET `Pinned`=1 WHERE `id`=%i", array($TTopicID)); }
+$queryupd = sql_pre_query("UPDATE `".$Settings['sqltable']."topics` SET `Pinned`=1 WHERE `id`=%i", array($TTopicID)); }
        if($_GET['act']=="unpin") {
-$queryupd = query("UPDATE `".$Settings['sqltable']."topics` SET `Pinned`=0 WHERE `id`=%i", array($TTopicID)); } 
-exec_query($queryupd); 
+$queryupd = sql_pre_query("UPDATE `".$Settings['sqltable']."topics` SET `Pinned`=0 WHERE `id`=%i", array($TTopicID)); } 
+sql_query($queryupd); 
 redirect("refresh",$basedir.url_maker($exfile['topic'],$Settings['file_ext'],"act=view&id=".$TTopicID."&page=1",$Settings['qstr'],$Settings['qsep'],$prexqstr['topic'],$exqstr['topic'],false).$Settings['qstr']."#post".$_GET['post'],"4");
 ?>
 <div class="Table1Border">
@@ -950,13 +950,13 @@ redirect("refresh",$basedir.url_maker($exfile['topic'],$Settings['file_ext'],"ac
 </tr>
 </table></div>
 <?php } } if($_GET['act']=="open"||$_GET['act']=="close") {
-$gtsquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `id`=%i LIMIT 1", array($_GET['id']));
-$gtsresult=exec_query($gtsquery);
-$gtsnum=mysql_num_rows($gtsresult);
-$TTopicID=mysql_result($gtsresult,0,"id");
-$TForumID=mysql_result($gtsresult,0,"ForumID");
-$TUsersID=mysql_result($gtsresult,0,"UserID");
-$TClosed=mysql_result($gtsresult,0,"Closed");
+$gtsquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `id`=%i LIMIT 1", array($_GET['id']));
+$gtsresult=sql_query($gtsquery);
+$gtsnum=sql_num_rows($gtsresult);
+$TTopicID=sql_result($gtsresult,0,"id");
+$TForumID=sql_result($gtsresult,0,"ForumID");
+$TUsersID=sql_result($gtsresult,0,"UserID");
+$TClosed=sql_result($gtsresult,0,"Closed");
 if ($TClosed>1) { $TClosed = 1; } 
 if ($TClosed<0) { $TClosed = 0; }
 $CanCloseTopics = false;
@@ -968,16 +968,16 @@ if($PermissionInfo['CanCloseTopics'][$TForumID]=="yes"&&
        $CanCloseTopics = true; } }
 if($_SESSION['UserID']==0) { $CanCloseTopics = false; }
 if($CanCloseTopics===false) {
-redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); mysql_free_result($gtsresult);
+redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); sql_free_result($gtsresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
-mysql_free_result($gtsresult);
+sql_free_result($gtsresult);
 if($CanCloseTopics===true) {
        if($_GET['act']=="close") {
-$queryupd = query("UPDATE `".$Settings['sqltable']."topics` SET `Closed`=1 WHERE `id`=%i", array($TTopicID)); }
+$queryupd = sql_pre_query("UPDATE `".$Settings['sqltable']."topics` SET `Closed`=1 WHERE `id`=%i", array($TTopicID)); }
        if($_GET['act']=="open") {
-$queryupd = query("UPDATE `".$Settings['sqltable']."topics` SET `Closed`=0 WHERE `id`=%i", array($TTopicID)); } 
-exec_query($queryupd); 
+$queryupd = sql_pre_query("UPDATE `".$Settings['sqltable']."topics` SET `Closed`=0 WHERE `id`=%i", array($TTopicID)); } 
+sql_query($queryupd); 
 redirect("refresh",$basedir.url_maker($exfile['topic'],$Settings['file_ext'],"act=view&id=".$TTopicID."&page=1",$Settings['qstr'],$Settings['qsep'],$prexqstr['topic'],$exqstr['topic'],false).$Settings['qstr']."#post".$_GET['post'],"4");
 ?>
 <div class="Table1Border">
@@ -1007,14 +1007,14 @@ redirect("refresh",$basedir.url_maker($exfile['topic'],$Settings['file_ext'],"ac
 </tr>
 </table></div>
 <?php } } if($_GET['act']=="delete") {
-$predquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `id`=%i LIMIT 1", array($_GET['post']));
-$predresult=exec_query($predquery);
-$prednum=mysql_num_rows($predresult);
-$ReplyID=mysql_result($predresult,0,"id");
-$ReplyTopicID=mysql_result($predresult,0,"TopicID");
-$ReplyForumID=mysql_result($predresult,0,"ForumID");
-$ReplyUserID=mysql_result($predresult,0,"UserID");
-mysql_free_result($predresult);
+$predquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `id`=%i LIMIT 1", array($_GET['post']));
+$predresult=sql_query($predquery);
+$prednum=sql_num_rows($predresult);
+$ReplyID=sql_result($predresult,0,"id");
+$ReplyTopicID=sql_result($predresult,0,"TopicID");
+$ReplyForumID=sql_result($predresult,0,"ForumID");
+$ReplyUserID=sql_result($predresult,0,"UserID");
+sql_free_result($predresult);
 $CanDeleteReply = false;
 if($_SESSION['UserID']!=0) {
 if($_SESSION['UserGroup']!=$Settings['GuestGroup']) {
@@ -1030,20 +1030,20 @@ if($CanDeleteReply===false) {
 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']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
-$delquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` ASC", array($_GET['id']));
-$delresult=exec_query($delquery);
-$delnum=mysql_num_rows($delresult);
+$delquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` ASC", array($_GET['id']));
+$delresult=sql_query($delquery);
+$delnum=sql_num_rows($delresult);
 $DelTopic = false;
-$gnrquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($ReplyForumID));
-$gnrresult=exec_query($gnrquery); $gnrnum=mysql_num_rows($gnrresult);
-$NumberPosts=mysql_result($gnrresult,0,"NumPosts"); $NumberTopics=mysql_result($gnrresult,0,"NumTopics"); 
-mysql_free_result($gnrresult);
-$FReplyID=mysql_result($delresult,0,"id");
+$gnrquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($ReplyForumID));
+$gnrresult=sql_query($gnrquery); $gnrnum=sql_num_rows($gnrresult);
+$NumberPosts=sql_result($gnrresult,0,"NumPosts"); $NumberTopics=sql_result($gnrresult,0,"NumTopics"); 
+sql_free_result($gnrresult);
+$FReplyID=sql_result($delresult,0,"id");
 if($ReplyID==$FReplyID) { $DelTopic = true;
-$gtsquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `id`=%i LIMIT 1", array($ReplyTopicID));
-$gtsresult=exec_query($gtsquery);
-$gtsnum=mysql_num_rows($gtsresult);
-$TUsersID=mysql_result($gtsresult,0,"UserID");
+$gtsquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `id`=%i LIMIT 1", array($ReplyTopicID));
+$gtsresult=sql_query($gtsquery);
+$gtsnum=sql_num_rows($gtsresult);
+$TUsersID=sql_result($gtsresult,0,"UserID");
 $CanDeleteTopics = false;
 if($_SESSION['UserGroup']!=$Settings['GuestGroup']) {
 if($PermissionInfo['CanDeleteTopics'][$ReplyForumID]=="yes"&&
@@ -1055,36 +1055,36 @@ if($PermissionInfo['CanDeleteTopics'][$ReplyForumID]=="yes"&&
                $TopicClosed==1) { $CanDeleteTopics = false; } }
 if($_SESSION['UserID']==0) { $CanDeleteTopics = false; }
 if($CanDeleteTopics===false) {
-redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); mysql_free_result($delresult);
+redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); sql_free_result($delresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($CanDeleteTopics===true) { $NewNumTopics = $NumberTopics - 1; $NewNumPosts = $NumberPosts - $delnum;
-$drquery = query("DELETE FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i", array($ReplyTopicID));
-exec_query($drquery); 
-$dtquery = query("DELETE FROM `".$Settings['sqltable']."topics` WHERE `id`=%i", array($ReplyTopicID));
-exec_query($dtquery);
-$queryupd = query("UPDATE `".$Settings['sqltable']."forums` SET `NumPosts`=%i,`NumTopics`=%i WHERE `id`=%i", array($NewNumPosts,$NewNumTopics,$ReplyForumID));
-exec_query($queryupd); } }
+$drquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i", array($ReplyTopicID));
+sql_query($drquery); 
+$dtquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."topics` WHERE `id`=%i", array($ReplyTopicID));
+sql_query($dtquery);
+$queryupd = sql_pre_query("UPDATE `".$Settings['sqltable']."forums` SET `NumPosts`=%i,`NumTopics`=%i WHERE `id`=%i", array($NewNumPosts,$NewNumTopics,$ReplyForumID));
+sql_query($queryupd); } }
 if($ReplyID!=$FReplyID) {
-$LReplyID=mysql_result($delresult,$delnum-1,"id");
-$SLReplyID=mysql_result($delresult,$delnum-2,"id");
-$NewLastUpdate=mysql_result($delresult,$delnum-2,"TimeStamp");
+$LReplyID=sql_result($delresult,$delnum-1,"id");
+$SLReplyID=sql_result($delresult,$delnum-2,"id");
+$NewLastUpdate=sql_result($delresult,$delnum-2,"TimeStamp");
 if($ReplyID==$LReplyID) { $NewNumReplies = $NumberReplies - 1; $NewNumPosts = $NumberPosts - 1;
-$drquery = query("DELETE FROM `".$Settings['sqltable']."posts` WHERE `id`=%i", array($ReplyID));
-exec_query($drquery); 
-$queryupd = query("UPDATE `".$Settings['sqltable']."forums` SET `NumPosts`=%i WHERE `id`=%i", array($NewNumPosts,$ReplyForumID));
-exec_query($queryupd);
-$queryupd = query("UPDATE `".$Settings['sqltable']."topics` SET `LastUpdate`=%i,`NumReply`=%i WHERE `id`=%i", array($NewLastUpdate,$NewNumReplies,$ReplyTopicID));
-exec_query($queryupd); } }
+$drquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."posts` WHERE `id`=%i", array($ReplyID));
+sql_query($drquery); 
+$queryupd = sql_pre_query("UPDATE `".$Settings['sqltable']."forums` SET `NumPosts`=%i WHERE `id`=%i", array($NewNumPosts,$ReplyForumID));
+sql_query($queryupd);
+$queryupd = sql_pre_query("UPDATE `".$Settings['sqltable']."topics` SET `LastUpdate`=%i,`NumReply`=%i WHERE `id`=%i", array($NewLastUpdate,$NewNumReplies,$ReplyTopicID));
+sql_query($queryupd); } }
 if($ReplyID!=$FReplyID&&$ReplyID!=$LReplyID) { $NewNumReplies = $NumberReplies - 1; $NewNumPosts = $NumberPosts - 1;
-$drquery = query("DELETE FROM `".$Settings['sqltable']."posts` WHERE `id`=%i", array($ReplyID));
-exec_query($drquery);
-$queryupd = query("UPDATE `".$Settings['sqltable']."forums` SET `NumPosts`=%i WHERE `id`=%i", array($NewNumPosts,$ReplyForumID));
-exec_query($queryupd);
-$queryupd = query("UPDATE `".$Settings['sqltable']."topics` SET `NumReply`=%i WHERE `id`=%i", array($NewNumReplies,$ReplyTopicID));
-exec_query($queryupd); }
+$drquery = sql_pre_query("DELETE FROM `".$Settings['sqltable']."posts` WHERE `id`=%i", array($ReplyID));
+sql_query($drquery);
+$queryupd = sql_pre_query("UPDATE `".$Settings['sqltable']."forums` SET `NumPosts`=%i WHERE `id`=%i", array($NewNumPosts,$ReplyForumID));
+sql_query($queryupd);
+$queryupd = sql_pre_query("UPDATE `".$Settings['sqltable']."topics` SET `NumReply`=%i WHERE `id`=%i", array($NewNumReplies,$ReplyTopicID));
+sql_query($queryupd); }
 redirect("refresh",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],FALSE),"3");
-mysql_free_result($delresult);
+sql_free_result($delresult);
 ?>
 <div class="Table1Border">
 <?php if($ThemeSet['TableStyle']=="div") { ?>
@@ -1121,44 +1121,44 @@ ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 $ShowEditTopic = null;
 if($PermissionInfo['CanEditTopics'][$TopicForumID]=="yes") {
-$editquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` ASC", array($TopicID));
-$editresult=exec_query($editquery);
-$editnum=mysql_num_rows($editresult);
-$FReplyID=mysql_result($editresult,0,"id");
-mysql_free_result($editresult);
+$editquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` ASC", array($TopicID));
+$editresult=sql_query($editquery);
+$editnum=sql_num_rows($editresult);
+$FReplyID=sql_result($editresult,0,"id");
+sql_free_result($editresult);
 if($_GET['post']==$FReplyID) { $ShowEditTopic = true; } }
 if($PermissionInfo['CanEditTopics'][$TopicForumID]=="no") { $ShowEditTopic = null; }
-$ersquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `id`=%i LIMIT 1", array($_GET['post']));
-$ersresult=exec_query($ersquery);
-$ersnum=mysql_num_rows($ersresult);
-if($ersnum==0) { mysql_free_result($ersresult);
+$ersquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `id`=%i LIMIT 1", array($_GET['post']));
+$ersresult=sql_query($ersquery);
+$ersnum=sql_num_rows($ersresult);
+if($ersnum==0) { sql_free_result($ersresult);
 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']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
-$ReplyPost=mysql_result($ersresult,0,"Post");
+$ReplyPost=sql_result($ersresult,0,"Post");
 /*$ReplyPost = stripcslashes(htmlspecialchars($ReplyPost, ENT_QUOTES, $Settings['charset']));
 $ReplyPost = preg_replace("/&amp;#(x[a-f0-9]+|[0-9]+);/i", "&#$1;", $ReplyPost);
 //$ReplyPost = remove_spaces($ReplyPost);*/
 $ReplyPost = remove_bad_entities($ReplyPost);
-$ReplyDescription=mysql_result($ersresult,0,"Description");
+$ReplyDescription=sql_result($ersresult,0,"Description");
 /*$ReplyDescription = stripcslashes(htmlspecialchars($ReplyDescription, ENT_QUOTES, $Settings['charset']));
 $ReplyDescription = preg_replace("/&amp;#(x[a-f0-9]+|[0-9]+);/i", "&#$1;", $ReplyDescription);
 //$ReplyDescription = remove_spaces($ReplyDescription);*/
-$ReplyGuestName=mysql_result($ersresult,0,"GuestName");
+$ReplyGuestName=sql_result($ersresult,0,"GuestName");
 //$ReplyGuestName = stripcslashes(htmlspecialchars($ReplyGuestName, ENT_QUOTES, $Settings['charset']));
 //$ReplyGuestName = preg_replace("/&amp;#(x[a-f0-9]+|[0-9]+);/i", "&#$1;", $ReplyGuestName);
 $ReplyGuestName = remove_spaces($ReplyGuestName);
-$ReplyUser=mysql_result($ersresult,0,"UserID");
+$ReplyUser=sql_result($ersresult,0,"UserID");
 if($_SESSION['UserID']!=$ReplyUser&&$PermissionInfo['CanModForum'][$TopicForumID]=="no") {
 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']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
-mysql_free_result($ersresult);
+sql_free_result($ersresult);
 if($ShowEditTopic===true) {
-$gtsquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `id`=%i LIMIT 1", array($TopicID));
-$gtsresult=exec_query($gtsquery);
-$gtsnum=mysql_num_rows($gtsresult);
-$TUsersID=mysql_result($gtsresult,0,"UserID");
+$gtsquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `id`=%i LIMIT 1", array($TopicID));
+$gtsresult=sql_query($gtsquery);
+$gtsnum=sql_num_rows($gtsresult);
+$TUsersID=sql_result($gtsresult,0,"UserID");
 if($_SESSION['UserID']!=$TUsersID) { $ShowEditTopic = null; }
 if($PermissionInfo['CanModForum'][$TopicForumID]=="yes"&&
        $PermissionInfo['CanEditTopics'][$TopicForumID]=="yes") { 
@@ -1168,7 +1168,7 @@ if($PermissionInfo['CanEditTopicsClose'][$TopicForumID]=="no"&&$TopicClosed==1)
 //$TopicName = stripcslashes(htmlspecialchars($TopicName, ENT_QUOTES, $Settings['charset']));
 //$TopicName = preg_replace("/&amp;#(x[a-f0-9]+|[0-9]+);/i", "&#$1;", $TopicName);
 $TopicName = remove_spaces($TopicName);
-mysql_free_result($gtsresult);
+sql_free_result($gtsresult);
 $UFID = uuid(false,true,false,$Settings['use_hashtype'],null);
 $_SESSION['UserFormID'] = $UFID;
 ?>
@@ -1191,24 +1191,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=query("SELECT * FROM `".$Settings['sqltable']."smileys` WHERE `Show`='yes'", array(null));
-$renee_result=exec_query($renee_query);
-$renee_num=mysql_num_rows($renee_result);
+$renee_query=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."smileys` WHERE `Show`='yes'", array(null));
+$renee_result=sql_query($renee_query);
+$renee_num=sql_num_rows($renee_result);
 $renee_s=0; $SmileRow=1;
 while ($renee_s < $renee_num) {
-$FileName=mysql_result($renee_result,$renee_s,"FileName");
-$SmileName=mysql_result($renee_result,$renee_s,"SmileName");
-$SmileText=mysql_result($renee_result,$renee_s,"SmileText");
-$SmileDirectory=mysql_result($renee_result,$renee_s,"Directory");
-$ShowSmile=mysql_result($renee_result,$renee_s,"Show");
-$ReplaceType=mysql_result($renee_result,$renee_s,"ReplaceCI");
+$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,"Show");
+$ReplaceType=sql_result($renee_result,$renee_s,"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; }
-mysql_free_result($renee_result);
+sql_free_result($renee_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']); ?>">
@@ -1267,31 +1267,31 @@ if($_SESSION['UserGroup']==$Settings['GuestGroup']&&
 require($SettDir['inc']."captcha.php"); }
 $ShowEditTopic = null;
 if($PermissionInfo['CanEditTopics'][$TopicForumID]=="yes") {
-$editquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` ASC", array($TopicID));
-$editresult=exec_query($editquery);
-$editnum=mysql_num_rows($editresult);
-$FReplyID=mysql_result($editresult,0,"id");
-mysql_free_result($editresult);
+$editquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` ASC", array($TopicID));
+$editresult=sql_query($editquery);
+$editnum=sql_num_rows($editresult);
+$FReplyID=sql_result($editresult,0,"id");
+sql_free_result($editresult);
 if($_GET['post']==$FReplyID) { $ShowEditTopic = true; } }
 if($PermissionInfo['CanEditTopics'][$TopicForumID]=="no") { $ShowEditTopic = null; }
-$ersquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `id`=%i LIMIT 1", array($_GET['post']));
-$ersresult=exec_query($ersquery);
-$ersnum=mysql_num_rows($ersresult);
-if($ersnum==0) { mysql_free_result($ersresult);
+$ersquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `id`=%i LIMIT 1", array($_GET['post']));
+$ersresult=sql_query($ersquery);
+$ersnum=sql_num_rows($ersresult);
+if($ersnum==0) { sql_free_result($ersresult);
 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']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
-$ReplyUser=mysql_result($ersresult,0,"UserID");
+$ReplyUser=sql_result($ersresult,0,"UserID");
 if($_SESSION['UserID']!=$ReplyUser&&$PermissionInfo['CanModForum'][$TopicForumID]=="no") {
 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']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
-mysql_free_result($ersresult); 
+sql_free_result($ersresult); 
 if($ShowEditTopic===true) {
-$gtsquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `id`=%i LIMIT 1", array($TopicID));
-$gtsresult=exec_query($gtsquery);
-$gtsnum=mysql_num_rows($gtsresult);
-$TUsersID=mysql_result($gtsresult,0,"UserID");
+$gtsquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `id`=%i LIMIT 1", array($TopicID));
+$gtsresult=sql_query($gtsquery);
+$gtsnum=sql_num_rows($gtsresult);
+$TUsersID=sql_result($gtsresult,0,"UserID");
 if($_SESSION['UserID']!=$TUsersID) { $ShowEditTopic = null; }
 if($PermissionInfo['CanModForum'][$TopicForumID]=="yes"&&
        $PermissionInfo['CanEditTopics'][$TopicForumID]=="yes") { 
@@ -1377,18 +1377,18 @@ $_POST['TopicName'] = stripcslashes(htmlspecialchars($_POST['TopicName'], ENT_QU
 $_POST['TopicName'] = remove_spaces($_POST['TopicName']); }
 /*    <_<  iWordFilter  >_>      
    by Kazuki Przyborowski - Cool Dude 2k */
-$katarzynaqy=query("SELECT * FROM `".$Settings['sqltable']."wordfilter`", array(null));
-$katarzynart=exec_query($katarzynaqy);
-$katarzynanm=mysql_num_rows($katarzynart);
+$katarzynaqy=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."wordfilter`", array(null));
+$katarzynart=sql_query($katarzynaqy);
+$katarzynanm=sql_num_rows($katarzynart);
 $katarzynas=0;
 while ($katarzynas < $katarzynanm) {
-$Filter=mysql_result($katarzynart,$katarzynas,"Filter");
-$Replace=mysql_result($katarzynart,$katarzynas,"Replace");
-$CaseInsensitive=mysql_result($katarzynart,$katarzynas,"CaseInsensitive");
+$Filter=sql_result($katarzynart,$katarzynas,"Filter");
+$Replace=sql_result($katarzynart,$katarzynas,"Replace");
+$CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
 if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
 if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
 if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; }
-$WholeWord=mysql_result($katarzynart,$katarzynas,"WholeWord");
+$WholeWord=sql_result($katarzynart,$katarzynas,"WholeWord");
 if($WholeWord=="on") { $WholeWord = "yes"; }
 if($WholeWord=="off") { $WholeWord = "no"; }
 if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; }
@@ -1405,26 +1405,26 @@ $_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; } mysql_free_result($katarzynart);
-$lonewolfqy=query("SELECT * FROM `".$Settings['sqltable']."restrictedwords` WHERE `RestrictedTopicName`='yes' or `RestrictedUserName`='yes'", array(null));
-$lonewolfrt=exec_query($lonewolfqy);
-$lonewolfnm=mysql_num_rows($lonewolfrt);
+++$katarzynas; } sql_free_result($katarzynart);
+$lonewolfqy=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."restrictedwords` WHERE `RestrictedTopicName`='yes' or `RestrictedUserName`='yes'", array(null));
+$lonewolfrt=sql_query($lonewolfqy);
+$lonewolfnm=sql_num_rows($lonewolfrt);
 $lonewolfs=0; $RMatches = null; $RGMatches = null;
 while ($lonewolfs < $lonewolfnm) {
-$RWord=mysql_result($lonewolfrt,$lonewolfs,"Word");
-$RCaseInsensitive=mysql_result($lonewolfrt,$lonewolfs,"CaseInsensitive");
+$RWord=sql_result($lonewolfrt,$lonewolfs,"Word");
+$RCaseInsensitive=sql_result($lonewolfrt,$lonewolfs,"CaseInsensitive");
 if($RCaseInsensitive=="on") { $RCaseInsensitive = "yes"; }
 if($RCaseInsensitive=="off") { $RCaseInsensitive = "no"; }
 if($RCaseInsensitive!="yes"||$RCaseInsensitive!="no") { $RCaseInsensitive = "no"; }
-$RWholeWord=mysql_result($lonewolfrt,$lonewolfs,"WholeWord");
+$RWholeWord=sql_result($lonewolfrt,$lonewolfs,"WholeWord");
 if($RWholeWord=="on") { $RWholeWord = "yes"; }
 if($RWholeWord=="off") { $RWholeWord = "no"; }
 if($RWholeWord!="yes"||$RWholeWord!="no") { $RWholeWord = "no"; }
-$RestrictedTopicName=mysql_result($lonewolfrt,$lonewolfs,"RestrictedTopicName");
+$RestrictedTopicName=sql_result($lonewolfrt,$lonewolfs,"RestrictedTopicName");
 if($RestrictedTopicName=="on") { $RestrictedTopicName = "yes"; }
 if($RestrictedTopicName=="off") { $RestrictedTopicName = "no"; }
 if($RestrictedTopicName!="yes"||$RestrictedTopicName!="no") { $RestrictedTopicName = "no"; }
-$RestrictedUserName=mysql_result($lonewolfrt,$lonewolfs,"RestrictedUserName");
+$RestrictedUserName=sql_result($lonewolfrt,$lonewolfs,"RestrictedUserName");
 if($RestrictedUserName=="on") { $RestrictedUserName = "yes"; }
 if($RestrictedUserName=="off") { $RestrictedUserName = "no"; }
 if($RestrictedUserName!="yes"||$RestrictedUserName!="no") { $RestrictedUserName = "no"; }
@@ -1457,7 +1457,7 @@ $RMatches = preg_match("/".$RWord."/i", $_POST['TopicName']);
 if($RestrictedUserName=="yes") {
 $RGMatches = preg_match("/".$RWord."/i", $_POST['GuestName']);
        if($RGMatches==true) { break 1; } } }
-++$lonewolfs; } mysql_free_result($lonewolfrt);
+++$lonewolfs; } sql_free_result($lonewolfrt);
 if ($_POST['ReplyDesc']==null) { $Error="Yes"; ?>
 <tr>
        <td><span class="TableMessage">
@@ -1516,26 +1516,26 @@ redirect("refresh",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"ac
        </span><br /></td>
 </tr>
 <?php } if ($Error!="Yes") { $LastActive = GMTimeStamp();
-$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_SESSION['UserID']));
-$reresult=exec_query($requery);
-$renum=mysql_num_rows($reresult);
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($_SESSION['UserID']));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult);
 $rei=0;
 while ($rei < $renum) {
 $User1ID=$_SESSION['UserID'];
-$User1Name=mysql_result($reresult,$rei,"Name");
+$User1Name=sql_result($reresult,$rei,"Name");
 if($_SESSION['UserGroup']==$Settings['GuestGroup']) { $User1Name = $_POST['GuestName']; }
 ++$rei; }
-mysql_free_result($reresult);
+sql_free_result($reresult);
 $EditUserIP=$_SERVER['REMOTE_ADDR'];
 $_SESSION['LastPostTime'] = GMTimeStamp() + $GroupInfo['FloodControl'];
 if($_SESSION['UserID']!=0&&$_SESSION['UserID']!=-1) {
-$queryupd = query("UPDATE `".$Settings['sqltable']."members` SET `LastActive`=%i,`IP`='%s',`LastPostTime`=%i WHERE `id`=%i", array($LastActive,$EditUserIP,$_SESSION['LastPostTime'],$_SESSION['UserID']));
-exec_query($queryupd); }
-$queryupd = query("UPDATE `".$Settings['sqltable']."posts` SET `LastUpdate`=%i,`EditUser`=%i,`EditUserName`='%s',`Post`='%s',`Description`='%s',`EditIP`='%s' WHERE `id`=%i", array($LastActive,$User1ID,$User1Name,$_POST['ReplyPost'],$_POST['ReplyDesc'],$EditUserIP,$_GET['post']));
-exec_query($queryupd);
+$queryupd = sql_pre_query("UPDATE `".$Settings['sqltable']."members` SET `LastActive`=%i,`IP`='%s',`LastPostTime`=%i WHERE `id`=%i", array($LastActive,$EditUserIP,$_SESSION['LastPostTime'],$_SESSION['UserID']));
+sql_query($queryupd); }
+$queryupd = sql_pre_query("UPDATE `".$Settings['sqltable']."posts` SET `LastUpdate`=%i,`EditUser`=%i,`EditUserName`='%s',`Post`='%s',`Description`='%s',`EditIP`='%s' WHERE `id`=%i", array($LastActive,$User1ID,$User1Name,$_POST['ReplyPost'],$_POST['ReplyDesc'],$EditUserIP,$_GET['post']));
+sql_query($queryupd);
 if($ShowEditTopic===true) {
-$queryupd = query("UPDATE `".$Settings['sqltable']."topics` SET `TopicName`='%s',`Description`='%s' WHERE `id`=%i", array($_POST['TopicName'],$_POST['ReplyDesc'],$TopicID));
-exec_query($queryupd); } } 
+$queryupd = sql_pre_query("UPDATE `".$Settings['sqltable']."topics` SET `TopicName`='%s',`Description`='%s' WHERE `id`=%i", array($_POST['TopicName'],$_POST['ReplyDesc'],$TopicID));
+sql_query($queryupd); } } 
 redirect(url_maker($exfile['topic'],$Settings['file_ext'],"act=view&id=".$TopicID."&page=1",$Settings['qstr'],$Settings['qsep'],$prexqstr['topic'],$exqstr['topic'],FALSE).$Settings['qstr']."#post".$_GET['post'],"3");
 ?>
 <tr>
@@ -1584,13 +1584,13 @@ if($_GET['fastreply']===true||
 if($_GET['fastreply']!==true&&
        $_GET['fastreply']!="on") { $fps = " style=\"display: none;\" "; }
 $QuoteReply = null; $QuoteDescription = null;
-$queryra = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` ASC LIMIT 1", array($_GET['id']));
-$resultra=exec_query($queryra);
-$numrose=mysql_num_rows($resultra);
-$QuoteDescription=mysql_result($resultra,0,"Description"); 
+$queryra = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` ASC LIMIT 1", array($_GET['id']));
+$resultra=sql_query($queryra);
+$numrose=sql_num_rows($resultra);
+$QuoteDescription=sql_result($resultra,0,"Description"); 
 $QuoteDescription = str_replace("Re: ","",$QuoteDescription);
 $QuoteDescription = "Re: ".$QuoteDescription;
-mysql_free_result($resultra);
+sql_free_result($resultra);
 $UFID = uuid(false,true,false,$Settings['use_hashtype'],null);
 $_SESSION['UserFormID'] = $UFID;
 ?>
@@ -1614,17 +1614,17 @@ $_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=query("SELECT * FROM `".$Settings['sqltable']."smileys` WHERE `Show`='yes'", array(null));
-$renee_result=exec_query($renee_query);
-$renee_num=mysql_num_rows($renee_result);
+$renee_query=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."smileys` WHERE `Show`='yes'", array(null));
+$renee_result=sql_query($renee_query);
+$renee_num=sql_num_rows($renee_result);
 $renee_s=0; $SmileRow=0; $SmileCRow=0;
 while ($renee_s < $renee_num) { ++$SmileRow;
-$FileName=mysql_result($renee_result,$renee_s,"FileName");
-$SmileName=mysql_result($renee_result,$renee_s,"SmileName");
-$SmileText=mysql_result($renee_result,$renee_s,"SmileText");
-$SmileDirectory=mysql_result($renee_result,$renee_s,"Directory");
-$ShowSmile=mysql_result($renee_result,$renee_s,"Show");
-$ReplaceType=mysql_result($renee_result,$renee_s,"ReplaceCI");
+$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,"Show");
+$ReplaceType=sql_result($renee_result,$renee_s,"ReplaceCI");
 if($SmileRow==1) { ?><tr>
        <?php } if($SmileRow<5) { ++$SmileCRow; ?>
        <td>&nbsp;<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;</td>
@@ -1636,7 +1636,7 @@ if($SmileCRow<5&&$SmileCRow!=0) {
 $SmileCRowL = 5 - $SmileCRow;
 echo "<td colspan=\"".$SmileCRowL."\">&nbsp;</td></tr>"; }
 echo "</table>";
-mysql_free_result($renee_result);
+sql_free_result($renee_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/rssfeed.php b/inc/rssfeed.php
index 0680b92..0836741 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/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: rssfeed.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="rssfeed.php"||$File3Name=="/rssfeed.php") {
@@ -74,18 +74,18 @@ else { if (stristr($_SERVER["HTTP_USER_AGENT"],"FeedValidator")) {
 } else { header("Content-Type: text/xml; charset=".$Settings['charset']); } } }
 header("Content-Language: en");
 header("Vary: Accept");
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i", array($_GET['id']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i", array($_GET['id']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
 $prei=0;
-$ForumID=mysql_result($preresult,0,"id");
-$ForumName=mysql_result($preresult,0,"Name");
+$ForumID=sql_result($preresult,0,"id");
+$ForumName=sql_result($preresult,0,"Name");
 $ForumName = htmlentities($ForumName, ENT_QUOTES, $Settings['charset']);
 $ForumName = preg_replace("/&#(x[a-f0-9]+|[0-9]+);/i", "&#$1;", $ForumName);
-$ForumCatID=mysql_result($preresult,0,"CategoryID");
-$ForumType=mysql_result($preresult,0,"ForumType");
+$ForumCatID=sql_result($preresult,0,"CategoryID");
+$ForumType=sql_result($preresult,0,"ForumType");
 $ForumType = strtolower($ForumType);
-mysql_free_result($preresult);
+sql_free_result($preresult);
 if($PermissionInfo['CanViewForum'][$ForumID]=="no"||
        $PermissionInfo['CanViewForum'][$ForumID]!="yes") {
 redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false));
@@ -98,64 +98,64 @@ ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 $gltf = array(null); $gltf[0] = $ForumID;
 if ($ForumType=="subforum") { 
-$apcquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `id`", array($ForumID));
-$apcresult=exec_query($apcquery);
-$apcnum=mysql_num_rows($apcresult);
+$apcquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `id`", array($ForumID));
+$apcresult=sql_query($apcquery);
+$apcnum=sql_num_rows($apcresult);
 $apci=0; $apcl=1; if($apcnum>=1) {
 while ($apci < $apcnum) {
-$SubsForumID=mysql_result($apcresult,$apci,"id");
+$SubsForumID=sql_result($apcresult,$apci,"id");
 if(isset($PermissionInfo['CanViewForum'][$SubsForumID])&&
        $PermissionInfo['CanViewForum'][$SubsForumID]=="yes") {
 $gltf[$apcl] = $SubsForumID; ++$apcl; }
 ++$apci; }
-mysql_free_result($apcresult); } }
+sql_free_result($apcresult); } }
 $Atom = null; $RSS = null; $PreRSS = null;
 $gltnum = count($gltf); $glti = 0; 
 while ($glti < $gltnum) {
-$query = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `Pinned` DESC, `LastUpdate` DESC LIMIT %i", array($gltf[$glti],$Settings['max_topics']));
-$result=exec_query($query);
-$num=mysql_num_rows($result); $i=0;
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `Pinned` DESC, `LastUpdate` DESC LIMIT %i", array($gltf[$glti],$Settings['max_topics']));
+$result=sql_query($query);
+$num=sql_num_rows($result); $i=0;
 while ($i < $num) {
-$TopicID=mysql_result($result,$i,"id");
-$ForumID=mysql_result($result,$i,"ForumID");
-$CategoryID=mysql_result($result,$i,"CategoryID");
-$pquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` ASC LIMIT %i", array($TopicID,1));
-$presult=exec_query($pquery);
-$pnum=mysql_num_rows($presult);
-$MyDescription=mysql_result($presult,0,"Post");
+$TopicID=sql_result($result,$i,"id");
+$ForumID=sql_result($result,$i,"ForumID");
+$CategoryID=sql_result($result,$i,"CategoryID");
+$pquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` ASC LIMIT %i", array($TopicID,1));
+$presult=sql_query($pquery);
+$pnum=sql_num_rows($presult);
+$MyDescription=sql_result($presult,0,"Post");
 $MyDescription = preg_replace("/\<br\>/", "<br />", nl2br($MyDescription));
 $MyDescription= text2icons($MyDescription,$Settings['sqltable']);
-$UsersID=mysql_result($result,$i,"UserID");
-$GuestsName=mysql_result($result,$i,"GuestName");
-$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($UsersID));
-$reresult=exec_query($requery);
-$renum=mysql_num_rows($reresult);
+$UsersID=sql_result($result,$i,"UserID");
+$GuestsName=sql_result($result,$i,"GuestName");
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($UsersID));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult);
 if($renum<1) { $UsersID = -1;
-$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($UsersID));
-$reresult=exec_query($requery);
-$renum=mysql_num_rows($reresult); }
-$UsersName=mysql_result($reresult,0,"Name");
-$UsersGroupID=mysql_result($reresult,0,"GroupID");
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($UsersID));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult); }
+$UsersName=sql_result($reresult,0,"Name");
+$UsersGroupID=sql_result($reresult,0,"GroupID");
 if($UsersName=="Guest") { $UsersName=$GuestsName;
 if($UsersName==null) { $UsersName="Guest"; } }
-mysql_free_result($reresult);
-$gquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($UsersGroupID));
-$gresult=exec_query($gquery);
-$UsersGroup=mysql_result($gresult,0,"Name");
-$GroupNamePrefix=mysql_result($gresult,0,"NamePrefix");
-$GroupNameSuffix=mysql_result($gresult,0,"NameSuffix");
-mysql_free_result($gresult);
+sql_free_result($reresult);
+$gquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($UsersGroupID));
+$gresult=sql_query($gquery);
+$UsersGroup=sql_result($gresult,0,"Name");
+$GroupNamePrefix=sql_result($gresult,0,"NamePrefix");
+$GroupNameSuffix=sql_result($gresult,0,"NameSuffix");
+sql_free_result($gresult);
 if(isset($GroupNamePrefix)&&$GroupNamePrefix!=null) {
        $UsersName = $GroupNamePrefix.$UsersName; }
 if(isset($GroupNameSuffix)&&$GroupNameSuffix!=null) {
        $UsersName = $UsersName.$GroupNameSuffix; }
-$TheTime=mysql_result($result,$i,"TimeStamp");
+$TheTime=sql_result($result,$i,"TimeStamp");
 $AtomTime=GMTimeChange("Y-m-d\TH:i:s\Z",$TheTime,0);
 //$OldRSSTime=GMTimeChange("Y-m-d\TH:i:s+0:00",$TheTime,0);
 $OldRSSTime=$AtomTime;
 $TheTime=GMTimeChange("D, j M Y G:i:s \G\M\T",$TheTime,0);
-$TopicName=mysql_result($result,$i,"TopicName");
-$ForumDescription=mysql_result($result,$i,"Description");
+$TopicName=sql_result($result,$i,"TopicName");
+$ForumDescription=sql_result($result,$i,"Description");
 if(isset($PermissionInfo['CanViewForum'][$ForumID])&&
        $PermissionInfo['CanViewForum'][$ForumID]=="yes"&&
        isset($CatPermissionInfo['CanViewCategory'][$CategoryID])&&
@@ -170,8 +170,8 @@ $RSS .= '<item rdf:about="'.$BoardURL.url_maker($exfilerss['topic'],$Settings['f
 if($_GET['feedtype']=="rss") {
 $CDataDescription = "<![CDATA[\n".$MyDescription."\n]]>";
 $RSS .= '<item>'."\n".'<pubDate>'.$TheTime.'</pubDate>'."\n".'<author>'.$UsersName.'</author>'."\n".'<title>'.$TopicName.'</title>'."\n".'<description>'.$CDataDescription.'</description>'."\n".'<link>'.$BoardURL.url_maker($exfilerss['topic'],$Settings['file_ext'],"act=view&id=".$TopicID."&page=1",$Settings['qstr'],$Settings['qsep'],$prexqstrrss['topic'],$exqstrrss['topic']).'</link>'."\n".'<guid>'.$BoardURL.url_maker($exfilerss['topic'],$Settings['file_ext'],"act=view&id=".$TopicID."&page=1",$Settings['qstr'],$Settings['qsep'],$prexqstrrss['topic'],$exqstrrss['topic']).'</guid>'."\n".'</item>'."\n"; } }
-++$i; } mysql_free_result($result);
-mysql_free_result($result);
+++$i; } sql_free_result($result);
+sql_free_result($result);
 ++$glti; }
 xml_doc_start("1.0",$Settings['charset']);
 if($Settings['showverinfo']=="on") { ?>

diff --git a/inc/searchs.php b/inc/searchs.php
index f33b072..635a406 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: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: searchs.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="searchs.php"||$File3Name=="/searchs.php") {
@@ -88,37 +88,37 @@ if($_GET['act']=="topics") {
 if(pre_strlen($_GET['msearch'])>="25") { 
        $_GET['msearch'] = null; }
 if($_GET['msearch']!=null) {
-$memsiquery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `Name`='%s' LIMIT 1", array($_GET['msearch']));
-$memsiresult=exec_query($memsiquery);
-$memsinum=mysql_num_rows($memsiresult);
+$memsiquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `Name`='%s' LIMIT 1", array($_GET['msearch']));
+$memsiresult=sql_query($memsiquery);
+$memsinum=sql_num_rows($memsiresult);
 $memsi=0;
 if($memsinum==0) { $memsid = -1; }
 if($memsinum!=0) {
-$memsid=mysql_result($memsiresult,$memsi,"id"); 
-mysql_free_result($memsiresult); } }
+$memsid=sql_result($memsiresult,$memsi,"id"); 
+sql_free_result($memsiresult); } }
 //Get SQL LIMIT Number
 $nums = $_GET['page'] * $Settings['max_topics'];
 $PageLimit = $nums - $Settings['max_topics'];
 if($PageLimit<0) { $PageLimit = 0; }
 if($_GET['msearch']==null) {
 if($_GET['type']!="wildcard") {
-$query = query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."topics` WHERE `TopicName`='%s' ORDER BY `Pinned` DESC, `LastUpdate` DESC LIMIT %i,%i", array($_GET['search'],$PageLimit,$Settings['max_topics'])); }
+$query = sql_pre_query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."topics` WHERE `TopicName`='%s' ORDER BY `Pinned` DESC, `LastUpdate` DESC LIMIT %i,%i", array($_GET['search'],$PageLimit,$Settings['max_topics'])); }
 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'])); } }
+$query = sql_pre_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 = sql_pre_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'])); } }
+$query = sql_pre_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 = sql_pre_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=exec_query($query);
-$rnresult=exec_query($rnquery);
-$NumberTopics = mysql_result($rnresult,0);
-mysql_free_result($rnresult);
+$query = sql_pre_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 = sql_pre_query("SELECT FOUND_ROWS();", array(null));
+$result=sql_query($query);
+$rnresult=sql_query($rnquery);
+$NumberTopics = sql_result($rnresult,0);
+sql_free_result($rnresult);
 if($NumberTopics==null) { 
        $NumberTopics = 0; }
 $num = $NumberTopics;
@@ -144,11 +144,11 @@ if($pnum<$Settings['max_topics']&&$pnum>0) {
        $pnum = $pnum - $pnum; 
        $Pages[$l] = $l; ++$l; } }
 //End Topic Page Code
-$num=mysql_num_rows($result);
+$num=sql_num_rows($result);
 if($num<=0) { 
 redirect("location",$basedir.url_maker($exfile['search'],$Settings['file_ext'],"act=topics",$Settings['qstr'],$Settings['qsep'],$prexqstr['search'],$exqstr['search'],false));
 header("Content-Type: text/plain; charset=".$Settings['charset']);
-ob_clean(); echo "Sorry could not find any search results."; mysql_free_result($result);
+ob_clean(); echo "Sorry could not find any search results."; sql_free_result($result);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 $i=0;
 //List Page Number Code Start
@@ -275,25 +275,25 @@ if($_GET['msearch']==null) { ?>
 </tr>
 <?php
 while ($i < $num) {
-$TopicID=mysql_result($result,$i,"id");
-$ForumID=mysql_result($result,$i,"ForumID");
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($ForumID));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
+$TopicID=sql_result($result,$i,"id");
+$ForumID=sql_result($result,$i,"ForumID");
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($ForumID));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
 $HotTopicPosts = $Settings['hot_topic_num'];
 if($prenum > 0) {
-$HotTopicPosts = mysql_result($preresult,0,"HotTopicPosts"); }
-mysql_free_result($preresult);
+$HotTopicPosts = sql_result($preresult,0,"HotTopicPosts"); }
+sql_free_result($preresult);
 if($HotTopicPosts!=0&&is_numeric($HotTopicPosts)) {
        $Settings['hot_topic_num'] = $HotTopicPosts; }
 if(!is_numeric($Settings['hot_topic_num'])) {
        $Settings['hot_topic_num'] = 15; }
-$CategoryID=mysql_result($result,$i,"CategoryID");
-$UsersID=mysql_result($result,$i,"UserID");
-$GuestsName=mysql_result($result,$i,"GuestName");
-$TheTime=mysql_result($result,$i,"TimeStamp");
+$CategoryID=sql_result($result,$i,"CategoryID");
+$UsersID=sql_result($result,$i,"UserID");
+$GuestsName=sql_result($result,$i,"GuestName");
+$TheTime=sql_result($result,$i,"TimeStamp");
 $TheTime=GMTimeChange("F j, Y",$TheTime,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
-$NumReply=mysql_result($result,$i,"NumReply");
+$NumReply=sql_result($result,$i,"NumReply");
 $NumberPosts=$NumReply + 1;
 $prepagelist = null;
 if(!isset($Settings['max_posts'])) { 
@@ -352,10 +352,10 @@ if($NumberPages>=2) {
        $prepagelist = $prepagelist."</span>"; } }
        if($ThemeSet['MiniPageAltStyle']=="off") { 
        $prepagelist = $prepagelist.")</span>"; } }
-$TopicName=mysql_result($result,$i,"TopicName");
-$TopicDescription=mysql_result($result,$i,"Description");
-$PinnedTopic=mysql_result($result,$i,"Pinned");
-$TopicStat=mysql_result($result,$i,"Closed");
+$TopicName=sql_result($result,$i,"TopicName");
+$TopicDescription=sql_result($result,$i,"Description");
+$PinnedTopic=sql_result($result,$i,"Pinned");
+$TopicStat=sql_result($result,$i,"Closed");
 $PreUsersName = GetUserName($UsersID,$Settings['sqltable']);
 if($PreUsersName['Name']===null) { $UsersID = -1;
 $PreUsersName = GetUserName($UsersID,$Settings['sqltable']); }
@@ -368,14 +368,14 @@ if(isset($PermissionInfo['CanViewForum'][$ForumID])&&
        isset($CatPermissionInfo['CanViewCategory'][$CategoryID])&&
        $CatPermissionInfo['CanViewCategory'][$CategoryID]=="yes") {
 $LastReply = "&nbsp;<br />&nbsp;";
-$glrquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` DESC LIMIT 1", array($TopicID));
-$glrresult=exec_query($glrquery);
-$glrnum=mysql_num_rows($glrresult);
+$glrquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` DESC LIMIT 1", array($TopicID));
+$glrresult=sql_query($glrquery);
+$glrnum=sql_num_rows($glrresult);
 if($glrnum>0){
-$ReplyID1=mysql_result($glrresult,0,"id");
-$UsersID1=mysql_result($glrresult,0,"UserID");
-$GuestsName1=mysql_result($glrresult,0,"GuestName");
-$TimeStamp1=mysql_result($glrresult,0,"TimeStamp");
+$ReplyID1=sql_result($glrresult,0,"id");
+$UsersID1=sql_result($glrresult,0,"UserID");
+$GuestsName1=sql_result($glrresult,0,"GuestName");
+$TimeStamp1=sql_result($glrresult,0,"TimeStamp");
 $TimeStamp1=GMTimeChange("F j, Y",$TimeStamp1,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
 $PreUsersName1 = GetUserName($UsersID1,$Settings['sqltable']);
 if($PreUsersName1['Name']===null) { $UsersID1 = -1;
@@ -404,7 +404,7 @@ if(($UsersID1<-1&&$UsersHidden1=="yes")||$UsersID1==0||($UsersID1>0&&$UsersHidde
 $lul = url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index']);
 $luln = url_maker($exfile['topic'],$Settings['file_ext'],"act=view&id=".$TopicID."&page=".$NumPages,$Settings['qstr'],$Settings['qsep'],$prexqstr['topic'],$exqstr['topic']).$qstrhtml."&#35;reply".$NumRPosts;
 $LastReply = "Time: <a href=\"".$luln."\">".$TimeStamp1."</a><br />\n".$UserPre." <span title=\"".$oldusername."\">".$UsersName1."</span>"; } }
-mysql_free_result($glrresult);
+sql_free_result($glrresult);
 if($TimeStamp1==null) { $LastReply = "&nbsp;<br />&nbsp;"; }
 $PreTopic = $ThemeSet['TopicIcon'];
 if ($PinnedTopic>1) { $PinnedTopic = 1; } 
@@ -468,7 +468,7 @@ if($pagenum>1) {
 ?>
 <div class="DivPageLinks">&nbsp;</div>
 <?php }
-mysql_free_result($result); } } } 
+sql_free_result($result); } } } 
 if($pagenum<=1) { ?>
 <div class="DivSearch">&nbsp;</div>
 <?php } ?>

diff --git a/inc/stats.php b/inc/stats.php
index ce51b6f..9893595 100644 (file)
--- a/inc/stats.php
+++ b/inc/stats.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: stats.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: stats.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="stats.php"||$File3Name=="/stats.php") {
@@ -27,13 +27,13 @@ $_SESSION['PreViewingTitle'] = "Viewing";
 $_SESSION['ViewingTitle'] = "Board Stats"; }
 $uolcuttime = GMTimeStamp();
 $uoltime = $uolcuttime - ini_get("session.gc_maxlifetime");
-$uolquery = query("SELECT session_data FROM `".$Settings['sqltable']."sessions` WHERE `expires` >= %i ORDER BY `expires` DESC", array($uoltime));
-$uolresult=exec_query($uolquery);
-$uolnum=mysql_num_rows($uolresult);
+$uolquery = sql_pre_query("SELECT session_data FROM `".$Settings['sqltable']."sessions` WHERE `expires` >= %i ORDER BY `expires` DESC", array($uoltime));
+$uolresult=sql_query($uolquery);
+$uolnum=sql_num_rows($uolresult);
 $uoli=0; $olmn = 0; $olgn = 0; $olan = 0;
 $MembersOnline = null; $GuestsOnline = null;
 while ($uoli < $uolnum) {
-$session_data=mysql_result($uolresult,$uoli,"session_data"); 
+$session_data=sql_result($uolresult,$uoli,"session_data"); 
 $UserSessInfo = unserialize_session($session_data);
 $AmIHiddenUser = "no";
 if($UserSessInfo['UserGroup']!=$Settings['GuestGroup']) {
@@ -50,27 +50,27 @@ if($UserSessInfo['UserGroup']==$Settings['GuestGroup']) {
 ++$olgn; }
 ++$uoli; }
 if($_GET['act']=="view"||$_GET['act']=="stats") {
-$ntquery = query("SELECT COUNT(*) FROM `".$Settings['sqltable']."topics`", array(null));
-$ntresult = exec_query($ntquery);
-$numtopics = mysql_result($ntresult,0);
-mysql_free_result($ntresult);
-$npquery = query("SELECT COUNT(*) FROM `".$Settings['sqltable']."posts`", array(null));
-$npresult = exec_query($npquery);
-$numposts = mysql_result($npresult,0);
-mysql_free_result($npresult);
+$ntquery = sql_pre_query("SELECT COUNT(*) FROM `".$Settings['sqltable']."topics`", array(null));
+$ntresult = sql_query($ntquery);
+$numtopics = sql_result($ntresult,0);
+sql_free_result($ntresult);
+$npquery = sql_pre_query("SELECT COUNT(*) FROM `".$Settings['sqltable']."posts`", array(null));
+$npresult = sql_query($npquery);
+$numposts = sql_result($npresult,0);
+sql_free_result($npresult);
 if($Settings['AdminValidate']=="on") {
-$nmquery = query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."members` WHERE `id`>=%i AND `HiddenMember`='no' AND `Validated`='yes' AND `GroupID`<>%i ORDER BY `Joined` DESC LIMIT 1", array(1,$Settings['ValidateGroup'])); }
+$nmquery = sql_pre_query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."members` WHERE `id`>=%i AND `HiddenMember`='no' AND `Validated`='yes' AND `GroupID`<>%i ORDER BY `Joined` DESC LIMIT 1", array(1,$Settings['ValidateGroup'])); }
 if($Settings['AdminValidate']!="on") {
-$nmquery = query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."members` WHERE `id`>=%i AND `HiddenMember`='no' ORDER BY `Joined` DESC LIMIT 1", array(1,$Settings['ValidateGroup'])); }
-$rnmquery = query("SELECT FOUND_ROWS();", array(null));
-$nmresult = exec_query($nmquery);
-$rnmresult = exec_query($rnmquery);
-//$nummembers = mysql_num_rows($nmresult);
-$nummembers = mysql_result($rnmresult,0);
-mysql_free_result($rnmresult);
+$nmquery = sql_pre_query("SELECT SQL_CALC_FOUND_ROWS * FROM `".$Settings['sqltable']."members` WHERE `id`>=%i AND `HiddenMember`='no' ORDER BY `Joined` DESC LIMIT 1", array(1,$Settings['ValidateGroup'])); }
+$rnmquery = sql_pre_query("SELECT FOUND_ROWS();", array(null));
+$nmresult = sql_query($nmquery);
+$rnmresult = sql_query($rnmquery);
+//$nummembers = sql_num_rows($nmresult);
+$nummembers = sql_result($rnmresult,0);
+sql_free_result($rnmresult);
 $NewestMem = array(null);
-$NewestMem['ID']=mysql_result($nmresult,0,"id");
-$NewestMem['Name']=mysql_result($nmresult,0,"Name");
+$NewestMem['ID']=sql_result($nmresult,0,"id");
+$NewestMem['Name']=sql_result($nmresult,0,"Name");
 if($NewestMem['ID']<=0) { $NewestMem['ID'] = "0"; $NewestMem['Name'] = "Anonymous"; }
 ?>
 <div class="StatsBorder">

diff --git a/inc/subcategories.php b/inc/subcategories.php
index 68953fe..3585f0e 100644 (file)
--- a/inc/subcategories.php
+++ b/inc/subcategories.php
@@ -11,26 +11,26 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: subcategories.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: subcategories.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="subcategories.php"||$File3Name=="/subcategories.php") {
        require('index.php');
        exit(); }
 if(!is_numeric($_GET['id'])) { $_GET['id'] = null; }
-$checkquery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($_GET['id']));
-$checkresult=exec_query($checkquery);
-$checknum=mysql_num_rows($checkresult);
-if($checknum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); mysql_free_result($checkresult);
+$checkquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($_GET['id']));
+$checkresult=sql_query($checkquery);
+$checknum=sql_num_rows($checkresult);
+if($checknum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); sql_free_result($checkresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($checknum>=1) {
-$CategoryID=mysql_result($checkresult,0,"id");
-$CategoryName=mysql_result($checkresult,0,"Name");
-$CategoryShow=mysql_result($checkresult,0,"ShowCategory");
-$CategoryType=mysql_result($checkresult,0,"CategoryType");
-$InSubCategory=mysql_result($checkresult,0,"InSubCategory");
-$SubShowForums=mysql_result($checkresult,0,"SubShowForums");
+$CategoryID=sql_result($checkresult,0,"id");
+$CategoryName=sql_result($checkresult,0,"Name");
+$CategoryShow=sql_result($checkresult,0,"ShowCategory");
+$CategoryType=sql_result($checkresult,0,"CategoryType");
+$InSubCategory=sql_result($checkresult,0,"InSubCategory");
+$SubShowForums=sql_result($checkresult,0,"SubShowForums");
 $CategoryType = strtolower($CategoryType); $SubShowForums = strtolower($SubShowForums);
 $SCategoryName = $CategoryName;
 if(!isset($CatPermissionInfo['CanViewCategory'][$CategoryID])) {
@@ -49,17 +49,17 @@ $_SESSION['ViewingFile'] = $exfile[$CategoryType]; }
 $_SESSION['PreViewingTitle'] = "Viewing SubCategory:";
 $_SESSION['ViewingTitle'] = $CategoryName;
 if($InSubCategory!="0") {
-$iscquery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($InSubCategory));
-$iscresult=exec_query($iscquery);
-$iscnum=mysql_num_rows($iscresult);
+$iscquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i LIMIT 1", array($InSubCategory));
+$iscresult=sql_query($iscquery);
+$iscnum=sql_num_rows($iscresult);
 if($iscnum>=1) {
-$iscCategoryID=mysql_result($iscresult,0,"id");
-$iscCategoryName=mysql_result($iscresult,0,"Name");
-$iscCategoryShow=mysql_result($iscresult,0,"ShowCategory");
-$iscCategoryType=mysql_result($iscresult,0,"CategoryType");
+$iscCategoryID=sql_result($iscresult,0,"id");
+$iscCategoryName=sql_result($iscresult,0,"Name");
+$iscCategoryShow=sql_result($iscresult,0,"ShowCategory");
+$iscCategoryType=sql_result($iscresult,0,"CategoryType");
 $iscCategoryType = strtolower($iscCategoryType); }
 if($iscnum<1) { $InSubCategory = "0"; } 
-mysql_free_result($iscresult); }
+sql_free_result($iscresult); }
 ?>
 <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 if($InSubCategory!="0") { echo $ThemeSet['NavLinkDivider']; ?><a href="<?php echo url_maker($exfile[$iscCategoryType],$Settings['file_ext'],"act=view&id=".$iscCategoryID."&page=1",$Settings['qstr'],$Settings['qsep'],$prexqstr[$iscCategoryType],$exqstr[$iscCategoryType]); ?>"><?php echo $iscCategoryName; ?></a><?php } echo $ThemeSet['NavLinkDivider']; ?><a href="<?php echo url_maker($exfile[$CategoryType],$Settings['file_ext'],"act=view&id=".$CategoryID,$Settings['qstr'],$Settings['qsep'],$prexqstr[$CategoryType],$exqstr[$CategoryType]); ?>"><?php echo $CategoryName; ?></a></div>
 <div class="DivNavLinks">&nbsp;</div>
@@ -68,24 +68,24 @@ if($CategoryType=="category") {
 redirect("location",$basedir.url_maker($exfile['category'],$Settings['file_ext'],"act=".$_GET['act']."&id=".$_GET['id'],$Settings['qstr'],$Settings['qsep'],$prexqstr['category'],$exqstr['category'],FALSE));
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
-mysql_free_result($checkresult);
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `ShowCategory`='yes' AND `InSubCategory`=%i ORDER BY `OrderID` ASC, `id` ASC", array($_GET['id']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
+sql_free_result($checkresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `ShowCategory`='yes' AND `InSubCategory`=%i ORDER BY `OrderID` ASC, `id` ASC", array($_GET['id']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
 $prei=0;
 while ($prei < $prenum) {
-$CategoryID=mysql_result($preresult,$prei,"id");
-$CategoryName=mysql_result($preresult,$prei,"Name");
-$CategoryShow=mysql_result($preresult,$prei,"ShowCategory");
-$CategoryType=mysql_result($preresult,$prei,"CategoryType");
-$SSubShowForums=mysql_result($preresult,$prei,"SubShowForums");
-$CategoryDescription=mysql_result($preresult,$prei,"Description");
+$CategoryID=sql_result($preresult,$prei,"id");
+$CategoryName=sql_result($preresult,$prei,"Name");
+$CategoryShow=sql_result($preresult,$prei,"ShowCategory");
+$CategoryType=sql_result($preresult,$prei,"CategoryType");
+$SSubShowForums=sql_result($preresult,$prei,"SubShowForums");
+$CategoryDescription=sql_result($preresult,$prei,"Description");
 $CategoryType = strtolower($CategoryType); $SubShowForums = strtolower($SubShowForums);
 if(isset($CatPermissionInfo['CanViewCategory'][$CategoryID])&&
        $CatPermissionInfo['CanViewCategory'][$CategoryID]=="yes") {
-$query = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `CategoryID`=%i AND `InSubForum`=0 ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `CategoryID`=%i AND `InSubForum`=0 ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
 if($num>=1) {
 ?>
@@ -111,31 +111,31 @@ if($num>=1) {
 </tr>
 <?php }
 while ($i < $num) {
-$ForumID=mysql_result($result,$i,"id");
-$ForumName=mysql_result($result,$i,"Name");
-$ForumShow=mysql_result($result,$i,"ShowForum");
-$ForumType=mysql_result($result,$i,"ForumType");
-$ForumShowTopics=mysql_result($result,$i,"CanHaveTopics");
+$ForumID=sql_result($result,$i,"id");
+$ForumName=sql_result($result,$i,"Name");
+$ForumShow=sql_result($result,$i,"ShowForum");
+$ForumType=sql_result($result,$i,"ForumType");
+$ForumShowTopics=sql_result($result,$i,"CanHaveTopics");
 $ForumShowTopics = strtolower($ForumShowTopics);
-$NumTopics=mysql_result($result,$i,"NumTopics");
-$NumPosts=mysql_result($result,$i,"NumPosts");
-$NumRedirects=mysql_result($result,$i,"Redirects");
-$ForumDescription=mysql_result($result,$i,"Description");
+$NumTopics=sql_result($result,$i,"NumTopics");
+$NumPosts=sql_result($result,$i,"NumPosts");
+$NumRedirects=sql_result($result,$i,"Redirects");
+$ForumDescription=sql_result($result,$i,"Description");
 $ForumType = strtolower($ForumType); $sflist = null;
 $gltf = array(null); $gltf[0] = $ForumID;
 if ($ForumType=="subforum") { 
-$apcquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
-$apcresult=exec_query($apcquery);
-$apcnum=mysql_num_rows($apcresult);
+$apcquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
+$apcresult=sql_query($apcquery);
+$apcnum=sql_num_rows($apcresult);
 $apci=0; $apcl=1; if($apcnum>=1) {
 while ($apci < $apcnum) {
-$NumsTopics=mysql_result($apcresult,$apci,"NumTopics");
+$NumsTopics=sql_result($apcresult,$apci,"NumTopics");
 $NumTopics = $NumsTopics + $NumTopics;
-$NumsPosts=mysql_result($apcresult,$apci,"NumPosts");
+$NumsPosts=sql_result($apcresult,$apci,"NumPosts");
 $NumPosts = $NumsPosts + $NumPosts;
-$SubsForumID=mysql_result($apcresult,$apci,"id");
-$SubsForumName=mysql_result($apcresult,$apci,"Name");
-$SubsForumType=mysql_result($apcresult,$apci,"ForumType");
+$SubsForumID=sql_result($apcresult,$apci,"id");
+$SubsForumName=sql_result($apcresult,$apci,"Name");
+$SubsForumType=sql_result($apcresult,$apci,"ForumType");
 if(isset($PermissionInfo['CanViewForum'][$SubsForumID])&&
        $PermissionInfo['CanViewForum'][$SubsForumID]=="yes") {
 $sfurl = "<a href=\"";
@@ -148,21 +148,21 @@ if($apcl>1) {
 $sflist = $sflist.", ".$sfurl; }
 $gltf[$apcl] = $SubsForumID; ++$apcl; }
 ++$apci; }
-mysql_free_result($apcresult); } }
+sql_free_result($apcresult); } }
 $gltf = array(null); $gltf[0] = $ForumID;
 if ($ForumType=="subforum") { 
-$apcquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
-$apcresult=exec_query($apcquery);
-$apcnum=mysql_num_rows($apcresult);
+$apcquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
+$apcresult=sql_query($apcquery);
+$apcnum=sql_num_rows($apcresult);
 $apci=0; $apcl=1; if($apcnum>=1) {
 while ($apci < $apcnum) {
-$NumsTopics=mysql_result($apcresult,$apci,"NumTopics");
+$NumsTopics=sql_result($apcresult,$apci,"NumTopics");
 $NumTopics = $NumsTopics + $NumTopics;
-$NumsPosts=mysql_result($apcresult,$apci,"NumPosts");
+$NumsPosts=sql_result($apcresult,$apci,"NumPosts");
 $NumPosts = $NumsPosts + $NumPosts;
-$SubsForumID=mysql_result($apcresult,$apci,"id");
-$SubsForumName=mysql_result($apcresult,$apci,"Name");
-$SubsForumType=mysql_result($apcresult,$apci,"ForumType");
+$SubsForumID=sql_result($apcresult,$apci,"id");
+$SubsForumName=sql_result($apcresult,$apci,"Name");
+$SubsForumType=sql_result($apcresult,$apci,"ForumType");
 if(isset($PermissionInfo['CanViewForum'][$SubsForumID])&&
        $PermissionInfo['CanViewForum'][$SubsForumID]=="yes") {
 $sfurl = "<a href=\"";
@@ -175,23 +175,23 @@ if($apcl>1) {
 $sflist = $sflist.", ".$sfurl; }
 $gltf[$apcl] = $SubsForumID; ++$apcl; }
 ++$apci; }
-mysql_free_result($apcresult); } }
+sql_free_result($apcresult); } }
 if ($ForumType=="subforum") { 
-$apcquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
-$apcresult=exec_query($apcquery);
-$apcnum=mysql_num_rows($apcresult);
+$apcquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
+$apcresult=sql_query($apcquery);
+$apcnum=sql_num_rows($apcresult);
 $apci=0; $apcl=1; if($apcnum>=1) {
 while ($apci < $apcnum) {
-$NumsTopics=mysql_result($apcresult,$apci,"NumTopics");
+$NumsTopics=sql_result($apcresult,$apci,"NumTopics");
 $NumTopics = $NumsTopics + $NumTopics;
-$NumsPosts=mysql_result($apcresult,$apci,"NumPosts");
+$NumsPosts=sql_result($apcresult,$apci,"NumPosts");
 $NumPosts = $NumsPosts + $NumPosts;
-$SubsForumID=mysql_result($apcresult,$apci,"id");
+$SubsForumID=sql_result($apcresult,$apci,"id");
 if(isset($PermissionInfo['CanViewForum'][$SubsForumID])&&
        $PermissionInfo['CanViewForum'][$SubsForumID]=="yes") {
 $gltf[$apcl] = $SubsForumID; ++$apcl; }
 ++$apci; }
-mysql_free_result($apcresult); } }
+sql_free_result($apcresult); } }
 if(isset($PermissionInfo['CanViewForum'][$ForumID])&&
        $PermissionInfo['CanViewForum'][$ForumID]=="yes") {
 $LastTopic = "&nbsp;<br />&nbsp;<br />&nbsp;";
@@ -200,25 +200,25 @@ $gltnum = count($gltf); $glti = 0;
 $OldUpdateTime = 0; $UseThisFonum = null;
 if ($ForumType=="subforum") { 
 while ($glti < $gltnum) {
-$gltfoquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($gltf[$glti]));
-$gltforesult=exec_query($gltfoquery);
-$gltfonum=mysql_num_rows($gltforesult);
+$gltfoquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($gltf[$glti]));
+$gltforesult=sql_query($gltfoquery);
+$gltfonum=sql_num_rows($gltforesult);
 if($gltfonum>0) {
-$NewUpdateTime=mysql_result($gltforesult,0,"LastUpdate");
+$NewUpdateTime=sql_result($gltforesult,0,"LastUpdate");
 if($NewUpdateTime>$OldUpdateTime) { 
        $UseThisFonum = $gltf[$glti]; 
 $OldUpdateTime = $NewUpdateTime; } }
-mysql_free_result($gltforesult);
+sql_free_result($gltforesult);
 ++$glti; } }
 if ($ForumType!="subforum"&&$ForumType!="redirect") { $UseThisFonum = $gltf[0]; }
 if ($ForumType!="redirect") {
-$gltquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($UseThisFonum));
-$gltresult=exec_query($gltquery);
-$gltnum=mysql_num_rows($gltresult);
+$gltquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($UseThisFonum));
+$gltresult=sql_query($gltquery);
+$gltnum=sql_num_rows($gltresult);
 if($gltnum>0){
-$TopicID=mysql_result($gltresult,0,"id");
-$TopicName=mysql_result($gltresult,0,"TopicName");
-$NumReplys=mysql_result($gltresult,0,"NumReply");
+$TopicID=sql_result($gltresult,0,"id");
+$TopicName=sql_result($gltresult,0,"TopicName");
+$NumReplys=sql_result($gltresult,0,"NumReply");
 $NumPages = null; $NumRPosts = $NumReplys + 1;
 if(!isset($Settings['max_posts'])) { $Settings['max_posts'] = 10; }
 if($NumRPosts>$Settings['max_posts']) {
@@ -228,16 +228,16 @@ $TopicName1 = pre_substr($TopicName,0,20);
 $oldtopicname=$TopicName;
 if (pre_strlen($TopicName)>20) {
 $TopicName1 = $TopicName1."..."; $TopicName=$TopicName1; }
-$glrquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` DESC LIMIT 1", array($TopicID));
-$glrresult=exec_query($glrquery);
-$glrnum=mysql_num_rows($glrresult);
+$glrquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` DESC LIMIT 1", array($TopicID));
+$glrresult=sql_query($glrquery);
+$glrnum=sql_num_rows($glrresult);
 if($glrnum>0){
-$ReplyID=mysql_result($glrresult,0,"id");
-$UsersID=mysql_result($glrresult,0,"UserID");
-$GuestsName=mysql_result($glrresult,0,"GuestName");
-$TimeStamp=mysql_result($glrresult,0,"TimeStamp");
+$ReplyID=sql_result($glrresult,0,"id");
+$UsersID=sql_result($glrresult,0,"UserID");
+$GuestsName=sql_result($glrresult,0,"GuestName");
+$TimeStamp=sql_result($glrresult,0,"TimeStamp");
 $TimeStamp=GMTimeChange("F j Y, g:i a",$TimeStamp,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
-mysql_free_result($glrresult); }
+sql_free_result($glrresult); }
 $PreUsersName = GetUserName($UsersID,$Settings['sqltable']);
 if($PreUsersName['Name']===null) { $UsersID = -1;
 $PreUsersName = GetUserName($UsersID,$Settings['sqltable']); }
@@ -259,7 +259,7 @@ if(($UsersID<-1&&$UsersHidden=="yes")||$UsersID==0||($UsersID>0&&$UsersHidden=="
        $UserPre = "Hidden:"; }
 $LastTopic = $TimeStamp."<br />\nTopic: <a href=\"".url_maker($exfile['topic'],$Settings['file_ext'],"act=view&id=".$TopicID."&page=".$NumPages,$Settings['qstr'],$Settings['qsep'],$prexqstr['topic'],$exqstr['topic']).$qstrhtml."&#35;reply".$NumRPosts."\" title=\"".$oldtopicname."\">".$TopicName."</a><br />\n".$UserPre." <span title=\"".$oldusername."\">".$UsersName."</span>"; } }
 if($LastTopic==null) { $LastTopic = "&nbsp;<br />&nbsp;<br />&nbsp;"; } }
-mysql_free_result($gltresult);
+sql_free_result($gltresult);
 if ($ForumType=="redirect") { $LastTopic="&nbsp;<br />Redirects: ".$NumRedirects."<br />&nbsp;"; }
 $PreForum = $ThemeSet['ForumIcon'];
 if ($ForumType=="forum") { $PreForum=$ThemeSet['ForumIcon']; }
@@ -278,7 +278,7 @@ $ExStr = ""; if ($ForumType!="redirect"&&
 <td class="TableColumn3" style="text-align: center;"><?php echo $NumPosts; ?></td>
 <td class="TableColumn3"><?php echo $LastTopic; ?></td>
 </tr>
-<?php } ++$i; } mysql_free_result($result);
+<?php } ++$i; } sql_free_result($result);
 if($num>=1) {
 ?>
 <tr id="SubCatEnd<?php echo $CategoryID; ?>" class="TableRow4">
@@ -287,7 +287,7 @@ if($num>=1) {
 </table></div>
 <div class="DivSubCategories">&nbsp;</div>
 <?php } } ++$prei; } }
-mysql_free_result($preresult);
+sql_free_result($preresult);
 $CatCheck = "skip";
 if($SubShowForums!="yes") { 
        $CategoryName = $SCategoryName; }

diff --git a/inc/subforums.php b/inc/subforums.php
index e165eb9..b5a8ff8 100644 (file)
--- a/inc/subforums.php
+++ b/inc/subforums.php
@@ -11,41 +11,41 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: subforums.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: subforums.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="subforums.php"||$File3Name=="/subforums.php") {
        require('index.php');
        exit(); }
 if(!is_numeric($_GET['id'])) { $_GET['id'] = null; }
-$checkquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_GET['id']));
-$checkresult=exec_query($checkquery);
-$checknum=mysql_num_rows($checkresult);
-if($checknum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); mysql_free_result($checkresult);
+$checkquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_GET['id']));
+$checkresult=sql_query($checkquery);
+$checknum=sql_num_rows($checkresult);
+if($checknum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); sql_free_result($checkresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($checknum>=1) {
-$ForumID=mysql_result($checkresult,0,"id");
-$ForumName=mysql_result($checkresult,0,"Name");
-$ForumType=mysql_result($checkresult,0,"ForumType");
-$InSubForum=mysql_result($checkresult,0,"InSubForum");
-$CategoryID=mysql_result($checkresult,0,"CategoryID");
-$RedirectURL=mysql_result($checkresult,0,"RedirectURL");
-$RedirectTimes=mysql_result($checkresult,0,"Redirects");
-$CanHaveTopics=mysql_result($checkresult,0,"CanHaveTopics");
-$NumberViews=mysql_result($checkresult,0,"NumViews");
+$ForumID=sql_result($checkresult,0,"id");
+$ForumName=sql_result($checkresult,0,"Name");
+$ForumType=sql_result($checkresult,0,"ForumType");
+$InSubForum=sql_result($checkresult,0,"InSubForum");
+$CategoryID=sql_result($checkresult,0,"CategoryID");
+$RedirectURL=sql_result($checkresult,0,"RedirectURL");
+$RedirectTimes=sql_result($checkresult,0,"Redirects");
+$CanHaveTopics=sql_result($checkresult,0,"CanHaveTopics");
+$NumberViews=sql_result($checkresult,0,"NumViews");
 $SForumName = $ForumName;
 $ForumType = strtolower($ForumType); $CanHaveTopics = strtolower($CanHaveTopics);
 if($CanHaveTopics!="yes"&&$ForumType!="redirect") {
 if($NumberViews==0||$NumberViews==null) { $NewNumberViews = 1; }
 if($NumberViews!=0&&$NumberViews!=null) { $NewNumberViews = $NumberViews + 1; }
-$viewup = query("UPDATE `".$Settings['sqltable']."forums` SET `NumViews`='%s' WHERE `id`=%i", array($NewNumberViews,$_GET['id']));
-exec_query($viewup); }
+$viewup = sql_pre_query("UPDATE `".$Settings['sqltable']."forums` SET `NumViews`='%s' WHERE `id`=%i", array($NewNumberViews,$_GET['id']));
+sql_query($viewup); }
 if($ForumType=="redirect") {
 if($RedirectTimes==0||$RedirectTimes==null) { $NewRedirTime = 1; }
 if($RedirectTimes!=0&&$RedirectTimes!=null) { $NewRedirTime = $RedirectTimes + 1; }
-$redirup = query("UPDATE `".$Settings['sqltable']."forums` SET `Redirects`='%s' WHERE `id`=%i", array($NewRedirTime,$_GET['id']));
-exec_query($redirup);
+$redirup = sql_pre_query("UPDATE `".$Settings['sqltable']."forums` SET `Redirects`='%s' WHERE `id`=%i", array($NewRedirTime,$_GET['id']));
+sql_query($redirup);
 if($RedirectURL!="http://"&&$RedirectURL!="") {
 redirect("location",$RedirectURL,0,null,false); ob_clean();
 header("Content-Type: text/plain; charset=".$Settings['charset']);
@@ -58,29 +58,29 @@ if($ForumType=="forum") {
 redirect("location",$basedir.url_maker($exfile['forum'],$Settings['file_ext'],"act=".$_GET['act']."&id=".$_GET['id'],$Settings['qstr'],$Settings['qsep'],$prexqstr['forum'],$exqstr['forum'],FALSE));
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
-mysql_free_result($checkresult);
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `ShowCategory`='yes' AND `id`=%i ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
+sql_free_result($checkresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `ShowCategory`='yes' AND `id`=%i ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
 $prei=0;
-$CategoryID=mysql_result($preresult,0,"id");
-$CategoryType=mysql_result($preresult,0,"CategoryType");
-$CategoryName=mysql_result($preresult,0,"Name");
-$CategoryShow=mysql_result($preresult,0,"ShowCategory");
-$CategoryDescription=mysql_result($preresult,0,"Description");
+$CategoryID=sql_result($preresult,0,"id");
+$CategoryType=sql_result($preresult,0,"CategoryType");
+$CategoryName=sql_result($preresult,0,"Name");
+$CategoryShow=sql_result($preresult,0,"ShowCategory");
+$CategoryDescription=sql_result($preresult,0,"Description");
 if($InSubForum!="0") {
-$isfquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($InSubForum));
-$isfresult=exec_query($isfquery);
-$isfnum=mysql_num_rows($isfresult);
+$isfquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($InSubForum));
+$isfresult=sql_query($isfquery);
+$isfnum=sql_num_rows($isfresult);
 if($isfnum>=1) {
-$isfForumID=mysql_result($isfresult,0,"id");
-$isfForumCatID=mysql_result($isfresult,0,"CategoryID");
-$isfForumName=mysql_result($isfresult,0,"Name");
-$isfForumType=mysql_result($isfresult,0,"ForumType");
+$isfForumID=sql_result($isfresult,0,"id");
+$isfForumCatID=sql_result($isfresult,0,"CategoryID");
+$isfForumName=sql_result($isfresult,0,"Name");
+$isfForumType=sql_result($isfresult,0,"ForumType");
 $isfForumType = strtolower($isfForumType);
-$isfRedirectURL=mysql_result($isfresult,0,"RedirectURL"); }
+$isfRedirectURL=sql_result($isfresult,0,"RedirectURL"); }
 if($isfnum<1) { $InSubForum = "0"; } 
-mysql_free_result($isfresult); }
+sql_free_result($isfresult); }
 $_SESSION['ViewingPage'] = url_maker(null,"no+ext","act=view&id=".$ForumID."&page=".$_GET['page'],"&","=",$prexqstr[$ForumType],$exqstr[$ForumType]);
 if($Settings['file_ext']!="no+ext"&&$Settings['file_ext']!="no ext") {
 $_SESSION['ViewingFile'] = $exfile[$ForumType].$Settings['file_ext']; }
@@ -108,9 +108,9 @@ ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($CatPermissionInfo['CanViewCategory'][$CategoryID]=="yes"&&
        $PermissionInfo['CanViewForum'][$_GET['id']]=="yes") {
-$query = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `CategoryID`=%i AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID,$_GET['id']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `CategoryID`=%i AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($CategoryID,$_GET['id']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 $i=0;
 ?>
 <div class="Table1Border">
@@ -135,31 +135,31 @@ $i=0;
 </tr>
 <?php
 while ($i < $num) {
-$ForumID=mysql_result($result,$i,"id");
-$ForumName=mysql_result($result,$i,"Name");
-$ForumShow=mysql_result($result,$i,"ShowForum");
-$ForumType=mysql_result($result,$i,"ForumType");
-$ForumShowTopics=mysql_result($result,$i,"CanHaveTopics");
+$ForumID=sql_result($result,$i,"id");
+$ForumName=sql_result($result,$i,"Name");
+$ForumShow=sql_result($result,$i,"ShowForum");
+$ForumType=sql_result($result,$i,"ForumType");
+$ForumShowTopics=sql_result($result,$i,"CanHaveTopics");
 $ForumShowTopics = strtolower($ForumShowTopics);
-$NumTopics=mysql_result($result,$i,"NumTopics");
-$NumPosts=mysql_result($result,$i,"NumPosts");
-$NumRedirects=mysql_result($result,$i,"Redirects");
-$ForumDescription=mysql_result($result,$i,"Description");
+$NumTopics=sql_result($result,$i,"NumTopics");
+$NumPosts=sql_result($result,$i,"NumPosts");
+$NumRedirects=sql_result($result,$i,"Redirects");
+$ForumDescription=sql_result($result,$i,"Description");
 $ForumType = strtolower($ForumType); $sflist = null;
 $gltf = array(null); $gltf[0] = $ForumID;
 if ($ForumType=="subforum") { 
-$apcquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
-$apcresult=exec_query($apcquery);
-$apcnum=mysql_num_rows($apcresult);
+$apcquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `ShowForum`='yes' AND `InSubForum`=%i ORDER BY `OrderID` ASC, `id` ASC", array($ForumID));
+$apcresult=sql_query($apcquery);
+$apcnum=sql_num_rows($apcresult);
 $apci=0; $apcl=1; if($apcnum>=1) {
 while ($apci < $apcnum) {
-$NumsTopics=mysql_result($apcresult,$apci,"NumTopics");
+$NumsTopics=sql_result($apcresult,$apci,"NumTopics");
 $NumTopics = $NumsTopics + $NumTopics;
-$NumsPosts=mysql_result($apcresult,$apci,"NumPosts");
+$NumsPosts=sql_result($apcresult,$apci,"NumPosts");
 $NumPosts = $NumsPosts + $NumPosts;
-$SubsForumID=mysql_result($apcresult,$apci,"id");
-$SubsForumName=mysql_result($apcresult,$apci,"Name");
-$SubsForumType=mysql_result($apcresult,$apci,"ForumType");
+$SubsForumID=sql_result($apcresult,$apci,"id");
+$SubsForumName=sql_result($apcresult,$apci,"Name");
+$SubsForumType=sql_result($apcresult,$apci,"ForumType");
 if(isset($PermissionInfo['CanViewForum'][$SubsForumID])&&
        $PermissionInfo['CanViewForum'][$SubsForumID]=="yes") {
 $sfurl = "<a href=\"";
@@ -172,7 +172,7 @@ if($apcl>1) {
 $sflist = $sflist.", ".$sfurl; }
 $gltf[$apcl] = $SubsForumID; ++$apcl; }
 ++$apci; }
-mysql_free_result($apcresult); } }
+sql_free_result($apcresult); } }
 if(isset($PermissionInfo['CanViewForum'][$ForumID])&&
        $PermissionInfo['CanViewForum'][$ForumID]=="yes") {
 $LastTopic = "&nbsp;<br />&nbsp;<br />&nbsp;";
@@ -181,25 +181,25 @@ $gltnum = count($gltf); $glti = 0;
 $OldUpdateTime = 0; $UseThisFonum = null;
 if ($ForumType=="subforum") { 
 while ($glti < $gltnum) {
-$gltfoquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `CategoryID`=%i AND `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($CategoryID,$gltf[$glti]));
-$gltforesult=exec_query($gltfoquery);
-$gltfonum=mysql_num_rows($gltforesult);
+$gltfoquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `CategoryID`=%i AND `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($CategoryID,$gltf[$glti]));
+$gltforesult=sql_query($gltfoquery);
+$gltfonum=sql_num_rows($gltforesult);
 if($gltfonum>0) {
-$NewUpdateTime=mysql_result($gltforesult,0,"LastUpdate");
+$NewUpdateTime=sql_result($gltforesult,0,"LastUpdate");
 if($NewUpdateTime>$OldUpdateTime) { 
        $UseThisFonum = $gltf[$glti]; 
 $OldUpdateTime = $NewUpdateTime; } }
-mysql_free_result($gltforesult);
+sql_free_result($gltforesult);
 ++$glti; } }
 if ($ForumType!="subforum"&&$ForumType!="redirect") { $UseThisFonum = $gltf[0]; }
 if ($ForumType!="redirect") {
-$gltquery = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($UseThisFonum));
-$gltresult=exec_query($gltquery);
-$gltnum=mysql_num_rows($gltresult);
+$gltquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE `ForumID`=%i ORDER BY `LastUpdate` DESC LIMIT 1", array($UseThisFonum));
+$gltresult=sql_query($gltquery);
+$gltnum=sql_num_rows($gltresult);
 if($gltnum>0){
-$TopicID=mysql_result($gltresult,0,"id");
-$TopicName=mysql_result($gltresult,0,"TopicName");
-$NumReplys=mysql_result($gltresult,0,"NumReply");
+$TopicID=sql_result($gltresult,0,"id");
+$TopicName=sql_result($gltresult,0,"TopicName");
+$NumReplys=sql_result($gltresult,0,"NumReply");
 $TopicName1 = pre_substr($TopicName,0,20);
 $oldtopicname=$TopicName; $NumRPosts = $NumReplys + 1;
 if(!isset($Settings['max_posts'])) { $Settings['max_posts'] = 10; }
@@ -208,16 +208,16 @@ $NumPages = ceil($NumRPosts/$Settings['max_posts']); }
 if($NumRPosts<=$Settings['max_posts']) { $NumPages = 1; }
 if (pre_strlen($TopicName)>20) { 
 $TopicName1 = $TopicName1."..."; $TopicName=$TopicName1; }
-$glrquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` DESC LIMIT 1", array($TopicID));
-$glrresult=exec_query($glrquery);
-$glrnum=mysql_num_rows($glrresult);
+$glrquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` DESC LIMIT 1", array($TopicID));
+$glrresult=sql_query($glrquery);
+$glrnum=sql_num_rows($glrresult);
 if($glrnum>0){
-$ReplyID=mysql_result($glrresult,0,"id");
-$UsersID=mysql_result($glrresult,0,"UserID");
-$GuestsName=mysql_result($glrresult,0,"GuestName");
-$TimeStamp=mysql_result($glrresult,0,"TimeStamp");
+$ReplyID=sql_result($glrresult,0,"id");
+$UsersID=sql_result($glrresult,0,"UserID");
+$GuestsName=sql_result($glrresult,0,"GuestName");
+$TimeStamp=sql_result($glrresult,0,"TimeStamp");
 $TimeStamp=GMTimeChange("F j Y, g:i a",$TimeStamp,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
-mysql_free_result($glrresult); }
+sql_free_result($glrresult); }
 $PreUsersName = GetUserName($UsersID,$Settings['sqltable']);
 if($PreUsersName['Name']===null) { $UsersID = -1;
 $PreUsersName = GetUserName($UsersID,$Settings['sqltable']); }
@@ -239,7 +239,7 @@ if(($UsersID<-1&&$UsersHidden=="yes")||$UsersID==0||($UsersID>0&&$UsersHidden=="
        $UserPre = "Hidden:"; }
 $LastTopic = $TimeStamp."<br />\nTopic: <a href=\"".url_maker($exfile['topic'],$Settings['file_ext'],"act=view&id=".$TopicID."&page=".$NumPages,$Settings['qstr'],$Settings['qsep'],$prexqstr['topic'],$exqstr['topic']).$qstrhtml."&#35;reply".$NumRPosts."\" title=\"".$oldtopicname."\">".$TopicName."</a><br />\n".$UserPre." <span title=\"".$oldusername."\">".$UsersName."</span>"; } }
 if($LastTopic==null) { $LastTopic = "&nbsp;<br />&nbsp;<br />&nbsp;"; } }
-mysql_free_result($gltresult);
+sql_free_result($gltresult);
 if ($ForumType=="redirect") { $LastTopic="&nbsp;<br />Redirects: ".$NumRedirects."<br />&nbsp;"; }
 $PreForum = $ThemeSet['ForumIcon'];
 if ($ForumType=="forum") { $PreForum=$ThemeSet['ForumIcon']; }
@@ -259,14 +259,14 @@ $ExStr = ""; if ($ForumType!="redirect"&&
 <td class="TableColumn3" style="text-align: center;"><?php echo $NumPosts; ?></td>
 <td class="TableColumn3"><?php echo $LastTopic; ?></td>
 </tr>
-<?php } ++$i; } mysql_free_result($result);
+<?php } ++$i; } sql_free_result($result);
 ?>
 <tr id="CatEnd<?php echo $CategoryID; ?>" class="TableRow4">
 <td class="TableColumn4" colspan="5">&nbsp;</td>
 </tr>
 </table></div>
 <div class="DivSubForums">&nbsp;</div>
-<?php } mysql_free_result($preresult);
+<?php } sql_free_result($preresult);
 $ForumCheck = "skip";
 if($CanHaveTopics!="yes") { 
        $ForumName = $SForumName; }

diff --git a/inc/topics.php b/inc/topics.php
index da2ada6..260ef28 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/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: topics.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="topics.php"||$File3Name=="/topics.php") {
@@ -20,44 +20,44 @@ if ($File3Name=="topics.php"||$File3Name=="/topics.php") {
 $pstring = null; $pagenum = null;
 if(!is_numeric($_GET['id'])) { $_GET['id'] = null; }
 if(!is_numeric($_GET['page'])) { $_GET['page'] = 1; }
-$prequery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_GET['id']));
-$preresult=exec_query($prequery);
-$prenum=mysql_num_rows($preresult);
-if($prenum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); mysql_free_result($preresult);
+$prequery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($_GET['id']));
+$preresult=sql_query($prequery);
+$prenum=sql_num_rows($preresult);
+if($prenum==0) { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); sql_free_result($preresult);
 ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']);
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 if($prenum>=1) {
-$ForumID=mysql_result($preresult,0,"id");
-$ForumCatID=mysql_result($preresult,0,"CategoryID");
-$ForumName=mysql_result($preresult,0,"Name");
-$ForumType=mysql_result($preresult,0,"ForumType");
-$InSubForum=mysql_result($preresult,0,"InSubForum");
-$RedirectURL=mysql_result($preresult,0,"RedirectURL");
-$RedirectTimes=mysql_result($preresult,0,"Redirects");
-$NumberViews=mysql_result($preresult,0,"NumViews");
-$NumberPosts=mysql_result($preresult,0,"NumPosts");
-$NumberTopics=mysql_result($preresult,0,"NumTopics");
-$PostCountAdd=mysql_result($preresult,0,"PostCountAdd");
-$CanHaveTopics=mysql_result($preresult,0,"CanHaveTopics");
-$HotTopicPosts=mysql_result($preresult,0,"HotTopicPosts");
+$ForumID=sql_result($preresult,0,"id");
+$ForumCatID=sql_result($preresult,0,"CategoryID");
+$ForumName=sql_result($preresult,0,"Name");
+$ForumType=sql_result($preresult,0,"ForumType");
+$InSubForum=sql_result($preresult,0,"InSubForum");
+$RedirectURL=sql_result($preresult,0,"RedirectURL");
+$RedirectTimes=sql_result($preresult,0,"Redirects");
+$NumberViews=sql_result($preresult,0,"NumViews");
+$NumberPosts=sql_result($preresult,0,"NumPosts");
+$NumberTopics=sql_result($preresult,0,"NumTopics");
+$PostCountAdd=sql_result($preresult,0,"PostCountAdd");
+$CanHaveTopics=sql_result($preresult,0,"CanHaveTopics");
+$HotTopicPosts=sql_result($preresult,0,"HotTopicPosts");
 if($HotTopicPosts!=0&&is_numeric($HotTopicPosts)) {
        $Settings['hot_topic_num'] = $HotTopicPosts; }
 if(!is_numeric($Settings['hot_topic_num'])) {
        $Settings['hot_topic_num'] = 15; }
-$ForumPostCountView=mysql_result($preresult,0,"PostCountView");
-$ForumKarmaCountView=mysql_result($preresult,0,"KarmaCountView");
-mysql_free_result($preresult);
+$ForumPostCountView=sql_result($preresult,0,"PostCountView");
+$ForumKarmaCountView=sql_result($preresult,0,"KarmaCountView");
+sql_free_result($preresult);
 $ForumType = strtolower($ForumType); $CanHaveTopics = strtolower($CanHaveTopics);
 if($CanHaveTopics=="yes"&&$ForumType=="subforum") { 
 if($_GET['act']=="create"||$_GET['act']=="maketopic"||
        $_POST['act']=="maketopics") { $ForumCheck = "skip"; } }
-$catcheck = query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i  LIMIT 1", array($ForumCatID));
-$catresult=exec_query($catcheck);
-$CategoryName=mysql_result($catresult,0,"Name");
-$CategoryType=mysql_result($catresult,0,"CategoryType");
-$CategoryPostCountView=mysql_result($catresult,0,"PostCountView");
-$CategoryKarmaCountView=mysql_result($catresult,0,"KarmaCountView");
-mysql_free_result($catresult);
+$catcheck = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."categories` WHERE `id`=%i  LIMIT 1", array($ForumCatID));
+$catresult=sql_query($catcheck);
+$CategoryName=sql_result($catresult,0,"Name");
+$CategoryType=sql_result($catresult,0,"CategoryType");
+$CategoryPostCountView=sql_result($catresult,0,"PostCountView");
+$CategoryKarmaCountView=sql_result($catresult,0,"KarmaCountView");
+sql_free_result($catresult);
 if($GroupInfo['HasAdminCP']!="yes"||$GroupInfo['HasModCP']!="yes") {
 if($MyPostCountChk==null) { $MyPostCountChk = 0; }
 if($MyKarmaCount==null) { $MyKarmaCount = 0; }
@@ -70,18 +70,18 @@ redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"a
 if($CategoryKarmaCountView!=0&&$MyKarmaCount<$CategoryKarmaCountView) {
 redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); } }
 if($InSubForum!="0") {
-$isfquery = query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($InSubForum));
-$isfresult=exec_query($isfquery);
-$isfnum=mysql_num_rows($isfresult);
+$isfquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."forums` WHERE `id`=%i LIMIT 1", array($InSubForum));
+$isfresult=sql_query($isfquery);
+$isfnum=sql_num_rows($isfresult);
 if($isfnum>=1) {
-$isfForumID=mysql_result($isfresult,0,"id");
-$isfForumCatID=mysql_result($isfresult,0,"CategoryID");
-$isfForumName=mysql_result($isfresult,0,"Name");
-$isfForumType=mysql_result($isfresult,0,"ForumType");
+$isfForumID=sql_result($isfresult,0,"id");
+$isfForumCatID=sql_result($isfresult,0,"CategoryID");
+$isfForumName=sql_result($isfresult,0,"Name");
+$isfForumType=sql_result($isfresult,0,"ForumType");
 $isfForumType = strtolower($isfForumType);
-$isfRedirectURL=mysql_result($isfresult,0,"RedirectURL"); }
+$isfRedirectURL=sql_result($isfresult,0,"RedirectURL"); }
 if($isfnum<1) { $InSubForum = "0"; } 
-mysql_free_result($isfresult); }
+sql_free_result($isfresult); }
 if($ForumCheck!="skip") {
 $_SESSION['ViewingPage'] = url_maker(null,"no+ext","act=view&id=".$ForumID."&page=".$_GET['page'],"&","=",$prexqstr[$ForumType],$exqstr[$ForumType]);
 if($Settings['file_ext']!="no+ext"&&$Settings['file_ext']!="no ext") {
@@ -113,13 +113,13 @@ if($CatPermissionInfo['CanViewCategory'][$ForumCatID]=="yes"&&
 if($ForumType!="redirect") {
 if($NumberViews==0||$NumberViews==null) { $NewNumberViews = 1; }
 if($NumberViews!=0&&$NumberViews!=null) { $NewNumberViews = $NumberViews + 1; }
-$viewup = query("UPDATE `".$Settings['sqltable']."forums` SET `NumViews`=%i WHERE `id`=%i", array($NewNumberViews,$_GET['id']));
-exec_query($viewup); }
+$viewup = sql_pre_query("UPDATE `".$Settings['sqltable']."forums` SET `NumViews`=%i WHERE `id`=%i", array($NewNumberViews,$_GET['id']));
+sql_query($viewup); }
 if($ForumType=="redirect") {
 if($RedirectTimes==0||$RedirectTimes==null) { $NewRedirTime = 1; }
 if($RedirectTimes!=0&&$RedirectTimes!=null) { $NewRedirTime = $RedirectTimes + 1; }
-$redirup = query("UPDATE `".$Settings['sqltable']."forums` SET `Redirects`=%i WHERE `id`=%i", array($NewRedirTime,$_GET['id']));
-exec_query($redirup);
+$redirup = sql_pre_query("UPDATE `".$Settings['sqltable']."forums` SET `Redirects`=%i WHERE `id`=%i", array($NewRedirTime,$_GET['id']));
+sql_query($redirup);
 if($RedirectURL!="http://"&&$RedirectURL!="") {
 redirect("location",$RedirectURL,0,null,false); ob_clean();
 header("Content-Type: text/plain; charset=".$Settings['charset']);
@@ -174,9 +174,9 @@ $PageLimit = $Settings['max_topics'] * $snumber;
 if($PageLimit<0) { $PageLimit = 0; }
 //End Topic Page Code
 $i=0;
-$query = query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE (`ForumID`=%i) OR (`OldForumID`=%i) ORDER BY `Pinned` DESC, `LastUpdate` DESC LIMIT %i,%i", array($_GET['id'],$_GET['id'],$PageLimit,$Settings['max_topics']));
-$result=exec_query($query);
-$num=mysql_num_rows($result);
+$query = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."topics` WHERE (`ForumID`=%i) OR (`OldForumID`=%i) ORDER BY `Pinned` DESC, `LastUpdate` DESC LIMIT %i,%i", array($_GET['id'],$_GET['id'],$PageLimit,$Settings['max_topics']));
+$result=sql_query($query);
+$num=sql_num_rows($result);
 //List Page Number Code Start
 $pagenum=count($Pages);
 if($_GET['page']>$pagenum) {
@@ -273,12 +273,12 @@ if($pstring!=null||$PermissionInfo['CanMakeTopics'][$ForumID]=="yes"&&$CanHaveTo
 </tr>
 <?php
 while ($i < $num) {
-$TopicID=mysql_result($result,$i,"id");
-$UsersID=mysql_result($result,$i,"UserID");
-$GuestsName=mysql_result($result,$i,"GuestName");
-$TheTime=mysql_result($result,$i,"TimeStamp");
+$TopicID=sql_result($result,$i,"id");
+$UsersID=sql_result($result,$i,"UserID");
+$GuestsName=sql_result($result,$i,"GuestName");
+$TheTime=sql_result($result,$i,"TimeStamp");
 $TheTime=GMTimeChange("F j Y, g:i a",$TheTime,$_SESSION['UserTimeZone'],0,$_SESSION['UserDST']);
-$NumReply=mysql_result($result,$i,"NumReply");
+$NumReply=sql_result($result,$i,"NumReply");
 $NumberPosts=$NumReply + 1;
 $prepagelist = null;
 if(!isset($Settings['max_posts'])) { 
@@ -337,26 +337,26 @@ if($NumberPages>=2) {
        $prepagelist = $prepagelist."</span>"; } }
        if($ThemeSet['MiniPageAltStyle']=="off") { 
        $prepagelist = $prepagelist.")</span>"; } }
-$TopicName=mysql_result($result,$i,"TopicName");
-$TopicDescription=mysql_result($result,$i,"Description");
-$PinnedTopic=mysql_result($result,$i,"Pinned");
-$TopicStat=mysql_result($result,$i,"Closed");
-$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($UsersID));
-$reresult=exec_query($requery);
-$renum=mysql_num_rows($reresult);
+$TopicName=sql_result($result,$i,"TopicName");
+$TopicDescription=sql_result($result,$i,"Description");
+$PinnedTopic=sql_result($result,$i,"Pinned");
+$TopicStat=sql_result($result,$i,"Closed");
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($UsersID));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult);
 if($renum<1) { $UsersID = -1;
-$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($UsersID));
-$reresult=exec_query($requery);
-$renum=mysql_num_rows($reresult); }
-$UserHidden=mysql_result($reresult,0,"HiddenMember");
-$UserGroupID=mysql_result($reresult,0,"GroupID");
-mysql_free_result($reresult);
-$gquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($UserGroupID));
-$gresult=exec_query($gquery);
-$User1Group=mysql_result($gresult,0,"Name");
-$GroupNamePrefix=mysql_result($gresult,0,"NamePrefix");
-$GroupNameSuffix=mysql_result($gresult,0,"NameSuffix");
-mysql_free_result($gresult);
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($UsersID));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult); }
+$UserHidden=sql_result($reresult,0,"HiddenMember");
+$UserGroupID=sql_result($reresult,0,"GroupID");
+sql_free_result($reresult);
+$gquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($UserGroupID));
+$gresult=sql_query($gquery);
+$User1Group=sql_result($gresult,0,"Name");
+$GroupNamePrefix=sql_result($gresult,0,"NamePrefix");
+$GroupNameSuffix=sql_result($gresult,0,"NameSuffix");
+sql_free_result($gresult);
 $PreUsersName = GetUserName($UsersID,$Settings['sqltable']);
 if($PreUsersName['Name']===null) { $UsersID = -1;
 $PreUsersName = GetUserName($UsersID,$Settings['sqltable']); }
@@ -369,19 +369,19 @@ if(isset($GroupNamePrefix)&&$GroupNamePrefix!=null) {
 if(isset($GroupNameSuffix)&&$GroupNameSuffix!=null) {
        $UsersName = $UsersName.$GroupNameSuffix; }
 $LastReply = "&nbsp;<br />&nbsp;";
-$glrquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` DESC LIMIT 1", array($TopicID));
-$glrresult=exec_query($glrquery);
-$glrnum=mysql_num_rows($glrresult);
+$glrquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=%i ORDER BY `TimeStamp` DESC LIMIT 1", array($TopicID));
+$glrresult=sql_query($glrquery);
+$glrnum=sql_num_rows($glrresult);
 if($glrnum>0){
-$ReplyID1=mysql_result($glrresult,0,"id");
-$UsersID1=mysql_result($glrresult,0,"UserID");
+$ReplyID1=sql_result($glrresult,0,"id");
+$UsersID1=sql_result($glrresult,0,"UserID");
 $PreUsersName1 = GetUserName($UsersID1,$Settings['sqltable']);
 if($PreUsersName1['Name']===null) { $UsersID1 = -1;
 $PreUsersName1 = GetUserName($UsersID1,$Settings['sqltable']); }
 $UsersName1 = $PreUsersName1['Name'];
 $UsersHidden1 = $PreUsersName1['Hidden'];
-$GuestsName1=mysql_result($glrresult,0,"GuestName");
-$TimeStamp1=mysql_result($glrresult,0,"TimeStamp");
+$GuestsName1=sql_result($glrresult,0,"GuestName");
+$TimeStamp1=sql_result($glrresult,0,"TimeStamp");
 $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; }
@@ -406,7 +406,7 @@ if(($UsersID1<-1&&$UsersHidden1=="yes")||$UsersID1==0||($UsersID1>0&&$UsersHidde
 $lul = url_maker($exfile['member'],$Settings['file_ext'],"act=view&id=".$UsersID1,$Settings['qstr'],$Settings['qsep'],$prexqstr['member'],$exqstr['member']);
 $luln = url_maker($exfile['topic'],$Settings['file_ext'],"act=view&id=".$TopicID."&page=".$NumPages,$Settings['qstr'],$Settings['qsep'],$prexqstr['topic'],$exqstr['topic']).$qstrhtml."&#35;reply".$NumRPosts;
 $LastReply = "<a href=\"".$luln."\">".$TimeStamp1."</a><br />\n".$UserPre." <span title=\"".$oldusername."\">".$UsersName1."</span>"; } }
-mysql_free_result($glrresult);
+sql_free_result($glrresult);
 if(!isset($TimeStamp1)) { $TimeStamp1 = null; } if(!isset($LastReply)) { $LastReply = "&nbsp;<br />&nbsp;"; }
 if($TimeStamp1==null) { $LastReply = "&nbsp;<br />&nbsp;"; }
 $PreTopic = $ThemeSet['TopicIcon'];
@@ -464,7 +464,7 @@ echo "<span>".$UsersName."</span>"; }
 </table></div>
 <div class="DivTopics">&nbsp;</div>
 <?php
-mysql_free_result($result); }
+sql_free_result($result); }
 if((GMTimeStamp()<$_SESSION['LastPostTime']&&$_SESSION['LastPostTime']!=0)&&($_GET['act']=="create"||$_GET['act']=="maketopic")) { 
 $_GET['act'] = "view"; $_POST['act'] = null; 
 redirect("refresh",$basedir.url_maker($exfile['forum'],$Settings['file_ext'],"act=view&id=".$ForumID."&page=1",$Settings['qstr'],$Settings['qsep'],$prexqstr['forum'],$exqstr['forum'],FALSE),"3"); ?>
@@ -536,17 +536,17 @@ $_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=query("SELECT * FROM `".$Settings['sqltable']."smileys` WHERE `Show`='yes'", array(null));
-$renee_result=exec_query($renee_query);
-$renee_num=mysql_num_rows($renee_result);
+$renee_query=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."smileys` WHERE `Show`='yes'", array(null));
+$renee_result=sql_query($renee_query);
+$renee_num=sql_num_rows($renee_result);
 $renee_s=0; $SmileRow=0; $SmileCRow=0;
 while ($renee_s < $renee_num) { ++$SmileRow;
-$FileName=mysql_result($renee_result,$renee_s,"FileName");
-$SmileName=mysql_result($renee_result,$renee_s,"SmileName");
-$SmileText=mysql_result($renee_result,$renee_s,"SmileText");
-$SmileDirectory=mysql_result($renee_result,$renee_s,"Directory");
-$ShowSmile=mysql_result($renee_result,$renee_s,"Show");
-$ReplaceType=mysql_result($renee_result,$renee_s,"ReplaceCI");
+$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,"Show");
+$ReplaceType=sql_result($renee_result,$renee_s,"ReplaceCI");
 if($SmileRow==1) { ?><tr>
        <?php } if($SmileRow<5) { ++$SmileCRow; ?>
        <td>&nbsp;<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;')" />&nbsp;</td>
@@ -558,7 +558,7 @@ if($SmileCRow<5&&$SmileCRow!=0) {
 $SmileCRowL = 5 - $SmileCRow;
 echo "<td colspan=\"".$SmileCRowL."\">&nbsp;</td></tr>"; }
 echo "</table>";
-mysql_free_result($renee_result);
+sql_free_result($renee_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']); ?>">
@@ -698,18 +698,18 @@ setcookie("GuestName", $_POST['GuestName'], time() + (7 * 86400), $cbasedir);
 $_SESSION['GuestName']=$_POST['GuestName']; } }
 /*    <_<  iWordFilter  >_>      
    by Kazuki Przyborowski - Cool Dude 2k */
-$katarzynaqy=query("SELECT * FROM `".$Settings['sqltable']."wordfilter`", array(null));
-$katarzynart=exec_query($katarzynaqy);
-$katarzynanm=mysql_num_rows($katarzynart);
+$katarzynaqy=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."wordfilter`", array(null));
+$katarzynart=sql_query($katarzynaqy);
+$katarzynanm=sql_num_rows($katarzynart);
 $katarzynas=0;
 while ($katarzynas < $katarzynanm) {
-$Filter=mysql_result($katarzynart,$katarzynas,"Filter");
-$Replace=mysql_result($katarzynart,$katarzynas,"Replace");
-$CaseInsensitive=mysql_result($katarzynart,$katarzynas,"CaseInsensitive");
+$Filter=sql_result($katarzynart,$katarzynas,"Filter");
+$Replace=sql_result($katarzynart,$katarzynas,"Replace");
+$CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
 if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
 if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
 if($CaseInsensitive!="yes"||$CaseInsensitive!="no") { $CaseInsensitive = "no"; }
-$WholeWord=mysql_result($katarzynart,$katarzynas,"WholeWord");
+$WholeWord=sql_result($katarzynart,$katarzynas,"WholeWord");
 if($WholeWord=="on") { $WholeWord = "yes"; }
 if($WholeWord=="off") { $WholeWord = "no"; }
 if($WholeWord!="yes"&&$WholeWord!="no") { $WholeWord = "no"; }
@@ -726,26 +726,26 @@ $_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; } mysql_free_result($katarzynart);
-$lonewolfqy=query("SELECT * FROM `".$Settings['sqltable']."restrictedwords` WHERE `RestrictedTopicName`='yes' or `RestrictedUserName`='yes'", array(null));
-$lonewolfrt=exec_query($lonewolfqy);
-$lonewolfnm=mysql_num_rows($lonewolfrt);
+++$katarzynas; } sql_free_result($katarzynart);
+$lonewolfqy=sql_pre_query("SELECT * FROM `".$Settings['sqltable']."restrictedwords` WHERE `RestrictedTopicName`='yes' or `RestrictedUserName`='yes'", array(null));
+$lonewolfrt=sql_query($lonewolfqy);
+$lonewolfnm=sql_num_rows($lonewolfrt);
 $lonewolfs=0; $RMatches = null; $RGMatches = null;
 while ($lonewolfs < $lonewolfnm) {
-$RWord=mysql_result($lonewolfrt,$lonewolfs,"Word");
-$RCaseInsensitive=mysql_result($lonewolfrt,$lonewolfs,"CaseInsensitive");
+$RWord=sql_result($lonewolfrt,$lonewolfs,"Word");
+$RCaseInsensitive=sql_result($lonewolfrt,$lonewolfs,"CaseInsensitive");
 if($RCaseInsensitive=="on") { $RCaseInsensitive = "yes"; }
 if($RCaseInsensitive=="off") { $RCaseInsensitive = "no"; }
 if($RCaseInsensitive!="yes"||$RCaseInsensitive!="no") { $RCaseInsensitive = "no"; }
-$RWholeWord=mysql_result($lonewolfrt,$lonewolfs,"WholeWord");
+$RWholeWord=sql_result($lonewolfrt,$lonewolfs,"WholeWord");
 if($RWholeWord=="on") { $RWholeWord = "yes"; }
 if($RWholeWord=="off") { $RWholeWord = "no"; }
 if($RWholeWord!="yes"||$RWholeWord!="no") { $RWholeWord = "no"; }
-$RestrictedTopicName=mysql_result($lonewolfrt,$lonewolfs,"RestrictedTopicName");
+$RestrictedTopicName=sql_result($lonewolfrt,$lonewolfs,"RestrictedTopicName");
 if($RestrictedTopicName=="on") { $RestrictedTopicName = "yes"; }
 if($RestrictedTopicName=="off") { $RestrictedTopicName = "no"; }
 if($RestrictedTopicName!="yes"||$RestrictedTopicName!="no") { $RestrictedTopicName = "no"; }
-$RestrictedUserName=mysql_result($lonewolfrt,$lonewolfs,"RestrictedUserName");
+$RestrictedUserName=sql_result($lonewolfrt,$lonewolfs,"RestrictedUserName");
 if($RestrictedUserName=="on") { $RestrictedUserName = "yes"; }
 if($RestrictedUserName=="off") { $RestrictedUserName = "no"; }
 if($RestrictedUserName!="yes"||$RestrictedUserName!="no") { $RestrictedUserName = "no"; }
@@ -778,7 +778,7 @@ $RMatches = preg_match("/".$RWord."/i", $_POST['TopicName']);
 if($RestrictedUserName=="yes") {
 $RGMatches = preg_match("/".$RWord."/i", $_POST['GuestName']);
        if($RGMatches==true) { break 1; } } }
-++$lonewolfs; } mysql_free_result($lonewolfrt);
+++$lonewolfs; } sql_free_result($lonewolfrt);
 if ($_POST['TopicName']==null) { $Error="Yes"; ?>
 <tr>
        <td><span class="TableMessage">
@@ -831,42 +831,42 @@ redirect("refresh",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"ac
        </span><br /></td>
 </tr>
 <?php } if ($Error!="Yes") { $LastActive = GMTimeStamp();
-$topicid = getnextid($Settings['sqltable'],"topics");
-//$postid = getnextid($Settings['sqltable'],"posts");
-$requery = query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyUserID));
-$reresult=exec_query($requery);
-$renum=mysql_num_rows($reresult);
+$topicid = sql_get_next_id($Settings['sqltable'],"topics");
+//$postid = sql_get_next_id($Settings['sqltable'],"posts");
+$requery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."members` WHERE `id`=%i LIMIT 1", array($MyUserID));
+$reresult=sql_query($requery);
+$renum=sql_num_rows($reresult);
 $rei=0;
 while ($rei < $renum) {
 $User1ID=$MyUserID;
-$User1Name=mysql_result($reresult,$rei,"Name");
+$User1Name=sql_result($reresult,$rei,"Name");
 if($_SESSION['UserGroup']==$Settings['GuestGroup']) { $User1Name = $_POST['GuestName']; }
-$User1Email=mysql_result($reresult,$rei,"Email");
-$User1Title=mysql_result($reresult,$rei,"Title");
-$User1GroupID=mysql_result($reresult,$rei,"GroupID");
-$PostCount=mysql_result($reresult,$rei,"PostCount");
+$User1Email=sql_result($reresult,$rei,"Email");
+$User1Title=sql_result($reresult,$rei,"Title");
+$User1GroupID=sql_result($reresult,$rei,"GroupID");
+$PostCount=sql_result($reresult,$rei,"PostCount");
 if($PostCountAdd=="on") { $NewPostCount = $PostCount + 1; }
 if(!isset($NewPostCount)) { $NewPostCount = $PostCount; }
-$gquery = query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($User1GroupID));
-$gresult=exec_query($gquery);
-$User1Group=mysql_result($gresult,0,"Name");
-mysql_free_result($gresult);
+$gquery = sql_pre_query("SELECT * FROM `".$Settings['sqltable']."groups` WHERE `id`=%i LIMIT 1", array($User1GroupID));
+$gresult=sql_query($gquery);
+$User1Group=sql_result($gresult,0,"Name");
+sql_free_result($gresult);
 $User1IP=$_SERVER['REMOTE_ADDR'];
-++$rei; } mysql_free_result($reresult);
-$query = query("INSERT INTO `".$Settings['sqltable']."topics` (`ForumID`, `CategoryID`, `OldForumID`, `OldCategoryID`, `UserID`, `GuestName`, `TimeStamp`, `LastUpdate`, `TopicName`, `Description`, `NumReply`, `NumViews`, `Pinned`, `Closed`) VALUES\n".
+++$rei; } sql_free_result($reresult);
+$query = sql_pre_query("INSERT INTO `".$Settings['sqltable']."topics` (`ForumID`, `CategoryID`, `OldForumID`, `OldCategoryID`, `UserID`, `GuestName`, `TimeStamp`, `LastUpdate`, `TopicName`, `Description`, `NumReply`, `NumViews`, `Pinned`, `Closed`) VALUES\n".
 "(%i, %i, %i, %i, %i, '%s', %i, %i, '%s', '%s', 0, 0, 0, 0)", array($ForumID,$ForumCatID,$ForumID,$ForumCatID,$User1ID,$User1Name,$LastActive,$LastActive,$_POST['TopicName'],$_POST['TopicDesc']));
-exec_query($query);
+sql_query($query);
 //$topicid = mysql_insert_id();
-$query = query("INSERT INTO `".$Settings['sqltable']."posts` (`TopicID`, `ForumID`, `CategoryID`, `UserID`, `GuestName`, `TimeStamp`, `LastUpdate`, `EditUser`, `EditUserName`, `Post`, `Description`, `IP`, `EditIP`) VALUES\n".
+$query = sql_pre_query("INSERT INTO `".$Settings['sqltable']."posts` (`TopicID`, `ForumID`, `CategoryID`, `UserID`, `GuestName`, `TimeStamp`, `LastUpdate`, `EditUser`, `EditUserName`, `Post`, `Description`, `IP`, `EditIP`) VALUES\n".
 "(".$topicid.", %i, %i, %i, '%s', %i, %i, 0, '', '%s', '%s', '%s', '0')", array($ForumID,$ForumCatID,$User1ID,$User1Name,$LastActive,$LastActive,$_POST['TopicPost'],$_POST['TopicDesc'],$User1IP));
-exec_query($query);
+sql_query($query);
 $_SESSION['LastPostTime'] = GMTimeStamp() + $GroupInfo['FloodControl'];
 if($User1ID!=0&&$User1ID!=-1) {
-$queryupd = query("UPDATE `".$Settings['sqltable']."members` SET `LastActive`=%i,`IP`='%s',`PostCount`=%i,`LastPostTime`=%i WHERE `id`=%i", array($LastActive,$User1IP,$NewPostCount,$_SESSION['LastPostTime'],$User1ID));
-exec_query($queryupd); }
+$queryupd = sql_pre_query("UPDATE `".$Settings['sqltable']."members` SET `LastActive`=%i,`IP`='%s',`PostCount`=%i,`LastPostTime`=%i WHERE `id`=%i", array($LastActive,$User1IP,$NewPostCount,$_SESSION['LastPostTime'],$User1ID));
+sql_query($queryupd); }
 $NewNumPosts = $NumberPosts + 1; $NewNumTopics = $NumberTopics + 1;
-$queryupd = query("UPDATE `".$Settings['sqltable']."forums` SET `NumPosts`=%i,`NumTopics`=%i WHERE `id`=%i", array($NewNumPosts,$NewNumTopics,$ForumID));
-exec_query($queryupd);
+$queryupd = sql_pre_query("UPDATE `".$Settings['sqltable']."forums` SET `NumPosts`=%i,`NumTopics`=%i WHERE `id`=%i", array($NewNumPosts,$NewNumTopics,$ForumID));
+sql_query($queryupd);
 redirect("refresh",$basedir.url_maker($exfile['topic'],$Settings['file_ext'],"act=view&id=".$topicid."&page=1",$Settings['qstr'],$Settings['qsep'],$prexqstr['topic'],$exqstr['topic'],FALSE),"3");
 ?><tr>
        <td><span class="TableMessage"><br />

diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 295d619..96d2efa 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/23/2009 SVN 358 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 11/23/2009 SVN 359 - 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] = 2; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 358; $RName = "iDB"; $SFName = "IntDB";
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 359; $RName = "iDB"; $SFName = "IntDB";
 $SVNDay[0] = 11; $SVNDay[1] = 23; $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/install.php b/install.php
index 28fb3b0..e1cb30f 100644 (file)
--- a/install.php
+++ b/install.php
@@ -12,7 +12,7 @@
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
     iDB Installer made by Game Maker 2k - http://idb.berlios.de/support/category.php?act=view&id=2
 
-    $FileInfo: install.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: install.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 if(ini_get("register_globals")) {
 require_once('inc/misc/killglobals.php'); }
@@ -119,8 +119,8 @@ if($this_dir=="\/") { $this_dir="/"; }
 $this_dir = str_replace("//", "/", $this_dir);
 $idbdir = addslashes(str_replace("\\","/",dirname(__FILE__)."/"));
 function sql_list_dbs() {
-   $result = exec_query("SHOW DATABASES;");
-   while( $data = mysql_fetch_row($result) ) {
+   $result = sql_query("SHOW DATABASES;");
+   while( $data = sql_fetch_row($result) ) {
        $array[] = $data[0];
    } return $array; }
 if ($_GET['act']!="Part2"&&$_POST['act']!="Part2") {

diff --git a/mysql.php b/mysql.php
index ab77ecb..9f90085 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: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: mysql.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 /* Some ini setting changes uncomment if you need them. 
    Display PHP Errors */
@@ -181,7 +181,7 @@ if($GZipEncode['Type']!="gzip") { if($GZipEncode['Type']!="deflate") { $GZipEnco
 /* if(eregi("msie",$browser) && !eregi("opera",$browser)){
 header('P3P: CP="NOI ADM DEV PSAi COM NAV OUR OTRo STP IND DEM"'); } */
 // Some http stuff
-$SQLStat = ConnectMysql($Settings['sqlhost'],$Settings['sqluser'],$Settings['sqlpass'],$Settings['sqldb']);
+$SQLStat = sql_connect_db($Settings['sqlhost'],$Settings['sqluser'],$Settings['sqlpass'],$Settings['sqldb']);
 $SQLCollate = "latin1_general_ci";
 $SQLCharset = "latin1"; 
 if($Settings['charset']=="ISO-8859-1") {
@@ -193,11 +193,11 @@ if($Settings['charset']=="ISO-8859-15") {
 if($Settings['charset']=="UTF-8") {
        $SQLCollate = "utf8_unicode_ci";
        $SQLCharset = "utf8"; }
-mysql_set_charset($SQLCharset);
+sql_set_charset($SQLCharset);
 if($SQLStat===false) {
-header("Content-Type: text/plain; charset=".$Settings['charset']); mysql_free_result($peresult);
+header("Content-Type: text/plain; charset=".$Settings['charset']); sql_free_result($peresult);
 ob_clean(); echo "Sorry could not connect to mysql database.\nContact the board admin about error. Error log below.";
-echo "\n".mysql_errno().": ".mysql_error();
+echo "\n".sql_errno().": ".sql_error();
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 $sqltable = $Settings['sqltable'];
 function sqlsession_open( $save_path, $session_name ) {
@@ -210,30 +210,30 @@ function sqlsession_read($id) {
 global $sqltable;
 $data = "";
 $time = GMTimeStamp();
-$sqlr = query("SELECT `session_data` FROM `".$sqltable."sessions` WHERE `session_id` = '%s'", array($id,$time));
-$rs = exec_query($sqlr);
-$a = mysql_num_rows($rs);
+$sqlr = sql_pre_query("SELECT `session_data` FROM `".$sqltable."sessions` WHERE `session_id` = '%s'", array($id,$time));
+$rs = sql_query($sqlr);
+$a = sql_num_rows($rs);
 if($a > 0) {
-$row = mysql_fetch_assoc($rs);
+$row = sql_fetch_assoc($rs);
 $data = $row['session_data']; }
 return $data; }
 function sqlsession_write($id,$data) {
 global $sqltable;              
 $time = GMTimeStamp();
-$sqlw = query("REPLACE `".$sqltable."sessions` VALUES('$id','$data', $time)", array($id,$data,$time));
-$rs = exec_query($sqlw);
+$sqlw = sql_pre_query("REPLACE `".$sqltable."sessions` VALUES('$id','$data', $time)", array($id,$data,$time));
+$rs = sql_query($sqlw);
 return true; }
 function sqlsession_destroy($id) {
 global $sqltable;
-$sqld = query("DELETE FROM `".$sqltable."sessions` WHERE `session_id` = '$id'", array($id));
-exec_query($sqld);
+$sqld = sql_pre_query("DELETE FROM `".$sqltable."sessions` WHERE `session_id` = '$id'", array($id));
+sql_query($sqld);
 return true; }
 function sqlsession_gc($maxlifetime) {
 global $sqltable;
 $time = GMTimeStamp() - $maxlifetime;
-//$sqlg = query('DELETE FROM `'.$sqltable.'sessions` WHERE `expires` < UNIX_TIMESTAMP();', array(null));
-$sqlg = query('DELETE FROM `'.$sqltable.'sessions` WHERE `expires` < %i', array($time));
-exec_query($sqlg);
+//$sqlg = sql_pre_query('DELETE FROM `'.$sqltable.'sessions` WHERE `expires` < UNIX_TIMESTAMP();', array(null));
+$sqlg = sql_pre_query('DELETE FROM `'.$sqltable.'sessions` WHERE `expires` < %i', array($time));
+sql_query($sqlg);
 return true; }
 session_set_save_handler("sqlsession_open", "sqlsession_close", "sqlsession_read", "sqlsession_write", "sqlsession_destroy", "sqlsession_gc");
 if($cookieDomain==null) {
@@ -289,11 +289,11 @@ if(isset($_COOKIE['SessPass'])&&isset($_COOKIE['MemberName'])) {
 require($SettDir['inc'].'prelogin.php'); } }
 require($SettDir['inc'].'groupsetup.php');
 if($Settings['board_offline']=="on"&&$GroupInfo['CanViewOffLine']!="yes") {
-header("Content-Type: text/plain; charset=".$Settings['charset']); mysql_free_result($peresult);
+header("Content-Type: text/plain; charset=".$Settings['charset']); sql_free_result($peresult);
 ob_clean(); if(!isset($Settings['offline_text'])) {
 echo "Sorry the board is off line.\nIf you are a admin you can login by the admin cp."; }
 if(isset($Settings['offline_text'])) { echo $Settings['offline_text']; }
-//echo "\n".mysql_errno().": ".mysql_error();
+//echo "\n".sql_errno().": ".sql_error();
 gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); }
 $dayconv = array('second' => 1, 'minute' => 60, 'hour' => 3600, 'day' => 86400, 'week' => 604800, 'month' => 2630880, 'year' => 31570560, 'decade' => 15705600);
 //Time Zone Set
@@ -361,8 +361,8 @@ $_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']));
-exec_query($qnewskin); }
+$qnewskin = sql_pre_query("UPDATE `".$Settings['sqltable']."members` SET `UseTheme`='%s',`LastActive`='%s' WHERE `id`=%i", array($_GET['theme'],$NewDay,$_SESSION['UserID']));
+sql_query($qnewskin); }
 /* The file Theme Exists */ }
 else { $_GET['theme'] = $Settings['DefaultTheme']; 
 $_SESSION['Theme'] = $Settings['DefaultTheme'];
@@ -373,8 +373,8 @@ $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']));
-exec_query($qnewskin); }
+$qnewskin = sql_pre_query("UPDATE `".$Settings['sqltable']."members` SET `UseTheme`='%s',`LastActive`='%s' WHERE `id`=%i", array($_SESSION['Theme'],$NewDay,$_SESSION['UserID']));
+sql_query($qnewskin); }
 $_GET['theme']=$_SESSION['Theme']; }
 if($_SESSION['Theme']==null) {
 $_SESSION['Theme']=$Settings['DefaultTheme'];

diff --git a/setup/mkconfig.php b/setup/mkconfig.php
index 7fcd68d..9f9e939 100644 (file)
--- a/setup/mkconfig.php
+++ b/setup/mkconfig.php
@@ -12,7 +12,7 @@
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: mkconfig.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: mkconfig.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="mkconfig.php"||$File3Name=="/mkconfig.php") {
@@ -107,7 +107,7 @@ if($_POST['usehashtype']=="sha512") { $iDBHashType = "iDBH512"; }
 if ($_POST['AdminUser']=="Guest") { $Error="Yes";
 echo "<br />You can not use Guest as your name."; }
 /* We are done now with fixing the info. ^_^ */
-$mydbtest = ConnectMysql($_POST['DatabaseHost'],$_POST['DatabaseUserName'],$_POST['DatabasePassword'],$_POST['DatabaseName']);
+$mydbtest = sql_connect_db($_POST['DatabaseHost'],$_POST['DatabaseUserName'],$_POST['DatabasePassword'],$_POST['DatabaseName']);
 $SQLCollate = "latin1_general_ci";
 $SQLCharset = "latin1"; 
 if($Settings['charset']=="ISO-8859-1") {
@@ -119,9 +119,9 @@ if($Settings['charset']=="ISO-8859-15") {
 if($Settings['charset']=="UTF-8") {
        $SQLCollate = "utf8_unicode_ci";
        $SQLCharset = "utf8"; }
-mysql_set_charset($SQLCharset);
+sql_set_charset($SQLCharset);
 if($mydbtest!==true) { $Error="Yes";
-echo "<br />".mysql_errno().": ".mysql_error()."\n"; }
+echo "<br />".sql_errno().": ".sql_error()."\n"; }
 if ($Error!="Yes") {
 $ServerUUID = uuid(false,true,false,$_POST['usehashtype'],null);
 if(!is_numeric($_POST['YourOffSet'])) { $_POST['YourOffSet'] = "0"; }

diff --git a/setup/mktable.php b/setup/mktable.php
index 6ffeffa..44421e2 100644 (file)
--- a/setup/mktable.php
+++ b/setup/mktable.php
@@ -12,7 +12,7 @@
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: mktable.php - Last Update: 11/14/2009 SVN 347 - Author: cooldude2k $
+    $FileInfo: mktable.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="mktable.php"||$File3Name=="/mktable.php") {
@@ -20,9 +20,9 @@ if ($File3Name=="mktable.php"||$File3Name=="/mktable.php") {
        exit(); }
 if(!isset($SetupDir['setup'])) { $SetupDir['setup'] = "setup/"; }
 if(!isset($SetupDir['convert'])) { $SetupDir['convert'] = "setup/convert/"; }
-$query=query("ALTER DATABASE `".$_POST['DatabaseName']."` DEFAULT CHARACTER SET ".$SQLCharset." COLLATE ".$SQLCollate.";", array(null));
-exec_query($query);
-$query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."categories` (\n".
+$query=sql_pre_query("ALTER DATABASE `".$_POST['DatabaseName']."` DEFAULT CHARACTER SET ".$SQLCharset." COLLATE ".$SQLCollate.";", array(null));
+sql_query($query);
+$query=sql_pre_query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."categories` (\n".
 "  `id` int(15) NOT NULL auto_increment,\n".
 "  `OrderID` int(15) NOT NULL default '0',\n".
 "  `Name` varchar(150) collate ".$SQLCollate." NOT NULL default '',\n".
@@ -35,11 +35,11 @@ $query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."categories` (
 "  `Description` text collate ".$SQLCollate." NOT NULL,\n".
 "  PRIMARY KEY  (`id`)\n".
 ") ENGINE=MyISAM  DEFAULT CHARSET=".$SQLCharset." COLLATE=".$SQLCollate.";", array(null));
-exec_query($query);
-$query = query("INSERT INTO `".$_POST['tableprefix']."categories` (`OrderID`, `Name`, `ShowCategory`, `CategoryType`, `SubShowForums`, `InSubCategory`, `PostCountView`, `KarmaCountView`, `Description`)\n". 
+sql_query($query);
+$query = sql_pre_query("INSERT INTO `".$_POST['tableprefix']."categories` (`OrderID`, `Name`, `ShowCategory`, `CategoryType`, `SubShowForums`, `InSubCategory`, `PostCountView`, `KarmaCountView`, `Description`)\n". 
 "VALUES (1, 'A Test Category', 'yes', 'category', 'yes', 0, 0, 0, 'A test category that may be removed at any time.')", array(null));
-exec_query($query);
-$query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."catpermissions` (\n".
+sql_query($query);
+$query=sql_pre_query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."catpermissions` (\n".
 "  `id` int(15) NOT NULL auto_increment,\n".
 "  `PermissionID` int(15) NOT NULL default '0',\n".
 "  `Name` varchar(150) collate ".$SQLCollate." NOT NULL default '',\n".
@@ -47,16 +47,16 @@ $query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."catpermission
 "  `CanViewCategory` varchar(5) collate ".$SQLCollate." NOT NULL default '',\n".
 "  PRIMARY KEY  (`id`)\n".
 ") ENGINE=MyISAM  DEFAULT CHARSET=".$SQLCharset." COLLATE=".$SQLCollate.";", array(null));
-exec_query($query);
-$query = query("INSERT INTO `".$_POST['tableprefix']."catpermissions` (`PermissionID`, `Name`, `CategoryID`, `CanViewCategory`) VALUES\n".
+sql_query($query);
+$query = sql_pre_query("INSERT INTO `".$_POST['tableprefix']."catpermissions` (`PermissionID`, `Name`, `CategoryID`, `CanViewCategory`) VALUES\n".
 "(1, 'Admin', 1, 'yes'),\n".
 "(2, 'Moderator', 1, 'yes'),\n".
 "(3, 'Member', 1, 'yes'),\n".
 "(4, 'Guest', 1, 'yes'),\n".
 "(5, 'Banned', 1, 'no'),\n".
 "(6, 'Validate', 1, 'yes');", array(null)); 
-exec_query($query);
-$query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."events` (\n".
+sql_query($query);
+$query=sql_pre_query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."events` (\n".
 "  `id` int(15) NOT NULL auto_increment,\n".
 "  `UserID` int(15) NOT NULL default '0',\n".
 "  `GuestName` varchar(150) collate ".$SQLCollate." NOT NULL default '',\n".
@@ -72,11 +72,11 @@ $query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."events` (\n".
 "  `EventYearEnd` int(5) NOT NULL default '0',\n".
 "  PRIMARY KEY  (`id`)\n".
 ") ENGINE=MyISAM  DEFAULT CHARSET=".$SQLCharset." COLLATE=".$SQLCollate.";", array(null));
-exec_query($query);
-$query = query("INSERT INTO `".$_POST['tableprefix']."events` (`UserID`, `GuestName`, `EventName`, `EventText`, `TimeStamp`, `TimeStampEnd`, `EventMonth`, `EventMonthEnd`, `EventDay`, `EventDayEnd`, `EventYear`, `EventYearEnd`) VALUES\n".
+sql_query($query);
+$query = sql_pre_query("INSERT INTO `".$_POST['tableprefix']."events` (`UserID`, `GuestName`, `EventName`, `EventText`, `TimeStamp`, `TimeStampEnd`, `EventMonth`, `EventMonthEnd`, `EventDay`, `EventDayEnd`, `EventYear`, `EventYearEnd`) VALUES\n".
 "(-1, '".$iDB_Author."', 'Opening', 'This is the day the Board was made. ^_^', %i, %i, %i, %i, %i, %i, %i, %i)", array($YourDate,$YourDateEnd,$EventMonth,$EventMonthEnd,$EventDay,$EventDayEnd,$EventYear,$EventYearEnd));
-exec_query($query);
-$query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."forums` (\n".
+sql_query($query);
+$query=sql_pre_query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."forums` (\n".
 "  `id` int(15) NOT NULL auto_increment,\n".
 "  `CategoryID` int(15) NOT NULL default '0',\n".
 "  `OrderID` int(15) NOT NULL default '0',\n".
@@ -97,11 +97,11 @@ $query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."forums` (\n".
 "  `NumTopics` int(15) NOT NULL default '0',\n".
 "  PRIMARY KEY  (`id`)\n".
 ") ENGINE=MyISAM  DEFAULT CHARSET=".$SQLCharset." COLLATE=".$SQLCollate.";", array(null));
-exec_query($query);
-$query = query("INSERT INTO `".$_POST['tableprefix']."forums` (`CategoryID`, `OrderID`, `Name`, `ShowForum`, `ForumType`, `InSubForum`, `RedirectURL`, `Redirects`, `NumViews`, `Description`, `PostCountAdd`, `PostCountView`, `KarmaCountView`, `CanHaveTopics`, `HotTopicPosts`, `NumPosts`, `NumTopics`) VALUES\n".
+sql_query($query);
+$query = sql_pre_query("INSERT INTO `".$_POST['tableprefix']."forums` (`CategoryID`, `OrderID`, `Name`, `ShowForum`, `ForumType`, `InSubForum`, `RedirectURL`, `Redirects`, `NumViews`, `Description`, `PostCountAdd`, `PostCountView`, `KarmaCountView`, `CanHaveTopics`, `HotTopicPosts`, `NumPosts`, `NumTopics`) VALUES\n".
 "(1, 1, 'A Test Forum', 'yes', 'forum', 0, 'http://', 0, 0, 'A test forum that may be removed at any time.', 'off', 0, 0, 'yes', 15, 1, 1)", array(null));
-exec_query($query);
-$query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."groups` (\n".
+sql_query($query);
+$query=sql_pre_query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."groups` (\n".
 "  `id` int(15) NOT NULL auto_increment,\n".
 "  `Name` varchar(150) collate ".$SQLCollate." NOT NULL default '',\n".
 "  `PermissionID` int(15) NOT NULL default '0',\n".
@@ -124,16 +124,16 @@ $query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."groups` (\n".
 "  PRIMARY KEY  (`id`),\n".
 "  UNIQUE KEY `Name` (`Name`)\n".
 ") ENGINE=MyISAM  DEFAULT CHARSET=".$SQLCharset." COLLATE=".$SQLCollate.";", array(null));
-exec_query($query);
-$query = query("INSERT INTO `".$_POST['tableprefix']."groups` (`Name`, `PermissionID`, `NamePrefix`, `NameSuffix`, `CanViewBoard`, `CanViewOffLine`, `CanEditProfile`, `CanAddEvents`, `CanPM`, `CanSearch`, `FloodControl`, `SearchFlood`, `PromoteTo`, `PromotePosts`, `PromoteKarma`, `HasModCP`, `HasAdminCP`, `ViewDBInfo`) VALUES\n".
+sql_query($query);
+$query = sql_pre_query("INSERT INTO `".$_POST['tableprefix']."groups` (`Name`, `PermissionID`, `NamePrefix`, `NameSuffix`, `CanViewBoard`, `CanViewOffLine`, `CanEditProfile`, `CanAddEvents`, `CanPM`, `CanSearch`, `FloodControl`, `SearchFlood`, `PromoteTo`, `PromotePosts`, `PromoteKarma`, `HasModCP`, `HasAdminCP`, `ViewDBInfo`) VALUES\n".
 "('Admin', 1, '', '', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 30, 30, 0, 0, 0, 'yes', 'yes', 'yes'),\n".
 "('Moderator', 2, '', '', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 30, 30, 0, 0, 0, 'yes', 'no', 'no'),\n".
 "('Member', 3, '', '', 'yes', 'no', 'yes', 'yes', 'yes', 'yes', 30, 30, 0, 0, 0, 'no', 'no', 'no'),\n".
 "('Guest', 4, '', '', 'yes', 'no', 'no', 'no', 'no', 'no', 30, 30, 0, 0, 0, 'no', 'no', 'no'),\n".
 "('Banned', 5, '', '', 'no', 'no', 'no', 'no', 'no', 'no', 30, 30, 0, 0, 0, 'no', 'no', 'no'),\n".
 "('Validate', 6, '', '', 'yes', 'no', 'yes', 'no', 'no', 'yes', 30, 30, 0, 0, 0, 'no', 'no', 'no');", array(null)); 
-exec_query($query);
-$query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."members` (\n".
+sql_query($query);
+$query=sql_pre_query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."members` (\n".
 "  `id` int(15) NOT NULL auto_increment,\n".
 "  `Name` varchar(150) collate ".$SQLCollate." NOT NULL default '',\n".
 "  `Password` varchar(250) collate ".$SQLCollate." NOT NULL default '',\n".
@@ -173,12 +173,12 @@ $query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."members` (\n"
 "  UNIQUE KEY `Name` (`Name`),\n".
 "  UNIQUE KEY `Email` (`Email`)\n".
 ") ENGINE=MyISAM  DEFAULT CHARSET=".$SQLCharset." COLLATE=".$SQLCollate.";", array(null));
-exec_query($query);
-$query = query("INSERT INTO `".$_POST['tableprefix']."members` (`id`, `Name`, `Password`, `HashType`, `Email`, `GroupID`, `Validated`, `HiddenMember`, `WarnLevel`, `Interests`, `Title`, `Joined`, `LastActive`, `LastPostTime`, `BanTime`, `BirthDay`, `BirthMonth`, `BirthYear`, `Signature`, `Notes`, `Avatar`, `AvatarSize`, `Website`, `Gender`, `PostCount`, `Karma`, `KarmaUpdate`, `RepliesPerPage`, `TopicsPerPage`, `MessagesPerPage`, `TimeZone`, `DST`, `UseTheme`, `IP`, `Salt`) VALUES\n".
+sql_query($query);
+$query = sql_pre_query("INSERT INTO `".$_POST['tableprefix']."members` (`id`, `Name`, `Password`, `HashType`, `Email`, `GroupID`, `Validated`, `HiddenMember`, `WarnLevel`, `Interests`, `Title`, `Joined`, `LastActive`, `LastPostTime`, `BanTime`, `BirthDay`, `BirthMonth`, `BirthYear`, `Signature`, `Notes`, `Avatar`, `AvatarSize`, `Website`, `Gender`, `PostCount`, `Karma`, `KarmaUpdate`, `RepliesPerPage`, `TopicsPerPage`, `MessagesPerPage`, `TimeZone`, `DST`, `UseTheme`, `IP`, `Salt`) VALUES\n".
 "(-1, 'Guest', '%s', '".$iDBHashType."', '%s', 4, 'no', 'yes', 0, 'Guest Account', 'Guest', %i, %i, '0', '0', '0', '0', '0', '[B]Test[/B] :)', 'Your Notes', 'http://', '100x100', '%s', 'UnKnow', 1, 0, 0, 10, 10, 10, '%s', '%s', 'iDB', '127.0.0.1', '%s'),\n".
 "(1, '%s', '%s', '".$iDBHashType."', '%s', 1, 'yes', 'no', 0, '%s', 'Admin', %i, %i, '0', '0', '0', '0', '0', '%s', 'Your Notes', '%s', '100x100', '%s', 'UnKnow', 0, 0, 0, 10, 10, 10, '%s', '%s', 'iDB', '%s', '%s');", array($GuestPassword,$GEmail,$YourDate,$YourDate,$YourWebsite,$AdminTime,$AdminDST,$GSalt,$_POST['AdminUser'],$NewPassword,$_POST['AdminEmail'],$Interests,$YourDate,$YourDate,$NewSignature,$Avatar,$YourWebsite,$AdminTime,$AdminDST,$UserIP,$YourSalt));
-exec_query($query);
-$query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."messenger` (\n".
+sql_query($query);
+$query=sql_pre_query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."messenger` (\n".
 "  `id` int(15) NOT NULL auto_increment,\n".
 "  `SenderID` int(15) NOT NULL default '0',\n".
 "  `ReciverID` int(15) NOT NULL default '0',\n".
@@ -190,11 +190,11 @@ $query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."messenger` (\
 "  `Read` int(5) NOT NULL default '0',\n".
 "  PRIMARY KEY  (`id`)\n".
 ") ENGINE=MyISAM  DEFAULT CHARSET=".$SQLCharset." COLLATE=".$SQLCollate.";", array(null));
-exec_query($query);
-$query = query("INSERT INTO `".$_POST['tableprefix']."messenger` (`SenderID`, `ReciverID`, `GuestName`, `MessageTitle`, `MessageText`, `Description`, `DateSend`, `Read`) VALUES\n".
+sql_query($query);
+$query = sql_pre_query("INSERT INTO `".$_POST['tableprefix']."messenger` (`SenderID`, `ReciverID`, `GuestName`, `MessageTitle`, `MessageText`, `Description`, `DateSend`, `Read`) VALUES\n".
 "(-1, 1, '".$iDB_Author."', 'Test', 'Hello Welcome to your board.\r\nThis is a Test PM. :P ', 'Hello Welcome', %i, 0)", array($YourDate));
-exec_query($query);
-$query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."permissions` (\n".
+sql_query($query);
+$query=sql_pre_query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."permissions` (\n".
 "  `id` int(15) NOT NULL auto_increment,\n".
 "  `PermissionID` int(15) NOT NULL default '0',\n".
 "  `Name` varchar(150) collate ".$SQLCollate." NOT NULL default '',\n".
@@ -218,16 +218,16 @@ $query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."permissions`
 "  `CanModForum` varchar(5) collate ".$SQLCollate." NOT NULL default '',\n".
 "  PRIMARY KEY  (`id`)\n".
 ") ENGINE=MyISAM  DEFAULT CHARSET=".$SQLCharset." COLLATE=".$SQLCollate.";", array(null));
-exec_query($query);
-$query = query("INSERT INTO `".$_POST['tableprefix']."permissions` (`PermissionID`, `Name`, `ForumID`, `CanViewForum`, `CanMakeTopics`, `CanMakeReplys`, `CanMakeReplysCT`, `CanEditTopics`, `CanEditTopicsCT`, `CanEditReplys`, `CanEditReplysCT`, `CanDeleteTopics`, `CanDeleteTopicsCT`, `CanDeleteReplys`, `CanDeleteReplysCT`, `CanCloseTopics`, `CanPinTopics`, `CanDohtml`, `CanUseBBags`, `CanModForum`) VALUES\n".
+sql_query($query);
+$query = sql_pre_query("INSERT INTO `".$_POST['tableprefix']."permissions` (`PermissionID`, `Name`, `ForumID`, `CanViewForum`, `CanMakeTopics`, `CanMakeReplys`, `CanMakeReplysCT`, `CanEditTopics`, `CanEditTopicsCT`, `CanEditReplys`, `CanEditReplysCT`, `CanDeleteTopics`, `CanDeleteTopicsCT`, `CanDeleteReplys`, `CanDeleteReplysCT`, `CanCloseTopics`, `CanPinTopics`, `CanDohtml`, `CanUseBBags`, `CanModForum`) VALUES\n".
 "(1, 'Admin', 1, 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes'),\n".
 "(2, 'Moderator', 1, 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes', 'yes'),\n".
 "(3, 'Member', 1, 'yes', 'yes', 'yes', 'no', 'yes', 'no', 'yes', 'no', 'yes', 'no', 'yes', 'no', 'no', 'no', 'no', 'yes', 'no'),\n".
 "(4, 'Guest', 1, 'yes', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no'),\n".
 "(5, 'Banned', 1, 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no'),\n".
 "(6, 'Validate', 1, 'yes', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no', 'no');", array(null)); 
-exec_query($query);
-$query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."posts` (\n".
+sql_query($query);
+$query=sql_pre_query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."posts` (\n".
 "  `id` int(15) NOT NULL auto_increment,\n".
 "  `TopicID` int(15) NOT NULL default '0',\n".
 "  `ForumID` int(15) NOT NULL default '0',\n".
@@ -244,11 +244,11 @@ $query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."posts` (\n".
 "  `EditIP` varchar(20) collate ".$SQLCollate." NOT NULL default '',\n".
 "  PRIMARY KEY  (`id`)\n".
 ") ENGINE=MyISAM  DEFAULT CHARSET=".$SQLCharset." COLLATE=".$SQLCollate.";", array(null));
-exec_query($query);
-$query = query("INSERT INTO `".$_POST['tableprefix']."posts` (`TopicID`, `ForumID`, `CategoryID`, `UserID`, `GuestName`, `TimeStamp`, `LastUpdate`, `EditUser`, `EditUserName`, `Post`, `Description`, `IP`, `EditIP`) VALUES\n".
+sql_query($query);
+$query = sql_pre_query("INSERT INTO `".$_POST['tableprefix']."posts` (`TopicID`, `ForumID`, `CategoryID`, `UserID`, `GuestName`, `TimeStamp`, `LastUpdate`, `EditUser`, `EditUserName`, `Post`, `Description`, `IP`, `EditIP`) VALUES\n".
 "(1, 1, 1, -1, '".$iDB_Author."', %i, %i, 1, '".$_POST['AdminUser']."', 'Welcome to your new Internet Discussion Board! :) ', 'Welcome %s', '127.0.0.1', '127.0.0.1')", array($YourDate,$YourEditDate,$_POST['AdminUser'])); 
-exec_query($query);
-$query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."restrictedwords` (\n".
+sql_query($query);
+$query=sql_pre_query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."restrictedwords` (\n".
 "  `id` int(15) NOT NULL auto_increment,\n".
 "  `Word` text collate ".$SQLCollate." NOT NULL,\n".
 "  `RestrictedUserName` varchar(5) collate ".$SQLCollate." NOT NULL default '',\n".
@@ -259,15 +259,15 @@ $query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."restrictedwor
 "  `WholeWord` varchar(5) collate ".$SQLCollate." NOT NULL default '',\n".
 "  PRIMARY KEY  (`id`)\n".
 ") ENGINE=MyISAM  DEFAULT CHARSET=".$SQLCharset." COLLATE=".$SQLCollate.";", array(null));
-exec_query($query);
-$query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."sessions` (\n".
+sql_query($query);
+$query=sql_pre_query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."sessions` (\n".
 "  `session_id` varchar(150) collate ".$SQLCollate." NOT NULL default '',\n".
 "  `session_data` text collate ".$SQLCollate." NOT NULL,\n".
 "  `expires` int(15) NOT NULL default '0',\n".
 "  PRIMARY KEY  (`session_id`)\n".
 ") ENGINE=MyISAM DEFAULT CHARSET=".$SQLCharset." COLLATE=".$SQLCollate.";", array(null));
-exec_query($query);
-$query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."smileys` (\n".
+sql_query($query);
+$query=sql_pre_query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."smileys` (\n".
 "  `id` int(15) NOT NULL auto_increment,\n".
 "  `FileName` text collate ".$SQLCollate." NOT NULL,\n".
 "  `SmileName` text collate ".$SQLCollate." NOT NULL,\n".
@@ -277,8 +277,8 @@ $query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."smileys` (\n"
 "  `ReplaceCI` varchar(5) collate ".$SQLCollate." NOT NULL default '',\n".
 "  PRIMARY KEY  (`id`)\n".
 ") ENGINE=MyISAM  DEFAULT CHARSET=".$SQLCharset." COLLATE=".$SQLCollate.";", array(null));
-exec_query($query);
-$query = query("INSERT INTO `".$_POST['tableprefix']."smileys` (`FileName`, `SmileName`, `SmileText`, `Directory`, `Show`, `ReplaceCI`) VALUES\n".
+sql_query($query);
+$query = sql_pre_query("INSERT INTO `".$_POST['tableprefix']."smileys` (`FileName`, `SmileName`, `SmileText`, `Directory`, `Show`, `ReplaceCI`) VALUES\n".
 "('smile.gif', 'Happy', ':)', 'smileys/', 'yes', 'no'),\n".
 "('tongue.gif', 'Tongue', ':P', 'smileys/', 'yes', 'yes'),\n".
 "('tongue2.gif', 'Tongue', ':tongue:', 'smileys/', 'no', 'yes'),\n".
@@ -295,9 +295,9 @@ $query = query("INSERT INTO `".$_POST['tableprefix']."smileys` (`FileName`, `Smi
 "('mad.gif', 'Mad', ':mad:', 'smileys/', 'yes', 'yes'),\n".
 "('wub.gif', 'Wub', ':wub:', 'smileys/', 'yes', 'yes'),\n".
 "('x.gif', 'X', ':x:', 'smileys/', 'yes', 'yes');", array(null));
-exec_query($query);
+sql_query($query);
 /*
-$query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."tagboard` (\n".
+$query=sql_pre_query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."tagboard` (\n".
 "  `id` int(15) NOT NULL auto_increment,\n".
 "  `UserID` int(15) NOT NULL default '0',\n".
 "  `GuestName` varchar(150) collate ".$SQLCollate." NOT NULL default '',\n".
@@ -306,11 +306,11 @@ $query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."tagboard` (\n
 "  `IP` varchar(20) collate ".$SQLCollate." NOT NULL default '',\n".
 "  PRIMARY KEY  (`id`)\n".
 ") ENGINE=MyISAM  DEFAULT CHARSET=".$SQLCharset." COLLATE=".$SQLCollate.";", array(null));
-exec_query($query);
-$query = query("INSERT INTO `".$_POST['tableprefix']."tagboard` VALUES (1,-1,'".$iDB_Author."',".$YourDate.",'Welcome to Your New Tag Board. ^_^','127.0.0.1'), array(null)); 
-exec_query($query);
+sql_query($query);
+$query = sql_pre_query("INSERT INTO `".$_POST['tableprefix']."tagboard` VALUES (1,-1,'".$iDB_Author."',".$YourDate.",'Welcome to Your New Tag Board. ^_^','127.0.0.1'), array(null)); 
+sql_query($query);
 */
-$query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."topics` (\n".
+$query=sql_pre_query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."topics` (\n".
 "  `id` int(15) NOT NULL auto_increment,\n".
 "  `ForumID` int(15) NOT NULL default '0',\n".
 "  `CategoryID` int(15) NOT NULL default '0',\n".
@@ -328,11 +328,11 @@ $query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."topics` (\n".
 "  `Closed` int(5) NOT NULL default '0',\n".
 "  PRIMARY KEY  (`id`)\n".
 ") ENGINE=MyISAM  DEFAULT CHARSET=".$SQLCharset." COLLATE=".$SQLCollate.";", array(null));
-exec_query($query);
-$query = query("INSERT INTO `".$_POST['tableprefix']."topics` (`ForumID`, `CategoryID`, `OldForumID`, `OldCategoryID`, `UserID`, `GuestName`, `TimeStamp`, `LastUpdate`, `TopicName`, `Description`, `NumReply`, `NumViews`, `Pinned`, `Closed`) VALUES\n".
+sql_query($query);
+$query = sql_pre_query("INSERT INTO `".$_POST['tableprefix']."topics` (`ForumID`, `CategoryID`, `OldForumID`, `OldCategoryID`, `UserID`, `GuestName`, `TimeStamp`, `LastUpdate`, `TopicName`, `Description`, `NumReply`, `NumViews`, `Pinned`, `Closed`) VALUES\n".
 "(1, 1, 1, 1, -1, '".$iDB_Author."', %i, %i, 'Welcome', 'Welcome %s', 0, 0, 1, 1)", array($YourDate,$YourDate,$_POST['AdminUser']));
-exec_query($query);
-$query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."wordfilter` (\n".
+sql_query($query);
+$query=sql_pre_query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."wordfilter` (\n".
 "  `id` int(15) NOT NULL auto_increment,\n".
 "  `Filter` text collate ".$SQLCollate." NOT NULL,\n".
 "  `Replace` text collate ".$SQLCollate." NOT NULL,\n".
@@ -340,5 +340,5 @@ $query=query("CREATE TABLE IF NOT EXISTS `".$_POST['tableprefix']."wordfilter` (
 "  `WholeWord` varchar(5) collate ".$SQLCollate." NOT NULL default '',\n".
 "  PRIMARY KEY  (`id`)\n".
 ") ENGINE=MyISAM  DEFAULT CHARSET=".$SQLCharset." COLLATE=".$SQLCollate.";", array(null));
-exec_query($query);
+sql_query($query);
 ?>

diff --git a/setup/setup.php b/setup/setup.php
index d49a1ea..4715644 100644 (file)
--- a/setup/setup.php
+++ b/setup/setup.php
@@ -12,7 +12,7 @@
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: setup.php - Last Update: 11/23/2009 SVN 357 - Author: cooldude2k $
+    $FileInfo: setup.php - Last Update: 11/23/2009 SVN 359 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="setup.php"||$File3Name=="/setup.php") {
@@ -30,10 +30,10 @@ if (!is_writable($checkfile)) {
    chmod("settings.php",0755); $Error="Yes";
    chmod("settingsbak.php",0755);
 } else { /* settings.php is writable install iDB. ^_^ */ }
-$StatSQL = mysql_connect($_POST['DatabaseHost'],$_POST['DatabaseUserName'],$_POST['DatabasePassword']);
+$StatSQL = sql_connect_db($_POST['DatabaseHost'],$_POST['DatabaseUserName'],$_POST['DatabasePassword']);
 if(!$StatSQL) { $Error="Yes";
 echo "<span class=\"TableMessage\">";
-echo "<br />".mysql_errno().": ".mysql_error()."\n</span>\n"; }
+echo "<br />".sql_errno().": ".sql_error()."\n</span>\n"; }
 if ($Error!="Yes") {
 $pretext = "<?php\n/*\n    This program is free software; you can redistribute it and/or modify\n    it under the terms of the Revised BSD License.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    Revised BSD License for more details.\n\n    Copyright 2004-2007 Cool Dude 2k - http://intdb.sourceforge.net/\n    Copyright 2004-2007 Game Maker 2k - http://idb.berlios.de/support/category.php?act=view&id=2\n    Emoticons made by Jcink http://tfbb.jcink.com/\n*/\n";
 $BoardSettings=$pretext."\$Settings = array();\n\$Settings['sqlhost'] = '".$_POST['DatabaseHost']."';\n\$Settings['sqluser'] = '".$_POST['DatabaseUserName']."';\n\$Settings['sqlpass'] = '".$_POST['DatabasePassword']."';\n?>";