phpbb-checkins Mailing List for phpBB (Page 623)

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 .. 621 622 623 624 625 .. 629 > >> (Page 623 of 629)

[Phpbb-checkins] CVS: phpBB2 profile.php,1.122,1.123

From: James A. <th...@us...> - 2001-10-22 01:11:50

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

Modified Files:
	profile.php 
Log Message:
Fixed bug in profile where account reactivation email had wrong link


Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -r1.122 -r1.123
*** profile.php	2001/10/18 22:18:57	1.122
--- profile.php	2001/10/22 01:11:47	1.123
***************
*** 952,956 ****
  				if($mode == "editprofile")
  				{
! 					if($email != $current_email && ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) )
  					{
  						$user_active = 0;
--- 952,956 ----
  				if($mode == "editprofile")
  				{
! 					if($email != $current_email && ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) && $userdata['user_level'] != ADMIN)
  					{
  						$user_active = 0;
***************
*** 1009,1018 ****
  								"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 								"U_ACTIVATE" => "http://" . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$act_key")
  							);
  							$emailer->send();
  							$emailer->reset();
  
- 							$message = $lang['Profile_updated'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("index.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_index'];
  
  						}
--- 1009,1025 ----
  								"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 								"U_ACTIVATE" => "http://" . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey")
  							);
  							$emailer->send();
  							$emailer->reset();
+ 							
+ 							$message = $lang['Profile_updated_inactive'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("index.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_index'];
+ 					
+ 							// Log the user out as their account is no longer active
+ 							if( $userdata['session_logged_in'] )
+ 							{
+ 								session_end($userdata['session_id'], $userdata['user_id']);
+ 							}
  
  
  						}
***************
*** 1023,1027 ****
  
  						$template->assign_vars(array(
! 							"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("index.$phpEx") . '">')
  						);
  
--- 1030,1034 ----
  
  						$template->assign_vars(array(
! 							"META" => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
  						);

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

From: Paul S. O. <ps...@us...> - 2001-10-21 01:53:51

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

Modified Files:
	index_frameset.tpl 
Log Message:
Additional updates, Tom

Index: index_frameset.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/index_frameset.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** index_frameset.tpl	2001/10/14 15:55:50	1.2
--- index_frameset.tpl	2001/10/21 01:53:48	1.3
***************
*** 2,10 ****
  <head>
  <title>phpBB Administration</title>
  </head>
  
! <frameset cols="170,*" scrolling="no" border="0">
! 	<frame src="{S_FRAME_NAV}" name="nav">
! 	<frame src="{S_FRAME_MAIN}" name="main">
  </frameset>
  
--- 2,11 ----
  <head>
  <title>phpBB Administration</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  </head>
  
! <frameset cols="170,*" rows="*" border="0" framespacing="0" frameborder="NO"> 
!   <frame src="{S_FRAME_NAV}" name="nav" noresize marginwidth="3" marginheight="3" scrolling="AUTO">
!   <frame src="{S_FRAME_MAIN}" name="main" marginwidth="10" marginheight="10" scrolling="AUTO">
  </frameset>
  
***************
*** 14,17 ****
  	</body>
  </noframes>
- 
  </html>
--- 15,17 ----

[Phpbb-checkins] CVS: phpBB2/templates/subSilver search_username.tpl,1.1,1.2 posting_topic_review.tpl,1.2,1.3

From: Paul S. O. <ps...@us...> - 2001-10-21 01:53:51

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

Modified Files:
	search_username.tpl posting_topic_review.tpl 
Log Message:
Additional updates, Tom

Index: search_username.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/search_username.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** search_username.tpl	2001/10/16 14:43:03	1.1
--- search_username.tpl	2001/10/21 01:53:48	1.2
***************
*** 9,26 ****
  </script>
  
! <form method="post" name="search" action="{S_SEARCH_ACTION}"><table width="100%" border="0" cellspacing="0" cellpadding="5" align="center" height="100%">
  	<tr>
! 		<td><table width="100%" border="0" cellspacing="1" cellpadding="4" class="forumline">
! 			<tr>
! 				<th class="thHead">{L_SEARCH_USERNAME}</th>
! 			</tr>
! 			<tr>
! 				<td valign="top" class="row1"><span class="genmed"><br /><input type="text" name="search_author" value="{AUTHOR}" class="post" /> &nbsp;<input type="submit" name="search" value="{L_SEARCH}" class="liteoption" /></span><br /><span class="gensmall">{L_SEARCH_EXPLAIN}</span><br />
! 				<!-- BEGIN switch_select_name -->
! 				<span class="genmed">{L_UPDATE_USERNAME}<br /><select name="author_list">{S_AUTHOR_OPTIONS}</select> &nbsp;<input type="submit" class="liteoption" onClick="refresh_username(this.form.author_list.options[this.form.author_list.selectedIndex].value);return false;" name="use" value="{L_SELECT}" /></span><br />
! 				<!-- END switch_select_name -->
! 				<br /><span class="gen"><a href="javascript:window.close();" class="gen">{L_CLOSE_WINDOW}</a></span></td>
! 			</tr>
! 		</table></td>
  	</tr>
! </table></form>
--- 9,41 ----
  </script>
  
! <form method="post" name="search" action="{S_SEARCH_ACTION}">
!   <table width="100%" border="0" cellspacing="0" cellpadding="10">
  	<tr>
! 	  <td>
! 		<table width="100%" border="0" cellspacing="1" cellpadding="4" class="forumline">
! 		  <tr> 
! 			<th class="thHead" height="25">{L_SEARCH_USERNAME}</th>
! 		  </tr>
! 		  <tr> 
! 			<td valign="top" class="row1"><span class="genmed"><br />
! 			  <input type="text" name="search_author" value="{AUTHOR}" class="post" />
! 			  &nbsp; 
! 			  <input type="submit" name="search" value="{L_SEARCH}" class="liteoption" />
! 			  </span><br />
! 			  <span class="gensmall">{L_SEARCH_EXPLAIN}</span><br />
! 			  <!-- BEGIN switch_select_name -->
! 			  <span class="genmed">{L_UPDATE_USERNAME}<br />
! 			  <select name="author_list">{S_AUTHOR_OPTIONS}
! 			  </select>
! 			  &nbsp; 
! 			  <input type="submit" class="liteoption" onClick="refresh_username(this.form.author_list.options[this.form.author_list.selectedIndex].value);return false;" name="use" value="{L_SELECT}" />
! 			  </span><br />
! 			  <!-- END switch_select_name -->
! 			  <br />
! 			  <span class="genmed"><a href="javascript:window.close();" class="genmed">{L_CLOSE_WINDOW}</a></span></td>
! 		  </tr>
! 		</table>
! 	  </td>
  	</tr>
!   </table>
! </form>

Index: posting_topic_review.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/posting_topic_review.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** posting_topic_review.tpl	2001/10/16 16:24:52	1.2
--- posting_topic_review.tpl	2001/10/21 01:53:48	1.3
***************
*** 4,8 ****
  	<tr> 
  	  
! 	<td class="catHead" height="28" align="center"><b>{L_TOPIC_REVIEW}</b></td>
  	</tr>
  	<tr>
--- 4,8 ----
  	<tr> 
  	  
! 	<td class="catHead" height="28" align="center"><b><span class="cattitle">{L_TOPIC_REVIEW}</span></b></td>
  	</tr>
  	<tr>

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/admin ranks_edit_body.tpl,1.2,1.3 ranks_list_body.tpl,1.2,1.3

From: James A. <th...@us...> - 2001-10-19 23:17:18

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

Modified Files:
	ranks_edit_body.tpl ranks_list_body.tpl 
Log Message:
Changed ranks admin so it shows the min and max posts of the rank


Index: ranks_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/ranks_edit_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ranks_edit_body.tpl	2001/10/14 15:55:50	1.2
--- ranks_edit_body.tpl	2001/10/19 23:17:15	1.3
***************
*** 17,26 ****
  	</tr>
  	<tr>
- 		<td class="row1" width="38%"><span class="gen">{L_RANK_MAXIMUM}:</span></td>
- 		<td class="row2"><input type="text" name="max_posts" size="5" maxlength="10" value="{MAXIMUM}" /></td>
- 	</tr>
- 	<tr>
  		<td class="row1" width="38%"><span class="gen">{L_RANK_MINIMUM}:</span></td>
  		<td class="row2"><input type="text" name="min_posts" size="5" maxlength="10" value="{MINIMUM}" /></td>
  	</tr>
  	<tr>
--- 17,26 ----
  	</tr>
  	<tr>
  		<td class="row1" width="38%"><span class="gen">{L_RANK_MINIMUM}:</span></td>
  		<td class="row2"><input type="text" name="min_posts" size="5" maxlength="10" value="{MINIMUM}" /></td>
+ 	</tr>
+ 	<tr>
+ 		<td class="row1" width="38%"><span class="gen">{L_RANK_MAXIMUM}:</span></td>
+ 		<td class="row2"><input type="text" name="max_posts" size="5" maxlength="10" value="{MAXIMUM}" /></td>
  	</tr>
  	<tr>

Index: ranks_list_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/ranks_list_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ranks_list_body.tpl	2001/10/14 15:55:50	1.2
--- ranks_list_body.tpl	2001/10/19 23:17:15	1.3
***************
*** 7,10 ****
--- 7,12 ----
  	<tr>
  		<th class="thCornerL">{L_RANK}</th>
+         <th class="thTop">{L_RANK_MINIMUM}</th>
+         <th class="thTop">{L_RANK_MAXIMUM}</th>
  		<th class="thTop">{L_SPECIAL_RANK}</th>
  		<th class="thTop">{L_EDIT}</th>
***************
*** 14,17 ****
--- 16,21 ----
  	<tr>
  		<td class="{ranks.ROW_CLASS}" align="center">{ranks.RANK}</td>
+         <td class="{ranks.ROW_CLASS}" align="center">{ranks.RANK_MIN}</td>
+         <td class="{ranks.ROW_CLASS}" align="center">{ranks.RANK_MAX}</td>
  		<td class="{ranks.ROW_CLASS}" align="center">{ranks.SPECIAL_RANK}</td>
  		<td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_EDIT}">{L_EDIT}</td>
***************
*** 20,24 ****
  	<!-- END ranks -->			
  	<tr>
! 		<td class="catBottom" align="center" colspan="4"><input type="submit" class="mainoption" name="add" value="{L_ADD_RANK}" /></td>
  	</tr>
  </table></form>
--- 24,28 ----
  	<!-- END ranks -->			
  	<tr>
! 		<td class="catBottom" align="center" colspan="6"><input type="submit" class="mainoption" name="add" value="{L_ADD_RANK}" /></td>
  	</tr>
  </table></form>

[Phpbb-checkins] CVS: phpBB2/admin admin_ranks.php,1.2,1.3

From: James A. <th...@us...> - 2001-10-19 23:17:18

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

Modified Files:
	admin_ranks.php 
Log Message:
Changed ranks admin so it shows the min and max posts of the rank


Index: admin_ranks.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ranks.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** admin_ranks.php	2001/10/14 15:46:53	1.2
--- admin_ranks.php	2001/10/19 23:17:15	1.3
***************
*** 249,253 ****
  		
  		$sql = "SELECT * FROM " . RANKS_TABLE . "
! 			ORDER BY rank_title";
  		if( !$result = $db->sql_query($sql) )
  		{
--- 249,253 ----
  		
  		$sql = "SELECT * FROM " . RANKS_TABLE . "
! 			ORDER BY rank_min ASC, rank_special ASC";
  		if( !$result = $db->sql_query($sql) )
  		{
***************
*** 262,265 ****
--- 262,267 ----
  			"L_RANKS_TEXT" => $lang['Ranks_explain'],
  			"L_RANK" => $lang['Rank'],
+ 			"L_RANK_MINIMUM" => $lang['Rank_minimum'],
+ 			"L_RANK_MAXIMUM" => $lang['Rank_maximum'],
  			"L_SPECIAL_RANK" => $lang['Special_rank'],
  			"L_EDIT" => $lang['Edit'],
***************
*** 276,279 ****
--- 278,289 ----
  			$special_rank = $rank_rows[$i]['rank_special'];
  			$rank_id = $rank_rows[$i]['rank_id'];
+ 			$rank_min = $rank_rows[$i]['rank_min'];
+ 			$rank_max = $rank_rows[$i]['rank_max'];
+ 
+ 			if($special_rank)
+ 			{
+ 				$rank_min = $rank_max = "-";
+ 			}
+ 
  			
  			$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
***************
*** 284,287 ****
--- 294,300 ----
  				"ROW_CLASS" => $row_class,
  				"RANK" => $rank,
+ 				"RANK_MIN" => $rank_min,
+ 				"RANK_MAX" => $rank_max,
+ 
  				"SPECIAL_RANK" => ( $special_rank == 1 ) ? $lang['Yes'] : $lang['No'],
  
***************
*** 303,307 ****
  	
  	$sql = "SELECT * FROM " . RANKS_TABLE . "
! 		ORDER BY rank_title";
  	if( !$result = $db->sql_query($sql) )
  	{
--- 316,320 ----
  	
  	$sql = "SELECT * FROM " . RANKS_TABLE . "
! 		ORDER BY rank_min ASC, rank_special ASC";
  	if( !$result = $db->sql_query($sql) )
  	{
***************
*** 316,319 ****
--- 329,334 ----
  		"L_RANKS_TEXT" => $lang['Ranks_explain'],
  		"L_RANK" => $lang['Rank_title'],
+ 		"L_RANK_MINIMUM" => $lang['Rank_minimum'],
+ 		"L_RANK_MAXIMUM" => $lang['Rank_maximum'],
  		"L_SPECIAL_RANK" => $lang['Rank_special'],
  		"L_EDIT" => $lang['Edit'],
***************
*** 330,334 ****
--- 345,356 ----
  		$special_rank = $rank_rows[$i]['rank_special'];
  		$rank_id = $rank_rows[$i]['rank_id'];
+ 		$rank_min = $rank_rows[$i]['rank_min'];
+ 		$rank_max = $rank_rows[$i]['rank_max'];
  		
+ 		if($special_rank == "1")
+ 		{
+ 			$rank_min = $rank_max = "-";
+ 		}
+ 
  		$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
  		$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
***************
*** 340,343 ****
--- 362,367 ----
  			"RANK" => $rank,
  			"SPECIAL_RANK" => $rank_is_special,
+ 			"RANK_MIN" => $rank_min,
+ 			"RANK_MAX" => $rank_max,
  
  			"U_RANK_EDIT" => append_sid("admin_ranks.$phpEx?mode=edit&amp;id=$rank_id"),
***************
*** 351,353 ****
  include('page_footer_admin.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 375,377 ----
  include('page_footer_admin.'.$phpEx);
  
! ?>

[Phpbb-checkins] CVS: phpBB2/includes bbcode.php,1.12,1.13

From: Doug K. <dou...@us...> - 2001-10-19 13:28:39

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

Modified Files:
	bbcode.php 
Log Message:
Removing traces of global announcements and also fixing a potential security hole in bbcode.  Img-based javascript is now stripped.  All images have to begin with http://

Index: bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/bbcode.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** bbcode.php	2001/10/01 23:22:18	1.12
--- bbcode.php	2001/10/19 13:28:35	1.13
***************
*** 264,268 ****
  
  	// [img]image_url_here[/img] code..
! 	$text = preg_replace("#\[img\](.*?)\[/img\]#si", "[img:$uid]\\1[/img:$uid]", $text);
  
  	// Remove our padding from the string..
--- 264,268 ----
  
  	// [img]image_url_here[/img] code..
! 	$text = preg_replace("#\[img\](([a-z]+?)://([^, \n\r]+))\[/img\]#si", "[img:$uid]\\1[/img:$uid]", $text);
  
  	// Remove our padding from the string..

[Phpbb-checkins] CVS: phpBB2/db mysql_basic.sql,1.64,1.65

From: Doug K. <dou...@us...> - 2001-10-19 13:28:39

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

Modified Files:
	mysql_basic.sql 
Log Message:
Removing traces of global announcements and also fixing a potential security hole in bbcode.  Img-based javascript is now stripped.  All images have to begin with http://

Index: mysql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mysql_basic.sql,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** mysql_basic.sql	2001/10/16 01:00:47	1.64
--- mysql_basic.sql	2001/10/19 13:28:35	1.65
***************
*** 62,66 ****
  # -- Forums
  INSERT INTO phpbb_forums (forum_id, forum_name, forum_desc, cat_id, forum_order, forum_posts, forum_topics, forum_last_post_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_announce, auth_sticky, auth_pollcreate, auth_vote, auth_attachments) VALUES (1, 'Test Forum 1', 'This is just a test forum.', 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 3, 1, 1, 1, 3);
- INSERT INTO phpbb_forums (forum_id, forum_name, forum_desc, cat_id, forum_order, forum_posts, forum_topics, forum_last_post_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_announce, auth_sticky, auth_pollcreate, auth_vote, auth_attachments) VALUES (-1, 'Global Announcements', 'This forum is required for the global announcements to function properly.  DO NOT DELETE IT UNDER ANY CIRCUMSTANCES!', 6, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 3, 1, 1, 1, 3);
  
  # -- Users
--- 62,65 ----

[Phpbb-checkins] CVS: phpBB2 profile.php,1.121,1.122

From: Doug K. <dou...@us...> - 2001-10-18 22:19:00

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

Modified Files:
	profile.php 
Log Message:
Fixes the bug in profile.php where MSNM does not show up correctly.

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -r1.121 -r1.122
*** profile.php	2001/10/15 16:00:47	1.121
--- profile.php	2001/10/18 22:18:57	1.122
***************
*** 346,350 ****
  		$aim_img = ($profiledata['user_aim']) ? "<a href=\"aim:goim?screenname=" . $profiledata['user_aim'] . "&amp;message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\" alt=\"" . $lang['AIM'] . "\" /></a>" : "&nbsp;";
  
! 		$msnm_img = ($profiledata['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /></a>" : "&nbsp;";
  
  		$yim_img = ( $profiledata['user_yim'] ) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $members[$i]['user_yim'] . "&amp;.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\" alt=\"" . $lang['YIM'] . "\" /></a>" : "&nbsp;";
--- 346,350 ----
  		$aim_img = ($profiledata['user_aim']) ? "<a href=\"aim:goim?screenname=" . $profiledata['user_aim'] . "&amp;message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\" alt=\"" . $lang['AIM'] . "\" /></a>" : "&nbsp;";
  
! 		$msnm_img = ($profiledata['user_msnm']) ? "<a href=\"mailto:" . $profiledata['user_msnm'] . "\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /></a>&nbsp;" . $profiledata['user_msnm'] : "&nbsp;";
  
  		$yim_img = ( $profiledata['user_yim'] ) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $members[$i]['user_yim'] . "&amp;.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\" alt=\"" . $lang['YIM'] . "\" /></a>" : "&nbsp;";

[Phpbb-checkins] CVS: phpBB2 install.php,1.8,1.9

From: Jonathan H. <the...@us...> - 2001-10-18 14:56:43

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

Modified Files:
	install.php 
Log Message:
Some clean-ups



Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** install.php	2001/10/16 20:56:42	1.8
--- install.php	2001/10/18 14:56:40	1.9
***************
*** 199,203 ****
  	// Sorry this has already been installed can't do anything more with it
  	//
! 	$template->assign_block_vars("error_install", array());
  	$template->assign_vars(array(
  		"L_ERROR_TITLE" => $lang['Installer_Error'],
--- 199,203 ----
  	// Sorry this has already been installed can't do anything more with it
  	//
! 	$template->assign_block_vars("switch_error_install", array());
  	$template->assign_vars(array(
  		"L_ERROR_TITLE" => $lang['Installer_Error'],
***************
*** 233,238 ****
  	$s_hidden_fields = '<input type="hidden" name="config_data" value="'.htmlspecialchars($HTTP_POST_VARS['config_data']).'" />';
  	$s_hidden_fields .= '<input type="hidden" name="ftp_file" value="1" />';
! 	$template->assign_block_vars("ftp_file", array());
! 	$template->assign_block_vars("common_install", array());
  	$template->assign_vars(array(
  				"L_INSTRUCTION_TEXT" => $lang['ftp_instructs'],
--- 233,238 ----
  	$s_hidden_fields = '<input type="hidden" name="config_data" value="'.htmlspecialchars($HTTP_POST_VARS['config_data']).'" />';
  	$s_hidden_fields .= '<input type="hidden" name="ftp_file" value="1" />';
! 	$template->assign_block_vars("switch_ftp_file", array());
! 	$template->assign_block_vars("switch_common_install", array());
  	$template->assign_vars(array(
  				"L_INSTRUCTION_TEXT" => $lang['ftp_instructs'],
***************
*** 266,270 ****
  		$s_hidden_fields = '<input type="hidden" name="config_data" value="' . htmlspecialchars($config_data) . '" />';
  		$s_hidden_fields .= '<input type="hidden" name="send_file" value="1" />';
! 		$template->assign_block_vars("common_install", array());
  		if ( $dbms == 'odbc' )
  		{
--- 266,270 ----
  		$s_hidden_fields = '<input type="hidden" name="config_data" value="' . htmlspecialchars($config_data) . '" />';
  		$s_hidden_fields .= '<input type="hidden" name="send_file" value="1" />';
! 		$template->assign_block_vars("switch_common_install", array());
  		if ( $dbms == 'odbc' )
  		{
***************
*** 319,323 ****
  			$lang['Inst_Step_2'] = $lang['ODBC_Instructs'] . '<br />' . $lang['Inst_Step_2'];
  		}
! 		$template->assign_block_vars("common_install", array());
  		$template->assign_vars(array(
  			"L_INSTRUCTION_TEXT" => $lang['Inst_Step_2'],
--- 319,323 ----
  			$lang['Inst_Step_2'] = $lang['ODBC_Instructs'] . '<br />' . $lang['Inst_Step_2'];
  		}
! 		$template->assign_block_vars("switch_common_install", array());
  		$template->assign_vars(array(
  			"L_INSTRUCTION_TEXT" => $lang['Inst_Step_2'],
***************
*** 363,368 ****
  	$s_hidden_fields = '<input type="hidden" name="install_step" value="1" />';
  
! 	$template->assign_block_vars("stage_one_install", array());
! 	$template->assign_block_vars("common_install", array());
  
  	$template->assign_vars(array(
--- 363,368 ----
  	$s_hidden_fields = '<input type="hidden" name="install_step" value="1" />';
  
! 	$template->assign_block_vars("switch_stage_one_install", array());
! 	$template->assign_block_vars("switch_common_install", array());
  
  	$template->assign_vars(array(
***************
*** 452,456 ****
  					$error = $db->sql_error();
  	
! 					$template->assign_block_vars("error_install", array());
  						$template->assign_vars(array(
  						"L_ERROR_TITLE" => $lang['Installer_Error'],
--- 452,456 ----
  					$error = $db->sql_error();
  	
! 					$template->assign_block_vars("switch_error_install", array());
  						$template->assign_vars(array(
  						"L_ERROR_TITLE" => $lang['Installer_Error'],
***************
*** 478,482 ****
  					$error = $db->sql_error();
  	
! 					$template->assign_block_vars("error_install", array());
  					$template->assign_vars(array(
  						"L_ERROR_TITLE" => $lang['Installer_Error'],
--- 478,482 ----
  					$error = $db->sql_error();
  	
! 					$template->assign_block_vars("switch_error_install", array());
  					$template->assign_vars(array(
  						"L_ERROR_TITLE" => $lang['Installer_Error'],
***************
*** 535,539 ****
  				$error = $db->sql_error();
  
! 				$template->assign_block_vars("error_install", array());
  				$template->assign_vars(array(
  					"L_ERROR_TITLE" => $lang['Installer_Error'],
--- 535,539 ----
  				$error = $db->sql_error();
  
! 				$template->assign_block_vars("switch_error_install", array());
  				$template->assign_vars(array(
  					"L_ERROR_TITLE" => $lang['Installer_Error'],
***************
*** 545,549 ****
  			}
  		}
! 		$template->assign_block_vars("common_install", array());
  		//
  		// Write out the config file.
--- 545,549 ----
  			}
  		}
! 		$template->assign_block_vars("switch_common_install", array());
  		//
  		// Write out the config file.
***************
*** 572,576 ****
  			if( extension_loaded('ftp') && !defined('NO_FTP') )
  			{
! 				$template->assign_block_vars('ftp_option', array());
  				$lang['Unwriteable_config'] .= '<p>'.$lang['ftp_option'].'</p>';
  				$template->assign_vars(array(
--- 572,576 ----
  			if( extension_loaded('ftp') && !defined('NO_FTP') )
  			{
! 				$template->assign_block_vars('switch_ftp_option', array());
  				$lang['Unwriteable_config'] .= '<p>'.$lang['ftp_option'].'</p>';
  				$template->assign_vars(array(
***************
*** 640,643 ****
  	}
  }
- 
  ?>
--- 640,642 ----

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

From: Jonathan H. <the...@us...> - 2001-10-18 14:56:43

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

Modified Files:
	install.tpl 
Log Message:
Some clean-ups



Index: install.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/install.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** install.tpl	2001/10/16 20:56:43	1.3
--- install.tpl	2001/10/18 14:56:40	1.4
***************
*** 118,122 ****
  			<tr>
  				<td width="100%"><form action="{S_FORM_ACTION}" method="post"><table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
! 					<!-- BEGIN stage_one_install -->
  					<tr>
  						<th colspan="2">{L_INITIAL_CONFIGURATION}</th>
--- 118,122 ----
  			<tr>
  				<td width="100%"><form action="{S_FORM_ACTION}" method="post"><table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
! 					<!-- BEGIN switch_stage_one_install -->
  					<tr>
  						<th colspan="2">{L_INITIAL_CONFIGURATION}</th>
***************
*** 172,177 ****
  						<td class="row2"><input type="password" name="admin_pass2" /></td>
  					</tr>
! 					<!-- END stage_one_install -->
! 					<!-- BEGIN error_install -->
  					<tr>
  						<th>{L_ERROR_TITLE}</th>
--- 172,177 ----
  						<td class="row2"><input type="password" name="admin_pass2" /></td>
  					</tr>
! 					<!-- END switch_stage_one_install -->
! 					<!-- BEGIN switch_error_install -->
  					<tr>
  						<th>{L_ERROR_TITLE}</th>
***************
*** 180,185 ****
  						<td class="row1" align="center"><span class="gen">{L_ERROR}</span></td>
  					</tr>
! 					<!-- END error_install -->
! 					<!-- BEGIN ftp_file -->
  					<tr>
  						<th colspan="2">{L_FTP_INFO}</th>
--- 180,185 ----
  						<td class="row1" align="center"><span class="gen">{L_ERROR}</span></td>
  					</tr>
! 					<!-- END switch_error_install -->
! 					<!-- BEGIN switch_ftp_file -->
  					<tr>
  						<th colspan="2">{L_FTP_INFO}</th>
***************
*** 197,202 ****
  						<td class="row2"><input type="password" name="ftp_pass"></td>
  					</tr>
! 					<!-- END ftp_file -->
! 					<!-- BEGIN ftp_option -->
  					<tr>
  						<th colspan="2">{L_CHOOSE_FTP}</th>
--- 197,202 ----
  						<td class="row2"><input type="password" name="ftp_pass"></td>
  					</tr>
! 					<!-- END switch_ftp_file -->
! 					<!-- BEGIN switch_ftp_option -->
  					<tr>
  						<th colspan="2">{L_CHOOSE_FTP}</th>
***************
*** 210,219 ****
  						<td class="row2"><input type="radio" name="send_file" value="1"></td>
  					</tr>
! 					<!-- END ftp_option -->
! 					<!-- BEGIN common_install -->
  					<tr> 
  					  <td class="cat" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="mainoption" type="submit" value="{L_SUBMIT}" /></td>
  					</tr>
! 					<!-- END common_install -->
  				</table></form></td>
  			</tr>
--- 210,219 ----
  						<td class="row2"><input type="radio" name="send_file" value="1"></td>
  					</tr>
! 					<!-- END switch_ftp_option -->
! 					<!-- BEGIN switch_common_install -->
  					<tr> 
  					  <td class="cat" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="mainoption" type="submit" value="{L_SUBMIT}" /></td>
  					</tr>
! 					<!-- END switch_common_install -->
  				</table></form></td>
  			</tr>

[Phpbb-checkins] CVS: phpBB2 posting.php,1.84,1.85

From: Paul S. O. <ps...@us...> - 2001-10-17 23:05:48

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

Modified Files:
	posting.php 
Log Message:
Removed remaining elements of global announcements to prevent confusion

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -r1.84 -r1.85
*** posting.php	2001/10/16 17:15:25	1.84
--- posting.php	2001/10/17 23:05:46	1.85
***************
*** 526,535 ****
  if( isset($HTTP_POST_VARS['topictype']) )
  {
! 	if( $HTTP_POST_VARS['topictype'] == "global" )
  	{
- 		$topic_type = POST_ANNOUNCE_GLOBAL;
- 	}
- 	else if( $HTTP_POST_VARS['topictype']  == "announce" )
- 	{
  		$topic_type = POST_ANNOUNCE;
  	}
--- 526,531 ----
  if( isset($HTTP_POST_VARS['topictype']) )
  {
! 	if( $HTTP_POST_VARS['topictype']  == "announce" )
  	{
  		$topic_type = POST_ANNOUNCE;
  	}
***************
*** 555,559 ****
  {
  	case 'newtopic':
! 		if( $topic_type == POST_ANNOUNCE || $topic_type == POST_GLOBAL_ANNOUNCE )
  		{
  			$is_auth_type = "auth_announce";
--- 551,555 ----
  {
  	case 'newtopic':
! 		if( $topic_type == POST_ANNOUNCE  )
  		{
  			$is_auth_type = "auth_announce";
***************
*** 643,651 ****
  	message_die(GENERAL_MESSAGE, $message);
  }
- else if( $topic_type == POST_GLOBAL_ANNOUNCE && $userdata['user_level'] != ADMIN )
- {
- 	$message = $lang['Sorry_auth'] . $lang['Administrators'] . $auth_string . $lang['this_forum'];
- 	message_die(GENERAL_MESSAGE, $message);
- }
  //
  // End Auth
--- 639,642 ----
***************
*** 945,952 ****
  					$sql .= " WHERE forum_id = $forum_id";
  					
- /*					if( $topic_type != POST_GLOBAL_ANNOUNCE )
- 					{		
- 					}
- */
  					if($db->sql_query($sql))
  					{
--- 936,939 ----
***************
*** 2255,2268 ****
  	$template->assign_block_vars("type_toggle", array());
  
- 	if( $userdata['user_level'] == ADMIN )
- 	{
- 		$global_announce_toggle = '<input type="radio" name="topictype" value="global"';
- 		if( $topic_type == POST_GLOBAL_ANNOUNCE )
- 		{
- 			$global_announce_toggle .= ' checked="checked"';
- 		}
- 		$global_announce_toggle .= ' /> ' . $lang['Post_Global_Announcement'] . '&nbsp;&nbsp;';
- 	}
- 
  	if( $is_auth['auth_announce'] )
  	{
--- 2242,2245 ----
***************
*** 2292,2296 ****
  			$topic_type_toggle .= ' checked="checked"';
  		}
! 		$topic_type_toggle .= ' /> ' . $lang['Post_Normal'] . '&nbsp;&nbsp;' . $sticky_toggle . $announce_toggle . $global_announce_toggle;
  	}
  }
--- 2269,2273 ----
  			$topic_type_toggle .= ' checked="checked"';
  		}
! 		$topic_type_toggle .= ' /> ' . $lang['Post_Normal'] . '&nbsp;&nbsp;' . $sticky_toggle . $announce_toggle;
  	}
  }

[Phpbb-checkins] CVS: phpBB2/admin admin_userauth.php,1.23,1.24

From: Paul S. O. <ps...@us...> - 2001-10-17 00:42:40

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

Modified Files:
	admin_userauth.php 
Log Message:
Fixed error which would cause failure when making user an admin

Index: admin_userauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_userauth.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** admin_userauth.php	2001/10/16 14:43:03	1.23
--- admin_userauth.php	2001/10/17 00:42:37	1.24
***************
*** 122,129 ****
  //
  //
! if(isset($HTTP_POST_VARS['submit']) && !empty($HTTP_POST_VARS[POST_USERS_URL]))
  {
  	$user_id = intval($HTTP_POST_VARS[POST_USERS_URL]);
! 	$adv = (isset($HTTP_POST_VARS['adv'])) ? TRUE : 0;
  
  	//
--- 122,129 ----
  //
  //
! if( isset($HTTP_POST_VARS['submit']) && !empty($HTTP_POST_VARS[POST_USERS_URL]) )
  {
  	$user_id = intval($HTTP_POST_VARS[POST_USERS_URL]);
! 	$adv = ( isset($HTTP_POST_VARS['adv']) ) ? TRUE : 0;
  
  	//
***************
*** 134,146 ****
  	// Get group_id for this user_id
  	//
! 	$sql_groupid = "SELECT ug.group_id, u.user_level
  		FROM " . USER_GROUP_TABLE . " ug, " . USERS_TABLE . " u, " . GROUPS_TABLE . " g
! 		WHERE u.user_id = $user_id
  			AND ug.user_id = u.user_id
  			AND g.group_id = ug.group_id
  			AND g.group_single_user = " . TRUE;
! 	if(!$result = $db->sql_query($sql_groupid))
  	{
! 		// Error no such user/group
  	}
  	$ug_info = $db->sql_fetchrow($result);
--- 134,146 ----
  	// Get group_id for this user_id
  	//
! 	$sql = "SELECT ug.group_id, u.user_level
  		FROM " . USER_GROUP_TABLE . " ug, " . USERS_TABLE . " u, " . GROUPS_TABLE . " g
! 		WHERE u.user_id = $user_id 
  			AND ug.user_id = u.user_id
  			AND g.group_id = ug.group_id
  			AND g.group_single_user = " . TRUE;
! 	if( !$result = $db->sql_query($sql) )
  	{
! 		message_die(GENERAL_ERROR, "Couldn't select info from user/user_group table", "", __LINE__, __FILE__, $sql);
  	}
  	$ug_info = $db->sql_fetchrow($result);
***************
*** 164,168 ****
  			if(!$result = $db->sql_query($sql))
  			{
! 				// Error ...
  			}
  
--- 164,168 ----
  			if(!$result = $db->sql_query($sql))
  			{
! 				message_die(GENERAL_ERROR, "Couldn't update auth access", "", __LINE__, __FILE__, $sql);
  			}
  
***************
*** 175,183 ****
  			if(!$result = $db->sql_query($sql))
  			{
! 				// Error ...
  			}
  		}
  
! 		header("Location: " . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id"));
  
  	}
--- 175,183 ----
  			if(!$result = $db->sql_query($sql))
  			{
! 				message_die(GENERAL_ERROR, "Couldn't update user level", "", __LINE__, __FILE__, $sql);
  			}
  		}
  
! 		header("Location: " . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id", true));
  
  	}
***************
*** 188,197 ****
  		// Make user an admin (if already user)
  		//
! 		$sql_userlevel = "UPDATE " . USERS_TABLE . "
  			SET user_level = " . ADMIN . "
  			WHERE user_id = $user_id";
! 		if(!$result = $db->sql_query($sql_userlevel))
  		{
! 			// Error ...
  		}
  
--- 188,197 ----
  		// Make user an admin (if already user)
  		//
! 		$sql = "UPDATE " . USERS_TABLE . "
  			SET user_level = " . ADMIN . "
  			WHERE user_id = $user_id";
! 		if( !$result = $db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, "Couldn't update user level", "", __LINE__, __FILE__, $sql);
  		}
  
***************
*** 200,220 ****
  		// admin
  		//
! 		$sql_unmod = "UPDATE " . AUTH_ACCESS_TABLE . "
  			SET auth_view = 0, auth_read = 0, auth_post = 0, auth_reply = 0, auth_edit = 0, auth_delete = 0, auth_sticky = 0, auth_announce = 0
  			WHERE group_id = " . $ug_info['group_id'];
! 		if(!$result = $db->sql_query($sql_unmod))
  		{
! 			// Error ...
  		}
  
! 		$sql_unauth = "DELETE FROM " . AUTH_ACCESS_TABLE . "
! 			WHERE group_id = $group_id
  				AND auth_mod = 0";
! 		if(!$result = $db->sql_query($sql_unauth))
  		{
! 			// Error ...
  		}
  
! 		header("Location: " . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id"));
  	}
  	else
--- 200,220 ----
  		// admin
  		//
! 		$sql = "UPDATE " . AUTH_ACCESS_TABLE . "
  			SET auth_view = 0, auth_read = 0, auth_post = 0, auth_reply = 0, auth_edit = 0, auth_delete = 0, auth_sticky = 0, auth_announce = 0
  			WHERE group_id = " . $ug_info['group_id'];
! 		if( !$result = $db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, "Couldn't update auth access", "", __LINE__, __FILE__, $sql);
  		}
  
! 		$sql = "DELETE FROM " . AUTH_ACCESS_TABLE . "
! 			WHERE group_id = " . $ug_info['group_id'] . " 
  				AND auth_mod = 0";
! 		if( !$result = $db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, "Couldn't delete auth access info", "", __LINE__, __FILE__, $sql);
  		}
  
! 		header("Location: " . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id", true));
  	}
  	else
***************
*** 231,235 ****
  		$au_result = $db->sql_query($sql);
  
! 		if($num_u_access = $db->sql_numrows($au_result))
  		{
  			$u_access = $db->sql_fetchrowset($au_result);
--- 231,235 ----
  		$au_result = $db->sql_query($sql);
  
! 		if( $num_u_access = $db->sql_numrows($au_result) )
  		{
  			$u_access = $db->sql_fetchrowset($au_result);
***************
*** 320,335 ****
  			// Moderator control
  			//
! 			while(list($mod_forum_id, $new_mod_status) = @each($change_mod_ary))
  			{
! 				if($mod_forum_id == $this_forum_id)
  				{
  					for($j = 0; $j < count($u_access); $j++)
  					{
! 						if($u_access[$j]['forum_id'] == $this_forum_id)
  						{
  							$cur_mod_status = $u_access[$j]['auth_mod'];
  							$is_single_user = $u_access[$j]['group_single_user'];
  
! 							if($cur_mod_status == $new_mod_status && $is_single_user)
  							{
  								//
--- 320,335 ----
  			// Moderator control
  			//
! 			while( list($mod_forum_id, $new_mod_status) = @each($change_mod_ary) )
  			{
! 				if( $mod_forum_id == $this_forum_id )
  				{
  					for($j = 0; $j < count($u_access); $j++)
  					{
! 						if( $u_access[$j]['forum_id'] == $this_forum_id )
  						{
  							$cur_mod_status = $u_access[$j]['auth_mod'];
  							$is_single_user = $u_access[$j]['group_single_user'];
  
! 							if( $cur_mod_status == $new_mod_status && $is_single_user )
  							{
  								//
***************
*** 338,342 ****
  								$update_mod = TRUE;
  							}
! 							else if($cur_mod_status && !$new_mod_status && !$is_single_user)
  							{
  								//
--- 338,342 ----
  								$update_mod = TRUE;
  							}
! 							else if( $cur_mod_status && !$new_mod_status && !$is_single_user )
  							{
  								//
***************
*** 348,354 ****
  								$warning_mod_frmname[$this_forum_id][] = $forum_access[$i]['forum_name'];
  							}
! 							else if($cur_mod_status != $new_mod_status && $is_single_user)
  							{
! 								if($new_mod_status)
  								{
  									$valid_auth_mod_sql[$this_forum_id] = "UPDATE " . AUTH_ACCESS_TABLE . "
--- 348,354 ----
  								$warning_mod_frmname[$this_forum_id][] = $forum_access[$i]['forum_name'];
  							}
! 							else if( $cur_mod_status != $new_mod_status && $is_single_user )
  							{
! 								if( $new_mod_status )
  								{
  									$valid_auth_mod_sql[$this_forum_id] = "UPDATE " . AUTH_ACCESS_TABLE . "
***************
*** 368,372 ****
  					}
  
! 					if(!$update_mod && $new_mod_status)
  					{
  						$valid_auth_mod_sql[$this_forum_id] = "INSERT INTO " . AUTH_ACCESS_TABLE . "
--- 368,372 ----
  					}
  
! 					if( !$update_mod && $new_mod_status )
  					{
  						$valid_auth_mod_sql[$this_forum_id] = "INSERT INTO " . AUTH_ACCESS_TABLE . "
***************
*** 381,391 ****
  			// Private/ACL control
  			//
! 			while(list($prv_forum_id, $new_prv_ary) = @each($change_prv_list))
  			{
! 				if($prv_forum_id == $this_forum_id && empty($valid_auth_mod_sql[$this_forum_id]) )
  				{
  					for($j = 0; $j < count($u_access); $j++)
  					{
! 						if($u_access[$j]['forum_id'] == $this_forum_id)
  						{
  							$is_single_user = $u_access[$j]['group_single_user'];
--- 381,391 ----
  			// Private/ACL control
  			//
! 			while( list($prv_forum_id, $new_prv_ary) = @each($change_prv_list) )
  			{
! 				if( $prv_forum_id == $this_forum_id && empty($valid_auth_mod_sql[$this_forum_id]) )
  				{
  					for($j = 0; $j < count($u_access); $j++)
  					{
! 						if( $u_access[$j]['forum_id'] == $this_forum_id )
  						{
  							$is_single_user = $u_access[$j]['group_single_user'];
***************
*** 417,421 ****
  									$update_acl = TRUE;
  								}
! 								else if( ( $cur_prv_status || $u_access[$j]['auth_mod'] ) && !$new_prv_status && !$is_single_user && !$warned)
  								{
  									//
--- 417,421 ----
  									$update_acl = TRUE;
  								}
! 								else if( ( $cur_prv_status || $u_access[$j]['auth_mod'] ) && !$new_prv_status && !$is_single_user && !$warned )
  								{
  									//
***************
*** 428,432 ****
  									$warned = TRUE;
  								}
! 								else if($cur_prv_status != $new_prv_status && $is_single_user)
  								{
  									if( $valid_auth_prv_sql_val != "")
--- 428,432 ----
  									$warned = TRUE;
  								}
! 								else if( $cur_prv_status != $new_prv_status && $is_single_user )
  								{
  									if( $valid_auth_prv_sql_val != "")
***************
*** 445,451 ****
  							}
  
! 							if($is_single_user)
  							{
! 								if(!$is_all_zeroed)
  								{
  									$valid_auth_prv_sql[$this_forum_id] .= $valid_auth_prv_sql_val . " WHERE forum_id = $this_forum_id AND group_id = " . $ug_info['group_id'];
--- 445,451 ----
  							}
  
! 							if( $is_single_user )
  							{
! 								if( !$is_all_zeroed )
  								{
  									$valid_auth_prv_sql[$this_forum_id] .= $valid_auth_prv_sql_val . " WHERE forum_id = $this_forum_id AND group_id = " . $ug_info['group_id'];
***************
*** 462,466 ****
  					}
  
! 					if(!$update_acl)
  					{
  						//
--- 462,466 ----
  					}
  
! 					if( !$update_acl )
  					{
  						//
***************
*** 548,552 ****
  			for($i = 0; $i < count($group_ary); $i++)
  			{
! 				if(!empty($valid_auth_prv_sql[$forum_id]))
  				{
  					$warning_list .= "<b><a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=" . $group_ary[$i]) . "\">" . $warning_prv_grpname[$forum_id][$i] . "</a></b> " . $lang['grants_access_status'] . " <b>" . $warning_prv_frmname[$forum_id][$i] . "</b> " . $lang['for_this_user'] . "<br />";
--- 548,552 ----
  			for($i = 0; $i < count($group_ary); $i++)
  			{
! 				if( !empty($valid_auth_prv_sql[$forum_id]) )
  				{
  					$warning_list .= "<b><a href=\"" . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=" . $group_ary[$i]) . "\">" . $warning_prv_grpname[$forum_id][$i] . "</a></b> " . $lang['grants_access_status'] . " <b>" . $warning_prv_frmname[$forum_id][$i] . "</b> " . $lang['for_this_user'] . "<br />";
***************
*** 555,559 ****
  		}
  
! 		if($warning_list != "")
  		{
  			$warning_list = "<br />" . $lang['Conflict_message_userauth'] . "<br/><br/>" . $warning_list . "<br />" . $lang['Click'] . " <a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id") . "\">" . $lang['HERE'] . "</a> ". $lang['return_user_auth_admin'] . "<br />";
--- 555,559 ----
  		}
  
! 		if( $warning_list != "" )
  		{
  			$warning_list = "<br />" . $lang['Conflict_message_userauth'] . "<br/><br/>" . $warning_list . "<br />" . $lang['Click'] . " <a href=\"" . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id") . "\">" . $lang['HERE'] . "</a> ". $lang['return_user_auth_admin'] . "<br />";

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.11,1.12

From: Paul S. O. <ps...@us...> - 2001-10-16 23:34:48

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

Modified Files:
	lang_main.php 
Log Message:
Minor change to message output when no posts exist

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** lang_main.php	2001/10/16 20:56:43	1.11
--- lang_main.php	2001/10/16 23:34:45	1.12
***************
*** 241,244 ****
--- 241,245 ----
  $lang['Newest_First'] = "Newest First";
  $lang['Oldest_First'] = "Oldest First";
+ $lang['No_posts_topic'] = "No posts exist for this topic";
  
  $lang['Return_to_top'] = "Return to top";
***************
*** 1080,1094 ****
  $lang['Unwriteable_config'] = "Your config file is unwriteable at present. A copy of the config file will be downloaded to your when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control centre (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2.";
  $lang['Download_config'] = "Download Config";
- $lang['ftp_choose'] = "Choose Download Method";
- $lang['Attempt_ftp'] = "Attempt to ftp config file into place:";
- $lang['Send_file'] = "Just send the file to me and I'll ftp it manually:";
- $lang['ftp_option'] = "<br />Since the ftp extensions are loaded in php you may will also be given the option of first trying to automatically ftp the config file into place.";
- $lang['ftp_instructs'] = "You have chosen to attempt to ftp the file to your phpBB installation automagically.  Please enter the information below to facilitate this process. Note that the FTP Path should be the exact path via ftp to your phpBB2 installation as if you were ftping to it.";
- $lang['ftp_path'] = "FTP Path to phpBB2:";
- $lang['ftp_username'] = "Your FTP Username:";
- $lang['ftp_password'] = "Your FTP Password:";
- $lang['Transfer_config'] = "Start Transfer";
- $lang['ftp_info'] = "Enter Your FTP Information";
  
  //
  // Ranks admin
--- 1081,1086 ----
  $lang['Unwriteable_config'] = "Your config file is unwriteable at present. A copy of the config file will be downloaded to your when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control centre (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2.";
  $lang['Download_config'] = "Download Config";
  
+ 
  //
  // Ranks admin
***************
*** 1128,1130 ****
  // -------------------------------------------------
  
! ?>
--- 1120,1122 ----
  // -------------------------------------------------
  
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.123,1.124

From: Paul S. O. <ps...@us...> - 2001-10-16 23:34:48

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

Modified Files:
	viewtopic.php 
Log Message:
Minor change to message output when no posts exist

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -r1.123 -r1.124
*** viewtopic.php	2001/10/16 16:38:01	1.123
--- viewtopic.php	2001/10/16 23:34:45	1.124
***************
*** 399,403 ****
  if(!$total_posts = $db->sql_numrows($result))
  {
! 	message_die(GENERAL_ERROR, "There don't appear to be any posts for this topic.", "", __LINE__, __FILE__, $sql);
  }
  $postrow = $db->sql_fetchrowset($result);
--- 399,403 ----
  if(!$total_posts = $db->sql_numrows($result))
  {
! 	message_die(GENERAL_MESSAGE, $lang['No_posts_topic']);
  }
  $postrow = $db->sql_fetchrowset($result);

[Phpbb-checkins] CVS: phpBB2/admin admin_announce.php,1.1,NONE

From: Doug K. <dou...@us...> - 2001-10-16 22:00:15

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

Removed Files:
	admin_announce.php 
Log Message:
Implementation of announcements changing, no longere necessary.

--- admin_announce.php DELETED ---

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.10,1.11

From: Jonathan H. <the...@us...> - 2001-10-16 20:56:46

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

Modified Files:
	lang_main.php 
Log Message:
One additional option for unwritable config file...(FTP) :D


Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** lang_main.php	2001/10/16 16:23:33	1.10
--- lang_main.php	2001/10/16 20:56:43	1.11
***************
*** 1080,1085 ****
  $lang['Unwriteable_config'] = "Your config file is unwriteable at present. A copy of the config file will be downloaded to your when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control centre (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2.";
  $lang['Download_config'] = "Download Config";
  
- 
  //
  // Ranks admin
--- 1080,1094 ----
  $lang['Unwriteable_config'] = "Your config file is unwriteable at present. A copy of the config file will be downloaded to your when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control centre (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2.";
  $lang['Download_config'] = "Download Config";
+ $lang['ftp_choose'] = "Choose Download Method";
+ $lang['Attempt_ftp'] = "Attempt to ftp config file into place:";
+ $lang['Send_file'] = "Just send the file to me and I'll ftp it manually:";
+ $lang['ftp_option'] = "<br />Since the ftp extensions are loaded in php you may will also be given the option of first trying to automatically ftp the config file into place.";
+ $lang['ftp_instructs'] = "You have chosen to attempt to ftp the file to your phpBB installation automagically.  Please enter the information below to facilitate this process. Note that the FTP Path should be the exact path via ftp to your phpBB2 installation as if you were ftping to it.";
+ $lang['ftp_path'] = "FTP Path to phpBB2:";
+ $lang['ftp_username'] = "Your FTP Username:";
+ $lang['ftp_password'] = "Your FTP Password:";
+ $lang['Transfer_config'] = "Start Transfer";
+ $lang['ftp_info'] = "Enter Your FTP Information";
  
  //
  // Ranks admin
***************
*** 1119,1121 ****
  // -------------------------------------------------
  
! ?>
\ No newline at end of file
--- 1128,1130 ----
  // -------------------------------------------------
  
! ?>

[Phpbb-checkins] CVS: phpBB2/templates/subSilver install.tpl,1.2,1.3

From: Jonathan H. <the...@us...> - 2001-10-16 20:56:45

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

Modified Files:
	install.tpl 
Log Message:
One additional option for unwritable config file...(FTP) :D


Index: install.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/install.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** install.tpl	2001/10/09 23:28:31	1.2
--- install.tpl	2001/10/16 20:56:43	1.3
***************
*** 178,184 ****
  					</tr>
  					<tr>
! 						<td class="row1" align="center"><span class="gen">{L_ERROR}</span></th>
  					</tr>
  					<!-- END error_install -->
  					<!-- BEGIN common_install -->
  					<tr> 
--- 178,214 ----
  					</tr>
  					<tr>
! 						<td class="row1" align="center"><span class="gen">{L_ERROR}</span></td>
  					</tr>
  					<!-- END error_install -->
+ 					<!-- BEGIN ftp_file -->
+ 					<tr>
+ 						<th colspan="2">{L_FTP_INFO}</th>
+ 					</tr>
+ 					<tr>
+ 						<td class="row1" align="right"><span class="gen">{L_FTP_PATH}</span></td>
+ 						<td class="row2"><input type="text" name="ftp_dir"></td>
+ 					</tr>
+ 					<tr>
+ 						<td class="row1" align="right"><span class="gen">{L_FTP_USER}</span></td>
+ 						<td class="row2"><input type="text" name="ftp_user"></td>
+ 					</tr>
+ 					<tr>
+ 						<td class="row1" align="right"><span class="gen">{L_FTP_PASS}</span></td>
+ 						<td class="row2"><input type="password" name="ftp_pass"></td>
+ 					</tr>
+ 					<!-- END ftp_file -->
+ 					<!-- BEGIN ftp_option -->
+ 					<tr>
+ 						<th colspan="2">{L_CHOOSE_FTP}</th>
+ 					</tr>
+ 					<tr>
+ 						<td class="row1" align="right" width="50%"><span class="gen">{L_ATTEMPT_FTP}</span></td>
+ 						<td class="row2"><input type="radio" name="send_file" value="2"></td>
+ 					</tr>
+ 					<tr>
+ 						<td class="row1" align="right" width="50%"><span class="gen">{L_SEND_FILE}</span></td>
+ 						<td class="row2"><input type="radio" name="send_file" value="1"></td>
+ 					</tr>
+ 					<!-- END ftp_option -->
  					<!-- BEGIN common_install -->
  					<tr>

[Phpbb-checkins] CVS: phpBB2 install.php,1.7,1.8

From: Jonathan H. <the...@us...> - 2001-10-16 20:56:45

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

Modified Files:
	install.php 
Log Message:
One additional option for unwritable config file...(FTP) :D


Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** install.php	2001/10/14 18:22:32	1.7
--- install.php	2001/10/16 20:56:42	1.8
***************
*** 117,120 ****
--- 117,126 ----
  );
  
+ //
+ // Uncomment the following line to completely disable the ftp option...
+ //
+ 
+ // define('NO_FTP', true);
+ 
  /***************************************************************************
  *		
***************
*** 151,154 ****
--- 157,163 ----
  
  $table_prefix = ( !empty($HTTP_POST_VARS['prefix']) ) ? $HTTP_POST_VARS['prefix'] : "";
+ $ftp_path = ( !empty($HTTP_POST_VARS['ftp_path']) ) ? $HTTP_POST_VARS['ftp_path'] : "";
+ $ftp_user = ( !empty($HTTP_POST_VARS['ftp_user']) ) ? $HTTP_POST_VARS['ftp_user'] : "";
+ $ftp_pass = ( !empty($HTTP_POST_VARS['ftp_pass']) ) ? $HTTP_POST_VARS['ftp_pass'] : "";
  
  include($phpbb_root_path.'includes/sql_parse.'.$phpEx);
***************
*** 199,203 ****
  	exit;
  }
! else if( !empty($HTTP_POST_VARS['send_file']) )
  {
  	header("Content-Type: text/x-delimtext; name=\"config.php\"");
--- 208,212 ----
  	exit;
  }
! else if( !empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == 1 )
  {
  	header("Content-Type: text/x-delimtext; name=\"config.php\"");
***************
*** 213,216 ****
--- 222,335 ----
  	exit;
  }
+ else if( !empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == 2 )
+ {
+ 	//
+ 	// Ok we couldn't write the config file so let's try ftping it.
+ 	//
+ 	if ( get_magic_quotes_gpc() )
+ 	{
+ 		$HTTP_POST_VARS['config_data'] = stripslashes($HTTP_POST_VARS['config_data']);
+ 	}
+ 	$s_hidden_fields = '<input type="hidden" name="config_data" value="'.htmlspecialchars($HTTP_POST_VARS['config_data']).'" />';
+ 	$s_hidden_fields .= '<input type="hidden" name="ftp_file" value="1" />';
+ 	$template->assign_block_vars("ftp_file", array());
+ 	$template->assign_block_vars("common_install", array());
+ 	$template->assign_vars(array(
+ 				"L_INSTRUCTION_TEXT" => $lang['ftp_instructs'],
+ 				"L_FTP_INFO" => $lang['ftp_info'],
+ 				"L_FTP_PATH" => $lang['ftp_path'],
+ 				"L_FTP_PASS" => $lang['ftp_password'],
+ 				"L_FTP_USER" => $lang['ftp_username'],
+ 				"L_SUBMIT" => $lang['Transfer_config'],
+ 				"S_HIDDEN_FIELDS" => $s_hidden_fields, 
+ 				"S_FORM_ACTION" => "install.$phpEx")
+ 	);
+ 	$template->pparse("body");
+ 	exit;
+ }
+ else if( !empty($HTTP_POST_VARS['ftp_file']) )
+ {
+ 	//
+ 	// Here we'll actually send the file...
+ 	//
+ 	if ( get_magic_quotes_gpc() )
+ 	{
+ 		$HTTP_POST_VARS['config_data'] = stripslashes($HTTP_POST_VARS['config_data']);
+ 	}
+ 	$conn_id = ftp_connect('localhost');
+ 	$login_result = ftp_login($conn_id, "$ftp_user", "$ftp_pass");
+ 	if( (!$conn_id) || (!$login_result) )
+ 	{
+ 		//
+ 		// Error couldn't get connected... Go back to option to send file...
+ 		//
+ 		$s_hidden_fields = '<input type="hidden" name="config_data" value="' . htmlspecialchars($config_data) . '" />';
+ 		$s_hidden_fields .= '<input type="hidden" name="send_file" value="1" />';
+ 		$template->assign_block_vars("common_install", array());
+ 		if ( $dbms == 'odbc' )
+ 		{
+ 			//
+ 			// Output the instruction_textions for the odbc...
+ 			//
+ 			$s_hidden_fields .= '<input type="hidden" name="install_step" value="3" />';
+ 			$lang['NoFTP_config'] = $lang['ODBC_Instructs'] . '<br />' . $lang['NoFTP_config'];	
+ 		}
+ 		$template->assign_vars(array(
+ 			"L_INSTRUCTION_TEXT" => $lang['NoFTP_config'],
+ 			"L_SUBMIT" => $lang['Download_config'],
+ 			"S_HIDDEN_FIELDS" => $s_hidden_fields, 
+ 			"S_FORM_ACTION" => "install.$phpEx")
+ 		);
+ 		$template->pparse('body');
+ 		exit();
+ 	}
+ 	else
+ 	{
+ 		//
+ 		// Write out a temp file...
+ 		//
+ 		$tmpfname = tempnam('/tmp', 'cfg');
+ 		@unlink($tmpfname); // unlink for safety on php4.0.3+
+ 		$fp = @fopen($tmpfname, 'w');
+ 		@fwrite($fp, $HTTP_POST_VARS['config_data']);
+ 		@fclose($fp);
+ 		//
+ 		// Now ftp it across.
+ 		//
+ 		@ftp_chdir($conn_id, $ftp_dir);
+ 		$res = ftp_put($conn_id, 'config.php', $tmpfname, FTP_ASCII);
+ 		@ftp_quit($conn_id);
+ 		unlink($tmpfname);
+ 		
+ 		//
+ 		// Ok we are basically done with the install process let's go on 
+ 		// and let the user configure their board now.
+ 		// We are going to do this by calling the admin_board.php from the
+ 		// normal board admin section.
+ 		//
+ 		$s_hidden_fields = '<input type="hidden" name="username" value="' . $admin_name . '" />';
+ 		$s_hidden_fields .= '<input type="hidden" name="password" value="' . $admin_pass1 . '" />';
+ 		$s_hidden_fields .= '<input type="hidden" name="redirect" value="admin/" />';
+ 		$s_hidden_fields .= '<input type="hidden" name="submit" value="Login" />';
+ 		if ( $dbms == 'odbc' )
+ 		{
+ 			//
+ 			// Output the instruction_textions for the odbc...
+ 			//
+ 			$lang['Inst_Step_2'] = $lang['ODBC_Instructs'] . '<br />' . $lang['Inst_Step_2'];
+ 		}
+ 		$template->assign_block_vars("common_install", array());
+ 		$template->assign_vars(array(
+ 			"L_INSTRUCTION_TEXT" => $lang['Inst_Step_2'],
+ 			"L_SUBMIT" => $lang['Finish_Install'],
+ 
+ 			"S_HIDDEN_FIELDS" => $s_hidden_fields, 
+ 			"S_FORM_ACTION" => "login.$phpEx")
+ 		);
+ 		
+ 		$template->pparse('body');
+ 		exit();
+ 	}
+ }
  else if( empty($install_step) || $admin_pass1 != $admin_pass2 || $dbhost == "" )
  {
***************
*** 451,455 ****
  			//
  			$s_hidden_fields = '<input type="hidden" name="config_data" value="' . htmlspecialchars($config_data) . '" />';
! 			$s_hidden_fields .= '<input type="hidden" name="send_file" value="1" />';			
  			if ( $dbms == 'odbc' )
  			{
--- 570,587 ----
  			//
  			$s_hidden_fields = '<input type="hidden" name="config_data" value="' . htmlspecialchars($config_data) . '" />';
! 			if( extension_loaded('ftp') && !defined('NO_FTP') )
! 			{
! 				$template->assign_block_vars('ftp_option', array());
! 				$lang['Unwriteable_config'] .= '<p>'.$lang['ftp_option'].'</p>';
! 				$template->assign_vars(array(
! 					"L_CHOOSE_FTP" => $lang['ftp_choose'],
! 					"L_ATTEMPT_FTP" => $lang['Attempt_ftp'],
! 					"L_SEND_FILE" => $lang['Send_file'])
! 				);
! 			}
! 			else
! 			{
! 				$s_hidden_fields .= '<input type="hidden" name="send_file" value="1" />';
! 			}
  			if ( $dbms == 'odbc' )
  			{
***************
*** 457,464 ****
  				// Output the instruction_textions for the odbc...
  				//
! 				$template->assign_block_vars("common_install", array());
  	
  				$s_hidden_fields .= '<input type="hidden" name="install_step" value="3" />';
! 				$lang['Unwritable_config'] = $lang['ODBC_Instructs'] . '<br />' . $lang['Unwritable_config'];	
  			}
  
--- 589,596 ----
  				// Output the instruction_textions for the odbc...
  				//
! 				// $template->assign_block_vars("common_install", array());
  	
  				$s_hidden_fields .= '<input type="hidden" name="install_step" value="3" />';
! 				$lang['Unwriteable_config'] = $lang['ODBC_Instructs'] . '<p>' . $lang['Unwriteable_config'] . '</p>';	
  			}
  
***************
*** 509,511 ****
  }
  
! ?>
\ No newline at end of file
--- 641,643 ----
  }
  
! ?>

[Phpbb-checkins] CVS: phpBB2 posting.php,1.83,1.84

From: Paul S. O. <ps...@us...> - 2001-10-16 17:15:28

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

Modified Files:
	posting.php 
Log Message:
Fix a few things left over from old global announce stuff

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -r1.83 -r1.84
*** posting.php	2001/10/16 16:21:23	1.83
--- posting.php	2001/10/16 17:15:25	1.84
***************
*** 942,949 ****
  						$sql .= ", forum_topics = forum_topics + 1";
  					}
  					
  /*					if( $topic_type != POST_GLOBAL_ANNOUNCE )
  					{		
- 						$sql .= " WHERE forum_id = $forum_id";
  					}
  */
--- 942,950 ----
  						$sql .= ", forum_topics = forum_topics + 1";
  					}
+ 
+ 					$sql .= " WHERE forum_id = $forum_id";
  					
  /*					if( $topic_type != POST_GLOBAL_ANNOUNCE )
  					{		
  					}
  */
***************
*** 2256,2260 ****
  	if( $userdata['user_level'] == ADMIN )
  	{
! 		$global_announce_toggle = '<input type="radio" name="topictype" value="announce"';
  		if( $topic_type == POST_GLOBAL_ANNOUNCE )
  		{
--- 2257,2261 ----
  	if( $userdata['user_level'] == ADMIN )
  	{
! 		$global_announce_toggle = '<input type="radio" name="topictype" value="global"';
  		if( $topic_type == POST_GLOBAL_ANNOUNCE )
  		{

[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.122,1.123

From: Paul S. O. <ps...@us...> - 2001-10-16 16:38:03

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

Modified Files:
	viewtopic.php 
Log Message:
Fix a few things left over from old global announce stuff

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -r1.122 -r1.123
*** viewtopic.php	2001/10/16 13:09:56	1.122
--- viewtopic.php	2001/10/16 16:38:01	1.123
***************
*** 40,52 ****
  $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
  
- $mode = (isset($HTTP_GET_VARS['mode'])) ? addslashes($HTTP_GET_VARS['mode']) : "";
- 
- $forum_id = (isset($HTTP_GET_VARS['f'])) ? intval($HTTP_GET_VARS['f']) : "";
- 
  //
  // End initial var setup
  //
  
! if( !isset($topic_id) && !isset($post_id) && ($mode != "viewannounce") )
  {
  	message_die(GENERAL_MESSAGE, 'Topic_post_not_exist');
--- 40,48 ----
  $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
  
  //
  // End initial var setup
  //
  
! if( !isset($topic_id) && !isset($post_id) )
  {
  	message_die(GENERAL_MESSAGE, 'Topic_post_not_exist');

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.8,1.9

From: Paul S. O. <ps...@us...> - 2001-10-16 16:37:50

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

Modified Files:
	lang_main.php 
Log Message:
Various fixes and updates so it actually works correctly ... more updates ;)

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** lang_main.php	2001/10/16 14:43:03	1.8
--- lang_main.php	2001/10/16 15:48:24	1.9
***************
*** 1085,1088 ****
--- 1085,1089 ----
  //
  $lang['Must_select_rank'] = "Sorry, you didn't select a rank.  Please go back and try again.";
+ $lang['No_assigned_rank'] = "No special rank assigned";
  $lang['Ranks_title'] = "Rank Administration";
  $lang['Ranks_explain'] = "Here you can add, edit, view, and delete ranks. This is also a place to create custom ranks";

[Phpbb-checkins] CVS: phpBB2 viewforum.php,1.93,1.94 posting.php,1.82,1.83

From: Paul S. O. <ps...@us...> - 2001-10-16 16:37:47

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

Modified Files:
	viewforum.php posting.php 
Log Message:
Fix a few things left over from old global announce stuff

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -r1.93 -r1.94
*** viewforum.php	2001/10/16 13:09:45	1.93
--- viewforum.php	2001/10/16 16:21:23	1.94
***************
*** 303,307 ****
  		AND p.post_id = t.topic_last_post_id
  		AND p.poster_id = u2.user_id
! 		AND t.topic_type = " . POST_ANNOUNCE . "
  	ORDER BY p.post_time DESC";
  if(!$ta_result = $db->sql_query($sql))
--- 303,307 ----
  		AND p.post_id = t.topic_last_post_id
  		AND p.poster_id = u2.user_id
! 		AND t.topic_type = " . POST_ANNOUNCE . " 
  	ORDER BY p.post_time DESC";
  if(!$ta_result = $db->sql_query($sql))

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -r1.82 -r1.83
*** posting.php	2001/10/16 13:09:23	1.82
--- posting.php	2001/10/16 16:21:23	1.83
***************
*** 526,534 ****
  if( isset($HTTP_POST_VARS['topictype']) )
  {
! 	if($HTTP_POST_VARS['topictype']  == "announce")
  	{
  		$topic_type = POST_ANNOUNCE;
  	}
! 	else if($HTTP_POST_VARS['topictype'] == "sticky")
  	{
  		$topic_type = POST_STICKY;
--- 526,538 ----
  if( isset($HTTP_POST_VARS['topictype']) )
  {
! 	if( $HTTP_POST_VARS['topictype'] == "global" )
  	{
+ 		$topic_type = POST_ANNOUNCE_GLOBAL;
+ 	}
+ 	else if( $HTTP_POST_VARS['topictype']  == "announce" )
+ 	{
  		$topic_type = POST_ANNOUNCE;
  	}
! 	else if( $HTTP_POST_VARS['topictype'] == "sticky" )
  	{
  		$topic_type = POST_STICKY;
***************
*** 551,555 ****
  {
  	case 'newtopic':
! 		if( $topic_type == POST_ANNOUNCE )
  		{
  			$is_auth_type = "auth_announce";
--- 555,559 ----
  {
  	case 'newtopic':
! 		if( $topic_type == POST_ANNOUNCE || $topic_type == POST_GLOBAL_ANNOUNCE )
  		{
  			$is_auth_type = "auth_announce";
***************
*** 639,642 ****
--- 643,651 ----
  	message_die(GENERAL_MESSAGE, $message);
  }
+ else if( $topic_type == POST_GLOBAL_ANNOUNCE && $userdata['user_level'] != ADMIN )
+ {
+ 	$message = $lang['Sorry_auth'] . $lang['Administrators'] . $auth_string . $lang['this_forum'];
+ 	message_die(GENERAL_MESSAGE, $message);
+ }
  //
  // End Auth
***************
*** 934,953 ****
  					}
  					
! 					$sqlquery = "SELECT topic_type FROM " . TOPICS_TABLE . "
! 						WHERE topic_id = $topic_id";
! 					if($result = $db->sql_query($sqlquery))
! 					{
! 						$topic_row = $db->sql_fetchrow($result);
! 						$topic_type = intval($topic_row['topic_type']);
! 					}
! 					else
! 					{
! 						message_die(GENERAL_ERROR, "Could not query topics table.", __LINE__, __FILE__, $sqlquery, "");
! 					}
! 					if($topic_type != POST_ANNOUNCE)
  					{		
! 					$sql .= " WHERE forum_id = $forum_id";
  					}
! 					
  					if($db->sql_query($sql))
  					{
--- 943,951 ----
  					}
  					
! /*					if( $topic_type != POST_GLOBAL_ANNOUNCE )
  					{		
! 						$sql .= " WHERE forum_id = $forum_id";
  					}
! */
  					if($db->sql_query($sql))
  					{
***************
*** 2256,2259 ****
--- 2254,2267 ----
  	$template->assign_block_vars("type_toggle", array());
  
+ 	if( $userdata['user_level'] == ADMIN )
+ 	{
+ 		$global_announce_toggle = '<input type="radio" name="topictype" value="announce"';
+ 		if( $topic_type == POST_GLOBAL_ANNOUNCE )
+ 		{
+ 			$global_announce_toggle .= ' checked="checked"';
+ 		}
+ 		$global_announce_toggle .= ' /> ' . $lang['Post_Global_Announcement'] . '&nbsp;&nbsp;';
+ 	}
+ 
  	if( $is_auth['auth_announce'] )
  	{
***************
*** 2283,2287 ****
  			$topic_type_toggle .= ' checked="checked"';
  		}
! 		$topic_type_toggle .= ' /> ' . $lang['Post_Normal'] . '&nbsp;&nbsp;' . $sticky_toggle . $announce_toggle;
  	}
  }
--- 2291,2295 ----
  			$topic_type_toggle .= ' checked="checked"';
  		}
! 		$topic_type_toggle .= ' /> ' . $lang['Post_Normal'] . '&nbsp;&nbsp;' . $sticky_toggle . $announce_toggle . $global_announce_toggle;
  	}
  }

[Phpbb-checkins] CVS: phpBB2/admin admin_users.php,1.28,1.29

From: Paul S. O. <ps...@us...> - 2001-10-16 16:37:45

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

Modified Files:
	admin_users.php 
Log Message:
Various fixes and updates so it actually works correctly ... ;)

Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** admin_users.php	2001/10/16 14:43:03	1.28
--- admin_users.php	2001/10/16 15:41:05	1.29
***************
*** 34,37 ****
--- 34,39 ----
  $phpbb_root_dir = "./../";
  require('pagestart.inc');
+ include($phpbb_root_dir . 'includes/bbcode.'.$phpEx);
+ include($phpbb_root_dir . 'includes/post.'.$phpEx);
  
  if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
***************
*** 129,133 ****
  	exit;
  }
! else if ( ($mode == "edit") || (isset($HTTP_POST_VARS['username']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset($HTTP_POST_VARS[POST_USERS_URL])) )
  {
  	//
--- 131,135 ----
  	exit;
  }
! else if( $mode == "edit" && ( isset($HTTP_POST_VARS['username']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset($HTTP_POST_VARS[POST_USERS_URL]) ) )
  {
  	//
***************
*** 223,227 ****
  	$rank_rows = $db->sql_fetchrowset($result);
  
! 	$rank_select_box = "";
  
  	for($i = 0; $i < $rank_count; $i++)
--- 225,229 ----
  	$rank_rows = $db->sql_fetchrowset($result);
  
! 	$rank_select_box = "<option value=\"0\">" . $lang['No_assigned_rank'] . "</option>";
  
  	for($i = 0; $i < $rank_count; $i++)
***************
*** 229,240 ****
  		$rank = $rank_rows[$i]['rank_title'];
  		$rank_id = $rank_rows[$i]['rank_id'];
! 		if ( $this_userdata['user_rank'] == $i + 1 )
! 		{
! 			$rank_select_box .= "<option value=\"" . $rank_id . "\" selected=\"selected\">" . $rank . "</option>";
! 		}
! 		else
! 		{
! 			$rank_select_box .= "<option value=\"" . $rank_id . "\">" . $rank . "</option>";		
! 		}	
  	}
  
--- 231,237 ----
  		$rank = $rank_rows[$i]['rank_title'];
  		$rank_id = $rank_rows[$i]['rank_id'];
! 		
! 		$selected = ( $this_userdata['user_rank'] == $i + 1 ) ? "selected=\"selected\"" : "";
! 		$rank_select_box .= "<option value=\"" . $rank_id . "\"$selected>" . $rank . "</option>";
  	}
  
***************
*** 352,356 ****
  	$template->pparse("body");
  }
! else if( $HTTP_POST_VARS['mode'] == "save" )
  {
  	//
--- 349,353 ----
  	$template->pparse("body");
  }
! else if( $mode == "save" && isset($HTTP_POST_VARS['submit']) )
  {
  	//
***************
*** 396,403 ****
  	$user_allowpm = (!empty($HTTP_POST_VARS['user_allowpm'])) ? intval($HTTP_POST_VARS['user_allowpm']) : 0;
  	$user_allowavatar = (!empty($HTTP_POST_VARS['user_allowavatar'])) ? intval($HTTP_POST_VARS['user_allowavatar']) : 0;
! 	$user_rank = (!empty($HTTP_POST_VARS['user_rank'])) ? intval($HTTP_POST_VARS['user_rank']) : "";
  	
- 	$user_rank_sql = (isset($user_rank)) ? ", user_rank = " . $user_rank : "";
- 
  	if(isset($HTTP_POST_VARS['submit']))
  	{
--- 393,398 ----
  	$user_allowpm = (!empty($HTTP_POST_VARS['user_allowpm'])) ? intval($HTTP_POST_VARS['user_allowpm']) : 0;
  	$user_allowavatar = (!empty($HTTP_POST_VARS['user_allowavatar'])) ? intval($HTTP_POST_VARS['user_allowavatar']) : 0;
! 	$user_rank = (!empty($HTTP_POST_VARS['user_rank'])) ? intval($HTTP_POST_VARS['user_rank']) : 0;
  	
  	if(isset($HTTP_POST_VARS['submit']))
  	{
***************
*** 512,516 ****
  		{
  			$sql = "UPDATE " . USERS_TABLE . "
! 				SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowavatar = $user_allowavatar, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_allow_pm = $user_allowpm, user_notify_pm = $notifypm, user_lang = '$user_lang', user_style = $user_style, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_active = $user_status, user_actkey = '$user_actkey' " . $user_rank_sql . $avatar_sql . "
  				WHERE user_id = $user_id";
  			if( $result = $db->sql_query($sql) )
--- 507,511 ----
  		{
  			$sql = "UPDATE " . USERS_TABLE . "
! 				SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowavatar = $user_allowavatar, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_allow_pm = $user_allowpm, user_notify_pm = $notifypm, user_lang = '$user_lang', user_style = $user_style, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_active = $user_status, user_actkey = '$user_actkey', user_rank = $user_rank" . $avatar_sql . "
  				WHERE user_id = $user_id";
  			if( $result = $db->sql_query($sql) )

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

From: Paul S. O. <ps...@us...> - 2001-10-16 16:37:44

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

Modified Files:
	admin_users.php 
Log Message:
Various fixes and updates so it actually works correctly ... more updates ;)

Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** admin_users.php	2001/10/16 15:41:05	1.29
--- admin_users.php	2001/10/16 15:44:26	1.30
***************
*** 507,511 ****
  		{
  			$sql = "UPDATE " . USERS_TABLE . "
! 				SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowavatar = $user_allowavatar, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_allow_pm = $user_allowpm, user_notify_pm = $notifypm, user_lang = '$user_lang', user_style = $user_style, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_active = $user_status, user_actkey = '$user_actkey', user_rank = $user_rank" . $avatar_sql . "
  				WHERE user_id = $user_id";
  			if( $result = $db->sql_query($sql) )
--- 507,511 ----
  		{
  			$sql = "UPDATE " . USERS_TABLE . "
! 				SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_sig_bbcode_uid = '$signature_bbcode_uid', user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowavatar = $user_allowavatar, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_allow_pm = $user_allowpm, user_notify_pm = $notifypm, user_lang = '$user_lang', user_style = $user_style, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_active = $user_status, user_actkey = '$user_actkey', user_rank = $user_rank" . $avatar_sql . "
  				WHERE user_id = $user_id";
  			if( $result = $db->sql_query($sql) )

[Phpbb-checkins] CVS: phpBB2/templates/subSilver faq_body.tpl,1.1,1.2 viewforum_body.tpl,1.5,1.6 posting_topic_review.tpl,1.1,1.2 simple_footer.tpl,1.1,1.2 simple_header.tpl,1.1,1.2

From: Paul S. O. <ps...@us...> - 2001-10-16 16:25:00

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

Modified Files:
	faq_body.tpl viewforum_body.tpl posting_topic_review.tpl 
	simple_footer.tpl simple_header.tpl 
Log Message:
Various updates, Tom

Index: faq_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/faq_body.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** faq_body.tpl	2001/10/05 08:29:32	1.1
--- faq_body.tpl	2001/10/16 16:24:51	1.2
***************
*** 1,11 ****
  <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
    <tr> 
! 	<th class="thRight">{L_FAQ}</th>
    </tr>
!   <!-- BEGIN faqrow -->  
    <tr> 
! 	<td width="22%" align="left" valign="top" class="{faqrow.ROW_CLASS}"><span class="name"><b>{faqrow.FAQ_QUESTION}</b></span><br />
! 	  <br />
! 	  <span class="postbody">{faqrow.FAQ_ANSWER}</span>
  	</td>
    </tr>
--- 1,11 ----
  <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
    <tr> 
! 	<th class="thHead">{L_FAQ}</th>
    </tr>
!   <!-- BEGIN faqrow -->  
    <tr> 
! 	<td width="22%" align="left" valign="top" class="row1"><span class="name"><b>{faqrow.FAQ_QUESTION}</b></span><br />
! 	  <br />
! 	  <span class="postbody">{faqrow.FAQ_ANSWER}</span>
  	</td>
    </tr>

Index: viewforum_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/viewforum_body.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** viewforum_body.tpl	2001/10/10 15:01:05	1.5
--- viewforum_body.tpl	2001/10/16 16:24:51	1.6
***************
*** 69,73 ****
  	<td>&nbsp;&nbsp;</td>
  	<td width="20" align="center"><img src="templates/subSilver/images/folder_announce.gif" alt="No new posts" width="19" height="18" /></td>
! 	<td class="gensmall">Announement</td>
  	<td class="gensmall">&nbsp;</td>
  	<td class="gensmall"><img src="templates/subSilver/images/folder_lock.gif" alt="{L_NEWPOSTS}" width="19" height="18" /></td>
--- 69,73 ----
  	<td>&nbsp;&nbsp;</td>
  	<td width="20" align="center"><img src="templates/subSilver/images/folder_announce.gif" alt="No new posts" width="19" height="18" /></td>
! 	<td class="gensmall">Announcement</td>
  	<td class="gensmall">&nbsp;</td>
  	<td class="gensmall"><img src="templates/subSilver/images/folder_lock.gif" alt="{L_NEWPOSTS}" width="19" height="18" /></td>

Index: posting_topic_review.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/posting_topic_review.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** posting_topic_review.tpl	2001/10/16 11:12:27	1.1
--- posting_topic_review.tpl	2001/10/16 16:24:52	1.2
***************
*** 3,16 ****
  <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
  	<tr> 
! 	  <th class="thTop" height="25"><b>{L_TOPIC_REVIEW}</b></th>
  	</tr>
  	<tr>
! 		<td><iframe width="100%" height="300" src="{U_REVIEW_TOPIC}">
  <!-- END switch_inline_mode -->
  
! <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
! 	<tr>
! 		<th class="thLeft" width="22%" height="26">{L_AUTHOR}</th>
! 		<th class="thRight">{L_MESSAGE}</th>
  	</tr>
  	<!-- BEGIN postrow -->
--- 3,17 ----
  <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
  	<tr> 
! 	  
! 	<td class="catHead" height="28" align="center"><b>{L_TOPIC_REVIEW}</b></td>
  	</tr>
  	<tr>
! 		<td class="row1"><iframe width="100%" height="300" src="{U_REVIEW_TOPIC}" >
  <!-- END switch_inline_mode -->
  
! 	  <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" style="border: 0px #006699 solid ">
! 		<tr>
! 		<th class="thCornerL" width="22%" height="26">{L_AUTHOR}</th>
! 		<th class="thCornerR">{L_MESSAGE}</th>
  	</tr>
  	<!-- BEGIN postrow -->

Index: simple_footer.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/simple_footer.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** simple_footer.tpl	2001/10/16 11:12:27	1.1
--- simple_footer.tpl	2001/10/16 16:24:52	1.2
***************
*** 18,24 ****
  <div align="center"> <span class="copyright"><br />Powered by phpBB {PHPBB_VERSION} &copy; 2001 <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB 
    Group</a></span></div>
- 	</td>
-   </tr>
- </table>
  &nbsp;
  </body>
--- 18,21 ----

Index: simple_header.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/simple_header.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** simple_header.tpl	2001/10/16 11:12:27	1.1
--- simple_header.tpl	2001/10/16 16:24:52	1.2
***************
*** 25,28 ****
--- 25,34 ----
  		scrollbar-arrow-color:  #006699; scrollbar-track-color: #EFEFEF;
  		scrollbar-darkshadow-color: #7294AF;
+ 		margin-bottom:0px; 
+ 		margin-left:0px; 
+ 		margin-right:0px; 
+ 		margin-top:0px; 
+ } 
+ 
  }
  
***************
*** 209,213 ****
  
  <body bgcolor="{T_BODY_BGCOLOR}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}">
! <span class="gen"><a name="top"></a></span><table width="100%" border="0" cellspacing="0" cellpadding="10" align="center"> 
! <tr> 
! 	<td class="bodyline"> 
--- 215,217 ----
  
  <body bgcolor="{T_BODY_BGCOLOR}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}">
! <span class="gen"><a name="top"></a></span>

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

Flat | Threaded

<< < 1 .. 621 622 623 624 625 .. 629 > >> (Page 623 of 629)