phpbb-checkins Mailing List for phpBB (Page 6)

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

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

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

You can subscribe to this list here.

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

Flat | Threaded

<< < 1 .. 4 5 6 7 8 .. 629 > >> (Page 6 of 629)

[Phpbb-checkins] r10147 - /branches/phpBB-3_0_0/phpBB/includes/functions.php

From: Meik S. <acy...@ph...> - 2009-09-15 13:11:47

Author: acydburn
Date: Tue Sep 15 14:10:59 2009
New Revision: 10147

Log:
Fix login for passworded forums - Bug #51265
Was a regression from r10067 for Bug #50285

Modified:
    branches/phpBB-3_0_0/phpBB/includes/functions.php

Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Tue Sep 15 14:10:59 2009
***************
*** 3050,3055 ****
--- 3050,3056 ----
  	page_header($user->lang['LOGIN'], false);
  
  	$template->assign_vars(array(
+ 		'S_LOGIN_ACTION'		=> build_url(array('f')),
  		'S_HIDDEN_FIELDS'		=> build_hidden_fields(array('f' => $forum_data['forum_id'])))
  	);

[Phpbb-checkins] r10146 - /branches/phpBB-3_0_0/phpBB/includes/functions_admin.php

From: Meik S. <acy...@ph...> - 2009-09-15 12:59:08

Author: acydburn
Date: Tue Sep 15 13:58:23 2009
New Revision: 10146

Log:
fix uninitialised variable in functions_admin.php (Bug #51295)

Modified:
    branches/phpBB-3_0_0/phpBB/includes/functions_admin.php

Modified: branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_admin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_admin.php Tue Sep 15 13:58:23 2009
***************
*** 2514,2519 ****
--- 2514,2520 ----
  
  		case 'mod':
  			$log_type = LOG_MOD;
+ 			$sql_forum = '';
  
  			if ($topic_id)
  			{

[Phpbb-checkins] r10145 - in /branches/phpBB-3_0_0/phpBB: adm/style/acp_users_warnings.html includes/acp/acp_users.php

From: Joas S. <nic...@ph...> - 2009-09-15 09:45:49

Author: nickvergessen
Date: Tue Sep 15 10:45:05 2009
New Revision: 10145

Log:
Fix #51305 - User need a_clearlog to delete warnings

Authorised by: AcydBurn

Modified:
    branches/phpBB-3_0_0/phpBB/adm/style/acp_users_warnings.html
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php

Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_users_warnings.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_users_warnings.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_users_warnings.html Tue Sep 15 10:45:05 2009
***************
*** 7,23 ****
  		<th>{L_REPORT_BY}</th>
  		<th>{L_TIME}</th>
  		<th>{L_FEEDBACK}</th>
! 		<!-- IF S_CLEARLOGS --><th>{L_MARK}</th><!-- ENDIF -->
  	</tr>
  	</thead>
  	<tbody>
  	<!-- BEGIN warn -->
  		<!-- IF warn.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
- 
  			<td>{warn.USERNAME}</td>
  			<td style="text-align: center; nowrap: nowrap;">{warn.DATE}</td>
  			<td>{warn.ACTION}</td>
! 			<!-- IF S_CLEARLOGS --><td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{warn.ID}" /></td><!-- ENDIF -->
  		</tr>
  	<!-- END warn -->
  	</tbody>
--- 7,22 ----
  		<th>{L_REPORT_BY}</th>
  		<th>{L_TIME}</th>
  		<th>{L_FEEDBACK}</th>
! 		<th>{L_MARK}</th>
  	</tr>
  	</thead>
  	<tbody>
  	<!-- BEGIN warn -->
  		<!-- IF warn.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
  			<td>{warn.USERNAME}</td>
  			<td style="text-align: center; nowrap: nowrap;">{warn.DATE}</td>
  			<td>{warn.ACTION}</td>
! 			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{warn.ID}" /></td>
  		</tr>
  	<!-- END warn -->
  	</tbody>
***************
*** 28,39 ****
  		</div>
  	<!-- ENDIF -->
  
! 	<!-- IF S_CLEARLOGS -->
! 		<fieldset class="quick">
! 			<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
! 			<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
! 			<p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p>
! 		</fieldset>
! 	<!-- ENDIF -->
  	{S_FORM_TOKEN}
  	</form>
--- 27,36 ----
  		</div>
  	<!-- ENDIF -->
  
! 	<fieldset class="quick">
! 		<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
! 		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
! 		<p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p>
! 	</fieldset>
  	{S_FORM_TOKEN}
  	</form>

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_users.php Tue Sep 15 10:45:05 2009
***************
*** 1167,1179 ****
  						$deleteall = request_var('delall', 0);
  						if ($deletemark && $marked)
  						{
! 							$sql_in = array();
! 							foreach ($marked as $mark)
! 							{
! 								$sql_in[] = $mark;
! 							}
! 							$where_sql = ' AND ' . $db->sql_in_set('warning_id', $sql_in);
! 							unset($sql_in);
  						}
  
  						if ($where_sql || $deleteall)
--- 1167,1173 ----
  						$deleteall = request_var('delall', 0);
  						if ($deletemark && $marked)
  						{
! 							$where_sql = ' AND ' . $db->sql_in_set('warning_id', array_values($marked));
  						}
  
  						if ($where_sql || $deleteall)
***************
*** 1291,1297 ****
  
  				$template->assign_vars(array(
  					'S_WARNINGS'	=> true,
- 					'S_CLEARLOGS'	=> $auth->acl_get('a_clearlogs'),
  				));
  
  			break;
--- 1285,1290 ----

[Phpbb-checkins] r10144 - /branches/phpBB-3_0_0/phpBB/includes/acp/acp_captcha.php

From: Henry S. <kel...@ph...> - 2009-09-15 09:12:04

Author: Kellanved
Date: Tue Sep 15 10:11:17 2009
New Revision: 10144

Log:
sanity check - avoid ugly error messages

Modified:
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_captcha.php

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_captcha.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_captcha.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_captcha.php Tue Sep 15 10:11:17 2009
***************
*** 30,39 ****
  		$user->add_lang('acp/board');
  
  		include($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx);
! 
  		$selected = request_var('select_captcha', $config['captcha_plugin']);
  		$configure = request_var('configure', false);
  
  		// Oh, they are just here for the view
  		if (isset($_GET['captcha_demo']))
  		{
--- 30,42 ----
  		$user->add_lang('acp/board');
  
  		include($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx);
! 		$captchas = phpbb_captcha_factory::get_captcha_types();
! 		
  		$selected = request_var('select_captcha', $config['captcha_plugin']);
+ 		$selected = (isset($captchas['available'][$selected]) || isset($captchas['unavailable'][$selected])) ? $selected : $config['captcha_plugin'];
  		$configure = request_var('configure', false);
  
+ 
  		// Oh, they are just here for the view
  		if (isset($_GET['captcha_demo']))
  		{
***************
*** 49,56 ****
  		}
  		else
  		{
- 			$captchas = phpbb_captcha_factory::get_captcha_types();
- 
  			$config_vars = array(
  				'enable_confirm'		=> array('tpl' => 'REG_ENABLE', 'default' => false),
  				'enable_post_confirm'	=> array('tpl' => 'POST_ENABLE', 'default' => false),
--- 52,57 ----

[Phpbb-checkins] r10143 - /branches/phpBB-3_0_0/phpBB/includes/auth/auth_db.php

From: Henry S. <kel...@ph...> - 2009-09-15 09:09:23

Author: Kellanved
Date: Tue Sep 15 10:08:37 2009
New Revision: 10143

Log:
#51395 - remove legacy captcha code. authorised by: acyd burn

Modified:
    branches/phpBB-3_0_0/phpBB/includes/auth/auth_db.php

Modified: branches/phpBB-3_0_0/phpBB/includes/auth/auth_db.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/auth/auth_db.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/auth/auth_db.php Tue Sep 15 10:08:37 2009
***************
*** 67,76 ****
  	// Every auth module is able to define what to do by itself...
  	if ($config['max_login_attempts'] && $row['user_login_attempts'] >= $config['max_login_attempts'])
  	{
- 		$confirm_id = request_var('confirm_id', '');
- 
  		// Visual Confirmation handling
! 		if (!$confirm_id)
  		{
  			return array(
  				'status'		=> LOGIN_ERROR_ATTEMPTS,
--- 67,78 ----
  	// Every auth module is able to define what to do by itself...
  	if ($config['max_login_attempts'] && $row['user_login_attempts'] >= $config['max_login_attempts'])
  	{
  		// Visual Confirmation handling
! 
! 		$captcha =& phpbb_captcha_factory::get_instance($config['captcha_plugin']);
! 		$captcha->init(CONFIRM_LOGIN);
! 		$vc_response = $captcha->validate();
! 		if ($vc_response)
  		{
  			return array(
  				'status'		=> LOGIN_ERROR_ATTEMPTS,
***************
*** 78,98 ****
  				'user_row'		=> $row,
  			);
  		}
! 		else
! 		{
! 			$captcha =& phpbb_captcha_factory::get_instance($config['captcha_plugin']);
! 			$captcha->init(CONFIRM_LOGIN);
! 			$vc_response = $captcha->validate();
! 
! 			if ($vc_response)
! 			{
! 				return array(
! 					'status'		=> LOGIN_ERROR_ATTEMPTS,
! 					'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS',
! 					'user_row'		=> $row,
! 				);
! 			}
! 		}
  	}
  
  	// If the password convert flag is set we need to convert it
--- 80,86 ----
  				'user_row'		=> $row,
  			);
  		}
! 		
  	}
  
  	// If the password convert flag is set we need to convert it

[Phpbb-checkins] r10142 - /branches/phpBB-3_0_0/phpBB/includes/message_parser.php

From: Joas S. <nic...@ph...> - 2009-09-13 15:05:10

Author: nickvergessen
Date: Sun Sep 13 16:04:21 2009
New Revision: 10142

Log:
fix #51235 - regression from 9843 for #48265

Authorised by: AcydBurn

Modified:
    branches/phpBB-3_0_0/phpBB/includes/message_parser.php

Modified: branches/phpBB-3_0_0/phpBB/includes/message_parser.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/message_parser.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/message_parser.php Sun Sep 13 16:04:21 2009
***************
*** 1510,1515 ****
--- 1510,1517 ----
  							{
  								$sql_ary['topic_id'] = $topic_id;
  							}
+ 							set_config_count('upload_dir_size', $filedata['filesize'], true);
+ 							set_config_count('num_files', 1, true);
  						}
  
  						$db->sql_query('INSERT INTO ' . ATTACHMENTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));

[Phpbb-checkins] r10141 - /branches/phpBB-3_0_0/phpBB/includes/functions_upload.php

From: Meik S. <acy...@ph...> - 2009-09-13 14:32:18

Author: acydburn
Date: Sun Sep 13 15:31:32 2009
New Revision: 10141

Log:
why am i so dumb sometimes... /me hits myself with the dumbness stick...
regression from r10122

Modified:
    branches/phpBB-3_0_0/phpBB/includes/functions_upload.php

Modified: branches/phpBB-3_0_0/phpBB/includes/functions_upload.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_upload.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_upload.php Sun Sep 13 15:31:32 2009
***************
*** 349,355 ****
  			}
  
  			phpbb_chmod($this->destination_file, $chmod);
- 			return true;
  		}
  
  		// Try to get real filesize from destination folder
--- 349,354 ----

[Phpbb-checkins] r10140 - /tags/release_3_0_6-RC1/

From: Meik S. <acy...@ph...> - 2009-09-12 17:15:51

Author: acydburn
Date: Sat Sep 12 18:15:03 2009
New Revision: 10140

Log:
Tag 3.0.6-RC1

Added:
    tags/release_3_0_6-RC1/
      - copied from r10139, branches/phpBB-3_0_0/

[Phpbb-checkins] r10139 - /branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php

From: Joas S. <nic...@ph...> - 2009-09-12 13:18:42

Author: nickvergessen
Date: Sat Sep 12 14:17:58 2009
New Revision: 10139

Log:
fix #49625 r10002 - Do not drop forum_id on mcp_front (un)approval

Authorised by: AcydBurn


Modified:
    branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php

Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php Sat Sep 12 14:17:58 2009
***************
*** 120,126 ****
  			}
  
  			$s_hidden_fields = build_hidden_fields(array(
! 				'redirect'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main')
  			));
  
  			$template->assign_vars(array(
--- 120,126 ----
  			}
  
  			$s_hidden_fields = build_hidden_fields(array(
! 				'redirect'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main' . (($forum_id) ? '&amp;f=' . $forum_id : ''))
  			));
  
  			$template->assign_vars(array(

[Phpbb-checkins] r10138 - in /branches/phpBB-3_0_0/phpBB: docs/CHANGELOG.html includes/ucp/ucp_pm_viewfolder.php language/en/ucp.php

From: Henry S. <kel...@ph...> - 2009-09-11 14:39:11

Author: Kellanved
Date: Fri Sep 11 15:38:23 2009
New Revision: 10138

Log:
rollback; will be in 3.0.7

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php
    branches/phpBB-3_0_0/phpBB/language/en/ucp.php

Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Fri Sep 11 15:38:23 2009
***************
*** 210,216 ****
  		<li>[Fix] Do not display links to user/post search if search is disabled. (Bug #50685 - Patch by HardStyle)</li>
  		<li>[Fix] Fix icon alignment for forums with large descriptions in subsilver2. (Bug #50445)</li>
  		<li>[Fix] Correctly display underlined links placed in last line in viewtopic. (Bug #14811 - Patch by primehalo)</li>
- 		<li>[Fix] Handle export of private messages where all recipients were deleted. (Bug #50985)</li>
  		<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
  		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
  		<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
--- 210,215 ----

Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php Fri Sep 11 15:38:23 2009
***************
*** 194,208 ****
  		else
  		{
  			// Build Recipient List if in outbox/sentbox
! 
! 			$address_temp = $address = $data = array();
  
  			if ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX)
  			{
  				foreach ($folder_info['rowset'] as $message_id => $row)
  				{
! 					$address_temp[$message_id] = rebuild_header(array('to' => $row['to_address'], 'bcc' => $row['bcc_address']));
! 					$address[$message_id] = array();
  				}
  			}
  
--- 194,206 ----
  		else
  		{
  			// Build Recipient List if in outbox/sentbox
! 			$address = $data = array();
  
  			if ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX)
  			{
  				foreach ($folder_info['rowset'] as $message_id => $row)
  				{
! 					$address[$message_id] = rebuild_header(array('to' => $row['to_address'], 'bcc' => $row['bcc_address']));
  				}
  			}
  
***************
*** 226,237 ****
  				$_types = array('u', 'g');
  				foreach ($_types as $ug_type)
  				{
! 					if (isset($address_temp[$message_id][$ug_type]) && sizeof($address_temp[$message_id][$ug_type]))
  					{
- 						if (!isset($address[$message_id][$ug_type]))
- 						{
- 							$address[$message_id][$ug_type] = array();
- 						}
  						if ($ug_type == 'u')
  						{
  							$sql = 'SELECT user_id as id, username as name
--- 224,231 ----
  				$_types = array('u', 'g');
  				foreach ($_types as $ug_type)
  				{
! 					if (isset($address[$message_id][$ug_type]) && sizeof($address[$message_id][$ug_type]))
  					{
  						if ($ug_type == 'u')
  						{
  							$sql = 'SELECT user_id as id, username as name
***************
*** 244,274 ****
  								FROM ' . GROUPS_TABLE . '
  								WHERE ';
  						}
! 						$sql .= $db->sql_in_set(($ug_type == 'u') ? 'user_id' : 'group_id', array_map('intval', array_keys($address_temp[$message_id][$ug_type])));
  
  						$result = $db->sql_query($sql);
  
  						while ($info_row = $db->sql_fetchrow($result))
  						{
! 							$address[$message_id][$ug_type][$address_temp[$message_id][$ug_type][$info_row['id']]][] = $info_row['name'];
! 							unset($address_temp[$message_id][$ug_type][$info_row['id']]);
  						}
  						$db->sql_freeresult($result);
  					}
  				}
  
- 				// There is the chance that all recipients of the message got deleted. To avoid creating 
- 				// exports without recipients, we add a bogus "undisclosed recipient".
- 				if (!(isset($address[$message_id]['g']) && sizeof($address[$message_id]['g'])) && 
- 				    !(isset($address[$message_id]['u']) && sizeof($address[$message_id]['u'])))
- 				{
- 					$address[$message_id]['u'] = array();
- 					$address[$message_id]['u']['to'] = array();
- 					$address[$message_id]['u']['to'][] = $user->lang['UNDISCLOSED_RECIPIENT'];
- 				}
- 
  				decode_message($message_row['message_text'], $message_row['bbcode_uid']);
! 				
  				$data[] = array(
  					'subject'	=> censor_text($row['message_subject']),
  					'sender'	=> $row['username'],
--- 238,258 ----
  								FROM ' . GROUPS_TABLE . '
  								WHERE ';
  						}
! 						$sql .= $db->sql_in_set(($ug_type == 'u') ? 'user_id' : 'group_id', array_map('intval', array_keys($address[$message_id][$ug_type])));
  
  						$result = $db->sql_query($sql);
  
  						while ($info_row = $db->sql_fetchrow($result))
  						{
! 							$address[$message_id][$ug_type][$address[$message_id][$ug_type][$info_row['id']]][] = $info_row['name'];
! 							unset($address[$message_id][$ug_type][$info_row['id']]);
  						}
  						$db->sql_freeresult($result);
  					}
  				}
  
  				decode_message($message_row['message_text'], $message_row['bbcode_uid']);
! 
  				$data[] = array(
  					'subject'	=> censor_text($row['message_subject']),
  					'sender'	=> $row['username'],

Modified: branches/phpBB-3_0_0/phpBB/language/en/ucp.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/ucp.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/ucp.php Fri Sep 11 15:38:23 2009
***************
*** 460,466 ****
  	'UCP_ZEBRA'						=> 'Friends &amp; Foes',
  	'UCP_ZEBRA_FOES'				=> 'Manage foes',
  	'UCP_ZEBRA_FRIENDS'				=> 'Manage friends',
- 	'UNDISCLOSED_RECIPIENT'			=> 'Undiclosed Recipient',
  	'UNKNOWN_FOLDER'				=> 'Unknown folder',
  	'UNWATCH_MARKED'				=> 'Unwatch marked',
  	'UPLOAD_AVATAR_FILE'			=> 'Upload from your machine',
--- 460,465 ----

[Phpbb-checkins] r10136 - in /branches/phpBB-3_0_0/phpBB: docs/CHANGELOG.html includes/ucp/ucp_pm_viewfolder.php language/en/ucp.php

From: Henry S. <kel...@ph...> - 2009-09-11 14:03:15

Author: Kellanved
Date: Fri Sep 11 14:53:56 2009
New Revision: 10136

Log:
#50985

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php
    branches/phpBB-3_0_0/phpBB/language/en/ucp.php

Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Fri Sep 11 14:53:56 2009
***************
*** 210,215 ****
--- 210,216 ----
  		<li>[Fix] Do not display links to user/post search if search is disabled. (Bug #50685 - Patch by HardStyle)</li>
  		<li>[Fix] Fix icon alignment for forums with large descriptions in subsilver2. (Bug #50445)</li>
  		<li>[Fix] Correctly display underlined links placed in last line in viewtopic. (Bug #14811 - Patch by primehalo)</li>
+ 		<li>[Fix] Handle export of orivate messages where all recipients were deleted. (Bug #50985)</li>
  		<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
  		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
  		<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>

Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php Fri Sep 11 14:53:56 2009
***************
*** 194,206 ****
  		else
  		{
  			// Build Recipient List if in outbox/sentbox
! 			$address = $data = array();
  
  			if ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX)
  			{
  				foreach ($folder_info['rowset'] as $message_id => $row)
  				{
! 					$address[$message_id] = rebuild_header(array('to' => $row['to_address'], 'bcc' => $row['bcc_address']));
  				}
  			}
  
--- 194,208 ----
  		else
  		{
  			// Build Recipient List if in outbox/sentbox
! 
! 			$address_temp = $address = $data = array();
  
  			if ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX)
  			{
  				foreach ($folder_info['rowset'] as $message_id => $row)
  				{
! 					$address_temp[$message_id] = rebuild_header(array('to' => $row['to_address'], 'bcc' => $row['bcc_address']));
! 					$address[$message_id] = array();
  				}
  			}
  
***************
*** 224,231 ****
  				$_types = array('u', 'g');
  				foreach ($_types as $ug_type)
  				{
! 					if (isset($address[$message_id][$ug_type]) && sizeof($address[$message_id][$ug_type]))
  					{
  						if ($ug_type == 'u')
  						{
  							$sql = 'SELECT user_id as id, username as name
--- 226,237 ----
  				$_types = array('u', 'g');
  				foreach ($_types as $ug_type)
  				{
! 					if (isset($address_temp[$message_id][$ug_type]) && sizeof($address_temp[$message_id][$ug_type]))
  					{
+ 						if (!isset($address[$message_id][$ug_type]))
+ 						{
+ 							$address[$message_id][$ug_type] = array();
+ 						}
  						if ($ug_type == 'u')
  						{
  							$sql = 'SELECT user_id as id, username as name
***************
*** 238,258 ****
  								FROM ' . GROUPS_TABLE . '
  								WHERE ';
  						}
! 						$sql .= $db->sql_in_set(($ug_type == 'u') ? 'user_id' : 'group_id', array_map('intval', array_keys($address[$message_id][$ug_type])));
  
  						$result = $db->sql_query($sql);
  
  						while ($info_row = $db->sql_fetchrow($result))
  						{
! 							$address[$message_id][$ug_type][$address[$message_id][$ug_type][$info_row['id']]][] = $info_row['name'];
! 							unset($address[$message_id][$ug_type][$info_row['id']]);
  						}
  						$db->sql_freeresult($result);
  					}
  				}
  
! 				decode_message($message_row['message_text'], $message_row['bbcode_uid']);
  
  				$data[] = array(
  					'subject'	=> censor_text($row['message_subject']),
  					'sender'	=> $row['username'],
--- 244,274 ----
  								FROM ' . GROUPS_TABLE . '
  								WHERE ';
  						}
! 						$sql .= $db->sql_in_set(($ug_type == 'u') ? 'user_id' : 'group_id', array_map('intval', array_keys($address_temp[$message_id][$ug_type])));
  
  						$result = $db->sql_query($sql);
  
  						while ($info_row = $db->sql_fetchrow($result))
  						{
! 							$address[$message_id][$ug_type][$address_temp[$message_id][$ug_type][$info_row['id']]][] = $info_row['name'];
! 							unset($address_temp[$message_id][$ug_type][$info_row['id']]);
  						}
  						$db->sql_freeresult($result);
  					}
  				}
  
! 				// There is the chance that all recipients of the message got deleted. To avoid creating 
! 				// exports without recipients, we add a bogus "undisclosed recipient".
! 				if (!(isset($address[$message_id]['g']) && sizeof($address[$message_id]['g'])) && 
! 				    !(isset($address[$message_id]['u']) && sizeof($address[$message_id]['u'])))
! 				{
! 					$address[$message_id]['u'] = array();
! 					$address[$message_id]['u']['to'] = array();
! 					$address[$message_id]['u']['to'][] = $user->lang['UNDISCLOSED_RECIPIENT'];
! 				}
  
+ 				decode_message($message_row['message_text'], $message_row['bbcode_uid']);
+ 				
  				$data[] = array(
  					'subject'	=> censor_text($row['message_subject']),
  					'sender'	=> $row['username'],

Modified: branches/phpBB-3_0_0/phpBB/language/en/ucp.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/ucp.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/ucp.php Fri Sep 11 14:53:56 2009
***************
*** 460,465 ****
--- 460,466 ----
  	'UCP_ZEBRA'						=> 'Friends &amp; Foes',
  	'UCP_ZEBRA_FOES'				=> 'Manage foes',
  	'UCP_ZEBRA_FRIENDS'				=> 'Manage friends',
+ 	'UNDISCLOSED_RECIPIENT'			=> 'Undiclosed Recipient',
  	'UNKNOWN_FOLDER'				=> 'Unknown folder',
  	'UNWATCH_MARKED'				=> 'Unwatch marked',
  	'UPLOAD_AVATAR_FILE'			=> 'Upload from your machine',

[Phpbb-checkins] r10137 - /branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html

From: Henry S. <kel...@ph...> - 2009-09-11 13:57:20

Author: Kellanved
Date: Fri Sep 11 14:56:26 2009
New Revision: 10137

Log:
#50985 - typo

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html

Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Fri Sep 11 14:56:26 2009
***************
*** 210,216 ****
  		<li>[Fix] Do not display links to user/post search if search is disabled. (Bug #50685 - Patch by HardStyle)</li>
  		<li>[Fix] Fix icon alignment for forums with large descriptions in subsilver2. (Bug #50445)</li>
  		<li>[Fix] Correctly display underlined links placed in last line in viewtopic. (Bug #14811 - Patch by primehalo)</li>
! 		<li>[Fix] Handle export of orivate messages where all recipients were deleted. (Bug #50985)</li>
  		<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
  		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
  		<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
--- 210,216 ----
  		<li>[Fix] Do not display links to user/post search if search is disabled. (Bug #50685 - Patch by HardStyle)</li>
  		<li>[Fix] Fix icon alignment for forums with large descriptions in subsilver2. (Bug #50445)</li>
  		<li>[Fix] Correctly display underlined links placed in last line in viewtopic. (Bug #14811 - Patch by primehalo)</li>
! 		<li>[Fix] Handle export of private messages where all recipients were deleted. (Bug #50985)</li>
  		<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
  		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
  		<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>

[Phpbb-checkins] r10135 - /branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php

From: Andreas F. <ba...@ph...> - 2009-09-10 19:49:40

Author: bantu
Date: Thu Sep 10 20:49:19 2009
New Revision: 10135

Log:
Fix bug #51105. - Ignore (disable) newly generated forum in forums list. Related to r9896.

Modified:
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php Thu Sep 10 20:49:19 2009
***************
*** 1936,1942 ****
  			'L_ACL_LINK'		=> $l_acl,
  			'L_BACK_LINK'		=> adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id),
  			'S_COPY_ACTION'		=> $action,
! 			'S_FORUM_OPTIONS'	=> make_forum_select($forum_data['parent_id'], false, false, false, false),
  		));
  	}
  
--- 1936,1942 ----
  			'L_ACL_LINK'		=> $l_acl,
  			'L_BACK_LINK'		=> adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id),
  			'S_COPY_ACTION'		=> $action,
! 			'S_FORUM_OPTIONS'	=> make_forum_select($forum_data['parent_id'], $forum_data['forum_id'], false, false, false),
  		));
  	}

[Phpbb-checkins] r10134 - /branches/phpBB-3_0_0/phpBB/language/en/acp/common.php

From: Yuriy R. <mar...@ph...> - 2009-09-10 15:32:34

Author: marshalrusty
Date: Thu Sep 10 16:32:16 2009
New Revision: 10134

Log:
Language changes

#51065

Modified:
    branches/phpBB-3_0_0/phpBB/language/en/acp/common.php

Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Thu Sep 10 16:32:16 2009
***************
*** 277,286 ****
  	'SELECT_ANONYMOUS'		=> 'Select anonymous user',
  	'SELECT_OPTION'			=> 'Select option',
  
! 	'SETTING_TOO_LOW'		=> 'The provided value for the setting â%1$sâ is too low. The minimal acceptable value is %2$d.',
  	'SETTING_TOO_BIG'		=> 'The provided value for the setting â%1$sâ is too high. The maximum acceptable value is %2$d.',
  	'SETTING_TOO_LONG'		=> 'The provided value for the setting â%1$sâ is too long. The maximum acceptable length is %2$d.',
! 	'SETTING_TOO_SHORT'		=> 'The provided value for the setting â%1$sâ is too short. The minimal acceptable length is %2$d.',
  
  	'SHOW_ALL_OPERATIONS'	=> 'Show all operations',
  
--- 277,286 ----
  	'SELECT_ANONYMOUS'		=> 'Select anonymous user',
  	'SELECT_OPTION'			=> 'Select option',
  
! 	'SETTING_TOO_LOW'		=> 'The provided value for the setting â%1$sâ is too low. The minimum acceptable value is %2$d.',
  	'SETTING_TOO_BIG'		=> 'The provided value for the setting â%1$sâ is too high. The maximum acceptable value is %2$d.',
  	'SETTING_TOO_LONG'		=> 'The provided value for the setting â%1$sâ is too long. The maximum acceptable length is %2$d.',
! 	'SETTING_TOO_SHORT'		=> 'The provided value for the setting â%1$sâ is too short. The minimum acceptable length is %2$d.',
  
  	'SHOW_ALL_OPERATIONS'	=> 'Show all operations',

[Phpbb-checkins] r10133 - /branches/phpBB-3_0_0/phpBB/language/en/acp/common.php

From: Yuriy R. <mar...@ph...> - 2009-09-10 15:27:54

Author: marshalrusty
Date: Thu Sep 10 16:27:10 2009
New Revision: 10133

Log:
Language changes

#51065

Modified:
    branches/phpBB-3_0_0/phpBB/language/en/acp/common.php

Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Thu Sep 10 16:27:10 2009
***************
*** 277,286 ****
  	'SELECT_ANONYMOUS'		=> 'Select anonymous user',
  	'SELECT_OPTION'			=> 'Select option',
  
! 	'SETTING_TOO_LOW'		=> 'The entered value for the setting â%1$sâ is too low. The minimal allowed value is %2$d.',
! 	'SETTING_TOO_BIG'		=> 'The entered value for the setting â%1$sâ is too big. The maximal allowed value is %2$d.',
! 	'SETTING_TOO_LONG'		=> 'The entered value for the setting â%1$sâ is too long. The maximal allowed length is %2$d.',
! 	'SETTING_TOO_SHORT'		=> 'The entered value for the setting â%1$sâ is not long enough. The minimal allowed length is %2$d.',
  
  	'SHOW_ALL_OPERATIONS'	=> 'Show all operations',
  
--- 277,286 ----
  	'SELECT_ANONYMOUS'		=> 'Select anonymous user',
  	'SELECT_OPTION'			=> 'Select option',
  
! 	'SETTING_TOO_LOW'		=> 'The provided value for the setting â%1$sâ is too low. The minimal acceptable value is %2$d.',
! 	'SETTING_TOO_BIG'		=> 'The provided value for the setting â%1$sâ is too high. The maximum acceptable value is %2$d.',
! 	'SETTING_TOO_LONG'		=> 'The provided value for the setting â%1$sâ is too long. The maximum acceptable length is %2$d.',
! 	'SETTING_TOO_SHORT'		=> 'The provided value for the setting â%1$sâ is too short. The minimal acceptable length is %2$d.',
  
  	'SHOW_ALL_OPERATIONS'	=> 'Show all operations',

[Phpbb-checkins] r10131 - in /branches/phpBB-3_0_0/phpBB: adm/style/acp_send_statistics.html includes/questionnaire/questionnaire.php

From: Meik S. <acy...@ph...> - 2009-09-10 14:08:47

Author: acydburn
Date: Thu Sep 10 14:30:47 2009
New Revision: 10131

Log:
also collect admins user agent vendor and version (send_statistics)

Modified:
    branches/phpBB-3_0_0/phpBB/adm/style/acp_send_statistics.html
    branches/phpBB-3_0_0/phpBB/includes/questionnaire/questionnaire.php

Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_send_statistics.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_send_statistics.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_send_statistics.html Thu Sep 10 14:30:47 2009
***************
*** 23,29 ****
  //]]>
  </script>
  
! <iframe onload="iframe_updated();" name="questionaire_result" style="display:none;"></iframe>
  
  <form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
  
--- 23,29 ----
  //]]>
  </script>
  
! <iframe onload="iframe_updated();" name="questionaire_result" style="display: none;"></iframe>
  
  <form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
  

Modified: branches/phpBB-3_0_0/phpBB/includes/questionnaire/questionnaire.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/questionnaire/questionnaire.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/questionnaire/questionnaire.php Thu Sep 10 14:30:47 2009
***************
*** 179,185 ****
  			// - 10.0.0.0/8
  			// - 172.16.0.0/12
  			// - 192.168.0.0/16
! 			'ip'	=> $ip_address_ary[0] . '.' . $ip_address_ary[1] . '.XXX.YYY',
  		);
  	}
  }
--- 179,185 ----
  			// - 10.0.0.0/8
  			// - 172.16.0.0/12
  			// - 192.168.0.0/16
! 			'ip'		=> $ip_address_ary[0] . '.' . $ip_address_ary[1] . '.XXX.YYY',
  		);
  	}
  }
***************
*** 233,239 ****
  	{
  		global $phpbb_root_path, $phpEx;
  		include("{$phpbb_root_path}config.$phpEx");
! 		
  		// Only send certain config vars
  		$config_vars = array(
  			'active_sessions' => true,
--- 233,239 ----
  	{
  		global $phpbb_root_path, $phpEx;
  		include("{$phpbb_root_path}config.$phpEx");
! 
  		// Only send certain config vars
  		$config_vars = array(
  			'active_sessions' => true,
***************
*** 447,452 ****
--- 447,468 ----
  		$result['dbms'] = $dbms;
  		$result['acm_type'] = $acm_type;
  		$result['load_extensions'] = $load_extensions;
+ 		$result['user_agent'] = 'Unknown';
+ 
+ 		// Try to get user agent vendor and version
+ 		$match = array();
+ 		$user_agent = (!empty($_SERVER['HTTP_USER_AGENT'])) ? (string) $_SERVER['HTTP_USER_AGENT'] : '';
+ 		$agents = array('firefox', 'msie', 'opera', 'chrome', 'safari', 'mozilla', 'seamonkey', 'konqueror', 'netscape', 'gecko', 'navigator', 'mosaic', 'lynx', 'amaya', 'omniweb', 'avant', 'camino', 'flock', 'aol');
+ 
+ 		// We check here 1 by 1 because some strings occur after others (for example Mozilla [...] Firefox/)
+ 		foreach ($agents as $agent)
+ 		{
+ 			if (preg_match('#(' . $agent . ')[/ ]?([0-9.]*)#i', $user_agent, $match))
+ 			{
+ 				$result['user_agent'] = $match[1] . ' ' . $match[2];
+ 				break;
+ 			}
+ 		}
  
  		return $result;
  	}

[Phpbb-checkins] r10132 - in /branches/phpBB-3_0_0/phpBB: docs/CHANGELOG.html styles/prosilver/theme/content.css

From: Meik S. <acy...@ph...> - 2009-09-10 13:56:57

Author: acydburn
Date: Thu Sep 10 14:56:11 2009
New Revision: 10132

Log:
Correctly display underlined links placed in last line in viewtopic. (Bug #14811 - Patch by primehalo)

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/content.css

Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Thu Sep 10 14:56:11 2009
***************
*** 209,214 ****
--- 209,215 ----
  		<li>[Fix] Do not show resend activation email link when using admin activation. (Bug #44375 - Patch by bbrunnrman)</li>
  		<li>[Fix] Do not display links to user/post search if search is disabled. (Bug #50685 - Patch by HardStyle)</li>
  		<li>[Fix] Fix icon alignment for forums with large descriptions in subsilver2. (Bug #50445)</li>
+ 		<li>[Fix] Correctly display underlined links placed in last line in viewtopic. (Bug #14811 - Patch by primehalo)</li>
  		<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
  		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
  		<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/content.css
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/content.css (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/content.css Thu Sep 10 14:56:11 2009
***************
*** 307,312 ****
--- 307,313 ----
  	font-family: "Lucida Grande", "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
  	font-size: 1em;
  	color: #333333;
+ 	padding-bottom: 1px;
  }
  
  .content h2, .panel h2 {

[Phpbb-checkins] r10130 - /branches/phpBB-3_0_0/phpBB/install/database_update.php

From: Andreas F. <ba...@ph...> - 2009-09-10 08:59:11

Author: bantu
Date: Thu Sep 10 09:58:24 2009
New Revision: 10130

Log:
Fix database updater for PostgreSQL: Data needs to be GROUPed BY left_id, before we can ORDER BY left_id. Introduced in r10072.

Modified:
    branches/phpBB-3_0_0/phpBB/install/database_update.php

Modified: branches/phpBB-3_0_0/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/database_update.php Thu Sep 10 09:58:24 2009
***************
*** 677,682 ****
--- 677,683 ----
  				WHERE module_class = '" . $db->sql_escape($module_data['class']) . "'
  					AND parent_id = {$parent_id}
  					AND left_id BETWEEN {$first_left_id} AND {$module_row['left_id']}
+ 				GROUP BY left_id
  				ORDER BY left_id";
  			$result = $db->sql_query($sql);
  			$steps = (int) $db->sql_fetchfield('num_modules');

[Phpbb-checkins] r10129 - /branches/phpBB-3_0_0/phpBB/includes/functions.php

From: Andreas F. <ba...@ph...> - 2009-09-10 08:44:53

Author: bantu
Date: Thu Sep 10 09:44:34 2009
New Revision: 10129

Log:
Fix bug #51075 introduced in r10121.

Modified:
    branches/phpBB-3_0_0/phpBB/includes/functions.php

Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Thu Sep 10 09:44:34 2009
***************
*** 1703,1710 ****
  
  			'WHERE'			=> "
  				(
! 				(tt.mark_time AND t.topic_last_post_time > tt.mark_time) OR
! 				(tt.mark_time IS NULL AND ft.mark_time AND t.topic_last_post_time > ft.mark_time) OR
  					(
  						((tt.mark_time IS NULL AND ft.mark_time IS NULL) OR (tt.mark_time < $last_mark AND ft.mark_time < $last_mark))
  						AND t.topic_last_post_time > $last_mark
--- 1703,1710 ----
  
  			'WHERE'			=> "
  				(
! 				(tt.mark_time IS NOT NULL AND t.topic_last_post_time > tt.mark_time) OR
! 				(tt.mark_time IS NULL AND ft.mark_time IS NOT NULL AND t.topic_last_post_time > ft.mark_time) OR
  					(
  						((tt.mark_time IS NULL AND ft.mark_time IS NULL) OR (tt.mark_time < $last_mark AND ft.mark_time < $last_mark))
  						AND t.topic_last_post_time > $last_mark

[Phpbb-checkins] r10128 - in /branches/phpBB-3_0_0/phpBB: docs/CHANGELOG.html styles/subsilver2/template/forumlist_body.html

From: Andreas F. <ba...@ph...> - 2009-09-09 22:32:32

Author: bantu
Date: Wed Sep  9 23:32:13 2009
New Revision: 10128

Log:
Fix bug #50445 - Fix icon alignment for forums with large descriptions in subsilver2.

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/forumlist_body.html

Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Wed Sep  9 23:32:13 2009
***************
*** 208,213 ****
--- 208,214 ----
  		<li>[Fix] Send activation email when activating user from user settings. (Bug #43145)</li>
  		<li>[Fix] Do not show resend activation email link when using admin activation. (Bug #44375 - Patch by bbrunnrman)</li>
  		<li>[Fix] Do not display links to user/post search if search is disabled. (Bug #50685 - Patch by HardStyle)</li>
+ 		<li>[Fix] Fix icon alignment for forums with large descriptions in subsilver2. (Bug #50445)</li>
  		<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
  		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
  		<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>

Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/forumlist_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/forumlist_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/forumlist_body.html Wed Sep  9 23:32:13 2009
***************
*** 19,29 ****
  			<td class="row1" width="50" align="center">{forumrow.FORUM_FOLDER_IMG}</td>
  			<td class="row1">
  				<!-- IF forumrow.FORUM_IMAGE -->
! 					<div style="float: {S_CONTENT_FLOW_BEGIN}; margin-{S_CONTENT_FLOW_END}: 5px;">{forumrow.FORUM_IMAGE}</div><div style="float: {S_CONTENT_FLOW_BEGIN};">
  				<!-- ENDIF -->
  				<a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a>
  				<p class="forumdesc">{forumrow.FORUM_DESC}</p>
- 				<!-- IF forumrow.FORUM_IMAGE --></div><!-- ENDIF -->
  			</td>
  			<!-- IF forumrow.CLICKS -->
  				<td class="row2" colspan="3" align="center"><span class="genmed">{L_REDIRECTS}: {forumrow.CLICKS}</span></td>
--- 19,28 ----
  			<td class="row1" width="50" align="center">{forumrow.FORUM_FOLDER_IMG}</td>
  			<td class="row1">
  				<!-- IF forumrow.FORUM_IMAGE -->
! 					<div style="float: {S_CONTENT_FLOW_BEGIN}; margin-{S_CONTENT_FLOW_END}: 5px;">{forumrow.FORUM_IMAGE}</div>
  				<!-- ENDIF -->
  				<a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a>
  				<p class="forumdesc">{forumrow.FORUM_DESC}</p>
  			</td>
  			<!-- IF forumrow.CLICKS -->
  				<td class="row2" colspan="3" align="center"><span class="genmed">{L_REDIRECTS}: {forumrow.CLICKS}</span></td>
***************
*** 42,48 ****
  			<td class="row1" width="50" align="center">{forumrow.FORUM_FOLDER_IMG}</td>
  			<td class="row1" width="100%">
  				<!-- IF forumrow.FORUM_IMAGE -->
! 					<div style="float: {S_CONTENT_FLOW_BEGIN}; margin-{S_CONTENT_FLOW_END}: 5px;">{forumrow.FORUM_IMAGE}</div><div style="float: {S_CONTENT_FLOW_BEGIN};">
  				<!-- ENDIF -->
  				<a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a>
  				<p class="forumdesc">{forumrow.FORUM_DESC}</p>
--- 41,47 ----
  			<td class="row1" width="50" align="center">{forumrow.FORUM_FOLDER_IMG}</td>
  			<td class="row1" width="100%">
  				<!-- IF forumrow.FORUM_IMAGE -->
! 					<div style="float: {S_CONTENT_FLOW_BEGIN}; margin-{S_CONTENT_FLOW_END}: 5px;">{forumrow.FORUM_IMAGE}</div>
  				<!-- ENDIF -->
  				<a class="forumlink" href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a>
  				<p class="forumdesc">{forumrow.FORUM_DESC}</p>
***************
*** 52,58 ****
  				<!-- IF forumrow.SUBFORUMS and forumrow.S_LIST_SUBFORUMS -->
  					<p class="forumdesc"><strong>{forumrow.L_SUBFORUM_STR}</strong> {forumrow.SUBFORUMS}</p>
  				<!-- ENDIF -->
- 				<!-- IF forumrow.FORUM_IMAGE --></div><!-- ENDIF -->
  			</td>
  			<td class="row2" align="center"><p class="topicdetails">{forumrow.TOPICS}</p></td>
  			<td class="row2" align="center"><p class="topicdetails">{forumrow.POSTS}</p></td>
--- 51,56 ----

[Phpbb-checkins] r10127 - /branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_post.html

From: Andreas F. <ba...@ph...> - 2009-09-09 22:00:55

Author: bantu
Date: Wed Sep  9 23:00:08 2009
New Revision: 10127

Log:
Fix bug #51035 introduced in r9814.

Modified:
    branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_post.html

Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_post.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_post.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/mcp_post.html Wed Sep  9 23:00:08 2009
***************
*** 46,52 ****
  	<th colspan="2" align="center"><!-- IF S_PM -->{L_PM}<!-- ELSE -->{L_POST_DETAILS}<!-- ENDIF --></th>
  </tr>
  <tr>
! 	<td class="row3" colspan="2" align="center"><span class="gensmall"><!-- IF S_MCP_QUEUE -->{RETURN_QUEUE} | {RETURN_TOPIC_SIMPLE} | {RETURN_POST}<!-- ELSEIF S_MCP_REPORT -->{RETURN_REPORTS} | <!-- IF S_PM --><a href="{U_VIEW_POST}">{L_VIEW_PM}</a><!-- ELSE --><a href="{U_VIEW_POST}">{L_VIEW_POST}</a> | <a href="{U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a> | <a href="{U_VIEW_FORUM}">{L_VIEW_FORUM}</a><!-- ENDIF --><!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></span></td>
  </tr>
  <tr>
  	<td class="row1"><b class="gen"><!-- IF S_PM -->{L_PM_SUBJECT}<!-- ELSE -->{L_POST_SUBJECT}<!-- ENDIF -->: </b></td>
--- 46,52 ----
  	<th colspan="2" align="center"><!-- IF S_PM -->{L_PM}<!-- ELSE -->{L_POST_DETAILS}<!-- ENDIF --></th>
  </tr>
  <tr>
! 	<td class="row3" colspan="2" align="center"><span class="gensmall"><!-- IF S_MCP_QUEUE -->{RETURN_QUEUE} | {RETURN_TOPIC_SIMPLE} | {RETURN_POST}<!-- ELSEIF S_MCP_REPORT -->{RETURN_REPORTS}<!-- IF not S_PM --> | <a href="{U_VIEW_POST}">{L_VIEW_POST}</a> | <a href="{U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a> | <a href="{U_VIEW_FORUM}">{L_VIEW_FORUM}</a><!-- ENDIF --><!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></span></td>
  </tr>
  <tr>
  	<td class="row1"><b class="gen"><!-- IF S_PM -->{L_PM_SUBJECT}<!-- ELSE -->{L_POST_SUBJECT}<!-- ENDIF -->: </b></td>

[Phpbb-checkins] r10126 - /branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewmessage.php

From: Andreas F. <ba...@ph...> - 2009-09-09 21:42:41

Author: bantu
Date: Wed Sep  9 22:41:51 2009
New Revision: 10126

Log:
Related to r9830: Change REPORT_POST to REPORT_PM.

Modified:
    branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewmessage.php

Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewmessage.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewmessage.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewmessage.php Wed Sep  9 22:41:51 2009
***************
*** 193,199 ****
  		'EMAIL_IMG'			=> $user->img('icon_contact_email', $user->lang['SEND_EMAIL']),
  		'QUOTE_IMG'			=> $user->img('icon_post_quote', $user->lang['POST_QUOTE_PM']),
  		'REPLY_IMG'			=> $user->img('button_pm_reply', $user->lang['POST_REPLY_PM']),
! 		'REPORT_IMG'		=> $user->img('icon_post_report', 'REPORT_POST'),
  		'EDIT_IMG'			=> $user->img('icon_post_edit', $user->lang['POST_EDIT_PM']),
  		'MINI_POST_IMG'		=> $user->img('icon_post_target', $user->lang['PM']),
  
--- 193,199 ----
  		'EMAIL_IMG'			=> $user->img('icon_contact_email', $user->lang['SEND_EMAIL']),
  		'QUOTE_IMG'			=> $user->img('icon_post_quote', $user->lang['POST_QUOTE_PM']),
  		'REPLY_IMG'			=> $user->img('button_pm_reply', $user->lang['POST_REPLY_PM']),
! 		'REPORT_IMG'		=> $user->img('icon_post_report', 'REPORT_PM'),
  		'EDIT_IMG'			=> $user->img('icon_post_edit', $user->lang['POST_EDIT_PM']),
  		'MINI_POST_IMG'		=> $user->img('icon_post_target', $user->lang['PM']),

[Phpbb-checkins] r10125 - /branches/phpBB-3_0_0/phpBB/styles/prosilver/template/memberlist_body.html

From: Joas S. <nic...@ph...> - 2009-09-09 10:47:34

Author: nickvergessen
Date: Wed Sep  9 11:46:51 2009
New Revision: 10125

Log:
regarding r10108 - Hide some more search links for #50685
Authorised by: AcydBurn

Modified:
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/memberlist_body.html

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/memberlist_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/memberlist_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/memberlist_body.html Wed Sep  9 11:46:51 2009
***************
*** 131,137 ****
  
  	<tr class="<!-- IF memberrow.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
  		<td><!-- IF memberrow.RANK_IMG --><span class="rank-img">{memberrow.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{memberrow.RANK_TITLE}</span><!-- ENDIF --><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input type="checkbox" name="user" value="{memberrow.USERNAME}" /> <!-- ENDIF -->{memberrow.USERNAME_FULL}<!-- IF S_SELECT_SINGLE --><br />[&nbsp;<a href="#" onclick="insert_single('{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a>&nbsp;]<!-- ENDIF --></td>
! 		<td class="posts"><!-- IF memberrow.POSTS --><a href="{memberrow.U_SEARCH_USER}" title="{L_SEARCH_USER_POSTS}">{memberrow.POSTS}</a><!-- ELSE -->{memberrow.POSTS}<!-- ENDIF --></td>
  		<td class="info"><!-- IF memberrow.U_WWW or memberrow.LOCATION --><!-- IF memberrow.U_WWW --><div><a href="{memberrow.U_WWW}" title="{L_VISIT_WEBSITE}: {memberrow.U_WWW}">{memberrow.U_SHORT_WWW}</a></div><!-- ENDIF --><!-- IF memberrow.LOCATION --><div>{memberrow.LOCATION}</div><!-- ENDIF --><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
  		<td>{memberrow.JOINED}</td>
  		<!-- IF S_VIEWONLINE --><td>{memberrow.VISITED}&nbsp;</td><!-- ENDIF -->
--- 131,137 ----
  
  	<tr class="<!-- IF memberrow.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
  		<td><!-- IF memberrow.RANK_IMG --><span class="rank-img">{memberrow.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{memberrow.RANK_TITLE}</span><!-- ENDIF --><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input type="checkbox" name="user" value="{memberrow.USERNAME}" /> <!-- ENDIF -->{memberrow.USERNAME_FULL}<!-- IF S_SELECT_SINGLE --><br />[&nbsp;<a href="#" onclick="insert_single('{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a>&nbsp;]<!-- ENDIF --></td>
! 		<td class="posts"><!-- IF memberrow.POSTS and S_DISPLAY_SEARCH --><a href="{memberrow.U_SEARCH_USER}" title="{L_SEARCH_USER_POSTS}">{memberrow.POSTS}</a><!-- ELSE -->{memberrow.POSTS}<!-- ENDIF --></td>
  		<td class="info"><!-- IF memberrow.U_WWW or memberrow.LOCATION --><!-- IF memberrow.U_WWW --><div><a href="{memberrow.U_WWW}" title="{L_VISIT_WEBSITE}: {memberrow.U_WWW}">{memberrow.U_SHORT_WWW}</a></div><!-- ENDIF --><!-- IF memberrow.LOCATION --><div>{memberrow.LOCATION}</div><!-- ENDIF --><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
  		<td>{memberrow.JOINED}</td>
  		<!-- IF S_VIEWONLINE --><td>{memberrow.VISITED}&nbsp;</td><!-- ENDIF -->

[Phpbb-checkins] r10124 - /branches/phpBB-3_0_0/phpBB/includes/acp/acp_inactive.php

From: Meik S. <acy...@ph...> - 2009-09-09 09:08:39

Author: acydburn
Date: Wed Sep  9 10:08:24 2009
New Revision: 10124

Log:
Send emails for manual user activation if admin activation is enabled not through queue in ACP (Bug #50925)

Modified:
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_inactive.php

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_inactive.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_inactive.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_inactive.php Wed Sep  9 10:08:24 2009
***************
*** 113,119 ****
  						{
  							include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
  
! 							$messenger = new messenger();
  
  							foreach ($inactive_users as $row)
  							{
--- 113,119 ----
  						{
  							include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
  
! 							$messenger = new messenger(false);
  
  							foreach ($inactive_users as $row)
  							{

[Phpbb-checkins] r10123 - /branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php

From: Meik S. <acy...@ph...> - 2009-09-09 08:07:47

Author: acydburn
Date: Wed Sep  9 09:07:01 2009
New Revision: 10123

Log:
define $data array at the correct location. ;)

Modified:
    branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php

Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php Wed Sep  9 09:07:01 2009
***************
*** 118,125 ****
  				$address_list = get_recipient_strings($folder_info['rowset']);
  			}
  
- 			$data = array();
- 
  			foreach ($folder_info['pm_list'] as $message_id)
  			{
  				$row = &$folder_info['rowset'][$message_id];
--- 118,123 ----
***************
*** 196,202 ****
  		else
  		{
  			// Build Recipient List if in outbox/sentbox
! 			$address = array();
  			if ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX)
  			{
  				foreach ($folder_info['rowset'] as $message_id => $row)
--- 194,201 ----
  		else
  		{
  			// Build Recipient List if in outbox/sentbox
! 			$address = $data = array();
! 
  			if ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX)
  			{
  				foreach ($folder_info['rowset'] as $message_id => $row)

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

Flat | Threaded

<< < 1 .. 4 5 6 7 8 .. 629 > >> (Page 6 of 629)