OSDN Git Service

Another small bug fix.
authorKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Wed, 18 Nov 2009 02:24:58 +0000 (02:24 +0000)
committerKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Wed, 18 Nov 2009 02:24:58 +0000 (02:24 +0000)
git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@353 2b68903e-0b30-0410-9a39-a2e4f3c5be39

inc/events.php
inc/lowreplies.php
inc/pm.php
inc/replies.php
inc/rssfeed.php
inc/versioninfo.php

index 914a6d9..8b23556 100644 (file)
@@ -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/14/2009 SVN 347 - Author: cooldude2k $
+    $FileInfo: events.php - Last Update: 11/17/2009 SVN 353 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="events.php"||$File3Name=="/events.php") {
@@ -36,7 +36,7 @@ $EventUser=mysql_result($result,$is,"UserID");
 $EventGuest=mysql_result($result,$is,"GuestName");
 $EventName=mysql_result($result,$is,"EventName");
 $EventText=mysql_result($result,$is,"EventText");
-$EventText = preg_replace("/\<br\>/", "<br />\n", nl2br($EventText));
+$EventText = preg_replace("/\<br\>/", "<br />", nl2br($EventText));
 $EventStart=mysql_result($result,$is,"TimeStamp");
 $EventEnd=mysql_result($result,$is,"TimeStampEnd");
 $EventStart = GMTimeChange("M. j Y",$EventStart,null);
@@ -72,7 +72,7 @@ $GroupNamePrefix=mysql_result($gresult,0,"NamePrefix");
 $GroupNameSuffix=mysql_result($gresult,0,"NameSuffix");
 @mysql_free_result($gresult);
 $User1Signature=mysql_result($reresult,$rei,"Signature");
-$User1Signature = preg_replace("/\<br\>/", "<br />\n", nl2br($User1Signature));
+$User1Signature = preg_replace("/\<br\>/", "<br />", nl2br($User1Signature));
 $User1Avatar=mysql_result($reresult,$rei,"Avatar");
 $User1AvatarSize=mysql_result($reresult,$rei,"AvatarSize");
 if ($User1Avatar=="http://"||$User1Avatar==null||
index 1b2fdcc..9e4a8e2 100644 (file)
@@ -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/14/2009 SVN 347 - Author: cooldude2k $
+    $FileInfo: replies.php - Last Update: 11/17/2009 SVN 353 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="replies.php"||$File3Name=="/replies.php") {
@@ -226,7 +226,7 @@ $MyEditUserID=mysql_result($result,$i,"EditUser");
 $MyEditUserName=mysql_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 = preg_replace("/\<br\>/", "<br />\n", nl2br($MyPost));
+$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);
@@ -331,7 +331,7 @@ $GroupNameSuffix=mysql_result($gresult,0,"NameSuffix");
 @mysql_free_result($gresult); }
 $MyPost = text2icons($MyPost,$Settings['sqltable']);
 if($MySubPost!=null) { $MyPost = $MyPost."\n".$MySubPost; }
-$User1Signature = preg_replace("/\<br\>/", "<br />\n", nl2br($User1Signature));
+$User1Signature = preg_replace("/\<br\>/", "<br />", nl2br($User1Signature));
 $User1Signature = text2icons($User1Signature,$Settings['sqltable']);
 $CanEditReply = false; $CanDeleteReply = false;
 if($_SESSION['UserGroup']!=$Settings['GuestGroup']) {
index 1e49996..5da85ff 100644 (file)
@@ -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/15/2009 SVN 349 - Author: cooldude2k $
+    $FileInfo: pm.php - Last Update: 11/17/2009 SVN 353 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="pm.php"||$File3Name=="/pm.php") {
@@ -430,7 +430,7 @@ $MessageName=mysql_result($result,$is,"MessageTitle");
 $DateSend=mysql_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 = preg_replace("/\<br\>/", "<br />\n", nl2br($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);
@@ -484,7 +484,7 @@ if(isset($GroupNamePrefix)&&$GroupNamePrefix!=null) {
 if(isset($GroupNameSuffix)&&$GroupNameSuffix!=null) {
        $User1Name = $User1Name.$GroupNameSuffix; }
 $MessageText = text2icons($MessageText,$Settings['sqltable']);
-$User1Signature = preg_replace("/\<br\>/", "<br />\n", nl2br($User1Signature));
+$User1Signature = preg_replace("/\<br\>/", "<br />", nl2br($User1Signature));
 $User1Signature = text2icons($User1Signature,$Settings['sqltable']);
 ?>
 <div class="TableInfoMini1Border">
@@ -596,7 +596,7 @@ $result=exec_query($query);
 $num=mysql_num_rows($result);
 $QuoteTitle=mysql_result($result,0,"MessageTitle");
 $MessageText=mysql_result($result,0,"MessageText");
-$QuoteReply = preg_replace("/\<br\>/", "<br />\n", nl2br($MessageText));
+$QuoteReply = preg_replace("/\<br\>/", "<br />", nl2br($MessageText));
 $QuoteDescription=mysql_result($result,0,"Description");
 $result=exec_query($query);
 $num=mysql_num_rows($result);
index 3f31017..6458bf1 100644 (file)
@@ -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/14/2009 SVN 347 - Author: cooldude2k $
+    $FileInfo: replies.php - Last Update: 11/17/2009 SVN 353 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="replies.php"||$File3Name=="/replies.php") {
@@ -263,7 +263,7 @@ $MyEditUserID=mysql_result($result,$i,"EditUser");
 $MyEditUserName=mysql_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 = preg_replace("/\<br\>/", "<br />\n", nl2br($MyPost));
+$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);
@@ -348,7 +348,7 @@ $eunum = mysql_num_rows($euresult); }
        $MySubPost = "<div class=\"EditReply\"><br />This post has been edited by <b>".$EditUserName."</b> on ".$MyEditTime."</div>"; }
 $MyPost = text2icons($MyPost,$Settings['sqltable']);
 if($MySubPost!=null) { $MyPost = $MyPost."\n".$MySubPost; }
-$User1Signature = preg_replace("/\<br\>/", "<br />\n", nl2br($User1Signature));
+$User1Signature = preg_replace("/\<br\>/", "<br />", nl2br($User1Signature));
 $User1Signature = text2icons($User1Signature,$Settings['sqltable']);
 $CanEditReply = false; $CanDeleteReply = false;
 if($_SESSION['UserGroup']!=$Settings['GuestGroup']) {
index 47b6248..aaea1b0 100644 (file)
@@ -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/14/2009 SVN 347 - Author: cooldude2k $
+    $FileInfo: rssfeed.php - Last Update: 11/17/2009 SVN 353 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="rssfeed.php"||$File3Name=="/rssfeed.php") {
@@ -122,7 +122,7 @@ $pquery = query("SELECT * FROM `".$Settings['sqltable']."posts` WHERE `TopicID`=
 $presult=exec_query($pquery);
 $pnum=mysql_num_rows($presult);
 $MyDescription=mysql_result($presult,0,"Post");
-$MyDescription = preg_replace("/\<br\>/", "<br />\n", nl2br($MyDescription));
+$MyDescription = preg_replace("/\<br\>/", "<br />", nl2br($MyDescription));
 $MyDescription= text2icons($MyDescription,$Settings['sqltable']);
 $UsersID=mysql_result($result,$i,"UserID");
 $GuestsName=mysql_result($result,$i,"GuestName");
index 85f1887..71269be 100644 (file)
@@ -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/17/2009 SVN 352 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 11/17/2009 SVN 353 - 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 = 352; $RName = "iDB"; $SFName = "IntDB";
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 353; $RName = "iDB"; $SFName = "IntDB";
 $SVNDay[0] = 11; $SVNDay[1] = 17; $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);