Yet another small bug fix to iBBCode/iBBTags.

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

diff --git a/inc/events.php b/inc/events.php
index 614b34d..f036e82 100644 (file)
--- a/inc/events.php
+++ b/inc/events.php
@@ -11,7 +11,7 @@
     Copyright 2004-2011 iDB Support - http://idb.berlios.de/
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: events.php - Last Update: 04/30/2011 SVN 636 - Author: cooldude2k $
+    $FileInfo: events.php - Last Update: 05/01/2011 SVN 638 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="events.php"||$File3Name=="/events.php") {
@@ -37,7 +37,6 @@ $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=sql_result($result,$is,"TimeStamp");
 $EventEnd=sql_result($result,$is,"TimeStampEnd");
 $EventStart = GMTimeChange("M. j Y",$EventStart,null);
@@ -108,9 +107,10 @@ if(isset($GroupNamePrefix)&&$GroupNamePrefix!=null) {
        $User1Name = $GroupNamePrefix.$User1Name; }
 if(isset($GroupNameSuffix)&&$GroupNameSuffix!=null) {
        $User1Name = $User1Name.$GroupNameSuffix; }
-$EventText = text2icons($EventText,$Settings['sqltable'],$SQLStat);
 if($User1CanUseBBags=="yes") { $EventText = bbcode_parser($EventText); }
 if($User1CanDoHTML=="yes") { $EventText = do_html_bbcode($EventText); }
+$EventText = text2icons($EventText,$Settings['sqltable'],$SQLStat);
+$EventText = preg_replace("/\<br\>/", "<br />", nl2br($EventText));
 $EventText = url2link($EventText);
 $User1Signature = preg_replace("/\<br\>/", "<br />", nl2br($User1Signature));
 $User1Signature = text2icons($User1Signature,$Settings['sqltable'],$SQLStat);

diff --git a/inc/lowreplies.php b/inc/lowreplies.php
index bb7e113..774ff5e 100644 (file)
--- a/inc/lowreplies.php
+++ b/inc/lowreplies.php
@@ -11,7 +11,7 @@
     Copyright 2004-2011 iDB Support - http://idb.berlios.de/
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: lowreplies.php - Last Update: 04/30/2011 SVN 636 - Author: cooldude2k $
+    $FileInfo: lowreplies.php - Last Update: 05/01/2011 SVN 638 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="replies.php"||$File3Name=="/replies.php") {
@@ -240,7 +240,6 @@ $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=sql_result($result,$i,"Post");
-$MyPost = preg_replace("/\<br\>/", "<br />", nl2br($MyPost));
 $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,$SQLStat);
@@ -369,12 +368,13 @@ sql_free_result($gresult); }
 $MyPost = text2icons($MyPost,$Settings['sqltable'],$SQLStat);
 if($User1CanUseBBags1=="yes") { $MyPost = bbcode_parser($MyPost); }
 if($User1CanDoHTML1=="yes") { $MyPost = do_html_bbcode($MyPost); }
+$MyPost = preg_replace("/\<br\>/", "<br />", nl2br($MyPost));
 $MyPost = url2link($MyPost);
 if($MySubPost!=null) { $MyPost = $MyPost."\n".$MySubPost; }
-$User1Signature = preg_replace("/\<br\>/", "<br />", nl2br($User1Signature));
 $User1Signature = text2icons($User1Signature,$Settings['sqltable'],$SQLStat);
 if($User1CanUseBBags=="yes") { $User1Signature = bbcode_parser($User1Signature); }
 if($User1CanDoHTML=="yes") { $User1Signature = do_html_bbcode($User1Signature); }
+$User1Signature = preg_replace("/\<br\>/", "<br />", nl2br($User1Signature));
 $User1Signature = url2link($User1Signature);
 $CanEditReply = false; $CanDeleteReply = false;
 if($_SESSION['UserGroup']!=$Settings['GuestGroup']) {

diff --git a/inc/messages.php b/inc/messages.php
index 5467eb0..de1b37c 100644 (file)
--- a/inc/messages.php
+++ b/inc/messages.php
@@ -11,7 +11,7 @@
     Copyright 2004-2011 iDB Support - http://idb.berlios.de/
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: messages.php - Last Update: 04/30/2011 SVN 636 - Author: cooldude2k $
+    $FileInfo: messages.php - Last Update: 05/01/2011 SVN 638 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="messages.php"||$File3Name=="/messages.php") {
@@ -433,7 +433,6 @@ $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=sql_result($result,$is,"MessageText");
-$MessageText = preg_replace("/\<br\>/", "<br />", nl2br($MessageText));
 $MessageDesc=sql_result($result,$is,"Description");
 $ipshow = "two";
 $requery = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."members\" WHERE \"id\"=%i", array($SenderID));
@@ -504,6 +503,7 @@ if(isset($GroupNameSuffix)&&$GroupNameSuffix!=null) {
 $MessageText = text2icons($MessageText,$Settings['sqltable'],$SQLStat);
 if($User1CanUseBBags=="yes") { $MessageText = bbcode_parser($MessageText); }
 if($User1CanDoHTML=="yes") { $MessageText = do_html_bbcode($MessageText); }
+$MessageText = preg_replace("/\<br\>/", "<br />", nl2br($MessageText));
 $MessageText = url2link($MessageText);
 $User1Signature = preg_replace("/\<br\>/", "<br />", nl2br($User1Signature));
 $User1Signature = text2icons($User1Signature,$Settings['sqltable'],$SQLStat);

diff --git a/inc/misc/ibbcode.php b/inc/misc/ibbcode.php
index cdf3fe1..4b54993 100644 (file)
--- a/inc/misc/ibbcode.php
+++ b/inc/misc/ibbcode.php
@@ -11,7 +11,7 @@
     Copyright 2004-2011 iDB Support - http://idb.berlios.de/
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: ibbcode.php - Last Update: 04/30/2011 SVN 637 - Author: cooldude2k $
+    $FileInfo: ibbcode.php - Last Update: 05/01/2011 SVN 638 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="ibbcode.php"||$File3Name=="/ibbcode.php") {
@@ -27,6 +27,7 @@ $BoardCharSet = $Settings['charset'];
 function html_decode($matches)
 {
 global $BoardCharSet;
+$matches[1] = str_replace(array("\r", "\r\n", "\n"), " ", $matches[1]);
 return html_entity_decode($matches[1], ENT_QUOTES, $BoardCharSet);
 }
 function do_html_bbcode($text)

diff --git a/inc/replies.php b/inc/replies.php
index 80a1d56..c9f6482 100644 (file)
--- a/inc/replies.php
+++ b/inc/replies.php
@@ -11,7 +11,7 @@
     Copyright 2004-2011 iDB Support - http://idb.berlios.de/
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: replies.php - Last Update: 04/30/2011 SVN 636 - Author: cooldude2k $
+    $FileInfo: replies.php - Last Update: 05/01/2011 SVN 638 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="replies.php"||$File3Name=="/replies.php") {
@@ -277,7 +277,6 @@ $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=sql_result($result,$i,"Post");
-$MyPost = preg_replace("/\<br\>/", "<br />", nl2br($MyPost));
 $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,$SQLStat);
@@ -387,6 +386,7 @@ $eunum = sql_num_rows($euresult); }
 $MyPost = text2icons($MyPost,$Settings['sqltable'],$SQLStat);
 if($User1CanUseBBags1=="yes") { $MyPost = bbcode_parser($MyPost); }
 if($User1CanDoHTML1=="yes") { $MyPost = do_html_bbcode($MyPost); }
+$MyPost = preg_replace("/\<br\>/", "<br />", nl2br($MyPost));
 $MyPost = url2link($MyPost);
 if($MySubPost!=null) { $MyPost = $MyPost."\n".$MySubPost; }
 $User1Signature = preg_replace("/\<br\>/", "<br />", nl2br($User1Signature));

diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 2d5be55..8324f8e 100644 (file)
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2004-2011 iDB Support - http://idb.berlios.de/
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: versioninfo.php - Last Update: 04/30/2011 SVN 637 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 05/01/2011 SVN 638 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") {
@@ -27,8 +27,8 @@ 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] = 3; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 637;
-$SVNDay[0] = 04; $SVNDay[1] = 30; $SVNDay[2] = 2011; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 638;
+$SVNDay[0] = 05; $SVNDay[1] = 01; $SVNDay[2] = 2011; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
 $AltName = "RDB"; $AltName2 = "ReneeDB"; $RName = "iDB"; $SFName = "IntDB";
 $RFullName = "Internet Discussion Boards"; $AltFullName = "Renee Discussion Boards";
 if(!isset($Settings['usealtname'])) { $Settings['usealtname'] = "no"; }