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

[Phpbb-checkins] CVS: phpBB2 faq.php,1.9,1.10

[Paul S. O. <ps...@us...>]

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

Modified Files:
	faq.php 
Log Message:
Added BBCode guide as separate file ... no doubt this will annoy some, oh well :)

Index: faq.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/faq.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** faq.php	2001/11/27 21:37:31	1.9
--- faq.php	2001/12/17 00:24:06	1.10
***************
*** 37,42 ****
  // Load the appropriate faq file
  //
- include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_faq.' . $phpEx);
  
  //
  // Pull the array data from the lang pack
--- 37,62 ----
  // Load the appropriate faq file
  //
  
+ if( isset($HTTP_GET_VARS['mode']) )
+ {
+ 	switch( $HTTP_GET_VARS['mode'] )
+ 	{
+ 		case 'bbcode':
+ 			$lang_file = "lang_bbcode";
+ 			$l_title = $lang['BBCode_guide'];
+ 			break;
+ 		default:
+ 			$lang_file = "lang_faq";
+ 			$l_title = $lang['FAQ'];
+ 			break;
+ 	}
+ }
+ else
+ {
+ 	$lang_file = "lang_faq";
+ 	$l_title = $lang['FAQ'];
+ }
+ include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/' . $lang_file . '.' . $phpEx);
+ 
  //
  // Pull the array data from the lang pack
***************
*** 72,76 ****
  // Lets build a page ...
  //
! $page_title = $lang['FAQ'];
  include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
--- 92,96 ----
  // Lets build a page ...
  //
! $page_title = $l_title;
  include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
***************
*** 92,96 ****
  
  $template->assign_vars(array(
! 	"L_FAQ" => $lang['FAQ'])
  );
  
--- 112,116 ----
  
  $template->assign_vars(array(
! 	"L_FAQ_TITLE" => $l_title)
  );
  

[Phpbb-checkins] CVS: phpBB2/templates/subSilver faq_body.tpl,1.6,1.7

[Paul S. O. <ps...@us...>]

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

Modified Files:
	faq_body.tpl 
Log Message:
Added BBCode guide as separate file ... no doubt this will annoy some, oh well :)

Index: faq_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/faq_body.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** faq_body.tpl	2001/11/27 21:37:31	1.6
--- faq_body.tpl	2001/12/17 00:24:05	1.7
***************
*** 8,12 ****
  <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" align="center">
  	<tr>
! 		<th class="thHead">{L_FAQ}</th>
  	</tr>
  	<tr>
--- 8,12 ----
  <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" align="center">
  	<tr>
! 		<th class="thHead">{L_FAQ_TITLE}</th>
  	</tr>
  	<tr>

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_bbcode.php,NONE,1.1

[Paul S. O. <ps...@us...>]

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

Added Files:
	lang_bbcode.php 
Log Message:
Added BBCode guide as separate file ... no doubt this will annoy some, oh well :)

--- NEW FILE ---
<?php
/***************************************************************************
 *                          lang_faq.php [english]
 *                            -------------------
 *   begin                : Wednesday Oct 3, 2001
 *   copyright            : (C) 2001 The phpBB Group
 *   email                : su...@ph...
 *
 *   $Id: lang_bbcode.php,v 1.1 2001/12/17 00:24:05 psotfx Exp $
 *
 *
 ***************************************************************************/

/***************************************************************************
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 ***************************************************************************/
 
// 
// To add an entry to your FAQ simply add a line to this file in this format:
// $faq[] = array("question", "answer");
// If you want to separate a section enter $faq[] = array("--","Block heading goes here if wanted");
// Links will be created automatically
//
// DO NOT forget the ; at the end of the line.
// Do NOT put double quotes (") in your FAQ entries, if you absolutely must then escape them ie. \"something\"
//
// The FAQ items will appear on the FAQ page in the same order they are listed in this file
//
 
  
$faq[] = array("--","Introduction");
$faq[] = array("What is BBCode?", "BBCode is a special implementation of HTML, whether you can use BBCode is determined by the administrator (you can also disable it on a per post basis from the posting form). BBCode itself is similar in style to HTML, tags are enclosed in square braces [ and ] rather than &lt; and &gt; and it offers greater control over what and how something is displayed. Depending on the template you are using you may find adding BBCode to your posts is made much easier through a clickable interface above the message area on the posting form. Even with this you may find the following guide useful.");

$faq[] = array("--","Text Formatting");
$faq[] = array("How to create bold, italic and underlined text", "BBCode includes tags to enable you to change the basic look of your text. This is achieved in the following ways: <ul><li>To make a piece of text bold enclose it in <b>[b][/b]</b>, eg. <br /><br /><b>[b]</b>Hello<b>[/b]</b><br /><br />will become <b>Hello</b></li><li>For underlining use <b>[u][/u]</b>, for example:<br /><br /><b>[u]</b>Good Morning<b>[/u]</b><br /><br />becomes <u>Good Morning</u></li><li>To italicise text use <b>[i][/i]</b>, eg.<br /><br />This is <b>[i]</b>Great!<b>[/i]</b><br /><br />would give This is <i>Great!</i></li></ul>");
$faq[] = array("How to change the text colour or size", "To alter the text colour or size the following tags are used, keep in mind that how the output appears will depend on the persons browser and system: <ul><li>Changing the colour of text is achieved by wrapping it in <b>[color=][/color]</b>, you can specify either a recognised colour name (eg. red, blue, yellow, etc.) or the hexadecimal triplet alternative, eg. #FFFFFF, #000000. For example, to create red text you could use:<br /><br /><b>[color=red]</b>Hello!<b>[/color]</b><br /><br />or<br /><br /><b>[color=#FF0000]</b>Hello!<b>[/color]</b><br /><br />will both output <span style=\"color:red\">Hello!</span></li><li>Changing the text size is achieved in a similar way using <b>[size=][/size]</b>. This tag is dependent on the template you are using but the recommended format is a numerical value representing the text size in pixels, starting at 1 (so tiny you will not see it!) through to 29 (very large!). For example:<br /><br /><b>[size=9]</b>SMALL<b>[/size]</b><br /><br />will generally be <span style=\"font-size:9px\">SMALL</span><br /><br />whereas:<br /><br /><b>[size=24]</b>HUGE!<b>[/size]</b><br /><br />will be <span style=\"font-size:24px\">HUGE!</span></li></ul>");
$faq[] = array("Can I combine formatting tags?", "Yes, of course you can, for example to get someones attention you may write:<br /><br /><b>[size=18][color=red][b]</b>LOOK AT ME!<b>[/b][/color][/size]</b><br /><br />this would output <span style=\"color:red;font-size:18px\"><b>LOOK AT ME!</b></span><br /><br />We don't recommend you output lots of text that looks like this though! Remember it is up to you, the poster to ensure tags are closed correctly. For example the following is incorrect:<br /><br /><b>[b][u]</b>This is wrong<b>[/b][/u]</b>");

$faq[] = array("--","Quoting and outputting fixed-width text");
$faq[] = array("Quoting text in replies", "There are two ways you can quote someone elses text, with a reference or without. When you hit use the quote function of the board you should notice that the post you are responding too is automatically added to the text window enclosed in a <b>[quote=\"\"][/quote]</b> block. This method allows you to quote with a reference to a person, thing, whatever. For example to quote a piece of text Mr. Blobby wrote you would enter:<br /><br /><b>[quote=\"Mr. Blobby\"]</b>The text Mr. Blobby wrote would go here<b>[/quote]</b><br /><br />The resulting output will automatically add, Mr. Blobby wrote: before the actual text. Remember to include the parenthesis \"\" around the name you are quoting! The second method allows you to blindly quote something, in this case just enclose the text in <b>[quote][/quote]</b>. The output generated will simply add, Quote: before the text itself.");
$faq[] = array("Outputting code or fixed width data", "If you want to output a piece of code or in fact anything that requires a  fixed width, eg. Courier type font then you should enclose the text in <b>[code][/code]</b>, eg.<br /><br /><b>[code]</b>echo \"This is some code\";<b>[/code]</b><br /><br /> All the formatting used within those tags will be retained.");

$faq[] = array("--","Generating lists");
$faq[] = array("Creating an Un-ordered list", "BBCode supports two types of lists, unordered and ordered, they are essentially the same as their HTML equivalents. An unordered list just ouputs your text one by one with only a bullet character to separate them. To create an unordered list you use <b>[list][/list]</b> and define each item within the list using <b>[*]</b>. For example to list your favorite colours you could use something like:<br /><br /><b>[list]</b><br /><b>[*]</b>Red<br /><b>[*]</b>Blue<br /><b>[*]</b>Yellow<br /><b>[/list]</b><br /><br />This would generate the following list:<ul><li>Red</li><li>Blue</li><li>Yellow</li></ul>");
$faq[] = array("Creating an Ordered list", "The second type of list, an ordered list gives you control over what is output before each item. To create an ordered list you use <b>[list=1][/list]</b> or alternatively <b>[list=a][/list]</b> items are still specified using <b>[*]</b>. The first list will output a numbered list while the second will use letters of the alphabet. For example:<br /><br /><b>[list=1]</b><br /><b>[*]</b>Go to the shops<br /><b>[*]</b>Buy a new computer<br /><b>[*]</b>Swear at computer when it crashes<br /><b>[/list]</b><br /><br />will generate the following:<ol type=\"1\"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use:<br /><br /><b>[list=a]</b><br /><b>[*]</b>The first possible answer<br /><b>[*]</b>The second possible answer<br /><b>[*]</b>The third possible answer<br /><b>[/list]</b><br /><br />giving<ol type=\"a\"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>");

$faq[] = array("--", "Creating Links");
$faq[] = array("Linking to another site", "phpBB BBCode supports a number of ways of creating URIs, Uniform Resource Indicators better known as URLs. The first of these uses the <b>[url=][/url]</b> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><b>[url=http://www.phpbb.com/]</b>Visit phpBB!<b>[/url]</b><br /><br />This would generate the following link, <a href=\"http://www.phpbb.com/\" target=\"_blank\">Visit phpBB!</a> You will notice the link opens in a new window so the user can continue browsing the forums if they wish. If you want the URL itself displayed as the link you can do this simply using:<br /><br /><b>[url]</b>http://www.phpbb.com/<b>[/url]</b><br /><br />This would generate the following link, <a href=\"http://www.phpbb.com/\" target=\"_blank\">http://www.phpbb.com/</a>. Alternatively phpBB features something called <i>Magic Links</i>, this will turn any syntatically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href=\"http://www.phpbb.com/\" target=\"_blank\">www.phpbb.com</a> being output when you view the message. The same thing applies equally to email addresses, you can either specify an address explicitly for example:<br /><br /><b>[email]</b>no...@do...<b>[/email]</b><br /><br />which will output <a href=\"emailto:no...@do...\">no...@do...</a> or you can just type no...@do... into your message and it will be automatically converted when you view. In addition you can wrap URLs around any of the other tags such as <b>[img][/img]</b> (see next entry), <b>[b][/b]</b>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><b>[url=http://www.phpbb.com/][img]</b>http://www.phpbb.com/images/phplogo.gif<b>[/url][/img]</b><br /><br />is <u>not</u> correct which may lead to your post being deleted so take care.");

$faq[] = array("--", "Showing images in posts");
$faq[] = array("Adding an image to a post", "phpBB BBCode includes a tag for including images in your posts. Two very important things to remember when using this tag are, many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot only exist on your computer for example, unless you run a webserver!) there is no present way of storing images locally with phpBB (both of these issues will be addressed in the next release of phpBB). To display an image you must surround the URL pointing to the image with <b>[img][/img]</b> tags. For example:<br /><br /><b>[img]</b>http://www.phpbb.com/images/phplogo.gif<b>[/img]</b><br /><br />As noted in the URL section above you can wrap an image in a <b>[url][/url]</b> tag if you wish, eg.<br /><br /><b>[url=http://www.phpbb.com/][img]</b>http://www.phpbb.com/images/phplogo.gif<b>[/img][/url]</b><br /><br />would generate:<br /><br /><a href=\"http://www.phpbb.com/\" target=\"_blank\"><img src=\"http://www.phpbb.com/images/phplogo.gif\" border=\"0\" alt=\"\" /></a><br />");

$faq[] = array("--", "Other matters");
$faq[] = array("Can I add my own tags?", "No, I am afraid not directly in phpBB 2.0. We are looking at offering customisable BBCode tags for the next major version");

//
// This ends the FAQ entries
//

?>

[Phpbb-checkins] CVS: phpBB2/templates/subSilver posting_body.tpl,1.14,1.15 posting_smilies.tpl,1.1,1.2

[Paul S. O. <ps...@us...>]

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

Modified Files:
	posting_body.tpl posting_smilies.tpl 
Log Message:
Ooops left explicit sizes in smilies panel which isn't great for weird size smilies ...

Index: posting_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/posting_body.tpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** posting_body.tpl	2001/12/16 18:13:34	1.14
--- posting_body.tpl	2001/12/17 00:06:13	1.15
***************
*** 259,263 ****
  				<tr align="center" valign="middle"> 
  				  <!-- BEGIN smilies_col -->
! 				  <td><a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" width="15" height="15" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a></td>
  				  <!-- END smilies_col -->
  				</tr>
--- 259,263 ----
  				<tr align="center" valign="middle"> 
  				  <!-- BEGIN smilies_col -->
! 				  <td><a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a></td>
  				  <!-- END smilies_col -->
  				</tr>

Index: posting_smilies.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/posting_smilies.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** posting_smilies.tpl	2001/12/16 18:01:23	1.1
--- posting_smilies.tpl	2001/12/17 00:06:13	1.2
***************
*** 27,31 ****
  					<tr align="center" valign="middle"> 
  						<!-- BEGIN smilies_col -->
! 						<td><a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" width="15" height="15" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a></td>
  						<!-- END smilies_col -->
  					</tr>
--- 27,31 ----
  					<tr align="center" valign="middle"> 
  						<!-- BEGIN smilies_col -->
! 						<td><a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a></td>
  						<!-- END smilies_col -->
  					</tr>

[Phpbb-checkins] CVS: phpBB2/db/schemas mssql_basic.sql,1.5,1.6 mysql_basic.sql,1.6,1.7 postgres_basic.sql,1.6,1.7

[Paul S. O. <ps...@us...>]

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

Modified Files:
	mssql_basic.sql mysql_basic.sql postgres_basic.sql 
Log Message:
Why didn't these commit yesterday with the other changes .. hmmm, even the history says they were in the CL ...strange

Index: mssql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mssql_basic.sql,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** mssql_basic.sql	2001/12/14 16:32:32	1.5
--- mssql_basic.sql	2001/12/16 20:31:12	1.6
***************
*** 142,146 ****
  SET IDENTITY_INSERT phpbb_themes ON;
  
! INSERT INTO phpbb_themes (themes_id, template_name, style_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (1,'subSilver','subSilver','','','E5E5E5','000000','006699','5584AA','FF9933','EDF2F2','EFEFEF','DEE3E7','c2cdd6','','','','CBD3D9','BCBCBC','1B7CAD','','','','AEBDC4','006699','FFFFFF','row1','row2','','Verdana,Arial,Helvetica,sans-serif','Verdana,Arial,Helvetica,sans-serif','courier','','','','004c75','004c75','004c75','','','');
  
  SET IDENTITY_INSERT phpbb_themes OFF;
--- 142,146 ----
  SET IDENTITY_INSERT phpbb_themes ON;
  
! INSERT INTO phpbb_themes (themes_id, template_name, style_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (1,'subSilver','subSilver','subSilver.css','','E5E5E5','000000','006699','5584AA','FF9933','EDF2F2','EFEFEF','DEE3E7','c2cdd6','','','','CBD3D9','BCBCBC','1B7CAD','','','','AEBDC4','006699','FFFFFF','row1','row2','','Verdana,Arial,Helvetica,sans-serif','Verdana,Arial,Helvetica,sans-serif','courier','','','','004c75','004c75','004c75','','','');
  
  SET IDENTITY_INSERT phpbb_themes OFF;

Index: mysql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_basic.sql,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** mysql_basic.sql	2001/12/14 16:32:32	1.6
--- mysql_basic.sql	2001/12/16 20:31:12	1.7
***************
*** 95,99 ****
  
  # -- Themes
! INSERT INTO phpbb_themes (themes_id, template_name, style_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (1, 'subSilver', 'subSilver', NULL, NULL, 'E5E5E5', '000000', '006699', '5584AA', 'FF9933', 'EDF2F2', 'EFEFEF', 'DEE3E7', 'c2cdd6', NULL, NULL, NULL, 'CBD3D9', 'BCBCBC', '1B7CAD', NULL, NULL, NULL, 'AEBDC4', '006699', 'FFFFFF', 'row1', 'row2', NULL, 'Verdana, Arial, Helvetica, sans-serif', 'Verdana, Arial, Helvetica, sans-serif', 'courier', NULL, NULL, NULL, '004c75', '004c75', '004c75', NULL, NULL, NULL);
  
  
--- 95,99 ----
  
  # -- Themes
! INSERT INTO phpbb_themes (themes_id, template_name, style_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (1, 'subSilver', 'subSilver', 'subSilver.css', NULL, 'E5E5E5', '000000', '006699', '5584AA', 'FF9933', 'EDF2F2', 'EFEFEF', 'DEE3E7', 'c2cdd6', NULL, NULL, NULL, 'CBD3D9', 'BCBCBC', '1B7CAD', NULL, NULL, NULL, 'AEBDC4', '006699', 'FFFFFF', 'row1', 'row2', NULL, 'Verdana, Arial, Helvetica, sans-serif', 'Verdana, Arial, Helvetica, sans-serif', 'courier', NULL, NULL, NULL, '004c75', '004c75', '004c75', NULL, NULL, NULL);
  
  

Index: postgres_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/postgres_basic.sql,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** postgres_basic.sql	2001/12/14 16:32:33	1.6
--- postgres_basic.sql	2001/12/16 20:31:12	1.7
***************
*** 95,99 ****
  
  -- Themes
! INSERT INTO phpbb_themes (themes_id, template_name, style_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (1, 'subSilver', 'subSilver', NULL, NULL, 'E5E5E5', '000000', '006699', '5584AA', 'FF9933', 'EDF2F2', 'EFEFEF', 'DEE3E7', 'c2cdd6', NULL, NULL, NULL, 'CBD3D9', 'BCBCBC', '1B7CAD', NULL, NULL, NULL, 'AEBDC4', '006699', 'FFFFFF', 'row1', 'row2', NULL, 'Verdana, Arial, Helvetica, sans-serif', 'Verdana, Arial, Helvetica, sans-serif', 'courier', NULL, NULL, NULL, '004c75', '004c75', '004c75', NULL, NULL, NULL);
  
  
--- 95,99 ----
  
  -- Themes
! INSERT INTO phpbb_themes (themes_id, template_name, style_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (1, 'subSilver', 'subSilver', 'subSilver.css', NULL, 'E5E5E5', '000000', '006699', '5584AA', 'FF9933', 'EDF2F2', 'EFEFEF', 'DEE3E7', 'c2cdd6', NULL, NULL, NULL, 'CBD3D9', 'BCBCBC', '1B7CAD', NULL, NULL, NULL, 'AEBDC4', '006699', 'FFFFFF', 'row1', 'row2', NULL, 'Verdana, Arial, Helvetica, sans-serif', 'Verdana, Arial, Helvetica, sans-serif', 'courier', NULL, NULL, NULL, '004c75', '004c75', '004c75', NULL, NULL, NULL);
  
  

[Phpbb-checkins] CVS: phpBB2/templates/subSilver index_body.tpl,1.13,1.14

[Paul S. O. <ps...@us...>]

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

Modified Files:
	index_body.tpl 
Log Message:
Changed way moderator lang is output on viewforum and index

Index: index_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/index_body.tpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** index_body.tpl	2001/12/15 17:35:52	1.13
--- index_body.tpl	2001/12/16 18:58:05	1.14
***************
*** 31,35 ****
  	<td class="row1" width="100%" height="50"><span class="forumlink"> <a href="{catrow.forumrow.U_VIEWFORUM}" class="forumlink">{catrow.forumrow.FORUM_NAME}</a><br />
  	  </span> <span class="genmed">{catrow.forumrow.FORUM_DESC}<br />
! 	  </span><span class="gensmall">{L_MODERATOR} {catrow.forumrow.MODERATORS}</span></td>
  	<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{catrow.forumrow.TOPICS}</span></td>
  	<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{catrow.forumrow.POSTS}</span></td>
--- 31,35 ----
  	<td class="row1" width="100%" height="50"><span class="forumlink"> <a href="{catrow.forumrow.U_VIEWFORUM}" class="forumlink">{catrow.forumrow.FORUM_NAME}</a><br />
  	  </span> <span class="genmed">{catrow.forumrow.FORUM_DESC}<br />
! 	  </span><span class="gensmall">{catrow.forumrow.L_MODERATOR} {catrow.forumrow.MODERATORS}</span></td>
  	<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{catrow.forumrow.TOPICS}</span></td>
  	<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{catrow.forumrow.POSTS}</span></td>

[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.80,1.81 auth.php,1.33,1.34

[Paul S. O. <ps...@us...>]

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

Modified Files:
	page_header.php auth.php 
Log Message:
Changed way moderator lang is output on viewforum and index

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -r1.80 -r1.81
*** page_header.php	2001/12/15 16:40:02	1.80
--- page_header.php	2001/12/16 18:53:44	1.81
***************
*** 270,274 ****
  	"L_POSTS" => $lang['Posts'],
  	"L_LASTPOST" => $lang['Last_Post'],
- 	"L_MODERATOR" => $lang['Moderator'],
  	"L_NO_NEW_POSTS" => $lang['No_new_posts'],
  	"L_NEW_POSTS" => $lang['New_posts'],
--- 270,273 ----

Index: auth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/auth.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** auth.php	2001/11/21 01:20:17	1.33
--- auth.php	2001/12/16 18:53:44	1.34
***************
*** 57,61 ****
  	global $db, $lang;
  
! 	switch($type)
  	{
  		case AUTH_ALL:
--- 57,61 ----
  	global $db, $lang;
  
! 	switch( $type )
  	{
  		case AUTH_ALL:
***************
*** 125,129 ****
  	// then we need to pull the auth information on the given forum (or all forums)
  	//
! 	if($f_access == -1)
  	{
  		$forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? "WHERE a.forum_id = $forum_id" : "";
--- 125,129 ----
  	// then we need to pull the auth information on the given forum (or all forums)
  	//
! 	if( $f_access == -1 )
  	{
  		$forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? "WHERE a.forum_id = $forum_id" : "";
***************
*** 140,144 ****
  		else
  		{
! 			if(!$db->sql_numrows($af_result))
  			{
  				message_die(GENERAL_ERROR, "No forum access control lists exist!", "", __LINE__, __FILE__, $sql);
--- 140,144 ----
  		else
  		{
! 			if( !$db->sql_numrows($af_result) )
  			{
  				message_die(GENERAL_ERROR, "No forum access control lists exist!", "", __LINE__, __FILE__, $sql);
***************
*** 158,186 ****
  	$auth_user = array();
  
! 	if($userdata['session_logged_in'])
  	{
  		$forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? "AND a.forum_id = $forum_id" : "";
  
! /*		$sql = "SELECT au.forum_id, $a_sql, au.auth_mod, g.group_single_user
! 			FROM " . AUTH_ACCESS_TABLE . " au, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE. " g
! 			WHERE ug.user_id = " . $userdata['user_id'] . "
! 				AND g.group_id = ug.group_id
! 				AND (
! 					( au.user_id = ug.user_id
! 						AND g.group_id = 0 )
! 					OR
! 					( au.group_id = ug.group_id
! 						AND g.group_id <> 0 )
! 					)
! 				$forum_match_sql";*/
! 		$sql = "SELECT a.forum_id, $a_sql, a.auth_mod, g.group_single_user
! 			FROM " . AUTH_ACCESS_TABLE . " a, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g
  			WHERE ug.user_id = ".$userdata['user_id']. " 
  				AND ug.user_pending = 0 
- 				AND g.group_id = ug.group_id
  				AND a.group_id = ug.group_id
  				$forum_match_sql";
  		$a_result = $db->sql_query($sql);
! 		if(!$a_result)
  		{
  			message_die(GENERAL_ERROR, "Failed obtaining forum access control lists", "", __LINE__, __FILE__, $sql);
--- 158,173 ----
  	$auth_user = array();
  
! 	if( $userdata['session_logged_in'] )
  	{
  		$forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? "AND a.forum_id = $forum_id" : "";
  
! 		$sql = "SELECT a.forum_id, $a_sql, a.auth_mod 
! 			FROM " . AUTH_ACCESS_TABLE . " a, " . USER_GROUP_TABLE . " ug 
  			WHERE ug.user_id = ".$userdata['user_id']. " 
  				AND ug.user_pending = 0 
  				AND a.group_id = ug.group_id
  				$forum_match_sql";
  		$a_result = $db->sql_query($sql);
! 		if( !$a_result )
  		{
  			message_die(GENERAL_ERROR, "Failed obtaining forum access control lists", "", __LINE__, __FILE__, $sql);
***************
*** 188,192 ****
  
  		$num_u_access = $db->sql_numrows($a_result);
! 		if($num_u_access)
  		{
  			if($forum_id != AUTH_LIST_ALL)
--- 175,179 ----
  
  		$num_u_access = $db->sql_numrows($a_result);
! 		if( $num_u_access )
  		{
  			if($forum_id != AUTH_LIST_ALL)
***************
*** 196,200 ****
  			else
  			{
! 				while($u_row = $db->sql_fetchrow($a_result))
  				{
  					$u_access[$u_row['forum_id']][] = $u_row;
--- 183,187 ----
  			else
  			{
! 				while( $u_row = $db->sql_fetchrow($a_result) )
  				{
  					$u_access[$u_row['forum_id']][] = $u_row;
***************
*** 204,208 ****
  	}
  
! 	$is_admin = ($userdata['user_level'] == ADMIN && $userdata['session_logged_in']) ? TRUE : 0;
  
  	$auth_user = array();
--- 191,195 ----
  	}
  
! 	$is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0;
  
  	$auth_user = array();
***************
*** 234,266 ****
  		// and instead set the auth to whatever the OR'd contents of the access levels are.
  		//
! 		if($forum_id != AUTH_LIST_ALL)
  		{
  			$value = $f_access[$key];
  
! 			switch($value)
  			{
  				case AUTH_ALL:
  					$auth_user[$key] = TRUE;
! 					$auth_user[$key . '_type'] = $lang['Anonymous_users'];
  					break;
  
  				case AUTH_REG:
  					$auth_user[$key] = ( $userdata['session_logged_in'] ) ? TRUE : 0;
! 					$auth_user[$key . '_type'] = $lang['Registered_Users'];
  					break;
  
  				case AUTH_ACL:
  					$auth_user[$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_ACL, $key, $u_access, $is_admin) : 0;
! 					$auth_user[$key . '_type'] = $lang['Users_granted_access'];
  					break;
  
  				case AUTH_MOD:
  					$auth_user[$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access, $is_admin) : 0;
! 					$auth_user[$key . '_type'] = $lang['Moderators'];
  					break;
  
  				case AUTH_ADMIN:
  					$auth_user[$key] = $is_admin;
! 					$auth_user[$key . '_type'] = $lang['Administrators'];
  					break;
  
--- 221,253 ----
  		// and instead set the auth to whatever the OR'd contents of the access levels are.
  		//
! 		if( $forum_id != AUTH_LIST_ALL )
  		{
  			$value = $f_access[$key];
  
! 			switch( $value )
  			{
  				case AUTH_ALL:
  					$auth_user[$key] = TRUE;
! 					$auth_user[$key . '_type'] = $lang['Auth_Anonymous_users'];
  					break;
  
  				case AUTH_REG:
  					$auth_user[$key] = ( $userdata['session_logged_in'] ) ? TRUE : 0;
! 					$auth_user[$key . '_type'] = $lang['Auth_Registered_Users'];
  					break;
  
  				case AUTH_ACL:
  					$auth_user[$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_ACL, $key, $u_access, $is_admin) : 0;
! 					$auth_user[$key . '_type'] = $lang['Auth_Users_granted_access'];
  					break;
  
  				case AUTH_MOD:
  					$auth_user[$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access, $is_admin) : 0;
! 					$auth_user[$key . '_type'] = $lang['Auth_Moderators'];
  					break;
  
  				case AUTH_ADMIN:
  					$auth_user[$key] = $is_admin;
! 					$auth_user[$key . '_type'] = $lang['Auth_Administrators'];
  					break;
  
***************
*** 277,305 ****
  				$f_forum_id = $f_access[$k]['forum_id'];
  
! 				switch($value)
  				{
  					case AUTH_ALL:
  						$auth_user[$f_forum_id][$key] = TRUE;
! 						$auth_user[$f_forum_id][$key . '_type'] = $lang['Anonymous_users'];
  						break;
  
  					case AUTH_REG:
  						$auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? TRUE : 0;
! 						$auth_user[$f_forum_id][$key . '_type'] = $lang['Registered_Users'];
  						break;
  
  					case AUTH_ACL:
  						$auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_ACL, $key, $u_access[$f_forum_id], $is_admin) : 0;
! 						$auth_user[$f_forum_id][$key . '_type'] = $lang['Users_granted_access'];
  						break;
  
  					case AUTH_MOD:
  						$auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access[$f_forum_id], $is_admin) : 0;
! 						$auth_user[$f_forum_id][$key . '_type'] = $lang['Moderators'];
  						break;
  
  					case AUTH_ADMIN:
  						$auth_user[$f_forum_id][$key] = $is_admin;
! 						$auth_user[$f_forum_id][$key . '_type'] = $lang['Administrators'];
  						break;
  
--- 264,292 ----
  				$f_forum_id = $f_access[$k]['forum_id'];
  
! 				switch( $value )
  				{
  					case AUTH_ALL:
  						$auth_user[$f_forum_id][$key] = TRUE;
! 						$auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Anonymous_users'];
  						break;
  
  					case AUTH_REG:
  						$auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? TRUE : 0;
! 						$auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Registered_Users'];
  						break;
  
  					case AUTH_ACL:
  						$auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_ACL, $key, $u_access[$f_forum_id], $is_admin) : 0;
! 						$auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Users_granted_access'];
  						break;
  
  					case AUTH_MOD:
  						$auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access[$f_forum_id], $is_admin) : 0;
! 						$auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Moderators'];
  						break;
  
  					case AUTH_ADMIN:
  						$auth_user[$f_forum_id][$key] = $is_admin;
! 						$auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Administrators'];
  						break;
  
***************
*** 315,321 ****
  	// Is user a moderator?
  	//
! 	if($forum_id != AUTH_LIST_ALL)
  	{
! 		$auth_user['auth_mod'] = ($userdata['session_logged_in']) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access, $is_admin) : 0;
  	}
  	else
--- 302,308 ----
  	// Is user a moderator?
  	//
! 	if( $forum_id != AUTH_LIST_ALL )
  	{
! 		$auth_user['auth_mod'] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access, $is_admin) : 0;
  	}
  	else
***************
*** 325,329 ****
  			$f_forum_id = $f_access[$k]['forum_id'];
  
! 			$auth_user[$f_forum_id]['auth_mod'] = ($userdata['session_logged_in']) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access[$f_forum_id], $is_admin) : 0;
  		}
  	}
--- 312,316 ----
  			$f_forum_id = $f_access[$k]['forum_id'];
  
! 			$auth_user[$f_forum_id]['auth_mod'] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access[$f_forum_id], $is_admin) : 0;
  		}
  	}
***************
*** 336,340 ****
  	$auth_user = 0;
  
! 	if(count($u_access))
  	{
  		for($j = 0; $j < count($u_access); $j++)
--- 323,327 ----
  	$auth_user = 0;
  
! 	if( count($u_access) )
  	{
  		for($j = 0; $j < count($u_access); $j++)

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.66,1.67

[Paul S. O. <ps...@us...>]

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

Modified Files:
	lang_main.php 
Log Message:
Changed way moderator lang is output on viewforum and index

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -r1.66 -r1.67
*** lang_main.php	2001/12/16 18:13:33	1.66
--- lang_main.php	2001/12/16 18:53:44	1.67
***************
*** 145,149 ****
  $lang['Usergroups'] = "Usergroups";
  $lang['Last_Post'] = "Last Post";
! $lang['Moderator'] = "Moderator/s";
  
  
--- 145,150 ----
  $lang['Usergroups'] = "Usergroups";
  $lang['Last_Post'] = "Last Post";
! $lang['Moderator'] = "Moderator";
! $lang['Moderators'] = "Moderators";
  
  
***************
*** 750,758 ****
  
  // These replace the %s in the above strings
! $lang['Anonymous_Users'] = "<b>anonymous users</b>";
! $lang['Registered_Users'] = "<b>registered users</b>";
! $lang['Users_granted_access'] = "<b>users granted special access</b>";
! $lang['Moderators'] = "<b>moderators</b>";
! $lang['Administrators'] = "<b>administrators</b>";
  
  $lang['Not_Moderator'] = "You are not a moderator of this forum";
--- 751,759 ----
  
  // These replace the %s in the above strings
! $lang['Auth_Anonymous_Users'] = "<b>anonymous users</b>";
! $lang['Auth_Registered_Users'] = "<b>registered users</b>";
! $lang['Auth_Users_granted_access'] = "<b>users granted special access</b>";
! $lang['Auth_Moderators'] = "<b>moderators</b>";
! $lang['Auth_Administrators'] = "<b>administrators</b>";
  
  $lang['Not_Moderator'] = "You are not a moderator of this forum";

[Phpbb-checkins] CVS: phpBB2 index.php,1.84,1.85 viewforum.php,1.114,1.115

[Paul S. O. <ps...@us...>]

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

Modified Files:
	index.php viewforum.php 
Log Message:
Changed way moderator lang is output on viewforum and index

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/index.php,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -r1.84 -r1.85
*** index.php	2001/12/15 16:40:35	1.84
--- index.php	2001/12/16 18:53:44	1.85
***************
*** 252,255 ****
--- 252,256 ----
  		"FORUM_LOCKED_IMG" => $images['forum_locked'],
  
+ 		"L_MODERATOR" => $lang['Moderators'], 
  		"L_FORUM_LOCKED" => $lang['Forum_is_locked'],
  		"L_MARK_FORUMS_READ" => $lang['Mark_all_forums'], 
***************
*** 380,388 ****
  				}
  
! 				if($moderators_links == "")
  				{
  					$moderators_links = " ";
  				}
  
  				$row_color = ( !($count % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
  				$row_class = ( !($count % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
--- 381,398 ----
  				}
  
! 				if( $moderators_links == "" )
  				{
  					$moderators_links = " ";
  				}
  
+ 				if( $mods > 0 )
+ 				{
+ 					$l_moderators = ( $mods == 1 ) ? $lang['Moderator'] : $lang['Moderators'];
+ 				}
+ 				else
+ 				{
+ 					$l_moderators = " ";
+ 				}
+ 
  				$row_color = ( !($count % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
  				$row_class = ( !($count % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
***************
*** 398,401 ****
--- 408,413 ----
  					"LAST_POST" => $last_post,
  					"MODERATORS" => $moderators_links,
+ 
+ 					"L_MODERATOR" => $l_moderators, 
  
  					"U_VIEWFORUM" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"))

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -r1.114 -r1.115
*** viewforum.php	2001/12/16 13:47:16	1.114
--- viewforum.php	2001/12/16 18:53:44	1.115
***************
*** 372,375 ****
--- 372,376 ----
  	"FOLDER_ANNOUNCE_NEW_IMG" => $images['folder_announce_new'],
  
+ 	"L_MODERATOR" => ( $total_mods == 1 ) ? $lang['Moderator'] : $lang['Moderators'], 
  	"L_MARK_TOPICS_READ" => $lang['Mark_all_topics'], 
  	"L_POST_NEW_TOPIC" => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'], 

[Phpbb-checkins] CVS: phpBB2 privmsg.php,1.63,1.64

[Paul S. O. <ps...@us...>]

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

Modified Files:
	privmsg.php 
Log Message:
Moved remaining hard coded text in posting template to lang_main, smilies now from DB + external smilies window if > 20

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -r1.63 -r1.64
*** privmsg.php	2001/12/16 15:30:37	1.63
--- privmsg.php	2001/12/16 18:29:20	1.64
***************
*** 35,39 ****
--- 35,129 ----
  }
  
+ // -----------------------
+ // Page specific functions
  //
+ // This isn't really specific since it's used in posting too,
+ // however I'm too lazy to move them both to functions at the 
+ // moment. Of course in 2.2 all the posting routines should
+ // be better 'integrated' so this won't be an issue
+ //
+ function generate_smilies($mode)
+ {
+ 	global $db, $board_config, $template, $lang, $images, $theme, $phpEx;
+ 	global $user_ip, $forum_id, $session_length;
+ 	global $userdata;
+ 
+ 	if( $mode == 'window' )
+ 	{
+ 		$userdata = session_pagestart($user_ip, $forum_id, $session_length);
+ 		init_userprefs($userdata);
+ 
+ 		$gen_simple_header = TRUE;
+ 
+ 		$page_title = $lang['Review_topic'] ." - $topic_title";
+ 		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+ 
+ 		$template->set_filenames(array(
+ 			"smiliesbody" => "posting_smilies.tpl")
+ 		);
+ 	}
+ 
+ 	$sql = "SELECT * 
+ 		FROM " . SMILIES_TABLE . " 
+ 		GROUP BY emoticon 
+ 		ORDER BY smilies_id";
+ 	if( $result = $db->sql_query($sql) )
+ 	{
+ 		if( $num_smilies = $db->sql_numrows($result) )
+ 		{
+ 			$rowset = $db->sql_fetchrowset($result);
+ 
+ 			$j = 0;
+ 			$s_colspan = 0;
+ 			$smilies_count = ( $mode == 'inline' ) ? min(20, $num_smilies) : $num_smilies;
+ 			$smilies_split_row = ( $mode == 'inline' ) ? 3 : 7;
+ 			for($i = 0; $i < $smilies_count; $i++)
+ 			{
+ 				if( !$j )
+ 				{
+ 					$template->assign_block_vars("smilies_row", array());
+ 				}
+ 
+ 				$template->assign_block_vars("smilies_row.smilies_col", array(
+ 					"SMILEY_CODE" => $rowset[$i]['code'],
+ 					"SMILEY_IMG" => "images/smiles/" . $rowset[$i]['smile_url'],
+ 					"SMILEY_DESC" => $rowset[$i]['emoticon'])
+ 				);
+ 
+ 				$s_colspan = max($s_colspan, $j + 1);
+ 
+ 				$j = ( $j == $smilies_split_row ) ? 0 : $j + 1;
+ 			}
+ 
+ 			if( $mode == 'inline' && $num_smilies > 20)
+ 			{
+ 				$template->assign_block_vars("switch_smilies_extra", array());
+ 
+ 				$template->assign_vars(array(
+ 					"L_MORE_SMILIES" => $lang['More_emoticons'], 
+ 					"U_MORE_SMILIES" => append_sid("posting.$phpEx?mode=smilies"))
+ 				);
+ 			}
+ 
+ 			$template->assign_vars(array(
+ 				"L_EMOTICONS" => $lang['Emoticons'], 
+ 				"L_CLOSE_WINDOW" => $lang['Close_window'], 
+ 				"S_SMILIES_COLSPAN" => $s_colspan)
+ 			);
+ 		}
+ 	}
+ 
+ 	if( $mode == 'window' )
+ 	{
+ 		$template->pparse("smiliesbody");
+ 
+ 		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+ 	}
+ }
+ //
+ // End page specific functions
+ // ---------------------------
+ 
+ //
  // Var definitions
  //
***************
*** 1538,1541 ****
--- 1628,1636 ----
  	}
  
+ 	//
+ 	// Send smilies to template
+ 	//
+ 	generate_smilies('inline');
+ 
  	$template->assign_vars(array(
  		"SUBJECT" => preg_replace($html_entities_match, $html_entities_replace, $privmsg_subject), 
***************
*** 1544,1548 ****
  		"HTML_STATUS" => $html_status, 
  		"SMILIES_STATUS" => $smilies_status, 
! 		"BBCODE_STATUS" => $bbcode_status, 
  		"FORUM_NAME" => $lang['Private_message'], 
  
--- 1639,1643 ----
  		"HTML_STATUS" => $html_status, 
  		"SMILIES_STATUS" => $smilies_status, 
! 		"BBCODE_STATUS" => sprintf($bbcode_status, '<a href="' . append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 
  		"FORUM_NAME" => $lang['Private_message'], 
  
***************
*** 1571,1574 ****
--- 1666,1710 ----
  		"L_DISABLE_SMILIES" => $lang['Disable_Smilies_post'], 
  		"L_ATTACH_SIGNATURE" => $lang['Attach_signature'], 
+ 
+ 		"L_BBCODE_B_HELP" => $lang['bbcode_b_help'], 
+ 		"L_BBCODE_I_HELP" => $lang['bbcode_i_help'], 
+ 		"L_BBCODE_U_HELP" => $lang['bbcode_u_help'], 
+ 		"L_BBCODE_Q_HELP" => $lang['bbcode_q_help'], 
+ 		"L_BBCODE_C_HELP" => $lang['bbcode_c_help'], 
+ 		"L_BBCODE_L_HELP" => $lang['bbcode_l_help'], 
+ 		"L_BBCODE_O_HELP" => $lang['bbcode_o_help'], 
+ 		"L_BBCODE_P_HELP" => $lang['bbcode_p_help'], 
+ 		"L_BBCODE_W_HELP" => $lang['bbcode_w_help'], 
+ 		"L_BBCODE_A_HELP" => $lang['bbcode_a_help'], 
+ 		"L_BBCODE_S_HELP" => $lang['bbcode_s_help'], 
+ 		"L_BBCODE_F_HELP" => $lang['bbcode_f_help'], 
+ 		"L_EMPTY_MESSAGE" => $lang['Empty_message'],
+ 
+ 		"L_FONT_COLOR" => $lang['Font_color'], 
+ 		"L_COLOR_DEFAULT" => $lang['color_default'], 
+ 		"L_COLOR_DARK_RED" => $lang['color_dark_red'], 
+ 		"L_COLOR_RED" => $lang['color_red'], 
+ 		"L_COLOR_ORANGE" => $lang['color_orange'], 
+ 		"L_COLOR_BROWN" => $lang['color_brown'], 
+ 		"L_COLOR_YELLOW" => $lang['color_yellow'], 
+ 		"L_COLOR_GREEN" => $lang['color_green'], 
+ 		"L_COLOR_OLIVE" => $lang['color_olive'], 
+ 		"L_COLOR_CYAN" => $lang['color_cyan'], 
+ 		"L_COLOR_BLUE" => $lang['color_blue'], 
+ 		"L_COLOR_DARK_BLUE" => $lang['color_dark_blue'], 
+ 		"L_COLOR_INDIGO" => $lang['color_indigo'], 
+ 		"L_COLOR_VIOLET" => $lang['color_violet'], 
+ 		"L_COLOR_WHITE" => $lang['color_white'], 
+ 		"L_COLOR_BLACK" => $lang['color_black'], 
+ 
+ 		"L_FONT_SIZE" => $lang['Font_size'], 
+ 		"L_FONT_TINY" => $lang['font_tiny'], 
+ 		"L_FONT_SMALL" => $lang['font_small'], 
+ 		"L_FONT_NORMAL" => $lang['font_normal'], 
+ 		"L_FONT_LARGE" => $lang['font_large'], 
+ 		"L_FONT_HUGE" => $lang['font_huge'], 
+ 
+ 		"L_BBCODE_CLOSE_TAGS" => $lang['Close_Tags'], 
+ 		"L_STYLES_TIP" => $lang['Styles_tip'], 
  
  		"S_HTML_CHECKED" => (!$html_on) ? "checked=\"checked\"" : "", 

[Phpbb-checkins] CVS: phpBB2/templates/subSilver simple_header.tpl,1.2,1.3 posting_body.tpl,1.13,1.14

[Paul S. O. <ps...@us...>]

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

Modified Files:
	simple_header.tpl posting_body.tpl 
Log Message:
Moved remaining hard coded text in posting template to lang_main, smilies now from DB + external smilies window if > 20

Index: simple_header.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/simple_header.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** simple_header.tpl	2001/10/16 16:24:52	1.2
--- simple_header.tpl	2001/12/16 18:13:34	1.3
***************
*** 13,213 ****
  {META}
  <title>{SITENAME} :: {PAGE_TITLE}</title>
  <style type="text/css">
  <!--
! /* subSilver Theme for phpBB2
!  * Created by subBlue design
!  * http://www.subBlue.com
!  */
! 
! body { 	background-color:{T_BODY_BGCOLOR};
! 		scrollbar-face-color: #C8D1D7; scrollbar-highlight-color: #EAF0F7;
! 		scrollbar-shadow-color: #95AFC4; scrollbar-3dlight-color: #D6DDE2;
! 		scrollbar-arrow-color:  #006699; scrollbar-track-color: #EFEFEF;
! 		scrollbar-darkshadow-color: #7294AF;
! 		margin-bottom:0px; 
! 		margin-left:0px; 
! 		margin-right:0px; 
! 		margin-top:0px; 
! } 
! 
! }
! 
! font	{ font-family: Verdana, Arial, Helvetica, sans-serif }
! td		{ font-family: Verdana, Arial, Helvetica, sans-serif }
! th		{ font-family: Verdana, Arial, Helvetica, sans-serif }
! P		{ font-family: Verdana, Arial, Helvetica, sans-serif }
! hr		{ height: 1px; color:{T_TR_COLOR3} }
! 
! 
! /* Forum colours */
! .bodyline	{ background-color:#FFFFFF; border: {T_TD_COLOR1}; border-style: solid; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px; border-left-width: 1px }
! .forumline	{ background-color:#FFFFFF; border: 2px #006699 solid }
! 
! 
! /* Main table cell colours and backgrounds */
! TH			{ background-color: {T_TH_COLOR3}; height: 25px; font-size: 11px; line-height : 100%; font-weight: bold; color: #FFB163; background-image: url(templates/subSilver/images/cellpic3.gif) }
! TD.tablebg	{ background-color: #000000 }
! TD.cat		{ background-color: {T_TH_COLOR1}; height: 28px; background-image: url(templates/subSilver/images/cellpic1.gif) }
! TD.row1		{ background-color: {T_TR_COLOR1} }
! TD.row2		{ background-color: {T_TR_COLOR2} }
! TD.row3		{ background-color: {T_TR_COLOR3} }
! TD.spaceRow { background-color: {T_TR_COLOR3}; border: #FFFFFF; border-style: solid; border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }
! TD.rowpic	{ background-color: #FFFFFF; background-image: url(templates/subSilver/images/cellpic2.jpg); background-repeat: repeat-y }
  td.icqback	{ background-image: url(templates/subSilver/images/icon_icq_add.gif); background-repeat: no-repeat }
  
  
- /* Setting additional nice borders for the main table cells */
- TD.catHead,TD.catSides,TD.catLeft,TD.catRight,TD.catBottom { background-color:{T_TH_COLOR1}; height: 28px; background-image: url(templates/subSilver/images/cellpic1.gif); border: #FFFFFF; border-style: solid; }	
- 
- TD.catHead	 { height: 29px; border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 0px }	
- TD.catSides  { border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }	
- TD.catLeft	 { border-left-width: 1px; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px }	
- TD.catRight	 { border-left-width: 0px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }	
- TD.catBottom { height: 29px; border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 1px }	
- 
- TH.thHead,TH.thSides,TH.thTop,TH.thLeft,TH.thRight,TH.thBottom,TH.thCornerL,TH.thCornerR { border: #FFFFFF; border-style: solid; }
- 
- TH.thHead	 { font-weight : bold; font-size: 12px; height: 25px; border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 0px }	
- TH.thSides	 { border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }	
- TH.thTop	 { border-left-width: 0px; border-top-width: 1px; border-right-width: 0px; border-bottom-width: 0px }	
- TH.thLeft	 { border-left-width: 1px; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px }	
- TH.thRight	 { border-left-width: 0px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }	
- TH.thBottom  { border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 1px }	
- TH.thCornerL { border-left-width: 1px; border-top-width: 1px; border-right-width: 0px; border-bottom-width: 0px }	
- TH.thCornerR { border-left-width: 0px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 0px }	
- 
- TD.row3Right	 { background-color: {T_TR_COLOR3}; border: #FFFFFF; border-style: solid;  border-left-width: 0px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px }
- 
- /* The largest text used in the index page title and toptic title etc. */
- .maintitle	{ font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; font-size : 22px; font-weight : bold; text-decoration : none; line-height : 120%; color : #000000;}
- 
- 
- /* General normal text */
- .gen		{ font-size : 12px; color : #000000; }
- a.gen		{ color: #006699; text-decoration: none; }
- a.gen:hover	{ color: #C23030; text-decoration: underline; }
- 
- /* General medium text */
- .genmed		{ font-size : 11px; color : #000000; }
- a.genmed		{ text-decoration: none; color : #006699; }
- a.genmed:hover	{ text-decoration: underline; color : #C23030; }
- 
- 
- /* General small */
- .gensmall		{ font-size : 10px; color : #000000; }
- a.gensmall		{ color: #006699; text-decoration: none; }
- a.gensmall:hover	{ color: #C23030; text-decoration: underline; }
- 
- 
- /* The register, login, search etc links at the top of the page */
- .mainmenu			{ font-size : 11px; text-decoration : none; color : #000000 }
- a.mainmenu			{ text-decoration: none; color : #006699;  }
- a.mainmenu:hover	{ text-decoration: underline; color : #C23030; }
- 
- 
- /* Forum categories */
- .cattitle			{ font-size : 12px; line-height : 100%; letter-spacing: 1px; font-weight : bold; text-decoration : none; color : #004c75 }
- a.cattitle			{ text-decoration: none; color : #004c75; }
- a.cattitle:hover	{ text-decoration: underline; }
- 
- 
- /* Forum title: Text and link to the forums used in: index.php */
- .forumlink			{ font-size : 12px; font-weight : bold; text-decoration : none; color : #136C99; }
- a.forumlink			{ text-decoration: none; color : #136C99; }
- a.forumlink:hover	{ text-decoration: underline; color : #D68000; }
- 
- 
- /* Used for the navigation text, (Page 1,2,3 etc) and the navigation bar when in a forum */
- .nav			{ font-size : 11px; font-weight : bold; text-decoration : none; color : #000000;}
- a.nav			{ text-decoration: none; color : #006699; }
- a.nav:hover		{ text-decoration: underline; }
- 
- 
- /* titles for the topics: can specify viewed link colour too */
- .topictitle			{ font-size : 11px; font-weight : bold; text-decoration : none; color : #000000; }
- a.topictitle		{ text-decoration: none; color : #006699; }
- a.topictitle:hover	{ text-decoration: underline; color : #D68000; }
- a.topictitle:visited	{ text-decoration: none; color : #5584AA; }
- 
- 
- /* Name of poster in viewmsg.php and viewtopic.php and other places */
- .name			{ font-size : 11px; text-decoration : none; color : #000000;}
- a.name			{ color: #006699; text-decoration: none;}
- a.name:hover	{ color: #C23030; text-decoration: underline;}
- 
- 
- /* Location, number of posts, post date etc */
- .postdetails		{ font-size : 10px; color : #000000; }
- a.postdetails		{ color: #006699; text-decoration: none; }
- a.postdetails:hover	{ color: #C23030; text-decoration: underline; }
- 
- 
- /* The content of the posts (body of text) */
- .postbody { font-size : 12px; line-height: 150%}
- 
- a.postlink	{ text-decoration: none; color : {T_BODY_LINK} }
- a.postlink:hover { text-decoration: underline; color : #C23030 }
- 
- 
- /* Quote Code (currently not used) */
- .code	{ font-family: Courier, Courier New; font-size: 11px; color: #006600;
- 		  background-color: #FAFAFA; border: {T_TR_COLOR3}; border-style: solid;
- 		  border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px
- 		}
- .quote	{ font-family: Verdana, Arial; font-size: 11px; color: #444444; line-height: 125%;
- 		  background-color: #FAFAFA; border: {T_TR_COLOR3}; border-style: solid;
- 		  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; }
- 
- 
- /* Form elements */
- input,textarea, select {
- color : #000000; 
- font-family : Verdana, Arial, Helvetica, sans-serif; 
- font-size : 11px; 
- font-weight : normal;
- border-color : #000000; 
- }
- 
- /* The text input fields background colour */
- input.post, textarea.post, select {
- background-color : #FFFFFF; 
- }
- 
- input { text-indent : 2px; }
- 
- /* The buttons used for bbCode styling in message post */
- input.button {
- background-color : {T_TR_COLOR1}; 
- color : #000000; 
- font-family : Verdana, Arial, Helvetica, sans-serif; 
- font-size : 11px; 
- }
- 
- 
- /* The main submit button option */
- input.mainoption {
- background-color : #FAFAFA;
- font-weight : bold;
- }
- 
- /* None bold submit button */
- input.liteoption {
- background-color : #FAFAFA;
- font-weight : normal;
- }
- 
  /* Import the fancy styles for IE only (NS4.x doesn't use the @import function) */
  @import url("templates/subSilver/formIE.css"); 
- 
- .helpline { background-color: {T_TR_COLOR2}; border-style: none; }
- 
- 
- /* Copyright and bottom info */
- .copyright		{ font-family: Verdana, Arial, Helvetica, sans-serif; color: #555555; font-size: 10px; letter-spacing: -1px;}
- a.copyright		{ color: #333333; text-decoration: none;}
- a.copyright:hover { color: #000000; text-decoration: underline;}
  -->
  </style>
--- 13,33 ----
  {META}
  <title>{SITENAME} :: {PAGE_TITLE}</title>
+ <link rel="stylesheet" href="templates/subSilver/{T_HEAD_STYLESHEET}" type="text/css" />
  <style type="text/css">
  <!--
! /* Specifiy background images for selected styles
!    This can't be done within the external style sheet as NS4 sees image paths relative to
!    the page which called the style sheet (i.e. this page in the root phpBB directory)
!    whereas all other browsers see image paths relative to the style sheet. Stupid NS again!
! */
! TH			{ background-image: url(templates/subSilver/images/cellpic3.gif) }
! TD.cat		{ background-image: url(templates/subSilver/images/cellpic1.gif) }
! TD.rowpic	{ background-image: url(templates/subSilver/images/cellpic2.jpg); background-repeat: repeat-y }
  td.icqback	{ background-image: url(templates/subSilver/images/icon_icq_add.gif); background-repeat: no-repeat }
+ TD.catHead,TD.catSides,TD.catLeft,TD.catRight,TD.catBottom { background-image: url(templates/subSilver/images/cellpic1.gif) }
  
  
  /* Import the fancy styles for IE only (NS4.x doesn't use the @import function) */
  @import url("templates/subSilver/formIE.css"); 
  -->
  </style>

Index: posting_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/posting_body.tpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** posting_body.tpl	2001/12/10 16:52:16	1.13
--- posting_body.tpl	2001/12/16 18:13:34	1.14
***************
*** 1,6 ****
! <!-- Spell checker option part 1: You must sign up for free at www.spellchecker.net to use this option -->
  <!-- Change the path to point to the file you got once signed up at Spellchecker.net -->
  <!-- Remember to uncomment the spellchecker button near the end of this template -->
! <!-- script type="text/javascript" language="javascript" src=spellcheck/spch.js></script -->
  <!-- End spellchecker option -->
  
--- 1,6 ----
! <!-- Spell checker option part 1: You must sign up for an account at www.spellchecker.net to use this option -->
  <!-- Change the path to point to the file you got once signed up at Spellchecker.net -->
  <!-- Remember to uncomment the spellchecker button near the end of this template -->
! <!-- script type="text/javascript" language="javascript" src="spellcheck/spch.js"></script -->
  <!-- End spellchecker option -->
  
***************
*** 11,20 ****
  // www.subBlue.com
  
- 
  // Startup variables
  var imageTag = false;
  var theSelection = false;
  
- 
  // Check for Browser & Platform for PC & IE specific bits
  // More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
--- 11,18 ----
***************
*** 27,47 ****
                  && (clientPC.indexOf('webtv')==-1) && (clientPC.indexOf('hotjava')==-1));
  
! var is_win   = ((clientPC.indexOf("win")!=-1) || (agt.indexOf("16bit")!=-1));
  var is_mac    = (clientPC.indexOf("mac")!=-1);
  
  
  // Helpline messages
! b_help = "Bold text: [b]text[/b]  (alt+b)";
! i_help = "Italic text: [i]text[/i]  (alt+i)";
! u_help = "Underline text: [u]text[/u]  (alt+u)";
! q_help = "Quote text: [quote]text[/quote]  (alt+q)";
! c_help = "Code display: [code]code[/code]  (alt+c)";
! l_help = "List: [list]text[/list] (alt+l)";
! o_help = "Ordered list: [list=]text[/list]  (alt+o)";
! p_help = "Insert image: [img]http://image_url[/img]  (alt+p)";
! w_help = "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)";
! a_help = "Close all open bbCode tags";
! s_help = "Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000";
! f_help = "Font size: [size=x-small]small text[/size]";
  
  // Define the bbCode tags
--- 25,45 ----
                  && (clientPC.indexOf('webtv')==-1) && (clientPC.indexOf('hotjava')==-1));
  
! var is_win   = ((clientPC.indexOf("win")!=-1) || (clientPC.indexOf("16bit") != -1));
  var is_mac    = (clientPC.indexOf("mac")!=-1);
  
  
  // Helpline messages
! b_help = "{L_BBCODE_B_HELP}";
! i_help = "{L_BBCODE_I_HELP}";
! u_help = "{L_BBCODE_U_HELP}";
! q_help = "{L_BBCODE_Q_HELP}";
! c_help = "{L_BBCODE_C_HELP}";
! l_help = "{L_BBCODE_L_HELP}";
! o_help = "{L_BBCODE_O_HELP}";
! p_help = "{L_BBCODE_P_HELP}";
! w_help = "{L_BBCODE_W_HELP}";
! a_help = "{L_BBCODE_A_HELP}";
! s_help = "{L_BBCODE_S_HELP}";
! f_help = "{L_BBCODE_F_HELP}";
  
  // Define the bbCode tags
***************
*** 86,90 ****
  
  	if (document.post.message.value.length < 2) {
! 		formErrors = "You must enter a message!";
  	}
  
--- 84,88 ----
  
  	if (document.post.message.value.length < 2) {
! 		formErrors = "{L_EMPTY_MESSAGE}";
  	}
  
***************
*** 112,116 ****
  }
  
- 
  function bbfontstyle(bbopen, bbclose) {
  	if ((clientVer >= 4) && is_ie && is_win) {
--- 110,113 ----
***************
*** 211,220 ****
  {ERROR_BOX}
  
!   <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
  	<tr> 
! 	  <td align="left"><span  class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> 
  		-> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
  	</tr>
!   </table>
  
    <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
--- 208,219 ----
  {ERROR_BOX}
  
! <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
  	<tr> 
! 		<td align="left"><span  class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a>
! 		<!-- BEGIN switch_not_privmsg --> 
  		-> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
+ 		<!-- END switch_not_privmsg -->
  	</tr>
! </table>
  
    <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
***************
*** 255,290 ****
  			  <table width="100" border="0" cellspacing="0" cellpadding="5">
  				<tr align="center"> 
! 				  <td colspan="4" class="gensmall"><b>Emoticons</b></td>
! 				</tr>
! 				<tr align="center" valign="middle"> 
! 				  <td><a href="javascript:emoticon(':)')"><img src="images/smiles/icon_smile.gif" width="15" height="15" border="0" alt="Smile" /></a></td>
! 				  <td><a href="javascript:emoticon(':D')"><img src="images/smiles/icon_biggrin.gif" width="15" height="15" border="0" alt="Big grin" /></a></td>
! 				  <td><a href="javascript:emoticon(':lol:')"> <img src="images/smiles/icon_lol.gif" width="15" height="15" border="0" alt="Laugh" /></a></td>
! 				  <td><a href="javascript:emoticon(';)')"><img src="images/smiles/icon_wink.gif" width="15" height="15" border="0" alt="Wink" /></a></td>
! 				</tr>
! 				<tr align="center" valign="middle"> 
! 				  <td><a href="javascript:emoticon(':|')"><img src="images/smiles/icon_neutral.gif" width="15" height="15" border="0" alt="Neutral" /></a></td>
! 				  <td><a href="javascript:emoticon(':(')"><img src="images/smiles/icon_sad.gif" width="15" height="15" border="0" alt="Sad" /></a></td>
! 				  <td><a href="javascript:emoticon(':?')"><img src="images/smiles/icon_confused.gif" width="15" height="15" border="0" alt="Uncertain" /></a></td>
! 				  <td><a href="javascript:emoticon(':shock:')"><img src="images/smiles/icon_eek.gif" width="15" height="15" border="0" alt="Shocked" /></a></td>
! 				</tr>
! 				<tr align="center" valign="middle"> 
! 				  <td><a href="javascript:emoticon(':roll:')"><img src="images/smiles/icon_rolleyes.gif" width="15" height="15" border="0" alt="Roll eyes" /></a></td>
! 				  <td><a href="javascript:emoticon('8)')"><img src="images/smiles/icon_cool.gif" width="15" height="15" border="0" alt="Cool!" /></a></td>
! 				  <td><a href="javascript:emoticon(':p')"><img src="images/smiles/icon_razz.gif" width="15" height="15" border="0" alt="Razz" /></a></td>
! 				  <td><a href="javascript:emoticon(':oops:')"><img src="images/smiles/icon_redface.gif" width="15" height="15" border="0" alt="Embarassed" /></a></td>
  				</tr>
  				<tr align="center" valign="middle"> 
! 				  <td><a href="javascript:emoticon(':evil:')"><img src="images/smiles/icon_evil.gif" width="15" height="15" border="0" alt="Evil" /></a></td>
! 				  <td><a href="javascript:emoticon(':x')"><img src="images/smiles/icon_mad.gif" width="15" height="15" border="0" alt="Mad" /></a></td>
! 				  <td><a href="javascript:emoticon(':cry:')"><img src="images/smiles/icon_cry.gif" width="15" height="15" border="0" alt="Cry" /></a></td>
! 				  <td><a href="javascript:emoticon(':o')"><img src="images/smiles/icon_surprised.gif" width="15" height="15" border="0" alt="Surprised" /></a></td>
  				</tr>
! 				<tr align="center" valign="middle"> 
! 				  <td><a href="javascript:emoticon(':idea:')"><img src="images/smiles/icon_idea.gif" width="15" height="15" border="0" alt="Idea" /></a></td>
! 				  <td><a href="javascript:emoticon(':?:')"><img src="images/smiles/icon_question.gif" width="15" height="15" border="0" alt="Question" /></a></td>
! 				  <td><a href="javascript:emoticon(':!:')"><img src="images/smiles/icon_exclaim.gif" width="15" height="15" border="0" alt="Exclaim" /></a></td>
! 				  <td><a href="javascript:emoticon(':arrow:')"><img src="images/smiles/icon_arrow.gif" width="15" height="15" border="0" alt="Arrow" /></a></td>
  				</tr>
  			  </table>
  			</td>
--- 254,271 ----
  			  <table width="100" border="0" cellspacing="0" cellpadding="5">
  				<tr align="center"> 
! 				  <td colspan="{S_SMILIES_COLSPAN}" class="gensmall"><b>{L_EMOTICONS}</b></td>
  				</tr>
+ 				<!-- BEGIN smilies_row -->
  				<tr align="center" valign="middle"> 
! 				  <!-- BEGIN smilies_col -->
! 				  <td><a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" width="15" height="15" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a></td>
! 				  <!-- END smilies_col -->
  				</tr>
! 				<!-- END smilies_row -->
! 				<!-- BEGIN switch_smilies_extra -->
! 				<tr align="center"> 
! 				  <td colspan="{S_SMILIES_COLSPAN}"><span  class="nav"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_MORE_SMILIES}</a></td>
  				</tr>
+ 				<!-- END switch_smilies_extra -->
  			  </table>
  			</td>
***************
*** 327,361 ****
  			  <table width="100%" border="0" cellspacing="0" cellpadding="0">
  				<tr> 
! 				  <td><span class="genmed"> &nbsp;Font color: 
  					<select name="addbbcode18" onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]')" onMouseOver="helpline('s')">
! 					  <option style="color:black; background-color: #FFFFFF " value="{T_FONTCOLOR1}" class="genmed">Default</option>
! 					  <option style="color:darkred; background-color: #DEE3E7" value="darkred" class="genmed">Dark 
! 					  Red</option>
! 					  <option style="color:red; background-color: #DEE3E7" value="red" class="genmed">Red</option>
! 					  <option style="color:orange; background-color: #DEE3E7" value="orange" class="genmed">Orange</option>
! 					  <option style="color:brown; background-color: #DEE3E7" value="brown" class="genmed">Brown</option>
! 					  <option style="color:yellow; background-color: #DEE3E7" value="yellow" class="genmed">Yellow</option>
! 					  <option style="color:green; background-color: #DEE3E7" value="green" class="genmed">Green</option>
! 					  <option style="color:olive; background-color: #DEE3E7" value="olive" class="genmed">Olive</option>
! 					  <option style="color:cyan; background-color: #DEE3E7" value="cyan" class="genmed">Cyan</option>
! 					  <option style="color:blue; background-color: #DEE3E7" value="blue" class="genmed">Blue</option>
! 					  <option style="color:darkblue; background-color: #DEE3E7" value="darkblue" class="genmed">Dark 
! 					  Blue</option>
! 					  <option style="color:indigo; background-color: #DEE3E7" value="indigo" class="genmed">Indigo</option>
! 					  <option style="color:violet; background-color: #DEE3E7" value="violet" class="genmed">Violet</option>
! 					  <option style="color:white; background-color: #DEE3E7" value="white" class="genmed">White</option>
! 					  <option style="color:black; background-color: #DEE3E7" value="black" class="genmed">Black</option>
! 					</select>
! 					&nbsp;Font size: 
! 					<select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')">
! 					  <option value="9" class="genmed">Tiny</option>
! 					  <option value="10" class="genmed">Small</option>
! 					  <option value="12" selected class="genmed">Normal</option>
! 					  <option value="18" class="genmed">Large</option>
! 					  <option  value="24" class="genmed">Huge</option>
  					</select>
  					</span></td>
! 				  <td nowrap="nowrap" align="right"><span class="gensmall"><a href="javascript:bbstyle(-1)" class="genmed" onMouseOver="helpline('a')">Close 
! 					Tags</a></span></td>
  				</tr>
  			  </table>
--- 308,337 ----
  			  <table width="100%" border="0" cellspacing="0" cellpadding="0">
  				<tr> 
! 				  <td><span class="genmed"> &nbsp;{L_FONT_COLOR}: 
  					<select name="addbbcode18" onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]')" onMouseOver="helpline('s')">
! 					  <option style="color:black; background-color: #FFFFFF " value="{T_FONTCOLOR1}" class="genmed">{L_COLOR_DEFAULT}</option>
! 					  <option style="color:darkred; background-color: #DEE3E7" value="darkred" class="genmed">{L_COLOR_DARK_RED}</option>
! 					  <option style="color:red; background-color: #DEE3E7" value="red" class="genmed">{L_COLOR_RED}</option>
! 					  <option style="color:orange; background-color: #DEE3E7" value="orange" class="genmed">{L_COLOR_ORANGE}</option>
! 					  <option style="color:brown; background-color: #DEE3E7" value="brown" class="genmed">{L_COLOR_BROWN}</option>
! 					  <option style="color:yellow; background-color: #DEE3E7" value="yellow" class="genmed">{L_COLOR_YELLOW}</option>
! 					  <option style="color:green; background-color: #DEE3E7" value="green" class="genmed">{L_COLOR_GREEN}</option>
! 					  <option style="color:olive; background-color: #DEE3E7" value="olive" class="genmed">{L_COLOR_OLIVE}</option>
! 					  <option style="color:cyan; background-color: #DEE3E7" value="cyan" class="genmed">{L_COLOR_CYAN}</option>
! 					  <option style="color:blue; background-color: #DEE3E7" value="blue" class="genmed">{L_COLOR_BLUE}</option>
! 					  <option style="color:darkblue; background-color: #DEE3E7" value="darkblue" class="genmed">{L_COLOR_DARK_BLUE}</option>
! 					  <option style="color:indigo; background-color: #DEE3E7" value="indigo" class="genmed">{L_COLOR_INDIGO}</option>
! 					  <option style="color:violet; background-color: #DEE3E7" value="violet" class="genmed">{L_COLOR_VIOLET}</option>
! 					  <option style="color:white; background-color: #DEE3E7" value="white" class="genmed">{L_COLOR_WHITE}</option>
! 					  <option style="color:black; background-color: #DEE3E7" value="black" class="genmed">{L_COLOR_BLACK}</option>
! 					</select> &nbsp;{L_FONT_SIZE}:<select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')">
! 					  <option value="9" class="genmed">{L_FONT_TINY}</option>
! 					  <option value="10" class="genmed">{L_FONT_SMALL}</option>
! 					  <option value="12" selected class="genmed">{L_FONT_NORMAL}</option>
! 					  <option value="18" class="genmed">{L_FONT_LARGE}</option>
! 					  <option  value="24" class="genmed">{L_FONT_HUGE}</option>
  					</select>
  					</span></td>
! 				  <td nowrap="nowrap" align="right"><span class="gensmall"><a href="javascript:bbstyle(-1)" class="genmed" onMouseOver="helpline('a')">{L_BBCODE_CLOSE_TAGS}</a></span></td>
  				</tr>
  			  </table>
***************
*** 364,368 ****
  		  <tr> 
  			<td colspan="9"> <span class="gensmall"> 
! 			  <input type="text" name="helpbox" size="45" maxlength="100" style="width:450px; font-size:10px" class="helpline" value="Tip: Styles can be applied quickly to selected text" />
  			  </span></td>
  		  </tr>
--- 340,344 ----
  		  <tr> 
  			<td colspan="9"> <span class="gensmall"> 
! 			  <input type="text" name="helpbox" size="45" maxlength="100" style="width:450px; font-size:10px" class="helpline" value="{L_STYLES_TIP}" />
  			  </span></td>
  		  </tr>
***************
*** 439,443 ****
  	<tr> 
  	  <td class="catBottom" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS} 
! 		<!-- Spell checker option part 2: You must sign up for free at www.spellchecker.net to use this option -->
  		<!-- Change the path in the onclick function to point to your files you got once signed up at Spellchecker.net -->
  		<!-- Remember to uncomment the link to the javascript file at the top of this template -->
--- 415,419 ----
  	<tr> 
  	  <td class="catBottom" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS} 
! 		<!-- Spell checker option part 2: You must sign up for an account at www.spellchecker.net to use this option -->
  		<!-- Change the path in the onclick function to point to your files you got once signed up at Spellchecker.net -->
  		<!-- Remember to uncomment the link to the javascript file at the top of this template -->

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.65,1.66

[Paul S. O. <ps...@us...>]

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

Modified Files:
	lang_main.php 
Log Message:
Moved remaining hard coded text in posting template to lang_main, smilies now from DB + external smilies window if > 20

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -r1.65 -r1.66
*** lang_main.php	2001/12/15 16:51:04	1.65
--- lang_main.php	2001/12/16 18:13:33	1.66
***************
*** 338,343 ****
  $lang['HTML_is_ON'] = "HTML is <u>ON</u>";
  $lang['HTML_is_OFF'] = "HTML is <u>OFF</u>";
! $lang['BBCode_is_ON'] = "BBCode is <u>ON</u>";
! $lang['BBCode_is_OFF'] = "BBCode is <u>OFF</u>";
  $lang['Smilies_are_ON'] = "Smilies are <u>ON</u>";
  $lang['Smilies_are_OFF'] = "Smilies are <u>OFF</u>";
--- 338,343 ----
  $lang['HTML_is_ON'] = "HTML is <u>ON</u>";
  $lang['HTML_is_OFF'] = "HTML is <u>OFF</u>";
! $lang['BBCode_is_ON'] = "%sBBCode%s is <u>ON</u>"; // %s are replaced with URI pointing to FAQ
! $lang['BBCode_is_OFF'] = "%sBBCode%s is <u>OFF</u>";
  $lang['Smilies_are_ON'] = "Smilies are <u>ON</u>";
  $lang['Smilies_are_OFF'] = "Smilies are <u>OFF</u>";
***************
*** 353,356 ****
--- 353,399 ----
  
  $lang['Topic_reply_notification'] = "Topic Reply Notification";
+ 
+ $lang['bbcode_b_help'] = "Bold text: [b]text[/b]  (alt+b)";
+ $lang['bbcode_i_help'] = "Italic text: [i]text[/i]  (alt+i)";
+ $lang['bbcode_u_help'] = "Underline text: [u]text[/u]  (alt+u)";
+ $lang['bbcode_q_help'] = "Quote text: [quote]text[/quote]  (alt+q)";
+ $lang['bbcode_c_help'] = "Code display: [code]code[/code]  (alt+c)";
+ $lang['bbcode_l_help'] = "List: [list]text[/list] (alt+l)";
+ $lang['bbcode_o_help'] = "Ordered list: [list=]text[/list]  (alt+o)";
+ $lang['bbcode_p_help'] = "Insert image: [img]http://image_url[/img]  (alt+p)";
+ $lang['bbcode_w_help'] = "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)";
+ $lang['bbcode_a_help'] = "Close all open bbCode tags";
+ $lang['bbcode_s_help'] = "Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000";
+ $lang['bbcode_f_help'] = "Font size: [size=x-small]small text[/size]";
+ 
+ $lang['Emoticons'] = "Emoticons";
+ $lang['More_emoticons'] = "View more Emoticons";
+ 
+ $lang['Font_color'] = "Font colour";
+ $lang['color_default'] = "Default";
+ $lang['color_dark_red'] = "Dark Red";
+ $lang['color_red'] = "Red";
+ $lang['color_orange'] = "Orange";
+ $lang['color_brown'] = "Brown";
+ $lang['color_yellow'] = "Yellow";
+ $lang['color_green'] = "Green";
+ $lang['color_olive'] = "Olive";
+ $lang['color_cyan'] = "Cyan";
+ $lang['color_blue'] = "Blue";
+ $lang['color_dark_blue'] = "Dark Blue";
+ $lang['color_indigo'] = "Indigo";
+ $lang['color_violet'] = "Violet";
+ $lang['color_white'] = "White";
+ $lang['color_black'] = "Black";
+ 
+ $lang['Font_size'] = "Font size";
+ $lang['font_tiny'] = "Tiny";
+ $lang['font_small'] = "Small";
+ $lang['font_normal'] = "Normal";
+ $lang['font_large'] = "Large";
+ $lang['font_huge'] = "Huge";
+ 
+ $lang['Close_Tags'] = "Close Tags";
+ $lang['Styles_tip'] = "Tip: Styles can be applied quickly to selected text";
  
  

[Phpbb-checkins] CVS: phpBB2 posting.php,1.125,1.126

[Paul S. O. <ps...@us...>]

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

Modified Files:
	posting.php 
Log Message:
Moved remaining hard coded text in posting template to lang_main, smilies now from DB + external smilies window if > 20

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -r1.125 -r1.126
*** posting.php	2001/12/15 22:05:25	1.125
--- posting.php	2001/12/16 18:13:33	1.126
***************
*** 572,575 ****
--- 572,654 ----
  	}
  }
+ 
+ function generate_smilies($mode)
+ {
+ 	global $db, $board_config, $template, $lang, $images, $theme, $phpEx;
+ 	global $user_ip, $forum_id, $session_length;
+ 	global $userdata;
+ 
+ 	if( $mode == 'window' )
+ 	{
+ 		$userdata = session_pagestart($user_ip, $forum_id, $session_length);
+ 		init_userprefs($userdata);
+ 
+ 		$gen_simple_header = TRUE;
+ 
+ 		$page_title = $lang['Review_topic'] ." - $topic_title";
+ 		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+ 
+ 		$template->set_filenames(array(
+ 			"smiliesbody" => "posting_smilies.tpl")
+ 		);
+ 	}
+ 
+ 	$sql = "SELECT * 
+ 		FROM " . SMILIES_TABLE . " 
+ 		GROUP BY emoticon 
+ 		ORDER BY smilies_id";
+ 	if( $result = $db->sql_query($sql) )
+ 	{
+ 		if( $num_smilies = $db->sql_numrows($result) )
+ 		{
+ 			$rowset = $db->sql_fetchrowset($result);
+ 
+ 			$j = 0;
+ 			$s_colspan = 0;
+ 			$smilies_count = ( $mode == 'inline' ) ? min(20, $num_smilies) : $num_smilies;
+ 			$smilies_split_row = ( $mode == 'inline' ) ? 3 : 7;
+ 			for($i = 0; $i < $smilies_count; $i++)
+ 			{
+ 				if( !$j )
+ 				{
+ 					$template->assign_block_vars("smilies_row", array());
+ 				}
+ 
+ 				$template->assign_block_vars("smilies_row.smilies_col", array(
+ 					"SMILEY_CODE" => $rowset[$i]['code'],
+ 					"SMILEY_IMG" => "images/smiles/" . $rowset[$i]['smile_url'],
+ 					"SMILEY_DESC" => $rowset[$i]['emoticon'])
+ 				);
+ 
+ 				$s_colspan = max($s_colspan, $j + 1);
+ 
+ 				$j = ( $j == $smilies_split_row ) ? 0 : $j + 1;
+ 			}
+ 
+ 			if( $mode == 'inline' && $num_smilies > 20)
+ 			{
+ 				$template->assign_block_vars("switch_smilies_extra", array());
+ 
+ 				$template->assign_vars(array(
+ 					"L_MORE_SMILIES" => $lang['More_emoticons'], 
+ 					"U_MORE_SMILIES" => append_sid("posting.$phpEx?mode=smilies"))
+ 				);
+ 			}
+ 
+ 			$template->assign_vars(array(
+ 				"L_EMOTICONS" => $lang['Emoticons'], 
+ 				"L_CLOSE_WINDOW" => $lang['Close_window'], 
+ 				"S_SMILIES_COLSPAN" => $s_colspan)
+ 			);
+ 		}
+ 	}
+ 
+ 	if( $mode == 'window' )
+ 	{
+ 		$template->pparse("smiliesbody");
+ 
+ 		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+ 	}
+ }
  //
  // End page specific functions
***************
*** 686,689 ****
--- 765,773 ----
  	exit;
  }
+ else if( $mode == "smilies" )
+ {
+ 	generate_smilies('window');
+ 	exit;
+ }
  
  //
***************
*** 2492,2501 ****
  if( $preview && !$error )
  {
- 
  	$orig_word = array();
  	$replacement_word = array();
  	$result = obtain_word_list($orig_word, $replacement_word);
  
- 
  	if( $bbcode_on )
  	{
--- 2576,2583 ----
***************
*** 2583,2586 ****
--- 2665,2673 ----
  
  //
+ // Send smilies to template
+ //
+ generate_smilies('inline');
+ 
+ //
  // User not logged in so offer up a username
  // field box
***************
*** 2727,2730 ****
--- 2814,2823 ----
  
  //
+ // This enables the forum/topic title to be output for posting
+ // but not for privmsg (where it makes no sense)
+ //
+ $template->assign_block_vars("switch_not_privmsg", array());
+ 
+ //
  // Output the data to the template
  //
***************
*** 2734,2738 ****
  	"MESSAGE" => $post_message,
  	"HTML_STATUS" => $html_status,
! 	"BBCODE_STATUS" => $bbcode_status,
  	"SMILIES_STATUS" => $smilies_status, 
  	"POLL_TITLE" => preg_replace($html_entities_match, $html_entities_replace, $poll_title),
--- 2827,2831 ----
  	"MESSAGE" => $post_message,
  	"HTML_STATUS" => $html_status,
! 	"BBCODE_STATUS" => sprintf($bbcode_status, '<a href="' . append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 
  	"SMILIES_STATUS" => $smilies_status, 
  	"POLL_TITLE" => preg_replace($html_entities_match, $html_entities_replace, $poll_title),
***************
*** 2754,2757 ****
--- 2847,2891 ----
  	"L_DELETE_POST" => $lang['Delete_post'],
  
+ 	"L_BBCODE_B_HELP" => $lang['bbcode_b_help'], 
+ 	"L_BBCODE_I_HELP" => $lang['bbcode_i_help'], 
+ 	"L_BBCODE_U_HELP" => $lang['bbcode_u_help'], 
+ 	"L_BBCODE_Q_HELP" => $lang['bbcode_q_help'], 
+ 	"L_BBCODE_C_HELP" => $lang['bbcode_c_help'], 
+ 	"L_BBCODE_L_HELP" => $lang['bbcode_l_help'], 
+ 	"L_BBCODE_O_HELP" => $lang['bbcode_o_help'], 
+ 	"L_BBCODE_P_HELP" => $lang['bbcode_p_help'], 
+ 	"L_BBCODE_W_HELP" => $lang['bbcode_w_help'], 
+ 	"L_BBCODE_A_HELP" => $lang['bbcode_a_help'], 
+ 	"L_BBCODE_S_HELP" => $lang['bbcode_s_help'], 
+ 	"L_BBCODE_F_HELP" => $lang['bbcode_f_help'], 
+ 	"L_EMPTY_MESSAGE" => $lang['Empty_message'],
+ 
+ 	"L_FONT_COLOR" => $lang['Font_color'], 
+ 	"L_COLOR_DEFAULT" => $lang['color_default'], 
+ 	"L_COLOR_DARK_RED" => $lang['color_dark_red'], 
+ 	"L_COLOR_RED" => $lang['color_red'], 
+ 	"L_COLOR_ORANGE" => $lang['color_orange'], 
+ 	"L_COLOR_BROWN" => $lang['color_brown'], 
+ 	"L_COLOR_YELLOW" => $lang['color_yellow'], 
+ 	"L_COLOR_GREEN" => $lang['color_green'], 
+ 	"L_COLOR_OLIVE" => $lang['color_olive'], 
+ 	"L_COLOR_CYAN" => $lang['color_cyan'], 
+ 	"L_COLOR_BLUE" => $lang['color_blue'], 
+ 	"L_COLOR_DARK_BLUE" => $lang['color_dark_blue'], 
+ 	"L_COLOR_INDIGO" => $lang['color_indigo'], 
+ 	"L_COLOR_VIOLET" => $lang['color_violet'], 
+ 	"L_COLOR_WHITE" => $lang['color_white'], 
+ 	"L_COLOR_BLACK" => $lang['color_black'], 
+ 
+ 	"L_FONT_SIZE" => $lang['Font_size'], 
+ 	"L_FONT_TINY" => $lang['font_tiny'], 
+ 	"L_FONT_SMALL" => $lang['font_small'], 
+ 	"L_FONT_NORMAL" => $lang['font_normal'], 
+ 	"L_FONT_LARGE" => $lang['font_large'], 
+ 	"L_FONT_HUGE" => $lang['font_huge'], 
+ 
+ 	"L_BBCODE_CLOSE_TAGS" => $lang['Close_Tags'], 
+ 	"L_STYLES_TIP" => $lang['Styles_tip'], 
+ 
  	"U_VIEWTOPIC" => ( $mode == "reply" ) ? append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;postorder=desc") : "", 
  	"U_REVIEW_TOPIC" => ( $mode == "reply" ) ? append_sid("posting.$phpEx?mode=topicreview&amp;" . POST_TOPIC_URL . "=$topic_id") : "", 
***************
*** 2831,2833 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
--- 2965,2967 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2/templates/subSilver posting_smilies.tpl,NONE,1.1

[Paul S. O. <ps...@us...>]

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

Added Files:
	posting_smilies.tpl 
Log Message:
Seperate window for excess smilies

--- NEW FILE ---

<script language="javascript" type="text/javascript">
<!--
function emoticon(text) {
	text = ' ' + text + ' ';
	if (opener.document.forms['post'].message.createTextRange && opener.document.forms['post'].message.caretPos) {
		var caretPos = opener.document.forms['post'].message.caretPos;
		caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? text + ' ' : text;
		opener.document.forms['post'].message.focus();
	} else {
	opener.document.forms['post'].message.value  += text;
	opener.document.forms['post'].message.focus();
	}
}
//-->
</script>

<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_EMOTICONS}</th>
			</tr>
			<tr>
				<td><table width="100" border="0" cellspacing="0" cellpadding="5">
					<!-- BEGIN smilies_row -->
					<tr align="center" valign="middle"> 
						<!-- BEGIN smilies_col -->
						<td><a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" width="15" height="15" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a></td>
						<!-- END smilies_col -->
					</tr>
					<!-- END smilies_row -->
					<!-- BEGIN switch_smilies_extra -->
					<tr align="center"> 
						<td colspan="{S_SMILIES_COLSPAN}"><span  class="nav"><a href="{U_MORE_SMILIES}" onclick="open_window('{U_MORE_SMILIES}', 250, 300);return false" target="_smilies" class="nav">{L_MORE_SMILIES}</a></td>
					</tr>
					<!-- END switch_smilies_extra -->
				</table></td>
			</tr>
			<tr>
				<td align="center"><br /><span class="genmed"><a href="javascript:window.close();" class="genmed">{L_CLOSE_WINDOW}</a></span></td>
			</tr>
		</table></td>
	</tr>
</table>

[Phpbb-checkins] CVS: phpBB2 privmsg.php,1.62,1.63

[Paul S. O. <ps...@us...>]

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

Modified Files:
	privmsg.php 
Log Message:
Implement solution for bug #493663 Re: in reply subject

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -r1.62 -r1.63
*** privmsg.php	2001/12/14 21:13:15	1.62
--- privmsg.php	2001/12/16 15:30:37	1.63
***************
*** 1275,1279 ****
  			$privmsg = $db->sql_fetchrow($pm_reply_status);
  
! 			$privmsg_subject = ( (strstr("Re:", $privmsg['privmsgs_subject'])) ? $lang['Re'] . ":" : "" ) . $privmsg['privmsgs_subject'];
  
  			$to_username = $privmsg['username'];
--- 1275,1279 ----
  			$privmsg = $db->sql_fetchrow($pm_reply_status);
  
! 			$privmsg_subject = ( ( !preg_match("/^Re:/", $privmsg['privmsgs_subject']) ) ? "Re: " : "" ) . $privmsg['privmsgs_subject'];
  
  			$to_username = $privmsg['username'];

[Phpbb-checkins] CVS: phpBB2 viewforum.php,1.113,1.114

[Paul S. O. <ps...@us...>]

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

Modified Files:
	viewforum.php 
Log Message:
Re-jiggle some unread/read/newest topic stuff

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -r1.113 -r1.114
*** viewforum.php	2001/12/16 13:38:10	1.113
--- viewforum.php	2001/12/16 13:47:16	1.114
***************
*** 516,570 ****
  			if( $userdata['session_logged_in'] )
  			{
! 				if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"]) || 
! 					isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"]) || 
! 					isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
  				{
  
! 					$unread_topics = true;
  
! 					if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"]) )
! 					{
! 						if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"] > $topic_rowset[$i]['post_time'] )
  						{
! 							$unread_topics = false;
  						}
- 					}
  
! 					if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"]) )
! 					{
! 						if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"] > $topic_rowset[$i]['post_time'] )
  						{
! 							$unread_topics = false;
  						}
- 					}
  
! 					if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
! 					{
! 						if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"] > $topic_rowset[$i]['post_time'] )
  						{
! 							$unread_topics = false;
  						}
- 					}
  
! 					if( $unread_topics )
! 					{
! 						$folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" title=\"" . $lang['New_posts'] . "\" />";
  
! 						$newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_post'] . "\" title=\"" . $lang['View_newest_post'] . "\" border=\"0\" /></a> ";
  					}
  					else
  					{
! 						$folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
  
! 						$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" title=\"$folder_alt\" border=\"0\" />";
! 						$newest_post_img = "";
  					}
- 
- 				}
- 				else if( $topic_rowset[$i]['post_time'] > $userdata['user_lastvisit'] ) 
- 				{
- 					$folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" title=\"" . $lang['New_posts'] . "\" />";
- 
- 					$newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_post'] . "\" title=\"" . $lang['View_newest_post'] . "\" border=\"0\" /></a> ";
  				}
  				else 
--- 516,572 ----
  			if( $userdata['session_logged_in'] )
  			{
! 				if( $topic_rowset[$i]['post_time'] > $userdata['user_lastvisit'] ) 
  				{
+ 					if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"]) || 
+ 						isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"]) || 
+ 						isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
+ 					{
  
! 						$unread_topics = true;
  
! 						if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"]) )
  						{
! 							if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"] > $topic_rowset[$i]['post_time'] )
! 							{
! 								$unread_topics = false;
! 							}
  						}
  
! 						if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"]) )
  						{
! 							if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"] > $topic_rowset[$i]['post_time'] )
! 							{
! 								$unread_topics = false;
! 							}
  						}
  
! 						if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
  						{
! 							if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"] > $topic_rowset[$i]['post_time'] )
! 							{
! 								$unread_topics = false;
! 							}
  						}
  
! 						if( $unread_topics )
! 						{
! 							$folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" title=\"" . $lang['New_posts'] . "\" />";
  
! 							$newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_post'] . "\" title=\"" . $lang['View_newest_post'] . "\" border=\"0\" /></a> ";
! 						}
! 						else
! 						{
! 							$folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
! 
! 							$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" title=\"$folder_alt\" border=\"0\" />";
! 							$newest_post_img = "";
! 						}
  					}
  					else
  					{
! 						$folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" title=\"" . $lang['New_posts'] . "\" />";
  
! 						$newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_post'] . "\" title=\"" . $lang['View_newest_post'] . "\" border=\"0\" /></a> ";
  					}
  				}
  				else 

[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.152,1.153

[Paul S. O. <ps...@us...>]

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

Modified Files:
	viewtopic.php 
Log Message:
Fix view newest post error + missing mini post icon in posting preview

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.152
retrieving revision 1.153
diff -C2 -r1.152 -r1.153
*** viewtopic.php	2001/12/16 13:36:47	1.152
--- viewtopic.php	2001/12/16 13:41:37	1.153
***************
*** 78,82 ****
  				if( !($row = $db->sql_fetchrow($result)) )
  				{
! 					message_die(GENERAL_MESSAGE, $lang['No_new_posts_last_visit']);
  				}
  				else
--- 78,82 ----
  				if( !($row = $db->sql_fetchrow($result)) )
  				{
! 					message_die(GENERAL_MESSAGE, 'No_new_posts_last_visit');
  				}
  				else

[Phpbb-checkins] CVS: phpBB2 viewforum.php,1.112,1.113

[Paul S. O. <ps...@us...>]

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

Modified Files:
	viewforum.php 
Log Message:
Fix view newest post error + missing mini post icon in posting preview

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -r1.112 -r1.113
*** viewforum.php	2001/12/16 13:36:47	1.112
--- viewforum.php	2001/12/16 13:38:10	1.113
***************
*** 513,517 ****
  			}
  
! 			$newest_post_img = ""
  			if( $userdata['session_logged_in'] )
  			{
--- 513,517 ----
  			}
  
! 			$newest_post_img = "";
  			if( $userdata['session_logged_in'] )
  			{

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

[Paul S. O. <ps...@us...>]

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

Modified Files:
	posting_preview.tpl 
Log Message:
Fix view newest post error + missing mini post icon in posting preview

Index: posting_preview.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/posting_preview.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** posting_preview.tpl	2001/10/01 23:22:18	1.2
--- posting_preview.tpl	2001/12/16 13:36:47	1.3
***************
*** 5,9 ****
    </tr>
    <tr> 
! 	<td class="row1"><img src="images/icon_minipost.gif" alt="Post image icon" /><span class="postdetails">{L_POSTED}: 
  	  {POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Post Subject: {POST_SUBJECT}</span> 
  	</td>
--- 5,9 ----
    </tr>
    <tr> 
! 	<td class="row1"><img src="templates/subSilver/images/icon_minipost.gif" alt="Post image icon" /><span class="postdetails">{L_POSTED}: 
  	  {POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Post Subject: {POST_SUBJECT}</span> 
  	</td>

[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.151,1.152 viewforum.php,1.111,1.112

[Paul S. O. <ps...@us...>]

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

Modified Files:
	viewtopic.php viewforum.php 
Log Message:
Fix view newest post error + missing mini post icon in posting preview

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.151
retrieving revision 1.152
diff -C2 -r1.151 -r1.152
*** viewtopic.php	2001/12/15 01:55:43	1.151
--- viewtopic.php	2001/12/16 13:36:47	1.152
***************
*** 64,71 ****
  			{
  				$sql = "SELECT p.post_id 
! 					FROM " . POSTS_TABLE . " p, " . SESSIONS_TABLE . " s 
! 					WHERE topic_id = $topic_id 
! 						AND s.session_id = '$session_id' 
! 						AND p.post_time >= s.session_last_visit 
  					ORDER BY p.post_time ASC 
  					LIMIT 1";
--- 64,72 ----
  			{
  				$sql = "SELECT p.post_id 
! 					FROM " . POSTS_TABLE . " p, " . SESSIONS_TABLE . " s,  " . USERS_TABLE . " u 
! 					WHERE s.session_id = '$session_id' 
! 						AND u.user_id = s.session_user_id 
! 						AND p.topic_id = $topic_id 
! 						AND p.post_time >= u.user_lastvisit 
  					ORDER BY p.post_time ASC 
  					LIMIT 1";

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -r1.111 -r1.112
*** viewforum.php	2001/12/15 17:47:45	1.111
--- viewforum.php	2001/12/16 13:36:47	1.112
***************
*** 513,516 ****
--- 513,517 ----
  			}
  
+ 			$newest_post_img = ""
  			if( $userdata['session_logged_in'] )
  			{

[Phpbb-checkins] CVS: phpBB2/admin admin_styles.php,1.10,1.11

[Paul S. O. <ps...@us...>]

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

Modified Files:
	admin_styles.php 
Log Message:
Hopefully fixed bug #491971

Index: admin_styles.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_styles.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** admin_styles.php	2001/12/16 02:38:45	1.10
--- admin_styles.php	2001/12/16 02:45:06	1.11
***************
*** 42,53 ****
  $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE;
  
! if( $cancel )
  {
! 	header("Location: " . append_sid("admin_styles.$phpEx"));
  }
  
! if( !$HTTP_POST_VARS['send_file'] )
  {
! 	require('pagestart.inc');
  }
  
--- 42,54 ----
  $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE;
  
! if( !$HTTP_POST_VARS['send_file'] )
  {
! 	$no_page_header = ( $cancel ) ? TRUE : FALSE;
! 	require('pagestart.inc');
  }
  
! if( $cancel )
  {
! 	header("Location: " . append_sid("admin_styles.$phpEx"));
  }
  

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_admin.php,1.19,1.20

[Paul S. O. <ps...@us...>]

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

Modified Files:
	lang_admin.php 
Log Message:
Added body text setting

Index: lang_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_admin.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** lang_admin.php	2001/12/16 00:44:59	1.19
--- lang_admin.php	2001/12/16 02:38:45	1.20
***************
*** 590,593 ****
--- 590,594 ----
  $lang['Theme_name'] = "Theme Name";
  $lang['Link_color'] = "Link Colour";
+ $lang['Text_color'] = "Text Colour";
  $lang['VLink_color'] = "Visited Link Colour";
  $lang['ALink_color'] = "Active Link Colour";
***************
*** 684,686 ****
  // -------------------------------------------------
  
! ?>
--- 685,687 ----
  // -------------------------------------------------
  
! ?>
\ No newline at end of file

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

[Paul S. O. <ps...@us...>]

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

Modified Files:
	styles_edit_body.tpl 
Log Message:
Added body text setting

Index: styles_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/styles_edit_body.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** styles_edit_body.tpl	2001/11/07 11:10:56	1.1
--- styles_edit_body.tpl	2001/12/16 02:38:45	1.2
***************
*** 17,23 ****
  	</tr>
  	<tr>
! 		<td class="cattitle">{L_THEME_ELEMENT}</td>
! 		<td class="cattitle">{L_VALUE}</td>
! 		<td class="cattitle">{L_SIMPLE_NAME}</td>
  	</tr>
  	<tr>
--- 17,23 ----
  	</tr>
  	<tr>
! 		<th>{L_THEME_ELEMENT}</th>
! 		<th>{L_VALUE}</th>
! 		<th>{L_SIMPLE_NAME}</th>
  	</tr>
  	<tr>
***************
*** 33,57 ****
  	<tr>
  		<td class="row1">{L_BACKGROUND_COLOR}:</td>
! 		<td class="row2" ><input type="text" size="25" maxlength="100" name="body_bgcolor" value="{BODY_BGCOLOR}"></td>
  		<td class="row2">&nbsp;</td>
  	</tr>
  	<tr>
! 		<td class="row1">{L_BODY_LINK}:</td>
! 		<td class="row2" ><input type="text" size="25" maxlength="100" name="body_link" value="{BODY_LINK}"></td>
  		<td class="row2">&nbsp;</td>
  	</tr>
  	<tr>
! 		<td class="row1">{L_BODY_VLINK}:</td>
! 		<td class="row2" ><input type="text" size="25" maxlength="100" name="body_vlink" value="{BODY_VLINK}"></td>
  		<td class="row2">&nbsp;</td>		
  	</tr>
  	<tr>
! 		<td class="row1">{L_BODY_ALINK}:</td>
! 		<td class="row2" ><input type="text" size="25" maxlength="100" name="body_alink" value="{BODY_ALINK}"></td>
  		<td class="row2">&nbsp;</td>		
  	</tr>
  	<tr>
! 		<td class="row1">{L_BODY_HLINK}:</td>
! 		<td class="row2" ><input type="text" size="25" maxlength="100" name="body_hlink" value="{BODY_HLINK}"></td>
  		<td class="row2">&nbsp;</td>		
  	</tr>
--- 33,62 ----
  	<tr>
  		<td class="row1">{L_BACKGROUND_COLOR}:</td>
! 		<td class="row2" ><input type="text" size="6" maxlength="6" name="body_bgcolor" value="{BODY_BGCOLOR}"></td>
  		<td class="row2">&nbsp;</td>
  	</tr>
  	<tr>
! 		<td class="row1">{L_BODY_TEXT_COLOR}:</td>
! 		<td class="row2" ><input type="text" size="6" maxlength="6" name="body_text" value="{BODY_TEXT_COLOR}"></td>
  		<td class="row2">&nbsp;</td>
  	</tr>
  	<tr>
! 		<td class="row1">{L_BODY_LINK_COLOR}:</td>
! 		<td class="row2" ><input type="text" size="6" maxlength="6" name="body_link" value="{BODY_LINK_COLOR}"></td>
! 		<td class="row2">&nbsp;</td>
! 	</tr>
! 	<tr>
! 		<td class="row1">{L_BODY_VLINK_COLOR}:</td>
! 		<td class="row2" ><input type="text" size="6" maxlength="6" name="body_vlink" value="{BODY_VLINK_COLOR}"></td>
  		<td class="row2">&nbsp;</td>		
  	</tr>
  	<tr>
! 		<td class="row1">{L_BODY_ALINK_COLOR}:</td>
! 		<td class="row2" ><input type="text" size="6" maxlength="6" name="body_alink" value="{BODY_ALINK_COLOR}"></td>
  		<td class="row2">&nbsp;</td>		
  	</tr>
  	<tr>
! 		<td class="row1">{L_BODY_HLINK_COLOR}:</td>
! 		<td class="row2" ><input type="text" size="6" maxlength="6" name="body_hlink" value="{BODY_HLINK_COLOR}"></td>
  		<td class="row2">&nbsp;</td>		
  	</tr>

[Phpbb-checkins] CVS: phpBB2/admin admin_styles.php,1.9,1.10

[Paul S. O. <ps...@us...>]

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

Modified Files:
	admin_styles.php 
Log Message:
Added body text setting

Index: admin_styles.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_styles.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** admin_styles.php	2001/11/29 08:32:02	1.9
--- admin_styles.php	2001/12/16 02:38:45	1.10
***************
*** 39,58 ****
  // Check if the user has cancled a confirmation message.
  //
! $confirm = ( $HTTP_POST_VARS['confirm'] ) ? TRUE : FALSE;
! $cancel = ( $HTTP_POST_VARS['cancel'] ) ? TRUE : FALSE;
  
! if($cancel)
  {
! 	header("Location: admin_styles.$phpEx");
  }
  
! if(!$HTTP_POST_VARS['send_file'])
  {
  	require('pagestart.inc');
  }
  
! if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
  {
! 	$mode = ($HTTP_GET_VARS['mode']) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
  }
  else 
--- 39,58 ----
  // Check if the user has cancled a confirmation message.
  //
! $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE;
! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE;
  
! if( $cancel )
  {
! 	header("Location: " . append_sid("admin_styles.$phpEx"));
  }
  
! if( !$HTTP_POST_VARS['send_file'] )
  {
  	require('pagestart.inc');
  }
  
! if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
  {
! 	$mode = ( isset($HTTP_GET_VARS['mode']) ) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
  }
  else 
***************
*** 61,71 ****
  }
  
! switch($mode)
  {
  	case "addnew":
! 		$install_to = ($HTTP_GET_VARS['install_to']) ? urldecode($HTTP_GET_VARS['install_to']) : $HTTP_POST_VARS['install_to'];
! 		$style_name = ($HTTP_GET_VARS['style']) ? urldecode($HTTP_GET_VARS['style']) : $HTTP_POST_VARS['style'];
  	
! 		if(isset($install_to))
  		{
  			include($phpbb_root_dir . "templates/" . $install_to . "/theme_info.cfg");
--- 61,71 ----
  }
  
! switch( $mode )
  {
  	case "addnew":
! 		$install_to = ( isset($HTTP_GET_VARS['install_to']) ) ? urldecode($HTTP_GET_VARS['install_to']) : $HTTP_POST_VARS['install_to'];
! 		$style_name = ( isset($HTTP_GET_VARS['style']) ) ? urldecode($HTTP_GET_VARS['style']) : $HTTP_POST_VARS['style'];
  	
! 		if( isset($install_to) )
  		{
  			include($phpbb_root_dir . "templates/" . $install_to . "/theme_info.cfg");
***************
*** 76,80 ****
  			for($i = 0; $i < count($template_name) && !$found; $i++)
  			{
! 				if($template_name[$i]['style_name'] == $style_name)
  				{
  					while(list($key, $val) = each($template_name[$i]))
--- 76,80 ----
  			for($i = 0; $i < count($template_name) && !$found; $i++)
  			{
! 				if( $template_name[$i]['style_name'] == $style_name )
  				{
  					while(list($key, $val) = each($template_name[$i]))
***************
*** 110,114 ****
  			$sql .= ")";
  			
! 			if(!$result = $db->sql_query($sql))
  			{
  				message_die(GENERAL_ERROR, "Could not insert theme data!", "Error", __LINE__, __FILE__, $sql);
--- 110,114 ----
  			$sql .= ")";
  			
! 			if( !$result = $db->sql_query($sql) )
  			{
  				message_die(GENERAL_ERROR, "Could not insert theme data!", "Error", __LINE__, __FILE__, $sql);
***************
*** 193,199 ****
  	case "create":
  	case "edit":
! 		$submit = (isset($HTTP_POST_VARS['submit'])) ? 1 : 0;
  		
! 		if($submit)
  		{
  			//	
--- 193,199 ----
  	case "create":
  	case "edit":
! 		$submit = ( isset($HTTP_POST_VARS['submit']) ) ? TRUE : 0;
  		
! 		if( $submit )
  		{
  			//	
***************
*** 205,208 ****
--- 205,209 ----
  			$updated['body_background'] = $HTTP_POST_VARS['body_background'];
  			$updated['body_bgcolor'] = $HTTP_POST_VARS['body_bgcolor'];
+ 			$updated['body_text'] = $HTTP_POST_VARS['body_text'];
  			$updated['body_link'] = $HTTP_POST_VARS['body_link'];
  			$updated['body_vlink'] = $HTTP_POST_VARS['body_vlink'];
***************
*** 559,566 ****
  				"L_BACKGROUND_IMAGE" => $lang['Background_image'],
  				"L_BACKGROUND_COLOR" => $lang['Background_color'],
! 				"L_BODY_LINK" => $lang['Link_color'],
! 				"L_BODY_VLINK" => $lang['VLink_color'],
! 				"L_BODY_ALINK" => $lang['ALink_color'],
! 				"L_BODY_HLINK" => $lang['HLink_color'],
  				"L_TR_COLOR1" => $lang['Tr_color1'],
  				"L_TR_COLOR2" => $lang['Tr_color2'],
--- 560,568 ----
  				"L_BACKGROUND_IMAGE" => $lang['Background_image'],
  				"L_BACKGROUND_COLOR" => $lang['Background_color'],
! 				"L_BODY_TEXT_COLOR" => $lang['Text_color'],
! 				"L_BODY_LINK_COLOR" => $lang['Link_color'],
! 				"L_BODY_VLINK_COLOR" => $lang['VLink_color'],
! 				"L_BODY_ALINK_COLOR" => $lang['ALink_color'],
! 				"L_BODY_HLINK_COLOR" => $lang['HLink_color'],
  				"L_TR_COLOR1" => $lang['Tr_color1'],
  				"L_TR_COLOR2" => $lang['Tr_color2'],
***************
*** 598,605 ****
  				"BODY_BACKGROUND" => $selected['body_background'],
  				"BODY_BGCOLOR" => $selected['body_bgcolor'],
! 				"BODY_LINK" => $selected['body_link'],
! 				"BODY_VLINK" => $selected['body_vlink'],
! 				"BODY_ALINK" => $selected['body_alink'],
! 				"BODY_HLINK" => $selected['body_hlink'],
  				"TR_COLOR1" => $selected['tr_color1'],
  				"TR_COLOR2" => $selected['tr_color2'],
--- 600,608 ----
  				"BODY_BACKGROUND" => $selected['body_background'],
  				"BODY_BGCOLOR" => $selected['body_bgcolor'],
! 				"BODY_TEXT_COLOR" => $selected['body_text'],
! 				"BODY_LINK_COLOR" => $selected['body_link'],
! 				"BODY_VLINK_COLOR" => $selected['body_vlink'],
! 				"BODY_ALINK_COLOR" => $selected['body_alink'],
! 				"BODY_HLINK_COLOR" => $selected['body_hlink'],
  				"TR_COLOR1" => $selected['tr_color1'],
  				"TR_COLOR2" => $selected['tr_color2'],
***************
*** 792,798 ****
  
  	case "delete":
! 		$style_id = ($HTTP_GET_VARS['style_id']) ? intval($HTTP_GET_VARS['style_id']) : intval($HTTP_POST_VARS['style_id']);
  		
! 		if(!$confirm)
  		{
  			if($style_id == $board_config['default_style'])
--- 795,801 ----
  
  	case "delete":
! 		$style_id = ( isset($HTTP_GET_VARS['style_id']) ) ? intval($HTTP_GET_VARS['style_id']) : intval($HTTP_POST_VARS['style_id']);
  		
! 		if( !$confirm )
  		{
  			if($style_id == $board_config['default_style'])

[Phpbb-checkins] CVS: phpBB2/templates/subSilver groupcp_user_body.tpl,1.4,1.5

[Paul S. O. <ps...@us...>]

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

Modified Files:
	groupcp_user_body.tpl 
Log Message:
Should fix bug #493448 I can't believe the cockup I made, that was a good one even by my standards ... PS: This one works ...

Index: groupcp_user_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/groupcp_user_body.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** groupcp_user_body.tpl	2001/11/18 14:01:35	1.4
--- groupcp_user_body.tpl	2001/12/16 02:06:14	1.5
***************
*** 19,23 ****
  			<td width="40%"><span class="gensmall">{GROUP_MEMBER_SELECT}</span></td>
  			<td align="center" width="30%"> 
! 			  <input type="submit" value="{L_VIEW_INFORMATION}" class="liteoption" />
  			</td>
  		</form></tr>
--- 19,23 ----
  			<td width="40%"><span class="gensmall">{GROUP_MEMBER_SELECT}</span></td>
  			<td align="center" width="30%"> 
! 			  <input type="submit" value="{L_VIEW_INFORMATION}" class="liteoption" />{S_HIDDEN_FIELDS}
  			</td>
  		</form></tr>
***************
*** 34,38 ****
  			<td width="40%"><span class="gensmall">{GROUP_PENDING_SELECT}</span></td>
  			<td align="center" width="30%"> 
! 			  <input type="submit" value="{L_VIEW_INFORMATION}" class="liteoption" />
  			</td>
  		</form></tr>
--- 34,38 ----
  			<td width="40%"><span class="gensmall">{GROUP_PENDING_SELECT}</span></td>
  			<td align="center" width="30%"> 
! 			  <input type="submit" value="{L_VIEW_INFORMATION}" class="liteoption" />{S_HIDDEN_FIELDS}
  			</td>
  		</form></tr>
***************
*** 53,57 ****
  			<td width="40%"><span class="gensmall">{GROUP_LIST_SELECT}</span></td>
  			<td align="center" width="30%"> 
! 			  <input type="submit" value="{L_VIEW_INFORMATION}" class="liteoption" />
  			</td>
  		</form></tr>
--- 53,57 ----
  			<td width="40%"><span class="gensmall">{GROUP_LIST_SELECT}</span></td>
  			<td align="center" width="30%"> 
! 			  <input type="submit" value="{L_VIEW_INFORMATION}" class="liteoption" />{S_HIDDEN_FIELDS}
  			</td>
  		</form></tr>