From d727872a8b1991244a45323195f4c09d2068c3ca Mon Sep 17 00:00:00 2001 From: Kazuki Przyborowski Date: Fri, 5 Nov 2010 21:44:47 +0000 Subject: [PATCH] Another update for bbcodes/bbtags. git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@597 2b68903e-0b30-0410-9a39-a2e4f3c5be39 --- inc/events.php | 16 ++++++++++++++-- inc/lowreplies.php | 23 ++++++++++++++++++++++- inc/messages.php | 13 ++++++++++++- inc/replies.php | 23 ++++++++++++++++++++++- inc/versioninfo.php | 4 ++-- 5 files changed, 72 insertions(+), 7 deletions(-) diff --git a/inc/events.php b/inc/events.php index 237a7bc..128e7e1 100644 --- a/inc/events.php +++ b/inc/events.php @@ -11,7 +11,7 @@ Copyright 2004-2010 iDB Support - http://idb.berlios.de/ Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: events.php - Last Update: 10/09/2010 SVN 586 - Author: cooldude2k $ + $FileInfo: events.php - Last Update: 11/05/2010 SVN 597 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="events.php"||$File3Name=="/events.php") { @@ -71,6 +71,12 @@ $gquery = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."groups\" WHERE $gresult=sql_query($gquery,$SQLStat); $User1Hidden=sql_result($reresult,$rei,"HiddenMember"); $User1Group=sql_result($gresult,0,"Name"); +$User1CanDoHTML=sql_result($gresult,0,"CanDoHTML"); +if($User1CanDoHTML!="yes"&&$User1CanDoHTML!="no") { + $User1CanDoHTML = "no"; } +$User1CanUseBBags=sql_result($gresult,0,"CanUseBBags"); +if($User1CanUseBBags!="yes"&&$User1CanUseBBags!="no") { + $User1CanUseBBags = "no"; } $GroupNamePrefix=sql_result($gresult,0,"NamePrefix"); $GroupNameSuffix=sql_result($gresult,0,"NameSuffix"); sql_free_result($gresult); @@ -103,8 +109,14 @@ if(isset($GroupNamePrefix)&&$GroupNamePrefix!=null) { if(isset($GroupNameSuffix)&&$GroupNameSuffix!=null) { $User1Name = $User1Name.$GroupNameSuffix; } $EventText = url2link($EventText); -$EventText = text2icons($EventText,$Settings['sqltable'],$SQLStat); +$EventText = text2icons($EventText,$Settings['sqltable'],$SQLStat); +if($User1CanUseBBags=="yes") { $EventText = bbcode_parser($EventText); } +if($User1CanDoHTML=="yes") { $EventText = do_html_bbcode($EventText); } +$User1Signature = preg_replace("/\/", "
", nl2br($User1Signature)); +$User1Signature = url2link($User1Signature); $User1Signature = text2icons($User1Signature,$Settings['sqltable'],$SQLStat); +if($User1CanUseBBags=="yes") { $User1Signature = bbcode_parser($User1Signature); } +if($User1CanDoHTML=="yes") { $User1Signature = do_html_bbcode($User1Signature); } ?>
diff --git a/inc/lowreplies.php b/inc/lowreplies.php index c5cbe1c..8fa58d2 100644 --- a/inc/lowreplies.php +++ b/inc/lowreplies.php @@ -11,7 +11,7 @@ Copyright 2004-2010 iDB Support - http://idb.berlios.de/ Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: lowreplies.php - Last Update: 09/06/2010 SVN 578 - Author: cooldude2k $ + $FileInfo: lowreplies.php - Last Update: 11/05/2010 SVN 597 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="replies.php"||$File3Name=="/replies.php") { @@ -262,9 +262,26 @@ $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,$SQLStat); $User1Group=sql_result($gresult,0,"Name"); +$User1CanDoHTML=sql_result($gresult,0,"CanDoHTML"); +if($User1CanDoHTML!="yes"&&$User1CanDoHTML!="no") { + $User1CanDoHTML = "no"; } +$User1CanUseBBags=sql_result($gresult,0,"CanUseBBags"); +if($User1CanUseBBags!="yes"&&$User1CanUseBBags!="no") { + $User1CanUseBBags = "no"; } $GroupNamePrefix=sql_result($gresult,0,"NamePrefix"); $GroupNameSuffix=sql_result($gresult,0,"NameSuffix"); +$User1PermissionID=sql_result($gresult,0,"PermissionID"); sql_free_result($gresult); +$per1query = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."permissions\" WHERE \"PermissionID\"=%i LIMIT 1", array($User1PermissionID)); +$per1esult=sql_query($per1query,$SQLStat); +$per1num=sql_num_rows($per1esult); +$User1CanDoHTML1=sql_result($per1esult,0,"CanDoHTML"); +if($User1CanDoHTML1!="yes"&&$User1CanDoHTML1!="no") { + $User1CanDoHTML1 = "no"; } +$User1CanUseBBags1=sql_result($per1esult,0,"CanUseBBags"); +if($User1CanUseBBags1!="yes"&&$User1CanUseBBags1!="no") { + $User1CanUseBBags1 = "no"; } +sql_free_result($per1esult); $User1Signature=sql_result($reresult,$rei,"Signature"); $User1Avatar=sql_result($reresult,$rei,"Avatar"); $User1AvatarSize=sql_result($reresult,$rei,"AvatarSize"); @@ -351,10 +368,14 @@ $GroupNameSuffix=sql_result($gresult,0,"NameSuffix"); sql_free_result($gresult); } $MyPost = url2link($MyPost); $MyPost = text2icons($MyPost,$Settings['sqltable'],$SQLStat); +if($User1CanUseBBags1=="yes") { $MyPostt = bbcode_parser($MyPostt); } +if($User1CanDoHTML1=="yes") { $MyPostt = do_html_bbcode($MyPostt); } if($MySubPost!=null) { $MyPost = $MyPost."\n".$MySubPost; } $User1Signature = preg_replace("/\/", "
", nl2br($User1Signature)); $User1Signature = url2link($User1Signature); $User1Signature = text2icons($User1Signature,$Settings['sqltable'],$SQLStat); +if($User1CanUseBBags=="yes") { $User1Signature = bbcode_parser($User1Signature); } +if($User1CanDoHTML=="yes") { $User1Signature = do_html_bbcode($User1Signature); } $CanEditReply = false; $CanDeleteReply = false; if($_SESSION['UserGroup']!=$Settings['GuestGroup']) { if($PermissionInfo['CanEditReplys'][$MyForumID]=="yes"&& diff --git a/inc/messages.php b/inc/messages.php index dddca81..bdb2115 100644 --- a/inc/messages.php +++ b/inc/messages.php @@ -11,7 +11,7 @@ Copyright 2004-2010 iDB Support - http://idb.berlios.de/ Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: messages.php - Last Update: 10/09/2010 SVN 586 - Author: cooldude2k $ + $FileInfo: messages.php - Last Update: 11/05/2010 SVN 597 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="messages.php"||$File3Name=="/messages.php") { @@ -461,6 +461,12 @@ $SenderHidden = $User1Hidden; $gquery = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."groups\" WHERE \"id\"=%i", array($User1GroupID)); $gresult=sql_query($gquery,$SQLStat); $User1Group=sql_result($gresult,0,"Name"); +$User1CanDoHTML=sql_result($gresult,0,"CanDoHTML"); +if($User1CanDoHTML!="yes"&&$User1CanDoHTML!="no") { + $User1CanDoHTML = "no"; } +$User1CanUseBBags=sql_result($gresult,0,"CanUseBBags"); +if($User1CanUseBBags!="yes"&&$User1CanUseBBags!="no") { + $User1CanUseBBags = "no"; } $GroupNamePrefix=sql_result($gresult,0,"NamePrefix"); $GroupNameSuffix=sql_result($gresult,0,"NameSuffix"); sql_free_result($gresult); @@ -497,8 +503,13 @@ if(isset($GroupNameSuffix)&&$GroupNameSuffix!=null) { $User1Name = $User1Name.$GroupNameSuffix; } $MessageText = url2link($MessageText); $MessageText = text2icons($MessageText,$Settings['sqltable'],$SQLStat); +if($User1CanUseBBags=="yes") { $MessageText = bbcode_parser($MessageText); } +if($User1CanDoHTML=="yes") { $MessageText = do_html_bbcode($MessageText); } $User1Signature = preg_replace("/\/", "
", nl2br($User1Signature)); +$User1Signature = url2link($User1Signature); $User1Signature = text2icons($User1Signature,$Settings['sqltable'],$SQLStat); +if($User1CanUseBBags=="yes") { $User1Signature = bbcode_parser($User1Signature); } +if($User1CanDoHTML=="yes") { $User1Signature = do_html_bbcode($User1Signature); } ?>
diff --git a/inc/replies.php b/inc/replies.php index e3798fb..c4efe54 100644 --- a/inc/replies.php +++ b/inc/replies.php @@ -11,7 +11,7 @@ Copyright 2004-2010 iDB Support - http://idb.berlios.de/ Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: replies.php - Last Update: 10/09/2010 SVN 586 - Author: cooldude2k $ + $FileInfo: replies.php - Last Update: 11/05/2010 SVN 597 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="replies.php"||$File3Name=="/replies.php") { @@ -300,9 +300,26 @@ $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,$SQLStat); $User1Group=sql_result($gresult,0,"Name"); +$User1CanDoHTML=sql_result($gresult,0,"CanDoHTML"); +if($User1CanDoHTML!="yes"&&$User1CanDoHTML!="no") { + $User1CanDoHTML = "no"; } +$User1CanUseBBags=sql_result($gresult,0,"CanUseBBags"); +if($User1CanUseBBags!="yes"&&$User1CanUseBBags!="no") { + $User1CanUseBBags = "no"; } $GroupNamePrefix=sql_result($gresult,0,"NamePrefix"); $GroupNameSuffix=sql_result($gresult,0,"NameSuffix"); +$User1PermissionID=sql_result($gresult,0,"PermissionID"); sql_free_result($gresult); +$per1query = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."permissions\" WHERE \"PermissionID\"=%i LIMIT 1", array($User1PermissionID)); +$per1esult=sql_query($per1query,$SQLStat); +$per1num=sql_num_rows($per1esult); +$User1CanDoHTML1=sql_result($per1esult,0,"CanDoHTML"); +if($User1CanDoHTML1!="yes"&&$User1CanDoHTML1!="no") { + $User1CanDoHTML1 = "no"; } +$User1CanUseBBags1=sql_result($per1esult,0,"CanUseBBags"); +if($User1CanUseBBags1!="yes"&&$User1CanUseBBags1!="no") { + $User1CanUseBBags1 = "no"; } +sql_free_result($per1esult); if($User1Title=="") { $User1Title = $User1Group; } $User1Signature=sql_result($reresult,$rei,"Signature"); $User1Avatar=sql_result($reresult,$rei,"Avatar"); @@ -369,10 +386,14 @@ $eunum = sql_num_rows($euresult); } $MySubPost = "

This post has been edited by ".$EditUserName." on ".$MyEditTime."
"; } $MyPost = url2link($MyPost); $MyPost = text2icons($MyPost,$Settings['sqltable'],$SQLStat); +if($User1CanUseBBags1=="yes") { $MyPostt = bbcode_parser($MyPostt); } +if($User1CanDoHTML1=="yes") { $MyPostt = do_html_bbcode($MyPostt); } if($MySubPost!=null) { $MyPost = $MyPost."\n".$MySubPost; } $User1Signature = preg_replace("/\/", "
", nl2br($User1Signature)); $User1Signature = url2link($User1Signature); $User1Signature = text2icons($User1Signature,$Settings['sqltable'],$SQLStat); +if($User1CanUseBBags=="yes") { $User1Signature = bbcode_parser($User1Signature); } +if($User1CanDoHTML=="yes") { $User1Signature = do_html_bbcode($User1Signature); } $CanEditReply = false; $CanDeleteReply = false; if($_SESSION['UserGroup']!=$Settings['GuestGroup']) { if($PermissionInfo['CanEditReplys'][$MyForumID]=="yes"&& diff --git a/inc/versioninfo.php b/inc/versioninfo.php index 3f93b53..bf790f3 100644 --- a/inc/versioninfo.php +++ b/inc/versioninfo.php @@ -11,7 +11,7 @@ Copyright 2004-2010 iDB Support - http://idb.berlios.de/ Copyright 2004-2010 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: versioninfo.php - Last Update: 11/05/2010 SVN 596 - Author: cooldude2k $ + $FileInfo: versioninfo.php - Last Update: 11/05/2010 SVN 597 - 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] = 4; $VER1[2] = 2; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2]; -$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 596; $RName = "iDB"; $SFName = "IntDB"; +$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 597; $RName = "iDB"; $SFName = "IntDB"; $SVNDay[0] = 11; $SVNDay[1] = 05; $SVNDay[2] = 2010; $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); -- 2.11.0