phpbb-checkins Mailing List for phpBB (Page 597)

phpBB is the world's leading open source discussion forum software.

Brought to you by: acydburn, marshalrusty, naderman, noxwizard979

phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com

You can subscribe to this list here.

2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (193)	Nov (393)	Dec (347)
2002	Jan (401)	Feb (232)	Mar (343)	Apr (129)	May (129)	Jun (116)	Jul (189)	Aug (129)	Sep (68)	Oct (172)	Nov (298)	Dec (148)
2003	Jan (264)	Feb (210)	Mar (322)	Apr (309)	May (234)	Jun (188)	Jul (215)	Aug (161)	Sep (234)	Oct (163)	Nov (110)	Dec (7)
2004	Jan (95)	Feb (107)	Mar (55)	Apr (3)	May (49)	Jun (35)	Jul (57)	Aug (43)	Sep (56)	Oct (40)	Nov (25)	Dec (21)
2005	Jan (93)	Feb (25)	Mar (22)	Apr (72)	May (45)	Jun (24)	Jul (29)	Aug (20)	Sep (50)	Oct (93)	Nov (69)	Dec (183)
2006	Jan (185)	Feb (143)	Mar (402)	Apr (260)	May (322)	Jun (367)	Jul (234)	Aug (299)	Sep (206)	Oct (288)	Nov (338)	Dec (307)
2007	Jan (296)	Feb (250)	Mar (261)	Apr (434)	May (539)	Jun (274)	Jul (440)	Aug (190)	Sep (128)	Oct (249)	Nov (86)	Dec (51)
2008	Jan (177)	Feb (67)	Mar (61)	Apr (48)	May (56)	Jun (97)	Jul (60)	Aug (64)	Sep (151)	Oct (79)	Nov (109)	Dec (123)
2009	Jan (70)	Feb (70)	Mar (73)	Apr (80)	May (22)	Jun (193)	Jul (191)	Aug (181)	Sep (120)	Oct (48)	Nov (24)	Dec

Flat | Threaded

<< < 1 .. 595 596 597 598 599 .. 629 > >> (Page 597 of 629)

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/images icon_www_english.gif,NONE,1.1 icon_yim_english.gif,NONE,1.1

From: Paul S. O. <ps...@us...> - 2001-12-21 12:43:35

Update of /cvsroot/phpbb/phpBB2/templates/subSilver/images
In directory usw-pr-cvs1:/tmp/cvs-serv29802/templates/subSilver/images

Added Files:
	icon_www_english.gif icon_yim_english.gif 
Log Message:
More language updates

--- NEW FILE ---
GIF89a;
 Ð,Ú
ô-++ú´pOÀ/0"00pF)PxÈð@À"BòhQÀt´Ð¡
--- NEW FILE ---
GIF89a;
c§À¯>ÃÄ>o(¤3V	H
 &#{
£(Ì¡*©2ÃÇ©%Æì)&¦){ÔÖ4 &Ü¢(rP86 S¨hÀE¤"EñJùp
rW¨
ºæZ(¦Hb6øõÃ,
4Öh£
ä¨ã<öèã:~ðo bäH&)"?

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/images icon_aim_english.gif,NONE,1.1 icon_edit_english.gif,NONE,1.1 icon_email_english.gif,NONE,1.1 icon_icq_add_english.gif,NONE,1.1 icon_ip_english.gif,NONE,1.1 icon_msnm_english.gif,NONE,1.1 icon_pm_english.gif,NONE,1.1 icon_profile_english.gif,NONE,1.1 icon_quote_english.gif,NONE,1.1 icon_search_english.gif,NONE,1.1 post_english.gif,NONE,1.1 reply-locked_english.gif,NONE,1.1 reply_english.gif,NONE,1.1

From: Paul S. O. <ps...@us...> - 2001-12-21 12:42:30

Update of /cvsroot/phpbb/phpBB2/templates/subSilver/images
In directory usw-pr-cvs1:/tmp/cvs-serv29604/templates/subSilver/images

Added Files:
	icon_aim_english.gif icon_edit_english.gif 
	icon_email_english.gif icon_icq_add_english.gif 
	icon_ip_english.gif icon_msnm_english.gif icon_pm_english.gif 
	icon_profile_english.gif icon_quote_english.gif 
	icon_search_english.gif post_english.gif 
	reply-locked_english.gif reply_english.gif 
Log Message:
Add language extension

--- NEW FILE ---
GIF89a;
*®

ypü9±b
ü£ÁãÅXt@@
--- NEW FILE ---
GIF89a;
9fÚ¬Z¯BM¤Re¬øúy<S·«Óí4ç¸|N¯Ï?ÃhµXÐ43k*:$}+ ? &*;;!)/$¬

!eª}#
11Ñ4ö4Ô}$5.náÈ1¥À·'5È5bÀ
HÁp@¼(j
AÆ',0èñC'|`XAdô®|yE´ a½@`À
--- NEW FILE ---
GIF89a;
|ì± Á(ØùÁaÿ4Hvárx`!G&x¨
YÈ|`¦+À¶À\`¨ 1 ÕÇ"°ÐàÆZ-~Ã_Ö±`ô0
--- NEW FILE ---
GIF89a;
*'!§
2	¶¸ m(2
5
$'¶·¸Ôº¼f{}¾+
Ô&&"ÓÕÖó»wÜ'>ÜÒ1bÀ8>Z÷ÃìeCÏÏ¥Lø¸¡ÀÆwXÀ 
--- NEW FILE ---
GIF89a
--- NEW FILE ---
GIF89a;
X@`¡]&dàÁÁA$xñBÀÏ"4HàAA¤<3`.µCT.(4 PUV4$\uªÚmÅªe+²ss°0A4¨(¡CEp;0La
`<B0XÏëCüÈÃg}Ë
Äæ ý
--- NEW FILE ---
GIF89a;
Ë«ÏÎÒëÒ«ÙÌ8»¨ÁZÉhÆâE³/0¼ø#*ØñÙ2vPF¼/
Vd°0#
1Ì°Pcå
"¤øÿ6lP#`2Ô¨
<èÖ`
1 <`@=Ê¢m° bP°ÅU16W(TsÃ!r]PvF?
;@ÄÑ"Ã³:_p ÂìÚ²iÇÆ;33ZÔ aF!XûQ¡Ç° ÇÙÉ\ï
.ÐãPº ¥PîV©å.Ü1Ä)æd"ÉA
--- NEW FILE ---
GIF89a;
-
! ,XQÿ
¸F#qZ¡-`Ä ÐN¨G E
#FÑWÃ¬=° #
--- NEW FILE ---
GIF89a;
Ê´!
	º®(×-¥)¦(,ª+2,
7+7ÃêÆÊñÊ4Ó
øDÈÈ¡
--- NEW FILE ---
GIF89a;
-=  !&&;&¤¤*b=))! ¶¶§1b:	!z"&z44//{:/¶::&:#¤/Ú¹,ÖÖÀ
	9 ±/(z/ó:ó03d<0]dÌ3À"CÁ}8qC=V¼[¶
MaÀ|0Á 2\x
7Äa Ä@`ÀÇ[ zMAÆÊ*À1A0ÈCC^c<(·BZ=Cà°uªò	-4\ÕÜ×)òx 8¯_$»ØÆ×bl]`«¬²¯Û:xh¶ÅfXéBëÊ1~ó&p`b
b@¯!Ü¦0ÎÃXØ: Âø¯ÆÝ:þìõÄo}
AÇ(¦¨¢A
--- NEW FILE ---
GIF89aR
Mn÷ìâ¶Ìk¡¼ðÓ¶YYYæÔÃ÷Í£ôôôÜÜÜ¥®ÈÕÛý7öööæÍ´ØØØøÝÃI¬¶ÐÞb¹|||ø¾Û¨vm555ºÃÈ÷È°ÅÔÝâ¦¶j¨ëÅiiis§þ'ÞÞÞEEEà®}ñ×FÂÔæ/û²jì°vÙaä½`es²úëÞÑüÁ®ÁËX¤L¶ä£d¯ÍÜøµtãÇ¬½Ðöùú»Ïtåëîãíò
c
$M
6bki¢£¤¥¦§¨©ª¦qn@c(j«·¸¹«j¼½m'T`´(ºÇÈª½¼mÍÍÐqwM(Æ¥.ÉÞ¦ËÌÎÑäçnS}]
a¦99*=*9!ß¹áÎÏåÐç
¨mç9uÌ	:T¨³ÁÐÔÿà&JNÓÄiÒ¦Ë7ÍÔt±4¡KhM&psb#Ô`âÉ±°¨QÀfP:Z0ñ£ÀRo°A2¥>ôH@ãÀêá¢Kh¶Q Ìc£ 1fÃ30d°Ý uüØÎöÚÏÔágÉGFXYâdµ÷r¨PyG*À4¹çB`ù 	¨±%øYaF
Ü±
Tø @¤<´MU$Ð¸aBÀ
¦$Ð,EhQÿ@àAÕFà
WÈÂy
--- NEW FILE ---
GIF89aR
l(Õ¢SEñAÕ¸LÊ	LWÒCYP¦TÙ§	¼QãT#²@±.:yÇä
ç\ÔÃ
j"gRA³f<èÐ@À8>¡¸Zµwä,Y2¯Ô[6ÙÐ
 )Y`0Âm ïqÄï$
:ÁàÁëQq,U OOÉ` Q%(ghxlØÿL6©
8`¨
--- NEW FILE ---
GIF89aR
,ºÎÏ¢½¼hÔÔ×
<H3È¤#y#\&\F!Ðé£ÒÓÕØï"òYsLX¤&f×ÈIð¥î»jÖà]ÇPD:®ª¥Ô<fD\K±æNa<P÷°e
øHÓÀAQwLÔÐhr&  )È+ÌkMlC-aJ½s0f°'Åeþ	
gx'Càà
bX 
4àfna`ñT°Ä5d @A
ø`Á\ÑÁÐ`ÁxÐ÷µ
âA 
p¥<ðP>l\°X1D	$HàÀ¬åa®
ð@m8ÑÄ¬¶ÆÛÑÊëÁÄ+A<ôEMä
B-Õ@?üPÄ	@ð\
@$æERp©znA¡ÂNl«z mp¶ßDAè@E[üd
C0p

At@;Mü!3  "|àoáHÇ:ÂQxÌ£÷ÈÇ>ÆÀBð"ð3fB%_ÀÈF:ò¤$'IIG!"?$D

[Phpbb-checkins] CVS: phpBB2 profile.php,1.155,1.156

From: Paul S. O. <ps...@us...> - 2001-12-21 02:22:09

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv12350

Modified Files:
	profile.php 
Log Message:
Admin send/view emails + fix avatar strangeness ... hopefully

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.155
retrieving revision 1.156
diff -C2 -r1.155 -r1.156
*** profile.php	2001/12/16 01:52:10	1.155
--- profile.php	2001/12/21 02:22:07	1.156
***************
*** 259,263 ****
  		}
  
! 		if( !empty($profiledata['user_viewemail']) )
  		{
  			$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL ."=" . $profiledata['user_id']) : "mailto:" . $profiledata['user_email'];
--- 259,263 ----
  		}
  
! 		if( !empty($profiledata['user_viewemail']) || $userdata['user_level'] == ADMIN )
  		{
  			$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL ."=" . $profiledata['user_id']) : "mailto:" . $profiledata['user_email'];
***************
*** 732,736 ****
  				$avatar_sql = ", user_avatar = '', user_avatar_type = " . USER_AVATAR_NONE;
  			}
! 			else if( $board_config['allow_avatar_upload'] && !$error )
  			{
  				//
--- 732,736 ----
  				$avatar_sql = ", user_avatar = '', user_avatar_type = " . USER_AVATAR_NONE;
  			}
! 			else if( ( $user_avatar_loc != "" || !empty($user_avatar_url) ) && $board_config['allow_avatar_upload'] && !$error )
  			{
  				//
***************
*** 748,752 ****
  				}
  
! 				if( $user_avatar_loc != "" && $board_config['allow_avatar_upload'] )
  				{
  					if( file_exists($user_avatar_loc) && ereg(".jpg$|.gif$|.png$", $user_avatar_name) )
--- 748,752 ----
  				}
  
! 				if( $user_avatar_loc != "" )
  				{
  					if( file_exists($user_avatar_loc) && ereg(".jpg$|.gif$|.png$", $user_avatar_name) )
***************
*** 824,828 ****
  					}
  				}
! 				else if( !empty($user_avatar_url) && $board_config['allow_avatar_upload'] )
  				{
  					//
--- 824,828 ----
  					}
  				}
! 				else if( !empty($user_avatar_url) )
  				{
  					//
***************
*** 960,990 ****
  				}
  			}
! 			else if( $board_config['allow_avatar_remote'] && !$error )
  			{
! 				if($user_avatar_remoteurl != "" && $avatar_sql == "")
  				{
! 					if( !preg_match("#^http:\/\/#i", $user_avatar_remoteurl) )
! 					{
! 						$user_avatar_remoteurl = "http://" . $user_avatar_remoteurl;
! 					}
  
! 					if( preg_match("#^http:\/\/[a-z0-9\-]+\.([a-z0-9\-]+\.)?[a-z]+\/.*?\.(gif|jpg|png)$#is", $user_avatar_remoteurl) )
! 					{
! 						$avatar_sql = ", user_avatar = '$user_avatar_remoteurl', user_avatar_type = " . USER_AVATAR_REMOTE;
! 					}
! 					else
! 					{
! 						$error = true;
! 						$error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['Wrong_remote_avatar_format'] : $lang['Wrong_remote_avatar_format'];
! 					}
  				}
! 			}
! 			else if( $board_config['allow_avatar_local'] && !$error )
! 			{
! 				if( $user_avatar_local != "" && $avatar_sql == "" )
  				{
! 					$avatar_sql = ", user_avatar = '$user_avatar_local', user_avatar_type = " . USER_AVATAR_GALLERY;
  				}
  			}
  
  			if( !$error )
--- 960,984 ----
  				}
  			}
! 			else if( $user_avatar_remoteurl != "" && $board_config['allow_avatar_remote'] && $avatar_sql == "" && !$error )
  			{
! 				if( !preg_match("#^http:\/\/#i", $user_avatar_remoteurl) )
  				{
! 					$user_avatar_remoteurl = "http://" . $user_avatar_remoteurl;
! 				}
  
! 				if( preg_match("#^http:\/\/[a-z0-9\-]+\.([a-z0-9\-]+\.)?[a-z]+\/.*?\.(gif|jpg|png)$#is", $user_avatar_remoteurl) )
! 				{
! 					$avatar_sql = ", user_avatar = '$user_avatar_remoteurl', user_avatar_type = " . USER_AVATAR_REMOTE;
  				}
! 				else
  				{
! 					$error = true;
! 					$error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['Wrong_remote_avatar_format'] : $lang['Wrong_remote_avatar_format'];
  				}
  			}
+ 			else if( $user_avatar_local != "" && $board_config['allow_avatar_local'] && $avatar_sql == "" && !$error )
+ 			{
+ 				$avatar_sql = ", user_avatar = '$user_avatar_local', user_avatar_type = " . USER_AVATAR_GALLERY;
+ 			}
  
  			if( !$error )
***************
*** 1339,1343 ****
  				while( $file = @readdir($dir) )
  				{
! 					if( $file != "." && $file != ".." && !is_file($file) && !is_link($file) )
  					{
  						$sub_dir = @opendir($board_config['avatar_gallery_path'] . "/" . $file);
--- 1333,1337 ----
  				while( $file = @readdir($dir) )
  				{
! 					if( $file != "." && $file != ".." && !is_file($board_config['avatar_gallery_path'] . "/" . $file) && !is_link($board_config['avatar_gallery_path'] . "/" . $file) )
  					{
  						$sub_dir = @opendir($board_config['avatar_gallery_path'] . "/" . $file);
***************
*** 1910,1914 ****
  			$user_lang = $row['user_lang'];
  
! 			if( $row['user_viewemail'] )
  			{
  				if( time() - $userdata['user_emailtime'] < $board_config['flood_interval'] )
--- 1904,1908 ----
  			$user_lang = $row['user_lang'];
  
! 			if( $row['user_viewemail'] || $userdata['user_level'] == ADMIN )
  			{
  				if( time() - $userdata['user_emailtime'] < $board_config['flood_interval'] )

[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.157,1.158

From: Paul S. O. <ps...@us...> - 2001-12-21 02:08:58

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv9789

Modified Files:
	viewtopic.php 
Log Message:
Moderator+ viewing of email addresses

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.157
retrieving revision 1.158
diff -C2 -r1.157 -r1.158
*** viewtopic.php	2001/12/20 22:02:38	1.157
--- viewtopic.php	2001/12/21 02:08:56	1.158
***************
*** 755,759 ****
  		{
  			case USER_AVATAR_UPLOAD:
! 				$poster_avatar = ( $board_config['avatar_upload_db'] ) ? "<img src=\"avatar.$phpEx?p=" . $postrow[$i]['post_id'] . "\" alt=\"\" />" : "<img src=\"" . $board_config['avatar_path'] . "/" . $postrow[$i]['user_avatar'] . "\" alt=\"\" border=\"0\" />";
  				break;
  			case USER_AVATAR_REMOTE:
--- 755,759 ----
  		{
  			case USER_AVATAR_UPLOAD:
! 				$poster_avatar = "<img src=\"" . $board_config['avatar_path'] . "/" . $postrow[$i]['user_avatar'] . "\" alt=\"\" border=\"0\" />";
  				break;
  			case USER_AVATAR_REMOTE:
***************
*** 834,838 ****
  	}
  
! 	if($poster_id != ANONYMOUS)
  	{
  		$profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Read_profile'] . "\" title=\"" . $lang['Read_profile'] . "\" border=\"0\" /></a>";
--- 834,838 ----
  	}
  
! 	if( $poster_id != ANONYMOUS )
  	{
  		$profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Read_profile'] . "\" title=\"" . $lang['Read_profile'] . "\" border=\"0\" /></a>";
***************
*** 840,844 ****
  		$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"". $images['icon_pm'] . "\" alt=\"" . $lang['Send_private_message'] . "\" title=\"" . $lang['Send_private_message'] . "\" border=\"0\" /></a>";
  
! 		if( !empty($postrow[$i]['user_viewemail']) )
  		{
  			$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL ."=" . $poster_id) : "mailto:" . $postrow[$i]['user_email'];
--- 840,844 ----
  		$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"". $images['icon_pm'] . "\" alt=\"" . $lang['Send_private_message'] . "\" title=\"" . $lang['Send_private_message'] . "\" border=\"0\" /></a>";
  
! 		if( !empty($postrow[$i]['user_viewemail']) || $is_auth['auth_mod'] )
  		{
  			$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL ."=" . $poster_id) : "mailto:" . $postrow[$i]['user_email'];
***************
*** 878,886 ****
  		}
  
! 		$aim_img = ($postrow[$i]['user_aim']) ? "<a href=\"aim:goim?screenname=" . $postrow[$i]['user_aim'] . "&amp;message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" alt=\"" . $lang['AIM'] . "\" title=\"" . $lang['AIM'] . "\" border=\"0\" /></a>" : "";
  
! 		$msn_img = ($postrow[$i]['user_msnm']) ? "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"" . $images['icon_msnm'] . "\" alt=\"" . $lang['MSNM'] . "\" title=\"" . $lang['MSNM'] . "\" border=\"0\" /></a>" : "";
  
! 		$yim_img = ($postrow[$i]['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $postrow[$i]['user_yim'] . "&amp;.src=pg\"><img src=\"" . $images['icon_yim'] . "\" alt=\"" . $lang['YIM'] . "\" title=\"" . $lang['YIM'] . "\" border=\"0\" /></a>" : "";
  	}
  	else
--- 878,886 ----
  		}
  
! 		$aim_img = ( $postrow[$i]['user_aim'] ) ? "<a href=\"aim:goim?screenname=" . $postrow[$i]['user_aim'] . "&amp;message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" alt=\"" . $lang['AIM'] . "\" title=\"" . $lang['AIM'] . "\" border=\"0\" /></a>" : "";
  
! 		$msn_img = ( $postrow[$i]['user_msnm'] ) ? "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"" . $images['icon_msnm'] . "\" alt=\"" . $lang['MSNM'] . "\" title=\"" . $lang['MSNM'] . "\" border=\"0\" /></a>" : "";
  
! 		$yim_img = ( $postrow[$i]['user_yim'] ) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $postrow[$i]['user_yim'] . "&amp;.src=pg\"><img src=\"" . $images['icon_yim'] . "\" alt=\"" . $lang['YIM'] . "\" title=\"" . $lang['YIM'] . "\" border=\"0\" /></a>" : "";
  	}
  	else

[Phpbb-checkins] CVS: phpBB2 memberlist.php,1.27,1.28

From: Paul S. O. <ps...@us...> - 2001-12-21 02:06:44

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv9359

Modified Files:
	memberlist.php 
Log Message:
Various updates + admin viewing of email addresses

Index: memberlist.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/memberlist.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** memberlist.php	2001/12/04 14:04:03	1.27
--- memberlist.php	2001/12/21 02:06:41	1.28
***************
*** 91,95 ****
  	$order_by = "user_regdate $sort_order LIMIT $start, " . $board_config['topics_per_page'];
  }
! $sql = "SELECT username, user_id, user_viewemail, user_posts, user_regdate, user_from, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_avatar
  	FROM " . USERS_TABLE . "
  	WHERE user_id <> " . ANONYMOUS . "
--- 91,95 ----
  	$order_by = "user_regdate $sort_order LIMIT $start, " . $board_config['topics_per_page'];
  }
! $sql = "SELECT username, user_id, user_viewemail, user_posts, user_regdate, user_from, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_avatar, user_avatar_type, user_allowavatar 
  	FROM " . USERS_TABLE . "
  	WHERE user_id <> " . ANONYMOUS . "
***************
*** 168,183 ****
  	for($i = 0; $i < $selected_members; $i++)
  	{
! 		$username = stripslashes($members[$i]['username']);
  		$user_id = $members[$i]['user_id'];
  
! 		$from = (!empty($members[$i]['user_from'])) ? stripslashes($members[$i]['user_from']) : "&nbsp;";
  
  		$joined = create_date($lang['DATE_FORMAT'], $members[$i]['user_regdate'], $board_config['board_timezone']);
  
! 		$posts = ($members[$i]['user_posts']) ? $members[$i]['user_posts'] : 0;
  
! 		if($members[$i]['user_avatar'] != "" && $user_id != ANONYMOUS)
  		{
! 			$poster_avatar = (strstr("http", $members[$i]['user_avatar']) && $board_config['allow_avatar_remote']) ? "<img src=\"" . $members[$i]['user_avatar'] . "\" alt=\"\" />" : "<img src=\"" . $board_config['avatar_path'] . "/" . $members[$i]['user_avatar'] . "\" alt=\"\" />";
  		}
  		else
--- 168,194 ----
  	for($i = 0; $i < $selected_members; $i++)
  	{
! 		$username = $members[$i]['username'];
  		$user_id = $members[$i]['user_id'];
  
! 		$from = ( !empty($members[$i]['user_from']) ) ? $members[$i]['user_from'] : "&nbsp;";
  
  		$joined = create_date($lang['DATE_FORMAT'], $members[$i]['user_regdate'], $board_config['board_timezone']);
  
! 		$posts = ( $members[$i]['user_posts'] ) ? $members[$i]['user_posts'] : 0;
  
! 		if( $members[$i]['user_avatar_type'] && $user_id != ANONYMOUS && $members[$i]['user_allowavatar'] )
  		{
! 			switch( $postrow[$i]['user_avatar_type'] )
! 			{
! 				case USER_AVATAR_UPLOAD:
! 					$poster_avatar = "<img src=\"" . $board_config['avatar_path'] . "/" . $members[$i]['user_avatar'] . "\" alt=\"\" border=\"0\" />";
! 					break;
! 				case USER_AVATAR_REMOTE:
! 					$poster_avatar = "<img src=\"" . $members[$i]['user_avatar'] . "\" alt=\"\" border=\"0\" />";
! 					break;
! 				case USER_AVATAR_GALLERY:
! 					$poster_avatar = "<img src=\"" . $board_config['avatar_gallery_path'] . "/" . $members[$i]['user_avatar'] . "\" alt=\"\" border=\"0\" />";
! 					break;
! 			}
  		}
  		else
***************
*** 186,190 ****
  		}
  
! 		if( !empty($members[$i]['user_viewemail']) )
  		{
  			$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL ."=" . $members[$i]['user_id']) : "mailto:" . $members[$i]['user_email'];
--- 197,201 ----
  		}
  
! 		if( !empty($members[$i]['user_viewemail']) || $userdata['user_level'] == ADMIN )
  		{
  			$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL ."=" . $members[$i]['user_id']) : "mailto:" . $members[$i]['user_email'];
***************
*** 199,205 ****
  		$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=" . $members[$i]['user_id']) . "\"><img src=\"" . $images['icon_pm'] . "\" border=\"0\" alt=\"" . $lang['Send_private_message'] . "\" /></a>";
  
! 		if($members[$i]['user_website'] != "")
  		{
! 			$www_img = "<a href=\"" . stripslashes($members[$i]['user_website']) . "\" target=\"_userwww\"><img src=\"" . $images['icon_www'] . "\" border=\"0\" alt=\"" . $lang['Visit_website'] . "\" /></a>";
  		}
  		else
--- 210,216 ----
  		$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=" . $members[$i]['user_id']) . "\"><img src=\"" . $images['icon_pm'] . "\" border=\"0\" alt=\"" . $lang['Send_private_message'] . "\" /></a>";
  
! 		if( $members[$i]['user_website'] != "" )
  		{
! 			$www_img = "<a href=\"" . $members[$i]['user_website'] . "\" target=\"_userwww\"><img src=\"" . $images['icon_www'] . "\" border=\"0\" alt=\"" . $lang['Visit_website'] . "\" /></a>";
  		}
  		else
***************
*** 208,212 ****
  		}
  
! 		if($members[$i]['user_icq'])
  		{
  			$icq_status_img = "<a href=\"http://wwp.icq.com/" . $members[$i]['user_icq'] . "#pager\"><img src=\"http://online.mirabilis.com/scripts/online.dll?icq=" . $members[$i]['user_icq'] . "&amp;img=5\" border=\"0\" alt=\"\" /></a>";
--- 219,223 ----
  		}
  
! 		if( $members[$i]['user_icq'] )
  		{
  			$icq_status_img = "<a href=\"http://wwp.icq.com/" . $members[$i]['user_icq'] . "#pager\"><img src=\"http://online.mirabilis.com/scripts/online.dll?icq=" . $members[$i]['user_icq'] . "&amp;img=5\" border=\"0\" alt=\"\" /></a>";
***************
*** 220,233 ****
  		}
  
! 		$aim_img = ($members[$i]['user_aim']) ? "<a href=\"aim:goim?screenname=" . $members[$i]['user_aim'] . "&amp;message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\" alt=\"" . $lang['AIM'] . "\" /></a>" : "&nbsp;";
  
! 		$msn_img = ($members[$i]['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /></a>" : "&nbsp;";
  
! 		$yim_img = ($members[$i]['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $members[$i]['user_yim'] . "&.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\" alt=\"" . $lang['YIM'] . "\" /></a>" : "&nbsp;";
  
  		$search_img = "<a href=\"" . append_sid("search.$phpEx?a=" . urlencode($members[$i]['username']) . "&amp;f=all&amp;b=0&amp;d=DESC&amp;c=100&amp;dosearch=1") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\" alt=\"" . $lang['Search'] . "\" /></a>";
  
! 		$row_color = (!($i % 2)) ? $theme['td_color1'] : $theme['td_color2'];
! 		$row_class = (!($i % 2)) ? $theme['td_class1'] : $theme['td_class2'];
  
  		$template->assign_block_vars("memberrow", array(
--- 231,244 ----
  		}
  
! 		$aim_img = ( $members[$i]['user_aim'] ) ? "<a href=\"aim:goim?screenname=" . $members[$i]['user_aim'] . "&amp;message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\" alt=\"" . $lang['AIM'] . "\" /></a>" : "&nbsp;";
  
! 		$msn_img = ( $members[$i]['user_msnm'] ) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /></a>" : "&nbsp;";
  
! 		$yim_img = ( $members[$i]['user_yim'] ) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $members[$i]['user_yim'] . "&.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\" alt=\"" . $lang['YIM'] . "\" /></a>" : "&nbsp;";
  
  		$search_img = "<a href=\"" . append_sid("search.$phpEx?a=" . urlencode($members[$i]['username']) . "&amp;f=all&amp;b=0&amp;d=DESC&amp;c=100&amp;dosearch=1") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\" alt=\"" . $lang['Search'] . "\" /></a>";
  
! 		$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
! 		$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
  
  		$template->assign_block_vars("memberrow", array(

[Phpbb-checkins] CVS: phpBB2/admin admin_styles.php,1.12,1.13

From: Paul S. O. <ps...@us...> - 2001-12-21 01:43:03

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv4504/admin

Modified Files:
	admin_styles.php 
Log Message:
Fix bug #495579

Index: admin_styles.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_styles.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** admin_styles.php	2001/12/17 10:03:33	1.12
--- admin_styles.php	2001/12/21 01:43:00	1.13
***************
*** 130,134 ****
  				while( $sub_dir = @readdir($dir) )
  				{
! 					if( $sub_dir != "." && $sub_dir != ".." && $sub_dir != "CVS" )
  					{
  						if( @file_exists($phpbb_root_dir . "templates/" . $sub_dir . "/theme_info.cfg") )
--- 130,134 ----
  				while( $sub_dir = @readdir($dir) )
  				{
! 					if( !is_file($phpbb_root_path . 'templates/' .$sub_dir) && !is_link($phpbb_root_path . 'templates/' .$sub_dir) && $sub_dir != "." && $sub_dir != ".." && $sub_dir != "CVS" )
  					{
  						if( @file_exists($phpbb_root_dir . "templates/" . $sub_dir . "/theme_info.cfg") )
***************
*** 545,549 ****
  				while( $file = @readdir($dir) )
  				{	
! 					if($file != "." && $file != ".." && $file != "CVS")
  					{
  						if($file == $selected['template_name'])
--- 545,549 ----
  				while( $file = @readdir($dir) )
  				{	
! 					if( !is_file($phpbb_root_path . 'templates/' . $file) && !is_link($phpbb_root_path . 'templates/' . $file) && $file != "." && $file != ".." && $file != "CVS" )
  					{
  						if($file == $selected['template_name'])
***************
*** 785,789 ****
  				while( $file = @readdir($dir) )
  				{	
! 					if( $file != "." && $file != ".." && $file != "CVS" )
  					{
  						$s_template_select .= '<option value="' . $file . '">' . $file . "</option>\n";
--- 785,789 ----
  				while( $file = @readdir($dir) )
  				{	
! 					if( !is_file($phpbb_root_path . 'templates/' . $file) && !is_link($phpbb_root_path . 'templates/' .$file) && $file != "." && $file != ".." && $file != "CVS" )
  					{
  						$s_template_select .= '<option value="' . $file . '">' . $file . "</option>\n";

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/admin index_body.tpl,1.3,1.4

From: Paul S. O. <ps...@us...> - 2001-12-21 01:29:12

Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv1792/templates/subSilver/admin

Modified Files:
	index_body.tpl 
Log Message:
Minor changes to whosonline stuff

Index: index_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/index_body.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** index_body.tpl	2001/10/14 15:55:50	1.3
--- index_body.tpl	2001/12/21 01:29:09	1.4
***************
*** 48,64 ****
  <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
    <tr> 
! 	<th width="25%" height="25" class="thCornerL">&nbsp;{L_USERNAME}&nbsp;</th>
! 	<th width="25%" height="25" class="thTop">&nbsp;{L_LAST_UPDATE}&nbsp;</th>
! 	<th width="25%" height="25" class="thTop">&nbsp;{L_LOCATION}&nbsp;</th>
! 	<th width="25%" height="25" class="thCornerR">&nbsp;{L_IP_ADDRESS}&nbsp;</th>
    </tr>
!   <!-- BEGIN userrow -->
    <tr> 
! 	<td width="25%" class="{userrow.ROW_CLASS}">&nbsp;<span class="gen"><a href="{userrow.U_USER_PROFILE}">{userrow.USERNAME}</a></span>&nbsp;</td>
! 	<td width="25%" align="center" class="{userrow.ROW_CLASS}">&nbsp;<span class="gen">{userrow.LASTUPDATE}</span>&nbsp;</td>
! 	<td width="25%" class="{userrow.ROW_CLASS}">&nbsp;<span class="gen">{userrow.LOCATION}</span>&nbsp;</td>
! 	<td width="25%" class="{userrow.ROW_CLASS}">&nbsp;<span class="gen">{userrow.IP_ADDRESS}</span>&nbsp;</td>
    </tr>
!   <!-- END userrow -->
  </table>
  
--- 48,78 ----
  <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
    <tr> 
! 	<th width="20%" class="thCornerL" height="25">&nbsp;{L_USERNAME}&nbsp;</th>
! 	<th width="20%" height="25" class="thTop">&nbsp;{L_STARTED}&nbsp;</th>
! 	<th width="20%" class="thTop">&nbsp;{L_LAST_UPDATE}&nbsp;</th>
! 	<th width="20%" class="thCornerR">&nbsp;{L_FORUM_LOCATION}&nbsp;</th>
! 	<th width="20%" height="25" class="thCornerR">&nbsp;{L_IP_ADDRESS}&nbsp;</th>
    </tr>
!   <!-- BEGIN reg_user_row -->
    <tr> 
! 	<td width="20%" class="{reg_user_row.ROW_CLASS}">&nbsp;<span class="gen"><a href="{reg_user_row.U_USER_PROFILE}" class="gen">{reg_user_row.USERNAME}</a></span>&nbsp;</td>
! 	<td width="20%" align="center" class="{reg_user_row.ROW_CLASS}">&nbsp;<span class="gen">{reg_user_row.STARTED}</span>&nbsp;</td>
! 	<td width="20%" align="center" nowrap="nowrap" class="{reg_user_row.ROW_CLASS}">&nbsp;<span class="gen">{reg_user_row.LASTUPDATE}</span>&nbsp;</td>
! 	<td width="20%" class="{reg_user_row.ROW_CLASS}">&nbsp;<span class="gen"><a href="{reg_user_row.U_FORUM_LOCATION}" class="gen">{reg_user_row.FORUM_LOCATION}</a></span>&nbsp;</td>
! 	<td width="20%" class="{reg_user_row.ROW_CLASS}">&nbsp;<span class="gen"><a href="{reg_user_row.U_WHOIS_IP}" class="gen" target="_phpbbwhois">{reg_user_row.IP_ADDRESS}</a></span>&nbsp;</td>
    </tr>
!   <!-- END reg_user_row -->
!   <tr> 
! 	<td colspan="5" height="1" class="row3"><img src="templates/subSilver/images/spacer.gif" width="1" height="1" alt="."></td>
!   </tr>
!   <!-- BEGIN guest_user_row -->
!   <tr> 
! 	<td width="20%" class="{guest_user_row.ROW_CLASS}">&nbsp;<span class="gen">{guest_user_row.USERNAME}</span>&nbsp;</td>
! 	<td width="20%" align="center" class="{guest_user_row.ROW_CLASS}">&nbsp;<span class="gen">{guest_user_row.STARTED}</span>&nbsp;</td>
! 	<td width="20%" align="center" nowrap="nowrap" class="{guest_user_row.ROW_CLASS}">&nbsp;<span class="gen">{guest_user_row.LASTUPDATE}</span>&nbsp;</td>
! 	<td width="20%" class="{guest_user_row.ROW_CLASS}">&nbsp;<span class="gen"><a href="{guest_user_row.U_FORUM_LOCATION}" class="gen">{guest_user_row.FORUM_LOCATION}</a></span>&nbsp;</td>
! 	<td width="20%" class="{guest_user_row.ROW_CLASS}">&nbsp;<span class="gen"><a href="{guest_user_row.U_WHOIS_IP}" target="_phpbbwhois">{guest_user_row.IP_ADDRESS}</a></span>&nbsp;</td>
!   </tr>
!   <!-- END guest_user_row -->
  </table>

[Phpbb-checkins] CVS: phpBB2/admin index.php,1.29,1.30

From: Paul S. O. <ps...@us...> - 2001-12-21 01:29:02

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv1731/admin

Modified Files:
	index.php 
Log Message:
Minor changes to whosonline stuff

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** index.php	2001/12/14 03:12:05	1.29
--- index.php	2001/12/21 01:28:58	1.30
***************
*** 29,33 ****
--- 29,51 ----
  require('pagestart.inc');
  
+ // ---------------
+ // Begin functions
  //
+ function inarray($needle, $haystack)
+ { 
+ 	for($i = 0; $i < sizeof($haystack); $i++ )
+ 	{ 
+ 		if( $haystack[$i] == $needle )
+ 		{ 
+ 			return true; 
+ 		} 
+ 	} 
+ 	return false; 
+ }
+ //
+ // End functions
+ // -------------
+ 
+ //
  // Generate relevant output
  //
***************
*** 288,292 ****
  	// Get users online information.
  	//
! 	$sql = "SELECT u.user_id, u.username, u.user_session_time AS session_time, u.user_session_page AS session_page, session_ip  
  		FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s
  		WHERE s.session_logged_in = " . TRUE . " 
--- 306,310 ----
  	// Get users online information.
  	//
! 	$sql = "SELECT u.user_id, u.username, u.user_session_time, u.user_session_page, s.session_logged_in, s.session_ip, s.session_start 
  		FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s
  		WHERE s.session_logged_in = " . TRUE . " 
***************
*** 294,310 ****
  			AND u.user_id <> " . ANONYMOUS . " 
  			AND u.user_session_time >= " . ( time() - 300 ) . " 
! 		ORDER BY s.session_time DESC";
  	if(!$result = $db->sql_query($sql))
  	{
  		message_die(GENERAL_ERROR, "Couldn't obtain regd user/online information.", "", __LINE__, __FILE__, $sql);
- 	}
- 
- 	$onlinerow = array();
- 	while( $row = $db->sql_fetchrow($result) )
- 	{
- 		$onlinerow[] = $row;
  	}
  
! 	$sql = "SELECT session_user_id AS user_id, session_page, session_logged_in, session_time, session_ip  
  		FROM " . SESSIONS_TABLE . "
  		WHERE session_logged_in = 0
--- 312,323 ----
  			AND u.user_id <> " . ANONYMOUS . " 
  			AND u.user_session_time >= " . ( time() - 300 ) . " 
! 		ORDER BY u.user_session_time DESC";
  	if(!$result = $db->sql_query($sql))
  	{
  		message_die(GENERAL_ERROR, "Couldn't obtain regd user/online information.", "", __LINE__, __FILE__, $sql);
  	}
+ 	$onlinerow_reg = $db->sql_fetchrowset($result);
  
! 	$sql = "SELECT session_page, session_logged_in, session_time, session_ip, session_start   
  		FROM " . SESSIONS_TABLE . "
  		WHERE session_logged_in = 0
***************
*** 315,324 ****
  		message_die(GENERAL_ERROR, "Couldn't obtain guest user/online information.", "", __LINE__, __FILE__, $sql);
  	}
  
- 	while( $row = $db->sql_fetchrow($result) )
- 	{
- 		$onlinerow[] = $row;
- 	}
- 
  	$sql = "SELECT forum_name, forum_id
  		FROM " . FORUMS_TABLE;
--- 328,333 ----
  		message_die(GENERAL_ERROR, "Couldn't obtain guest user/online information.", "", __LINE__, __FILE__, $sql);
  	}
+ 	$onlinerow_guest = $db->sql_fetchrowset($result);
  
  	$sql = "SELECT forum_name, forum_id
  		FROM " . FORUMS_TABLE;
***************
*** 334,421 ****
  		message_die(GENERAL_ERROR, "Couldn't obtain user/online forums information.", "", __LINE__, __FILE__, $sql);
  	}
  
! 	$online_count = count($onlinerow);
! 	if($online_count)
  	{
! 		$count = 0;
  
! 		for($i = 0; $i < $online_count; $i++)
  		{
! 			$username = ( $onlinerow[$i]['user_id'] == ANONYMOUS ) ? $lang['Anonymous'] : $onlinerow[$i]['username'];
  
! 			if( $onlinerow[$i]['session_page'] < 1 )
  			{
! 				switch( $onlinerow[$i]['session_page'] )
  				{
  					case PAGE_INDEX:
  						$location = $lang['Forum_index'];
! 						$location_url = "index.$phpEx";
  						break;
  					case PAGE_POSTING:
  						$location = $lang['Posting_message'];
! 						$location_url = "index.$phpEx";
  						break;
  					case PAGE_LOGIN:
  						$location = $lang['Logging_on'];
! 						$location_url = "index.$phpEx";
  						break;
  					case PAGE_SEARCH:
  						$location = $lang['Searching_forums'];
! 						$location_url = "search.$phpEx";
  						break;
  					case PAGE_PROFILE:
  						$location = $lang['Viewing_profile'];
! 						$location_url = "index.$phpEx";
  						break;
  					case PAGE_VIEWONLINE:
  						$location = $lang['Viewing_online'];
! 						$location_url = "viewonline.$phpEx";
  						break;
  					case PAGE_VIEWMEMBERS:
  						$location = $lang['Viewing_member_list'];
! 						$location_url = "memberlist.$phpEx";
  						break;
  					case PAGE_PRIVMSGS:
  						$location = $lang['Viewing_priv_msgs'];
! 						$location_url = "privmsg.$phpEx";
  						break;
  					case PAGE_FAQ:
  						$location = $lang['Viewing_FAQ'];
! 						$location_url = "faq.$phpEx";
  						break;
  					default:
  						$location = $lang['Forum_index'];
! 						$location_url = "index.$phpEx";
  				}
  			}
  			else
  			{
! 				$location_url = append_sid("admin_forum.$phpEx?" . POST_FORUM_URL . "=" . $onlinerow[$i]['session_page']);
! 				$location = $forum_data[$onlinerow[$i]['session_page']];
  			}
- 
- 			$row_color = ( !($count % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
- 			$row_class = ( !($count % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
  
! 			$count++;
  
! 			$ip_address = decode_ip($onlinerow[$i]['session_ip']);
! 
! 			if( empty($username) )
! 			{
! 				$username = $lang['Guest'];
! 			}
  
! 			$template->assign_block_vars("userrow", array(
  				"ROW_COLOR" => "#" . $row_color,
  				"ROW_CLASS" => $row_class,
! 				"USERNAME" => $username,
! 				"LOGGED_ON" => $logged_on,
! 				"LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow[$i]['session_time'], $board_config['board_timezone']),
! 				"LOCATION" => $location,
! 				"IP_ADDRESS" => $ip_address,
! 				"U_USER_PROFILE" => append_sid("admin_users.$phpEx?" . POST_USERS_URL . "=" . $onlinerow[$i]['user_id'] . "&mode=edit"))
  			);
  		}
  	}
  
--- 343,540 ----
  		message_die(GENERAL_ERROR, "Couldn't obtain user/online forums information.", "", __LINE__, __FILE__, $sql);
  	}
+ 
+ 	$reg_userid_ary = array();
+ 
+ 	if( count($onlinerow_reg) )
+ 	{
+ 		$registered_users = 0;
+ 
+ 		for($i = 0; $i < count($onlinerow_reg); $i++)
+ 		{
+ 			if( !inarray($onlinerow_reg[$i]['user_id'], $reg_userid_ary) )
+ 			{
+ 				$reg_userid_ary[] = $onlinerow_reg[$i]['user_id'];
+ 
+ 				$username = $onlinerow_reg[$i]['username'];
+ 
+ 				if( $onlinerow_reg[$i]['user_allow_viewonline'] || $userdata['user_level'] == ADMIN )
+ 				{
+ 					$registered_users++;
+ 					$hidden = FALSE;
+ 				}
+ 				else
+ 				{
+ 					$hidden_users++;
+ 					$hidden = TRUE;
+ 				}
+ 
+ 				if( $onlinerow_reg[$i]['user_session_page'] < 1 )
+ 				{
+ 					switch($onlinerow_reg[$i]['user_session_page'])
+ 					{
+ 						case PAGE_INDEX:
+ 							$location = $lang['Forum_index'];
+ 							$location_url = "index.$phpEx?pane=right";
+ 							break;
+ 						case PAGE_POSTING:
+ 							$location = $lang['Posting_message'];
+ 							$location_url = "index.$phpEx?pane=right";
+ 							break;
+ 						case PAGE_LOGIN:
+ 							$location = $lang['Logging_on'];
+ 							$location_url = "index.$phpEx?pane=right";
+ 							break;
+ 						case PAGE_SEARCH:
+ 							$location = $lang['Searching_forums'];
+ 							$location_url = "index.$phpEx?pane=right";
+ 							break;
+ 						case PAGE_PROFILE:
+ 							$location = $lang['Viewing_profile'];
+ 							$location_url = "index.$phpEx?pane=right";
+ 							break;
+ 						case PAGE_VIEWONLINE:
+ 							$location = $lang['Viewing_online'];
+ 							$location_url = "index.$phpEx?pane=right";
+ 							break;
+ 						case PAGE_VIEWMEMBERS:
+ 							$location = $lang['Viewing_member_list'];
+ 							$location_url = "index.$phpEx?pane=right";
+ 							break;
+ 						case PAGE_PRIVMSGS:
+ 							$location = $lang['Viewing_priv_msgs'];
+ 							$location_url = "index.$phpEx?pane=right";
+ 							break;
+ 						case PAGE_FAQ:
+ 							$location = $lang['Viewing_FAQ'];
+ 							$location_url = "index.$phpEx?pane=right";
+ 							break;
+ 						default:
+ 							$location = $lang['Forum_index'];
+ 							$location_url = "index.$phpEx?pane=right";
+ 					}
+ 				}
+ 				else
+ 				{
+ 					$location_url = append_sid("admin_forums.$phpEx?mode=editforum&amp;" . POST_FORUM_URL . "=" . $onlinerow_reg[$i]['user_session_page']);
+ 					$location = $forum_data[$onlinerow_reg[$i]['user_session_page']];
+ 				}
+ 
+ 				$row_color = ( $registered_users % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
+ 				$row_class = ( $registered_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
+ 
+ 				$reg_ip = decode_ip($onlinerow_reg[$i]['session_ip']);
+ 
+ 				$template->assign_block_vars("reg_user_row", array(
+ 					"ROW_COLOR" => "#" . $row_color,
+ 					"ROW_CLASS" => $row_class,
+ 					"USERNAME" => $username, 
+ 					"STARTED" => create_date($board_config['default_dateformat'], $onlinerow_reg[$i]['session_start'], $board_config['board_timezone']), 
+ 					"LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_reg[$i]['user_session_time'], $board_config['board_timezone']),
+ 					"FORUM_LOCATION" => $location,
+ 					"IP_ADDRESS" => $reg_ip, 
+ 
+ 					"U_WHOIS_IP" => "http://www.samspade.org/t/ipwhois?a=$reg_ip", 
+ 					"U_USER_PROFILE" => append_sid("admin_users.$phpEx?mode=edit&amp;" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']),
+ 					"U_FORUM_LOCATION" => append_sid($location_url))
+ 				);
+ 			}
+ 		}
+ 
+ 	}
+ 	else
+ 	{
+ 		$template->assign_vars(array(
+ 			"L_NO_REGISTERED_USERS_BROWSING" => $lang['No_users_browsing'])
+ 		);
+ 	}
  
! 	//
! 	// Guest users
! 	//
! 	if( count($onlinerow_guest) )
  	{
! 		$guest_users = 0;
  
! 		for($i = 0; $i < count($onlinerow_guest); $i++)
  		{
! 			$guest_userip_ary[] = $onlinerow_guest[$i]['session_ip'];
! 			$guest_users++;
  
! 			if( $onlinerow_guest[$i]['session_page'] < 1 )
  			{
! 				switch( $onlinerow_guest[$i]['session_page'] )
  				{
  					case PAGE_INDEX:
  						$location = $lang['Forum_index'];
! 						$location_url = "index.$phpEx?pane=right";
  						break;
  					case PAGE_POSTING:
  						$location = $lang['Posting_message'];
! 						$location_url = "index.$phpEx?pane=right";
  						break;
  					case PAGE_LOGIN:
  						$location = $lang['Logging_on'];
! 						$location_url = "index.$phpEx?pane=right";
  						break;
  					case PAGE_SEARCH:
  						$location = $lang['Searching_forums'];
! 						$location_url = "index.$phpEx?pane=right";
  						break;
  					case PAGE_PROFILE:
  						$location = $lang['Viewing_profile'];
! 						$location_url = "index.$phpEx?pane=right";
  						break;
  					case PAGE_VIEWONLINE:
  						$location = $lang['Viewing_online'];
! 						$location_url = "index.$phpEx?pane=right";
  						break;
  					case PAGE_VIEWMEMBERS:
  						$location = $lang['Viewing_member_list'];
! 						$location_url = "index.$phpEx?pane=right";
  						break;
  					case PAGE_PRIVMSGS:
  						$location = $lang['Viewing_priv_msgs'];
! 						$location_url = "index.$phpEx?pane=right";
  						break;
  					case PAGE_FAQ:
  						$location = $lang['Viewing_FAQ'];
! 						$location_url = "index.$phpEx?pane=right";
  						break;
  					default:
  						$location = $lang['Forum_index'];
! 						$location_url = "index.$phpEx?pane=right";
  				}
  			}
  			else
  			{
! 				$location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $onlinerow_guest[$i]['session_page']);
! 				$location = $forum_data[$onlinerow_guest[$i]['session_page']];
  			}
  
! 			$row_color = ( $guest_users % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
! 			$row_class = ( $guest_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
  
! 			$guest_ip = decode_ip($onlinerow_guest[$i]['session_ip']);
  
! 			$template->assign_block_vars("guest_user_row", array(
  				"ROW_COLOR" => "#" . $row_color,
  				"ROW_CLASS" => $row_class,
! 				"USERNAME" => $lang['Guest'],
! 				"STARTED" => create_date($board_config['default_dateformat'], $onlinerow_guest[$i]['session_start'], $board_config['board_timezone']), 
! 				"LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_guest[$i]['session_time'], $board_config['board_timezone']),
! 				"FORUM_LOCATION" => $location,
! 				"IP_ADDRESS" => $guest_ip, 
! 
! 				"U_WHOIS_IP" => "http://www.samspade.org/t/ipwhois?a=$guest_ip", 
! 				"U_FORUM_LOCATION" => append_sid($location_url))
  			);
  		}
+ 
+ 	}
+ 	else
+ 	{
+ 		$template->assign_vars(array(
+ 			"L_NO_GUESTS_BROWSING" => $lang['No_users_browsing'])
+ 		);
  	}

[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.156,1.157

From: Paul S. O. <ps...@us...> - 2001-12-20 22:02:41

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv12070

Modified Files:
	viewtopic.php 
Log Message:
Fix sig bug #495562 and prepare club for next person who says "fix it quick" ... :)

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -r1.156 -r1.157
*** viewtopic.php	2001/12/20 19:00:08	1.156
--- viewtopic.php	2001/12/20 22:02:38	1.157
***************
*** 935,939 ****
  	$bbcode_uid = $postrow[$i]['bbcode_uid'];
  
! 	$user_sig = $postrow[$i]['user_sig'];
  	$user_sig_bbcode_uid = $postrow[$i]['user_sig_bbcode_uid'];
  
--- 935,939 ----
  	$bbcode_uid = $postrow[$i]['bbcode_uid'];
  
! 	$user_sig = ( $postrow[$i]['enable_sig'] && $postrow[$i]['user_sig'] != "" ) ? $postrow[$i]['user_sig'] : "";
  	$user_sig_bbcode_uid = $postrow[$i]['user_sig_bbcode_uid'];
  
***************
*** 950,954 ****
  	if( !$board_config['allow_html'] )
  	{
! 		if( $user_sig != "" && $postrow[$i]['enable_sig'] && $userdata['user_allowhtml'] )
  		{
  			$user_sig = preg_replace("#(<)([\/]?.*?)(>)#is", "&lt;\\2&gt;", $user_sig);
--- 950,954 ----
  	if( !$board_config['allow_html'] )
  	{
! 		if( $user_sig != "" && $userdata['user_allowhtml'] )
  		{
  			$user_sig = preg_replace("#(<)([\/]?.*?)(>)#is", "&lt;\\2&gt;", $user_sig);
***************
*** 966,970 ****
  	if( $board_config['allow_bbcode'] )
  	{
! 		if( $user_sig != "" && $postrow[$i]['enable_sig'] && $user_sig_bbcode_uid != "" )
  		{
  			$user_sig = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($user_sig, $user_sig_bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $user_sig);
--- 966,970 ----
  	if( $board_config['allow_bbcode'] )
  	{
! 		if( $user_sig != "" && $user_sig_bbcode_uid != "" )
  		{
  			$user_sig = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($user_sig, $user_sig_bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $user_sig);
***************
*** 977,982 ****
  	}
  
  	$message = make_clickable($message);
- 	$user_sig = make_clickable($user_sig);
  
  	//
--- 977,985 ----
  	}
  
+ 	if( $user_sig != "" )
+ 	{
+ 		$user_sig = make_clickable($user_sig);
+ 	}
  	$message = make_clickable($message);
  
  	//
***************
*** 993,1003 ****
  	if( count($orig_word) )
  	{
! 		$post_subject = preg_replace($orig_word, $replacement_word, $post_subject);
! 		$message = preg_replace($orig_word, $replacement_word, $message);
! 
! 		if( $user_sig != "" && $postrow[$i]['enable_sig'] )
  		{
  			$user_sig = preg_replace($orig_word, $replacement_word, $user_sig);
  		}
  	}
  
--- 996,1006 ----
  	if( count($orig_word) )
  	{
! 		if( $user_sig != "" )
  		{
  			$user_sig = preg_replace($orig_word, $replacement_word, $user_sig);
  		}
+ 
+ 		$post_subject = preg_replace($orig_word, $replacement_word, $post_subject);
+ 		$message = preg_replace($orig_word, $replacement_word, $message);
  	}
  
***************
*** 1007,1018 ****
  	if( $board_config['allow_smilies'] )
  	{
! 		if( $postrow[$i]['enable_smilies'] )
  		{
! 			$message = smilies_pass($message);
  		}
  
! 		if( $postrow[$i]['user_allowsmile'] && $user_sig != "" && $postrow[$i]['enable_sig'] )
  		{
! 			$user_sig = smilies_pass($user_sig);
  		}
  	}
--- 1010,1021 ----
  	if( $board_config['allow_smilies'] )
  	{
! 		if( $postrow[$i]['user_allowsmile'] && $user_sig != "" )
  		{
! 			$user_sig = smilies_pass($user_sig);
  		}
  
! 		if( $postrow[$i]['enable_smilies'] )
  		{
! 			$message = smilies_pass($message);
  		}
  	}
***************
*** 1022,1031 ****
  	// till recently it wasn't XHTML compliant)
  	//
! 	$message = str_replace("\n", "\n<br />\n", $message);
! 
! 	if( $user_sig != "" && $postrow[$i]['enable_sig'] )
  	{
  		$user_sig = "<br />_________________<br />" . str_replace("\n", "\n<br />", $user_sig);
  	}
  
  	//
--- 1025,1034 ----
  	// till recently it wasn't XHTML compliant)
  	//
! 	if( $user_sig != "" )
  	{
  		$user_sig = "<br />_________________<br />" . str_replace("\n", "\n<br />", $user_sig);
  	}
+ 
+ 	$message = str_replace("\n", "\n<br />\n", $message);
  
  	//

[Phpbb-checkins] CVS: phpBB2 install.php,1.22,1.23

From: Jonathan H. <the...@us...> - 2001-12-20 19:24:33

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv28288

Modified Files:
	install.php 
Log Message:
fix for re-including functions in upgrade-install integration..


Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** install.php	2001/12/16 01:52:52	1.22
--- install.php	2001/12/20 19:24:30	1.23
***************
*** 870,873 ****
--- 870,874 ----
  		if ( $upgrade == 1 && $upgrade_now == $lang['upgrade_submit'] )
  		{
+ 			define('INSTALLING', true);
  			require('upgrade.'.$phpEx);
  			exit;

[Phpbb-checkins] CVS: phpBB2/templates/subSilver viewtopic_body.tpl,1.16,1.17

From: Paul S. O. <ps...@us...> - 2001-12-20 19:00:24

Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv21348/templates/subSilver

Modified Files:
	viewtopic_body.tpl 
Log Message:
Separate sig completely from message

Index: viewtopic_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/viewtopic_body.tpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** viewtopic_body.tpl	2001/12/15 15:57:47	1.16
--- viewtopic_body.tpl	2001/12/20 19:00:22	1.17
***************
*** 46,50 ****
  		</tr>
  		<tr> 
! 		  <td colspan="2"><span class="postbody">{postrow.MESSAGE}</span><span class="gensmall">{postrow.EDITED_MESSAGE}</span></td>
  		</tr>
  	  </table>
--- 46,50 ----
  		</tr>
  		<tr> 
! 		  <td colspan="2"><span class="postbody">{postrow.MESSAGE}{postrow.SIGNATURE}</span><span class="gensmall">{postrow.EDITED_MESSAGE}</span></td>
  		</tr>
  	  </table>

[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.155,1.156

From: Paul S. O. <ps...@us...> - 2001-12-20 19:00:11

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv21270

Modified Files:
	viewtopic.php 
Log Message:
Separate sig completely from message

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.155
retrieving revision 1.156
diff -C2 -r1.155 -r1.156
*** viewtopic.php	2001/12/20 16:58:39	1.155
--- viewtopic.php	2001/12/20 19:00:08	1.156
***************
*** 390,394 ****
  // Go ahead and pull all data for this topic
  //
! $sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, u.user_avatar_type, u.user_allowavatar, p.*,  pt.post_text, pt.post_subject, pt.bbcode_uid
  	FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  	WHERE p.topic_id = $topic_id
--- 390,394 ----
  // Go ahead and pull all data for this topic
  //
! $sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, u.user_avatar_type, u.user_allowavatar, u.user_allowsmile, p.*,  pt.post_text, pt.post_subject, pt.bbcode_uid
  	FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  	WHERE p.topic_id = $topic_id
***************
*** 943,947 ****
  	// output
  	//
- 	$message = make_clickable($message);
  
  	//
--- 943,946 ----
***************
*** 963,991 ****
  
  	//
! 	// Parse signature for BBCode if reqd.
  	//
! 	if( $user_sig != "" && $postrow[$i]['enable_sig'] && $user_sig_bbcode_uid != "" )
  	{
! 		$user_sig = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($user_sig, $user_sig_bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $user_sig);
! 		$user_sig = "<span class=\"signature\">". make_clickable($user_sig). "</span>";
! 	}
! 
! 	//
! 	// Parse message for BBCode if reqd
! 	//
! 	if( $bbcode_uid != "" )
! 	{
! 		$message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
! 	}
  
! 	//
! 	// Append signature
! 	//
! 	if( $postrow[$i]['enable_sig'] && $user_sig != "" )
! 	{
! 		$message .= "<br /><br />_________________<br />" . $user_sig;
  	}
  
  	$message = make_clickable($message);
  
  	//
--- 962,982 ----
  
  	//
! 	// Parse message and/or sig for BBCode if reqd
  	//
! 	if( $board_config['allow_bbcode'] )
  	{
! 		if( $user_sig != "" && $postrow[$i]['enable_sig'] && $user_sig_bbcode_uid != "" )
! 		{
! 			$user_sig = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($user_sig, $user_sig_bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $user_sig);
! 		}
  
! 		if( $bbcode_uid != "" )
! 		{
! 			$message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
! 		}
  	}
  
  	$message = make_clickable($message);
+ 	$user_sig = make_clickable($user_sig);
  
  	//
***************
*** 1004,1007 ****
--- 995,1003 ----
  		$post_subject = preg_replace($orig_word, $replacement_word, $post_subject);
  		$message = preg_replace($orig_word, $replacement_word, $message);
+ 
+ 		if( $user_sig != "" && $postrow[$i]['enable_sig'] )
+ 		{
+ 			$user_sig = preg_replace($orig_word, $replacement_word, $user_sig);
+ 		}
  	}
  
***************
*** 1009,1015 ****
  	// Parse smilies
  	//
! 	if( $board_config['allow_smilies'] && $postrow[$i]['enable_smilies'] )
  	{
! 		$message = smilies_pass($message);
  	}
  
--- 1005,1019 ----
  	// Parse smilies
  	//
! 	if( $board_config['allow_smilies'] )
  	{
! 		if( $postrow[$i]['enable_smilies'] )
! 		{
! 			$message = smilies_pass($message);
! 		}
! 
! 		if( $postrow[$i]['user_allowsmile'] && $user_sig != "" && $postrow[$i]['enable_sig'] )
! 		{
! 			$user_sig = smilies_pass($user_sig);
! 		}
  	}
  
***************
*** 1018,1022 ****
  	// till recently it wasn't XHTML compliant)
  	//
! 	$message = str_replace("\n", "\n<br />", $message);
  
  	//
--- 1022,1031 ----
  	// till recently it wasn't XHTML compliant)
  	//
! 	$message = str_replace("\n", "\n<br />\n", $message);
! 
! 	if( $user_sig != "" && $postrow[$i]['enable_sig'] )
! 	{
! 		$user_sig = "<br />_________________<br />" . str_replace("\n", "\n<br />", $user_sig);
! 	}
  
  	//
***************
*** 1057,1060 ****
--- 1066,1070 ----
  		"POST_SUBJECT" => $post_subject,
  		"MESSAGE" => $message, 
+ 		"SIGNATURE" => $user_sig, 
  		"EDITED_MESSAGE" => $l_edited_by,

[Phpbb-checkins] CVS: phpBB2/templates/subSilver subSilver.css,1.1,1.2

From: Bart v. B. <ba...@us...> - 2001-12-20 16:58:44

Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv18329/templates/subSilver

Modified Files:
	subSilver.css 
Log Message:
Fixed bug #493598 and added SPAN to signature

Index: subSilver.css
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/subSilver.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subSilver.css	2001/12/15 17:35:52	1.1
--- subSilver.css	2001/12/20 16:58:39	1.2
***************
*** 136,140 ****
  		  border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px
  		}
! .signature	{ font-size : 11px; text-decoration : none; line-height : 150%; color : #333366; }
  .editedby	{ font-size : 10px; line-height : 100%; color : #333333; }
  
--- 136,140 ----
  		  border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px
  		}
! .signature	{ font-size : 11px; text-decoration : none; color : #333366; }
  .editedby	{ font-size : 10px; line-height : 100%; color : #333333; }

[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.154,1.155

From: Bart v. B. <ba...@us...> - 2001-12-20 16:58:44

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv18329

Modified Files:
	viewtopic.php 
Log Message:
Fixed bug #493598 and added SPAN to signature

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.154
retrieving revision 1.155
diff -C2 -r1.154 -r1.155
*** viewtopic.php	2001/12/17 03:15:09	1.154
--- viewtopic.php	2001/12/20 16:58:39	1.155
***************
*** 943,946 ****
--- 943,947 ----
  	// output
  	//
+ 	$message = make_clickable($message);
  
  	//
***************
*** 967,970 ****
--- 968,972 ----
  	{
  		$user_sig = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($user_sig, $user_sig_bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $user_sig);
+ 		$user_sig = "<span class=\"signature\">". make_clickable($user_sig). "</span>";
  	}

[Phpbb-checkins] CVS: phpBB2/language/lang_dutch lang_main.php,1.6,1.7

From: Bart v. B. <ba...@us...> - 2001-12-20 15:24:19

Update of /cvsroot/phpbb/phpBB2/language/lang_dutch
In directory usw-pr-cvs1:/tmp/cvs-serv21798

Modified Files:
	lang_main.php 
Log Message:
Extremely minor change; type

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_dutch/lang_main.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** lang_main.php	2001/12/18 20:40:48	1.6
--- lang_main.php	2001/12/20 15:24:15	1.7
***************
*** 531,535 ****
  $lang['Confirm_password'] = "Bevestig wachtwoord";
  $lang['password_if_changed'] = "Geef alleen een wachtwoord op als je het wilt wijzigen";
! $lang['password_confirm_if_changed'] = "Je hoeft alleen je wachtwoord te bevestigen als je het veranderd";
  
  $lang['Avatar'] = "Avatar";
--- 531,535 ----
  $lang['Confirm_password'] = "Bevestig wachtwoord";
  $lang['password_if_changed'] = "Geef alleen een wachtwoord op als je het wilt wijzigen";
! $lang['password_confirm_if_changed'] = "Je hoeft alleen je wachtwoord te bevestigen als je het verandert.";
  
  $lang['Avatar'] = "Avatar";

[Phpbb-checkins] CVS: phpBB2 search.php,1.49,1.50

From: Paul S. O. <ps...@us...> - 2001-12-20 01:25:03

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv27404

Modified Files:
	search.php 
Log Message:
Fix bug #495250 and various other issues

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** search.php	2001/12/20 00:39:22	1.49
--- search.php	2001/12/20 01:25:00	1.50
***************
*** 159,166 ****
  {
  	$return_chars = ( isset($HTTP_POST_VARS['charsreqd']) ) ? intval($HTTP_POST_VARS['charsreqd']) : intval($HTTP_GET_VARS['charsreqd']);
- 	if( $return_chars == "all" )
- 	{
- 		$return_chars = -1;
- 	}
  }
  else
--- 159,162 ----
***************
*** 175,179 ****
  else
  {
! 	$search_cat = "all";
  }
  
--- 171,175 ----
  else
  {
! 	$search_cat = -1;
  }
  
***************
*** 184,188 ****
  else
  {
! 	$search_forum = "all";
  }
  
--- 180,184 ----
  else
  {
! 	$search_forum = -1;
  }
  
***************
*** 216,220 ****
  if(!empty($HTTP_POST_VARS['resultdays']) )
  {
! 	$search_time = time() - ( $HTTP_POST_VARS['resultdays'] * 86400 );
  }
  else
--- 212,216 ----
  if(!empty($HTTP_POST_VARS['resultdays']) )
  {
! 	$search_time = time() - ( intval($HTTP_POST_VARS['resultdays']) * 86400 );
  }
  else
***************
*** 223,227 ****
  }
  
! $start = ( isset($HTTP_GET_VARS['start']) ) ? $HTTP_GET_VARS['start'] : 0;
  
  //
--- 219,223 ----
  }
  
! $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
  
  //
***************
*** 277,280 ****
--- 273,280 ----
  				message_die(GENERAL_MESSAGE, $lang['No_search_match']);
  			}
+ 
+ 			$show_results = "topics";
+ 			$sortby = 0;
+ 			$sortby_dir = "DESC";
  		}
  		else if( $search_id == "egosearch" )
***************
*** 284,287 ****
--- 284,291 ----
  				WHERE poster_id = " . $userdata['user_id'] . " 
  				ORDER BY post_time DESC";
+ 
+ 			$show_results = "topics";
+ 			$sortby = 0;
+ 			$sortby_dir = "DESC";
  		}
  		else
***************
*** 316,319 ****
--- 320,324 ----
  				ORDER BY post_time DESC";
  		}
+ 
  		$result = $db->sql_query($sql); 
  		if( !$result )
***************
*** 336,360 ****
  		if( $sql_post_id_in != "" )
  		{
! 			$sql = "SELECT topic_id 
! 				FROM " . POSTS_TABLE . " 
! 				WHERE post_id IN ($sql_post_id_in) 
! 				GROUP BY topic_id";
! 			$result = $db->sql_query($sql); 
! 			if( !$result )
  			{
! 				message_die(GENERAL_ERROR, "Couldn't matched posts", "", __LINE__, __FILE__, $sql);
! 			}
  
! 			$sql_post_id_in = "";
! 			while( $row = $db->sql_fetchrow($result) )
! 			{
! 				if( $sql_post_id_in != "" )
  				{
! 					$sql_post_id_in .= ", ";
  				}
- 				$sql_post_id_in .= $row['topic_id'];
  			}
  
! 			$search_sql .= "t.topic_id IN ($sql_post_id_in) ";
  		}
  		else
--- 341,384 ----
  		if( $sql_post_id_in != "" )
  		{
! 			if( $show_results == "posts" )
  			{
! 				$search_sql .= "p.post_id IN ($sql_post_id_in)";
  
! 				if( $search_time )
  				{
! 					$search_sql .= " AND p.post_time >= $search_time ";
  				}
  			}
+ 			else
+ 			{
+ 				$search_time_sql = "";
+ 				if( $search_time )
+ 				{
+ 					$search_time_sql = "AND post_time >= $search_time";
+ 				}
  
! 				$sql = "SELECT topic_id 
! 					FROM " . POSTS_TABLE . " 
! 					WHERE post_id IN ($sql_post_id_in) 
! 						$search_time_sql 
! 					GROUP BY topic_id";
! 				$result = $db->sql_query($sql); 
! 				if( !$result )
! 				{
! 					message_die(GENERAL_ERROR, "Couldn't matched posts", "", __LINE__, __FILE__, $sql);
! 				}
! 
! 				$sql_post_id_in = "";
! 				while( $row = $db->sql_fetchrow($result) )
! 				{
! 					if( $sql_post_id_in != "" )
! 					{
! 						$sql_post_id_in .= ", ";
! 					}
! 					$sql_post_id_in .= $row['topic_id'];
! 				}
! 
! 				$search_sql .= "t.topic_id IN ($sql_post_id_in) ";
! 			}
  		}
  		else
***************
*** 362,370 ****
  			message_die(GENERAL_MESSAGE, $lang['No_search_match']);
  		}
- 
- 		$show_results = "topics";
- 		$sortby = 0;
- 		$sortby_dir = "DESC";
- 
  	}
  	else if( $search_id == "unanswered" )
--- 386,389 ----
***************
*** 550,576 ****
  
  				$search_sql .= "t.topic_id IN ($sql_post_id_in) ";
- /*
- 						if( $query_author == "" )
- 						{
- 							$search_sql .= "t.topic_id IN ( 
- 								SELECT topic_id 
- 								FROM " . POSTS_TABLE . " 
- 								WHERE post_id IN ($sql_post_id_in) 
- 									$search_time_sql
- 								GROUP BY topic_id )";
- 						}
- 						else
- 						{
- 							$search_sql .= "t.topic_id IN ( 
- 								SELECT p.topic_id 
- 								FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u 
- 								WHERE p.post_id IN ($sql_post_id_in) 
- 									AND u.username LIKE '$query_author' 
- 									AND p.poster_id = u.user_id 
- 									$search_time_sql
- 								GROUP BY p.topic_id )";
- 						}
- */
- 
  			}		
  		}
--- 569,572 ----
***************
*** 605,609 ****
  	//
  	$auth_sql = "";
! 	if( $search_forum != "all" )
  	{
  		$is_auth = auth(AUTH_READ, $search_forum, $userdata);
--- 601,605 ----
  	//
  	$auth_sql = "";
! 	if( $search_forum != -1 )
  	{
  		$is_auth = auth(AUTH_READ, $search_forum, $userdata);
***************
*** 622,626 ****
  		$is_auth_ary = auth(AUTH_READ, AUTH_LIST_ALL, $userdata); 
  
! 		if( $search_cat != "all" )
  		{
  			$auth_sql = "f.cat_id = $search_cat";
--- 618,622 ----
  		$is_auth_ary = auth(AUTH_READ, AUTH_LIST_ALL, $userdata); 
  
! 		if( $search_cat != -1 )
  		{
  			$auth_sql = "f.cat_id = $search_cat";
***************
*** 908,912 ****
  			if( $showresults == "posts" )
  			{
! 				if( $return_chars )
  				{
  					$bbcode_uid = $searchset[$i]['bbcode_uid'];
--- 904,908 ----
  			if( $showresults == "posts" )
  			{
! 				if( isset($return_chars) )
  				{
  					$bbcode_uid = $searchset[$i]['bbcode_uid'];
***************
*** 1240,1244 ****
  	ORDER BY c.cat_id, f.forum_order";
  $result = $db->sql_query($sql);
! if(!$result)
  {
  	message_die(GENERAL_ERROR, "Couldn't obtain forum_name/forum_id", "", __LINE__, __FILE__, $sql);
--- 1236,1240 ----
  	ORDER BY c.cat_id, f.forum_order";
  $result = $db->sql_query($sql);
! if( !$result )
  {
  	message_die(GENERAL_ERROR, "Couldn't obtain forum_name/forum_id", "", __LINE__, __FILE__, $sql);
***************
*** 1248,1252 ****
  
  $s_forums = "";
! while($row = $db->sql_fetchrow($result))
  {
  	if( $is_auth_ary[$row['forum_id']]['auth_read'] )
--- 1244,1248 ----
  
  $s_forums = "";
! while( $row = $db->sql_fetchrow($result) )
  {
  	if( $is_auth_ary[$row['forum_id']]['auth_read'] )
***************
*** 1262,1271 ****
  if( $s_forums != "" )
  {
! 	$s_forums = "<option value=\"all\">" . $lang['All_available'] . "</option>" . $s_forums;
  
  	//
  	// Category to search
  	//
! 	$s_categories = "<option value=\"all\">" . $lang['All_available'] . "</option>";
  	while( list($cat_id, $cat_title) = @each($list_cat))
  	{
--- 1258,1267 ----
  if( $s_forums != "" )
  {
! 	$s_forums = "<option value=\"-1\">" . $lang['All_available'] . "</option>" . $s_forums;
  
  	//
  	// Category to search
  	//
! 	$s_categories = "<option value=\"-1\">" . $lang['All_available'] . "</option>";
  	while( list($cat_id, $cat_title) = @each($list_cat))
  	{
***************
*** 1281,1285 ****
  // Number of chars returned
  //
! $s_characters = "<option value=\"all\">" . $lang['All_available'] . "</option>";
  $s_characters .= "<option value=\"0\">0</option>";
  $s_characters .= "<option value=\"25\">25</option>";
--- 1277,1281 ----
  // Number of chars returned
  //
! $s_characters = "<option value=\"-1\">" . $lang['All_available'] . "</option>";
  $s_characters .= "<option value=\"0\">0</option>";
  $s_characters .= "<option value=\"25\">25</option>";
***************
*** 1288,1292 ****
  for($i = 100; $i < 1100 ; $i += 100)
  {
! 	$selected = ($i == 200) ? "selected=\"selected\"" : "";
  	$s_characters .= "<option value=\"$i\"$selected>$i</option>";
  }
--- 1284,1288 ----
  for($i = 100; $i < 1100 ; $i += 100)
  {
! 	$selected = ( $i == 200 ) ? "selected=\"selected\"" : "";
  	$s_characters .= "<option value=\"$i\"$selected>$i</option>";
  }
***************
*** 1310,1314 ****
  for($i = 0; $i < count($previous_days); $i++)
  {
! 	$selected = ($topic_days == $previous_days[$i]) ? " selected=\"selected\"" : "";
  	$s_time .= "<option value=\"" . $previous_days[$i] . "\"$selected>" . $previous_days_text[$i] . "</option>";
  }
--- 1306,1310 ----
  for($i = 0; $i < count($previous_days); $i++)
  {
! 	$selected = ( $topic_days == $previous_days[$i] ) ? " selected=\"selected\"" : "";
  	$s_time .= "<option value=\"" . $previous_days[$i] . "\"$selected>" . $previous_days_text[$i] . "</option>";
  }

[Phpbb-checkins] CVS: phpBB2/templates/subSilver posting_body.tpl,1.15,1.16

From: Paul S. O. <ps...@us...> - 2001-12-20 00:47:19

Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv14835/templates/subSilver

Modified Files:
	posting_body.tpl 
Log Message:
maxlength of username and subject fields changed to match schema + private messaging boxes added

Index: posting_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/posting_body.tpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** posting_body.tpl	2001/12/17 00:06:13	1.15
--- posting_body.tpl	2001/12/20 00:47:16	1.16
***************
*** 203,206 ****
--- 203,230 ----
  //-->
  </script>
+ 
+ <!-- BEGIN privmsg_extensions -->
+ <table border="0" cellspacing="0" cellpadding="0" align="center" width="100%">
+   <tr> 
+ 	<td valign="top" align="center" width="100%"> 
+ 	  <table height="40" cellspacing="2" cellpadding="2" border="0">
+ 		<tr valign="middle"> 
+ 		  <td>{INBOX_IMG}</td>
+ 		  <td><span class="cattitle">{INBOX_LINK}&nbsp;&nbsp;</span></td>
+ 		  <td>{SENTBOX_IMG}</td>
+ 		  <td><span class="cattitle">{SENTBOX_LINK}&nbsp;&nbsp;</span></td>
+ 		  <td>{OUTBOX_IMG}</td>
+ 		  <td><span class="cattitle">{OUTBOX_LINK}&nbsp;&nbsp;</span></td>
+ 		  <td>{SAVEBOX_IMG}</td>
+ 		  <td><span class="cattitle">{SAVEBOX_LINK}&nbsp;&nbsp;</span></td>
+ 		</tr>
+ 	  </table>
+ 	</td>
+   </tr>
+ </table>
+ 
+ <br clear="all" />
+ <!-- END privmsg_extensions -->
+ 
  <form action="{S_POST_ACTION}" method="post" name="post" onSubmit="return checkForm(this)">
  
***************
*** 232,236 ****
  	  <td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td>
  	  <td class="row2"><span class="genmed"> 
! 		<input type="text"  class="post" name="username" maxlength="50" size="20" tabindex="1" value="{USERNAME}" />
  		&nbsp; 
  		<input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" />
--- 256,260 ----
  	  <td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td>
  	  <td class="row2"><span class="genmed"> 
! 		<input type="text"  class="post" name="username" maxlength="25" size="25" tabindex="1" value="{USERNAME}" />
  		&nbsp; 
  		<input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" />
***************
*** 241,245 ****
  	  <td class="row1" width="22%"><span class="gen"><b>{L_SUBJECT}</b></span></td>
  	  <td class="row2" width="78%"> <span class="gen"> 
! 		<input type="text" name="subject" size="45" maxlength="100" style="width:450px" tabindex="2" class="post" value="{SUBJECT}" />
  		</span> </td>
  	</tr>
--- 265,269 ----
  	  <td class="row1" width="22%"><span class="gen"><b>{L_SUBJECT}</b></span></td>
  	  <td class="row2" width="78%"> <span class="gen"> 
! 		<input type="text" name="subject" size="45" maxlength="60" style="width:450px" tabindex="2" class="post" value="{SUBJECT}" />
  		</span> </td>
  	</tr>

[Phpbb-checkins] CVS: phpBB2/db/schemas mssql_schema.sql,1.15,1.16 mysql_schema.sql,1.10,1.11 postgres_schema.sql,1.12,1.13

From: Paul S. O. <ps...@us...> - 2001-12-20 00:45:44

Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv14424/db/schemas

Modified Files:
	mssql_schema.sql mysql_schema.sql postgres_schema.sql 
Log Message:
Minor updates to post_username, post_subject and topic_title field lengths

Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** mssql_schema.sql	2001/12/19 23:12:22	1.15
--- mssql_schema.sql	2001/12/20 00:45:41	1.16
***************
*** 106,110 ****
  	[post_time] [int] NOT NULL ,
  	[poster_ip] [char] (8) NULL ,
! 	[post_username] [varchar] (50) NULL ,
  	[enable_bbcode] [smallint] NULL ,
  	[enable_html] [smallint] NULL ,
--- 106,110 ----
  	[post_time] [int] NOT NULL ,
  	[poster_ip] [char] (8) NULL ,
! 	[post_username] [char] (25) NULL ,
  	[enable_bbcode] [smallint] NULL ,
  	[enable_html] [smallint] NULL ,
***************
*** 119,123 ****
  	[post_id] [int] NOT NULL ,
  	[bbcode_uid] [char] (10) NULL ,
! 	[post_subject] [varchar] (100) NULL ,
  	[post_text] [text] NULL 
  ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
--- 119,123 ----
  	[post_id] [int] NOT NULL ,
  	[bbcode_uid] [char] (10) NULL ,
! 	[post_subject] [char] (60) NULL ,
  	[post_text] [text] NULL 
  ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
***************
*** 281,285 ****
  	[topic_id] [int] IDENTITY (1, 1) NOT NULL ,
  	[forum_id] [int] NOT NULL ,
! 	[topic_title] [varchar] (100) NOT NULL ,
  	[topic_poster] [int] NOT NULL ,
  	[topic_time] [int] NOT NULL ,
--- 281,285 ----
  	[topic_id] [int] IDENTITY (1, 1) NOT NULL ,
  	[forum_id] [int] NOT NULL ,
! 	[topic_title] [varchar] (60) NOT NULL ,
  	[topic_poster] [int] NOT NULL ,
  	[topic_time] [int] NOT NULL ,

Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_schema.sql,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** mysql_schema.sql	2001/12/15 16:40:35	1.10
--- mysql_schema.sql	2001/12/20 00:45:41	1.11
***************
*** 162,166 ****
     post_time int(11) DEFAULT '0' NOT NULL,
     poster_ip char(8) NOT NULL, 
!    post_username varchar(30), 
     enable_bbcode tinyint(1) DEFAULT '1' NOT NULL,
     enable_html tinyint(1) DEFAULT '0' NOT NULL,
--- 162,166 ----
     post_time int(11) DEFAULT '0' NOT NULL,
     poster_ip char(8) NOT NULL, 
!    post_username varchar(25), 
     enable_bbcode tinyint(1) DEFAULT '1' NOT NULL,
     enable_html tinyint(1) DEFAULT '0' NOT NULL,
***************
*** 184,188 ****
     post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
     bbcode_uid char(10) NOT NULL,
!    post_subject varchar(255),
     post_text text,
     PRIMARY KEY (post_id)
--- 184,188 ----
     post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
     bbcode_uid char(10) NOT NULL,
!    post_subject char(60),
     post_text text,
     PRIMARY KEY (post_id)

Index: postgres_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_schema.sql,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** postgres_schema.sql	2001/12/18 16:38:18	1.12
--- postgres_schema.sql	2001/12/20 00:45:41	1.13
***************
*** 160,164 ****
     poster_id int4 DEFAULT '0' NOT NULL,
     post_time int4 DEFAULT '0' NOT NULL,
!    post_username varchar(30),
     poster_ip char(8) DEFAULT '' NOT NULL,
     enable_bbcode int2 DEFAULT '1' NOT NULL,
--- 160,164 ----
     poster_id int4 DEFAULT '0' NOT NULL,
     post_time int4 DEFAULT '0' NOT NULL,
!    post_username varchar(25),
     poster_ip char(8) DEFAULT '' NOT NULL,
     enable_bbcode int2 DEFAULT '1' NOT NULL,
***************
*** 182,186 ****
     post_id int4 DEFAULT '0' NOT NULL,
     bbcode_uid varchar(10) DEFAULT '' NOT NULL,
!    post_subject varchar(255),
     post_text text,
     CONSTRAINT phpbb_posts_text_pkey PRIMARY KEY (post_id)
--- 182,186 ----
     post_id int4 DEFAULT '0' NOT NULL,
     bbcode_uid varchar(10) DEFAULT '' NOT NULL,
!    post_subject varchar(60),
     post_text text,
     CONSTRAINT phpbb_posts_text_pkey PRIMARY KEY (post_id)
***************
*** 394,398 ****
     topic_id int4 DEFAULT nextval('phpbb_topics_id_seq'::text) NOT NULL,
     forum_id int4 DEFAULT '0' NOT NULL,
!    topic_title varchar(100) DEFAULT '' NOT NULL,
     topic_poster int4 DEFAULT '0' NOT NULL,
     topic_time int4 DEFAULT '0' NOT NULL,
--- 394,398 ----
     topic_id int4 DEFAULT nextval('phpbb_topics_id_seq'::text) NOT NULL,
     forum_id int4 DEFAULT '0' NOT NULL,
!    topic_title varchar(60) DEFAULT '' NOT NULL,
     topic_poster int4 DEFAULT '0' NOT NULL,
     topic_time int4 DEFAULT '0' NOT NULL,

[Phpbb-checkins] CVS: phpBB2 search.php,1.48,1.49

From: Paul S. O. <ps...@us...> - 2001-12-20 00:39:25

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv13052

Modified Files:
	search.php 
Log Message:
Fix bug #495130 and remove unnecessary free_result

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** search.php	2001/12/19 17:15:08	1.48
--- search.php	2001/12/20 00:39:22	1.49
***************
*** 745,751 ****
  				}
  			}
- 
- 			$db->sql_freeresult($result);
- 		
  		}
  		else
--- 745,748 ----
***************
*** 1051,1055 ****
  
  					$times = 1;
! 					for($j = 0; $j < $replies + 1; $j += $board_config['topics_per_page'])
  					{
  						$base_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id . "&amp;start=$j&amp;highlight=$highlight_active");
--- 1048,1052 ----
  
  					$times = 1;
! 					for($j = 0; $j < $replies + 1; $j += $board_config['posts_per_page'])
  					{
  						$base_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id . "&amp;start=$j&amp;highlight=$highlight_active");

[Phpbb-checkins] CVS: phpBB2/db mssql.php,1.18,1.19

From: Paul S. O. <ps...@us...> - 2001-12-20 00:12:45

Update of /cvsroot/phpbb/phpBB2/db
In directory usw-pr-cvs1:/tmp/cvs-serv4211/db

Modified Files:
	mssql.php 
Log Message:
Various updates

Index: mssql.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mssql.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** mssql.php	2001/11/20 22:34:50	1.18
--- mssql.php	2001/12/20 00:12:42	1.19
***************
*** 29,43 ****
  
  	var $db_connect_id;
! 	var $query_result;
! 	var $in_transaction = 0;
! 	var $transaction_name;
! 	var $query_limit_offset;
! 	var $query_limit_numrows;
! 	var $query_limit_success;
  	var $next_id;
  	var $row;
! 	var $num_queries = 0;
  
! 	var $query_array = array();
  
  	//
--- 29,42 ----
  
  	var $db_connect_id;
! 	var $result;
! 
  	var $next_id;
+ 	var $in_transaction = 0;
+ 
  	var $row;
! 	var $limit_offset;
! 	var $query_limit_success;
  
! 	var $num_queries = 0;
  
  	//
***************
*** 46,50 ****
  	function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true)
  	{
- 
  		$this->persistency = $persistency;
  		$this->user = $sqluser;
--- 45,48 ----
***************
*** 53,77 ****
  		$this->dbname = $database;
  
! 		if($this->persistency)
! 		{
! 			$this->db_connect_id = @mssql_pconnect($this->server, $this->user, $this->password);
! 		}
! 		else
! 		{
! 			$this->db_connect_id = @mssql_connect($this->server, $this->user, $this->password);
! 		}
  
! 		if($this->db_connect_id)
  		{
! 			if($this->dbname != "")
  			{
! 				$dbselect = @mssql_select_db($this->dbname, $this->db_connect_id);
! 				if(!$dbselect)
! 				{
! 					@mssql_close($this->db_connect_id);
! 					return false;
! 				}
  			}
  		}
  		return $this->db_connect_id;
  	}
--- 51,65 ----
  		$this->dbname = $database;
  
! 		$this->db_connect_id = ( $this->persistency ) ? mssql_pconnect($this->server, $this->user, $this->password) : mssql_connect($this->server, $this->user, $this->password);
  
! 		if( $this->db_connect_id && $this->dbname != "" )
  		{
! 			if( !mssql_select_db($this->dbname, $this->db_connect_id) )
  			{
! 				mssql_close($this->db_connect_id);
! 				return false;
  			}
  		}
+ 
  		return $this->db_connect_id;
  	}
***************
*** 91,96 ****
  				@mssql_query("COMMIT", $this->db_connect_id);
  			}
! 			$result = @mssql_close($this->db_connect_id);
! 			return $result;
  		}
  		else
--- 79,84 ----
  				@mssql_query("COMMIT", $this->db_connect_id);
  			}
! 
! 			return @mssql_close($this->db_connect_id);
  		}
  		else
***************
*** 109,122 ****
  		// Remove any pre-existing queries
  		//
! 		unset($this->query_result);
  		unset($this->row);
  
! 		if($query != "")
  		{
  			$this->num_queries++;
  			if($transaction == BEGIN_TRANSACTION)
  			{
! 				$result = @mssql_query("BEGIN TRANSACTION", $this->db_connect_id);
! 				if(!$result)
  				{
  					return false;
--- 97,110 ----
  		// Remove any pre-existing queries
  		//
! 		unset($this->result);
  		unset($this->row);
  
! 		if( $query != "" )
  		{
  			$this->num_queries++;
+ 
  			if($transaction == BEGIN_TRANSACTION)
  			{
! 				if( !mssql_query("BEGIN TRANSACTION", $this->db_connect_id) )
  				{
  					return false;
***************
*** 137,255 ****
  			// ... needs checking under Windows itself.
  			//
! 			if( preg_match("/^SELECT.*?LIMIT/is", $query) )
  			{
- 				preg_match("/^SELECT(.*)LIMIT ([0-9]+)[, ]*([0-9]+)*$/s", $query, $limits);
- 
  				$query = $limits[1];
- 				if($limits[3])
- 				{
- 					$row_offset = $limits[2];
- 					$num_rows = $limits[3];
- 				}
- 				else
- 				{
- 					$row_offset = 0;
- 					$num_rows = $limits[2];
- 				}
  
! 				$query = "SELECT TOP " . ($row_offset + $num_rows) . $query;
! 
! //				@mssql_query("SET ROWCOUNT ".($row_offset + $num_rows));
! 				$this->query_result = @mssql_query($query, $this->db_connect_id);
! //				@mssql_query("SET ROWCOUNT 0");
  
! 				$this->query_limit_success[$this->query_result] = true;
  
! 				$this->query_limit_offset[$this->query_result] = -1;
! 				$this->query_limit_numrows[$this->query_result] = $num_rows;
  
! 				if($this->query_result && $row_offset > 0)
  				{
! 					$result = @mssql_data_seek($this->query_result, $row_offset);
! 					if(!$result)
  					{
! 						$this->query_limit_success[$query_id] = false;
  					}
- 					$this->query_limit_offset[$this->query_result] = $row_offset;
  				}
  			}
! 			else if(eregi("^INSERT ", $query))
  			{
! 				$query = preg_replace("/\\\'/s", "''", $query);
! 
! 				$this->query_result = @mssql_query($query, $this->db_connect_id);
! 
! 				if($this->query_result)
! 				{
! 					$next_id_query = @mssql_query("SELECT @@IDENTITY AS this_id");
! 					$this->next_id[$this->query_result] = $this->sql_fetchfield("this_id", -1, $next_id_query);
! 				}
! 				else
  				{
! 					if($this->in_transaction)
  					{
! 						@mssql_query("ROLLBACK", $this->db_connect_id);
! 						$this->in_transaction = FALSE;
  					}
- 					return false;
  				}
- 
- 				$this->query_limit_offset[$this->query_result] = -1;
- 				$this->query_limit_numrows[$this->query_result] = -1;
  			}
  			else
  			{
! 				if(eregi("SELECT", $query))
  				{
! 					$this->query_result = @mssql_query($query, $this->db_connect_id);
! 				}
! 				else
! 				{
! 					$query = preg_replace("/\\\'/s", "''", $query);
  
! 					$this->query_result = @mssql_query($query, $this->db_connect_id);
! 					if($this->query_result)
  					{
! 						$this->query_result = uniqid(rand());
  					}
  				}
! 
! 				if($this->query_result)
! 				{
! 					$affected_query = @mssql_query("SELECT @@ROWCOUNT AS this_count");
! 
! 					$this->affected_rows[$this->query_result] = $this->sql_fetchfield("this_count", -1, $affected_query);
  
! 					$this->query_limit_offset[$this->query_result] = -1;
! 					$this->query_limit_numrows[$this->query_result] = -1;
! 				}
! 				else
  				{
! 					if($this->in_transaction)
! 					{
! 						@mssql_query("ROLLBACK", $this->db_connect_id);
! 						$this->in_transaction = FALSE;
! 					}
! 					return false;
  				}
- 			}
  
! 			if($transaction == END_TRANSACTION && $this->in_transaction)
! 			{
! 				$result = @mssql_query("COMMIT", $this->db_connect_id);
! 				$this->in_transaction = FALSE;
  			}
  
! 			return $this->query_result;
! 		}
! 		else
! 		{
! 			if($transaction == END_TRANSACTION)
  			{
! 				$result = @mssql_query("COMMIT", $this->db_connect_id);
  				$this->in_transaction = FALSE;
  			}
  
! 			return false;
  		}
  	}
--- 125,204 ----
  			// ... needs checking under Windows itself.
  			//
! 			if( preg_match("/^SELECT(.*?)(LIMIT ([0-9]+)[, ]*([0-9]+)*)?$/s", $query, $limits) )
  			{
  				$query = $limits[1];
  
! 				if( !empty($limits[2]) )
! 				{
! 					$row_offset = ( $limits[4] ) ? $limits[3] : "";
! 					$num_rows = ( $limits[4] ) ? $limits[4] : $limits[3];
  
! 					$query = "TOP " . ( $row_offset + $num_rows ) . $query;
! 				}
  
! 				$this->result = mssql_query("SELECT $query", $this->db_connect_id); 
  
! 				if( $this->result )
  				{
! 					$this->limit_offset[$this->result] = ( !empty($row_offset) ) ? $row_offset : 0;
! 
! 					if( $row_offset > 0 )
  					{
! 						mssql_data_seek($this->result, $row_offset);
  					}
  				}
  			}
! 			else if( eregi("^INSERT ", $query) )
  			{
! 				if( mssql_query(str_replace("\'", "''", $query), $this->db_connect_id) )
  				{
! 					$this->result = time() + microtime();
! 
! 					$result_id = mssql_query("SELECT @@IDENTITY AS id, @@ROWCOUNT as affected", $this->db_connect_id);
! 					if( $result_id )
  					{
! 						if( $row = mssql_fetch_array($result_id) )
! 						{
! 							$this->next_id[$this->db_connect_id] = $row['id'];	
! 							$this->affected_rows[$this->db_connect_id] = $row['affected'];
! 						}
  					}
  				}
  			}
  			else
  			{
! 				if( mssql_query(str_replace("\'", "''", $query), $this->db_connect_id) )
  				{
! 					$this->result = time() + microtime();
  
! 					$result_id = mssql_query("SELECT @@ROWCOUNT as affected", $this->db_connect_id);
! 					if( $result_id )
  					{
! 						if( $row = mssql_fetch_array($result_id) )
! 						{
! 							$this->affected_rows[$this->db_connect_id] = $row['affected'];
! 						}
  					}
  				}
! 			}
  
! 			if( !$this->result )
! 			{
! 				if( $this->in_transaction )
  				{
! 					mssql_query("ROLLBACK", $this->db_connect_id);
! 					$this->in_transaction = FALSE;
  				}
  
! 				return false;
  			}
  
! 			if( $transaction == END_TRANSACTION && $this->in_transaction )
  			{
! 				mssql_query("COMMIT", $this->db_connect_id);
  				$this->in_transaction = FALSE;
  			}
  
! 			return $this->result;
  		}
  	}
***************
*** 259,293 ****
  	//
  	function sql_numrows($query_id = 0)
- 	{
- 		if(!$query_id)
- 		{
- 			$query_id = $this->query_result;
- 		}
- 		if($query_id)
- 		{
- 			if($this->query_limit_offset[$query_id] > 0)
- 			{
- 				$result = @mssql_num_rows($query_id) - $this->query_limit_offset[$query_id];
- 			}
- 			else
- 			{
- 				$result = @mssql_num_rows($query_id);
- 			}
- 			return $result;
- 		}
- 		else
- 		{
- 			return false;
- 		}
- 	}
- 	function sql_affectedrows($query_id = 0)
  	{
! 		if(!$query_id)
  		{
! 			$query_id = $this->query_result;
  		}
! 		if($query_id)
  		{
! 			return $this->affected_rows[$query_id];
  		}
  		else
--- 208,220 ----
  	//
  	function sql_numrows($query_id = 0)
  	{
! 		if( !$query_id )
  		{
! 			$query_id = $this->result;
  		}
! 
! 		if( $query_id )
  		{
! 			return ( !empty($this->limit_offset[$query_id]) ) ? mssql_num_rows($query_id) - $this->limit_offset[$query_id] : @mssql_num_rows($query_id);
  		}
  		else
***************
*** 296,373 ****
  		}
  	}
  	function sql_numfields($query_id = 0)
  	{
! 		if(!$query_id)
! 		{
! 			$query_id = $this->query_result;
! 		}
! 		if($query_id)
  		{
! 			$result = @mssql_num_fields($query_id);
! 			return $result;
! 		}
! 		else
! 		{
! 			return false;
  		}
  	}
  	function sql_fieldname($offset, $query_id = 0)
  	{
! 		if(!$query_id)
  		{
! 			$query_id = $this->query_result;
! 		}
! 		if($query_id)
! 		{
! 			$result = @mssql_field_name($query_id, $offset);
! 			return $result;
  		}
! 		else
! 		{
! 			return false;
! 		}
  	}
  	function sql_fieldtype($offset, $query_id = 0)
  	{
  		if(!$query_id)
- 		{
- 			$query_id = $this->query_result;
- 		}
- 		if($query_id)
  		{
! 			$result = @mssql_field_type($query_id, $offset);
! 			return $result;
  		}
! 		else
! 		{
! 			return false;
! 		}
  	}
  	function sql_fetchrow($query_id = 0)
  	{
! 		if(!$query_id)
  		{
! 			$query_id = $this->query_result;
  		}
! 		if($query_id)
  		{
  
! 			if($this->query_limit_offset[$query_id] > 0)
! 			{
! 				if($this->query_limit_success)
! 				{
! 					$this->row = @mssql_fetch_array($query_id);
! 					return $this->row;
! 				}
! 				else
! 				{
! 					return false;
! 				}
! 			}
! 			else
  			{
! 				$this->row = @mssql_fetch_array($query_id);
! 				return $this->row;
  			}
  		}
  		else
--- 223,276 ----
  		}
  	}
+ 
  	function sql_numfields($query_id = 0)
  	{
! 		if( !$query_id )
  		{
! 			$query_id = $this->result;
  		}
+ 
+ 		return ( $query_id ) ? mssql_num_fields($query_id) : false;
  	}
+ 
  	function sql_fieldname($offset, $query_id = 0)
  	{
! 		if( !$query_id )
  		{
! 			$query_id = $this->result;
  		}
! 
! 		return ( $query_id ) ? mssql_field_name($query_id, $offset) : false;
  	}
+ 
  	function sql_fieldtype($offset, $query_id = 0)
  	{
  		if(!$query_id)
  		{
! 			$query_id = $this->result;
  		}
! 
! 		return ( $query_id ) ? mssql_field_type($query_id, $offset) : false;
  	}
+ 
  	function sql_fetchrow($query_id = 0)
  	{
! 		if( !$query_id )
  		{
! 			$query_id = $this->result;
  		}
! 
! 		if( $query_id )
  		{
+ 			empty($row);
  
! 			$row = mssql_fetch_array($query_id);
! 
! 			while( list($key, $value) = @each($row) )
  			{
! 				$row[$key] = stripslashes($value);
  			}
+ 
+ 			return $row;
  		}
  		else
***************
*** 376,408 ****
  		}
  	}
  	function sql_fetchrowset($query_id = 0)
  	{
! 		if(!$query_id)
  		{
! 			$query_id = $this->query_result;
  		}
! 		if($query_id)
  		{
! 			if($this->query_limit_success[$query_id])
! 			{
! 				empty($this->rowset);
! 				while($this->rowset = @mssql_fetch_array($query_id))
! 				{
! 					$result[] = $this->rowset;
! 				}
! 			}
! 			else if($this->query_limit_numrows[$query_id] == -1)
  			{
! 				empty($this->rowset);
! 				while($this->rowset = @mssql_fetch_array($query_id))
  				{
! 					$result[] = $this->rowset;
  				}
! 			}
! 			else
! 			{
! 				$result = false;
  			}
! 			return $result;
  		}
  		else
--- 279,305 ----
  		}
  	}
+ 
  	function sql_fetchrowset($query_id = 0)
  	{
! 		if( !$query_id )
  		{
! 			$query_id = $this->result;
  		}
! 
! 		if( $query_id )
  		{
! 			$i = 0;
! 			empty($rowset);
! 
! 			while( $row = mssql_fetch_array($query_id))
  			{
! 				while( list($key, $value) = @each($row) )
  				{
! 					$rowset[$i][$key] = stripslashes($value);
  				}
! 				$i++;
  			}
! 
! 			return $rowset;
  		}
  		else
***************
*** 411,448 ****
  		}
  	}
  	function sql_fetchfield($field, $row = -1, $query_id)
  	{
! 		if(!$query_id)
  		{
! 			$query_id = $this->query_result;
  		}
! 		if($query_id)
  		{
! 			if($row != -1)
  			{
! 				if($this->query_limit_offset[$query_id] > 0)
  				{
! 					if($this->query_limit_offset[$query_id] > 0 && $this->query_limit_success)
! 					{
! 						$result = @mssql_result($this->query_result, ($this->query_limit_offset[$query_id] + $row), $field);
! 					}
! 					else
! 					{
! 						return false;
! 					}
  				}
  				else
  				{
! 					$result = @mssql_result($this->query_result, $row, $field);
  				}
  			}
  			else
  			{
! 				if(empty($this->row))
  				{
! 					$this->row = @mssql_fetch_array($query_id);
! 					$result = $this->row[$field];
  				}
  			}
  			return $result;
  		}
--- 308,341 ----
  		}
  	}
+ 
  	function sql_fetchfield($field, $row = -1, $query_id)
  	{
! 		if( !$query_id )
  		{
! 			$query_id = $this->result;
  		}
! 
! 		if( $query_id )
  		{
! 			if( $row != -1 )
  			{
! 				if( $this->limit_offset[$query_id] > 0 )
  				{
! 					$result = ( !empty($this->limit_offset[$query_id]) ) ? mssql_result($this->result, ($this->limit_offset[$query_id] + $row), $field) : false;
  				}
  				else
  				{
! 					$result = mssql_result($this->result, $row, $field);
  				}
  			}
  			else
  			{
! 				if( empty($this->row[$query_id]) )
  				{
! 					$this->row[$query_id] = mssql_fetch_array($query_id);
! 					$result = stripslashes($this->row[$query_id][$field]);
  				}
  			}
+ 
  			return $result;
  		}
***************
*** 452,472 ****
  		}
  	}
  	function sql_rowseek($rownum, $query_id = 0)
  	{
! 		if(!$query_id)
  		{
! 			$query_id = $this->query_result;
  		}
! 		if($query_id)
  		{
! 			if($this->query_limit_offset[$query_id] > 0)
! 			{
! 				$result = @mssql_data_seek($query_id, ($this->query_limit_offset[$query_id] + $rownum));
! 			}
! 			else
! 			{
! 				$result = @mssql_data_seek($query_id, $rownum);
! 			}
! 			return $result;
  		}
  		else
--- 345,359 ----
  		}
  	}
+ 
  	function sql_rowseek($rownum, $query_id = 0)
  	{
! 		if( !$query_id )
  		{
! 			$query_id = $this->result;
  		}
! 
! 		if( $query_id )
  		{
! 			return ( !empty($this->limit_offset[$query_id]) ) ? mssql_data_seek($query_id, ($this->limit_offset[$query_id] + $rownum)) : mssql_data_seek($query_id, $rownum);
  		}
  		else
***************
*** 475,512 ****
  		}
  	}
! 	function sql_nextid($query_id = 0)
  	{
! 		if(!$query_id)
! 		{
! 			$query_id = $this->query_result;
! 		}
! 		if($query_id)
! 		{
! 			return $this->next_id[$query_id];
! 		}
! 		else
! 		{
! 			return false;
! 		}
  	}
  	function sql_freeresult($query_id = 0)
  	{
! 		if(!$query_id)
! 		{
! 			$query_id = $this->query_result;
! 		}
! 		if($query_id)
  		{
! 			$result = @mssql_free_result($query_id);
! 			return $result;
  		}
! 		else
! 		{
! 			return false;
! 		}
  	}
  	function sql_error($query_id = 0)
  	{
! 		$result[message] = @mssql_get_last_message();
  		return $result;
  	}
--- 362,389 ----
  		}
  	}
! 
! 	function sql_nextid()
  	{
! 		return ( $this->next_id[$this->db_connect_id] ) ? $this->next_id[$this->db_connect_id] : false;
! 	}
! 
! 	function sql_affectedrows()
! 	{
! 		return ( $this->affected_rows[$this->db_connect_id] ) ? $this->affected_rows[$this->db_connect_id] : false;
  	}
+ 
  	function sql_freeresult($query_id = 0)
  	{
! 		if( !$query_id )
  		{
! 			$query_id = $this->result;
  		}
! 
! 		return ( $query_id ) ? mssql_free_result($query_id) : false;
  	}
+ 
  	function sql_error($query_id = 0)
  	{
! 		$result['message'] = @mssql_get_last_message();
  		return $result;
  	}

[Phpbb-checkins] CVS: phpBB2/db/schemas mssql_schema.sql,1.14,1.15

From: Paul S. O. <ps...@us...> - 2001-12-19 23:12:24

Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv21663/db/schemas

Modified Files:
	mssql_schema.sql 
Log Message:
Topic last post id was set as non null ...

Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** mssql_schema.sql	2001/12/19 23:03:58	1.14
--- mssql_schema.sql	2001/12/19 23:12:22	1.15
***************
*** 289,293 ****
  	[topic_type] [smallint] NOT NULL ,
  	[topic_vote] [smallint] NOT NULL ,
! 	[topic_last_post_id] [int] NOT NULL ,
  	[topic_moved_id] [int] NULL 
  ) ON [PRIMARY]
--- 289,293 ----
  	[topic_type] [smallint] NOT NULL ,
  	[topic_vote] [smallint] NOT NULL ,
! 	[topic_last_post_id] [int] NULL ,
  	[topic_moved_id] [int] NULL 
  ) ON [PRIMARY]

[Phpbb-checkins] CVS: phpBB2/db/schemas mssql_schema.sql,1.13,1.14

From: Paul S. O. <ps...@us...> - 2001-12-19 23:04:01

Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv19371/db/schemas

Modified Files:
	mssql_schema.sql 
Log Message:
Damn commas, someone should be shot

Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** mssql_schema.sql	2001/12/19 22:52:11	1.13
--- mssql_schema.sql	2001/12/19 23:03:58	1.14
***************
*** 237,241 ****
  	[span_class1] [varchar] (25) NULL ,
  	[span_class2] [varchar] (25) NULL ,
! 	[span_class3] [varchar] (25) NULL 
  	[img_size_poll] [smallint] NULL ,
  	[img_size_privmsg] [smallint] NULL 
--- 237,241 ----
  	[span_class1] [varchar] (25) NULL ,
  	[span_class2] [varchar] (25) NULL ,
! 	[span_class3] [varchar] (25) NULL ,
  	[img_size_poll] [smallint] NULL ,
  	[img_size_privmsg] [smallint] NULL

[Phpbb-checkins] CVS: phpBB2/db/schemas mssql_schema.sql,1.12,1.13

From: Paul S. O. <ps...@us...> - 2001-12-19 22:52:15

Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv15728/db/schemas

Modified Files:
	mssql_schema.sql 
Log Message:
Fixed part 3 of bug #494929

Index: mssql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_schema.sql,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** mssql_schema.sql	2001/12/15 16:40:35	1.12
--- mssql_schema.sql	2001/12/19 22:52:11	1.13
***************
*** 238,241 ****
--- 238,243 ----
  	[span_class2] [varchar] (25) NULL ,
  	[span_class3] [varchar] (25) NULL 
+ 	[img_size_poll] [smallint] NULL ,
+ 	[img_size_privmsg] [smallint] NULL 
  ) ON [PRIMARY]
  GO
***************
*** 272,276 ****
  	[span_class1_name] [varchar] (25) NULL ,
  	[span_class2_name] [varchar] (25) NULL ,
! 	[span_class3_name] [varchar] (25) NULL 
  ) ON [PRIMARY]
  GO
--- 274,278 ----
  	[span_class1_name] [varchar] (25) NULL ,
  	[span_class2_name] [varchar] (25) NULL ,
! 	[span_class3_name] [varchar] (25) NULL
  ) ON [PRIMARY]
  GO

[Phpbb-checkins] CVS: phpBB2 search.php,1.47,1.48

From: Paul S. O. <ps...@us...> - 2001-12-19 17:15:18

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv17134

Modified Files:
	search.php 
Log Message:
Fix for bug #494740

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** search.php	2001/12/15 17:50:28	1.47
--- search.php	2001/12/19 17:15:08	1.48
***************
*** 1215,1219 ****
  					"U_VIEW_FORUM" => $forum_url, 
  					"U_VIEW_TOPIC" => $topic_url,
! 					"U_TOPIC_POSTER_PROFILE" => $topic_poster_profile_url)
  				);
  			}
--- 1215,1219 ----
  					"U_VIEW_FORUM" => $forum_url, 
  					"U_VIEW_TOPIC" => $topic_url,
! 					"U_TOPIC_POSTER_PROFILE" => append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $searchset[$i]['user_id']))
  				);
  			}

[Phpbb-checkins] CVS: phpBB2/templates/subSilver search_results_topics.tpl,1.7,1.8

From: Paul S. O. <ps...@us...> - 2001-12-19 17:14:49

Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv17021/templates/subSilver

Modified Files:
	search_results_topics.tpl 
Log Message:
Minor change to column order

Index: search_results_topics.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/search_results_topics.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** search_results_topics.tpl	2001/11/19 14:12:09	1.7
--- search_results_topics.tpl	2001/12/19 17:14:46	1.8
***************
*** 17,22 ****
  	<th class="thTop">&nbsp;{L_FORUM}&nbsp;</th>
  	<th class="thTop">&nbsp;{L_TOPICS}&nbsp;</th>
- 	<th class="thTop">&nbsp;{L_REPLIES}&nbsp;</th>
  	<th class="thTop">&nbsp;{L_AUTHOR}&nbsp;</th>
  	<th class="thTop">&nbsp;{L_VIEWS}&nbsp;</th>
  	<th class="thCornerR">&nbsp;{L_LASTPOST}&nbsp;</th>
--- 17,22 ----
  	<th class="thTop">&nbsp;{L_FORUM}&nbsp;</th>
  	<th class="thTop">&nbsp;{L_TOPICS}&nbsp;</th>
  	<th class="thTop">&nbsp;{L_AUTHOR}&nbsp;</th>
+ 	<th class="thTop">&nbsp;{L_REPLIES}&nbsp;</th>
  	<th class="thTop">&nbsp;{L_VIEWS}&nbsp;</th>
  	<th class="thCornerR">&nbsp;{L_LASTPOST}&nbsp;</th>
***************
*** 27,32 ****
  	<td class="row1"><span class="forumlink"><a href="{searchresults.U_VIEW_FORUM}" class="forumlink">{searchresults.FORUM_NAME}</a></span></td>
  	<td class="row2"><span class="topictitle">{searchresults.NEWEST_POST_IMG}{searchresults.TOPIC_TYPE}<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a></span><br /><span class="gensmall">{searchresults.GOTO_PAGE}</span></td>
! 	<td class="row1" align="center" valign="middle"><span class="postdetails">{searchresults.REPLIES}</span></td>
! 	<td class="row2" align="center" valign="middle"><span class="name"><a href="{searchresults.U_TOPIC_POSTER_PROFILE}" class="name">{searchresults.TOPIC_POSTER}</a></span></td>
  	<td class="row1" align="center" valign="middle"><span class="postdetails">{searchresults.VIEWS}</span></td>
  	<td class="row2" align="center" valign="middle" nowrap="nowrap"><span class="postdetails">{searchresults.LAST_POST}</span></td>
--- 27,32 ----
  	<td class="row1"><span class="forumlink"><a href="{searchresults.U_VIEW_FORUM}" class="forumlink">{searchresults.FORUM_NAME}</a></span></td>
  	<td class="row2"><span class="topictitle">{searchresults.NEWEST_POST_IMG}{searchresults.TOPIC_TYPE}<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a></span><br /><span class="gensmall">{searchresults.GOTO_PAGE}</span></td>
! 	<td class="row1" align="center" valign="middle"><span class="name"><a href="{searchresults.U_TOPIC_POSTER_PROFILE}" class="name">{searchresults.TOPIC_POSTER}</a></span></td>
! 	<td class="row2" align="center" valign="middle"><span class="postdetails">{searchresults.REPLIES}</span></td>
  	<td class="row1" align="center" valign="middle"><span class="postdetails">{searchresults.VIEWS}</span></td>
  	<td class="row2" align="center" valign="middle" nowrap="nowrap"><span class="postdetails">{searchresults.LAST_POST}</span></td>

7 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 595 596 597 598 599 .. 629 > >> (Page 597 of 629)