phpbb-checkins Mailing List for phpBB (Page 17)

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 .. 15 16 17 18 19 .. 629 > >> (Page 17 of 629)

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

From: Chris S. <too...@ph...> - 2009-07-27 12:57:46

Author: toonarmy
Date: Mon Jul 27 13:57:29 2009
New Revision: 9872

Log:
Fix an SQL error

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 Mon Jul 27 13:57:29 2009
***************
*** 2376,2382 ****
  		WHERE l.log_type = $log_type
  			AND u.user_id = l.user_id
  			" . (($limit_days) ? "AND l.log_time >= $limit_days" : '') .
! 			(!empty($log_operation) ? "AND l.log_operation = '" . $db->sql_escape($log_operation) . "'" : '') . "
  			$sql_forum
  		ORDER BY $sort_by";
  	$result = $db->sql_query_limit($sql, $limit, $offset);
--- 2376,2382 ----
  		WHERE l.log_type = $log_type
  			AND u.user_id = l.user_id
  			" . (($limit_days) ? "AND l.log_time >= $limit_days" : '') .
! 			(!empty($log_operation) ? " AND l.log_operation = '" . $db->sql_escape($log_operation) . "'" : '') . "
  			$sql_forum
  		ORDER BY $sort_by";
  	$result = $db->sql_query_limit($sql, $limit, $offset);

[Phpbb-checkins] r9871 - /branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php

From: Chris S. <too...@ph...> - 2009-07-27 12:44:19

Author: toonarmy
Date: Mon Jul 27 13:43:57 2009
New Revision: 9871

Log:
Fix a bug in r9781 #48595

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

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php Mon Jul 27 13:43:57 2009
***************
*** 33,38 ****
--- 33,39 ----
  		// Set up general vars
  		$action		= request_var('action', '');
  		$forum_id	= request_var('f', 0);
+ 		$topic_id	= request_var('t', 0);
  		$start		= request_var('start', 0);
  		$deletemark = (!empty($_POST['delmarked'])) ? true : false;
  		$deleteall	= (!empty($_POST['delall'])) ? true : false;

[Phpbb-checkins] r9870 - /branches/phpBB-3_0_0/phpBB/feed.php

From: Andreas F. <ba...@ph...> - 2009-07-27 12:19:11

Author: bantu
Date: Mon Jul 27 13:18:09 2009
New Revision: 9870

Log:
Directly send UTF8 data instead of entities.

Modified:
    branches/phpBB-3_0_0/phpBB/feed.php

Modified: branches/phpBB-3_0_0/phpBB/feed.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/feed.php (original)
--- branches/phpBB-3_0_0/phpBB/feed.php Mon Jul 27 13:18:09 2009
***************
*** 282,291 ****
  
  	// Replace some entities with their unicode counterpart
  	$entities = array(
! 		'&nbsp;'	=> '&#160;',
! 		'&bull;'	=> '&#8226;',
! 		'&middot;'	=> '&#183;',
! 		'&copy;'	=> '&#169;',
  	);
  
  	$content = str_replace(array_keys($entities), array_values($entities), $content);
--- 282,291 ----
  
  	// Replace some entities with their unicode counterpart
  	$entities = array(
! 		'&nbsp;'	=> "\xC2\xA0",
! 		'&bull;'	=> "\xE2\x80\xA2",
! 		'&middot;'	=> "\xC2\xB7",
! 		'&copy;'	=> "\xC2\xA9",
  	);
  
  	$content = str_replace(array_keys($entities), array_values($entities), $content);
***************
*** 425,431 ****
  	/**
  	* Separator for title elements to separate items (for example forum / topic)
  	*/
! 	var $separator = '&#x2022;';
  
  	/**
  	* Constructor. Set standard keys.
--- 425,431 ----
  	/**
  	* Separator for title elements to separate items (for example forum / topic)
  	*/
! 	var $separator = "\xE2\x80\xA2"; // &bull;
  
  	/**
  	* Constructor. Set standard keys.

[Phpbb-checkins] r9869 - in /branches/phpBB-3_0_0/phpBB: includes/ includes/captcha/plugins/ includes/ucp/ styles/prosilver/template/ styles/subsilver2/template/

From: Henry S. <kel...@ph...> - 2009-07-27 11:39:48

Author: Kellanved
Date: Mon Jul 27 12:39:28 2009
New Revision: 9869

Log:
Minor captcha API change - disable display of plugin by returning false in get_template.

Modified:
    branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php
    branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
    branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
    branches/phpBB-3_0_0/phpBB/includes/functions.php
    branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_register.php
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html
    branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/login_body.html
    branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/posting_body.html

Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/captcha_abstract.php Mon Jul 27 12:39:28 2009
***************
*** 87,107 ****
  	{
  		global $config, $user, $template, $phpEx, $phpbb_root_path;
  		
! 		$link = append_sid($phpbb_root_path . 'ucp.' . $phpEx . '?mode=confirm&amp;confirm_id=' . $this->confirm_id . '&amp;type=' . $this->type);
! 		$explain = ($this->type != CONFIRM_POST) ? sprintf($user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>') : $user->lang['POST_CONFIRM_EXPLAIN'];
! 		
! 		$template->assign_vars(array(
! 			'CONFIRM_IMAGE_LINK'		=> $link,
! 			'CONFIRM_IMAGE'				=> '<img src="'. $link . '" />',
! 			'CONFIRM_IMG'				=> '<img src="'. $link . '" />',
! 			'CONFIRM_ID'				=> $this->confirm_id,
! 			'S_CONFIRM_CODE'			=> true,
! 			'S_TYPE'					=> $this->type,
! 			'S_CONFIRM_REFRESH'			=> ($config['enable_confirm'] && $config['confirm_refresh'] && $this->type == CONFIRM_REG) ? true : false,
! 			'L_CONFIRM_EXPLAIN'			=> $explain,
! 		));
  
! 		return 'captcha_default.html';
  	}
  
  	function get_demo_template($id)
--- 87,114 ----
  	{
  		global $config, $user, $template, $phpEx, $phpbb_root_path;
  		
! 		if ($this->is_solved())
! 		{
! 			return false;
! 		}
! 		else
! 		{
! 			$link = append_sid($phpbb_root_path . 'ucp.' . $phpEx . '?mode=confirm&amp;confirm_id=' . $this->confirm_id . '&amp;type=' . $this->type);
! 			$explain = ($this->type != CONFIRM_POST) ? sprintf($user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>') : $user->lang['POST_CONFIRM_EXPLAIN'];
! 			
! 			$template->assign_vars(array(
! 				'CONFIRM_IMAGE_LINK'		=> $link,
! 				'CONFIRM_IMAGE'				=> '<img src="'. $link . '" />',
! 				'CONFIRM_IMG'				=> '<img src="'. $link . '" />',
! 				'CONFIRM_ID'				=> $this->confirm_id,
! 				'S_CONFIRM_CODE'			=> true,
! 				'S_TYPE'					=> $this->type,
! 				'S_CONFIRM_REFRESH'			=> ($config['enable_confirm'] && $config['confirm_refresh'] && $this->type == CONFIRM_REG) ? true : false,
! 				'L_CONFIRM_EXPLAIN'			=> $explain,
! 			));
  
! 			return 'captcha_default.html';
! 		}
  	}
  
  	function get_demo_template($id)

Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php Mon Jul 27 12:39:28 2009
***************
*** 171,184 ****
  	{
  		global $template;
  		
! 		$template->assign_vars(array(
! 			'QA_CONFIRM_QUESTION'		=> $this->question_text,
! 			'QA_CONFIRM_ID'				=> $this->confirm_id,
! 			'S_CONFIRM_CODE'			=> true,
! 			'S_TYPE'					=> $this->type,
! 		));
  
! 		return 'captcha_qa.html';
  	}
  
  	/**
--- 171,191 ----
  	{
  		global $template;
  		
! 		if ($this->is_solved())
! 		{
! 			return false;
! 		}
! 		else
! 		{
! 			$template->assign_vars(array(
! 				'QA_CONFIRM_QUESTION'		=> $this->question_text,
! 				'QA_CONFIRM_ID'				=> $this->confirm_id,
! 				'S_CONFIRM_CODE'			=> true,
! 				'S_TYPE'					=> $this->type,
! 			));
  
! 			return 'captcha_qa.html';
! 		}
  	}
  
  	/**

Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php Mon Jul 27 12:39:28 2009
***************
*** 128,143 ****
  	{
  		global $config, $user, $template;
  
! 		$template->assign_vars(array(
! 			'RECAPTCHA_SERVER'			=> $this->recaptcha_server,
! 			'RECAPTCHA_PUBKEY'			=> isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
! 			'RECAPTCHA_ERRORGET'		=> '',
! 			'S_RECAPTCHA_AVAILABLE'		=> $this->is_available(),
! 			'S_CONFIRM_CODE'			=> true,
! 			'S_TYPE'					=> $this->type,
! 		));
  
! 		return 'captcha_recaptcha.html';
  	}
  
  	function get_demo_template($id)
--- 128,150 ----
  	{
  		global $config, $user, $template;
  
! 		if ($this->is_solved())
! 		{
! 			return false;
! 		}
! 		else
! 		{
! 			$template->assign_vars(array(
! 				'RECAPTCHA_SERVER'			=> $this->recaptcha_server,
! 				'RECAPTCHA_PUBKEY'			=> isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
! 				'RECAPTCHA_ERRORGET'		=> '',
! 				'S_RECAPTCHA_AVAILABLE'		=> $this->is_available(),
! 				'S_CONFIRM_CODE'			=> true,
! 				'S_TYPE'					=> $this->type,
! 			));
  
! 			return 'captcha_recaptcha.html';
! 		}
  	}
  
  	function get_demo_template($id)

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 Mon Jul 27 12:39:28 2009
***************
*** 2752,2758 ****
  				$captcha->reset();
  
  				$template->assign_vars(array(
- 					'S_CONFIRM_CODE'			=> true,
  					'CAPTCHA_TEMPLATE'			=> $captcha->get_template(),
  				));
  
--- 2752,2757 ----

Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_register.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_register.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_register.php Mon Jul 27 12:39:28 2009
***************
*** 446,455 ****
  		$confirm_image = '';
  
  		// Visual Confirmation - Show images
! 		if ($config['enable_confirm'] && !$captcha->is_solved())
  		{
  			$template->assign_vars(array(
- 				'L_CONFIRM_EXPLAIN'		=> sprintf($user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>'),
  				'CAPTCHA_TEMPLATE'		=> $captcha->get_template(),
  			));
  		}
--- 446,454 ----
  		$confirm_image = '';
  
  		// Visual Confirmation - Show images
! 		if ($config['enable_confirm'])
  		{
  			$template->assign_vars(array(
  				'CAPTCHA_TEMPLATE'		=> $captcha->get_template(),
  			));
  		}

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/login_body.html Mon Jul 27 12:39:28 2009
***************
*** 21,27 ****
  				<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
  			<!-- ENDIF -->
  		</dl>
! 		<!-- IF CAPTCHA_TEMPLATE -->
  		<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
  		<!-- ENDIF -->
  		<!-- IF S_DISPLAY_FULL_LOGIN -->
--- 21,27 ----
  				<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
  			<!-- ENDIF -->
  		</dl>
! 		<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
  		<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
  		<!-- ENDIF -->
  		<!-- IF S_DISPLAY_FULL_LOGIN -->

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/posting_editor.html Mon Jul 27 12:39:28 2009
***************
*** 99,105 ****
  		<dt><label for="subject">{L_SUBJECT}:</label></dt>
  		<dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd>
  	</dl>
! 		<!-- IF S_CONFIRM_CODE -->
  		<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
  		<!-- ENDIF -->
  	<!-- ENDIF -->
--- 99,105 ----
  		<dt><label for="subject">{L_SUBJECT}:</label></dt>
  		<dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd>
  	</dl>
! 		<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
  		<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
  		<!-- ENDIF -->
  	<!-- ENDIF -->

Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/login_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/login_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/login_body.html Mon Jul 27 12:39:28 2009
***************
*** 65,71 ****
  	</td>
  </tr>
  
! <!-- IF S_CONFIRM_CODE -->
  </table>
  <table class="tablebg" width="100%" cellspacing="1">
  		
--- 65,71 ----
  	</td>
  </tr>
  
! <!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
  </table>
  <table class="tablebg" width="100%" cellspacing="1">
  		

Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/posting_body.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/posting_body.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/posting_body.html Mon Jul 27 12:39:28 2009
***************
*** 332,338 ****
  	</tr>
  <!-- ENDIF -->
  
! 		<!-- IF S_CONFIRM_CODE -->
  		<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
  		<!-- ENDIF -->
  
--- 332,338 ----
  	</tr>
  <!-- ENDIF -->
  
! 		<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
  		<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
  		<!-- ENDIF -->

[Phpbb-checkins] r9868 - /branches/phpBB-3_0_0/phpBB/feed.php

From: Meik S. <acy...@ph...> - 2009-07-27 10:47:15

Author: acydburn
Date: Mon Jul 27 11:46:56 2009
New Revision: 9868

Log:
i hope this resolves the duplicate issues in feed readers

Modified:
    branches/phpBB-3_0_0/phpBB/feed.php

Modified: branches/phpBB-3_0_0/phpBB/feed.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/feed.php (original)
--- branches/phpBB-3_0_0/phpBB/feed.php Mon Jul 27 11:46:56 2009
***************
*** 218,227 ****
  	$link = (strpos($link, 'sid=') !== false) ? trim(preg_replace('/(&amp;|&|\?)sid=[a-z0-9]+(&amp;|&)?/', '\1', $link), '?& ') : $link;
  
  	// Now the only thing remaining could be an empty &amp;
! 	if (substr($link, -5) === '&amp;')
! 	{
! 		$link = substr($link, 0, -5);
! 	}
  
  	return $link;
  }
--- 218,226 ----
  	$link = (strpos($link, 'sid=') !== false) ? trim(preg_replace('/(&amp;|&|\?)sid=[a-z0-9]+(&amp;|&)?/', '\1', $link), '?& ') : $link;
  
  	// Now the only thing remaining could be an empty &amp;
! 	$link = (substr($link, -5) === '&amp;') ? substr($link, 0, -5) : $link;
! 	// And &amp;#xxx
! 	$link = str_replace('&amp;#', '#', $link);
  
  	return $link;
  }

[Phpbb-checkins] r9867 - /branches/phpBB-3_0_0/phpBB/feed.php

From: Andreas F. <ba...@ph...> - 2009-07-27 10:24:59

Author: bantu
Date: Mon Jul 27 11:24:42 2009
New Revision: 9867

Log:
Cast some array values and properties to integer.

Modified:
    branches/phpBB-3_0_0/phpBB/feed.php

Modified: branches/phpBB-3_0_0/phpBB/feed.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/feed.php (original)
--- branches/phpBB-3_0_0/phpBB/feed.php Mon Jul 27 11:24:42 2009
***************
*** 604,610 ****
  
  			while ($row = $db->sql_fetchrow($result))
  			{
! 				$post_ids[] = $row['topic_last_post_id'];
  			}
  			$db->sql_freeresult($result);
  		}
--- 604,610 ----
  
  			while ($row = $db->sql_fetchrow($result))
  			{
! 				$post_ids[] = (int) $row['topic_last_post_id'];
  			}
  			$db->sql_freeresult($result);
  		}
***************
*** 630,636 ****
  			$forum_ids = array();
  			while ($row = $db->sql_fetchrow($result))
  			{
! 				$forum_ids[] = $row['forum_id'];
  			}
  			$db->sql_freeresult($result);
  
--- 630,636 ----
  			$forum_ids = array();
  			while ($row = $db->sql_fetchrow($result))
  			{
! 				$forum_ids[] = (int) $row['forum_id'];
  			}
  			$db->sql_freeresult($result);
  
***************
*** 646,652 ****
  
  			while ($row = $db->sql_fetchrow($result))
  			{
! 				$post_ids[] = $row['topic_last_post_id'];
  			}
  			$db->sql_freeresult($result);
  		}
--- 646,652 ----
  
  			while ($row = $db->sql_fetchrow($result))
  			{
! 				$post_ids[] = (int) $row['topic_last_post_id'];
  			}
  			$db->sql_freeresult($result);
  		}
***************
*** 676,682 ****
  
  			while ($row = $db->sql_fetchrow($result))
  			{
! 				$post_ids[] = $row['post_id'];
  			}
  			$db->sql_freeresult($result);
  		}
--- 676,682 ----
  
  			while ($row = $db->sql_fetchrow($result))
  			{
! 				$post_ids[] = (int) $row['post_id'];
  			}
  			$db->sql_freeresult($result);
  		}
***************
*** 870,876 ****
  		$this->set('enable_smilies',	'enable_smilies');
  		$this->set('enable_magic_url',	'enable_magic_url');
  
! 		$this->num_items = $config['feed_overall_forums_limit'];
  	}
  
  	function open()
--- 870,876 ----
  		$this->set('enable_smilies',	'enable_smilies');
  		$this->set('enable_magic_url',	'enable_magic_url');
  
! 		$this->num_items = (int) $config['feed_overall_forums_limit'];
  	}
  
  	function open()
***************
*** 949,955 ****
  		$this->set('enable_smilies',	'enable_smilies');
  		$this->set('enable_magic_url',	'enable_magic_url');
  
! 		$this->num_items = $config['feed_overall_topics_limit'];
  	}
  
  	function open()
--- 949,955 ----
  		$this->set('enable_smilies',	'enable_smilies');
  		$this->set('enable_magic_url',	'enable_magic_url');
  
! 		$this->num_items = (int) $config['feed_overall_topics_limit'];
  	}
  
  	function open()
***************
*** 981,987 ****
  
  		while ($row = $db->sql_fetchrow($result))
  		{
! 			$post_ids[] = $row['topic_first_post_id'];
  		}
  		$db->sql_freeresult($result);
  
--- 981,987 ----
  
  		while ($row = $db->sql_fetchrow($result))
  		{
! 			$post_ids[] = (int) $row['topic_first_post_id'];
  		}
  		$db->sql_freeresult($result);

[Phpbb-checkins] r9866 - /branches/phpBB-3_0_0/phpBB/feed.php

From: Meik S. <acy...@ph...> - 2009-07-27 09:56:59

Author: acydburn
Date: Mon Jul 27 10:56:31 2009
New Revision: 9866

Log:
do not cache results from registered users...

Modified:
    branches/phpBB-3_0_0/phpBB/feed.php

Modified: branches/phpBB-3_0_0/phpBB/feed.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/feed.php (original)
--- branches/phpBB-3_0_0/phpBB/feed.php Mon Jul 27 10:56:31 2009
***************
*** 10,16 ****
  * MOD Author Profile: http://www.phpbb.com/community/memberlist.php?mode=viewprofile&u=345763
  * MOD Author Homepage: http://www.mssti.com/phpbb3/
  *
- * @note remove cache if Authentication gets added
  **/
  
  /**
--- 10,15 ----
***************
*** 221,227 ****
  	// Now the only thing remaining could be an empty &amp;
  	if (substr($link, -5) === '&amp;')
  	{
! 	    $link = substr($link, 0, -5);
  	}
  
  	return $link;
--- 220,226 ----
  	// Now the only thing remaining could be an empty &amp;
  	if (substr($link, -5) === '&amp;')
  	{
! 		$link = substr($link, 0, -5);
  	}
  
  	return $link;
***************
*** 417,423 ****
  	/**
  	* Default setting for last x days
  	*/
! 	var $sort_days = 100;
  
  	/**
  	* Default cache time of entries in seconds
--- 416,422 ----
  	/**
  	* Default setting for last x days
  	*/
! 	var $sort_days = 30;
  
  	/**
  	* Default cache time of entries in seconds
***************
*** 585,591 ****
  
  		$post_ids = array();
  
! 		// Search for topics in last 7 days
  		$last_post_time_sql = ($this->sort_days) ? ' AND t.topic_last_post_time > ' . (time() - ($this->sort_days * 24 * 3600)) : '';
  
  		// Fetch latest post, grouped by topic...
--- 584,590 ----
  
  		$post_ids = array();
  
! 		// Search for topics in last X days
  		$last_post_time_sql = ($this->sort_days) ? ' AND t.topic_last_post_time > ' . (time() - ($this->sort_days * 24 * 3600)) : '';
  
  		// Fetch latest post, grouped by topic...
***************
*** 713,718 ****
--- 712,729 ----
  	{
  		global $db, $cache;
  
+ 		// Disable cache if it is not a guest or a bot but a registered user
+ 		if ($this->cache_time)
+ 		{
+ 			global $user;
+ 
+ 			// We check this here because we call get_item() quite often
+ 			if (!empty($user) && $user->data['is_registered'])
+ 			{
+ 				$this->cache_time = 0;
+ 			}
+ 		}
+ 
  		if (!$this->cache_time)
  		{
  			if (empty($this->result))

[Phpbb-checkins] r9865 - /branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php

From: Henry S. <kel...@ph...> - 2009-07-27 06:16:00

Author: Kellanved
Date: Mon Jul 27 07:15:47 2009
New Revision: 9865

Log:
#48685

Modified:
    branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php

Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php Mon Jul 27 07:15:47 2009
***************
*** 54,60 ****
  		$user->add_lang('captcha_qa');
  		// read input
  		$this->confirm_id = request_var('qa_confirm_id', '');
! 		$this->answer = request_var('qa_answer', '');
  
  		$this->type = (int) $type;
  		$this->question_lang = $user->data['user_lang'];
--- 54,60 ----
  		$user->add_lang('captcha_qa');
  		// read input
  		$this->confirm_id = request_var('qa_confirm_id', '');
! 		$this->answer = request_var('qa_answer', '', true);
  
  		$this->type = (int) $type;
  		$this->question_lang = $user->data['user_lang'];
***************
*** 448,454 ****
  	{
  		global $db;
  		
! 		$answer = ($this->question_strict) ? request_var('qa_answer', '') : utf8_clean_string(request_var('qa_answer', ''));
  		
  		$sql = 'SELECT answer_text
  					FROM ' . ANSWERS_TABLE . '
--- 448,454 ----
  	{
  		global $db;
  		
! 		$answer = ($this->question_strict) ? request_var('qa_answer', '', true) : utf8_clean_string(request_var('qa_answer', '', true));
  		
  		$sql = 'SELECT answer_text
  					FROM ' . ANSWERS_TABLE . '
***************
*** 578,586 ****
  		{
  			// okay, show the editor
  			$error = false;
! 			$input_question = request_var('question_text', '');
! 			$input_answers = request_var('answers', '');
! 			$input_lang = request_var('lang_iso', '');
  			$input_strict = request_var('strict', false);
  			$langs = $this->get_languages();
  			foreach ($langs as $lang => $entry)
--- 578,586 ----
  		{
  			// okay, show the editor
  			$error = false;
! 			$input_question = request_var('question_text', '', true);
! 			$input_answers = request_var('answers', '', true);
! 			$input_lang = request_var('lang_iso', '', true);
  			$input_strict = request_var('strict', false);
  			$langs = $this->get_languages();
  			foreach ($langs as $lang => $entry)
***************
*** 724,733 ****
  		global $db;
  
  		$question = array(
! 			'question_text'	=> request_var('question_text', ''),
  			'strict'		=> request_var('strict', false),
  			'lang_iso'		=> request_var('lang_iso', ''),
! 			'answers'		=> explode("\n", request_var('answers', '')),
  		);
  		
  		return $question;
--- 724,733 ----
  		global $db;
  
  		$question = array(
! 			'question_text'	=> request_var('question_text', '', true),
  			'strict'		=> request_var('strict', false),
  			'lang_iso'		=> request_var('lang_iso', ''),
! 			'answers'		=> explode("\n", request_var('answers', '', true)),
  		);
  		
  		return $question;

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

From: Nils A. <nad...@ph...> - 2009-07-26 20:23:00

Author: naderman
Date: Sun Jul 26 21:22:41 2009
New Revision: 9864

Log:
geez, maybe we should stop displaying text and this would become easier

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 Sun Jul 26 21:22:41 2009
***************
*** 322,335 ****
  		if ($total == 0)
  		{
  			$template->assign_vars(array(
! 				'L_REPORTS_TOTAL'	=>	$user->lang['PM_REPORTS_ZERO_TOTAL'],
  				'S_HAS_PM_REPORTS'		=>	false)
  			);
  		}
  		else
  		{
  			$template->assign_vars(array(
! 				'L_REPORTS_TOTAL'	=> ($total == 1) ? $user->lang['PM_REPORT_TOTAL'] : sprintf($user->lang['PM_REPORTS_TOTAL'], $total),
  				'S_HAS_PM_REPORTS'		=> true)
  			);
  		}
--- 322,335 ----
  		if ($total == 0)
  		{
  			$template->assign_vars(array(
! 				'L_PM_REPORTS_TOTAL'	=>	$user->lang['PM_REPORTS_ZERO_TOTAL'],
  				'S_HAS_PM_REPORTS'		=>	false)
  			);
  		}
  		else
  		{
  			$template->assign_vars(array(
! 				'L_PM_REPORTS_TOTAL'	=> ($total == 1) ? $user->lang['PM_REPORT_TOTAL'] : sprintf($user->lang['PM_REPORTS_TOTAL'], $total),
  				'S_HAS_PM_REPORTS'		=> true)
  			);
  		}

[Phpbb-checkins] r9863 - /branches/phpBB-3_0_0/phpBB/language/en/acp/board.php

From: Chris S. <too...@ph...> - 2009-07-26 18:31:49

Author: toonarmy
Date: Sun Jul 26 19:31:31 2009
New Revision: 9863

Log:
Fix r9862 #36685 this is pre-pub as well O_O

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

Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/board.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/board.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/board.php Sun Jul 26 19:31:31 2009
***************
*** 486,492 ****
  	'EMAIL_SIG'						=> 'E-mail signature',
  	'EMAIL_SIG_EXPLAIN'				=> 'This text will be attached to all e-mails the board sends.',
  	'ENABLE_EMAIL'					=> 'Enable board-wide e-mails',
! 	'ENABLE_EMAIL_EXPLAIN'			=> 'If this is set to disabled no e-mails will be sent by the board at all. <em>Note the user and admin account activiation settings require this setting to be enabled. If currently using &quot;user&quot; or &quot;admin&quot; activation in the activation settings, disabling this setting will require no activiation of new accounts.</em>',
  	'SMTP_AUTH_METHOD'				=> 'Authentication method for SMTP',
  	'SMTP_AUTH_METHOD_EXPLAIN'		=> 'Only used if a username/password is set, ask your provider if you are unsure which method to use.',
  	'SMTP_CRAM_MD5'					=> 'CRAM-MD5',
--- 486,492 ----
  	'EMAIL_SIG'						=> 'E-mail signature',
  	'EMAIL_SIG_EXPLAIN'				=> 'This text will be attached to all e-mails the board sends.',
  	'ENABLE_EMAIL'					=> 'Enable board-wide e-mails',
! 	'ENABLE_EMAIL_EXPLAIN'			=> 'If this is set to disabled no e-mails will be sent by the board at all. <em>Note the user and admin account activation settings require this setting to be enabled. If currently using &quot;user&quot; or &quot;admin&quot; activation in the activation settings, disabling this setting will require no activation of new accounts.</em>',
  	'SMTP_AUTH_METHOD'				=> 'Authentication method for SMTP',
  	'SMTP_AUTH_METHOD_EXPLAIN'		=> 'Only used if a username/password is set, ask your provider if you are unsure which method to use.',
  	'SMTP_CRAM_MD5'					=> 'CRAM-MD5',

[Phpbb-checkins] r9862 - /branches/phpBB-3_0_0/phpBB/language/en/acp/board.php

From: Chris S. <too...@ph...> - 2009-07-26 18:25:12

Author: toonarmy
Date: Sun Jul 26 19:24:53 2009
New Revision: 9862

Log:
Alter r9860 #36685

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

Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/board.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/board.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/board.php Sun Jul 26 19:24:53 2009
***************
*** 486,492 ****
  	'EMAIL_SIG'						=> 'E-mail signature',
  	'EMAIL_SIG_EXPLAIN'				=> 'This text will be attached to all e-mails the board sends.',
  	'ENABLE_EMAIL'					=> 'Enable board-wide e-mails',
! 	'ENABLE_EMAIL_EXPLAIN'			=> 'If this is set to disabled no e-mails will be sent by the board at all. <em>Note the user and admin account activiation settings require this setting to be enabled.</em>',
  	'SMTP_AUTH_METHOD'				=> 'Authentication method for SMTP',
  	'SMTP_AUTH_METHOD_EXPLAIN'		=> 'Only used if a username/password is set, ask your provider if you are unsure which method to use.',
  	'SMTP_CRAM_MD5'					=> 'CRAM-MD5',
--- 486,492 ----
  	'EMAIL_SIG'						=> 'E-mail signature',
  	'EMAIL_SIG_EXPLAIN'				=> 'This text will be attached to all e-mails the board sends.',
  	'ENABLE_EMAIL'					=> 'Enable board-wide e-mails',
! 	'ENABLE_EMAIL_EXPLAIN'			=> 'If this is set to disabled no e-mails will be sent by the board at all. <em>Note the user and admin account activiation settings require this setting to be enabled. If currently using &quot;user&quot; or &quot;admin&quot; activation in the activation settings, disabling this setting will require no activiation of new accounts.</em>',
  	'SMTP_AUTH_METHOD'				=> 'Authentication method for SMTP',
  	'SMTP_AUTH_METHOD_EXPLAIN'		=> 'Only used if a username/password is set, ask your provider if you are unsure which method to use.',
  	'SMTP_CRAM_MD5'					=> 'CRAM-MD5',

[Phpbb-checkins] r9861 - in /branches/phpBB-3_0_0/phpBB: adm/style/install_update_diff.html docs/CHANGELOG.html includes/diff/renderer.php

From: Chris S. <too...@ph...> - 2009-07-26 17:58:33

Author: toonarmy
Date: Sun Jul 26 18:58:10 2009
New Revision: 9861

Log:
XHTML mistakes in the updater. #46585

Modified:
    branches/phpBB-3_0_0/phpBB/adm/style/install_update_diff.html
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/includes/diff/renderer.php

Modified: branches/phpBB-3_0_0/phpBB/adm/style/install_update_diff.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/install_update_diff.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/install_update_diff.html Sun Jul 26 18:58:10 2009
***************
*** 28,33 ****
--- 28,36 ----
  		//whatever IE needs to do this
  	}	
  }
+ 
+ window.onresize = resize_panel;
+ 
  // ]]>
  </script>
  
***************
*** 48,57 ****
  
  <!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
  div#codepanel {
- 	overflow: auto;
  	width: 100%;
- 	height: 350px;
- 	display: inline-block;
  }
  <!-- ELSE -->
  div#codepanel {	
--- 51,57 ----
***************
*** 59,70 ****
--- 59,80 ----
  }
  <!-- ENDIF -->
  
+ <!-- IF DIFF_MODE neq 'unified' and DIFF_MODE neq 'side_by_side'  -->
+ div#diff_content pre {
+ 	overflow: auto;
+ 	height: 414px;
+ 	width: 100% !important;
+ }
+ <!-- ENDIF -->
+ 
  <!-- IF not S_DIFF_NEW_FILE -->
  /**
  * Unified Diff
  */
  .file {
  	line-height: .7em;
+ 	overflow: auto;
+ 	height: 414px;
  }
  
  .diff {
***************
*** 203,211 ****
  
  </head>
  
- 
  <!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
! <body onresize="resize_panel();" onload="resize_panel();">
  <!-- ELSE -->
  <body>
  <!-- ENDIF -->
--- 213,220 ----
  
  </head>
  
  <!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
! <body onload="resize_panel();">
  <!-- ELSE -->
  <body>
  <!-- ENDIF -->
***************
*** 220,226 ****
  <!-- ENDIF -->
  <!-- IF not S_DIFF_NEW_FILE -->
  		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
! 		<form method="post">
  		<fieldset class="quick">
  			<label for="diff_mode">{L_SELECT_DIFF_MODE}:</label>
  			<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
--- 229,235 ----
  <!-- ENDIF -->
  <!-- IF not S_DIFF_NEW_FILE -->
  		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
! 		<form method="post" action="">
  		<fieldset class="quick">
  			<label for="diff_mode">{L_SELECT_DIFF_MODE}:</label>
  			<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>

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 Sun Jul 26 18:58:10 2009
***************
*** 264,270 ****
  		<li>[Fix] Changed the success message when requesting a new password to be more accurate. (Bug #41405)</li>
  		<li>[Fix] Add missing anti-abuse email headers to acp_inactive.php and ucp_resend.php.</li>
  		<li>[Fix] Only remind users in the correct inactive states depending on the board account activation level.</li>
! 		<li>[Fix] Various XHTML mistakes in prosilver, subsilver2 and the ACP. (Bugs #41745, #42265 - Patch by nickvergessen, #38465, #43015)</li>
  		<li>[Fix] Log password changes via password reset function. (Bug #41365)</li>
  		<li>[Fix] Poll, negative durations generate error (Bug #41295 - Patch by TerraFrost)</li>
  		<li>[Fix] Visibility of custom field on registration is incorrectly controlled by setting &quot;display&quot; (Bug #41385 - Patch by Eelke and fade2gray)</li>
--- 264,270 ----
  		<li>[Fix] Changed the success message when requesting a new password to be more accurate. (Bug #41405)</li>
  		<li>[Fix] Add missing anti-abuse email headers to acp_inactive.php and ucp_resend.php.</li>
  		<li>[Fix] Only remind users in the correct inactive states depending on the board account activation level.</li>
! 		<li>[Fix] Various XHTML mistakes in prosilver, subsilver2 and the ACP. (Bugs #41745, #42265 - Patch by nickvergessen, #38465, #43015, #46585 - Patch by Raimon)</li>
  		<li>[Fix] Log password changes via password reset function. (Bug #41365)</li>
  		<li>[Fix] Poll, negative durations generate error (Bug #41295 - Patch by TerraFrost)</li>
  		<li>[Fix] Visibility of custom field on registration is incorrectly controlled by setting &quot;display&quot; (Bug #41385 - Patch by Eelke and fade2gray)</li>

Modified: branches/phpBB-3_0_0/phpBB/includes/diff/renderer.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/diff/renderer.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/diff/renderer.php Sun Jul 26 18:58:10 2009
***************
*** 536,542 ****
  	*/
  	function get_diff_content($diff)
  	{
! 		return '<textarea style="height: 290px;" class="full">' . htmlspecialchars($this->render($diff)) . '</textarea>';
  	}
  
  	function _block_header($xbeg, $xlen, $ybeg, $ylen)
--- 536,542 ----
  	*/
  	function get_diff_content($diff)
  	{
! 		return '<textarea style="height: 290px;" rows="15" cols="76" class="full">' . htmlspecialchars($this->render($diff)) . '</textarea>';
  	}
  
  	function _block_header($xbeg, $xlen, $ybeg, $ylen)

[Phpbb-checkins] r9860 - /branches/phpBB-3_0_0/phpBB/language/en/acp/board.php

From: Chris S. <too...@ph...> - 2009-07-26 17:01:24

Author: toonarmy
Date: Sun Jul 26 18:01:07 2009
New Revision: 9860

Log:
#36685

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

Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/board.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/board.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/board.php Sun Jul 26 18:01:07 2009
***************
*** 486,492 ****
  	'EMAIL_SIG'						=> 'E-mail signature',
  	'EMAIL_SIG_EXPLAIN'				=> 'This text will be attached to all e-mails the board sends.',
  	'ENABLE_EMAIL'					=> 'Enable board-wide e-mails',
! 	'ENABLE_EMAIL_EXPLAIN'			=> 'If this is set to disabled no e-mails will be sent by the board at all.',
  	'SMTP_AUTH_METHOD'				=> 'Authentication method for SMTP',
  	'SMTP_AUTH_METHOD_EXPLAIN'		=> 'Only used if a username/password is set, ask your provider if you are unsure which method to use.',
  	'SMTP_CRAM_MD5'					=> 'CRAM-MD5',
--- 486,492 ----
  	'EMAIL_SIG'						=> 'E-mail signature',
  	'EMAIL_SIG_EXPLAIN'				=> 'This text will be attached to all e-mails the board sends.',
  	'ENABLE_EMAIL'					=> 'Enable board-wide e-mails',
! 	'ENABLE_EMAIL_EXPLAIN'			=> 'If this is set to disabled no e-mails will be sent by the board at all. <em>Note the user and admin account activiation settings require this setting to be enabled.</em>',
  	'SMTP_AUTH_METHOD'				=> 'Authentication method for SMTP',
  	'SMTP_AUTH_METHOD_EXPLAIN'		=> 'Only used if a username/password is set, ask your provider if you are unsure which method to use.',
  	'SMTP_CRAM_MD5'					=> 'CRAM-MD5',

[Phpbb-checkins] r9859 - in /branches/phpBB-3_0_0/phpBB: docs/CHANGELOG.html posting.php

From: Chris S. <too...@ph...> - 2009-07-26 16:16:47

Author: toonarmy
Date: Sun Jul 26 17:16:30 2009
New Revision: 9859

Log:
Preserve post options when refusing to save the post as a draft. #39115

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/posting.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 Sun Jul 26 17:16:30 2009
***************
*** 177,182 ****
--- 177,183 ----
  		<li>[Fix] Correctly set attachment flag for topics, posts and pms after deleting attachments (Bug #48265 - Patch by WorldWar and nickvergessen)</li>
  		<li>[Fix] Display &quot;Locked&quot; button instead of &quot;Reply&quot; one for locked forum in viewtopic (prosilver). (Bug #38055 - Patch by Raimon)</li>
  		<li>[Fix] Correctly propagate umlauts over search result pages (Bug #33755)</li>
+ 		<li>[Fix] Preserve post options when refusing to save the post as a draft. (Bug #39115)</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>
  		<li>[Change] Template engine now permits to a limited extent variable includes.</li>

Modified: branches/phpBB-3_0_0/phpBB/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/posting.php Sun Jul 26 17:16:30 2009
***************
*** 545,550 ****
--- 545,591 ----
  				)
  			);
  
+ 			$hidden_fields = array(
+ 				'icon_id'			=> 0,
+ 
+ 				'disable_bbcode'	=> false,
+ 				'disable_smilies'	=> false,
+ 				'disable_magic_url'	=> false,
+ 				'attach_sig'		=> true,
+ 				'lock_topic'		=> false,
+ 
+ 				'topic_type'		=> POST_NORMAL,
+ 				'topic_time_limit'	=> 0,
+ 
+ 				'poll_title'		=> '',
+ 				'poll_option_text'	=> '',
+ 				'poll_max_options'	=> 1,
+ 				'poll_length'		=> 0,
+ 				'poll_vote_change'	=> false,
+ 			);
+ 
+ 			foreach ($hidden_fields as $name => $default)
+ 			{
+ 				if (!isset($_POST[$name]))
+ 				{
+ 					// Don't include it, if its not available
+ 					unset($hidden_fields[$name]);
+ 					continue;
+ 				}
+ 
+ 				if (is_bool($default))
+ 				{
+ 					// Use the string representation
+ 					$hidden_fields[$name] = request_var($name, '');
+ 				}
+ 				else
+ 				{
+ 					$hidden_fields[$name] = request_var($name, $default);
+ 				}
+ 			}
+ 
+ 			$s_hidden_fields .= build_hidden_fields($hidden_fields);
+ 
  			confirm_box(false, 'SAVE_DRAFT', $s_hidden_fields);
  		}
  	}

[Phpbb-checkins] r9858 - in /branches/phpBB-3_0_0/phpBB: includes/acp/acp_logs.php includes/mcp/mcp_logs.php language/en/acp/common.php

From: Chris S. <too...@ph...> - 2009-07-26 14:54:23

Author: toonarmy
Date: Sun Jul 26 15:54:02 2009
New Revision: 9858

Log:
Make some adjustments to the log filter. r9781, r9800

Modified:
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php
    branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php
    branches/phpBB-3_0_0/phpBB/language/en/acp/common.php

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_logs.php Sun Jul 26 15:54:02 2009
***************
*** 156,169 ****
  				" . (($limit_days) ? "AND log_time >= $sql_where " : ' ') . 
  				$sql_forum;
  		$result = $db->sql_query($sql);
  		while ($row = $db->sql_fetchrow($result))
  		{
  			if (empty($row['log_operation']))
  			{
  				continue;
  			}
  			$selected = ($log_operation == $row['log_operation']) ? ' selected="selected"' : '';
! 			$s_lang_keys .= '<option value="' . $row['log_operation'] . '"' . $selected . '>' . htmlspecialchars(strip_tags($user->lang[$row['log_operation']]), ENT_COMPAT, 'UTF-8') . '</option>';
  		}
  		$db->sql_freeresult($result);
  
--- 156,187 ----
  				" . (($limit_days) ? "AND log_time >= $sql_where " : ' ') . 
  				$sql_forum;
  		$result = $db->sql_query($sql);
+ 
  		while ($row = $db->sql_fetchrow($result))
  		{
  			if (empty($row['log_operation']))
  			{
  				continue;
  			}
+ 
  			$selected = ($log_operation == $row['log_operation']) ? ' selected="selected"' : '';
! 
! 			if (isset($user->lang[$row['log_operation']]))
! 			{
! 				$text = htmlspecialchars(strip_tags(str_replace('<br />', ' ', $user->lang[$row['log_operation']])), ENT_COMPAT, 'UTF-8');
! 
! 				// Fill in sprintf placeholders with translated placeholder text
! 				if (substr_count($text, '%'))
! 				{
! 					$text = vsprintf($text, array_fill(0, substr_count($text, '%'), $user->lang['LOGS_PLACEHOLDER']));
! 				}
! 			}
! 			else
! 			{
! 				$text = ucfirst(str_replace('_', ' ', strtolower($row['log_operation'])));
! 			}
! 
! 			$s_lang_keys .= '<option value="' . $row['log_operation'] . '"' . $selected . '>' . $text . '</option>';
  		}
  		$db->sql_freeresult($result);
  

Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php Sun Jul 26 15:54:02 2009
***************
*** 186,199 ****
  				' . (($limit_days) ? "AND log_time >= $sql_where " : ' ') . 
  				$sql_forum;
  		$result = $db->sql_query($sql);
  		while ($row = $db->sql_fetchrow($result))
  		{
  			if (empty($row['log_operation']))
  			{
  				continue;
  			}
  			$selected = ($log_operation == $row['log_operation']) ? ' selected="selected"' : '';
! 			$s_lang_keys .= '<option value="' . $row['log_operation'] . '"' . $selected . '>' . htmlspecialchars(strip_tags($user->lang[$row['log_operation']]), ENT_COMPAT, 'UTF-8') . '</option>';
  		}
  		$db->sql_freeresult($result);
  
--- 186,217 ----
  				' . (($limit_days) ? "AND log_time >= $sql_where " : ' ') . 
  				$sql_forum;
  		$result = $db->sql_query($sql);
+ 
  		while ($row = $db->sql_fetchrow($result))
  		{
  			if (empty($row['log_operation']))
  			{
  				continue;
  			}
+ 
  			$selected = ($log_operation == $row['log_operation']) ? ' selected="selected"' : '';
! 
! 			if (isset($user->lang[$row['log_operation']]))
! 			{
! 				$text = htmlspecialchars(strip_tags(str_replace('<br />', ' ', $user->lang[$row['log_operation']])), ENT_COMPAT, 'UTF-8');
! 
! 				// Fill in sprintf placeholders with translated placeholder text
! 				if (substr_count($text, '%'))
! 				{
! 					$text = vsprintf($text, array_fill(0, substr_count($text, '%'), $user->lang['LOGS_PLACEHOLDER']));
! 				}
! 			}
! 			else
! 			{
! 				$text = ucfirst(str_replace('_', ' ', strtolower($row['log_operation'])));
! 			}
! 
! 			$s_lang_keys .= '<option value="' . $row['log_operation'] . '"' . $selected . '>' . $text . '</option>';
  		}
  		$db->sql_freeresult($result);
  

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 Sun Jul 26 15:54:02 2009
***************
*** 307,312 ****
--- 307,314 ----
  
  	'DISPLAY_LOG'	=> 'Display entries from previous',
  
+ 	'LOGS_PLACEHOLDER'	=> '&lt;value&gt;',
+ 
  	'NO_ENTRIES'	=> 'No log entries for this period.',
  
  	'SORT_IP'		=> 'IP address',

[Phpbb-checkins] r9857 - /branches/phpBB-3_0_0/phpBB/includes/acp/acp_send_statistics.php

From: Nils A. <nad...@ph...> - 2009-07-26 11:34:30

Author: naderman
Date: Sun Jul 26 12:34:11 2009
New Revision: 9857

Log:
correctly add the install_id to the data

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

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_send_statistics.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_send_statistics.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_send_statistics.php Sun Jul 26 12:34:11 2009
***************
*** 61,66 ****
--- 61,71 ----
  
  		foreach ($raw as $provider => $data)
  		{
+ 			if ($provider == 'install_id')
+ 			{
+ 				$data = array($provider => $data);
+ 			}
+ 
  			$template->assign_block_vars('providers', array(
  				'NAME'	=> htmlspecialchars($provider),
  			));

[Phpbb-checkins] r9856 - /branches/phpBB-3_0_0/phpBB/includes/questionnaire/questionnaire.php

From: Nils A. <nad...@ph...> - 2009-07-26 11:34:08

Author: naderman
Date: Sun Jul 26 12:33:48 2009
New Revision: 9856

Log:
made a mistake when turning stats into a whitelist

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

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 Sun Jul 26 12:33:48 2009
***************
*** 253,258 ****
--- 253,259 ----
  			'allow_namechange' => true,
  			'allow_nocensors' => true,
  			'allow_pm_attach' => true,
+ 			'allow_pm_report' => true,
  			'allow_post_flash' => true,
  			'allow_post_links' => true,
  			'allow_privmsg' => true,
***************
*** 435,445 ****
  		);
  
  		$result = array();
! 		foreach ($this->config as $name => $value)
  		{
! 			if (!isset($exclude_config_vars[$name]))
  			{
! 				$result['config.' . $name] = $value;
  			}
  		}
  
--- 436,446 ----
  		);
  
  		$result = array();
! 		foreach ($config_vars as $name => $void)
  		{
! 			if (isset($this->config[$name]))
  			{
! 				$result['config.' . $name] = $this->config[$name];
  			}
  		}

[Phpbb-checkins] r9855 - in /branches/phpBB-3_0_0/phpBB: includes/functions.php search.php

From: Ruslan U. <rx...@ph...> - 2009-07-26 10:17:11

Author: rxu
Date: Sun Jul 26 11:16:52 2009
New Revision: 9855

Log:
Fix r9755 for #46765
Authorised by: ToonArmy

Modified:
    branches/phpBB-3_0_0/phpBB/includes/functions.php
    branches/phpBB-3_0_0/phpBB/search.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 Sun Jul 26 11:16:52 2009
***************
*** 4138,4144 ****
  {
  	global $config, $db, $user;
  
! 	if($user_id === false)
  	{
  		$user_id = $user->data['user_id'];
  	}
--- 4138,4144 ----
  {
  	global $config, $db, $user;
  
! 	if ($user_id === false)
  	{
  		$user_id = $user->data['user_id'];
  	}
***************
*** 4150,4174 ****
  	{
  		// List of the tracked forums (not ideal, hope the better way will be found)
  		// This list is to fetch later the forums user never read (fully) before
! 		$sql = 'SELECT forum_id FROM ' . FORUMS_TRACK_TABLE . "
  			WHERE user_id = {$user_id}";
  		$result = $db->sql_query($sql);
! 		while($row = $db->sql_fetchrow($result))
  		{
  			$tracked_forums_list[] = $row['forum_id'];
  		}
  		$db->sql_freeresult($result);
! 	
  		// Get list of the unread topics - on topics tracking as the first step
! 		$sql = 'SELECT t.topic_id, t.topic_last_post_time, tt.mark_time FROM ' . TOPICS_TABLE . ' t, ' . TOPICS_TRACK_TABLE . " tt
  			WHERE t.topic_id = tt.topic_id
  				AND t.topic_last_post_time >= tt.mark_time
  				AND tt.user_id = {$user_id}
! 				$sql_extra";
  		$result = $db->sql_query($sql);
! 		while($row = $db->sql_fetchrow($result))
  		{
! 			if($row['topic_last_post_time'] == $row['mark_time'])
  			{
  				// Check if there're read topics for the forums having unread ones
  				$read_topics_list[$row['topic_id']] = $row['mark_time'];
--- 4150,4177 ----
  	{
  		// List of the tracked forums (not ideal, hope the better way will be found)
  		// This list is to fetch later the forums user never read (fully) before
! 		$sql = 'SELECT forum_id
! 			FROM ' . FORUMS_TRACK_TABLE . "
  			WHERE user_id = {$user_id}";
  		$result = $db->sql_query($sql);
! 		while ($row = $db->sql_fetchrow($result))
  		{
  			$tracked_forums_list[] = $row['forum_id'];
  		}
  		$db->sql_freeresult($result);
! 
  		// Get list of the unread topics - on topics tracking as the first step
! 		$sql = 'SELECT t.topic_id, t.topic_last_post_time, tt.mark_time
! 			FROM ' . TOPICS_TABLE . ' t, ' . TOPICS_TRACK_TABLE . " tt
  			WHERE t.topic_id = tt.topic_id
  				AND t.topic_last_post_time >= tt.mark_time
  				AND tt.user_id = {$user_id}
! 			$sql_extra
! 			ORDER BY t.topic_last_post_time DESC";
  		$result = $db->sql_query($sql);
! 		while ($row = $db->sql_fetchrow($result))
  		{
! 			if ($row['topic_last_post_time'] == $row['mark_time'])
  			{
  				// Check if there're read topics for the forums having unread ones
  				$read_topics_list[$row['topic_id']] = $row['mark_time'];
***************
*** 4179,4211 ****
  			}
  		}
  		$db->sql_freeresult($result);
! 		
  		// Get the full list of the tracked topics
  		$tracked_topics_list = array_merge(array_keys($unread_topics_list), array_keys($read_topics_list));
  
  		// Get list of the unread topics - on forums tracking as the second step
  		// We don't take in account topics tracked before
! 		$sql = 'SELECT t.topic_id, ft.mark_time FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TRACK_TABLE . ' ft
  			WHERE t.forum_id = ft.forum_id
  				AND t.topic_last_post_time > ft.mark_time
  				AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . "
  				AND ft.user_id = {$user_id}
! 			$sql_extra";
  		$result = $db->sql_query($sql);
! 		while($row = $db->sql_fetchrow($result))
  		{
  			$unread_topics_list[$row['topic_id']] = $row['mark_time'];
  		}
  		$db->sql_freeresult($result);
! 		
  		// And the last step - find unread topics were not found before (that can mean a user has never read some forums)
! 		$sql = 'SELECT topic_id FROM ' . TOPICS_TABLE . "
  			WHERE topic_last_post_time > {$user->data['user_lastmark']}
  				AND " . $db->sql_in_set('topic_id', array_keys($unread_topics_list), true, true) . '
  				AND ' . $db->sql_in_set('forum_id', $tracked_forums_list, true, true) . "
! 			$sql_extra";
  		$result = $db->sql_query_limit($sql, 1000);
! 		while($row = $db->sql_fetchrow($result))
  		{
  			$unread_topics_list[$row['topic_id']] = $user->data['user_lastmark'];
  		}
--- 4182,4222 ----
  			}
  		}
  		$db->sql_freeresult($result);
! 
  		// Get the full list of the tracked topics
  		$tracked_topics_list = array_merge(array_keys($unread_topics_list), array_keys($read_topics_list));
  
  		// Get list of the unread topics - on forums tracking as the second step
  		// We don't take in account topics tracked before
! 		$sql = 'SELECT t.topic_id, ft.mark_time
! 			FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TRACK_TABLE . ' ft
  			WHERE t.forum_id = ft.forum_id
  				AND t.topic_last_post_time > ft.mark_time
  				AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . "
  				AND ft.user_id = {$user_id}
! 			$sql_extra
! 			ORDER BY t.topic_last_post_time DESC";
  		$result = $db->sql_query($sql);
! 		while ($row = $db->sql_fetchrow($result))
  		{
  			$unread_topics_list[$row['topic_id']] = $row['mark_time'];
  		}
  		$db->sql_freeresult($result);
! 
! 		// Refresh the full list of the tracked topics
! 		unset($tracked_topics_list);
! 		$tracked_topics_list = array_merge(array_keys($unread_topics_list), array_keys($read_topics_list));
! 
  		// And the last step - find unread topics were not found before (that can mean a user has never read some forums)
! 		$sql = 'SELECT topic_id
! 			FROM ' . TOPICS_TABLE . "
  			WHERE topic_last_post_time > {$user->data['user_lastmark']}
  				AND " . $db->sql_in_set('topic_id', array_keys($unread_topics_list), true, true) . '
  				AND ' . $db->sql_in_set('forum_id', $tracked_forums_list, true, true) . "
! 			$sql_extra
! 			ORDER BY topic_last_post_time DESC";
  		$result = $db->sql_query_limit($sql, 1000);
! 		while ($row = $db->sql_fetchrow($result))
  		{
  			$unread_topics_list[$row['topic_id']] = $user->data['user_lastmark'];
  		}

Modified: branches/phpBB-3_0_0/phpBB/search.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/search.php (original)
--- branches/phpBB-3_0_0/phpBB/search.php Sun Jul 26 11:16:52 2009
***************
*** 381,387 ****
  					$unread_list = array();
  					$unread_list = get_unread_topics_list();
  
! 					if(!empty($unread_list))
  					{
  						$sql = 'SELECT t.topic_id
  							FROM ' . TOPICS_TABLE . ' t
--- 381,387 ----
  					$unread_list = array();
  					$unread_list = get_unread_topics_list();
  
! 					if (!empty($unread_list))
  					{
  						$sql = 'SELECT t.topic_id
  							FROM ' . TOPICS_TABLE . ' t

[Phpbb-checkins] r9854 - /branches/phpBB-3_0_0/phpBB/language/en/mcp.php

From: Nils A. <nad...@ph...> - 2009-07-25 18:06:41

Author: naderman
Date: Sat Jul 25 19:06:25 2009
New Revision: 9854

Log:
I manage to get a one line commit wrong ...

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

Modified: branches/phpBB-3_0_0/phpBB/language/en/mcp.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/mcp.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/mcp.php Sat Jul 25 19:06:25 2009
***************
*** 252,258 ****
  	'PM_REPORT_CLOSED_SUCCESS'	=> 'The selected PM report has been closed successfully.',
  	'PM_REPORT_DELETED_SUCCESS'	=> 'The selected PM report has been deleted successfully.',
  	'PM_REPORTED_SUCCESS'		=> 'This private message has been successfully reported.',
! 	'REPORT_TOTAL'				=> 'In total there is <strong>1</strong> PM report to review.',
  	'PM_REPORTS_TOTAL'			=> 'In total there are <strong>%d</strong> PM reports to review.',
  	'PM_REPORTS_ZERO_TOTAL'		=> 'There are no PM reports to review.',
  	'PM_REPORT_DETAILS'			=> 'Private message report details',
--- 252,258 ----
  	'PM_REPORT_CLOSED_SUCCESS'	=> 'The selected PM report has been closed successfully.',
  	'PM_REPORT_DELETED_SUCCESS'	=> 'The selected PM report has been deleted successfully.',
  	'PM_REPORTED_SUCCESS'		=> 'This private message has been successfully reported.',
! 	'PM_REPORT_TOTAL'			=> 'In total there is <strong>1</strong> PM report to review.',
  	'PM_REPORTS_TOTAL'			=> 'In total there are <strong>%d</strong> PM reports to review.',
  	'PM_REPORTS_ZERO_TOTAL'		=> 'There are no PM reports to review.',
  	'PM_REPORT_DETAILS'			=> 'Private message report details',

[Phpbb-checkins] r9853 - /branches/phpBB-3_0_0/phpBB/language/en/mcp.php

From: Nils A. <nad...@ph...> - 2009-07-25 18:01:35

Author: naderman
Date: Sat Jul 25 19:01:15 2009
New Revision: 9853

Log:
missing lang var for PM reports

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

Modified: branches/phpBB-3_0_0/phpBB/language/en/mcp.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/mcp.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/mcp.php Sat Jul 25 19:01:15 2009
***************
*** 252,257 ****
--- 252,258 ----
  	'PM_REPORT_CLOSED_SUCCESS'	=> 'The selected PM report has been closed successfully.',
  	'PM_REPORT_DELETED_SUCCESS'	=> 'The selected PM report has been deleted successfully.',
  	'PM_REPORTED_SUCCESS'		=> 'This private message has been successfully reported.',
+ 	'REPORT_TOTAL'				=> 'In total there is <strong>1</strong> PM report to review.',
  	'PM_REPORTS_TOTAL'			=> 'In total there are <strong>%d</strong> PM reports to review.',
  	'PM_REPORTS_ZERO_TOTAL'		=> 'There are no PM reports to review.',
  	'PM_REPORT_DETAILS'			=> 'Private message report details',

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

From: Andreas F. <ba...@ph...> - 2009-07-25 14:48:44

Author: bantu
Date: Sat Jul 25 15:48:25 2009
New Revision: 9852

Log:
r9849, r9851 - Do it right ... hopefully

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 Sat Jul 25 15:48:25 2009
***************
*** 199,211 ****
  		<li>[Change] Add pagination for icons and smilies in the ACP and smilies in the smiley popup</li>
  		<li>[Change] Cache get_username_string() function calls on viewtopic.</li>
  		<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
! 		<li>[Feature] Backported 3.2 captcha plugins.</li>
  			<ul>
  				<li>Classic and GD CAPTCHA</li>
  				<li>reCaptcha (based on API from recaptcha.net by Mike Crawford and Ben Maurer)</li>
  				<li>Q&amp;A CAPTCHA</li>
! 				<li>3D Wave (by Robert &quot;Xore&quot; Hetzler)/li>
  			</ul>
  		<li>[Feature] Introduced new ACM plugins:
  			<ul>
  				<li>null</li>
--- 199,212 ----
  		<li>[Change] Add pagination for icons and smilies in the ACP and smilies in the smiley popup</li>
  		<li>[Change] Cache get_username_string() function calls on viewtopic.</li>
  		<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
! 		<li>[Feature] Backported 3.2 captcha plugins.
  			<ul>
  				<li>Classic and GD CAPTCHA</li>
  				<li>reCaptcha (based on API from recaptcha.net by Mike Crawford and Ben Maurer)</li>
  				<li>Q&amp;A CAPTCHA</li>
! 				<li>3D Wave (by Robert &quot;Xore&quot; Hetzler)</li>
  			</ul>
+ 		</li>
  		<li>[Feature] Introduced new ACM plugins:
  			<ul>
  				<li>null</li>

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

From: Andreas F. <ba...@ph...> - 2009-07-25 14:32:45

Author: bantu
Date: Sat Jul 25 15:32:27 2009
New Revision: 9851

Log:
Fix r9849.

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 Sat Jul 25 15:32:27 2009
***************
*** 204,210 ****
  				<li>Classic and GD CAPTCHA</li>
  				<li>reCaptcha (based on API from recaptcha.net by Mike Crawford and Ben Maurer)</li>
  				<li>Q&amp;A CAPTCHA</li>
! 				<li>3D Wave (by Robert &quote;Xore&amp; Hetzler)/li>
  			</ul>
  		<li>[Feature] Introduced new ACM plugins:
  			<ul>
--- 204,210 ----
  				<li>Classic and GD CAPTCHA</li>
  				<li>reCaptcha (based on API from recaptcha.net by Mike Crawford and Ben Maurer)</li>
  				<li>Q&amp;A CAPTCHA</li>
! 				<li>3D Wave (by Robert &quot;Xore&quot; Hetzler)/li>
  			</ul>
  		<li>[Feature] Introduced new ACM plugins:
  			<ul>

[Phpbb-checkins] r9848 - /branches/phpBB-3_0_0/phpBB/docs/coding-guidelines.html

From: Chris S. <too...@ph...> - 2009-07-25 13:44:50

Author: toonarmy
Date: Sat Jul 25 11:23:05 2009
New Revision: 9848

Log:
Add some docs for dynamic includes adding in r9570

Modified:
    branches/phpBB-3_0_0/phpBB/docs/coding-guidelines.html

Modified: branches/phpBB-3_0_0/phpBB/docs/coding-guidelines.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/coding-guidelines.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/coding-guidelines.html Sat Jul 25 11:23:05 2009
***************
*** 1116,1121 ****
--- 1116,1131 ----
  
  <p>You will note in the 3.0 templates the major sources start with <code>&lt;!-- INCLUDE overall_header.html --&gt;</code> or <code>&lt;!-- INCLUDE simple_header.html --&gt;</code>, etc. In 2.0.x control of &quot;which&quot; header to use was defined entirely within the code. In 3.0.x the template designer can output what they like. Note that you can introduce new templates (i.e. other than those in the default set) using this system and include them as you wish ... perhaps useful for a common &quot;menu&quot; bar or some such. No need to modify loads of files as with 2.0.x.</p>
  
+ <p>Added in <strong>3.0.6</strong> is the ability to include a file using a template variable to specify the file, this functionality only works for root variables (i.e. not block variables).</p>
+ <div class="codebox"><pre>
+ <span class="comment">&lt;!-- INCLUDE {FILE_VAR} --&gt;</span>
+ </pre></div>
+ <p>Template defined variables can also be utilised.
+ <div class="codebox"><pre>
+ <span class="comment">&lt;!-- DEFINE $SOME_VAR = 'my_file.html' --&gt;</span>
+ <span class="comment">&lt;!-- INCLUDE {$SOME_VAR} --&gt;</span>	
+ </pre></div>
+ 
  <h4>PHP</h4>
  <p>A contentious decision has seen the ability to include PHP within the template introduced. This is achieved by enclosing the PHP within relevant tags:</p>

[Phpbb-checkins] r9850 - in /branches/phpBB-3_0_0/phpBB: docs/CHANGELOG.html search.php

From: Nils A. <nad...@ph...> - 2009-07-25 13:44:49

Author: naderman
Date: Sat Jul 25 13:35:46 2009
New Revision: 9850

Log:
Correctly propagate umlauts over search result pages [Bug #33755]

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/search.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 Sat Jul 25 13:35:46 2009
***************
*** 176,181 ****
--- 176,182 ----
  		<li>[Fix] Do not cut post-message in between HTML-Entities on search.php (Bug #31505 - Patch by leviatan21)</li>
  		<li>[Fix] Correctly set attachment flag for topics, posts and pms after deleting attachments (Bug #48265 - Patch by WorldWar and nickvergessen)</li>
  		<li>[Fix] Display &quot;Locked&quot; button instead of &quot;Reply&quot; one for locked forum in viewtopic (prosilver). (Bug #38055 - Patch by Raimon)</li>
+ 		<li>[Fix] Correctly propagate umlauts over search result pages (Bug #33755)</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>
  		<li>[Change] Template engine now permits to a limited extent variable includes.</li>

Modified: branches/phpBB-3_0_0/phpBB/search.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/search.php (original)
--- branches/phpBB-3_0_0/phpBB/search.php Sat Jul 25 13:35:46 2009
***************
*** 545,551 ****
  
  	$u_search = append_sid("{$phpbb_root_path}search.$phpEx", $u_sort_param . $u_show_results);
  	$u_search .= ($search_id) ? '&amp;search_id=' . $search_id : '';
! 	$u_search .= ($u_hilit) ? '&amp;keywords=' . urlencode(htmlspecialchars_decode($search->search_query)) : '';
  	$u_search .= ($search_terms != 'all') ? '&amp;terms=' . $search_terms : '';
  	$u_search .= ($topic_id) ? '&amp;t=' . $topic_id : '';
  	$u_search .= ($author) ? '&amp;author=' . urlencode(htmlspecialchars_decode($author)) : '';
--- 545,551 ----
  
  	$u_search = append_sid("{$phpbb_root_path}search.$phpEx", $u_sort_param . $u_show_results);
  	$u_search .= ($search_id) ? '&amp;search_id=' . $search_id : '';
! 	$u_search .= ($u_hilit) ? '&amp;keywords=' . urlencode(htmlspecialchars_decode($keywords)) : '';
  	$u_search .= ($search_terms != 'all') ? '&amp;terms=' . $search_terms : '';
  	$u_search .= ($topic_id) ? '&amp;t=' . $topic_id : '';
  	$u_search .= ($author) ? '&amp;author=' . urlencode(htmlspecialchars_decode($author)) : '';

[Phpbb-checkins] r9847 - /branches/phpBB-3_0_0/phpBB/includes/template.php

From: Chris S. <too...@ph...> - 2009-07-25 13:44:49

Author: toonarmy
Date: Sat Jul 25 11:16:13 2009
New Revision: 9847

Log:
Small change to r9839

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

Modified: branches/phpBB-3_0_0/phpBB/includes/template.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/template.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/template.php Sat Jul 25 11:16:13 2009
***************
*** 39,46 ****
  	var $files_inherit = array();
  	var $files_template = array();
  	var $inherit_root = '';
! 	var $orig_tpl_storedb = 'undefined';
! 	var $orig_tpl_inherits_id = 'undefined';
  
  	// this will hash handle names to the compiled/uncompiled code for that handle.
  	var $compiled_code = array();
--- 39,46 ----
  	var $files_inherit = array();
  	var $files_template = array();
  	var $inherit_root = '';
! 	var $orig_tpl_storedb;
! 	var $orig_tpl_inherits_id;
  
  	// this will hash handle names to the compiled/uncompiled code for that handle.
  	var $compiled_code = array();
***************
*** 57,70 ****
  		{
  			$this->root = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template';
  			$this->cachepath = $phpbb_root_path . 'cache/tpl_' . str_replace('_', '-', $user->theme['template_path']) . '_';
! 			if ($this->orig_tpl_storedb == 'undefined')
  			{
  				$this->orig_tpl_storedb = $user->theme['template_storedb'];
  			}
! 			if ($this->orig_tpl_inherits_id == 'undefined')
  			{
  				$this->orig_tpl_inherits_id = $user->theme['template_inherits_id'];
  			}
  			$user->theme['template_storedb'] = $this->orig_tpl_storedb;
  			$user->theme['template_inherits_id'] = $this->orig_tpl_inherits_id;
  
--- 57,73 ----
  		{
  			$this->root = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template';
  			$this->cachepath = $phpbb_root_path . 'cache/tpl_' . str_replace('_', '-', $user->theme['template_path']) . '_';
! 
! 			if ($this->orig_tpl_storedb === null)
  			{
  				$this->orig_tpl_storedb = $user->theme['template_storedb'];
  			}
! 
! 			if ($this->orig_tpl_inherits_id === null)
  			{
  				$this->orig_tpl_inherits_id = $user->theme['template_inherits_id'];
  			}
+ 
  			$user->theme['template_storedb'] = $this->orig_tpl_storedb;
  			$user->theme['template_inherits_id'] = $this->orig_tpl_inherits_id;

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

Flat | Threaded

<< < 1 .. 15 16 17 18 19 .. 629 > >> (Page 17 of 629)