OSDN Git Service

(root) / idb / iDB.git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4c60f4f)
Small SQL bug fix. :P
authorKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Wed, 9 Dec 2009 09:20:13 +0000 (09:20 +0000)
committerKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Wed, 9 Dec 2009 09:20:13 +0000 (09:20 +0000)
git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@383 2b68903e-0b30-0410-9a39-a2e4f3c5be39

inc/events.php patch | blob | history
inc/groupsetup.php patch | blob | history
inc/members.php patch | blob | history
inc/misc/functions.php patch | blob | history
inc/pm.php patch | blob | history
inc/prelogin.php patch | blob | history
inc/profilemain.php patch | blob | history
inc/replies.php patch | blob | history
inc/topics.php patch | blob | history
inc/versioninfo.php patch | blob | history
setup/mysql.php patch | blob | history

diff --git a/inc/events.php b/inc/events.php
index 62c70d2..cc92db0 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: 12/09/2009 SVN 382 - Author: cooldude2k $
+    $FileInfo: events.php - Last Update: 12/09/2009 SVN 383 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="events.php"||$File3Name=="/events.php") {
@@ -206,7 +206,7 @@ $_SESSION['UserFormID'] = $UFID;
 <td class="TableColumn3" style="width: 15%; vertical-align: middle; text-align: center;">
 <div style="width: 100%; height: 160px; overflow: auto;">
 <table style="width: 100%; text-align: center;"><?php
-$renee_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Show\"='yes'", array(null));
+$renee_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Display\"='yes'", array(null));
 $renee_result=sql_query($renee_query,$SQLStat);
 $renee_num=sql_num_rows($renee_result);
 $renee_s=0; $SmileRow=0; $SmileCRow=0;
@@ -215,7 +215,7 @@ $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");
+$ShowSmile=sql_result($renee_result,$renee_s,"Display");
 $ReplaceType=sql_result($renee_result,$renee_s,"ReplaceCI");
 if($SmileRow==1) { ?><tr>
        <?php } if($SmileRow<5) { ++$SmileCRow; ?>
@@ -460,8 +460,8 @@ $katarzynart=sql_query($katarzynaqy,$SQLStat);
 $katarzynanm=sql_num_rows($katarzynart);
 $katarzynas=0;
 while ($katarzynas < $katarzynanm) {
-$Filter=sql_result($katarzynart,$katarzynas,"Filter");
-$Replace=sql_result($katarzynart,$katarzynas,"Replace");
+$Filter=sql_result($katarzynart,$katarzynas,"FilterWord");
+$Replace=sql_result($katarzynart,$katarzynas,"Replacement");
 $CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
 if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
 if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
diff --git a/inc/groupsetup.php b/inc/groupsetup.php
index 16f8d05..2da5e2a 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: 12/09/2009 SVN 382 - Author: cooldude2k $
+    $FileInfo: groupsetup.php - Last Update: 12/09/2009 SVN 383 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="groupsetup.php"||$File3Name=="/groupsetup.php") {
@@ -32,7 +32,7 @@ $Settings['GuestGroupID']=sql_result($ggidresult,0,"id");*/
 $MyPostCountChk = null; $MyKarmaCount = null;
 if(!isset($_SESSION['UserID'])) { $_SESSION['UserID'] = 0; }
 if($_SESSION['UserID']!=0&&$_SESSION['UserID']!=null) { $BanError = null;
-$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'])); 
+$kgbquerychkusr = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."members\" WHERE \"Name\"='%s' AND \"UserPassword\"='%s' AND \"id\"=%i LIMIT 1", array($_SESSION['MemberName'],$_SESSION['UserPass'],$_SESSION['UserID'])); 
 $resultchkusr=sql_query($kgbquerychkusr,$SQLStat);
 $numchkusr=sql_num_rows($resultchkusr);
 if($numchkusr==1) {
@@ -40,7 +40,7 @@ $ChkUsrID=sql_result($resultchkusr,0,"id");
 $ChkUsrName=sql_result($resultchkusr,0,"Name");
 $ChkUsrGroup=sql_result($resultchkusr,0,"GroupID");
 $ChkUsrGroupID=$ChkUsrGroup;
-$ChkUsrPass=sql_result($resultchkusr,0,"Password");
+$ChkUsrPass=sql_result($resultchkusr,0,"UserPassword");
 $ChkUsrTimeZone=sql_result($resultchkusr,0,"TimeZone");
 $ChkUsrTheme=sql_result($resultchkusr,0,"UseTheme");
 $ChkUsrLastPostTime=sql_result($resultchkusr,0,"LastPostTime");
diff --git a/inc/members.php b/inc/members.php
index 1e01d1f..f389368 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: 12/09/2009 SVN 382 - Author: cooldude2k $
+    $FileInfo: members.php - Last Update: 12/09/2009 SVN 383 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="members.php"||$File3Name=="/members.php") {
@@ -867,7 +867,7 @@ $numlog=sql_num_rows($resultlog);
 if($numlog>=1) {
 $i=0;
 $YourName=sql_result($resultlog,$i,"Name");
-$YourPassTry=sql_result($resultlog,$i,"Password");
+$YourPassTry=sql_result($resultlog,$i,"UserPassword");
 $HashType=sql_result($resultlog,$i,"HashType");
 $JoinedPass=sql_result($resultlog,$i,"Joined");
 $HashSalt=sql_result($resultlog,$i,"Salt");
@@ -886,7 +886,7 @@ if($YourPassword!=$YourPassTry) { $passright = false; }
 if($YourPassword==$YourPassTry) { $passright = true;
 $YourIDM=sql_result($resultlog,$i,"id");
 $YourNameM=sql_result($resultlog,$i,"Name");
-$YourPassM=sql_result($resultlog,$i,"Password");
+$YourPassM=sql_result($resultlog,$i,"UserPassword");
 $PostCount=sql_result($resultlog,$i,"PostCount");
 $YourGroupM=sql_result($resultlog,$i,"GroupID");
 $YourGroupIDM=$YourGroupM;
@@ -921,7 +921,7 @@ $NewPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$NewHashSalt,"sha512");
 $NewDay=GMTimeStamp();
 $NewIP=$_SERVER['REMOTE_ADDR'];
 if($BanError!="yes") {
-$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));
+$queryup = sql_pre_query("UPDATE \"".$Settings['sqltable']."members\" SET \"UserPassword\"='%s',\"HashType\"='%s',\"LastActive\"=%i,\"IP\"='%s',\"Salt\"='%s' WHERE \"id\"=%i", array($NewPassword,$iDBHash,$NewDay,$NewIP,$NewHashSalt,$YourIDM));
 sql_query($queryup,$SQLStat);
 sql_free_result($resultlog);
 //session_regenerate_id();
@@ -1355,10 +1355,10 @@ 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 = 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". 
+$query = sql_pre_query("INSERT INTO \"".$Settings['sqltable']."members\" (\"Name\", \"UserPassword\", \"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));
 sql_query($query,$SQLStat);
-$querylogr = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."members\" WHERE \"Name\"='%s' AND \"Password\"='%s' LIMIT 1", array($Name,$NewPassword));
+$querylogr = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."members\" WHERE \"Name\"='%s' AND \"UserPassword\"='%s' LIMIT 1", array($Name,$NewPassword));
 $resultlogr=sql_query($querylogr,$SQLStat);
 $numlogr=sql_num_rows($resultlogr);
 if($numlogr>=1) {
diff --git a/inc/misc/functions.php b/inc/misc/functions.php
index e8d63e7..a5ccf04 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: 12/09/2009 SVN 382 - Author: cooldude2k $
+    $FileInfo: functions.php - Last Update: 12/09/2009 SVN 383 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="functions.php"||$File3Name=="/functions.php") {
@@ -123,7 +123,7 @@ $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");
+$ShowSmile=sql_result($reneeresult,$renees,"Display");
 $ReplaceType=sql_result($reneeresult,$renees,"ReplaceCI");
 if($ReplaceType=="on") { $ReplaceType = "yes"; }
 if($ReplaceType=="off") { $ReplaceType = "no"; }
diff --git a/inc/pm.php b/inc/pm.php
index 7b9054e..27c7d15 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: 12/09/2009 SVN 382 - Author: cooldude2k $
+    $FileInfo: pm.php - Last Update: 12/09/2009 SVN 383 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="pm.php"||$File3Name=="/pm.php") {
@@ -636,7 +636,7 @@ $_SESSION['UserFormID'] = $UFID;
 <td class="TableColumn3" style="width: 15%; vertical-align: middle; text-align: center;">
 <div style="width: 100%; height: 160px; overflow: auto;">
 <table style="width: 100%; text-align: center;"><?php
-$renee_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Show\"='yes'", array(null));
+$renee_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Display\"='yes'", array(null));
 $renee_result=sql_query($renee_query,$SQLStat);
 $renee_num=sql_num_rows($renee_result);
 $renee_s=0; $SmileRow=0; $SmileCRow=0;
@@ -645,7 +645,7 @@ $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");
+$ShowSmile=sql_result($renee_result,$renee_s,"Display");
 $ReplaceType=sql_result($renee_result,$renee_s,"ReplaceCI");
 if($SmileRow==1) { ?><tr>
        <?php } if($SmileRow<5) { ++$SmileCRow; ?>
@@ -817,8 +817,8 @@ $katarzynart=sql_query($katarzynaqy,$SQLStat);
 $katarzynanm=sql_num_rows($katarzynart);
 $katarzynas=0;
 while ($katarzynas < $katarzynanm) {
-$Filter=sql_result($katarzynart,$katarzynas,"Filter");
-$Replace=sql_result($katarzynart,$katarzynas,"Replace");
+$Filter=sql_result($katarzynart,$katarzynas,"FilterWord");
+$Replace=sql_result($katarzynart,$katarzynas,"Replacement");
 $CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
 if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
 if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
diff --git a/inc/prelogin.php b/inc/prelogin.php
index 23da635..7c2c33e 100644 (file)
--- a/inc/prelogin.php
+++ b/inc/prelogin.php
@@ -11,14 +11,14 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: prelogin.php - Last Update: 12/09/2009 SVN 382 - Author: cooldude2k $
+    $FileInfo: prelogin.php - Last Update: 12/09/2009 SVN 383 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="prelogin.php"||$File3Name=="/prelogin.php") {
        require('index.php');
        exit(); }
 $_SESSION['CheckCookie']="done";
-$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']));
+$querylog2 = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."members\" WHERE \"Name\"='%s' AND \"UserPassword\"='%s' AND \"id\"=%i LIMIT 1", array($_COOKIE['MemberName'],$_COOKIE['SessPass'],$_COOKIE['UserID']));
 $resultlog2=sql_query($querylog2,$SQLStat);
 $numlog2=sql_num_rows($resultlog2);
 if($numlog2==1) {
@@ -26,7 +26,7 @@ $YourIDAM=sql_result($resultlog2,0,"id");
 $YourNameAM=sql_result($resultlog2,0,"Name");
 $YourGroupAM=sql_result($resultlog2,0,"GroupID");
 $YourGroupIDAM=$YourGroupAM;
-$YourPassAM=sql_result($resultlog2,0,"Password");
+$YourPassAM=sql_result($resultlog2,0,"UserPassword");
 $gquery = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."groups\" WHERE \"id\"=%i LIMIT 1", array($YourGroupAM));
 $gresult=sql_query($gquery,$SQLStat);
 $YourGroupAM=sql_result($gresult,0,"Name");
diff --git a/inc/profilemain.php b/inc/profilemain.php
index bdc49aa..f8ff073 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: 12/09/2009 SVN 382 - Author: cooldude2k $
+    $FileInfo: profilemain.php - Last Update: 12/09/2009 SVN 383 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="profilemain.php"||$File3Name=="/profilemain.php") {
@@ -169,8 +169,8 @@ if($_POST['act']=="view"&&
        $katarzynanm=sql_num_rows($katarzynart);
        $katarzynas=0;
        while ($katarzynas < $katarzynanm) {
-       $Filter=sql_result($katarzynart,$katarzynas,"Filter");
-       $Replace=sql_result($katarzynart,$katarzynas,"Replace");
+       $Filter=sql_result($katarzynart,$katarzynas,"FilterWord");
+       $Replace=sql_result($katarzynart,$katarzynas,"Replacement");
        $CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
        if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
        if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
@@ -251,8 +251,8 @@ if($_POST['act']=="signature"&&
        $katarzynanm=sql_num_rows($katarzynart);
        $katarzynas=0;
        while ($katarzynas < $katarzynanm) {
-       $Filter=sql_result($katarzynart,$katarzynas,"Filter");
-       $Replace=sql_result($katarzynart,$katarzynas,"Replace");
+       $Filter=sql_result($katarzynart,$katarzynas,"FilterWord");
+       $Replace=sql_result($katarzynart,$katarzynas,"Replacement");
        $CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
        if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
        if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
@@ -717,8 +717,8 @@ if($_POST['act']=="profile"&&
        $katarzynanm=sql_num_rows($katarzynart);
        $katarzynas=0;
        while ($katarzynas < $katarzynanm) {
-       $Filter=sql_result($katarzynart,$katarzynas,"Filter");
-       $Replace=sql_result($katarzynart,$katarzynas,"Replace");
+       $Filter=sql_result($katarzynart,$katarzynas,"FilterWord");
+       $Replace=sql_result($katarzynart,$katarzynas,"Replacement");
        $CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
        if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
        if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
@@ -852,7 +852,7 @@ if($_POST['act']=="userinfo"&&
        $result=sql_query($query,$SQLStat);
        $num=sql_num_rows($result);
        $i=0;
-       $OldPassword=sql_result($result,$i,"Password");
+       $OldPassword=sql_result($result,$i,"UserPassword");
        $OldHashType=sql_result($result,$i,"HashType");
        $OldJoined=sql_result($result,$i,"Joined");
        $OldSalt=sql_result($result,$i,"Salt");
@@ -912,7 +912,7 @@ if($YourPassword!=$OldPassword) { $Error="Yes"; ?>
        if($cookieSecure===false) {
        setcookie("SessPass", $NewPassword, time() + (7 * 86400), $cbasedir, $cookieDomain); } }
        $_POST['Email'] = remove_spaces($_POST['Email']);
-       $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']));
+       $querynewuserinfo = sql_pre_query("UPDATE \"".$Settings['sqltable']."members\" SET \"UserPassword\"='%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,$SQLStat); } } } }
 ?>
 <?php if($_POST['update']=="now"&&$_GET['act']!=null) {
diff --git a/inc/replies.php b/inc/replies.php
index ce9aa77..2f3e1fd 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: 12/09/2009 SVN 382 - Author: cooldude2k $
+    $FileInfo: replies.php - Last Update: 12/09/2009 SVN 383 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="replies.php"||$File3Name=="/replies.php") {
@@ -608,7 +608,7 @@ $_SESSION['UserFormID'] = $UFID;
 <td class="TableColumn3" style="width: 15%; vertical-align: middle; text-align: center;">
 <div style="width: 100%; height: 160px; overflow: auto;">
 <table style="width: 100%; text-align: center;"><?php
-$renee_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Show\"='yes'", array(null));
+$renee_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Display\"='yes'", array(null));
 $renee_result=sql_query($renee_query,$SQLStat);
 $renee_num=sql_num_rows($renee_result);
 $renee_s=0; $rose_a=0; $SmileRow=0; $SmileCRow=0;
@@ -617,7 +617,7 @@ $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");
+$ShowSmile=sql_result($renee_result,$renee_s,"Display");
 $ReplaceType=sql_result($renee_result,$renee_s,"ReplaceCI");
 if($SmileRow==1) { ?><tr>
        <?php } if($SmileRow<5) { ++$SmileCRow; ?>
@@ -774,8 +774,8 @@ $katarzynart=sql_query($katarzynaqy,$SQLStat);
 $katarzynanm=sql_num_rows($katarzynart);
 $katarzynas=0;
 while ($katarzynas < $katarzynanm) {
-$Filter=sql_result($katarzynart,$katarzynas,"Filter");
-$Replace=sql_result($katarzynart,$katarzynas,"Replace");
+$Filter=sql_result($katarzynart,$katarzynas,"FilterWord");
+$Replace=sql_result($katarzynart,$katarzynas,"Replacement");
 $CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
 if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
 if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
@@ -1200,7 +1200,7 @@ $_SESSION['UserFormID'] = $UFID;
 <tr class="TableRow3" id="EditReplies<?php echo $_GET['post']; ?>">
 <td class="TableColumn3" style="width: 15%; vertical-align: middle; text-align: center;">
 <div style="width: 100%; height: 160px; overflow: auto;"><?php
-$renee_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Show\"='yes'", array(null));
+$renee_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Display\"='yes'", array(null));
 $renee_result=sql_query($renee_query,$SQLStat);
 $renee_num=sql_num_rows($renee_result);
 $renee_s=0; $SmileRow=1;
@@ -1209,7 +1209,7 @@ $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");
+$ShowSmile=sql_result($renee_result,$renee_s,"Display");
 $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;
@@ -1391,8 +1391,8 @@ $katarzynart=sql_query($katarzynaqy,$SQLStat);
 $katarzynanm=sql_num_rows($katarzynart);
 $katarzynas=0;
 while ($katarzynas < $katarzynanm) {
-$Filter=sql_result($katarzynart,$katarzynas,"Filter");
-$Replace=sql_result($katarzynart,$katarzynas,"Replace");
+$Filter=sql_result($katarzynart,$katarzynas,"FilterWord");
+$Replace=sql_result($katarzynart,$katarzynas,"Replacement");
 $CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
 if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
 if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
@@ -1623,7 +1623,7 @@ $_SESSION['UserFormID'] = $UFID;
 <td class="TableColumn3" style="width: 15%; vertical-align: middle; text-align: center;">
 <div style="width: 100%; height: 160px; overflow: auto;">
 <table style="width: 100%; text-align: center;"><?php
-$renee_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Show\"='yes'", array(null));
+$renee_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Display\"='yes'", array(null));
 $renee_result=sql_query($renee_query,$SQLStat);
 $renee_num=sql_num_rows($renee_result);
 $renee_s=0; $SmileRow=0; $SmileCRow=0;
@@ -1632,7 +1632,7 @@ $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");
+$ShowSmile=sql_result($renee_result,$renee_s,"Display");
 $ReplaceType=sql_result($renee_result,$renee_s,"ReplaceCI");
 if($SmileRow==1) { ?><tr>
        <?php } if($SmileRow<5) { ++$SmileCRow; ?>
diff --git a/inc/topics.php b/inc/topics.php
index 04f64f0..bad2fc2 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: 12/09/2009 SVN 382 - Author: cooldude2k $
+    $FileInfo: topics.php - Last Update: 12/09/2009 SVN 383 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="topics.php"||$File3Name=="/topics.php") {
@@ -536,7 +536,7 @@ $_SESSION['UserFormID'] = $UFID;
 <td class="TableColumn3" style="width: 15%; vertical-align: middle; text-align: center;">
 <div style="width: 100%; height: 160px; overflow: auto;">
 <table style="width: 100%; text-align: center;"><?php
-$renee_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Show\"='yes'", array(null));
+$renee_query=sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."smileys\" WHERE \"Display\"='yes'", array(null));
 $renee_result=sql_query($renee_query,$SQLStat);
 $renee_num=sql_num_rows($renee_result);
 $renee_s=0; $SmileRow=0; $SmileCRow=0;
@@ -545,7 +545,7 @@ $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");
+$ShowSmile=sql_result($renee_result,$renee_s,"Display");
 $ReplaceType=sql_result($renee_result,$renee_s,"ReplaceCI");
 if($SmileRow==1) { ?><tr>
        <?php } if($SmileRow<5) { ++$SmileCRow; ?>
@@ -703,8 +703,8 @@ $katarzynart=sql_query($katarzynaqy,$SQLStat);
 $katarzynanm=sql_num_rows($katarzynart);
 $katarzynas=0;
 while ($katarzynas < $katarzynanm) {
-$Filter=sql_result($katarzynart,$katarzynas,"Filter");
-$Replace=sql_result($katarzynart,$katarzynas,"Replace");
+$Filter=sql_result($katarzynart,$katarzynas,"FilterWord");
+$Replace=sql_result($katarzynart,$katarzynas,"Replacement");
 $CaseInsensitive=sql_result($katarzynart,$katarzynas,"CaseInsensitive");
 if($CaseInsensitive=="on") { $CaseInsensitive = "yes"; }
 if($CaseInsensitive=="off") { $CaseInsensitive = "no"; }
diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 039052e..febda0c 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: 12/09/2009 SVN 382 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 12/09/2009 SVN 383 - 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] = 3; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 382; $RName = "iDB"; $SFName = "IntDB";
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 383; $RName = "iDB"; $SFName = "IntDB";
 $SVNDay[0] = 12; $SVNDay[1] = 09; $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/setup/mysql.php b/setup/mysql.php
index ef4e1e6..4f80d1c 100644 (file)
--- a/setup/mysql.php
+++ b/setup/mysql.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: mysql.php - Last Update: 12/09/2009 SVN 382 - Author: cooldude2k $
+    $FileInfo: mysql.php - Last Update: 12/09/2009 SVN 383 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="mysql.php"||$File3Name=="/mysql.php") {
@@ -136,7 +136,7 @@ sql_query($query,$SQLStat);
 $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".
+"  \"UserPassword\" varchar(250) collate ".$SQLCollate." NOT NULL default '',\n".
 "  \"HashType\" varchar(50) collate ".$SQLCollate." NOT NULL default '',\n".
 "  \"Email\" varchar(150) collate ".$SQLCollate." NOT NULL default '',\n".
 "  \"GroupID\" int(15) NOT NULL default '0',\n".
@@ -174,7 +174,7 @@ $query=sql_pre_query("CREATE TABLE IF NOT EXISTS \"".$_POST['tableprefix']."memb
 "  UNIQUE KEY \"Email\" (\"Email\")\n".
 ") ENGINE=MyISAM  DEFAULT CHARSET=".$SQLCharset." COLLATE=".$SQLCollate.";", array(null));
 sql_query($query,$SQLStat);
-$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".
+$query = sql_pre_query("INSERT INTO \"".$_POST['tableprefix']."members\" (\"id\", \"Name\", \"UserPassword\", \"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));
 sql_query($query,$SQLStat);
@@ -273,12 +273,12 @@ $query=sql_pre_query("CREATE TABLE IF NOT EXISTS \"".$_POST['tableprefix']."smil
 "  \"SmileName\" text collate ".$SQLCollate." NOT NULL,\n".
 "  \"SmileText\" text collate ".$SQLCollate." NOT NULL,\n".
 "  \"Directory\" text collate ".$SQLCollate." NOT NULL,\n".
-"  \"Show\" varchar(5) collate ".$SQLCollate." NOT NULL default '',\n".
+"  \"Display\" varchar(5) collate ".$SQLCollate." NOT NULL default '',\n".
 "  \"ReplaceCI\" varchar(5) collate ".$SQLCollate." NOT NULL default '',\n".
 "  PRIMARY KEY  (\"id\")\n".
 ") ENGINE=MyISAM  DEFAULT CHARSET=".$SQLCharset." COLLATE=".$SQLCollate.";", array(null));
 sql_query($query,$SQLStat);
-$query = sql_pre_query("INSERT INTO \"".$_POST['tableprefix']."smileys\" (\"FileName\", \"SmileName\", \"SmileText\", \"Directory\", \"Show\", \"ReplaceCI\") VALUES\n".
+$query = sql_pre_query("INSERT INTO \"".$_POST['tableprefix']."smileys\" (\"FileName\", \"SmileName\", \"SmileText\", \"Directory\", \"Display\", \"ReplaceCI\") VALUES\n".
 "('angry.png', 'Angry', ':angry:', 'smileys/', 'yes', 'yes'),\n".
 "('closedeyes.png', 'Sleep', 'v_v', 'smileys/', 'yes', 'no'),\n".
 "('cool.png', 'Cool', 'B)', 'smileys/', 'yes', 'no'),\n".
@@ -338,8 +338,8 @@ $query = sql_pre_query("INSERT INTO \"".$_POST['tableprefix']."topics\" (\"Forum
 sql_query($query,$SQLStat);
 $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".
+"  \"FilterWord\" text collate ".$SQLCollate." NOT NULL,\n".
+"  \"Replacement\" text collate ".$SQLCollate." NOT NULL,\n".
 "  \"CaseInsensitive\" varchar(5) collate ".$SQLCollate." NOT NULL default '',\n".
 "  \"WholeWord\" varchar(5) collate ".$SQLCollate." NOT NULL default '',\n".
 "  PRIMARY KEY  (\"id\")\n".
Internet Discussion Boards is a message board system by Game Maker 2k. Its very easy to set up. Your web host needs PHP and CUBRID / MySQL / MariaDB / PostgreSQL / SQLite. Internet Discussion Boards is Open Source so you can make changes to it.
About OSDN
Find Software
Develop Software
Help